Attachment #140214 for bug #186729

View | Details | Raw Unified | Return to bug 186729
Collapse All | Expand All





PORTNAME=	xrdp
PORTVERSION=	0.6.1
PORTREVISION=	3
PORTEPOCH=	1
CATEGORIES=	net
MASTER_SITES=	GH

CONFIGURE_ARGS=	--localstatedir=/var
LDFLAGS+=	-L${LOCALBASE}/lib
CPPFLAGS+=	-I${LOCALBASE}/include
CONFLICTS_INSTALL=	xrdp-devel-[0-9]* x11rdp-devel-[0-9]*

OPTIONS_DEFINE=	DEBUG
OPTIONS_DEFAULT=	JP106 X11RDP
OPTIONS_GROUP=	KEYMAP XSERVER
OPTIONS_GROUP_KEYMAP= JP106
OPTIONS_GROUP_XSERVER= X11RDP
OPTIONS_RADIO=	XVNC
OPTIONS_RADIO_XVNC=	REALVNC TIGERVNC TIGHTVNC TRIDIAVNC
REALVNC_DESC=	Use RealVNC
TIGERVNC_DESC=	Use TigerVNC (recommended)
TIGHTVNC_DESC=	Use TightVNC
TRIDIAVNC_DESC=	Use TridiaVNC
X11RDP_DESC=	Use X11rdp (most recommended)
JP106_DESC=	Install Japanese JP106 keymap

.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MTRIDIAVNC}
RUN_DEPENDS=	Xvnc:${PORTSDIR}/net/tridiavnc
.endif
# X11rdp
.if ${PORT_OPTIONS:MX11RDP} || exists(${LOCALBASE}/bin/X11rdp)
RUN_DEPENDS+=	X11rdp:${PORTSDIR}/x11-servers/x11rdp
EXTRA_PATCHES+=	${FILESDIR}/extra-patch-x11rdp_xrdp.ini
.endif

.if ${PORT_OPTIONS:MDEBUG}
CONFIGURE_ARGS+=	--enable-xrdpdebug




--- xrdp/xrdp.ini.orig	2013-02-01 14:36:13.909344583 +0000
+++ xrdp/xrdp.ini	2013-02-01 14:41:12.679342721 +0000
@@ -17,6 +17,15 @@
 #background=626c72
 
 [xrdp1]
+name=sesman-X11rdp
+lib=libxup.so
+username=ask
+password=ask
+ip=127.0.0.1
+port=-1
+xserverbpp=24
+
+[xrdp2]
 name=sesman-Xvnc
 lib=libvnc.so
 username=ask
@@ -24,7 +33,7 @@
 ip=127.0.0.1
 port=-1
 
-[xrdp2]
+[xrdp3]
 name=console
 lib=libvnc.so
 ip=127.0.0.1
@@ -32,7 +41,7 @@
 username=na
 password=ask
 
-[xrdp3]
+[xrdp4]
 name=vnc-any
 lib=libvnc.so
 ip=ask
@@ -40,7 +49,7 @@
 username=na
 password=ask
 
-[xrdp4]
+[xrdp5]
 name=sesman-any
 lib=libvnc.so
 ip=ask
@@ -48,13 +57,13 @@
 username=ask
 password=ask
 
-[xrdp5]
+[xrdp6]
 name=rdp-any
 lib=librdp.so
 ip=ask
 port=ask3389
 
-[xrdp6]
+[xrdp7]
 name=freerdp-any
 lib=libxrdpfreerdp1.so
 ip=ask
@@ -62,11 +71,4 @@
 username=ask
 password=ask
 
-[xrdp7]
-name=sesman-X11rdp
-lib=libxup.so
-username=ask
-password=ask
-ip=127.0.0.1
-port=-1
-xserverbpp=24
+

Line 0 Link Here

(-)net/xrdp/files/patch-xrdp_xrdp.ini (+11 lines)
	1	--- xrdp/xrdp.ini.orig 2013-09-12 21:36:02.000000000 +0000
	2	+++ xrdp/xrdp.ini 2013-12-19 07:05:11.089270612 +0000
	3	@@ -3,7 +3,7 @@
	4	bitmap_cache=yes
	5	bitmap_compression=yes
	6	port=3389
	7	-crypt_level=low
	8	+crypt_level=high
	9	channel_code=1
	10	max_bpp=24
	11	#black=000000

Return to bug 186729

Lines 3-9 Link Here

(-)net/xrdp/Makefile (-4 / +11 lines)
3		3
4	PORTNAME= xrdp	4	PORTNAME= xrdp
5	PORTVERSION= 0.6.1	5	PORTVERSION= 0.6.1
6	PORTREVISION= 2	6	PORTREVISION= 3
7	PORTEPOCH= 1	7	PORTEPOCH= 1
8	CATEGORIES= net	8	CATEGORIES= net
9	MASTER_SITES= GH	9	MASTER_SITES= GH
Lines 29-46 Link Here
29	CONFIGURE_ARGS= --localstatedir=/var	29	CONFIGURE_ARGS= --localstatedir=/var
30	LDFLAGS+= -L${LOCALBASE}/lib	30	LDFLAGS+= -L${LOCALBASE}/lib
31	CPPFLAGS+= -I${LOCALBASE}/include	31	CPPFLAGS+= -I${LOCALBASE}/include
32	CONFLICTS= xrdp-devel-[0-9]*	32	CONFLICTS_INSTALL= xrdp-devel-[0-9]* x11rdp-devel-[0-9]*
33		33
34	OPTIONS_DEFINE= DEBUG	34	OPTIONS_DEFINE= DEBUG
35	OPTIONS_DEFAULT= JP106 TIGERVNC	35	OPTIONS_DEFAULT= JP106 X11RDP
36	OPTIONS_GROUP= KEYMAP	36	OPTIONS_GROUP= KEYMAP XSERVER
37	OPTIONS_GROUP_KEYMAP= JP106	37	OPTIONS_GROUP_KEYMAP= JP106
		38	OPTIONS_GROUP_XSERVER= X11RDP
38	OPTIONS_RADIO= XVNC	39	OPTIONS_RADIO= XVNC
39	OPTIONS_RADIO_XVNC= REALVNC TIGERVNC TIGHTVNC TRIDIAVNC	40	OPTIONS_RADIO_XVNC= REALVNC TIGERVNC TIGHTVNC TRIDIAVNC
40	REALVNC_DESC= Use RealVNC	41	REALVNC_DESC= Use RealVNC
41	TIGERVNC_DESC= Use TigerVNC (recommended)	42	TIGERVNC_DESC= Use TigerVNC (recommended)
42	TIGHTVNC_DESC= Use TightVNC	43	TIGHTVNC_DESC= Use TightVNC
43	TRIDIAVNC_DESC= Use TridiaVNC	44	TRIDIAVNC_DESC= Use TridiaVNC
		45	X11RDP_DESC= Use X11rdp (most recommended)
44	JP106_DESC= Install Japanese JP106 keymap	46	JP106_DESC= Install Japanese JP106 keymap
45		47
46	.include <bsd.port.options.mk>	48	.include <bsd.port.options.mk>
Lines 58-63 Link Here
58	.if ${PORT_OPTIONS:MTRIDIAVNC}	60	.if ${PORT_OPTIONS:MTRIDIAVNC}
59	RUN_DEPENDS= Xvnc:${PORTSDIR}/net/tridiavnc	61	RUN_DEPENDS= Xvnc:${PORTSDIR}/net/tridiavnc
60	.endif	62	.endif
		63	# X11rdp
		64	.if ${PORT_OPTIONS:MX11RDP} \|\| exists(${LOCALBASE}/bin/X11rdp)
		65	RUN_DEPENDS+= X11rdp:${PORTSDIR}/x11-servers/x11rdp
		66	EXTRA_PATCHES+= ${FILESDIR}/extra-patch-x11rdp_xrdp.ini
		67	.endif
61		68
62	.if ${PORT_OPTIONS:MDEBUG}	69	.if ${PORT_OPTIONS:MDEBUG}
63	CONFIGURE_ARGS+= --enable-xrdpdebug	70	CONFIGURE_ARGS+= --enable-xrdpdebug

Line 0 Link Here

(-)net/xrdp/files/extra-patch-x11rdp_xrdp.ini (+74 lines)
		1	--- xrdp/xrdp.ini.orig 2013-02-01 14:36:13.909344583 +0000
		2	+++ xrdp/xrdp.ini 2013-02-01 14:41:12.679342721 +0000
		3	@@ -17,6 +17,15 @@
		4	#background=626c72
		5
		6	[xrdp1]
		7	+name=sesman-X11rdp
		8	+lib=libxup.so
		9	+username=ask
		10	+password=ask
		11	+ip=127.0.0.1
		12	+port=-1
		13	+xserverbpp=24
		14	+
		15	+[xrdp2]
		16	name=sesman-Xvnc
		17	lib=libvnc.so
		18	username=ask
		19	@@ -24,7 +33,7 @@
		20	ip=127.0.0.1
		21	port=-1
		22
		23	-[xrdp2]
		24	+[xrdp3]
		25	name=console
		26	lib=libvnc.so
		27	ip=127.0.0.1
		28	@@ -32,7 +41,7 @@
		29	username=na
		30	password=ask
		31
		32	-[xrdp3]
		33	+[xrdp4]
		34	name=vnc-any
		35	lib=libvnc.so
		36	ip=ask
		37	@@ -40,7 +49,7 @@
		38	username=na
		39	password=ask
		40
		41	-[xrdp4]
		42	+[xrdp5]
		43	name=sesman-any
		44	lib=libvnc.so
		45	ip=ask
		46	@@ -48,13 +57,13 @@
		47	username=ask
		48	password=ask
		49
		50	-[xrdp5]
		51	+[xrdp6]
		52	name=rdp-any
		53	lib=librdp.so
		54	ip=ask
		55	port=ask3389
		56
		57	-[xrdp6]
		58	+[xrdp7]
		59	name=freerdp-any
		60	lib=libxrdpfreerdp1.so
		61	ip=ask
		62	@@ -62,11 +71,4 @@
		63	username=ask
		64	password=ask
65
66	-[xrdp7]
67	-name=sesman-X11rdp
68	-lib=libxup.so
69	-username=ask
70	-password=ask
71	-ip=127.0.0.1
72	-port=-1
73	-xserverbpp=24
74	+