Attachment #113895 for bug #155509

Lines 6-15 Link Here

(-)/tmp/xrdp/Makefile (-2 / +28 lines)
6	#	6	#
7		7
8	PORTNAME= xrdp	8	PORTNAME= xrdp
9	PORTVERSION= 0.6.0.20101009cvs	9	PORTVERSION= 0.6.0.20110117cvs
10	PORTREVISION= 1	10	#PORTREVISION= 0
11	CATEGORIES= net	11	CATEGORIES= net
12	MASTER_SITES= http://www.club.kyutech.ac.jp/~meta/distfiles/	12	MASTER_SITES= http://www.club.kyutech.ac.jp/~meta/distfiles/
		13	DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
		14	DIST_SUBDIR?= ${PORTNAME}
13		15
14	MAINTAINER= ports@FreeBSD.org	16	MAINTAINER= ports@FreeBSD.org
15	COMMENT= An open source Remote Desktop Protocol (RDP) server	17	COMMENT= An open source Remote Desktop Protocol (RDP) server
Lines 22-35 Link Here
22	CONFIGURE_ARGS= --localstatedir=/var	24	CONFIGURE_ARGS= --localstatedir=/var
23	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \	25	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
24	LDFLAGS="-L${LOCALBASE}/lib"	26	LDFLAGS="-L${LOCALBASE}/lib"
		27	RUN_DEPENDS+= Xvnc:${PORTSDIR}/net/vnc
		28	LICENSE= GPLv2
		29	LICENSE_FILE= ${WRKSRC}/COPYING
25		30
26	INSTALL_SHLIB= yes	31	INSTALL_SHLIB= yes
27	LDCONFIG_DIRS= %%PREFIX%%/lib/xrdp	32	LDCONFIG_DIRS= %%PREFIX%%/lib/xrdp
28		33
		34	OPTIONS= DEBUG "Build with debugging symbols" off \
		35	JP106 "Install Japanese JP106 Keymap" on
		36
		37	.include <bsd.port.options.mk>
		38
29	.if defined(WITH_DEBUG)	39	.if defined(WITH_DEBUG)
30	CFLAGS+= -DXRDP_DEBUG	40	CFLAGS+= -DXRDP_DEBUG
31	.endif	41	.endif
32		42
		43	.if defined(WITH_JP106)
		44	DISTFILES+= xrdp-jp106km.tar.gz
		45	.endif
		46
33	MAN5= sesman.ini.5 xrdp.ini.5	47	MAN5= sesman.ini.5 xrdp.ini.5
34	MAN8= xrdp-sesman.8 xrdp-sesrun.8 xrdp.8	48	MAN8= xrdp-sesman.8 xrdp-sesrun.8 xrdp.8
35		49
Lines 49-54 Link Here
49	${CP} -p ${PREFIX}/etc/xrdp/$f.sample ${PREFIX}/etc/xrdp/$f ; \	63	${CP} -p ${PREFIX}/etc/xrdp/$f.sample ${PREFIX}/etc/xrdp/$f ; \
50	fi	64	fi
51	.endfor	65	.endfor
		66	.if defined(WITH_JP106)
		67	.for f in km-0411.ini
		68	@if [ ! -f ${PREFIX}/etc/xrdp/$f ]; then \
		69	${CP} -p ${WRKSRC}/../xrdp-jp106km/$f ${PREFIX}/etc/xrdp/$f ; \
		70	fi
		71	.endfor
		72	.for f in km-e0010411.ini km-e0200411.ini km-e0210411.ini
		73	@if [ ! -f ${PREFIX}/etc/xrdp/$f ]; then \
		74	${LN} -s ${PREFIX}/etc/xrdp/km-0411.ini ${PREFIX}/etc/xrdp/$f ; \
		75	fi
		76	.endfor
		77	.endif
52	@${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD}	78	@${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD}
53		79
54	.include <bsd.port.mk>	80	.include <bsd.port.mk>

Lines 1-2 Link Here

(-)/tmp/xrdp/distinfo (-2 / +4 lines)
1	SHA256 (xrdp-0.6.0.20101009cvs.tar.gz) = b4379fc04e36b434116669b35ac0662ddc1451363e78b91f67017603913c9946	1	SHA256 (xrdp/xrdp-0.6.0.20110117cvs.tar.gz) = 06ad5b8afa4841aaa25ef06c7374ae881bd678b8ab5d6230ce0b9f6a463cfa98
2	SIZE (xrdp-0.6.0.20101009cvs.tar.gz) = 297394	2	SIZE (xrdp/xrdp-0.6.0.20110117cvs.tar.gz) = 1998298
		3	SHA256 (xrdp/xrdp-jp106km.tar.gz) = 0de5c5bbdc04e883f59d3c8fec48f5453ac6c9b0bca9f923add267d5638f7bce
		4	SIZE (xrdp/xrdp-jp106km.tar.gz) = 1510

Lines 1-6 Link Here

(-)/tmp/xrdp/files/patch-common__os_calls.c (-3 / +3 lines)
1	--- ./common/os_calls.c.orig Sun Jul 30 01:41:31 2006	1	--- common/os_calls.c.orig 2011-03-12 16:10:35.000000000 +0900
2	+++ ./common/os_calls.c Mon Jun 4 17:37:42 2007	2	+++ common/os_calls.c 2011-03-12 16:34:05.000000000 +0900
3	@@ -1002,6 +1002,8 @@	3	@@ -1987,6 +1987,8 @@
4	g_clearenv(void)	4	g_clearenv(void)
5	{	5	{
6	#if defined(_WIN32)	6	#if defined(_WIN32)

Lines 1-34 Link Here

(-)/tmp/xrdp/files/patch-common__trans.c (-34 lines)
1	--- ./common/trans.c-orig 2010-05-04 09:37:22.000000000 +0200
2	+++ ./common/trans.c 2010-06-15 09:13:05.000000000 +0200
3	@@ -214,6 +214,7 @@
4	/* error */
5	self->status = TRANS_STATUS_DOWN;
6	rv = 1;
7	+ break;
8	}
9	}
10	else if (rcvd == 0)
11	@@ -221,6 +222,7 @@
12	/* error */
13	self->status = TRANS_STATUS_DOWN;
14	rv = 1;
15	+ break;
16	}
17	else
18	{
19	@@ -271,6 +273,7 @@
20	/* error */
21	self->status = TRANS_STATUS_DOWN;
22	rv = 1;
23	+ break;
24	}
25	}
26	else if (sent == 0)
27	@@ -278,6 +281,7 @@
28	/* error */
29	self->status = TRANS_STATUS_DOWN;
30	rv = 1;
31	+ break;
32	}
33	else
34	{

Lines 9-14 Link Here

(-)/tmp/xrdp/files/pkg-message.in (-1 / +1 lines)
9	xrdpsesman_enable="YES"	9	xrdpsesman_enable="YES"
10		10
11	Do not forget to edit the configuration files in "%%PREFIX%%/etc/xrdp"	11	Do not forget to edit the configuration files in "%%PREFIX%%/etc/xrdp"
12	and the "%%PREFIX%%/lib/startwm.sh" script.	12	and the "%%PREFIX%%/etc//xrdp/startwm.sh" script.
13		13
14	==============================================================================	14	==============================================================================

Line 0 Link Here

(-)/tmp/xrdp/files/pkg-message.in~ (+14 lines)
	1	==============================================================================
	2
	3	XRDP has been installed.
	4
	5	There is an rc.d script, so the service can be enabled by adding this line
	6	in /etc/rc.conf:
	7
	8	xrdp_enable="YES"
	9	xrdpsesman_enable="YES"
	10
	11	Do not forget to edit the configuration files in "%%PREFIX%%/etc/xrdp"
	12	and the "%%PREFIX%%/etc/startwm.sh" script.
	13
	14	==============================================================================




etc/xrdp/km-0410.ini
etc/xrdp/km-0419.ini
etc/xrdp/km-041d.ini
etc/xrdp/rsakeys.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

Return to bug 155509

Lines 10-22 Link Here

(-)/tmp/xrdp/pkg-plist (-4 lines)
10	etc/xrdp/km-0410.ini	10	etc/xrdp/km-0410.ini
11	etc/xrdp/km-0419.ini	11	etc/xrdp/km-0419.ini
12	etc/xrdp/km-041d.ini	12	etc/xrdp/km-041d.ini
13	etc/xrdp/rsakeys.ini
14	etc/xrdp/rsakeys.ini.sample	13	etc/xrdp/rsakeys.ini.sample
15	etc/xrdp/sesman.ini
16	etc/xrdp/sesman.ini.sample	14	etc/xrdp/sesman.ini.sample
17	etc/xrdp/startwm.sh
18	etc/xrdp/startwm.sh.sample	15	etc/xrdp/startwm.sh.sample
19	etc/xrdp/xrdp.ini
20	etc/xrdp/xrdp.ini.sample	16	etc/xrdp/xrdp.ini.sample
21	etc/xrdp/xrdp.sh	17	etc/xrdp/xrdp.sh
22	lib/xrdp/libcommon.a	18	lib/xrdp/libcommon.a