6 files changed, 52 insertions, 52 deletions

diff --git a/net/xrdp/Makefile b/net/xrdp/Makefile
index c684a3e16107..51487dc73582 100644
--- a/net/xrdp/Makefile
+++ b/net/xrdp/Makefile
@@ -6,10 +6,15 @@
 #
 
 PORTNAME=	xrdp
-PORTVERSION=	0.6.0.20101009cvs
-PORTREVISION=	1
+PORTVERSION=    0.6.0.20110117
 CATEGORIES=	net
-MASTER_SITES=	http://www.club.kyutech.ac.jp/~meta/distfiles/
+MASTER_SITES=	http://www.club.kyutech.ac.jp/~meta/distfiles/ \
+		http://key2.jp/~meta/distfiles/
+DISTNAME=	${PORTNAME}-${PORTVERSION}cvs
+DIST_SUBDIR?=	${PORTNAME}
+
+PATCH_SITES=	http://www.club.kyutech.ac.jp/~meta/patches/xrdp/0.6.0/ \
+		http://key2.jp/~meta/patches/xrdp/0.6.0/
 
 MAINTAINER=	meta@club.kyutech.ac.jp
 COMMENT=	An open source Remote Desktop Protocol (RDP) server
@@ -20,16 +25,35 @@ GNU_CONFIGURE=	yes
 USE_RC_SUBR=	xrdp
 
 CONFIGURE_ARGS=	--localstatedir=/var
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
+CPPFLAGS=	-I${LOCALBASE}/include
+LDFLAGS=		-L${LOCALBASE}/lib
+RUN_DEPENDS+=	Xvnc:${PORTSDIR}/net/vnc
+LICENSE=		GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+USE_LDCONFIG=	%%PREFIX%%/lib/xrdp
+
+OPTIONS=        DEBUG "Build with debugging symbols" off \
+		JP106 "Install Japanese JP106 Keymap" on
 
-INSTALL_SHLIB=	yes
-LDCONFIG_DIRS=	%%PREFIX%%/lib/xrdp
+.include <bsd.port.options.mk>
 
 .if defined(WITH_DEBUG)
 CFLAGS+=	-DXRDP_DEBUG
 .endif
 
+.if defined(WITH_JP106)
+PATCHFILES+=	patch-instfiles__Makefile.am \
+	patch-instfiles__km-0411.ini \
+	patch-instfiles__km-e0010411.ini \
+	patch-instfiles__km-e0200411.ini \
+	patch-instfiles__km-e0210411.ini
+PLIST_SUB+=	JP106=""
+.else
+PLIST_SUB+=	JP106="@comment "
+.endif
+
 MAN5=		sesman.ini.5 xrdp.ini.5
 MAN8=		xrdp-sesman.8 xrdp-sesrun.8 xrdp.8
 
diff --git a/net/xrdp/distinfo b/net/xrdp/distinfo
index e777068f93f1..a08439ea98c1 100644
--- a/net/xrdp/distinfo
+++ b/net/xrdp/distinfo
@@ -1,2 +1,12 @@
-SHA256 (xrdp-0.6.0.20101009cvs.tar.gz) = b4379fc04e36b434116669b35ac0662ddc1451363e78b91f67017603913c9946
-SIZE (xrdp-0.6.0.20101009cvs.tar.gz) = 297394
+SHA256 (xrdp/xrdp-0.6.0.20110117cvs.tar.gz) = 06ad5b8afa4841aaa25ef06c7374ae881bd678b8ab5d6230ce0b9f6a463cfa98
+SIZE (xrdp/xrdp-0.6.0.20110117cvs.tar.gz) = 1998298
+SHA256 (xrdp/patch-instfiles__Makefile.am) = 92e8a1768b63f508bc5b37cdc5723d1e03875af7fbdf064aa86a6b40b1bd2f07
+SIZE (xrdp/patch-instfiles__Makefile.am) = 710
+SHA256 (xrdp/patch-instfiles__km-0411.ini) = 58bcb7f063db4fcde9230be3013d46226b8af5c0060b7faf00250a51aa7da4fd
+SIZE (xrdp/patch-instfiles__km-0411.ini) = 9576
+SHA256 (xrdp/patch-instfiles__km-e0010411.ini) = 201e55ae65c223602d66eb15ac3fd53564dc3f8e856f08183f9cf8f3fc6334c3
+SIZE (xrdp/patch-instfiles__km-e0010411.ini) = 9592
+SHA256 (xrdp/patch-instfiles__km-e0200411.ini) = d6e95d98629bf346173e97ebd9fba7910971a0165fc32c3e3cada3c5a6d01de8
+SIZE (xrdp/patch-instfiles__km-e0200411.ini) = 9592
+SHA256 (xrdp/patch-instfiles__km-e0210411.ini) = f3f29efc3541c08f60edbbb3ecf85da59abe7d745b59a7d5d0340d5940c3e723
+SIZE (xrdp/patch-instfiles__km-e0210411.ini) = 9592
diff --git a/net/xrdp/files/patch-common__os_calls.c b/net/xrdp/files/patch-common__os_calls.c
index 6e0adbdab0ff..d1c16a43d7da 100644
--- a/net/xrdp/files/patch-common__os_calls.c
+++ b/net/xrdp/files/patch-common__os_calls.c
@@ -1,6 +1,6 @@
---- ./common/os_calls.c.orig	Sun Jul 30 01:41:31 2006
-+++ ./common/os_calls.c	Mon Jun  4 17:37:42 2007
-@@ -1002,6 +1002,8 @@
+--- common/os_calls.c.orig	2011-03-12 16:10:35.000000000 +0900
++++ common/os_calls.c	2011-03-12 16:34:05.000000000 +0900
+@@ -1987,6 +1987,8 @@
  g_clearenv(void)
  {
  #if defined(_WIN32)
diff --git a/net/xrdp/files/patch-common__trans.c b/net/xrdp/files/patch-common__trans.c
deleted file mode 100644
index 89cb12b3db9a..000000000000
--- a/net/xrdp/files/patch-common__trans.c
+++ /dev/null
@@ -1,34 +0,0 @@
---- ./common/trans.c-orig	2010-05-04 09:37:22.000000000 +0200
-+++ ./common/trans.c		2010-06-15 09:13:05.000000000 +0200
-@@ -214,6 +214,7 @@
-         /* error */
-         self->status = TRANS_STATUS_DOWN;
-         rv = 1;
-+        break;
-       }
-     }
-     else if (rcvd == 0)
-@@ -221,6 +222,7 @@
-       /* error */
-       self->status = TRANS_STATUS_DOWN;
-       rv = 1;
-+      break;
-     }
-     else
-     {
-@@ -271,6 +273,7 @@
-         /* error */
-         self->status = TRANS_STATUS_DOWN;
-         rv = 1;
-+        break;
-       }
-     }
-     else if (sent == 0)
-@@ -278,6 +281,7 @@
-       /* error */
-       self->status = TRANS_STATUS_DOWN;
-       rv = 1;
-+      break;
-     }
-     else
-     {
diff --git a/net/xrdp/files/pkg-message.in b/net/xrdp/files/pkg-message.in
index 2b57a8f05a90..733b6dbf354a 100644
--- a/net/xrdp/files/pkg-message.in
+++ b/net/xrdp/files/pkg-message.in
@@ -9,6 +9,6 @@ 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.
+and the "%%PREFIX%%/etc/xrdp/startwm.sh" script.
 
 ==============================================================================
diff --git a/net/xrdp/pkg-plist b/net/xrdp/pkg-plist
index 4be1f21511de..f77288e5f72e 100644
--- a/net/xrdp/pkg-plist
+++ b/net/xrdp/pkg-plist
@@ -10,13 +10,13 @@ etc/xrdp/km-040c.ini
 etc/xrdp/km-0410.ini
 etc/xrdp/km-0419.ini
 etc/xrdp/km-041d.ini
-etc/xrdp/rsakeys.ini
+%%JP106%%etc/xrdp/km-0411.ini
+%%JP106%%etc/xrdp/km-e0200411.ini
+%%JP106%%etc/xrdp/km-e0010411.ini
+%%JP106%%etc/xrdp/km-e0210411.ini
 etc/xrdp/rsakeys.ini.sample
-etc/xrdp/sesman.ini
 etc/xrdp/sesman.ini.sample
-etc/xrdp/startwm.sh
 etc/xrdp/startwm.sh.sample
-etc/xrdp/xrdp.ini
 etc/xrdp/xrdp.ini.sample
 etc/xrdp/xrdp.sh
 lib/xrdp/libcommon.a
@@ -60,4 +60,4 @@ share/xrdp/xrdp24b.bmp
 share/xrdp/xrdp256.bmp
 @dirrm share/xrdp
 @dirrm lib/xrdp
-@dirrm etc/xrdp
+@dirrmtry etc/xrdp