diff options
author | swills <swills@FreeBSD.org> | 2014-02-15 02:57:15 +0800 |
---|---|---|
committer | swills <swills@FreeBSD.org> | 2014-02-15 02:57:15 +0800 |
commit | 578d549a5fc65aa2b6ae9f0823964ce0c34b9a4f (patch) | |
tree | 3fa43d36e886ef91b89a7d3ded9cad9a32f7d1ec /net/xrdp/Makefile | |
parent | 0f7054fbc3d4c6db10e7f9a9faf9d38e71adbe57 (diff) | |
download | freebsd-ports-graphics-578d549a5fc65aa2b6ae9f0823964ce0c34b9a4f.tar.gz freebsd-ports-graphics-578d549a5fc65aa2b6ae9f0823964ce0c34b9a4f.tar.zst freebsd-ports-graphics-578d549a5fc65aa2b6ae9f0823964ce0c34b9a4f.zip |
- Add x11rdp support and enable by default
- Enhance default encryption level (backport from upstream [1])
- Bump PORTREVISION for package change
PR: ports/186729
Submitted by: Koichiro IWAO <meta+ports@vmeta.jp> (maintainer)
Diffstat (limited to 'net/xrdp/Makefile')
-rw-r--r-- | net/xrdp/Makefile | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/net/xrdp/Makefile b/net/xrdp/Makefile index 277e7c4c8fd..2f0a15509a6 100644 --- a/net/xrdp/Makefile +++ b/net/xrdp/Makefile @@ -3,7 +3,7 @@ PORTNAME= xrdp PORTVERSION= 0.6.1 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= net MASTER_SITES= GH @@ -29,18 +29,20 @@ GH_TAGNAME= ${GH_COMMIT} CONFIGURE_ARGS= --localstatedir=/var LDFLAGS+= -L${LOCALBASE}/lib CPPFLAGS+= -I${LOCALBASE}/include -CONFLICTS= xrdp-devel-[0-9]* +CONFLICTS_INSTALL= xrdp-devel-[0-9]* x11rdp-devel-[0-9]* OPTIONS_DEFINE= DEBUG -OPTIONS_DEFAULT= JP106 TIGERVNC -OPTIONS_GROUP= KEYMAP +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> @@ -58,6 +60,11 @@ RUN_DEPENDS= Xvnc:${PORTSDIR}/net/tightvnc .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 |