diff options
| author | Ben Woods <woodsb02@FreeBSD.org> | 2016-12-11 04:36:57 +0000 |
|---|---|---|
| committer | Ben Woods <woodsb02@FreeBSD.org> | 2016-12-11 04:36:57 +0000 |
| commit | d0ea56deb08f32659f5aef555ad218c6773f985e (patch) | |
| tree | 3b8430d61957c595f3da0c8c31c214506f0917ca /net/guacamole-server | |
| parent | 9e90e98fd89140b414695bdbc1d9bdd221675623 (diff) | |
| download | ports-d0ea56deb08f32659f5aef555ad218c6773f985e.tar.gz ports-d0ea56deb08f32659f5aef555ad218c6773f985e.zip | |
Notes
Diffstat (limited to 'net/guacamole-server')
| -rw-r--r-- | net/guacamole-server/Makefile | 2 | ||||
| -rw-r--r-- | net/guacamole-server/files/patch-configure.ac | 66 |
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 |