Date: Mon, 25 Apr 2011 07:36:44 +0900 From: Kouichiro Iwao <meta@club.kyutech.ac.jp> To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org Cc: meta@club.kyutech.ac.jp Subject: Re: ports/155509: Update port: net/xrdp update to current cvs version and JP106 keyboard support improvement Message-ID: <20110424223644.GA2216@club.kyutech.ac.jp> In-Reply-To: <201103130410.p2D4ACQS083365@freefall.freebsd.org> References: <201103130347.p2D3lWMe048595@rose.club.kyutech.ac.jp> <201103130410.p2D4ACQS083365@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--2fHTh5uZTiUOsy+g Content-Type: text/plain; charset=iso-2022-jp Content-Disposition: inline making a binary package with JP106 option didn't work. Fixed the Makefile to behave more properly. -- kiwao <meta@club.kyutech.ac.jp> --2fHTh5uZTiUOsy+g Content-Type: text/x-diff; charset=iso-2022-jp Content-Disposition: attachment; filename="xrdp-0.6.0.20110117cvs_1.patch" diff -ruN --exclude=CVS /usr/ports/net/xrdp/Makefile /tmp/xrdp/Makefile --- /usr/ports/net/xrdp/Makefile 2011-01-27 21:33:54.000000000 +0900 +++ /tmp/xrdp/Makefile 2011-04-25 07:25:29.000000000 +0900 @@ -6,12 +6,16 @@ # PORTNAME= xrdp -PORTVERSION= 0.6.0.20101009cvs -PORTREVISION= 1 +PORTVERSION= 0.6.0.20110117cvs 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/ +DIST_SUBDIR?= ${PORTNAME} -MAINTAINER= ports@FreeBSD.org +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 USE_XORG= x11 xfixes @@ -22,14 +26,35 @@ CONFIGURE_ARGS= --localstatedir=/var CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" +CPPFLAGS= -I${LOCALBASE}/include +LDFLAGS= -L${LOCALBASE}/lib +RUN_DEPENDS+= Xvnc:${PORTSDIR}/net/vnc +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING INSTALL_SHLIB= yes LDCONFIG_DIRS= %%PREFIX%%/lib/xrdp +OPTIONS= DEBUG "Build with debugging symbols" off \ + JP106 "Install Japanese JP106 Keymap" on + +.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 -ruN --exclude=CVS /usr/ports/net/xrdp/distinfo /tmp/xrdp/distinfo --- /usr/ports/net/xrdp/distinfo 2010-11-11 01:29:35.000000000 +0900 +++ /tmp/xrdp/distinfo 2011-04-25 06:50:10.000000000 +0900 @@ -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 -ruN --exclude=CVS /usr/ports/net/xrdp/files/patch-common__os_calls.c /tmp/xrdp/files/patch-common__os_calls.c --- /usr/ports/net/xrdp/files/patch-common__os_calls.c 2007-06-05 09:21:46.000000000 +0900 +++ /tmp/xrdp/files/patch-common__os_calls.c 2011-04-25 06:50:10.000000000 +0900 @@ -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 -ruN --exclude=CVS /usr/ports/net/xrdp/files/patch-common__trans.c /tmp/xrdp/files/patch-common__trans.c --- /usr/ports/net/xrdp/files/patch-common__trans.c 2011-01-27 21:33:55.000000000 +0900 +++ /tmp/xrdp/files/patch-common__trans.c 1970-01-01 09:00:00.000000000 +0900 @@ -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 -ruN --exclude=CVS /usr/ports/net/xrdp/files/pkg-message.in /tmp/xrdp/files/pkg-message.in --- /usr/ports/net/xrdp/files/pkg-message.in 2010-11-11 01:29:36.000000000 +0900 +++ /tmp/xrdp/files/pkg-message.in 2011-04-25 06:50:10.000000000 +0900 @@ -9,6 +9,6 @@ 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 -ruN --exclude=CVS /usr/ports/net/xrdp/pkg-plist /tmp/xrdp/pkg-plist --- /usr/ports/net/xrdp/pkg-plist 2010-11-11 01:29:35.000000000 +0900 +++ /tmp/xrdp/pkg-plist 2011-04-25 06:50:10.000000000 +0900 @@ -10,13 +10,13 @@ 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 --2fHTh5uZTiUOsy+g--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20110424223644.GA2216>