- Update to version 0.4.0.

- Remove "xrdp_" prefix previously added to binaries, since there are no
  conflicts.

Reported by:	portscout

15 files changed, 123 insertions, 49 deletions

diff --git a/net/xrdp/Makefile b/net/xrdp/Makefile
index 159daf9b387..55255031e82 100644
--- a/net/xrdp/Makefile
+++ b/net/xrdp/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xrdp
-PORTVERSION=	0.3.2
+PORTVERSION=	0.4.0
 CATEGORIES=	net
 MASTER_SITES=	SF
 
@@ -19,8 +19,8 @@ USE_RC_SUBR=	xrdp
 CFLAGS+=	-DXRDP_DEBUG
 .endif
 
-MAN5=		xrdp_sesman.ini.5 xrdp.ini.5
-MAN8=		xrdp_sesman.8 xrdp_sesrun.8 xrdp.8
+MAN5=		sesman.ini.5 xrdp.ini.5
+MAN8=		sesman.8 sesrun.8 xrdp.8
 
 SUB_FILES=	pkg-message
 
@@ -34,7 +34,7 @@ post-patch:
 		 s|CFLAGS =|CFLAGS +=|; s|gcc|${CC}|; s|-ldl||'
 	@${REINPLACE_CMD} -e \
 		's|startwm\.sh|${PREFIX}/lib/${PORTNAME}/&|; \
-		 s|\./sesman\.log|/var/log/xrdp_sesman.log|' \
+		 s|\./sesman\.log|/var/log/sesman.log|' \
 		 ${WRKSRC}/sesman/sesman.ini
 	@${REINPLACE_CMD} -e 's|Tahoma-10\.fv1|${PREFIX}/lib/${PORTNAME}/&|' \
 		${WRKSRC}/xrdp/xrdp_font.c
@@ -43,7 +43,7 @@ post-patch:
 		${WRKSRC}/xrdp/xrdp_login_wnd.c
 	@${REINPLACE_CMD} -e 's|cursor[01]\.cur|${PREFIX}/lib/${PORTNAME}/&|' \
 		${WRKSRC}/xrdp/xrdp_wm.c
-	@${REINPLACE_CMD} -Ee 's|/(etc/pam\.d/)(sesman)|${PREFIX}/\1xrdp_\2|' \
+	@${REINPLACE_CMD} -e 's|/etc/pam\.d/sesman|${PREFIX}&|' \
 		${WRKSRC}/sesman/verify_user_pam.c
 
 post-install:
diff --git a/net/xrdp/distinfo b/net/xrdp/distinfo
index dd5f3b3f8d1..83a8da4eb37 100644
--- a/net/xrdp/distinfo
+++ b/net/xrdp/distinfo
@@ -1,3 +1,3 @@
-MD5 (xrdp-0.3.2.tar.gz) = 6953cecc5ebb5d272403a41e8f5d82b1
-SHA256 (xrdp-0.3.2.tar.gz) = c15f4f84ceb209e7673d48b4718d754b7be8e4c65c6f6e4a31ffec29efa64e1a
-SIZE (xrdp-0.3.2.tar.gz) = 164273
+MD5 (xrdp-0.4.0.tar.gz) = dc83d149e385c4cd402d990695691f55
+SHA256 (xrdp-0.4.0.tar.gz) = a31ddb6f3781d705a9d8b27b3c3cc30322836b90459882f5e18831d02c219538
+SIZE (xrdp-0.4.0.tar.gz) = 194417
diff --git a/net/xrdp/files/patch-Makefile b/net/xrdp/files/patch-Makefile
index 8af01d1911a..c41bd6979fb 100644
--- a/net/xrdp/files/patch-Makefile
+++ b/net/xrdp/files/patch-Makefile
@@ -1,5 +1,5 @@
---- ./Makefile.orig	Fri Mar  3 22:02:01 2006
-+++ ./Makefile	Sun Apr 29 12:42:28 2007
+--- Makefile.orig	Sun Jan 21 00:44:44 2007
++++ Makefile	Mon Jul 16 21:52:23 2007
 @@ -3,7 +3,6 @@
  CFGDIR = /etc/xrdp
  PIDDIR = /var/run
@@ -16,14 +16,13 @@
  	make -C vnc install
  	make -C libxrdp install
  	make -C xrdp install
-@@ -46,9 +44,7 @@
+@@ -46,8 +44,7 @@
  	make -C sesman install
  	make -C xup install
  	make -C docs install
 -	if [ -d /etc/pam.d ]; then install instfiles/pam.d/sesman /etc/pam.d/sesman; fi
--	install instfiles/xrdpstart.sh $(DESTDIR)/xrdpstart.sh
 -	install instfiles/xrdp_control.sh $(DESTDIR)/xrdp_control.sh
-+	if [ -d $(PREFIX)/etc/pam.d ]; then $(BSD_INSTALL_DATA) instfiles/pam.d/sesman $(PREFIX)/etc/pam.d/xrdp_sesman; fi
++	if [ -d $(PREFIX)/etc/pam.d ]; then $(BSD_INSTALL_DATA) instfiles/pam.d/sesman $(PREFIX)/etc/pam.d; fi
  
  installdeb:
- 	mkdir -p $(DESTDIRDEB)/usr/xrdp
+ 	mkdir -p $(DESTDIRDEB)/usr/lib/xrdp
diff --git a/net/xrdp/files/patch-docs__Makefile b/net/xrdp/files/patch-docs__Makefile
index b2fff2d45be..a8d224e12ff 100644
--- a/net/xrdp/files/patch-docs__Makefile
+++ b/net/xrdp/files/patch-docs__Makefile
@@ -11,8 +11,8 @@
 -	install man/xrdp.8 $(DESTDIRDEB)/usr/man/man8/xrdp.8
 -	install man/sesman.ini.5 $(DESTDIRDEB)/usr/man/man5/sesman.ini.5
 -	install man/xrdp.ini.5 $(DESTDIRDEB)/usr/man/man5/xrdp.ini.5
-+	$(BSD_INSTALL_MAN) man/sesman.8 $(MANPREFIX)/man/man8/xrdp_sesman.8
-+	$(BSD_INSTALL_MAN) man/sesrun.8 $(MANPREFIX)/man/man8/xrdp_sesrun.8
++	$(BSD_INSTALL_MAN) man/sesman.8 $(MANPREFIX)/man/man8/sesman.8
++	$(BSD_INSTALL_MAN) man/sesrun.8 $(MANPREFIX)/man/man8/sesrun.8
 +	$(BSD_INSTALL_MAN) man/xrdp.8 $(MANPREFIX)/man/man8/xrdp.8
-+	$(BSD_INSTALL_MAN) man/sesman.ini.5 $(MANPREFIX)/man/man5/xrdp_sesman.ini.5
++	$(BSD_INSTALL_MAN) man/sesman.ini.5 $(MANPREFIX)/man/man5/sesman.ini.5
 +	$(BSD_INSTALL_MAN) man/xrdp.ini.5 $(MANPREFIX)/man/man5/xrdp.ini.5
diff --git a/net/xrdp/files/patch-libxrdp__Makefile b/net/xrdp/files/patch-libxrdp__Makefile
new file mode 100644
index 00000000000..7cd0d4eb5b2
--- /dev/null
+++ b/net/xrdp/files/patch-libxrdp__Makefile
@@ -0,0 +1,11 @@
+--- libxrdp/Makefile.orig	Mon Sep 10 00:34:55 2007
++++ libxrdp/Makefile	Mon Sep 10 00:40:48 2007
+@@ -34,7 +34,7 @@
+ 	rm -f $(LIBXRDPOBJ) libxrdp.a libxrdp.so
+ 
+ install:
+-	install libxrdp.so $(DESTDIR)/libxrdp.so
++	$(BSD_INSTALL_PROGRAM) libxrdp.so $(DESTDIR)/libxrdp.so
+ 
+ installdeb:
+ 	install libxrdp.so $(DESTDIRDEB)/usr/lib/xrdp/libxrdp.so
diff --git a/net/xrdp/files/patch-rdp__Makefile b/net/xrdp/files/patch-rdp__Makefile
new file mode 100644
index 00000000000..ca5d904828e
--- /dev/null
+++ b/net/xrdp/files/patch-rdp__Makefile
@@ -0,0 +1,11 @@
+--- rdp/Makefile.orig	Mon Sep 10 00:34:55 2007
++++ rdp/Makefile	Mon Sep 10 00:41:20 2007
+@@ -33,7 +33,7 @@
+ 	$(CC) $(C_OS_FLAGS) ../common/ssl_calls.c
+ 
+ install:
+-	install librdp.so $(DESTDIR)/librdp.so
++	$(BSD_INSTALL_PROGRAM) librdp.so $(DESTDIR)/librdp.so
+ 
+ installdeb:
+ 	install librdp.so $(DESTDIRDEB)/usr/lib/xrdp/librdp.so
diff --git a/net/xrdp/files/patch-sesman__Makefile b/net/xrdp/files/patch-sesman__Makefile
index d34e34d736f..b6c4b94d419 100644
--- a/net/xrdp/files/patch-sesman__Makefile
+++ b/net/xrdp/files/patch-sesman__Makefile
@@ -1,27 +1,27 @@
---- ./sesman/Makefile.orig	Fri May 26 10:10:14 2006
-+++ ./sesman/Makefile	Sun Apr 29 12:42:48 2007
-@@ -13,7 +13,7 @@
- DOCDIR = /usr/doc/xrdp
+--- sesman/Makefile.orig	Sun May 27 20:18:14 2007
++++ sesman/Makefile	Mon Sep 10 00:58:31 2007
+@@ -17,7 +17,7 @@
+ 	  -DSESMAN_SESSVC_FILE=\"sessvc\"
  
- DEFINES = -DSESMAN_CFG_FILE=\"$(CFGDIR)/sesman.ini\" \
--          -DSESMAN_PID_FILE=\"$(PIDDIR)/sesman.pid\"
-+          -DSESMAN_PID_FILE=\"$(PIDDIR)/xrdp_sesman.pid\"
+ CFLAGS = -Wall -O2 -I../common -I/usr/include/nptl -I./libscp $(DEFINES)
+-LDFLAGS = -L/usr/gnu/lib -L/usr/lib/nptl -L./libscp -Wl,-rpath,. -lpthread -ldl -lscp
++LDFLAGS = -L./libscp -lpthread -lscp -Wl,-rpath=$(DESTDIR)
+ C_OS_FLAGS = $(CFLAGS) -c
+ CC = gcc
  
- CFLAGS = -Wall -O2 -I../common $(DEFINES)
- LDFLAGS = -L /usr/gnu/lib $(DEFINES)
-@@ -46,10 +46,11 @@
- 	rm -f $(SESMANOBJ) verify_user.o verify_user_pam.o verify_user_pam_userpass.o sesman sesrun.o sesrun
+@@ -54,10 +54,11 @@
+ 	make -C libscp clean
  
  install:
 -	install sesman $(DESTDIR)/sesman
--	install sesrun $(DESTDIR)/sesrun
 -	install startwm.sh $(DESTDIR)/startwm.sh
 -	install sesman.ini $(CFGDIR)/sesman.ini
-+	$(BSD_INSTALL_PROGRAM) sesman $(PREFIX)/bin/xrdp_sesman
-+	$(BSD_INSTALL_PROGRAM) sesrun $(PREFIX)/bin/xrdp_sesrun
+-	install sessvc $(DESTDIR)/sessvc
++	$(BSD_INSTALL_PROGRAM) sesman $(PREFIX)/bin/sesman
 +	$(BSD_INSTALL_SCRIPT) startwm.sh $(DESTDIR)/startwm.sh
 +	$(BSD_INSTALL_DATA) sesman.ini $(CFGDIR)/sesman.ini.sample
 +	@test -f $(CFGDIR)/sesman.ini || cp $(CFGDIR)/sesman.ini.sample $(CFGDIR)/sesman.ini
++	$(BSD_INSTALL_PROGRAM) sessvc $(PREFIX)/bin/sessvc
+ 	make -C tools install
+ 	make -C libscp install
  
- installdeb:
- 	install sesman $(DESTDIRDEB)/usr/xrdp/sesman
diff --git a/net/xrdp/files/patch-sesman__libscp__Makefile b/net/xrdp/files/patch-sesman__libscp__Makefile
new file mode 100644
index 00000000000..6d889ac6eda
--- /dev/null
+++ b/net/xrdp/files/patch-sesman__libscp__Makefile
@@ -0,0 +1,11 @@
+--- sesman/libscp/Makefile.orig	Mon Sep 10 00:34:55 2007
++++ sesman/libscp/Makefile	Mon Sep 10 00:43:17 2007
+@@ -30,7 +30,7 @@
+ 	rm -f $(LIBSCPOBJ) $(LIBSCPLNAME)
+ 
+ install:
+-	install $(LIBSCPLNAME) $(DESTDIR)/$(LIBSCPLNAME)
++	$(BSD_INSTALL_PROGRAM) $(LIBSCPLNAME) $(DESTDIR)/$(LIBSCPLNAME)
+ 
+ installdeb:
+ 	install $(LIBSCPLNAME) $(DESTDIRDEB)/usr/lib/xrdp/$(LIBSCPLNAME)
diff --git a/net/xrdp/files/patch-sesman__tools__Makefile b/net/xrdp/files/patch-sesman__tools__Makefile
new file mode 100644
index 00000000000..039ac4ce0fc
--- /dev/null
+++ b/net/xrdp/files/patch-sesman__tools__Makefile
@@ -0,0 +1,13 @@
+--- sesman/tools/Makefile.orig	Mon Sep 10 00:34:55 2007
++++ sesman/tools/Makefile	Mon Sep 10 00:42:29 2007
+@@ -48,8 +48,8 @@
+ 	rm -f *.o sestest sesrun
+ 
+ install:
+-	install sesrun $(DESTDIR)/sesrun
+-	install sestest $(DESTDIR)/sestest
++	$(BSD_INSTALL_PROGRAM) sesrun $(PREFIX)/bin/sesrun
++	$(BSD_INSTALL_PROGRAM) sestest $(PREFIX)/bin/sestest
+ 
+ installdeb:
+ 	install sesrun $(DESTDIRDEB)/usr/lib/xrdp/sesrun
diff --git a/net/xrdp/files/patch-vnc__Makefile b/net/xrdp/files/patch-vnc__Makefile
new file mode 100644
index 00000000000..2fb7aa85a2d
--- /dev/null
+++ b/net/xrdp/files/patch-vnc__Makefile
@@ -0,0 +1,11 @@
+--- vnc/Makefile.orig	Mon Sep 10 00:34:55 2007
++++ vnc/Makefile	Mon Sep 10 00:39:45 2007
+@@ -31,7 +31,7 @@
+ 	$(CC) $(C_OS_FLAGS) ../common/d3des.c
+ 
+ install:
+-	install libvnc.so $(DESTDIR)/libvnc.so
++	$(BSD_INSTALL_PROGRAM) libvnc.so $(DESTDIR)/libvnc.so
+ 
+ installdeb:
+ 	install libvnc.so $(DESTDIRDEB)/usr/lib/xrdp/libvnc.so
diff --git a/net/xrdp/files/patch-xrdp__Makefile b/net/xrdp/files/patch-xrdp__Makefile
index ea34c733bbf..3ad61ef4072 100644
--- a/net/xrdp/files/patch-xrdp__Makefile
+++ b/net/xrdp/files/patch-xrdp__Makefile
@@ -1,12 +1,19 @@
---- ./xrdp/Makefile.orig	Fri Mar  3 22:02:08 2006
-+++ ./xrdp/Makefile	Sun Apr 29 12:42:28 2007
-@@ -24,21 +24,23 @@
+--- xrdp/Makefile.orig	Fri Apr 13 00:50:59 2007
++++ xrdp/Makefile	Mon Sep 10 00:34:07 2007
+@@ -18,27 +18,29 @@
+ CFLAGS = -Wall -O2 -I../common -I../libxrdp $(DEFINES)
+ #CFLAGS += -DXRDP_DEBUG
+ C_OS_FLAGS = $(CFLAGS) -c
+-LDFLAGS = -L/usr/gnu/lib -L../libxrdp -Wl,-rpath,.
++LDFLAGS = -L../libxrdp
+ LIBS = -ldl -lpthread -lxrdp
+ CC = gcc
+ 
  all: xrdp
  
  xrdp: $(XRDPOBJ)
 -	$(CC) $(LDFLAGS) -o xrdp $(XRDPOBJ) $(LIBS)
 +	$(CC) $(LDFLAGS) -o xrdp $(XRDPOBJ) $(LIBS) -Wl,-rpath=$(DESTDIR)
- 	strip xrdp
  
  clean:
  	rm -f $(XRDPOBJ) xrdp
@@ -25,11 +32,11 @@
 +	$(BSD_INSTALL_DATA) cursor0.cur $(DESTDIR)/cursor0.cur
 +	$(BSD_INSTALL_DATA) cursor1.cur $(DESTDIR)/cursor1.cur
 +	$(BSD_INSTALL_DATA) Tahoma-10.fv1 $(DESTDIR)/Tahoma-10.fv1
-+	$(BSD_INSTALL_PROGRAM) xrdp $(PREFIX)/bin/xrdp
 +	$(BSD_INSTALL_DATA) xrdp.ini $(CFGDIR)/xrdp.ini.sample
 +	@test -f $(CFGDIR)/xrdp.ini || cp $(CFGDIR)/xrdp.ini.sample $(CFGDIR)/xrdp.ini
 +	$(BSD_INSTALL_DATA) rsakeys.ini $(CFGDIR)/rsakeys.ini.sample
 +	@test -f $(CFGDIR)/rsakeys.ini || cp $(CFGDIR)/rsakeys.ini.sample $(CFGDIR)/rsakeys.ini
++	$(BSD_INSTALL_PROGRAM) xrdp $(PREFIX)/bin/xrdp
  
  installdeb:
- 	install ad256.bmp $(DESTDIRDEB)/usr/xrdp/ad256.bmp
+ 	install ad256.bmp $(DESTDIRDEB)/usr/lib/xrdp/ad256.bmp
diff --git a/net/xrdp/files/patch-xup__Makefile b/net/xrdp/files/patch-xup__Makefile
new file mode 100644
index 00000000000..8743092847a
--- /dev/null
+++ b/net/xrdp/files/patch-xup__Makefile
@@ -0,0 +1,11 @@
+--- xup/Makefile.orig	Mon Sep 10 00:34:55 2007
++++ xup/Makefile	Mon Sep 10 00:43:56 2007
+@@ -29,7 +29,7 @@
+ 	$(CC) $(C_OS_FLAGS) ../common/os_calls.c
+ 
+ install:
+-	install libxup.so $(DESTDIR)/libxup.so
++	$(BSD_INSTALL_PROGRAM) libxup.so $(DESTDIR)/libxup.so
+ 
+ installdeb:
+ 	install libxup.so $(DESTDIRDEB)/usr/lib/xrdp/libxup.so
diff --git a/net/xrdp/files/pkg-message.in b/net/xrdp/files/pkg-message.in
index 5d7273a2e1d..4be440f94f5 100644
--- a/net/xrdp/files/pkg-message.in
+++ b/net/xrdp/files/pkg-message.in
@@ -2,9 +2,6 @@
 
 XRDP has been installed.
 
-The binaries "sesman" and "sesrun" have been prefixed with "xrdp_" to avoid a
-possible name conflict, as their manual pages, log and pid files.
-
 There is an rc.d script, so the service can be enabled by adding this line
 in /etc/rc.conf:
 
diff --git a/net/xrdp/files/xrdp.in b/net/xrdp/files/xrdp.in
index 3f719ef23f2..660d03d9423 100644
--- a/net/xrdp/files/xrdp.in
+++ b/net/xrdp/files/xrdp.in
@@ -3,14 +3,14 @@
 # $FreeBSD$
 #
 # REQUIRE: DAEMON
-# PROVIDE: xrdp xrdp_sesman
+# PROVIDE: xrdp sesman
 #
 
 . %%RC_SUBR%%
 
 name="xrdp"
 rcvar=`set_rcvar`
-xrdp_daemons="xrdp xrdp_sesman"
+xrdp_daemons="xrdp sesman"
 
 # Read settings and set default values.
 load_rc_config "$name"
@@ -18,9 +18,9 @@ load_rc_config "$name"
 
 # Enable/disable dependent daemon.
 if [ -n "${rcvar}" ] && checkyesno "${rcvar}"; then
-	: ${xrdp_sesman_enable="YES"}
+	: ${sesman_enable="YES"}
 else
-	: ${xrdp_sesman_enable="NO"}
+	: ${sesman_enable="NO"}
 fi
 
 # Commands.
diff --git a/net/xrdp/pkg-plist b/net/xrdp/pkg-plist
index 319cbef3aba..f14dba98c16 100644
--- a/net/xrdp/pkg-plist
+++ b/net/xrdp/pkg-plist
@@ -1,7 +1,9 @@
+bin/sesman
+bin/sessvc
+bin/sesrun
+bin/sestest
 bin/xrdp
-bin/xrdp_sesman
-bin/xrdp_sesrun
-etc/pam.d/xrdp_sesman
+etc/pam.d/sesman
 @unexec if cmp -s %D/etc/xrdp/rsakeys.ini %D/etc/xrdp/rsakeys.ini.sample; then rm -f %D/etc/xrdp/rsakeys.ini; fi
 etc/xrdp/rsakeys.ini.sample
 @exec [ -f %D/etc/xrdp/rsakeys.ini ] || cp %D/etc/xrdp/rsakeys.ini.sample %D/etc/xrdp/rsakeys.ini
@@ -16,6 +18,7 @@ lib/xrdp/ad256.bmp
 lib/xrdp/cursor0.cur
 lib/xrdp/cursor1.cur
 lib/xrdp/librdp.so
+lib/xrdp/libscp.so
 lib/xrdp/libvnc.so
 lib/xrdp/libxrdp.so
 lib/xrdp/libxup.so