Update to 0.6.0.20101009cvs.

PR:		151323
Submitted by:	Koichiro IWAO <meta@club.kyutech.ac.jp>

4 files changed, 28 insertions, 17 deletions

diff --git a/net/xrdp/Makefile b/net/xrdp/Makefile
index 28f76765c00..8e36891c25a 100644
--- a/net/xrdp/Makefile
+++ b/net/xrdp/Makefile
@@ -6,19 +6,25 @@
 #
 
 PORTNAME=	xrdp
-PORTVERSION=	0.5.0.20090811cvs
-PORTREVISION=	1
+PORTVERSION=	0.6.0.20101009cvs
+#PORTREVISION=	0
 CATEGORIES=	net
-MASTER_SITES=	LOCAL/pav
+MASTER_SITES=	http://www.club.kyutech.ac.jp/~meta/distfiles/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An open source Remote Desktop Protocol (RDP) server
 
+USE_XORG=	x11 xfixes
 USE_AUTOTOOLS=	autoconf:268:env automake:111:env libtool:22
 GNU_CONFIGURE=	yes
 USE_RC_SUBR=	xrdp
 
 CONFIGURE_ARGS=	--localstatedir=/var
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+
+INSTALL_SHLIB=	yes
+LDCONFIG_DIRS=	%%PREFIX%%/lib/xrdp
 
 .if defined(WITH_DEBUG)
 CFLAGS+=	-DXRDP_DEBUG
diff --git a/net/xrdp/distinfo b/net/xrdp/distinfo
index fda024692d7..e777068f93f 100644
--- a/net/xrdp/distinfo
+++ b/net/xrdp/distinfo
@@ -1,3 +1,2 @@
-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
+SHA256 (xrdp-0.6.0.20101009cvs.tar.gz) = b4379fc04e36b434116669b35ac0662ddc1451363e78b91f67017603913c9946
+SIZE (xrdp-0.6.0.20101009cvs.tar.gz) = 297394
diff --git a/net/xrdp/files/pkg-message.in b/net/xrdp/files/pkg-message.in
index 4be440f94f5..2b57a8f05a9 100644
--- a/net/xrdp/files/pkg-message.in
+++ b/net/xrdp/files/pkg-message.in
@@ -6,6 +6,7 @@ There is an rc.d script, so the service can be enabled by adding this line
 in /etc/rc.conf:
 
 xrdp_enable="YES"
+xrdpsesman_enable="YES"
 
 Do not forget to edit the configuration files in "%%PREFIX%%/etc/xrdp"
 and the "%%PREFIX%%/lib/startwm.sh" script.
diff --git a/net/xrdp/pkg-plist b/net/xrdp/pkg-plist
index 95808e6d678..4be1f21511d 100644
--- a/net/xrdp/pkg-plist
+++ b/net/xrdp/pkg-plist
@@ -1,21 +1,24 @@
+bin/xrdp-genkeymap
 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/km-0407.ini
+etc/xrdp/km-0409.ini
+etc/xrdp/km-040c.ini
+etc/xrdp/km-0410.ini
+etc/xrdp/km-0419.ini
+etc/xrdp/km-041d.ini
+etc/xrdp/rsakeys.ini
 etc/xrdp/rsakeys.ini.sample
-@exec [ -f %D/etc/xrdp/rsakeys.ini ] || cp %D/etc/xrdp/rsakeys.ini.sample %D/etc/xrdp/rsakeys.ini
-@unexec if cmp -s %D/etc/xrdp/sesman.ini %D/etc/xrdp/sesman.ini.sample; then rm -f %D/etc/xrdp/sesman.ini; fi
+etc/xrdp/sesman.ini
 etc/xrdp/sesman.ini.sample
-@exec [ -f %D/etc/xrdp/sesman.ini ] || cp %D/etc/xrdp/sesman.ini.sample %D/etc/xrdp/sesman.ini
-@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/startwm.sh
+etc/xrdp/startwm.sh.sample
+etc/xrdp/xrdp.ini
 etc/xrdp/xrdp.ini.sample
-@exec [ -f %D/etc/xrdp/xrdp.ini ] || cp %D/etc/xrdp/xrdp.ini.sample %D/etc/xrdp/xrdp.ini
+etc/xrdp/xrdp.sh
 lib/xrdp/libcommon.a
 lib/xrdp/libcommon.la
 lib/xrdp/libcommon.so
@@ -48,11 +51,13 @@ sbin/xrdp
 sbin/xrdp-chansrv
 sbin/xrdp-sesman
 sbin/xrdp-sessvc
+share/xrdp/ad24b.bmp
 share/xrdp/ad256.bmp
 share/xrdp/cursor0.cur
 share/xrdp/cursor1.cur
 share/xrdp/sans-10.fv1
+share/xrdp/xrdp24b.bmp
 share/xrdp/xrdp256.bmp
 @dirrm share/xrdp
 @dirrm lib/xrdp
-@dirrmtry etc/xrdp
+@dirrm etc/xrdp