- Update to 20090811 cvs snapshot of upcoming 0.5.0

Tested by:	Kouichiro Iwao <meta@club.kyutech.ac.jp>
Feature safe:	yes

15 files changed, 79 insertions, 244 deletions

diff --git a/net/xrdp/Makefile b/net/xrdp/Makefile
index f79f6f5d2785..6794e79c6168 100644
--- a/net/xrdp/Makefile
+++ b/net/xrdp/Makefile
@@ -6,47 +6,50 @@
 #
 
 PORTNAME=	xrdp
-PORTVERSION=	0.4.1
+PORTVERSION=	0.5.0.20090811cvs
 CATEGORIES=	net
-MASTER_SITES=	SF
+MASTER_SITES=	LOCAL/pav
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An open source Remote Desktop Protocol (RDP) server
 
+USE_AUTOTOOLS=	autoconf:262:env automake:110:env libtool:22
+GNU_CONFIGURE=	yes
 USE_RC_SUBR=	xrdp
 
+CONFIGURE_ARGS=	--localstatedir=/var
+
 .if defined(WITH_DEBUG)
 CFLAGS+=	-DXRDP_DEBUG
 .endif
 
 MAN5=		sesman.ini.5 xrdp.ini.5
-MAN8=		sesman.8 sesrun.8 xrdp.8
+MAN8=		xrdp-sesman.8 xrdp-sesrun.8 xrdp.8
 
 SUB_FILES=	pkg-message
 
 post-patch:
-	@${FIND} ${WRKSRC} -type f -name Makefile | \
-		${XARGS} ${REINPLACE_CMD} -e \
-		's|/usr/local/xrdp|${PREFIX}/lib/${PORTNAME}|; \
-		 s|/etc/xrdp|${PREFIX}/etc/${PORTNAME}|; \
-		 s|/usr/local/man|${MANPREFIX}/man|; \
-		 s|/usr/doc/xrdp|${DOCSDIR}|; \
-		 s|CFLAGS =|CFLAGS +=|; s|gcc|${CC}|; s|-ldl||'
-	@${REINPLACE_CMD} -e \
-		's|startwm\.sh|${PREFIX}/lib/${PORTNAME}/&|; \
-		 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
-	@${REINPLACE_CMD} -Ee \
-		's,(xrdp|ad)256\.bmp,${PREFIX}/lib/${PORTNAME}/&,' \
-		${WRKSRC}/xrdp/xrdp_login_wnd.c
-	@${REINPLACE_CMD} -e 's|cursor[01]\.cur|${PREFIX}/lib/${PORTNAME}/&|' \
-		${WRKSRC}/xrdp/xrdp_wm.c
-	@${REINPLACE_CMD} -e 's|/etc/pam\.d/sesman|${PREFIX}&|' \
-		${WRKSRC}/sesman/verify_user_pam.c
+	@${REINPLACE_CMD} -e '/chmod/s|startwm.sh|startwm.sh.sample|' ${WRKSRC}/sesman/Makefile.am
+	@${REINPLACE_CMD} -e '/chmod/s|rsakeys.ini|rsakeys.ini.sample|' ${WRKSRC}/xrdp/Makefile.am
+
+pre-configure:
+	@cd ${WRKSRC} && ./bootstrap
+	@${REINPLACE_CMD} -e 's|sesmansysconfdir)/$$$$f|sesmansysconfdir)/$$$$f.sample|' ${WRKSRC}/sesman/Makefile.in
+	@${REINPLACE_CMD} -e 's|xrdpsysconfdir)/$$$$f|xrdpsysconfdir)/$$$$f.sample|' ${WRKSRC}/xrdp/Makefile.in
 
 post-install:
+	@if [ ! -f ${PREFIX}/etc/xrdp/startwm.sh ]; then \
+		${CP} -p ${PREFIX}/etc/xrdp/startwm.sh.sample ${PREFIX}/etc/xrdp/startwm.sh ; \
+	fi
+	@if [ ! -f ${PREFIX}/etc/xrdp/rsakeys.ini ]; then \
+		${CP} -p ${PREFIX}/etc/xrdp/rsakeys.ini.sample ${PREFIX}/etc/xrdp/rsakeys.ini ; \
+	fi
+	@if [ ! -f ${PREFIX}/etc/xrdp/sesman.ini ]; then \
+		${CP} -p ${PREFIX}/etc/xrdp/sesman.ini.sample ${PREFIX}/etc/xrdp/sesman.ini ; \
+	fi
+	@if [ ! -f ${PREFIX}/etc/xrdp/xrdp.ini ]; then \
+		${CP} -p ${PREFIX}/etc/xrdp/xrdp.ini.sample ${PREFIX}/etc/xrdp/xrdp.ini ; \
+	fi
 	@${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD}
 
 .include <bsd.port.mk>
diff --git a/net/xrdp/distinfo b/net/xrdp/distinfo
index 68e30dcec34f..fda024692d7e 100644
--- a/net/xrdp/distinfo
+++ b/net/xrdp/distinfo
@@ -1,3 +1,3 @@
-MD5 (xrdp-0.4.1.tar.gz) = 86a2afcb8d304d5003ecbbdbf46058c0
-SHA256 (xrdp-0.4.1.tar.gz) = 275cb009cb837c5d59a0d1a2d062d137c8d8ed781cfc699d59ff5452891c18f0
-SIZE (xrdp-0.4.1.tar.gz) = 238850
+MD5 (xrdp-0.5.0.20090811cvs.tar.gz) = 541982ebe6acc8f4b0d342d9fd336768
+SHA256 (xrdp-0.5.0.20090811cvs.tar.gz) = 2ee278110676cd8326ac2ea8d02cc1914ecba742194646568c316d1d38b96191
+SIZE (xrdp-0.5.0.20090811cvs.tar.gz) = 305702
diff --git a/net/xrdp/files/patch-Makefile b/net/xrdp/files/patch-Makefile
deleted file mode 100644
index c41bd6979fbb..000000000000
--- a/net/xrdp/files/patch-Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
---- 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
- MANDIR = /usr/local/man
--DOCDIR = /usr/doc/xrdp
- 
- all: world
- 
-@@ -38,7 +37,6 @@
- 	mkdir -p $(CFGDIR)
- 	mkdir -p $(PIDDIR)
- 	mkdir -p $(MANDIR)
--	mkdir -p $(DOCDIR)
- 	make -C vnc install
- 	make -C libxrdp install
- 	make -C xrdp install
-@@ -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/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; fi
- 
- installdeb:
- 	mkdir -p $(DESTDIRDEB)/usr/lib/xrdp
diff --git a/net/xrdp/files/patch-docs__Makefile b/net/xrdp/files/patch-docs__Makefile
deleted file mode 100644
index a8d224e12ffc..000000000000
--- a/net/xrdp/files/patch-docs__Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
---- ./docs/Makefile.orig	Fri Mar  3 22:02:02 2006
-+++ ./docs/Makefile	Sun Apr 29 12:42:28 2007
-@@ -10,10 +10,8 @@
- world:
- 
- install:
--
--installdeb:
--	install man/sesman.8 $(DESTDIRDEB)/usr/man/man8/sesman.8
--	install man/sesrun.8 $(DESTDIRDEB)/usr/man/man8/sesrun.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/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/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
deleted file mode 100644
index 7cd0d4eb5b2e..000000000000
--- a/net/xrdp/files/patch-libxrdp__Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index ca5d904828e2..000000000000
--- a/net/xrdp/files/patch-rdp__Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index b6c4b94d4193..000000000000
--- a/net/xrdp/files/patch-sesman__Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
---- 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\"
- 
- 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
- 
-@@ -54,10 +54,11 @@
- 	make -C libscp clean
- 
- install:
--	install sesman $(DESTDIR)/sesman
--	install startwm.sh $(DESTDIR)/startwm.sh
--	install sesman.ini $(CFGDIR)/sesman.ini
--	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
- 
diff --git a/net/xrdp/files/patch-sesman__config.c b/net/xrdp/files/patch-sesman__config.c
deleted file mode 100644
index b666830df52e..000000000000
--- a/net/xrdp/files/patch-sesman__config.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- ./sesman/config.c.orig	Thu May 25 17:34:32 2006
-+++ ./sesman/config.c	Sun Apr 29 12:42:28 2007
-@@ -30,6 +30,8 @@
- #include "file.h"
- #include "sesman.h"
- 
-+#include <fcntl.h>
-+
- /******************************************************************************/
- /**
-  *
-@@ -59,7 +61,7 @@
-   struct list* param_n;
-   struct list* param_v;
- 
--  fd = g_file_open(SESMAN_CFG_FILE);
-+  fd = open(SESMAN_CFG_FILE, O_RDONLY);
-   if (-1 == fd)
-   {
-     g_printf("sesman: error reading config: %s\r\n", SESMAN_CFG_FILE);
diff --git a/net/xrdp/files/patch-sesman__libscp__Makefile b/net/xrdp/files/patch-sesman__libscp__Makefile
deleted file mode 100644
index 6d889ac6eda5..000000000000
--- a/net/xrdp/files/patch-sesman__libscp__Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 039ac4ce0fc0..000000000000
--- a/net/xrdp/files/patch-sesman__tools__Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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
deleted file mode 100644
index 2fb7aa85a2d1..000000000000
--- a/net/xrdp/files/patch-vnc__Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 3ad61ef4072c..000000000000
--- a/net/xrdp/files/patch-xrdp__Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
---- 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)
- 
- clean:
- 	rm -f $(XRDPOBJ) xrdp
- 
- install:
--	install ad256.bmp $(DESTDIR)/ad256.bmp
--	install xrdp256.bmp $(DESTDIR)/xrdp256.bmp
--	install cursor0.cur $(DESTDIR)/cursor0.cur
--	install cursor1.cur $(DESTDIR)/cursor1.cur
--	install Tahoma-10.fv1 $(DESTDIR)/Tahoma-10.fv1
--	install xrdp.ini $(CFGDIR)/xrdp.ini
--	install rsakeys.ini $(CFGDIR)/rsakeys.ini
--	install xrdp $(DESTDIR)/xrdp
-+	$(BSD_INSTALL_DATA) ad256.bmp $(DESTDIR)/ad256.bmp
-+	$(BSD_INSTALL_DATA) xrdp256.bmp $(DESTDIR)/xrdp256.bmp
-+	$(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_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/lib/xrdp/ad256.bmp
diff --git a/net/xrdp/files/patch-xup__Makefile b/net/xrdp/files/patch-xup__Makefile
deleted file mode 100644
index 8743092847a4..000000000000
--- a/net/xrdp/files/patch-xup__Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/xrdp.in b/net/xrdp/files/xrdp.in
index 660d03d9423d..698f3d2d448f 100644
--- a/net/xrdp/files/xrdp.in
+++ b/net/xrdp/files/xrdp.in
@@ -10,7 +10,7 @@
 
 name="xrdp"
 rcvar=`set_rcvar`
-xrdp_daemons="xrdp sesman"
+xrdp_daemons="xrdp xrdpsesman"
 
 # Read settings and set default values.
 load_rc_config "$name"
@@ -43,8 +43,13 @@ xrdp_cmd() {
     # Apply to all the daemons.
     for name in ${xrdp_daemons}; do
 	rcvar=$(set_rcvar)
-	command="%%PREFIX%%/bin/${name}"
-	pidfile="/var/run/${name}.pid"
+	if [ "${name}" = "xrdpsesman" ]; then
+		command="%%PREFIX%%/sbin/xrdp-sesman"
+		pidfile="/var/run/xrdp-sesman.pid"
+	else
+		command="%%PREFIX%%/sbin/${name}"
+		pidfile="/var/run/${name}.pid"
+	fi
 
 	run_rc_command "${_rc_prefix}${rc_arg}" ${rc_extra_args}
     done
diff --git a/net/xrdp/pkg-plist b/net/xrdp/pkg-plist
index f14dba98c165..95808e6d6784 100644
--- a/net/xrdp/pkg-plist
+++ b/net/xrdp/pkg-plist
@@ -1,9 +1,12 @@
-bin/sesman
-bin/sessvc
-bin/sesrun
-bin/sestest
-bin/xrdp
-etc/pam.d/sesman
+bin/xrdp-keygen
+bin/xrdp-sesadmin
+bin/xrdp-sesrun
+bin/xrdp-sestest
+etc/pam.d/xrdp-sesman
+etc/xrdp/xrdp.sh
+@unexec if cmp -s %D/etc/xrdp/startwm.sh %D/etc/xrdp/startwm.sh.sample; then rm -f %D/etc/xrdp/startwm.sh; fi
+etc/xrdp/startwm.sh.sample
+@exec [ -f %D/etc/xrdp/startwm.sh ] || cp %D/etc/xrdp/startwm.sh.sample %D/etc/xrdp/startwm.sh
 @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
@@ -13,16 +16,43 @@ etc/xrdp/sesman.ini.sample
 @unexec if cmp -s %D/etc/xrdp/xrdp.ini %D/etc/xrdp/xrdp.ini.sample; then rm -f %D/etc/xrdp/xrdp.ini; fi
 etc/xrdp/xrdp.ini.sample
 @exec [ -f %D/etc/xrdp/xrdp.ini ] || cp %D/etc/xrdp/xrdp.ini.sample %D/etc/xrdp/xrdp.ini
-lib/xrdp/Tahoma-10.fv1
-lib/xrdp/ad256.bmp
-lib/xrdp/cursor0.cur
-lib/xrdp/cursor1.cur
+lib/xrdp/libcommon.a
+lib/xrdp/libcommon.la
+lib/xrdp/libcommon.so
+lib/xrdp/libcommon.so.0
+lib/xrdp/libmc.a
+lib/xrdp/libmc.la
+lib/xrdp/libmc.so
+lib/xrdp/libmc.so.0
+lib/xrdp/librdp.a
+lib/xrdp/librdp.la
 lib/xrdp/librdp.so
+lib/xrdp/librdp.so.0
+lib/xrdp/libscp.a
+lib/xrdp/libscp.la
 lib/xrdp/libscp.so
+lib/xrdp/libscp.so.0
+lib/xrdp/libvnc.a
+lib/xrdp/libvnc.la
 lib/xrdp/libvnc.so
+lib/xrdp/libvnc.so.0
+lib/xrdp/libxrdp.a
+lib/xrdp/libxrdp.la
 lib/xrdp/libxrdp.so
+lib/xrdp/libxrdp.so.0
+lib/xrdp/libxup.a
+lib/xrdp/libxup.la
 lib/xrdp/libxup.so
-lib/xrdp/startwm.sh
-lib/xrdp/xrdp256.bmp
+lib/xrdp/libxup.so.0
+sbin/xrdp
+sbin/xrdp-chansrv
+sbin/xrdp-sesman
+sbin/xrdp-sessvc
+share/xrdp/ad256.bmp
+share/xrdp/cursor0.cur
+share/xrdp/cursor1.cur
+share/xrdp/sans-10.fv1
+share/xrdp/xrdp256.bmp
+@dirrm share/xrdp
 @dirrm lib/xrdp
 @dirrmtry etc/xrdp