Index: branches/2019Q2/net/xrdp/Makefile
===================================================================
--- branches/2019Q2/net/xrdp/Makefile	(revision 497799)
+++ branches/2019Q2/net/xrdp/Makefile	(revision 497800)
@@ -1,92 +1,94 @@
 # Created by: alepulver
 # $FreeBSD$
 
 PORTNAME=	xrdp
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.9.9
 PORTEPOCH=	1
 CATEGORIES=	net
 DIST_SUBDIR?=	${PORTNAME}
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${PORTNAME}/commit/
+PATCHFILES=	81703c4.patch:-p1 46b4a9b.patch:-p1 0ed82f71.patch:-p1
 
 MAINTAINER=	meta@FreeBSD.org
 COMMENT=	Open source Remote Desktop Protocol (RDP) server
 
 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-12.2/modules/module-xrdp-sink.so:audio/pulseaudio-module-xrdp
 
 USES=		autoreconf:build jpeg localbase libtool pkgconfig ssl
 USE_XORG=	ice pixman sm x11 xfixes xrandr
 USE_LDCONFIG=	${PREFIX}/lib/xrdp
 USE_GITHUB=	yes
 
 GNU_CONFIGURE=	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-deinstall 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
 
 .include <bsd.port.pre.mk>
 
 .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:
 	@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 <bsd.port.post.mk>
Index: branches/2019Q2/net/xrdp/distinfo
===================================================================
--- branches/2019Q2/net/xrdp/distinfo	(revision 497799)
+++ branches/2019Q2/net/xrdp/distinfo	(revision 497800)
@@ -1,7 +1,13 @@
-TIMESTAMP = 1545713834
+TIMESTAMP = 1554341138
 SHA256 (xrdp/neutrinolabs-xrdp-v0.9.9_GH0.tar.gz) = 80da5f76b57e816f7536fd79e391581bb534dc97fca900840a81fb7db1d473f0
 SIZE (xrdp/neutrinolabs-xrdp-v0.9.9_GH0.tar.gz) = 661707
 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
+SHA256 (xrdp/81703c4.patch) = e70ff288d3f1c747deddf5da6912be465962f49810f926af7bf6853fb6129542
+SIZE (xrdp/81703c4.patch) = 2753
+SHA256 (xrdp/46b4a9b.patch) = f603c92b9ebf44affbcd523786dfe02d95cf00ae8ea531988c54159bbc87e30e
+SIZE (xrdp/46b4a9b.patch) = 1322
+SHA256 (xrdp/0ed82f71.patch) = eb239fa4a09db6c5e7cb42673434a9ca0d5c502e8c4916ffe1946e50130e457f
+SIZE (xrdp/0ed82f71.patch) = 2784
Index: branches/2019Q2
===================================================================
--- branches/2019Q2	(revision 497799)
+++ branches/2019Q2	(revision 497800)

Property changes on: branches/2019Q2
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r497782