Index: Makefile
===================================================================
--- Makefile	(revision 427270)
+++ Makefile	(working copy)
@@ -1,9 +1,7 @@
-# Created by: Alexander Logvinov <avl@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	freerdp
-PORTVERSION=	1.2.0
-PORTREVISION=	7
+PORTVERSION=	2.0.0.g2016.11.24
 CATEGORIES=	net comms ipv6
 
 MAINTAINER=	bsdports@kyle-evans.net
@@ -12,71 +10,77 @@
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USE_LDCONFIG=	yes
-USES=		alias cmake:outsource cpe execinfo pkgconfig compiler:c++11-lib ssl
 USE_GITHUB=	yes
 GH_ACCOUNT=	FreeRDP
 GH_PROJECT=	${GH_ACCOUNT}
-GH_TAGNAME=	f5ff6e1
+GH_TAGNAME=	2a6dbab
 
+USES=		alias cmake:outsource compiler:c++11-lib cpe execinfo gettext localbase pathfix pkgconfig ssl
+USE_LDCONFIG=	yes
 CPE_VENDOR=	freerdp_project
 
-LDFLAGS+=	-L${LOCALBASE}/lib
-CFLAGS+=	-I${WRKSRC}/include -I${WRKSRC}/winpr/include -I${LOCALBASE}/include
+CMAKE_ARGS+=	-DWITH_LIBSYSTEMD=OFF -DWITH_WAYLAND=OFF -DWITH_GSTREAMER_0_10=OFF ${CMAKE_ARGS_${ARCH}}
 
-OPTIONS_DEFINE=		ALSA CUPS DIRECTFB FFMPEG GSTREAMER PULSEAUDIO SSE X11
+OPTIONS_DEFINE=		ALSA CUPS FFMPEG GSTREAMER PULSEAUDIO SSE X11
 OPTIONS_DEFAULT=	CUPS GSTREAMER X11
 OPTIONS_SUB=		yes
 
+OPTIONS_DEFINE_armv6=	NEON
+
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
-ALSA_CMAKE_ON=		-DWITH_ALSA=ON
-ALSA_CMAKE_OFF=		-DWITH_ALSA=OFF
+ALSA_CMAKE_BOOL=	WITH_ALSA
 
 CUPS_LIB_DEPENDS=	libcups.so:print/cups
-CUPS_CMAKE_ON=		-DWITH_CUPS=ON
-CUPS_CMAKE_OFF=		-DWITH_CUPS=OFF
+CUPS_CMAKE_BOOL=	WITH_CUPS
 
-# outdated and unmaintained upstream
-DIRECTFB_DESC=		Build FreeRDP DirectFB client (outdated)
-DIRECTFB_LIB_DEPENDS=	libdirectfb.so:devel/directfb
-DIRECTFB_CMAKE_ON=	-DWITH_DIRECTFB=ON
-DIRECTFB_CMAKE_OFF=	-DWITH_DIRECTFB=OFF
-# currently DirectFB option fails with clang
-DIRECTFB_USE=		gcc=yes
-
 FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
 			libavutil.so:multimedia/ffmpeg
-FFMPEG_CMAKE_ON=	-DWITH_FFMPEG=ON
-FFMPEG_CMAKE_OFF=	-DWITH_FFMPEG=OFF
+FFMPEG_CMAKE_BOOL=	WITH_FFMPEG
 
-GSTREAMER_CMAKE_ON=	-DWITH_GSTREAMER_1_0=ON -DWITH_GSTREAMER_0_10=OFF
-GSTREAMER_CMAKE_OFF=	-DWITH_GSTREAMER_1_0=OFF -DWITH_GSTREAMER_0_10=OFF
-GSTREAMER_USE=		gstreamer1=yes xorg=x11,xextproto,xext,xrandr
+GSTREAMER_CMAKE_BOOL=	WITH_GSTREAMER_1_0
+GSTREAMER_USE=		gnome=glib20 gstreamer1=yes xorg=x11,xextproto,xext,xrandr
+GSTREAMER_LIB_DEPENDS=	libgstbase-1.0.so:multimedia/gstreamer1
 
+NEON_DESC=		Enable	Media Processing Engine instructions
+NEON_CMAKE_BOOL=	WITH_NEON
+CMAKE_ARGS_aarch64=	-DWITH_NEON=ON
+CFLAGS_aarch=		-D__ARM_NEON__=__ARM_NEON # clang
+.if ! ${CFLAGS:M-march*}
+NEON_CFLAGS=		-march=armv7-a
+.endif
+
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
-PULSEAUDIO_CMAKE_ON=	-DWITH_PULSE=ON
-PULSEAUDIO_CMAKE_OFF=	-DWITH_PULSE=OFF
+PULSEAUDIO_CMAKE_BOOL=	WITH_PULSE
 
-SSE_CMAKE_ON=		-DWITH_SSE2=ON
-SSE_CMAKE_OFF=		-DWITH_SSE2=OFF
+SSE_CMAKE_BOOL=		WITH_SSE2
 
 X11_DESC=		Build FreeRDP X11 client
 X11_BUILD_DEPENDS=	xmlto:textproc/xmlto
-X11_CMAKE_ON=		-DWITH_X11=ON
-X11_CMAKE_OFF=		-DWITH_X11=OFF -DWITH_XKBFILE=OFF
-X11_USE=		xorg=x11,xkbfile,xcursor,xextproto,xv,xinerama,xext \
-			xcursor,xrandr,xi,xfixes,xrender
+X11_CMAKE_ON=		-DWITH_XKBDFILE=OFF
+X11_CMAKE_BOOL=		WITH_X11
+X11_USE=		xorg=x11,xkbfile,xcursor,xextproto,xv,xinerama,xext,xrandr,xi,xfixes,xrender
 
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
 
-post-extract:
-	${REINPLACE_CMD} -e 's|$${CMAKE_INSTALL_LIBDIR}/pkgconfig|libdata/pkgconfig|' \
-		-e '/CMAKE_INSTALL_RPATH /d' \
+.if ${OPSYS} == "FreeBSD" && ${ARCH} == "armv6"
+.if ${OSVERSION} < 1100500 || \
+	(${OSVERSION} >= 1100500 && ${OSVERSION} < 1100504) || \
+	(${OSVERSION} >= 1200000 && ${OSVERSION} < 1200008)
+BROKEN=	Fails to build on ARMv6 (libm bug). See: r305380 (HEAD), r305971 (stable/11) [\#199422, \#211965] \
+	Please update to a later (fixed) version.
+.endif
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e '/CMAKE_INSTALL_RPATH /d' \
 		${WRKSRC}/CMakeLists.txt
-	${REINPLACE_CMD} -e 's|share/man/man1|man/man1|' \
+	@${REINPLACE_CMD} -e 's/OPENBSD/BSD/' \
+		${WRKSRC}/winpr/CMakeLists.txt \
 		${WRKSRC}/client/X11/CMakeLists.txt
-	${REINPLACE_CMD} -e 's/NetBSD__)/NetBSD__) || defined(__FreeBSD__)/' \
+	@${REINPLACE_CMD} -e 's/NetBSD__)/NetBSD__) || defined(__FreeBSD__)/' \
 		${WRKSRC}/winpr/libwinpr/utils/trio/triodef.h
-	${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|' \
+	@${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|' \
 		${WRKSRC}/channels/drive/client/statvfs.c
-.include <bsd.port.mk>
+	@${RM} ${WRKSRC}/cmake/FindOpenSSL.cmake
+
+.include <bsd.port.post.mk>