net/freerdp: Update to 2.0.0 pre-release (GitHub as of 2016.11.24)

- This update brings in the latest 2 years of FreeRDP project work,
  which has had a long time between tagging releases.
- Remove DIRECTFB option, as it no longer compiles, and gets little
  upstream maintenance
- Use NEON on aarch64, and optionally on armv6
- Mark as broken on armv6 on FreeBSD 11.0-RELEASE and early versions
  of 12.0-CURRENT
- Fix issue with X11_USE=xorg= being truncated due to whitespace as it
  wrapped over multiple lines
- Move installed *.cmake files to correct location for modules

net/freerdp1:
- create new port based on previous net/freerdp 1.2.0, as it is required
  by net/guacamole-server

net/vinagre:
- patch to work with the new version of net/freerdp 2.0.0

net/guacamole-server:
- patch to work with net/freerdp1

PR:		212004
PR:		214956
Submitted by:	Kyle Evans (maintainer)
Reported by:	John Hein <z7dr6ut7gs@snkmail.com>
Reviewed by:	Mikael Urankar <mikael.urankar@gmail.com>
Reviewed by:	Ting-Wei Lan <lantw44@gmail.com>
Reviewed by:	Antenore Gatta <antenore@simbiosi.org>
Reviewed by:	amdmi3
Approved by:	adamw (mentor)
Differential Revision:	https://reviews.freebsd.org/D8712

2 files changed, 67 insertions, 1 deletions

diff --git a/net/guacamole-server/Makefile b/net/guacamole-server/Makefile
index a2cca481e44c..65708ac1d13a 100644
--- a/net/guacamole-server/Makefile
+++ b/net/guacamole-server/Makefile
@@ -40,7 +40,7 @@ OPTIONS_DEFAULT=	RDP SSH VNC VORBIS PULSEAUDIO WEBP
 OPTIONS_SUB=		yes
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_DESC?=	VNC audio support (Experimental)
-RDP_LIB_DEPENDS=	libfreerdp.so:net/freerdp
+RDP_LIB_DEPENDS=	libfreerdp1.so:net/freerdp1
 RDP_DESC?=		RDP Protocal Support
 SSH_LIB_DEPENDS=	libssh2.so:security/libssh2
 SSH_USE=		GNOME=pango
diff --git a/net/guacamole-server/files/patch-configure.ac b/net/guacamole-server/files/patch-configure.ac
new file mode 100644
index 000000000000..bcb011012165
--- /dev/null
+++ b/net/guacamole-server/files/patch-configure.ac
@@ -0,0 +1,66 @@
+--- configure.ac.orig	2016-12-04 15:16:36 UTC
++++ configure.ac
+@@ -389,13 +389,13 @@ then
+     event_interface=unknown
+ 
+     # libfreerdp-core / libfreerdp
+-    AC_CHECK_LIB([freerdp-core], [freerdp_new],
+-                 [RDP_LIBS="$RDP_LIBS -lfreerdp-core"],
+-                 [AC_CHECK_LIB([freerdp], [freerdp_new],
+-                               [RDP_LIBS="$RDP_LIBS -lfreerdp -lfreerdp-client"],
++    AC_CHECK_LIB([freerdp1-core], [freerdp_new],
++                 [RDP_LIBS="$RDP_LIBS -lfreerdp1-core"],
++                 [AC_CHECK_LIB([freerdp1], [freerdp_new],
++                               [RDP_LIBS="$RDP_LIBS -lfreerdp1 -lfreerdp1-client"],
+                                [AC_MSG_WARN([
+   --------------------------------------------
+-   Unable to find libfreerdp-core / libfreerdp
++   Unable to find libfreerdp1-core / libfreerdp1
+    RDP will be disabled.
+   --------------------------------------------])
+                   have_freerdp=no])])
+@@ -405,33 +405,33 @@ fi
+ # libfreerdp-cache
+ if test "x${have_freerdp}" = "xyes"
+ then
+-    AC_CHECK_LIB([freerdp-cache], [glyph_cache_register_callbacks],
+-                 [RDP_LIBS="$RDP_LIBS -lfreerdp-cache"])
++    AC_CHECK_LIB([freerdp1-cache], [glyph_cache_register_callbacks],
++                 [RDP_LIBS="$RDP_LIBS -lfreerdp1-cache"])
+ fi
+ 
+ # libfreerdp-channels (1.0) / libfreerdp-client + libfreerdp-core (1.1)
+ if test "x${have_freerdp}" = "xyes"
+ then
+-    AC_CHECK_LIB([freerdp-client], [freerdp_channels_new],
+-                 [RDP_LIBS="$RDP_LIBS -lfreerdp-client"],
+-                 [AC_CHECK_LIB([freerdp-channels], [freerdp_channels_new],
+-                               [RDP_LIBS="$RDP_LIBS -lfreerdp-channels"
++    AC_CHECK_LIB([freerdp1-client], [freerdp_channels_new],
++                 [RDP_LIBS="$RDP_LIBS -lfreerdp1-client"],
++                 [AC_CHECK_LIB([freerdp1-channels], [freerdp_channels_new],
++                               [RDP_LIBS="$RDP_LIBS -lfreerdp1-channels"
+                                legacy_freerdp_extensions=yes])],
+-                 [-lfreerdp-core])
++                 [-lfreerdp1-core])
+ fi
+ 
+ # libfreerdp-utils
+ if test "x${have_freerdp}" = "xyes"
+ then
+-    AC_CHECK_LIB([freerdp-utils], [svc_plugin_init],
+-                 [RDP_LIBS="$RDP_LIBS -lfreerdp-utils"])
++    AC_CHECK_LIB([freerdp1-utils], [svc_plugin_init],
++                 [RDP_LIBS="$RDP_LIBS -lfreerdp1-utils"])
+ fi
+ 
+ # libfreerdp-codec
+ if test "x${have_freerdp}" = "xyes"
+ then
+-    AC_CHECK_LIB([freerdp-codec], [freerdp_image_convert],
+-                 [RDP_LIBS="$RDP_LIBS -lfreerdp-codec"])
++    AC_CHECK_LIB([freerdp1-codec], [freerdp_image_convert],
++                 [RDP_LIBS="$RDP_LIBS -lfreerdp1-codec"])
+ fi
+ 
+ # Available color conversion functions