Index: head/net/xrdp-devel/Makefile =================================================================== --- head/net/xrdp-devel/Makefile (revision 558734) +++ head/net/xrdp-devel/Makefile (revision 558735) @@ -1,95 +1,97 @@ # Created by: alepulver # $FreeBSD$ PORTNAME= xrdp DISTVERSIONPREFIX= v -DISTVERSION= 0.9.14 +DISTVERSION= 0.9.15.p20201218 PORTEPOCH= 1 CATEGORIES= net PKGNAMESUFFIX= -devel DIST_SUBDIR?= ${PORTNAME} PATCH_SITES= https://github.com/${GH_ACCOUNT}/${PORTNAME}/commit/ MAINTAINER= meta@FreeBSD.org COMMENT= Open source Remote Desktop Protocol (RDP) server (development version) LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${LOCALBASE}/bin/nasm:devel/nasm RUN_DEPENDS= xterm:x11/xterm \ ${LOCALBASE}/lib/xorg/modules/libxorgxrdp.so:x11-drivers/xorgxrdp \ ${LOCALBASE}/lib/pulse-13.0/modules/module-xrdp-sink.so:audio/pulseaudio-module-xrdp USES= autoreconf:build compiler:c11 jpeg localbase libtool pkgconfig \ ssl xorg USE_XORG= ice pixman sm x11 xfixes xrandr USE_LDCONFIG= ${PREFIX}/lib/xrdp USE_GITHUB= yes GNU_CONFIGURE= yes -GH_ACCOUNT= neutrinolabs +#GH_ACCOUNT= neutrinolabs +GH_ACCOUNT= metalefty GH_PROJECT= xrdp librfxcodec:librfxcodec libpainter:libpainter -GH_TAGNAME= v0.1.5:librfxcodec v0.1.1:libpainter +GH_TAGNAME= 70d231b v0.1.5:librfxcodec v0.1.1:libpainter CONFIGURE_ARGS= --localstatedir=/var --enable-strict-locations \ --with-pkgconfigdir=${LOCALBASE}/libdata/pkgconfig \ --enable-pam-config=freebsd \ --enable-jpeg --enable-pixman --enable-rfxcodec --enable-painter LDFLAGS+= -lssl CONFLICTS= xrdp-devel[0-9]* INSTALL_TARGET= install-strip SUB_FILES= pkg-deinstall pkg-install pkg-message SUB_LIST= OPENSSLBASE=${OPENSSLBASE} OPTIONS_DEFINE= DEBUG FUSE IPV6 OPTIONS_DEFAULT= FDKAAC 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 .include .if ${SSL_DEFAULT} == base # As base OpenSSL doesn't install a .pc file, some flags such as -lcrypto # cannot be obtained automatically via pkgconfig. When compiled with base # OpenSSL, it needs to be specified explicitly. CONFIGURE_ENV+= OPENSSL_CFLAGS="-I${OPENSSLINC}" \ OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl" .endif post-extract: # librfxcodec is provided as git submodule @${CP} -r ${WRKSRC_librfxcodec}/ ${WRKSRC}/librfxcodec/ @${CP} -r ${WRKSRC_libpainter}/ ${WRKSRC}/libpainter/ pre-configure: + @${REINPLACE_CMD} -e "s|0.9.14|${DISTVERSION}-${GH_TAGNAME}|" ${WRKSRC}/configure.ac @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./bootstrap post-install: ${INSTALL_SCRIPT} ${FILESDIR}/startwm.sh ${STAGEDIR}${ETCDIR} 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-devel/distinfo =================================================================== --- head/net/xrdp-devel/distinfo (revision 558734) +++ head/net/xrdp-devel/distinfo (revision 558735) @@ -1,7 +1,7 @@ -TIMESTAMP = 1598856500 -SHA256 (xrdp/neutrinolabs-xrdp-v0.9.14_GH0.tar.gz) = f46d90f3272531b9dec032fcf16104ea73d33b17f9720cd3d541203182df2c88 -SIZE (xrdp/neutrinolabs-xrdp-v0.9.14_GH0.tar.gz) = 695062 -SHA256 (xrdp/neutrinolabs-librfxcodec-v0.1.5_GH0.tar.gz) = 5710a65a9f877aca5b5bca9f2fb83b5904b59d465ab5c10bcf4ffc2b3416d0c8 -SIZE (xrdp/neutrinolabs-librfxcodec-v0.1.5_GH0.tar.gz) = 48387 -SHA256 (xrdp/neutrinolabs-libpainter-v0.1.1_GH0.tar.gz) = 6caee8444fbd72677ac5e125c7ac99490688474975451668e751a9d9187ee5e6 -SIZE (xrdp/neutrinolabs-libpainter-v0.1.1_GH0.tar.gz) = 13929 +TIMESTAMP = 1608277642 +SHA256 (xrdp/metalefty-xrdp-v0.9.15.p20201218-70d231b_GH0.tar.gz) = 5e3bb5e5ce1426ecccaeec2f338979c51d6d798100c11a4ee8352f50908e81f8 +SIZE (xrdp/metalefty-xrdp-v0.9.15.p20201218-70d231b_GH0.tar.gz) = 703564 +SHA256 (xrdp/metalefty-librfxcodec-v0.1.5_GH0.tar.gz) = 5710a65a9f877aca5b5bca9f2fb83b5904b59d465ab5c10bcf4ffc2b3416d0c8 +SIZE (xrdp/metalefty-librfxcodec-v0.1.5_GH0.tar.gz) = 48387 +SHA256 (xrdp/metalefty-libpainter-v0.1.1_GH0.tar.gz) = 6caee8444fbd72677ac5e125c7ac99490688474975451668e751a9d9187ee5e6 +SIZE (xrdp/metalefty-libpainter-v0.1.1_GH0.tar.gz) = 13929 Index: head/net/xrdp-devel/files/pkg-deinstall.in =================================================================== --- head/net/xrdp-devel/files/pkg-deinstall.in (nonexistent) +++ head/net/xrdp-devel/files/pkg-deinstall.in (revision 558735) @@ -0,0 +1,34 @@ +#!/bin/sh +# vim:ts=4:sw=4:et + +if [ $# -ne 2 ]; then + echo "usage: $0 distname { DEINSTALL | POST-DEINSTALL }" >&2 + exit 1 +fi + +case $2 in + DEINSTALL) + : nothing to do here + ;; + POST-DEINSTALL) + RSAKEYS=%%PREFIX%%/etc/xrdp/rsakeys.ini + PRIVATEKEY=%%PREFIX%%/etc/xrdp/key.pem + CERTIFICATE=%%PREFIX%%/etc/xrdp/cert.pem + + # if keys are generated during post-install script, remove it + # but do not remove user's keys + for f in $RSAKEYS $PRIVATEKEY $CERTIFICATE; + do + if cmp -s "${f}.sample" "${f}"; then + rm -f "${f}" + fi + rm -f "${f}.sample" + done + ;; + *) + echo "usage: $0 distname { DEINSTALL | POST-DEINSTALL }" >&2 + exit 1 + ;; +esac + +exit 0 Property changes on: head/net/xrdp-devel/files/pkg-deinstall.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property