Index: head/net/xrdp/Makefile =================================================================== --- head/net/xrdp/Makefile (revision 390665) +++ head/net/xrdp/Makefile (revision 390666) @@ -1,93 +1,81 @@ # Created by: alepulver # $FreeBSD$ PORTNAME= xrdp PORTVERSION= 0.6.1 -PORTREVISION= 6 +DISTVERSIONPREFIX= v +PORTREVISION= 7 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 USE_LDCONFIG= ${PREFIX}/lib/xrdp USE_OPENSSL= yes USE_RC_SUBR= xrdp USE_XORG= x11 xfixes USE_GITHUB= yes GH_ACCOUNT= neutrinolabs -GH_TAGNAME= 5d53758 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_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 - -# Which Xserver to use -.if ${PORT_OPTIONS:MREALVNC} -RUN_DEPENDS= Xvnc:${PORTSDIR}/net/vnc -.endif -.if ${PORT_OPTIONS:MTIGERVNC} -RUN_DEPENDS= Xvnc:${PORTSDIR}/net/tigervnc -.endif -.if ${PORT_OPTIONS:MTIGHTVNC} -RUN_DEPENDS= Xvnc:${PORTSDIR}/net/tightvnc -.endif -.if ${PORT_OPTIONS:MTRIDIAVNC} -RUN_DEPENDS= Xvnc:${PORTSDIR}/net/tridiavnc -.endif +# Debug +DEBUG_CONFIGURE_ENABLE= xrdpdebug +# Xvnc +REALVNC_RUN_DEPENDS= Xvnc:${PORTSDIR}/net/vnc +TIGERVNC_RUN_DEPENDS= Xvnc:${PORTSDIR}/net/tigervnc +TIGHTVNC_RUN_DEPENDS= Xvnc:${PORTSDIR}/net/tightvnc +TRIDIAVNC_RUN_DEPENDS= Xvnc:${PORTSDIR}/net/tridiavnc # 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 +X11RDP_RUN_DEPENDS= X11rdp:${PORTSDIR}/x11-servers/x11rdp +X11RDP_EXTRA_PATCHES= ${FILESDIR}/extra-patch-x11rdp_xrdp.ini +# JP106 keymap +JP106_PLIST_SUB= JP106="" +JP106_PLIST_SUB_OFF= JP106="@comment" -.if ${PORT_OPTIONS:MDEBUG} -CONFIGURE_ARGS+= --enable-xrdpdebug -CFLAGS+= -DXRDP_DEBUG -.endif +.include .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 - -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 Index: head/net/xrdp/distinfo =================================================================== --- head/net/xrdp/distinfo (revision 390665) +++ head/net/xrdp/distinfo (revision 390666) @@ -1,2 +1,2 @@ -SHA256 (neutrinolabs-xrdp-0.6.1-5d53758_GH0.tar.gz) = fd3c9d1c6fb953d71c8184e384f9043039cea514f7791134546fb52444757d5c -SIZE (neutrinolabs-xrdp-0.6.1-5d53758_GH0.tar.gz) = 1559409 +SHA256 (xrdp/neutrinolabs-xrdp-v0.6.1_GH0.tar.gz) = 7b5a91fc5aa5a36bebff2b5ed19854486bf8836b7d01ad7bb00caa4e6b107c5b +SIZE (xrdp/neutrinolabs-xrdp-v0.6.1_GH0.tar.gz) = 1559359 Index: head/net/xrdp/pkg-plist =================================================================== --- head/net/xrdp/pkg-plist (revision 390665) +++ head/net/xrdp/pkg-plist (revision 390666) @@ -1,73 +1,72 @@ -@stopdaemon xrdp bin/xrdp-dis bin/xrdp-genkeymap bin/xrdp-keygen bin/xrdp-sesadmin bin/xrdp-sesrun bin/xrdp-sestest lib/xrdp/libcommon.a lib/xrdp/libcommon.so lib/xrdp/libcommon.so.0 lib/xrdp/libcommon.so.0.0.0 lib/xrdp/libmc.a lib/xrdp/libmc.so lib/xrdp/libmc.so.0 lib/xrdp/libmc.so.0.0.0 lib/xrdp/librdp.a lib/xrdp/librdp.so lib/xrdp/librdp.so.0 lib/xrdp/librdp.so.0.0.0 lib/xrdp/libscp.a lib/xrdp/libscp.so lib/xrdp/libscp.so.0 lib/xrdp/libscp.so.0.0.0 lib/xrdp/libvnc.a lib/xrdp/libvnc.so lib/xrdp/libvnc.so.0 lib/xrdp/libvnc.so.0.0.0 lib/xrdp/libxrdp.a lib/xrdp/libxrdp.so lib/xrdp/libxrdp.so.0 lib/xrdp/libxrdp.so.0.0.0 lib/xrdp/libxup.a lib/xrdp/libxup.so lib/xrdp/libxup.so.0 lib/xrdp/libxup.so.0.0.0 man/man5/sesman.ini.5.gz man/man5/xrdp.ini.5.gz man/man8/xrdp-sesman.8.gz man/man8/xrdp-sesrun.8.gz man/man8/xrdp.8.gz etc/pam.d/xrdp-sesman %%ETCDIR%%/km-0407.ini %%ETCDIR%%/km-0409.ini %%ETCDIR%%/km-040c.ini %%ETCDIR%%/km-0410.ini %%ETCDIR%%/km-0419.ini %%ETCDIR%%/km-041d.ini %%JP106%%%%ETCDIR%%/km-0411.ini %%JP106%%%%ETCDIR%%/km-e0010411.ini %%JP106%%%%ETCDIR%%/km-e0200411.ini %%JP106%%%%ETCDIR%%/km-e0210411.ini @unexec if cmp -s %D/etc/xrdp/rsakeys.ini.sample %D/etc/xrdp/rsakeys.ini; then rm -f %D/etc/xrdp/rsakeys.ini; fi @unexec if cmp -s %D/etc/xrdp/sesman.ini.sample %D/etc/xrdp/sesman.ini; then rm -f %D/etc/xrdp/sesman.ini; fi @unexec if cmp -s %D/etc/xrdp/startwm.sh.sample %D/etc/xrdp/startwm.sh; then rm -f %D/etc/xrdp/startwm.sh; fi @unexec if cmp -s %D/etc/xrdp/xrdp.ini.sample %D/etc/xrdp/xrdp.ini; then rm -f %D/etc/xrdp/xrdp.ini; fi @sample %%ETCDIR%%/rsakeys.ini.sample @sample %%ETCDIR%%/sesman.ini.sample @sample %%ETCDIR%%/startwm.sh.sample @sample %%ETCDIR%%/xrdp.ini.sample @exec [ -f %D/etc/xrdp/sesman.ini ] || cp -p %D/etc/xrdp/sesman.ini.sample %D/etc/xrdp/sesman.ini @exec [ -f %D/etc/xrdp/startwm.sh ] || cp -p %D/etc/xrdp/startwm.sh.sample %D/etc/xrdp/startwm.sh @exec [ -f %D/etc/xrdp/xrdp.ini ] || cp -p %D/etc/xrdp/xrdp.ini.sample %D/etc/xrdp/xrdp.ini sbin/xrdp sbin/xrdp-chansrv sbin/xrdp-sesman sbin/xrdp-sessvc %%DATADIR%%/ad24b.bmp %%DATADIR%%/ad256.bmp %%DATADIR%%/cursor0.cur %%DATADIR%%/cursor1.cur %%DATADIR%%/sans-10.fv1 %%DATADIR%%/xrdp24b.bmp %%DATADIR%%/xrdp256.bmp