Index: head/net/xrdp/Makefile =================================================================== --- head/net/xrdp/Makefile (revision 474233) +++ head/net/xrdp/Makefile (revision 474234) @@ -1,101 +1,101 @@ # Created by: alepulver # $FreeBSD$ PORTNAME= xrdp -PORTVERSION= 0.9.6 +PORTVERSION= 0.9.7 DISTVERSIONPREFIX= v PORTEPOCH= 1 CATEGORIES= net DIST_SUBDIR?= ${PORTNAME} MAINTAINER= meta@FreeBSD.org COMMENT= Open source Remote Desktop Protocol (RDP) server LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/COPYING # pulseaudio's configured source is required for audio redirection BUILD_DEPENDS= ${NONEXISTENT}:audio/pulseaudio:configure \ ${LOCALBASE}/bin/nasm:devel/nasm RUN_DEPENDS= ${LOCALBASE}/lib/xorg/modules/libxorgxrdp.so:x11-drivers/xorgxrdp USES= autoreconf:build jpeg localbase libtool pkgconfig ssl USE_XORG= ice pixman sm x11 xfixes xrandr GNU_CONFIGURE= yes USE_LDCONFIG= ${PREFIX}/lib/xrdp USE_GITHUB= yes GH_ACCOUNT= neutrinolabs GH_PROJECT= xrdp librfxcodec:librfxcodec libpainter:libpainter GH_TAGNAME= v0.1.4:librfxcodec v0.1.1:libpainter CONFIGURE_ARGS= --localstatedir=/var --enable-strict-locations \ --with-pkgconfigdir=${LOCALBASE}/libdata/pkgconfig \ --enable-jpeg --enable-pixman --enable-rfxcodec --enable-painter LDFLAGS+= -lssl CONFLICTS= xrdp-devel[0-9]* INSTALL_TARGET= install-strip SUB_FILES= pkg-install pkg-message SUB_LIST= OPENSSLBASE=${OPENSSLBASE} OPTIONS_DEFINE= DEBUG FUSE IPV6 OPTIONS_DEFAULT= FDKAAC MP3LAME OPUS OPTIONS_GROUP= AUDIO_CODEC OPTIONS_GROUP_AUDIO_CODEC= FDKAAC MP3LAME OPUS FDKAAC_DESC= Enable Fraunhofer FDK AAC for audio redirection FUSE_DESC= Enable drive redirection via FUSE (experimental) MP3LAME_DESC= Enable MP3 Lame for audio redirection OPUS_DESC= Enable Opus for audio redirection DEBUG_CONFIGURE_ENABLE= xrdpdebug FDKAAC_CONFIGURE_ENABLE= fdkaac FDKAAC_LIB_DEPENDS= libfdk-aac.so:audio/fdk-aac FUSE_CONFIGURE_ENABLE= fuse FUSE_USES= fuse IPV6_CONFIGURE_ENABLE= ipv6 MP3LAME_CONFIGURE_ENABLE= mp3lame MP3LAME_LIB_DEPENDS= libmp3lame.so:audio/lame OPUS_CONFIGURE_ENABLE= opus OPUS_LIB_DEPENDS= libopus.so:audio/opus # don't forget to increase PORTREVISION after pulseaudio update PULSE_VERSION= ${MAKE} -C ${PORTSDIR}/audio/pulseaudio -VPORTVERSION PULSE_WRKSRC= ${MAKE} -C ${PORTSDIR}/audio/pulseaudio -VWRKSRC post-extract: # librfxcodec is provided as git submodule @${CP} -r ${WRKSRC_librfxcodec}/ ${WRKSRC}/librfxcodec/ @${CP} -r ${WRKSRC_libpainter}/ ${WRKSRC}/libpainter/ post-patch: @${REINPLACE_CMD} \ -e "s|^PULSE_DIR = .*|PULSE_DIR = `${PULSE_WRKSRC}`|" \ -e "s|-Wall -O2|-Wall -O2 -I${LOCALBASE}/include|" \ ${WRKSRC}/sesman/chansrv/pulse/Makefile pre-configure: @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./bootstrap post-build: # build pulseaudio module @${CP} -r "`${PULSE_WRKSRC}`" ${WRKDIR} @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} -C sesman/chansrv/pulse post-install: # install pulseaudio module ${MKDIR} "${STAGEDIR}${PREFIX}/lib/pulse-`${PULSE_VERSION}`/modules/" .for f in module-xrdp-sink.so module-xrdp-source.so ${INSTALL_LIB} -m 0755 ${WRKSRC}/sesman/chansrv/pulse/$f \ "${STAGEDIR}${PREFIX}/lib/pulse-`${PULSE_VERSION}`/modules/" .endfor # substitute pkg-plist not using PLIST_SUB ${REINPLACE_CMD} -e "s|%%PULSE_VERSION%%|`${PULSE_VERSION}`|g" ${TMPPLIST} post-stage: @${RM} ${STAGEDIR}${PREFIX}/etc/xrdp/rsakeys.ini @${RM} ${STAGEDIR}${PREFIX}/etc/xrdp/cert.pem @${RM} ${STAGEDIR}${PREFIX}/etc/xrdp/key.pem .for f in sesman.ini startwm.sh reconnectwm.sh xrdp.ini xrdp_keyboard.ini @${MV} ${STAGEDIR}${PREFIX}/etc/xrdp/$f ${STAGEDIR}${PREFIX}/etc/xrdp/$f.sample .endfor .include Index: head/net/xrdp/distinfo =================================================================== --- head/net/xrdp/distinfo (revision 474233) +++ head/net/xrdp/distinfo (revision 474234) @@ -1,7 +1,7 @@ -TIMESTAMP = 1522053694 -SHA256 (xrdp/neutrinolabs-xrdp-v0.9.6_GH0.tar.gz) = 68361f4e75fd70a85e258af78af244754dc7190092abfdb9c709e20905de260d -SIZE (xrdp/neutrinolabs-xrdp-v0.9.6_GH0.tar.gz) = 1878049 +TIMESTAMP = 1530261600 +SHA256 (xrdp/neutrinolabs-xrdp-v0.9.7_GH0.tar.gz) = 3396479a7b692a0f93bd7951dcfca2c8f033b73bbf55612fb0164ce8a6cef7c2 +SIZE (xrdp/neutrinolabs-xrdp-v0.9.7_GH0.tar.gz) = 665858 SHA256 (xrdp/neutrinolabs-librfxcodec-v0.1.4_GH0.tar.gz) = 8e2d6060aca6d92ebd8b5cd295e9b85b8dd12ec00aacf7e3d351a8dacb56f4f3 SIZE (xrdp/neutrinolabs-librfxcodec-v0.1.4_GH0.tar.gz) = 48379 SHA256 (xrdp/neutrinolabs-libpainter-v0.1.1_GH0.tar.gz) = 6caee8444fbd72677ac5e125c7ac99490688474975451668e751a9d9187ee5e6 SIZE (xrdp/neutrinolabs-libpainter-v0.1.1_GH0.tar.gz) = 13929 Index: head/net/xrdp/pkg-plist =================================================================== --- head/net/xrdp/pkg-plist (revision 474233) +++ head/net/xrdp/pkg-plist (revision 474234) @@ -1,102 +1,103 @@ bin/xrdp-dis bin/xrdp-genkeymap bin/xrdp-keygen bin/xrdp-sesadmin bin/xrdp-sesrun lib/libpainter.a lib/libpainter.so lib/libpainter.so.0 lib/libpainter.so.0.0.0 lib/librfxencode.so lib/librfxencode.so.0.0.0 lib/librfxencode.a lib/librfxencode.so.0 include/painter.h include/rfxcodec_common.h include/rfxcodec_decode.h include/rfxcodec_encode.h include/xrdp_client_info.h include/xrdp_constants.h include/xrdp_rail.h include/xrdp_sockets.h lib/pulse-%%PULSE_VERSION%%/modules/module-xrdp-sink.so lib/pulse-%%PULSE_VERSION%%/modules/module-xrdp-source.so libdata/pkgconfig/libpainter.pc libdata/pkgconfig/rfxcodec.pc libdata/pkgconfig/xrdp.pc 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/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/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/libxrdpapi.so lib/xrdp/libxrdpapi.a lib/xrdp/libxrdpapi.so.0 lib/xrdp/libxrdpapi.so.0.0.0 etc/pam.d/xrdp-sesman etc/rc.d/xrdp +etc/rc.d/xrdp-sesman %%ETCDIR%%/km-00000407.ini %%ETCDIR%%/km-00000409.ini %%ETCDIR%%/km-00010409.ini %%ETCDIR%%/km-0000040a.ini %%ETCDIR%%/km-0000040b.ini %%ETCDIR%%/km-0000040c.ini %%ETCDIR%%/km-00000410.ini %%ETCDIR%%/km-00000411.ini %%ETCDIR%%/km-00000412.ini %%ETCDIR%%/km-00000414.ini %%ETCDIR%%/km-00000415.ini %%ETCDIR%%/km-00000416.ini %%ETCDIR%%/km-00000419.ini %%ETCDIR%%/km-0000041d.ini %%ETCDIR%%/km-00000807.ini %%ETCDIR%%/km-00000809.ini %%ETCDIR%%/km-0000080c.ini %%ETCDIR%%/km-00000813.ini %%ETCDIR%%/km-00000816.ini %%ETCDIR%%/km-0000100c.ini %%ETCDIR%%/pulse/default.pa @postunexec if cmp -s %D/etc/xrdp/sesman.ini.sample %D/etc/xrdp/sesman.ini; then rm -f %D/etc/xrdp/sesman.ini; fi @postunexec if cmp -s %D/etc/xrdp/startwm.sh.sample %D/etc/xrdp/startwm.sh; then rm -f %D/etc/xrdp/startwm.sh; fi @postunexec if cmp -s %D/etc/xrdp/reconnectwm.sh.sample %D/etc/xrdp/reconnectwm.sh; then rm -f %D/etc/xrdp/reconnectwm.sh; fi @postunexec if cmp -s %D/etc/xrdp/xrdp.ini.sample %D/etc/xrdp/xrdp.ini; then rm -f %D/etc/xrdp/xrdp.ini; fi @postunexec if cmp -s %D/etc/xrdp/xrdp_keyboard.ini.sample %D/etc/xrdp/xrdp_keyboard.ini; then rm -f %D/etc/xrdp/xrdp_keyboard.ini; fi @sample %%ETCDIR%%/sesman.ini.sample @sample %%ETCDIR%%/startwm.sh.sample @sample %%ETCDIR%%/reconnectwm.sh.sample @sample %%ETCDIR%%/xrdp.ini.sample @sample %%ETCDIR%%/xrdp_keyboard.ini.sample man/man1/xrdp-dis.1.gz man/man5/sesman.ini.5.gz man/man8/xrdp.8.gz man/man5/xrdp.ini.5.gz man/man8/xrdp-chansrv.8.gz man/man8/xrdp-genkeymap.8.gz man/man8/xrdp-keygen.8.gz man/man8/xrdp-sesadmin.8.gz man/man8/xrdp-sesman.8.gz man/man8/xrdp-sesrun.8.gz sbin/xrdp sbin/xrdp-chansrv sbin/xrdp-sesman %%DATADIR%%/ad24b.bmp %%DATADIR%%/ad256.bmp %%DATADIR%%/cursor0.cur %%DATADIR%%/cursor1.cur %%DATADIR%%/sans-10.fv1 %%DATADIR%%/xrdp24b.bmp %%DATADIR%%/xrdp256.bmp %%DATADIR%%/xrdp_logo.bmp