Index: head/net/xrdp/Makefile =================================================================== --- head/net/xrdp/Makefile (revision 331262) +++ head/net/xrdp/Makefile (revision 331263) @@ -1,100 +1,99 @@ # Created by: alepulver # $FreeBSD$ PORTNAME= xrdp -PORTVERSION= 0.6.0 -PORTREVISION= 4 +PORTVERSION= 0.6.1 +PORTREVISION= 0 PORTEPOCH= 1 CATEGORIES= net -MASTER_SITES= SF/xrdp/xrdp/${PORTVERSION} -DISTNAME= ${PORTNAME}-v${PORTVERSION} +MASTER_SITES= GH DIST_SUBDIR?= ${PORTNAME} PATCH_SITES= http://www.club.kyutech.ac.jp/~meta/patches/xrdp/0.6.0/ \ http://key2.jp/~meta/patches/xrdp/0.6.0/ MAINTAINER= meta+ports@vmeta.jp -COMMENT= An open source Remote Desktop Protocol (RDP) server +COMMENT= Open source Remote Desktop Protocol (RDP) server LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING USES= pkgconfig USE_XORG= x11 xfixes USE_AUTOTOOLS= autoconf:env automake:env libtool GNU_CONFIGURE= yes USE_RC_SUBR= xrdp +USE_GITHUB= yes +GH_ACCOUNT= FreeRDP +GH_PROJECT= xrdp +GH_COMMIT= 5d53758 +GH_TAGNAME= ${GH_COMMIT} CONFIGURE_ARGS= --localstatedir=/var --enable-freerdp1 LDFLAGS+= -L${LOCALBASE}/lib CPPFLAGS+= -I${LOCALBASE}/include CONFLICTS= xrdp-devel-[0-9]* BUILD_DEPENDS+= freerdp>=1.0.2:${PORTSDIR}/net/freerdp -USE_LDCONFIG= ${PREFIX}/lib/xrdp +USE_LDCONFIG= ${STAGEDIR}${PREFIX}/lib/xrdp OPTIONS_DEFINE= DEBUG JP106 OPTIONS_DEFAULT= JP106 TIGERVNC 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 JP106_DESC= Install Japanese JP106 keymap -NO_STAGE= yes .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 .if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+= --enable-xrdpdebug CFLAGS+= -DXRDP_DEBUG .endif .if ${PORT_OPTIONS:MJP106} PATCHFILES+= patch-instfiles__Makefile.am \ patch-instfiles__km-0411.ini \ patch-instfiles__km-e0010411.ini \ patch-instfiles__km-e0200411.ini \ patch-instfiles__km-e0210411.ini PLIST_SUB+= JP106="" .else PLIST_SUB+= JP106="@comment " .endif -MAN5= sesman.ini.5 xrdp.ini.5 -MAN8= xrdp-sesman.8 xrdp-sesrun.8 xrdp.8 - 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 sesman.ini startwm.sh xrdp.ini - @if [ ! -f ${PREFIX}/etc/xrdp/$f ]; then \ - ${CP} -p ${PREFIX}/etc/xrdp/$f.sample ${PREFIX}/etc/xrdp/$f ; \ + @if [ ! -f ${STAGEDIR}${PREFIX}/etc/xrdp/$f ]; then \ + ${CP} -p ${STAGEDIR}${PREFIX}/etc/xrdp/$f.sample ${STAGEDIR}${PREFIX}/etc/xrdp/$f ; \ fi .endfor - @${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD} .include Index: head/net/xrdp/distinfo =================================================================== --- head/net/xrdp/distinfo (revision 331262) +++ head/net/xrdp/distinfo (revision 331263) @@ -1,12 +1,12 @@ -SHA256 (xrdp/xrdp-v0.6.0.tar.gz) = 8b20fe56d935252981d73ac3b70b9b1654a83939824d9962beebb1586e429690 -SIZE (xrdp/xrdp-v0.6.0.tar.gz) = 322104 +SHA256 (xrdp/xrdp-0.6.1.tar.gz) = ef9b223cf8a114c05d85f352bbc842468028fed33842698ba09e2bc86c21bcd0 +SIZE (xrdp/xrdp-0.6.1.tar.gz) = 1559492 SHA256 (xrdp/patch-instfiles__Makefile.am) = 92e8a1768b63f508bc5b37cdc5723d1e03875af7fbdf064aa86a6b40b1bd2f07 SIZE (xrdp/patch-instfiles__Makefile.am) = 710 SHA256 (xrdp/patch-instfiles__km-0411.ini) = 58bcb7f063db4fcde9230be3013d46226b8af5c0060b7faf00250a51aa7da4fd SIZE (xrdp/patch-instfiles__km-0411.ini) = 9576 SHA256 (xrdp/patch-instfiles__km-e0010411.ini) = 201e55ae65c223602d66eb15ac3fd53564dc3f8e856f08183f9cf8f3fc6334c3 SIZE (xrdp/patch-instfiles__km-e0010411.ini) = 9592 SHA256 (xrdp/patch-instfiles__km-e0200411.ini) = d6e95d98629bf346173e97ebd9fba7910971a0165fc32c3e3cada3c5a6d01de8 SIZE (xrdp/patch-instfiles__km-e0200411.ini) = 9592 SHA256 (xrdp/patch-instfiles__km-e0210411.ini) = f3f29efc3541c08f60edbbb3ecf85da59abe7d745b59a7d5d0340d5940c3e723 SIZE (xrdp/patch-instfiles__km-e0210411.ini) = 9592 Index: head/net/xrdp/pkg-plist =================================================================== --- head/net/xrdp/pkg-plist (revision 331262) +++ head/net/xrdp/pkg-plist (revision 331263) @@ -1,76 +1,81 @@ @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.la lib/xrdp/libcommon.so lib/xrdp/libcommon.so.0 lib/xrdp/libmc.a lib/xrdp/libmc.la lib/xrdp/libmc.so lib/xrdp/libmc.so.0 lib/xrdp/librdp.a lib/xrdp/librdp.la lib/xrdp/librdp.so lib/xrdp/librdp.so.0 lib/xrdp/libscp.a lib/xrdp/libscp.la lib/xrdp/libscp.so lib/xrdp/libscp.so.0 lib/xrdp/libvnc.a lib/xrdp/libvnc.la lib/xrdp/libvnc.so lib/xrdp/libvnc.so.0 lib/xrdp/libxrdp.a lib/xrdp/libxrdp.la lib/xrdp/libxrdp.so lib/xrdp/libxrdp.so.0 lib/xrdp/libxup.a lib/xrdp/libxup.la lib/xrdp/libxup.so lib/xrdp/libxup.so.0 lib/xrdp/libxrdpfreerdp1.la lib/xrdp/libxrdpfreerdp1.a lib/xrdp/libxrdpfreerdp1.so lib/xrdp/libxrdpfreerdp1.so.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 etc/xrdp/km-0407.ini etc/xrdp/km-0409.ini etc/xrdp/km-040c.ini etc/xrdp/km-0410.ini etc/xrdp/km-0419.ini etc/xrdp/km-041d.ini %%JP106%%etc/xrdp/km-0411.ini %%JP106%%etc/xrdp/km-e0200411.ini %%JP106%%etc/xrdp/km-e0010411.ini %%JP106%%etc/xrdp/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 etc/xrdp/rsakeys.ini.sample etc/xrdp/sesman.ini.sample etc/xrdp/startwm.sh.sample etc/xrdp/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 etc/xrdp/xrdp.sh sbin/xrdp sbin/xrdp-chansrv sbin/xrdp-sesman sbin/xrdp-sessvc share/xrdp/ad24b.bmp share/xrdp/ad256.bmp share/xrdp/cursor0.cur share/xrdp/cursor1.cur share/xrdp/sans-10.fv1 share/xrdp/xrdp24b.bmp share/xrdp/xrdp256.bmp @dirrm share/xrdp @dirrm lib/xrdp @dirrmtry etc/xrdp