Index: head/net/xrdp/Makefile =================================================================== --- head/net/xrdp/Makefile (revision 426130) +++ head/net/xrdp/Makefile (revision 426131) @@ -1,79 +1,77 @@ # Created by: alepulver # $FreeBSD$ PORTNAME= xrdp PORTVERSION= 0.6.2 DISTVERSIONPREFIX= v PORTEPOCH= 1 CATEGORIES= net DIST_SUBDIR= ${PORTNAME} MAINTAINER= meta+ports@vmeta.jp COMMENT= Open source Remote Desktop Protocol (RDP) server LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING GNU_CONFIGURE= yes USES= autoreconf:build libtool pkgconfig ssl USE_LDCONFIG= ${PREFIX}/lib/xrdp USE_RC_SUBR= xrdp USE_XORG= x11 xfixes USE_GITHUB= yes GH_ACCOUNT= neutrinolabs CONFIGURE_ARGS= --localstatedir=/var CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib SUB_FILES= pkg-message 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 +OPTIONS_RADIO_XVNC= TIGERVNC TIGHTVNC TRIDIAVNC 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 # Debug DEBUG_CONFIGURE_ENABLE= xrdpdebug # Xvnc -REALVNC_RUN_DEPENDS= Xvnc:net/vnc TIGERVNC_RUN_DEPENDS= Xvnc:net/tigervnc TIGHTVNC_RUN_DEPENDS= Xvnc:net/tightvnc TRIDIAVNC_RUN_DEPENDS= Xvnc:net/tridiavnc # X11rdp X11RDP_RUN_DEPENDS= X11rdp:x11-servers/x11rdp X11RDP_EXTRA_PATCHES= ${FILESDIR}/extra-patch-x11rdp_xrdp.ini # JP106 keymap JP106_PLIST_SUB= JP106="" JP106_PLIST_SUB_OFF= JP106="@comment " .include .if ${PORT_OPTIONS:MJP106} KEYMAP_FILES+= km-0411.ini km-e0010411.ini \ km-e0200411.ini km-e0210411.ini .endif post-patch: .for f in sesman/sesman.ini sesman/startwm.sh xrdp/rsakeys.ini xrdp/xrdp.ini @${MV} ${WRKSRC}/$f ${WRKSRC}/$f.sample .endfor pre-configure: @cd ${WRKSRC} && ./bootstrap post-install: .for f in ${KEYMAP_FILES} ${INSTALL_DATA} ${FILESDIR}/$f ${STAGEDIR}${PREFIX}/etc/xrdp .endfor .include Index: head/net/xrdp-devel/Makefile =================================================================== --- head/net/xrdp-devel/Makefile (revision 426130) +++ head/net/xrdp-devel/Makefile (revision 426131) @@ -1,97 +1,93 @@ # Created by: alepulver # $FreeBSD$ PORTNAME= xrdp PORTVERSION= 0.7.0.b20130912 PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= net PKGNAMESUFFIX= -devel MAINTAINER= meta+ports@vmeta.jp COMMENT= Open source Remote Desktop Protocol (RDP) server LICENSE= GPLv2 USES= autoreconf:build jpeg libtool pkgconfig ssl USE_XORG= x11 xfixes GNU_CONFIGURE= yes USE_RC_SUBR= xrdp USE_LDCONFIG= ${PREFIX}/lib/xrdp USE_GITHUB= yes GH_ACCOUNT= neutrinolabs GH_TAGNAME= 64e2291 CONFIGURE_ARGS= --localstatedir=/var \ --enable-jpeg CPPFLAGS+= -I${LOCALBASE}/include -I${OPENSSLINC} LIBS+= -L${LOCALBASE}/lib -L${OPENSSLLIB} CONFLICTS= xrdp-[0-9]* # xrdp v0.7 is not compatible with current net/freerdp (1.0.2) #BUILD_DEPENDS+= freerdp>=1.0.2:net/freerdp #CONFIGURE_ARGS+= --enable-freerdp1 OPTIONS_DEFINE= DEBUG SOUND OPTIONS_DEFAULT= TIGERVNC JP106 OPTIONS_GROUP= KEYMAP OPTIONS_GROUP_KEYMAP= JP106 OPTIONS_RADIO= XVNC -OPTIONS_RADIO_XVNC= REALVNC TIGERVNC TIGHTVNC TRIDIAVNC -REALVNC_DESC= Use RealVNC +OPTIONS_RADIO_XVNC= TIGERVNC TIGHTVNC TRIDIAVNC TIGERVNC_DESC= Use TigerVNC (recommended) TIGHTVNC_DESC= Use TightVNC TRIDIAVNC_DESC= Use TridiaVNC SOUND_DESC= Enable sound support via pulseaudio (experimental) JP106_DESC= Install Japanese JP106 keymap .include # Which Xserver to use -.if ${PORT_OPTIONS:MREALVNC} -RUN_DEPENDS= Xvnc:net/vnc -.endif .if ${PORT_OPTIONS:MTIGERVNC} RUN_DEPENDS= Xvnc:net/tigervnc .endif .if ${PORT_OPTIONS:MTIGHTVNC} RUN_DEPENDS= Xvnc:net/tightvnc .endif .if ${PORT_OPTIONS:MTRIDIAVNC} RUN_DEPENDS= Xvnc:net/tridiavnc .endif .if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+= --enable-xrdpdebug CFLAGS+= -DXRDP_DEBUG .endif .if ${PORT_OPTIONS:MJP106} KEYMAP_FILES+= km-0411.ini km-e0010411.ini \ km-e0200411.ini km-e0210411.ini PLIST_SUB+= JP106="" .else PLIST_SUB+= JP106="@comment " .endif .if ${PORT_OPTIONS:MSOUND} BUILD_DEPENDS+= ${LOCALBASE}/include/pulse/simple.h:audio/pulseaudio \ ${LOCALBASE}/include/pulse/error.h:audio/pulseaudio CONFIGURE_ARGS+= --enable-simplesound .endif SUB_FILES= pkg-message post-patch: .for f in sesman/sesman.ini sesman/startwm.sh xrdp/rsakeys.ini xrdp/xrdp.ini @${MV} ${WRKSRC}/$f ${WRKSRC}/$f.sample .endfor pre-configure: @cd ${WRKSRC} && ./bootstrap post-install: .for f in ${KEYMAP_FILES} ${INSTALL_DATA} ${FILESDIR}/$f ${STAGEDIR}${PREFIX}/etc/xrdp .endfor .include