Index: branches/2019Q1/net/freerdp/Makefile
===================================================================
--- branches/2019Q1/net/freerdp/Makefile	(revision 491469)
+++ branches/2019Q1/net/freerdp/Makefile	(revision 491470)
@@ -1,108 +1,108 @@
 # Created by: Alexander Logvinov <avl@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	freerdp
 DISTVERSION=	2.0.0-rc4
 CATEGORIES=	net comms ipv6
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES=	649f49f.patch:-p1 effa8b8.patch:-p1
+PATCHFILES=	649f49f.patch:-p1 effa8b8.patch:-p1 0c83efa.patch:-p1
 
 MAINTAINER=	kevans@FreeBSD.org
 COMMENT=	Free implementation of Remote Desktop Protocol
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libepoll-shim.so:devel/libepoll-shim
 
 USES=		alias cmake compiler:c++11-lib cpe gettext localbase pathfix pkgconfig ssl
 USE_LDCONFIG=	yes
 CPE_VENDOR=	freerdp_project
 
 BROKEN_SSL=	libressl-devel
 BROKEN_SSL_REASON_libressl-devel=	fails to compile: no member named 'alert_dispatch' in 'struct ssl3_state_st'
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	FreeRDP
 GH_PROJECT=	${GH_ACCOUNT}
 
 CMAKE_ARGS+=	-DWITH_LIBSYSTEMD=OFF -DWITH_GSTREAMER_0_10=OFF ${CMAKE_ARGS_${ARCH}}
 
 CMAKE_ARGS_aarch64=	-DWITH_NEON=ON
 CFLAGS_aarch64=		-D__ARM_NEON__=__ARM_NEON # clang
 
 OPTIONS_DEFINE=		ALSA CUPS FFMPEG GSTREAMER ICU KERBEROS MANPAGES \
 			PULSEAUDIO WAYLAND X11
 OPTIONS_DEFAULT=	CUPS GSTREAMER ICU KERBEROS MANPAGES WAYLAND X11
 OPTIONS_SUB=		yes
 
 OPTIONS_DEFINE_armv6=	NEON
 OPTIONS_DEFINE_armv7=	NEON
 OPTIONS_DEFINE_amd64=	SSE
 OPTIONS_DEFINE_i386=	SSE
 OPTIONS_DEFAULT_amd64=	SSE
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CMAKE_BOOL=	WITH_ALSA
 
 CUPS_LIB_DEPENDS=	libcups.so:print/cups
 CUPS_CMAKE_BOOL=	WITH_CUPS
 
 FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
 			libavutil.so:multimedia/ffmpeg
 FFMPEG_CMAKE_BOOL=	WITH_FFMPEG
 
 GSTREAMER_CMAKE_BOOL=	WITH_GSTREAMER_1_0
 GSTREAMER_USE=		gnome=glib20 gstreamer1=yes xorg=x11,xext,xorgproto,xrandr
 GSTREAMER_LIB_DEPENDS=	libgstbase-1.0.so:multimedia/gstreamer1
 
 ICU_LIB_DEPENDS=	libicuuc.so:devel/icu
 ICU_CMAKE_BOOL=		WITH_ICU
 
 KERBEROS_CMAKE_BOOL=	WITH_GSSAPI_HEIMDAL
 
 MANPAGES_BUILD_DEPENDS=	xmlto:textproc/xmlto
 MANPAGES_CMAKE_BOOL=	WITH_MANPAGES
 MANPAGES_CMAKE_OFF=	-DWITH_MANPAGES=OFF
 
 NEON_DESC=		Enable	Media Processing Engine instructions
 NEON_CMAKE_BOOL=	WITH_NEON
 .if ! ${CFLAGS:M-march*}
 NEON_CFLAGS=		-march=armv7-a
 .endif
 
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CMAKE_BOOL=	WITH_PULSE
 
 SSE_CMAKE_BOOL=		WITH_SSE2
 
 WAYLAND_DESC=		Build FreeRDP Wayland client
 WAYLAND_BUILD_DEPENDS=	${LOCALBASE}/include/linux/input.h:devel/evdev-proto
 WAYLAND_LIB_DEPENDS=	libwayland-client.so:graphics/wayland \
 			libwayland-cursor.so:graphics/wayland \
 			libxkbcommon.so:x11/libxkbcommon
 WAYLAND_CMAKE_BOOL=	WITH_WAYLAND
 
 X11_DESC=		Build FreeRDP X11 client
 X11_CMAKE_BOOL=		WITH_X11
 X11_CMAKE_OFF=		-DWITH_XKBFILE=OFF
 X11_USE=		xorg=x11,xcursor,xext,xorgproto,xfixes,xi,xinerama,xkbfile,xrandr,xrender,xv
 
 post-patch:
 	@${REINPLACE_CMD} -e '/CMAKE_INSTALL_RPATH /d' \
 		${WRKSRC}/CMakeLists.txt
 	@${REINPLACE_CMD} -e 's/Linux/Linux|FreeBSD/' \
 		${WRKSRC}/winpr/CMakeLists.txt
 	@${REINPLACE_CMD} -e 's/NetBSD__)/NetBSD__) || defined(__FreeBSD__)/' \
 		${WRKSRC}/winpr/libwinpr/utils/trio/triodef.h
 	@${RM} ${WRKSRC}/cmake/FindOpenSSL.cmake
 	@${REINPLACE_CMD} -e 's|$${CMAKE_INSTALL_LIBDIR}/cmake|$${CMAKE_INSTALL_PREFIX}/share/cmake/Modules|' \
 		${WRKSRC}/client/CMakeLists.txt \
 		${WRKSRC}/winpr/CMakeLists.txt \
 		${WRKSRC}/uwac/CMakeLists.txt \
 		${WRKSRC}/server/CMakeLists.txt \
 		${WRKSRC}/server/shadow/CMakeLists.txt \
 		${WRKSRC}/libfreerdp/CMakeLists.txt
 
 .include <bsd.port.mk>
Index: branches/2019Q1/net/freerdp/distinfo
===================================================================
--- branches/2019Q1/net/freerdp/distinfo	(revision 491469)
+++ branches/2019Q1/net/freerdp/distinfo	(revision 491470)
@@ -1,7 +1,9 @@
-TIMESTAMP = 1545302361
+TIMESTAMP = 1546908117
 SHA256 (FreeRDP-FreeRDP-2.0.0-rc4_GH0.tar.gz) = 3406f3bfab63f81c1533029a5bf73949ff60f22f6e155c5a08005b8b8afe6d49
 SIZE (FreeRDP-FreeRDP-2.0.0-rc4_GH0.tar.gz) = 6615213
-SHA256 (effa8b8.patch) = 2fa4479ff7c0239f279172c08e7b52491d457ab844e6f5a6316c46f0d3afa49c
-SIZE (effa8b8.patch) = 993
 SHA256 (649f49f.patch) = 9f8ef88e12f55fcb02a6a30c7d7fff3ae19894c6d368eebc17e878b81cdaa975
 SIZE (649f49f.patch) = 777
+SHA256 (effa8b8.patch) = 2fa4479ff7c0239f279172c08e7b52491d457ab844e6f5a6316c46f0d3afa49c
+SIZE (effa8b8.patch) = 993
+SHA256 (0c83efa.patch) = fe9b6cabe7e54f6c02bf64e14eeb07d997511c3481e7e592e6526dbc10d337c3
+SIZE (0c83efa.patch) = 1144
Index: branches/2019Q1
===================================================================
--- branches/2019Q1	(revision 491469)
+++ branches/2019Q1	(revision 491470)

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