aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorkwm <kwm@FreeBSD.org>2015-08-06 03:13:24 +0800
committerkwm <kwm@FreeBSD.org>2015-08-06 03:13:24 +0800
commitbc6e07a29987571d80b4d847a2dc03a3b52e9d60 (patch)
treee398c7b6ea5203fd3953999e6dd9d6c83c9ec931 /net
parentef524082a34d7a98c929937172fd0785d168ad45 (diff)
downloadfreebsd-ports-gnome-bc6e07a29987571d80b4d847a2dc03a3b52e9d60.tar.gz
freebsd-ports-gnome-bc6e07a29987571d80b4d847a2dc03a3b52e9d60.tar.zst
freebsd-ports-gnome-bc6e07a29987571d80b4d847a2dc03a3b52e9d60.zip
The FreeBSD GNOME team proudly presents GNOME 3.16 for FreeBSD.
The offical GNOME 3.16 release notes can be found at https://help.gnome.org/misc/release-notes/3.16/ Upgrade instructions for port users: Delete the old tracker package with: # pkg delete -f tracker And user port upgrade tool of choice to upgrade. Thanks to Antoine Brodin for running the exp-runs. This release was made possible by the following people: Gustau Perez Ting-Wei_Lan PR: 201980
Diffstat (limited to 'net')
-rw-r--r--net/geocode-glib/Makefile9
-rw-r--r--net/geocode-glib/distinfo4
-rw-r--r--net/glib-networking/Makefile6
-rw-r--r--net/glib-networking/distinfo4
-rw-r--r--net/glib-networking/files/patch-tls_gnutls_gtlsclientconnection-gnutls.c24
-rw-r--r--net/glib-networking/pkg-plist1
-rw-r--r--net/gnome-online-accounts/Makefile10
-rw-r--r--net/gnome-online-accounts/distinfo4
-rw-r--r--net/gnome-online-accounts/pkg-plist24
-rw-r--r--net/gnome-online-miners/Makefile3
-rw-r--r--net/gnome-online-miners/distinfo4
-rw-r--r--net/grilo-plugins/Makefile11
-rw-r--r--net/grilo-plugins/distinfo4
-rw-r--r--net/grilo-plugins/pkg-plist4
-rw-r--r--net/grilo/Makefile3
-rw-r--r--net/grilo/distinfo4
-rw-r--r--net/grilo/pkg-plist16
-rw-r--r--net/gtk-vnc/Makefile14
-rw-r--r--net/gtk-vnc/distinfo4
-rw-r--r--net/gtk-vnc/files/patch-configure427
-rw-r--r--net/gtk-vnc/files/patch-src_Makefile.in206
-rw-r--r--net/gtk-vnc/files/patch-src_coroutine_ucontext.c11
-rw-r--r--net/gtk-vnc/pkg-plist23
-rw-r--r--net/libgweather/Makefile7
-rw-r--r--net/libgweather/distinfo4
-rw-r--r--net/libgweather/pkg-plist59
-rw-r--r--net/vinagre/Makefile7
-rw-r--r--net/vinagre/distinfo4
-rw-r--r--net/vinagre/files/patch-vinagre_vinagre-dirs.vala9
-rw-r--r--net/vinagre/pkg-plist67
-rw-r--r--net/vino/Makefile15
-rw-r--r--net/vino/distinfo4
-rw-r--r--net/vino/pkg-plist1
33 files changed, 201 insertions, 796 deletions
diff --git a/net/geocode-glib/Makefile b/net/geocode-glib/Makefile
index e65bf33a3c94..7187b93683af 100644
--- a/net/geocode-glib/Makefile
+++ b/net/geocode-glib/Makefile
@@ -1,9 +1,8 @@
# Created by: Gustau Perez i Querol <gustau.perez@gmail.com>
# $FreeBSD$
-# $MCom: ports/trunk/net/geocode-glib/Makefile 20031 2014-11-02 21:47:55Z kwm $
PORTNAME= geocode-glib
-PORTVERSION= 3.14.0
+PORTVERSION= 3.16.2
CATEGORIES= net devel gnome
MASTER_SITES= GNOME
@@ -13,6 +12,8 @@ COMMENT= Convenience library for the geocoding and reverse geocoding
LIB_DEPENDS= libjson-glib-1.0.so:${PORTSDIR}/devel/json-glib \
libsoup-2.4.so:${PORTSDIR}/devel/libsoup
+PORTSCOUT= limitw:1,even
+
USES= gettext gmake libtool pathfix pkgconfig tar:xz
USE_GNOME= intlhack
USE_LDCONFIG= yes
@@ -22,8 +23,4 @@ LDFLAGS+= -L${LOCALBASE}/lib
MAKE_ENV= XDG_CACHE_HOME=${WRKDIR}
INSTALL_TARGET= install-strip
-post-patch:
- @${REINPLACE_CMD} -e 's|SoupGNOME|Soup|' \
- ${WRKSRC}/geocode-glib/Makefile.in
-
.include <bsd.port.mk>
diff --git a/net/geocode-glib/distinfo b/net/geocode-glib/distinfo
index 29b227d43354..55b801ba86bd 100644
--- a/net/geocode-glib/distinfo
+++ b/net/geocode-glib/distinfo
@@ -1,2 +1,2 @@
-SHA256 (geocode-glib-3.14.0.tar.xz) = a19b21a92b8cbfa29a5ae6616c2fdca8567e97480f7bb5c955905f6ae1c72010
-SIZE (geocode-glib-3.14.0.tar.xz) = 352308
+SHA256 (geocode-glib-3.16.2.tar.xz) = a551ffdbd793d54a14e709c9d02e82dde3abc14eed8065abad92275a43fe2c97
+SIZE (geocode-glib-3.16.2.tar.xz) = 355424
diff --git a/net/glib-networking/Makefile b/net/glib-networking/Makefile
index 38d1f0fee563..5aef870e5e01 100644
--- a/net/glib-networking/Makefile
+++ b/net/glib-networking/Makefile
@@ -1,10 +1,8 @@
# Created by: Koop Mast <kwm@FreeBSD.org>
# $FreeBSD$
-# $MCom: ports/trunk/net/glib-networking/Makefile 19944 2014-10-15 05:33:09Z gusi $
PORTNAME= glib-networking
-PORTVERSION= 2.42.1
-PORTREVISION= 1
+PORTVERSION= 2.44.0
CATEGORIES= net
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -22,6 +20,8 @@ LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls \
RUN_DEPENDS= ca_root_nss>=0:${PORTSDIR}/security/ca_root_nss \
gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
+PORTSCOUT= limitw:1,even
+
USES= gettext gmake libtool pathfix pkgconfig tar:xz
USE_GNOME= glib20 intltool
GNU_CONFIGURE= yes
diff --git a/net/glib-networking/distinfo b/net/glib-networking/distinfo
index 911ad3fcd429..af11b91d74db 100644
--- a/net/glib-networking/distinfo
+++ b/net/glib-networking/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/glib-networking-2.42.1.tar.xz) = c06bf76da3353695fcc791b7b02e5d60c01c379e554f7841dc6cbca32f65f3a0
-SIZE (gnome2/glib-networking-2.42.1.tar.xz) = 374540
+SHA256 (gnome2/glib-networking-2.44.0.tar.xz) = 8f8a340d3ba99bfdef38b653da929652ea6640e27969d29f7ac51fbbe11a4346
+SIZE (gnome2/glib-networking-2.44.0.tar.xz) = 375456
diff --git a/net/glib-networking/files/patch-tls_gnutls_gtlsclientconnection-gnutls.c b/net/glib-networking/files/patch-tls_gnutls_gtlsclientconnection-gnutls.c
index 1e8f45fb017f..58b3a1168620 100644
--- a/net/glib-networking/files/patch-tls_gnutls_gtlsclientconnection-gnutls.c
+++ b/net/glib-networking/files/patch-tls_gnutls_gtlsclientconnection-gnutls.c
@@ -1,8 +1,8 @@
---- tls/gnutls/gtlsclientconnection-gnutls.c.orig 2012-03-04 18:47:23.000000000 -0500
-+++ tls/gnutls/gtlsclientconnection-gnutls.c 2012-03-04 18:50:26.000000000 -0500
-@@ -349,7 +349,8 @@ g_tls_client_connection_gnutls_finish_ha
- {
- GTlsClientConnectionGnutls *gnutls = G_TLS_CLIENT_CONNECTION_GNUTLS (conn);
+--- tls/gnutls/gtlsclientconnection-gnutls.c.orig 2015-03-17 14:53:17.000000000 +0100
++++ tls/gnutls/gtlsclientconnection-gnutls.c 2015-03-17 16:02:39.897699000 +0100
+@@ -309,7 +309,8 @@ g_tls_client_connection_gnutls_finish_ha
+
+ g_assert (inout_error != NULL);
- if (g_error_matches (*inout_error, G_TLS_ERROR, G_TLS_ERROR_NOT_TLS) &&
+ if (inout_error &&
@@ -10,12 +10,12 @@
gnutls->priv->cert_requested)
{
g_clear_error (inout_error);
-@@ -361,7 +362,7 @@ g_tls_client_connection_gnutls_finish_ha
- {
- gnutls_datum session_data;
+@@ -327,7 +328,7 @@ g_tls_client_connection_gnutls_finish_ha
-- if (!*inout_error &&
-+ if (inout_error && !*inout_error &&
- gnutls_session_get_data2 (g_tls_connection_gnutls_get_session (conn),
- &session_data) == 0)
+ if (gnutls->priv->session_id)
+ {
+- if (!*inout_error)
++ if (inout_error && !*inout_error)
{
+ if (!gnutls_session_is_resumed (g_tls_connection_gnutls_get_session (conn)))
+ {
diff --git a/net/glib-networking/pkg-plist b/net/glib-networking/pkg-plist
index 3aa4c948ae58..3f8a1a58d741 100644
--- a/net/glib-networking/pkg-plist
+++ b/net/glib-networking/pkg-plist
@@ -12,6 +12,7 @@ share/locale/as/LC_MESSAGES/glib-networking.mo
share/locale/be/LC_MESSAGES/glib-networking.mo
share/locale/bg/LC_MESSAGES/glib-networking.mo
share/locale/bn_IN/LC_MESSAGES/glib-networking.mo
+share/locale/bs/LC_MESSAGES/glib-networking.mo
share/locale/ca/LC_MESSAGES/glib-networking.mo
share/locale/ca@valencia/LC_MESSAGES/glib-networking.mo
share/locale/cs/LC_MESSAGES/glib-networking.mo
diff --git a/net/gnome-online-accounts/Makefile b/net/gnome-online-accounts/Makefile
index b12e67aef107..8d6563d53cca 100644
--- a/net/gnome-online-accounts/Makefile
+++ b/net/gnome-online-accounts/Makefile
@@ -1,9 +1,8 @@
# Created by: Koop Mast <kwm@FreeBSD.org>
# $FreeBSD$
-# $MCom: ports/trunk/net/gnome-online-accounts/Makefile 20037 2014-11-03 08:29:49Z kwm $
PORTNAME= gnome-online-accounts
-PORTVERSION= 3.14.3
+PORTVERSION= 3.16.3
CATEGORIES= net
MASTER_SITES= GNOME
@@ -11,7 +10,7 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= Interface provider to access the user's online accounts
BUILD_DEPENDS= docbook-xsl>=0:${PORTSDIR}/textproc/docbook-xsl
-LIB_DEPENDS= libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3 \
+LIB_DEPENDS= libwebkit2gtk-4.0.so:${PORTSDIR}/www/webkit2-gtk3 \
libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
libtelepathy-glib.so:${PORTSDIR}/net-im/telepathy-glib \
libjson-glib-1.0.so:${PORTSDIR}/devel/json-glib \
@@ -20,6 +19,8 @@ LIB_DEPENDS= libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3 \
libsecret-1.so:${PORTSDIR}/security/libsecret \
librest-0.7.so:${PORTSDIR}/devel/librest
+PORTSCOUT= limitw:1,even
+
USES= gettext gmake libtool pathfix pkgconfig tar:xz
USE_GNOME= gtk30 intlhack introspection:build libxslt:build
GNU_CONFIGURE= yes
@@ -30,4 +31,7 @@ LDFLAGS+= -L${LOCALBASE}/lib
INSTALL_TARGET= install-strip
GLIB_SCHEMAS= org.gnome.online-accounts.gschema.xml
+# for webkit2-gtk3
+USES+= compiler:c++11-lib
+
.include <bsd.port.mk>
diff --git a/net/gnome-online-accounts/distinfo b/net/gnome-online-accounts/distinfo
index 72e6de47da49..c7ee66d071ff 100644
--- a/net/gnome-online-accounts/distinfo
+++ b/net/gnome-online-accounts/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome-online-accounts-3.14.3.tar.xz) = 6fe2dc67ab2c50a1c127767f43f31513dac72453bd41d4b4265217a19667c2c6
-SIZE (gnome-online-accounts-3.14.3.tar.xz) = 1408156
+SHA256 (gnome-online-accounts-3.16.3.tar.xz) = a0648e4d595f5c63f85c03bf65a2cf1204e8615aba242c50c15aa4c9696a0ca0
+SIZE (gnome-online-accounts-3.16.3.tar.xz) = 1420940
diff --git a/net/gnome-online-accounts/pkg-plist b/net/gnome-online-accounts/pkg-plist
index 1f445026e8df..20a2b6cb046b 100644
--- a/net/gnome-online-accounts/pkg-plist
+++ b/net/gnome-online-accounts/pkg-plist
@@ -5,22 +5,24 @@ include/goa-1.0/goa/goaenums.h
include/goa-1.0/goa/goaenumtypes.h
include/goa-1.0/goa/goaerror.h
include/goa-1.0/goa/goatypes.h
+include/goa-1.0/goa/goaversion.h
include/goa-1.0/goabackend/goabackend.h
include/goa-1.0/goabackend/goabackendenums.h
include/goa-1.0/goabackend/goabackendenumtypes.h
include/goa-1.0/goabackend/goabackendtypes.h
include/goa-1.0/goabackend/goaprovider.h
lib/girepository-1.0/Goa-1.0.typelib
+lib/goa-1.0/include/goaconfig.h
+lib/goa-1.0/web-extensions/libgoawebextension.a
+lib/goa-1.0/web-extensions/libgoawebextension.so
lib/libgoa-1.0.a
lib/libgoa-1.0.so
lib/libgoa-1.0.so.0
lib/libgoa-1.0.so.0.0.0
lib/libgoa-backend-1.0.a
lib/libgoa-backend-1.0.so
-lib/libgoa-backend-1.0.so.1.0.0
-include/goa-1.0/goa/goaversion.h
-lib/goa-1.0/include/goaconfig.h
lib/libgoa-backend-1.0.so.1
+lib/libgoa-backend-1.0.so.1.0.0
libdata/pkgconfig/goa-1.0.pc
libdata/pkgconfig/goa-backend-1.0.pc
libexec/goa-daemon
@@ -30,10 +32,10 @@ share/gir-1.0/Goa-1.0.gir
%%DATADIR%%/irc-networks.xml
share/icons/hicolor/16x16/apps/goa-account-facebook.png
share/icons/hicolor/16x16/apps/goa-account-flickr.png
+share/icons/hicolor/16x16/apps/goa-account-foursquare.png
share/icons/hicolor/16x16/apps/goa-account-google.png
share/icons/hicolor/16x16/apps/goa-account-owncloud.png
share/icons/hicolor/16x16/apps/goa-account-pocket.png
-share/icons/hicolor/16x16/apps/goa-account-yahoo.png
share/icons/hicolor/16x16/apps/goa-account.png
share/icons/hicolor/16x16/apps/im-aim.png
share/icons/hicolor/16x16/apps/im-ekiga.png
@@ -58,10 +60,10 @@ share/icons/hicolor/16x16/apps/im-yahoo.png
share/icons/hicolor/16x16/apps/im-zephyr.png
share/icons/hicolor/22x22/apps/goa-account-facebook.png
share/icons/hicolor/22x22/apps/goa-account-flickr.png
+share/icons/hicolor/22x22/apps/goa-account-foursquare.png
share/icons/hicolor/22x22/apps/goa-account-google.png
share/icons/hicolor/22x22/apps/goa-account-owncloud.png
share/icons/hicolor/22x22/apps/goa-account-pocket.png
-share/icons/hicolor/22x22/apps/goa-account-yahoo.png
share/icons/hicolor/22x22/apps/goa-account.png
share/icons/hicolor/22x22/apps/im-aim.png
share/icons/hicolor/22x22/apps/im-ekiga.png
@@ -86,10 +88,10 @@ share/icons/hicolor/22x22/apps/im-yahoo.png
share/icons/hicolor/22x22/apps/im-zephyr.png
share/icons/hicolor/24x24/apps/goa-account-facebook.png
share/icons/hicolor/24x24/apps/goa-account-flickr.png
+share/icons/hicolor/24x24/apps/goa-account-foursquare.png
share/icons/hicolor/24x24/apps/goa-account-google.png
share/icons/hicolor/24x24/apps/goa-account-owncloud.png
share/icons/hicolor/24x24/apps/goa-account-pocket.png
-share/icons/hicolor/24x24/apps/goa-account-yahoo.png
share/icons/hicolor/24x24/apps/goa-account.png
share/icons/hicolor/24x24/apps/im-aim.png
share/icons/hicolor/24x24/apps/im-ekiga.png
@@ -114,10 +116,10 @@ share/icons/hicolor/24x24/apps/im-zephyr.png
share/icons/hicolor/256x256/apps/goa-account.png
share/icons/hicolor/32x32/apps/goa-account-facebook.png
share/icons/hicolor/32x32/apps/goa-account-flickr.png
+share/icons/hicolor/32x32/apps/goa-account-foursquare.png
share/icons/hicolor/32x32/apps/goa-account-google.png
share/icons/hicolor/32x32/apps/goa-account-owncloud.png
share/icons/hicolor/32x32/apps/goa-account-pocket.png
-share/icons/hicolor/32x32/apps/goa-account-yahoo.png
share/icons/hicolor/32x32/apps/goa-account.png
share/icons/hicolor/32x32/apps/im-aim.png
share/icons/hicolor/32x32/apps/im-ekiga.png
@@ -141,10 +143,10 @@ share/icons/hicolor/32x32/apps/im-yahoo.png
share/icons/hicolor/32x32/apps/im-zephyr.png
share/icons/hicolor/48x48/apps/goa-account-facebook.png
share/icons/hicolor/48x48/apps/goa-account-flickr.png
+share/icons/hicolor/48x48/apps/goa-account-foursquare.png
share/icons/hicolor/48x48/apps/goa-account-google.png
share/icons/hicolor/48x48/apps/goa-account-owncloud.png
share/icons/hicolor/48x48/apps/goa-account-pocket.png
-share/icons/hicolor/48x48/apps/goa-account-yahoo.png
share/icons/hicolor/48x48/apps/goa-account.png
share/icons/hicolor/48x48/apps/im-aim.png
share/icons/hicolor/48x48/apps/im-ekiga.png
@@ -206,6 +208,7 @@ share/locale/bn/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/bn_IN/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/bn_IN/LC_MESSAGES/gnome-online-accounts.mo
share/locale/br/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+share/locale/bs/LC_MESSAGES/gnome-online-accounts.mo
share/locale/ca/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/ca/LC_MESSAGES/gnome-online-accounts.mo
share/locale/ca@valencia/LC_MESSAGES/gnome-online-accounts-tpaw.mo
@@ -256,6 +259,7 @@ share/locale/hu/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/hu/LC_MESSAGES/gnome-online-accounts.mo
share/locale/id/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/id/LC_MESSAGES/gnome-online-accounts.mo
+share/locale/is/LC_MESSAGES/gnome-online-accounts.mo
share/locale/it/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/it/LC_MESSAGES/gnome-online-accounts.mo
share/locale/ja/LC_MESSAGES/gnome-online-accounts-tpaw.mo
@@ -283,14 +287,15 @@ share/locale/mr/LC_MESSAGES/gnome-online-accounts.mo
share/locale/ms/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/ms/LC_MESSAGES/gnome-online-accounts.mo
share/locale/my/LC_MESSAGES/gnome-online-accounts-tpaw.mo
-share/locale/ne/LC_MESSAGES/gnome-online-accounts.mo
share/locale/nb/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/nb/LC_MESSAGES/gnome-online-accounts.mo
share/locale/ne/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+share/locale/ne/LC_MESSAGES/gnome-online-accounts.mo
share/locale/nl/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/nl/LC_MESSAGES/gnome-online-accounts.mo
share/locale/nn/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/oc/LC_MESSAGES/gnome-online-accounts-tpaw.mo
+share/locale/oc/LC_MESSAGES/gnome-online-accounts.mo
share/locale/or/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/or/LC_MESSAGES/gnome-online-accounts.mo
share/locale/pa/LC_MESSAGES/gnome-online-accounts-tpaw.mo
@@ -342,4 +347,3 @@ share/locale/zh_HK/LC_MESSAGES/gnome-online-accounts.mo
share/locale/zh_TW/LC_MESSAGES/gnome-online-accounts-tpaw.mo
share/locale/zh_TW/LC_MESSAGES/gnome-online-accounts.mo
share/locale/zu/LC_MESSAGES/gnome-online-accounts-tpaw.mo
-share/gnome-online-accounts/goawebview.css
diff --git a/net/gnome-online-miners/Makefile b/net/gnome-online-miners/Makefile
index de95e4063add..271bd287e015 100644
--- a/net/gnome-online-miners/Makefile
+++ b/net/gnome-online-miners/Makefile
@@ -1,9 +1,8 @@
# Created by: Gustau Perez <gustau.perez@gmail.com>
# $FreeBSD$
-# $MCom: ports/trunk/net/gnome-online-miners/Makefile 19966 2014-10-16 06:32:52Z gusi $
PORTNAME= gnome-online-miners
-PORTVERSION= 3.14.1
+PORTVERSION= 3.14.3
CATEGORIES= net
MASTER_SITES= GNOME
diff --git a/net/gnome-online-miners/distinfo b/net/gnome-online-miners/distinfo
index e61f4a0f9029..6928152d4717 100644
--- a/net/gnome-online-miners/distinfo
+++ b/net/gnome-online-miners/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome-online-miners-3.14.1.tar.xz) = 6c6b48be2f89400ca16560c6fff67519229034ea78be867c9fbcb86c1d7cf784
-SIZE (gnome-online-miners-3.14.1.tar.xz) = 256328
+SHA256 (gnome-online-miners-3.14.3.tar.xz) = 907f0c1d2f4fcb762be9e3992d05bcc39d292d9c1246c2aca2b293b04c59ba7d
+SIZE (gnome-online-miners-3.14.3.tar.xz) = 258488
diff --git a/net/grilo-plugins/Makefile b/net/grilo-plugins/Makefile
index 7288723dbd4b..789fbd31b264 100644
--- a/net/grilo-plugins/Makefile
+++ b/net/grilo-plugins/Makefile
@@ -1,9 +1,8 @@
# Created by: Gustau Perez i Querol <gustau.perez@gmail.com>
# $FreeBSD$
-# $MCom: ports/trunk/net/grilo-plugins/Makefile 20031 2014-11-02 21:47:55Z kwm $
PORTNAME= grilo-plugins
-PORTVERSION= 0.2.13
+PORTVERSION= 0.2.14
CATEGORIES= net
MASTER_SITES= GNOME
@@ -28,8 +27,9 @@ LDFLAGS+= -L${LOCALBASE}/lib
INSTALL_TARGET= install-strip
OPTIONS_SUB= yes
-OPTIONS_DEFINE= TRACKER DLEYNA DMAP
-OPTIONS_DEFAULT= TRACKER
+OPTIONS_DEFINE= TRACKER DLEYNA DMAP METADATA
+OPTIONS_DEFAULT= TRACKER METADATA
+
TRACKER_DESC= Tracker support for grilo (used by gnome-music and possibly others)
TRACKER_CONFIGURE_ENABLE= tracker
TRACKER_LIB_DEPENDS= libtracker-sparql-1.0.so:${PORTSDIR}/sysutils/tracker
@@ -39,5 +39,8 @@ DMAP_LIB_DEPENDS= libdmapsharing-3.0.so:${PORTSDIR}/net/libdmapsharing
DLEYNA_DESC= DLNA support for grilo
DLEYNA_CONFIGURE_ENABLE= dleyna
DLEYNA_LIB_DEPENDS= libsoup-2.4.so:${PORTSDIR}/devel/libsoup
+METADATA_DESC= Enable Local-metadata plugin
+METADATA_CONFIGURE_ENABLE= localmetadata
+METADATA_LIB_DEPENDS= libmediaart-2.0.so:${PORTSDIR}/multimedia/libmediaart
.include <bsd.port.mk>
diff --git a/net/grilo-plugins/distinfo b/net/grilo-plugins/distinfo
index 37a1c0d6b799..9f4f2752422f 100644
--- a/net/grilo-plugins/distinfo
+++ b/net/grilo-plugins/distinfo
@@ -1,2 +1,2 @@
-SHA256 (grilo-plugins-0.2.13.tar.xz) = a5544831ba81a4e7caea30da89874fd20142a362d389366e1113d0e64be51201
-SIZE (grilo-plugins-0.2.13.tar.xz) = 999896
+SHA256 (grilo-plugins-0.2.14.tar.xz) = d0f18116675058c7e8c178b1fe26d6d73998a0452f85a73b1696df740c83d3ab
+SIZE (grilo-plugins-0.2.14.tar.xz) = 1036824
diff --git a/net/grilo-plugins/pkg-plist b/net/grilo-plugins/pkg-plist
index 83ccddc4fde6..7d352317fa50 100644
--- a/net/grilo-plugins/pkg-plist
+++ b/net/grilo-plugins/pkg-plist
@@ -11,6 +11,7 @@ lib/grilo-0.2/grl-lastfm-albumart.xml
%%TRACKER%%lib/grilo-0.2/grl-local-metadata.xml
lib/grilo-0.2/grl-magnatune.xml
lib/grilo-0.2/grl-metadata-store.xml
+lib/grilo-0.2/grl-opensubtitles.xml
lib/grilo-0.2/grl-optical-media.xml
lib/grilo-0.2/grl-pocket.xml
lib/grilo-0.2/grl-podcasts.xml
@@ -33,6 +34,7 @@ lib/grilo-0.2/libgrllastfm-albumart.so
%%TRACKER%%lib/grilo-0.2/libgrllocalmetadata.so
lib/grilo-0.2/libgrlmagnatune.so
lib/grilo-0.2/libgrlmetadatastore.so
+lib/grilo-0.2/libgrlopensubtitles.so
lib/grilo-0.2/libgrloptical-media.so
lib/grilo-0.2/libgrlpocket.so
lib/grilo-0.2/libgrlpodcasts.so
@@ -75,6 +77,8 @@ share/locale/sk/LC_MESSAGES/grilo-plugins.mo
share/locale/sl/LC_MESSAGES/grilo-plugins.mo
share/locale/sr/LC_MESSAGES/grilo-plugins.mo
share/locale/sr@latin/LC_MESSAGES/grilo-plugins.mo
+share/locale/sv/LC_MESSAGES/grilo-plugins.mo
+share/locale/tr/LC_MESSAGES/grilo-plugins.mo
share/locale/uk/LC_MESSAGES/grilo-plugins.mo
share/locale/zh_CN/LC_MESSAGES/grilo-plugins.mo
share/locale/zh_HK/LC_MESSAGES/grilo-plugins.mo
diff --git a/net/grilo/Makefile b/net/grilo/Makefile
index cd34de4f9323..833c271f8b20 100644
--- a/net/grilo/Makefile
+++ b/net/grilo/Makefile
@@ -1,9 +1,8 @@
# Created by: Gustau Perez i Querol <gustau.perez@gmail.com>
# $FreeBSD$
-# $MCom: ports/trunk/net/grilo/Makefile 20031 2014-11-02 21:47:55Z kwm $
PORTNAME= grilo
-PORTVERSION= 0.2.11
+PORTVERSION= 0.2.12
CATEGORIES= net
MASTER_SITES= GNOME
diff --git a/net/grilo/distinfo b/net/grilo/distinfo
index c135cc4407a6..65d9a52a09f7 100644
--- a/net/grilo/distinfo
+++ b/net/grilo/distinfo
@@ -1,2 +1,2 @@
-SHA256 (grilo-0.2.11.tar.xz) = 8a52c37521de80d6caf08a519a708489b9e2b097c2758a0acaab6fbd26d30ea6
-SIZE (grilo-0.2.11.tar.xz) = 614060
+SHA256 (grilo-0.2.12.tar.xz) = 55b4663550bc8185f8db232e96b9ba99fbfa9175e31e7321fa5ccaacf3617b85
+SIZE (grilo-0.2.12.tar.xz) = 617284
diff --git a/net/grilo/pkg-plist b/net/grilo/pkg-plist
index 1b0aeec61279..3596a88d36cb 100644
--- a/net/grilo/pkg-plist
+++ b/net/grilo/pkg-plist
@@ -33,19 +33,21 @@ lib/girepository-1.0/GrlPls-0.2.typelib
lib/libgrilo-0.2.a
lib/libgrilo-0.2.so
lib/libgrilo-0.2.so.1
-lib/libgrilo-0.2.so.1.7.0
+lib/libgrilo-0.2.so.1.8.0
lib/libgrlnet-0.2.a
lib/libgrlnet-0.2.so
lib/libgrlnet-0.2.so.0
-lib/libgrlnet-0.2.so.0.1.8
+lib/libgrlnet-0.2.so.0.1.9
lib/libgrlpls-0.2.a
lib/libgrlpls-0.2.so
lib/libgrlpls-0.2.so.0
-lib/libgrlpls-0.2.so.0.0.3
+lib/libgrlpls-0.2.so.0.0.4
libdata/pkgconfig/grilo-0.2.pc
libdata/pkgconfig/grilo-net-0.2.pc
libdata/pkgconfig/grilo-pls-0.2.pc
-man/man1/grl-inspect.1.gz
+man/man1/grl-inspect-0.2.1.gz
+man/man1/grl-launch-0.2.1.gz
+%%UI%%man/man1/grilo-test-ui-0.2.1.gz
share/gir-1.0/Grl-0.2.gir
share/gir-1.0/GrlNet-0.2.gir
share/gir-1.0/GrlPls-0.2.gir
@@ -56,15 +58,15 @@ share/locale/cs/LC_MESSAGES/grilo.mo
share/locale/da/LC_MESSAGES/grilo.mo
share/locale/de/LC_MESSAGES/grilo.mo
share/locale/el/LC_MESSAGES/grilo.mo
-share/locale/es/LC_MESSAGES/grilo.mo
share/locale/eo/LC_MESSAGES/grilo.mo
+share/locale/es/LC_MESSAGES/grilo.mo
share/locale/eu/LC_MESSAGES/grilo.mo
share/locale/fr/LC_MESSAGES/grilo.mo
share/locale/gl/LC_MESSAGES/grilo.mo
-share/locale/id/LC_MESSAGES/grilo.mo
-share/locale/it/LC_MESSAGES/grilo.mo
share/locale/he/LC_MESSAGES/grilo.mo
share/locale/hu/LC_MESSAGES/grilo.mo
+share/locale/id/LC_MESSAGES/grilo.mo
+share/locale/it/LC_MESSAGES/grilo.mo
share/locale/ja/LC_MESSAGES/grilo.mo
share/locale/ko/LC_MESSAGES/grilo.mo
share/locale/lt/LC_MESSAGES/grilo.mo
diff --git a/net/gtk-vnc/Makefile b/net/gtk-vnc/Makefile
index 620ec18c72e9..8719b5993e83 100644
--- a/net/gtk-vnc/Makefile
+++ b/net/gtk-vnc/Makefile
@@ -1,10 +1,8 @@
# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
# $FreeBSD$
-# $MCom: ports/trunk/net/gtk-vnc/Makefile 20031 2014-11-02 21:47:55Z kwm $
PORTNAME= gtk-vnc
-PORTVERSION= 0.4.4
-PORTREVISION= 3
+PORTVERSION= 0.5.4
CATEGORIES= net gnome
MASTER_SITES= GNOME
@@ -19,7 +17,7 @@ LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls \
libgcrypt.so:${PORTSDIR}/security/libgcrypt \
libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
-USE_GNOME= gtk30 introspection:build
+USE_GNOME= gtk30 intltool introspection:build
USES= gettext gmake libtool pathfix pkgconfig tar:xz
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
@@ -30,4 +28,12 @@ CONFIGURE_ARGS= --with-gtk=3.0 --enable-introspection \
MAKE_JOBS_UNSAFE= yes
INSTALL_TARGET= install-strip
+OPTIONS_DEFINE= PULSEAUDIO
+OPTIONS_DEFAULT=PULSEAUDIO
+OPTIONS_SUB= yes
+
+PULSEAUDIO_DESC= use PulseAudio for audio playback
+PULSEAUDIO_CONFIGURE_WITH= pulseaudio
+PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio
+
.include <bsd.port.mk>
diff --git a/net/gtk-vnc/distinfo b/net/gtk-vnc/distinfo
index 764f4cc43968..256f9410ff8d 100644
--- a/net/gtk-vnc/distinfo
+++ b/net/gtk-vnc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gtk-vnc-0.4.4.tar.xz) = c93fdb53c78b52a1cfa067c1a0be0b93d4adfc17ccea1215f20eeab2818308b7
-SIZE (gtk-vnc-0.4.4.tar.xz) = 377304
+SHA256 (gtk-vnc-0.5.4.tar.xz) = 488aa97a76ce6868160699cd45d4a0ee0fe6f0ad4631737c6ddd84450f6c9ce7
+SIZE (gtk-vnc-0.5.4.tar.xz) = 418104
diff --git a/net/gtk-vnc/files/patch-configure b/net/gtk-vnc/files/patch-configure
deleted file mode 100644
index eb14a6abc00e..000000000000
--- a/net/gtk-vnc/files/patch-configure
+++ /dev/null
@@ -1,427 +0,0 @@
---- configure.orig 2013-12-15 11:12:43.000000000 +0100
-+++ configure 2013-12-15 11:18:53.000000000 +0100
-@@ -620,14 +620,16 @@
- WITH_VALA_FALSE
- WITH_VALA_TRUE
- VAPIGEN
--G_IR_SCANNER_SYMBOL_PREFIX_FALSE
--G_IR_SCANNER_SYMBOL_PREFIX_TRUE
--WITH_GOBJECT_INTROSPECTION_FALSE
--WITH_GOBJECT_INTROSPECTION_TRUE
--G_IR_COMPILER
--G_IR_SCANNER
--GOBJECT_INTROSPECTION_LIBS
--GOBJECT_INTROSPECTION_CFLAGS
-+HAVE_INTROSPECTION_FALSE
-+HAVE_INTROSPECTION_TRUE
-+INTROSPECTION_MAKEFILE
-+INTROSPECTION_LIBS
-+INTROSPECTION_CFLAGS
-+INTROSPECTION_TYPELIBDIR
-+INTROSPECTION_GIRDIR
-+INTROSPECTION_GENERATE
-+INTROSPECTION_COMPILER
-+INTROSPECTION_SCANNER
- ENABLE_PLUGIN_FALSE
- ENABLE_PLUGIN_TRUE
- WITH_EXAMPLES_FALSE
-@@ -915,9 +917,7 @@
- FIREFOX_PLUGIN_CFLAGS
- FIREFOX_PLUGIN_LIBS
- MOZILLA_PLUGIN_CFLAGS
--MOZILLA_PLUGIN_LIBS
--GOBJECT_INTROSPECTION_CFLAGS
--GOBJECT_INTROSPECTION_LIBS'
-+MOZILLA_PLUGIN_LIBS'
-
-
- # Initialize some variables set by options.
-@@ -1555,7 +1555,8 @@
- --enable-iso-c Try to warn if code is not ISO C
- --enable-plugin=no/yes enable browser plugin default=no
- --disable-rebuilds disable all source autogeneration rules
-- --enable-introspection enable GObject introspection
-+ --enable-introspection=[no/auto/yes]
-+ Enable introspection for this build
- --enable-vala enable Vala binding generation
-
- Optional Packages:
-@@ -1624,11 +1625,6 @@
- C compiler flags for MOZILLA_PLUGIN, overriding pkg-config
- MOZILLA_PLUGIN_LIBS
- linker flags for MOZILLA_PLUGIN, overriding pkg-config
-- GOBJECT_INTROSPECTION_CFLAGS
-- C compiler flags for GOBJECT_INTROSPECTION, overriding
-- pkg-config
-- GOBJECT_INTROSPECTION_LIBS
-- linker flags for GOBJECT_INTROSPECTION, overriding pkg-config
-
- Use these variables to override the choices made by `configure' or to help
- it to find libraries and programs with nonstandard names/locations.
-@@ -15735,286 +15731,98 @@
- fi
-
-
--# Check whether --enable-introspection was given.
--if test "${enable_introspection+set}" = set; then :
-- enableval=$enable_introspection;
--else
-- enable_introspection=check
--fi
--
--
--has_symbol_prefix=no
--if test "x$enable_introspection" != "xno" ; then
--
--pkg_failed=no
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GOBJECT_INTROSPECTION" >&5
--$as_echo_n "checking for GOBJECT_INTROSPECTION... " >&6; }
--
--if test -n "$GOBJECT_INTROSPECTION_CFLAGS"; then
-- pkg_cv_GOBJECT_INTROSPECTION_CFLAGS="$GOBJECT_INTROSPECTION_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= \$GOBJECT_INTROSPECTION_DESIRED\""; } >&5
-- ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_DESIRED") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-- test $ac_status = 0; }; then
-- pkg_cv_GOBJECT_INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_DESIRED" 2>/dev/null`
--else
-- pkg_failed=yes
--fi
-- else
-- pkg_failed=untried
--fi
--if test -n "$GOBJECT_INTROSPECTION_LIBS"; then
-- pkg_cv_GOBJECT_INTROSPECTION_LIBS="$GOBJECT_INTROSPECTION_LIBS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= \$GOBJECT_INTROSPECTION_DESIRED\""; } >&5
-- ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_DESIRED") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-- test $ac_status = 0; }; then
-- pkg_cv_GOBJECT_INTROSPECTION_LIBS=`$PKG_CONFIG --libs "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_DESIRED" 2>/dev/null`
--else
-- pkg_failed=yes
--fi
-- else
-- pkg_failed=untried
--fi
--
--
-
--if test $pkg_failed = yes; then
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
-
--if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-- _pkg_short_errors_supported=yes
-+ # Check whether --enable-introspection was given.
-+if test "${enable_introspection+set}" = set; then :
-+ enableval=$enable_introspection;
- else
-- _pkg_short_errors_supported=no
-+ enable_introspection=auto
- fi
-- if test $_pkg_short_errors_supported = yes; then
-- GOBJECT_INTROSPECTION_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_DESIRED" 2>&1`
-- else
-- GOBJECT_INTROSPECTION_PKG_ERRORS=`$PKG_CONFIG --print-errors "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_DESIRED" 2>&1`
-- fi
-- # Put the nasty error message in config.log where it belongs
-- echo "$GOBJECT_INTROSPECTION_PKG_ERRORS" >&5
--
-
-
--pkg_failed=no
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GOBJECT_INTROSPECTION" >&5
--$as_echo_n "checking for GOBJECT_INTROSPECTION... " >&6; }
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gobject-introspection" >&5
-+$as_echo_n "checking for gobject-introspection... " >&6; }
-
--if test -n "$GOBJECT_INTROSPECTION_CFLAGS"; then
-- pkg_cv_GOBJECT_INTROSPECTION_CFLAGS="$GOBJECT_INTROSPECTION_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= \$GOBJECT_INTROSPECTION_REQUIRED\""; } >&5
-- ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-- test $ac_status = 0; }; then
-- pkg_cv_GOBJECT_INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED" 2>/dev/null`
--else
-- pkg_failed=yes
--fi
-- else
-- pkg_failed=untried
--fi
--if test -n "$GOBJECT_INTROSPECTION_LIBS"; then
-- pkg_cv_GOBJECT_INTROSPECTION_LIBS="$GOBJECT_INTROSPECTION_LIBS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= \$GOBJECT_INTROSPECTION_REQUIRED\""; } >&5
-- ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED") 2>&5
-+ case $enable_introspection in #(
-+ no) :
-+ found_introspection="no (disabled, use --enable-introspection to enable)"
-+ ;; #(
-+ yes) :
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
-- pkg_cv_GOBJECT_INTROSPECTION_LIBS=`$PKG_CONFIG --libs "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED" 2>/dev/null`
--else
-- pkg_failed=yes
--fi
-- else
-- pkg_failed=untried
--fi
--
--
--
--if test $pkg_failed = yes; then
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--
--if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-- _pkg_short_errors_supported=yes
--else
-- _pkg_short_errors_supported=no
--fi
-- if test $_pkg_short_errors_supported = yes; then
-- GOBJECT_INTROSPECTION_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED" 2>&1`
-- else
-- GOBJECT_INTROSPECTION_PKG_ERRORS=`$PKG_CONFIG --print-errors "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED" 2>&1`
-- fi
-- # Put the nasty error message in config.log where it belongs
-- echo "$GOBJECT_INTROSPECTION_PKG_ERRORS" >&5
--
--
-- if test "x$enable_introspection" = "xcheck"; then
-- enable_introspection=no
-- else
-- as_fn_error $? "gobject-introspection is not available" "$LINENO" 5
-- fi
--
--elif test $pkg_failed = untried; then
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--
-- if test "x$enable_introspection" = "xcheck"; then
-- enable_introspection=no
-- else
-- as_fn_error $? "gobject-introspection is not available" "$LINENO" 5
-- fi
--
-+ :
- else
-- GOBJECT_INTROSPECTION_CFLAGS=$pkg_cv_GOBJECT_INTROSPECTION_CFLAGS
-- GOBJECT_INTROSPECTION_LIBS=$pkg_cv_GOBJECT_INTROSPECTION_LIBS
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }
--
-- enable_introspection=yes
-- has_symbol_prefix=no
--
-+ as_fn_error $? "gobject-introspection-1.0 is not installed" "$LINENO" 5
- fi
--
--elif test $pkg_failed = untried; then
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--
--
--pkg_failed=no
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GOBJECT_INTROSPECTION" >&5
--$as_echo_n "checking for GOBJECT_INTROSPECTION... " >&6; }
--
--if test -n "$GOBJECT_INTROSPECTION_CFLAGS"; then
-- pkg_cv_GOBJECT_INTROSPECTION_CFLAGS="$GOBJECT_INTROSPECTION_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= \$GOBJECT_INTROSPECTION_REQUIRED\""; } >&5
-- ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED") 2>&5
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 0.9.4\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 0.9.4") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
-- pkg_cv_GOBJECT_INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED" 2>/dev/null`
-+ found_introspection=yes
- else
-- pkg_failed=yes
--fi
-- else
-- pkg_failed=untried
-+ as_fn_error $? "You need to have gobject-introspection >= 0.9.4 installed to build gtk-vnc" "$LINENO" 5
- fi
--if test -n "$GOBJECT_INTROSPECTION_LIBS"; then
-- pkg_cv_GOBJECT_INTROSPECTION_LIBS="$GOBJECT_INTROSPECTION_LIBS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= \$GOBJECT_INTROSPECTION_REQUIRED\""; } >&5
-- ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED") 2>&5
-+ ;; #(
-+ auto) :
-+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-introspection-1.0 >= 0.9.4\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "gobject-introspection-1.0 >= 0.9.4") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
-- pkg_cv_GOBJECT_INTROSPECTION_LIBS=`$PKG_CONFIG --libs "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED" 2>/dev/null`
-+ found_introspection=yes
- else
-- pkg_failed=yes
--fi
-- else
-- pkg_failed=untried
-+ found_introspection=no
- fi
-+ enable_introspection=$found_introspection
-+ ;; #(
-+ *) :
-+ as_fn_error $? "invalid argument passed to --enable-introspection, should be one of [no/auto/yes]" "$LINENO" 5
-+ ;;
-+esac
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $found_introspection" >&5
-+$as_echo "$found_introspection" >&6; }
-
-+ INTROSPECTION_SCANNER=
-+ INTROSPECTION_COMPILER=
-+ INTROSPECTION_GENERATE=
-+ INTROSPECTION_GIRDIR=
-+ INTROSPECTION_TYPELIBDIR=
-+ if test "x$found_introspection" = "xyes"; then
-+ INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
-+ INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
-+ INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
-+ INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
-+ INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
-+ INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
-+ INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
-+ INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
-+ fi
-
-
--if test $pkg_failed = yes; then
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--
--if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-- _pkg_short_errors_supported=yes
--else
-- _pkg_short_errors_supported=no
--fi
-- if test $_pkg_short_errors_supported = yes; then
-- GOBJECT_INTROSPECTION_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED" 2>&1`
-- else
-- GOBJECT_INTROSPECTION_PKG_ERRORS=`$PKG_CONFIG --print-errors "gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQUIRED" 2>&1`
-- fi
-- # Put the nasty error message in config.log where it belongs
-- echo "$GOBJECT_INTROSPECTION_PKG_ERRORS" >&5
--
-
-- if test "x$enable_introspection" = "xcheck"; then
-- enable_introspection=no
-- else
-- as_fn_error $? "gobject-introspection is not available" "$LINENO" 5
-- fi
-
--elif test $pkg_failed = untried; then
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
-
-- if test "x$enable_introspection" = "xcheck"; then
-- enable_introspection=no
-- else
-- as_fn_error $? "gobject-introspection is not available" "$LINENO" 5
-- fi
-
--else
-- GOBJECT_INTROSPECTION_CFLAGS=$pkg_cv_GOBJECT_INTROSPECTION_CFLAGS
-- GOBJECT_INTROSPECTION_LIBS=$pkg_cv_GOBJECT_INTROSPECTION_LIBS
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }
-
-- enable_introspection=yes
-- has_symbol_prefix=no
-
--fi
-
-+ if test "x$found_introspection" = "xyes"; then
-+ HAVE_INTROSPECTION_TRUE=
-+ HAVE_INTROSPECTION_FALSE='#'
- else
-- GOBJECT_INTROSPECTION_CFLAGS=$pkg_cv_GOBJECT_INTROSPECTION_CFLAGS
-- GOBJECT_INTROSPECTION_LIBS=$pkg_cv_GOBJECT_INTROSPECTION_LIBS
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }
--
-- enable_introspection=yes
-- has_symbol_prefix=yes
--
-+ HAVE_INTROSPECTION_TRUE='#'
-+ HAVE_INTROSPECTION_FALSE=
- fi
-
-- if test "x$enable_introspection" = "xyes" ; then
--
--$as_echo "#define WITH_GOBJECT_INTROSPECTION 1" >>confdefs.h
--
--
--
-- G_IR_SCANNER=$($PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0)
-
-- G_IR_COMPILER=$($PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0)
--
-- fi
--fi
-- if test "x$enable_introspection" = "xyes"; then
-- WITH_GOBJECT_INTROSPECTION_TRUE=
-- WITH_GOBJECT_INTROSPECTION_FALSE='#'
--else
-- WITH_GOBJECT_INTROSPECTION_TRUE='#'
-- WITH_GOBJECT_INTROSPECTION_FALSE=
--fi
--
-- if test "x$has_symbol_prefix" = "xyes"; then
-- G_IR_SCANNER_SYMBOL_PREFIX_TRUE=
-- G_IR_SCANNER_SYMBOL_PREFIX_FALSE='#'
--else
-- G_IR_SCANNER_SYMBOL_PREFIX_TRUE='#'
-- G_IR_SCANNER_SYMBOL_PREFIX_FALSE=
--fi
-
-
- if test "x$with_gtk" = "x3.0"; then
-@@ -16030,7 +15838,7 @@
- enable_vala="$default_vala"
- fi
-
--if test "x$enable_introspection" = "xyes" ; then
-+if test "x$found_introspection" = "xyes" ; then
- if test "x$enable_vala" != "xno" ; then
- # Extract the first word of "vapigen", so it can be a program name with args.
- set dummy vapigen; ac_word=$2
-@@ -16264,12 +16072,8 @@
- as_fn_error $? "conditional \"ENABLE_PLUGIN\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
--if test -z "${WITH_GOBJECT_INTROSPECTION_TRUE}" && test -z "${WITH_GOBJECT_INTROSPECTION_FALSE}"; then
-- as_fn_error $? "conditional \"WITH_GOBJECT_INTROSPECTION\" was never defined.
--Usually this means the macro was only invoked conditionally." "$LINENO" 5
--fi
--if test -z "${G_IR_SCANNER_SYMBOL_PREFIX_TRUE}" && test -z "${G_IR_SCANNER_SYMBOL_PREFIX_FALSE}"; then
-- as_fn_error $? "conditional \"G_IR_SCANNER_SYMBOL_PREFIX\" was never defined.
-+if test -z "${HAVE_INTROSPECTION_TRUE}" && test -z "${HAVE_INTROSPECTION_FALSE}"; then
-+ as_fn_error $? "conditional \"HAVE_INTROSPECTION\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${WITH_VALA_TRUE}" && test -z "${WITH_VALA_FALSE}"; then
diff --git a/net/gtk-vnc/files/patch-src_Makefile.in b/net/gtk-vnc/files/patch-src_Makefile.in
deleted file mode 100644
index 5f8edf978e3b..000000000000
--- a/net/gtk-vnc/files/patch-src_Makefile.in
+++ /dev/null
@@ -1,206 +0,0 @@
---- src/Makefile.in.orig 2014-01-18 14:22:53.000000000 +0100
-+++ src/Makefile.in 2014-01-18 14:26:22.000000000 +0100
-@@ -51,10 +51,13 @@
- @WITH_PYTHON_TRUE@am__append_11 = vnc.defs vncmodule.defs.c
- @WITH_PYTHON_TRUE@am__append_12 = vnc.override
- @WITH_PYTHON_FALSE@am__append_13 = vnc.override vncmodule.c
--@HAVE_GTK_2_TRUE@@WITH_GOBJECT_INTROSPECTION_TRUE@am__append_14 = \
--@HAVE_GTK_2_TRUE@@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vncimageframebuffer.h $(srcdir)/vncimageframebuffer.c
-+@HAVE_GTK_2_TRUE@@HAVE_INTROSPECTION_TRUE@am__append_14 = \
-+@HAVE_GTK_2_TRUE@@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vncimageframebuffer.h $(srcdir)/vncimageframebuffer.c
-
--@WITH_GOBJECT_INTROSPECTION_TRUE@am__append_15 = $(gir_DATA) $(typelibs_DATA)
-+@HAVE_INTROSPECTION_TRUE@am__append_15 = GVnc-1.0.gir
-+@HAVE_GTK_2_TRUE@@HAVE_INTROSPECTION_TRUE@am__append_16 = GtkVnc-1.0.gir
-+@HAVE_GTK_2_FALSE@@HAVE_INTROSPECTION_TRUE@am__append_17 = GtkVnc-2.0.gir
-+@HAVE_INTROSPECTION_TRUE@am__append_18 = $(gir_DATA) $(typelibs_DATA)
- subdir = src
- DIST_COMMON = $(gtk_vnc_include_HEADERS) $(gvnc_include_HEADERS) \
- $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-@@ -272,8 +275,6 @@
- GNUTLS_LIBS = @GNUTLS_LIBS@
- GNUTLS_REQUIRED = @GNUTLS_REQUIRED@
- GOBJECT_CFLAGS = @GOBJECT_CFLAGS@
--GOBJECT_INTROSPECTION_CFLAGS = @GOBJECT_INTROSPECTION_CFLAGS@
--GOBJECT_INTROSPECTION_LIBS = @GOBJECT_INTROSPECTION_LIBS@
- GOBJECT_LIBS = @GOBJECT_LIBS@
- GOBJECT_REQUIRED = @GOBJECT_REQUIRED@
- GREP = @GREP@
-@@ -284,8 +285,6 @@
- GTK_LIBS = @GTK_LIBS@
- GTK_REQUIRED = @GTK_REQUIRED@
- GTK_VNC_API_VERSION = @GTK_VNC_API_VERSION@
--G_IR_COMPILER = @G_IR_COMPILER@
--G_IR_SCANNER = @G_IR_SCANNER@
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -297,6 +296,14 @@
- INTLTOOL_MERGE = @INTLTOOL_MERGE@
- INTLTOOL_PERL = @INTLTOOL_PERL@
- INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-+INTROSPECTION_CFLAGS = @INTROSPECTION_CFLAGS@
-+INTROSPECTION_COMPILER = @INTROSPECTION_COMPILER@
-+INTROSPECTION_GENERATE = @INTROSPECTION_GENERATE@
-+INTROSPECTION_GIRDIR = @INTROSPECTION_GIRDIR@
-+INTROSPECTION_LIBS = @INTROSPECTION_LIBS@
-+INTROSPECTION_MAKEFILE = @INTROSPECTION_MAKEFILE@
-+INTROSPECTION_SCANNER = @INTROSPECTION_SCANNER@
-+INTROSPECTION_TYPELIBDIR = @INTROSPECTION_TYPELIBDIR@
- LD = @LD@
- LDFLAGS = @LDFLAGS@
- LIBOBJS = @LIBOBJS@
-@@ -530,7 +537,7 @@
- vncconnectionenums.h vncconnectionenums.c
-
- CLEANFILES = $(MARSHAL_FILES) $(ENUM_FILES) $(am__append_11) \
-- $(am__append_15)
-+ $(am__append_18)
- @WITH_PYTHON_TRUE@pyexec_LTLIBRARIES = gtkvnc.la
- @WITH_PYTHON_TRUE@gtkvnc_la_LIBADD = libgtk-vnc-$(GTK_VNC_API_VERSION).la @PYGTK_LIBS@
- @WITH_PYTHON_TRUE@gtkvnc_la_CFLAGS = @GTK_CFLAGS@ @PYTHON_INCLUDES@ \
-@@ -541,31 +548,62 @@
- @WITH_PYTHON_TRUE@nodist_gtkvnc_la_SOURCES = vncmodule.defs.c
- @WITH_PYTHON_TRUE@CODEGENDIR = $(shell pkg-config --variable=codegendir pygtk-2.0)
- @WITH_PYTHON_TRUE@DEFSDIR = $(shell pkg-config --variable=defsdir pygtk-2.0)
--@WITH_GOBJECT_INTROSPECTION_TRUE@GVNC_INTROSPECTION_SRCS = \
--@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vncpixelformat.h \
--@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vncframebuffer.h $(srcdir)/vncframebuffer.c \
--@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vncbaseframebuffer.h $(srcdir)/vncbaseframebuffer.c \
--@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vnccolormap.h $(srcdir)/vnccolormap.c \
--@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vnccursor.h $(srcdir)/vnccursor.c \
--@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vncconnection.h $(srcdir)/vncconnection.c \
--@WITH_GOBJECT_INTROSPECTION_TRUE@ $(builddir)/vncconnectionenums.h $(builddir)/vncconnectionenums.c \
--@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vncutil.h $(srcdir)/vncutil.c
--
--@WITH_GOBJECT_INTROSPECTION_TRUE@GTK_VNC_INTROSPECTION_SRCS = $(srcdir)/vnccairoframebuffer.h \
--@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vnccairoframebuffer.c \
--@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vncdisplay.h \
--@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vncdisplay.c \
--@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vncgrabsequence.h \
--@WITH_GOBJECT_INTROSPECTION_TRUE@ $(srcdir)/vncgrabsequence.c \
--@WITH_GOBJECT_INTROSPECTION_TRUE@ $(builddir)/vncdisplayenums.h \
--@WITH_GOBJECT_INTROSPECTION_TRUE@ $(builddir)/vncdisplayenums.c \
--@WITH_GOBJECT_INTROSPECTION_TRUE@ $(am__append_14)
--@G_IR_SCANNER_SYMBOL_PREFIX_FALSE@@WITH_GOBJECT_INTROSPECTION_TRUE@PREFIX_ARGS = --strip-prefix=Vnc
--@G_IR_SCANNER_SYMBOL_PREFIX_TRUE@@WITH_GOBJECT_INTROSPECTION_TRUE@PREFIX_ARGS = --symbol-prefix=vnc --identifier-prefix=Vnc
--@WITH_GOBJECT_INTROSPECTION_TRUE@girdir = $(datadir)/gir-1.0
--@WITH_GOBJECT_INTROSPECTION_TRUE@gir_DATA = GVnc-1.0.gir GtkVnc-$(GTK_VNC_API_VERSION).gir
--@WITH_GOBJECT_INTROSPECTION_TRUE@typelibsdir = $(libdir)/girepository-1.0
--@WITH_GOBJECT_INTROSPECTION_TRUE@typelibs_DATA = GVnc-1.0.typelib GtkVnc-$(GTK_VNC_API_VERSION).typelib
-+INTROSPECTION_GIRS = $(am__append_15) $(am__append_16) \
-+ $(am__append_17)
-+INTROSPECTION_SCANNER_ARGS = --symbol-prefix=vnc \
-+ --identifier-prefix=Vnc \
-+ --add-include-path=$(top_srcdir) \
-+ --add-include-path=$(srcdir) \
-+ --add-include-path=$(builddir)
-+
-+INTROSPECTION_COMPILER_ARGS = --includedir=$(top_srcdir) \
-+ --includedir=$(srcdir)
-+
-+@HAVE_INTROSPECTION_TRUE@GVNC_INTROSPECTION_SRCS = \
-+@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vncpixelformat.h \
-+@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vncframebuffer.h $(srcdir)/vncframebuffer.c \
-+@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vncbaseframebuffer.h $(srcdir)/vncbaseframebuffer.c \
-+@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vnccolormap.h $(srcdir)/vnccolormap.c \
-+@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vnccursor.h $(srcdir)/vnccursor.c \
-+@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vncconnection.h $(srcdir)/vncconnection.c \
-+@HAVE_INTROSPECTION_TRUE@ $(builddir)/vncconnectionenums.h $(builddir)/vncconnectionenums.c \
-+@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vncutil.h $(srcdir)/vncutil.c
-+
-+@HAVE_INTROSPECTION_TRUE@GTK_VNC_INTROSPECTION_SRCS = \
-+@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vnccairoframebuffer.h \
-+@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vnccairoframebuffer.c \
-+@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vncdisplay.h \
-+@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vncdisplay.c \
-+@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vncgrabsequence.h \
-+@HAVE_INTROSPECTION_TRUE@ $(srcdir)/vncgrabsequence.c \
-+@HAVE_INTROSPECTION_TRUE@ $(builddir)/vncdisplayenums.h \
-+@HAVE_INTROSPECTION_TRUE@ $(builddir)/vncdisplayenums.c \
-+@HAVE_INTROSPECTION_TRUE@ $(am__append_14)
-+@HAVE_INTROSPECTION_TRUE@GVnc_1_0_gir_INCLUDES = GObject-2.0
-+@HAVE_INTROSPECTION_TRUE@GVnc_1_0_gir_PACKAGES = gobject-2.0
-+@HAVE_INTROSPECTION_TRUE@GVnc_1_0_gir_EXPORT_PACKAGES = gvnc-1.0
-+@HAVE_INTROSPECTION_TRUE@GVnc_1_0_gir_LIBS = libgvnc-1.0.la
-+@HAVE_INTROSPECTION_TRUE@GVnc_1_0_gir_FILES = $(GVNC_INTROSPECTION_SRCS)
-+@HAVE_INTROSPECTION_TRUE@GVnc_1_0_gir_CFLAGS = $(libgvnc_1_0_la_CFLAGS)
-+@HAVE_INTROSPECTION_TRUE@GVnc_1_0_gir_SCANNERFLAGS = --c-include="gvnc.h"
-+@HAVE_GTK_2_TRUE@@HAVE_INTROSPECTION_TRUE@GtkVnc_1_0_gir_INCLUDES = GObject-2.0
-+@HAVE_GTK_2_TRUE@@HAVE_INTROSPECTION_TRUE@GtkVnc_1_0_gir_PACKAGES = gobject-2.0 gtk+-$(GTK_API_VERSION)
-+@HAVE_GTK_2_TRUE@@HAVE_INTROSPECTION_TRUE@GtkVnc_1_0_gir_EXPORT_PACKAGES = gtk-vnc-$(GTK_VNC_API_VERSION)
-+@HAVE_GTK_2_TRUE@@HAVE_INTROSPECTION_TRUE@GtkVnc_1_0_gir_LIBS = libgvnc-1.0.la libgtk-vnc-$(GTK_VNC_API_VERSION).la
-+@HAVE_GTK_2_TRUE@@HAVE_INTROSPECTION_TRUE@GtkVnc_1_0_gir_FILES = $(GTK_VNC_INTROSPECTION_SRCS)
-+@HAVE_GTK_2_TRUE@@HAVE_INTROSPECTION_TRUE@GtkVnc_1_0_gir_CFLAGS = $(libgvnc_1_0_la_CFLAGS) $(libgvncpulse_1_0_la_CFLAGS)
-+@HAVE_GTK_2_TRUE@@HAVE_INTROSPECTION_TRUE@GtkVnc_1_0_gir_SCANNERFLAGS = --c-include="gtk-vnc.h" --include-uninstalled=$(top_builddir)/src/GVnc-1.0.gir
-+@HAVE_GTK_2_FALSE@@HAVE_INTROSPECTION_TRUE@GtkVnc_2_0_gir_INCLUDES = GObject-2.0
-+@HAVE_GTK_2_FALSE@@HAVE_INTROSPECTION_TRUE@GtkVnc_2_0_gir_PACKAGES = gobject-2.0 gtk+-$(GTK_API_VERSION)
-+@HAVE_GTK_2_FALSE@@HAVE_INTROSPECTION_TRUE@GtkVnc_2_0_gir_EXPORT_PACKAGES = gtk-vnc-$(GKT_VNC_API_VERSION)
-+@HAVE_GTK_2_FALSE@@HAVE_INTROSPECTION_TRUE@GtkVnc_2_0_gir_LIBS = libgvnc-1.0.la libgtk-vnc-$(GTK_VNC_API_VERSION).la
-+@HAVE_GTK_2_FALSE@@HAVE_INTROSPECTION_TRUE@GtkVnc_2_0_gir_FILES = $(GTK_VNC_INTROSPECTION_SRCS)
-+@HAVE_GTK_2_FALSE@@HAVE_INTROSPECTION_TRUE@GtkVnc_2_0_gir_CFLAGS = $(libgvnc_1_0_la_CFLAGS) $(libgvncpulse_1_0_la_CFLAGS)
-+@HAVE_GTK_2_FALSE@@HAVE_INTROSPECTION_TRUE@GtkVnc_2_0_gir_SCANNERFLAGS = --c-include="gtk-vnc.h" --include-uninstalled=$(top_builddir)/src/GVnc-1.0.gir
-+@HAVE_INTROSPECTION_TRUE@girdir = $(datadir)/gir-1.0
-+@HAVE_INTROSPECTION_TRUE@gir_DATA = $(INTROSPECTION_GIRS)
-+@HAVE_INTROSPECTION_TRUE@typelibsdir = $(libdir)/girepository-1.0
-+@HAVE_INTROSPECTION_TRUE@typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
- all: $(BUILT_SOURCES)
- $(MAKE) $(AM_MAKEFLAGS) all-am
-
-@@ -1380,50 +1418,12 @@
- @WITH_PYTHON_TRUE@ --register $(DEFSDIR)/gtk-types.defs \
- @WITH_PYTHON_TRUE@ --override $(srcdir)/vnc.override vnc.defs > $@
-
--@WITH_GOBJECT_INTROSPECTION_TRUE@GVnc-1.0.gir: libgvnc-1.0.la $(G_IR_SCANNER) Makefile.am
--@WITH_GOBJECT_INTROSPECTION_TRUE@ $(AM_V_GEN)PKG_CONFIG_PATH=$(top_builddir) $(G_IR_SCANNER) -v \
--@WITH_GOBJECT_INTROSPECTION_TRUE@ --namespace GVnc \
--@WITH_GOBJECT_INTROSPECTION_TRUE@ --nsversion 1.0 \
--@WITH_GOBJECT_INTROSPECTION_TRUE@ --include GObject-2.0 \
--@WITH_GOBJECT_INTROSPECTION_TRUE@ $(PREFIX_ARGS) \
--@WITH_GOBJECT_INTROSPECTION_TRUE@ --library=$(builddir)/libgvnc-1.0.la \
--@WITH_GOBJECT_INTROSPECTION_TRUE@ --add-include-path=$(top_srcdir) \
--@WITH_GOBJECT_INTROSPECTION_TRUE@ --add-include-path=$(srcdir) \
--@WITH_GOBJECT_INTROSPECTION_TRUE@ --add-include-path=$(builddir) \
--@WITH_GOBJECT_INTROSPECTION_TRUE@ --c-include="gvnc.h" \
--@WITH_GOBJECT_INTROSPECTION_TRUE@ --output $@ \
--@WITH_GOBJECT_INTROSPECTION_TRUE@ -I$(top_srcdir) \
--@WITH_GOBJECT_INTROSPECTION_TRUE@ -I$(srcdir) \
--@WITH_GOBJECT_INTROSPECTION_TRUE@ --verbose \
--@WITH_GOBJECT_INTROSPECTION_TRUE@ --pkg=gvnc-1.0 \
--@WITH_GOBJECT_INTROSPECTION_TRUE@ $(GVNC_INTROSPECTION_SRCS)
--
--@WITH_GOBJECT_INTROSPECTION_TRUE@GtkVnc-$(GTK_VNC_API_VERSION).gir: GVnc-1.0.gir libgtk-vnc-$(GTK_VNC_API_VERSION).la $(G_IR_SCANNER) Makefile.am
--@WITH_GOBJECT_INTROSPECTION_TRUE@ $(AM_V_GEN)PKG_CONFIG_PATH=$(top_builddir) $(G_IR_SCANNER) -v \
--@WITH_GOBJECT_INTROSPECTION_TRUE@ --namespace GtkVnc \
--@WITH_GOBJECT_INTROSPECTION_TRUE@ --nsversion $(GTK_VNC_API_VERSION) \
--@WITH_GOBJECT_INTROSPECTION_TRUE@ --include GObject-2.0 \
--@WITH_GOBJECT_INTROSPECTION_TRUE@ --include Gtk-$(GTK_API_VERSION) \
--@WITH_GOBJECT_INTROSPECTION_TRUE@ --include GVnc-1.0 \
--@WITH_GOBJECT_INTROSPECTION_TRUE@ $(PREFIX_ARGS) \
--@WITH_GOBJECT_INTROSPECTION_TRUE@ --library=$(builddir)/libgtk-vnc-$(GTK_VNC_API_VERSION).la \
--@WITH_GOBJECT_INTROSPECTION_TRUE@ --add-include-path=$(top_srcdir) \
--@WITH_GOBJECT_INTROSPECTION_TRUE@ --add-include-path=$(srcdir) \
--@WITH_GOBJECT_INTROSPECTION_TRUE@ --add-include-path=$(builddir) \
--@WITH_GOBJECT_INTROSPECTION_TRUE@ --c-include="gtk-vnc.h" \
--@WITH_GOBJECT_INTROSPECTION_TRUE@ --output $@ \
--@WITH_GOBJECT_INTROSPECTION_TRUE@ -I$(top_srcdir) \
--@WITH_GOBJECT_INTROSPECTION_TRUE@ -I$(srcdir) \
--@WITH_GOBJECT_INTROSPECTION_TRUE@ --verbose \
--@WITH_GOBJECT_INTROSPECTION_TRUE@ --pkg=gtk-vnc-$(GTK_VNC_API_VERSION) \
--@WITH_GOBJECT_INTROSPECTION_TRUE@ $(GTK_VNC_INTROSPECTION_SRCS)
--
--@WITH_GOBJECT_INTROSPECTION_TRUE@%.typelib: %.gir
--@WITH_GOBJECT_INTROSPECTION_TRUE@ $(AM_V_GEN)$(G_IR_COMPILER) \
--@WITH_GOBJECT_INTROSPECTION_TRUE@ --includedir=$(srcdir) \
--@WITH_GOBJECT_INTROSPECTION_TRUE@ --includedir=$(builddir) \
--@WITH_GOBJECT_INTROSPECTION_TRUE@ --includedir=$(girdir) \
--@WITH_GOBJECT_INTROSPECTION_TRUE@ -o $@ $<
-+-include $(INTROSPECTION_MAKEFILE)
-+
-+@HAVE_INTROSPECTION_TRUE@GVnc-1.0.gir: libgvnc-1.0.la
-+
-+@HAVE_GTK_2_TRUE@@HAVE_INTROSPECTION_TRUE@GtkVnc-1.0.gir: libgtk-vnc-$(GTK_VNC_API_VERSION).la
-+@HAVE_GTK_2_FALSE@@HAVE_INTROSPECTION_TRUE@GtkVnc-2.0.gir: libgtk-vnc-2.0.la
-
- -include $(top_srcdir)/git.mk
-
diff --git a/net/gtk-vnc/files/patch-src_coroutine_ucontext.c b/net/gtk-vnc/files/patch-src_coroutine_ucontext.c
deleted file mode 100644
index e50fb85767cc..000000000000
--- a/net/gtk-vnc/files/patch-src_coroutine_ucontext.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/coroutine_ucontext.c.orig 2011-02-18 16:29:10.000000000 +0000
-+++ src/coroutine_ucontext.c 2011-02-20 17:51:14.000000000 +0000
-@@ -60,7 +60,7 @@ int coroutine_init(struct coroutine *co)
- co->cc.stack_size = co->stack_size;
- co->cc.stack = mmap(0, co->stack_size,
- PROT_READ | PROT_WRITE,
-- MAP_PRIVATE | MAP_ANONYMOUS,
-+ MAP_PRIVATE | MAP_ANON,
- -1, 0);
- if (co->cc.stack == MAP_FAILED)
- return -1;
diff --git a/net/gtk-vnc/pkg-plist b/net/gtk-vnc/pkg-plist
index 1d52a43635ca..e24b18089b57 100644
--- a/net/gtk-vnc/pkg-plist
+++ b/net/gtk-vnc/pkg-plist
@@ -5,6 +5,10 @@ include/gtk-vnc-2.0/vncdisplayenums.h
include/gtk-vnc-2.0/vncgrabsequence.h
include/gtk-vnc-2.0/vncimageframebuffer.h
include/gvnc-1.0/gvnc.h
+include/gvnc-1.0/vncaudio.h
+include/gvnc-1.0/vncaudioformat.h
+include/gvnc-1.0/vncaudiosample.h
+include/gvnc-1.0/vncbaseaudio.h
include/gvnc-1.0/vncbaseframebuffer.h
include/gvnc-1.0/vnccolormap.h
include/gvnc-1.0/vncconnection.h
@@ -13,7 +17,10 @@ include/gvnc-1.0/vnccursor.h
include/gvnc-1.0/vncframebuffer.h
include/gvnc-1.0/vncpixelformat.h
include/gvnc-1.0/vncutil.h
+%%PULSEAUDIO%%include/gvncpulse-1.0/gvncpulse.h
+%%PULSEAUDIO%%include/gvncpulse-1.0/vncaudiopulse.h
lib/girepository-1.0/GVnc-1.0.typelib
+%%PULSEAUDIO%%lib/girepository-1.0/GVncPulse-1.0.typelib
lib/girepository-1.0/GtkVnc-2.0.typelib
lib/libgtk-vnc-2.0.so
lib/libgtk-vnc-2.0.so.0
@@ -21,10 +28,15 @@ lib/libgtk-vnc-2.0.so.0.0.2
lib/libgvnc-1.0.so
lib/libgvnc-1.0.so.0
lib/libgvnc-1.0.so.0.0.1
+%%PULSEAUDIO%%lib/libgvncpulse-1.0.so
+%%PULSEAUDIO%%lib/libgvncpulse-1.0.so.0
+%%PULSEAUDIO%%lib/libgvncpulse-1.0.so.0.0.1
libdata/pkgconfig/gtk-vnc-2.0.pc
libdata/pkgconfig/gvnc-1.0.pc
+%%PULSEAUDIO%%libdata/pkgconfig/gvncpulse-1.0.pc
man/man1/gvnccapture.1.gz
share/gir-1.0/GVnc-1.0.gir
+%%PULSEAUDIO%%share/gir-1.0/GVncPulse-1.0.gir
share/gir-1.0/GtkVnc-2.0.gir
share/locale/ca/LC_MESSAGES/gtk-vnc.mo
share/locale/ca@valencia/LC_MESSAGES/gtk-vnc.mo
@@ -37,11 +49,16 @@ share/locale/eo/LC_MESSAGES/gtk-vnc.mo
share/locale/es/LC_MESSAGES/gtk-vnc.mo
share/locale/eu/LC_MESSAGES/gtk-vnc.mo
share/locale/fr/LC_MESSAGES/gtk-vnc.mo
+share/locale/gd/LC_MESSAGES/gtk-vnc.mo
share/locale/gl/LC_MESSAGES/gtk-vnc.mo
+share/locale/he/LC_MESSAGES/gtk-vnc.mo
share/locale/hu/LC_MESSAGES/gtk-vnc.mo
+share/locale/id/LC_MESSAGES/gtk-vnc.mo
share/locale/it/LC_MESSAGES/gtk-vnc.mo
share/locale/ja/LC_MESSAGES/gtk-vnc.mo
share/locale/ko/LC_MESSAGES/gtk-vnc.mo
+share/locale/lt/LC_MESSAGES/gtk-vnc.mo
+share/locale/lv/LC_MESSAGES/gtk-vnc.mo
share/locale/nb/LC_MESSAGES/gtk-vnc.mo
share/locale/nds/LC_MESSAGES/gtk-vnc.mo
share/locale/pa/LC_MESSAGES/gtk-vnc.mo
@@ -52,12 +69,18 @@ share/locale/ro/LC_MESSAGES/gtk-vnc.mo
share/locale/ru/LC_MESSAGES/gtk-vnc.mo
share/locale/sk/LC_MESSAGES/gtk-vnc.mo
share/locale/sl/LC_MESSAGES/gtk-vnc.mo
+share/locale/sr/LC_MESSAGES/gtk-vnc.mo
+share/locale/sr@latin/LC_MESSAGES/gtk-vnc.mo
share/locale/sv/LC_MESSAGES/gtk-vnc.mo
+share/locale/te/LC_MESSAGES/gtk-vnc.mo
+share/locale/tg/LC_MESSAGES/gtk-vnc.mo
share/locale/th/LC_MESSAGES/gtk-vnc.mo
share/locale/tr/LC_MESSAGES/gtk-vnc.mo
+share/locale/uk/LC_MESSAGES/gtk-vnc.mo
share/locale/zh_CN/LC_MESSAGES/gtk-vnc.mo
share/locale/zh_HK/LC_MESSAGES/gtk-vnc.mo
share/locale/zh_TW/LC_MESSAGES/gtk-vnc.mo
share/vala/vapi/gtk-vnc-2.0.deps
share/vala/vapi/gtk-vnc-2.0.vapi
share/vala/vapi/gvnc-1.0.vapi
+%%PULSEAUDIO%%share/vala/vapi/gvncpulse-1.0.vapi
diff --git a/net/libgweather/Makefile b/net/libgweather/Makefile
index 0f0da6302bd4..2e068af21aff 100644
--- a/net/libgweather/Makefile
+++ b/net/libgweather/Makefile
@@ -2,9 +2,10 @@
# $FreeBSD$
PORTNAME= libgweather
-PORTVERSION= 3.14.3
+PORTVERSION= 3.16.1
CATEGORIES= net gnome
MASTER_SITES= GNOME
+DIST_SUBDIR= gnome3
MAINTAINER= gnome@FreeBSD.org
COMMENT= Library to accessing online weather informations
@@ -18,13 +19,13 @@ RUN_DEPENDS= gnome-icon-theme>=0:${PORTSDIR}/misc/gnome-icon-theme
PORTSCOUT= limitw:1,even
USES= gettext gmake libtool pathfix pkgconfig tar:xz
-USE_GNOME= gnomeprefix gtk30 intlhack \
- introspection:build
+USE_GNOME= gtk30 intlhack introspection:build
INSTALLS_ICONS= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LIBS+= -L${LOCALBASE}/lib
+CONFIGURE_ARGS+=--disable-glade-catalog
INSTALL_TARGET= install-strip
GLIB_SCHEMAS= org.gnome.GWeather.enums.xml \
org.gnome.GWeather.gschema.xml
diff --git a/net/libgweather/distinfo b/net/libgweather/distinfo
index 7cdda0b70ed6..31c2f616069d 100644
--- a/net/libgweather/distinfo
+++ b/net/libgweather/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libgweather-3.14.3.tar.xz) = 04dd25064cdc7715c1bf5fc476c8596d640cbcb3551217867195cef16bbbbf6b
-SIZE (libgweather-3.14.3.tar.xz) = 3467744
+SHA256 (gnome3/libgweather-3.16.1.tar.xz) = db0955261427bb0f1a3f2747507863c591bf2f09dc477cfbf1cea0382cd34dfd
+SIZE (gnome3/libgweather-3.16.1.tar.xz) = 3478080
diff --git a/net/libgweather/pkg-plist b/net/libgweather/pkg-plist
index d1aafea58c23..02199d1e49cd 100644
--- a/net/libgweather/pkg-plist
+++ b/net/libgweather/pkg-plist
@@ -1,41 +1,41 @@
-lib/girepository-1.0/GWeather-3.0.typelib
-share/gir-1.0/GWeather-3.0.gir
include/libgweather-3.0/libgweather/gweather-enum-types.h
include/libgweather-3.0/libgweather/gweather-enums.h
include/libgweather-3.0/libgweather/gweather-location.h
include/libgweather-3.0/libgweather/gweather-timezone.h
-include/libgweather-3.0/libgweather/location-entry.h
-include/libgweather-3.0/libgweather/timezone-menu.h
include/libgweather-3.0/libgweather/gweather-version.h
include/libgweather-3.0/libgweather/gweather-weather.h
include/libgweather-3.0/libgweather/gweather.h
+include/libgweather-3.0/libgweather/location-entry.h
+include/libgweather-3.0/libgweather/timezone-menu.h
+lib/girepository-1.0/GWeather-3.0.typelib
lib/libgweather-3.so
lib/libgweather-3.so.6
-lib/libgweather-3.so.6.3.2
+lib/libgweather-3.so.6.4.1
libdata/pkgconfig/gweather-3.0.pc
-%%DOCSDIR%%-3.0/GWeatherInfo.html
-%%DOCSDIR%%-3.0/GWeatherLocation.html
-%%DOCSDIR%%-3.0/GWeatherLocationEntry.html
-%%DOCSDIR%%-3.0/GWeatherTimezone.html
-%%DOCSDIR%%-3.0/GWeatherTimezoneMenu.html
-%%DOCSDIR%%-3.0/annotation-glossary.html
-%%DOCSDIR%%-3.0/api-index-deprecated.html
-%%DOCSDIR%%-3.0/api-index-full.html
-%%DOCSDIR%%-3.0/ch01.html
-%%DOCSDIR%%-3.0/home.png
-%%DOCSDIR%%-3.0/index.html
-%%DOCSDIR%%-3.0/ix03.html
-%%DOCSDIR%%-3.0/index.sgml
-%%DOCSDIR%%-3.0/left-insensitive.png
-%%DOCSDIR%%-3.0/left.png
-%%DOCSDIR%%-3.0/libgweather-3.0.devhelp2
-%%DOCSDIR%%-3.0/libgweather-Versioning-information.html
-%%DOCSDIR%%-3.0/object-tree.html
-%%DOCSDIR%%-3.0/right-insensitive.png
-%%DOCSDIR%%-3.0/right.png
-%%DOCSDIR%%-3.0/up-insensitive.png
-%%DOCSDIR%%-3.0/style.css
-%%DOCSDIR%%-3.0/up.png
+share/gir-1.0/GWeather-3.0.gir
+share/gtk-doc/html/libgweather-3.0/GWeatherInfo.html
+share/gtk-doc/html/libgweather-3.0/GWeatherLocation.html
+share/gtk-doc/html/libgweather-3.0/GWeatherLocationEntry.html
+share/gtk-doc/html/libgweather-3.0/GWeatherTimezone.html
+share/gtk-doc/html/libgweather-3.0/GWeatherTimezoneMenu.html
+share/gtk-doc/html/libgweather-3.0/annotation-glossary.html
+share/gtk-doc/html/libgweather-3.0/api-index-deprecated.html
+share/gtk-doc/html/libgweather-3.0/api-index-full.html
+share/gtk-doc/html/libgweather-3.0/ch01.html
+share/gtk-doc/html/libgweather-3.0/home.png
+share/gtk-doc/html/libgweather-3.0/index.html
+share/gtk-doc/html/libgweather-3.0/index.sgml
+share/gtk-doc/html/libgweather-3.0/ix03.html
+share/gtk-doc/html/libgweather-3.0/left-insensitive.png
+share/gtk-doc/html/libgweather-3.0/left.png
+share/gtk-doc/html/libgweather-3.0/libgweather-3.0.devhelp2
+share/gtk-doc/html/libgweather-3.0/libgweather-Versioning-information.html
+share/gtk-doc/html/libgweather-3.0/object-tree.html
+share/gtk-doc/html/libgweather-3.0/right-insensitive.png
+share/gtk-doc/html/libgweather-3.0/right.png
+share/gtk-doc/html/libgweather-3.0/style.css
+share/gtk-doc/html/libgweather-3.0/up-insensitive.png
+share/gtk-doc/html/libgweather-3.0/up.png
%%DATADIR%%/Locations.xml
%%DATADIR%%/locations.dtd
share/locale/af/LC_MESSAGES/libgweather-3.0.mo
@@ -118,6 +118,8 @@ share/locale/fi/LC_MESSAGES/libgweather-3.0.mo
share/locale/fi/LC_MESSAGES/libgweather-locations.mo
share/locale/fr/LC_MESSAGES/libgweather-3.0.mo
share/locale/fr/LC_MESSAGES/libgweather-locations.mo
+share/locale/fur/LC_MESSAGES/libgweather-3.0.mo
+share/locale/fur/LC_MESSAGES/libgweather-locations.mo
share/locale/ga/LC_MESSAGES/libgweather-3.0.mo
share/locale/ga/LC_MESSAGES/libgweather-locations.mo
share/locale/gd/LC_MESSAGES/libgweather-3.0.mo
@@ -138,6 +140,7 @@ share/locale/hy/LC_MESSAGES/libgweather-3.0.mo
share/locale/id/LC_MESSAGES/libgweather-3.0.mo
share/locale/id/LC_MESSAGES/libgweather-locations.mo
share/locale/is/LC_MESSAGES/libgweather-3.0.mo
+share/locale/is/LC_MESSAGES/libgweather-locations.mo
share/locale/it/LC_MESSAGES/libgweather-3.0.mo
share/locale/it/LC_MESSAGES/libgweather-locations.mo
share/locale/ja/LC_MESSAGES/libgweather-3.0.mo
diff --git a/net/vinagre/Makefile b/net/vinagre/Makefile
index b2198ef57a86..708b5931c1f4 100644
--- a/net/vinagre/Makefile
+++ b/net/vinagre/Makefile
@@ -1,9 +1,8 @@
# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
# $FreeBSD$
-# $MCom: ports/trunk/net/vinagre/Makefile 20064 2014-11-11 06:09:58Z gusi $
PORTNAME= vinagre
-PORTVERSION= 3.14.3
+PORTVERSION= 3.16.1
PORTREVISION= 1
CATEGORIES= net gnome
MASTER_SITES= GNOME
@@ -21,9 +20,11 @@ LIB_DEPENDS= libgtk-vnc-2.0.so:${PORTSDIR}/net/gtk-vnc \
libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring
RUN_DEPENDS= gnome-icon-theme>=0:${PORTSDIR}/misc/gnome-icon-theme
+PORTSCOUT= limitw:1,even
+
USES= desktop-file-utils gettext gmake pathfix pkgconfig \
shared-mime-info tar:xz
-USE_GNOME= gnomeprefix gtk30 intlhack libxml2 vte3
+USE_GNOME= gtk30 intlhack libxml2 vte3
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
CONFIGURE_ARGS= --disable-spice --enable-ssh
diff --git a/net/vinagre/distinfo b/net/vinagre/distinfo
index e17079fcaa99..29fe2f9aab4b 100644
--- a/net/vinagre/distinfo
+++ b/net/vinagre/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/vinagre-3.14.3.tar.xz) = f82d8c66684a00a79422724b0e1efad28ba35ba21a92dc7dcb867ed7b64659f0
-SIZE (gnome3/vinagre-3.14.3.tar.xz) = 1101544
+SHA256 (gnome3/vinagre-3.16.1.tar.xz) = d77c0057e8525efeef8b35839bce07e5451d99f3ef9d156c7f549a4c1ad6483f
+SIZE (gnome3/vinagre-3.16.1.tar.xz) = 812964
diff --git a/net/vinagre/files/patch-vinagre_vinagre-dirs.vala b/net/vinagre/files/patch-vinagre_vinagre-dirs.vala
new file mode 100644
index 000000000000..3b14527999a4
--- /dev/null
+++ b/net/vinagre/files/patch-vinagre_vinagre-dirs.vala
@@ -0,0 +1,9 @@
+--- vinagre/vinagre-dirs.vala.orig 2015-01-06 15:14:33.089376522 +0100
++++ vinagre/vinagre-dirs.vala 2015-01-06 15:22:22.849343759 +0100
+@@ -46,5 +46,6 @@
+ // Filename could not be found!
+ error ("Data file ā€˜%sā€™ could not be found in system data directories.",
+ filename);
++ return "";
+ }
+ }
diff --git a/net/vinagre/pkg-plist b/net/vinagre/pkg-plist
index c06e0124904e..6f52b86ca9a7 100644
--- a/net/vinagre/pkg-plist
+++ b/net/vinagre/pkg-plist
@@ -1,6 +1,7 @@
bin/vinagre
man/man1/vinagre.1.gz
share/GConf/gsettings/org.gnome.Vinagre.convert
+share/appdata/vinagre.appdata.xml
share/applications/vinagre-file.desktop
share/applications/vinagre.desktop
%%TELEPATHY%%share/dbus-1/services/org.freedesktop.Telepathy.Client.Vinagre.service
@@ -9,10 +10,11 @@ share/applications/vinagre.desktop
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
%%PORTDOCS%%%%DOCSDIR%%/NEWS
%%PORTDOCS%%%%DOCSDIR%%/README
-share/appdata/vinagre.appdata.xml
share/help/C/vinagre/connect-file.page
share/help/C/vinagre/connect-reverse.page
share/help/C/vinagre/connect.page
+share/help/C/vinagre/figures/preferences-desktop-remote-desktop.png
+share/help/C/vinagre/figures/vinagre-connected-3-16.png
share/help/C/vinagre/fullscreen.page
share/help/C/vinagre/index.page
share/help/C/vinagre/introduction.page
@@ -21,11 +23,11 @@ share/help/C/vinagre/legal.xml
share/help/C/vinagre/scaling.page
share/help/C/vinagre/take-screenshot.page
share/help/C/vinagre/view-only.page
-share/help/C/vinagre/figures/preferences-desktop-remote-desktop.png
-share/help/C/vinagre/figures/vinagre-connected.png
share/help/cs/vinagre/connect-file.page
share/help/cs/vinagre/connect-reverse.page
share/help/cs/vinagre/connect.page
+share/help/cs/vinagre/figures/preferences-desktop-remote-desktop.png
+share/help/cs/vinagre/figures/vinagre-connected-3-16.png
share/help/cs/vinagre/fullscreen.page
share/help/cs/vinagre/index.page
share/help/cs/vinagre/introduction.page
@@ -34,11 +36,11 @@ share/help/cs/vinagre/legal.xml
share/help/cs/vinagre/scaling.page
share/help/cs/vinagre/take-screenshot.page
share/help/cs/vinagre/view-only.page
-share/help/cs/vinagre/figures/preferences-desktop-remote-desktop.png
-share/help/cs/vinagre/figures/vinagre-connected.png
share/help/de/vinagre/connect-file.page
share/help/de/vinagre/connect-reverse.page
share/help/de/vinagre/connect.page
+share/help/de/vinagre/figures/preferences-desktop-remote-desktop.png
+share/help/de/vinagre/figures/vinagre-connected-3-16.png
share/help/de/vinagre/fullscreen.page
share/help/de/vinagre/index.page
share/help/de/vinagre/introduction.page
@@ -47,11 +49,11 @@ share/help/de/vinagre/legal.xml
share/help/de/vinagre/scaling.page
share/help/de/vinagre/take-screenshot.page
share/help/de/vinagre/view-only.page
-share/help/de/vinagre/figures/preferences-desktop-remote-desktop.png
-share/help/de/vinagre/figures/vinagre-connected.png
share/help/el/vinagre/connect-file.page
share/help/el/vinagre/connect-reverse.page
share/help/el/vinagre/connect.page
+share/help/el/vinagre/figures/preferences-desktop-remote-desktop.png
+share/help/el/vinagre/figures/vinagre-connected-3-16.png
share/help/el/vinagre/fullscreen.page
share/help/el/vinagre/index.page
share/help/el/vinagre/introduction.page
@@ -60,11 +62,11 @@ share/help/el/vinagre/legal.xml
share/help/el/vinagre/scaling.page
share/help/el/vinagre/take-screenshot.page
share/help/el/vinagre/view-only.page
-share/help/el/vinagre/figures/preferences-desktop-remote-desktop.png
-share/help/el/vinagre/figures/vinagre-connected.png
share/help/es/vinagre/connect-file.page
share/help/es/vinagre/connect-reverse.page
share/help/es/vinagre/connect.page
+share/help/es/vinagre/figures/preferences-desktop-remote-desktop.png
+share/help/es/vinagre/figures/vinagre-connected-3-16.png
share/help/es/vinagre/fullscreen.page
share/help/es/vinagre/index.page
share/help/es/vinagre/introduction.page
@@ -73,11 +75,11 @@ share/help/es/vinagre/legal.xml
share/help/es/vinagre/scaling.page
share/help/es/vinagre/take-screenshot.page
share/help/es/vinagre/view-only.page
-share/help/es/vinagre/figures/preferences-desktop-remote-desktop.png
-share/help/es/vinagre/figures/vinagre-connected.png
share/help/eu/vinagre/connect-file.page
share/help/eu/vinagre/connect-reverse.page
share/help/eu/vinagre/connect.page
+share/help/eu/vinagre/figures/preferences-desktop-remote-desktop.png
+share/help/eu/vinagre/figures/vinagre-connected-3-16.png
share/help/eu/vinagre/fullscreen.page
share/help/eu/vinagre/index.page
share/help/eu/vinagre/introduction.page
@@ -86,11 +88,11 @@ share/help/eu/vinagre/legal.xml
share/help/eu/vinagre/scaling.page
share/help/eu/vinagre/take-screenshot.page
share/help/eu/vinagre/view-only.page
-share/help/eu/vinagre/figures/preferences-desktop-remote-desktop.png
-share/help/eu/vinagre/figures/vinagre-connected.png
share/help/fa/vinagre/connect-file.page
share/help/fa/vinagre/connect-reverse.page
share/help/fa/vinagre/connect.page
+share/help/fa/vinagre/figures/preferences-desktop-remote-desktop.png
+share/help/fa/vinagre/figures/vinagre-connected-3-16.png
share/help/fa/vinagre/fullscreen.page
share/help/fa/vinagre/index.page
share/help/fa/vinagre/introduction.page
@@ -99,11 +101,11 @@ share/help/fa/vinagre/legal.xml
share/help/fa/vinagre/scaling.page
share/help/fa/vinagre/take-screenshot.page
share/help/fa/vinagre/view-only.page
-share/help/fa/vinagre/figures/preferences-desktop-remote-desktop.png
-share/help/fa/vinagre/figures/vinagre-connected.png
share/help/fr/vinagre/connect-file.page
share/help/fr/vinagre/connect-reverse.page
share/help/fr/vinagre/connect.page
+share/help/fr/vinagre/figures/preferences-desktop-remote-desktop.png
+share/help/fr/vinagre/figures/vinagre-connected-3-16.png
share/help/fr/vinagre/fullscreen.page
share/help/fr/vinagre/index.page
share/help/fr/vinagre/introduction.page
@@ -112,11 +114,11 @@ share/help/fr/vinagre/legal.xml
share/help/fr/vinagre/scaling.page
share/help/fr/vinagre/take-screenshot.page
share/help/fr/vinagre/view-only.page
-share/help/fr/vinagre/figures/preferences-desktop-remote-desktop.png
-share/help/fr/vinagre/figures/vinagre-connected.png
share/help/gl/vinagre/connect-file.page
share/help/gl/vinagre/connect-reverse.page
share/help/gl/vinagre/connect.page
+share/help/gl/vinagre/figures/preferences-desktop-remote-desktop.png
+share/help/gl/vinagre/figures/vinagre-connected-3-16.png
share/help/gl/vinagre/fullscreen.page
share/help/gl/vinagre/index.page
share/help/gl/vinagre/introduction.page
@@ -125,11 +127,11 @@ share/help/gl/vinagre/legal.xml
share/help/gl/vinagre/scaling.page
share/help/gl/vinagre/take-screenshot.page
share/help/gl/vinagre/view-only.page
-share/help/gl/vinagre/figures/preferences-desktop-remote-desktop.png
-share/help/gl/vinagre/figures/vinagre-connected.png
share/help/hu/vinagre/connect-file.page
share/help/hu/vinagre/connect-reverse.page
share/help/hu/vinagre/connect.page
+share/help/hu/vinagre/figures/preferences-desktop-remote-desktop.png
+share/help/hu/vinagre/figures/vinagre-connected-3-16.png
share/help/hu/vinagre/fullscreen.page
share/help/hu/vinagre/index.page
share/help/hu/vinagre/introduction.page
@@ -138,11 +140,11 @@ share/help/hu/vinagre/legal.xml
share/help/hu/vinagre/scaling.page
share/help/hu/vinagre/take-screenshot.page
share/help/hu/vinagre/view-only.page
-share/help/hu/vinagre/figures/preferences-desktop-remote-desktop.png
-share/help/hu/vinagre/figures/vinagre-connected.png
share/help/id/vinagre/connect-file.page
share/help/id/vinagre/connect-reverse.page
share/help/id/vinagre/connect.page
+share/help/id/vinagre/figures/preferences-desktop-remote-desktop.png
+share/help/id/vinagre/figures/vinagre-connected-3-16.png
share/help/id/vinagre/fullscreen.page
share/help/id/vinagre/index.page
share/help/id/vinagre/introduction.page
@@ -151,11 +153,11 @@ share/help/id/vinagre/legal.xml
share/help/id/vinagre/scaling.page
share/help/id/vinagre/take-screenshot.page
share/help/id/vinagre/view-only.page
-share/help/id/vinagre/figures/preferences-desktop-remote-desktop.png
-share/help/id/vinagre/figures/vinagre-connected.png
share/help/lv/vinagre/connect-file.page
share/help/lv/vinagre/connect-reverse.page
share/help/lv/vinagre/connect.page
+share/help/lv/vinagre/figures/preferences-desktop-remote-desktop.png
+share/help/lv/vinagre/figures/vinagre-connected-3-16.png
share/help/lv/vinagre/fullscreen.page
share/help/lv/vinagre/index.page
share/help/lv/vinagre/introduction.page
@@ -164,11 +166,11 @@ share/help/lv/vinagre/legal.xml
share/help/lv/vinagre/scaling.page
share/help/lv/vinagre/take-screenshot.page
share/help/lv/vinagre/view-only.page
-share/help/lv/vinagre/figures/preferences-desktop-remote-desktop.png
-share/help/lv/vinagre/figures/vinagre-connected.png
share/help/pt_BR/vinagre/connect-file.page
share/help/pt_BR/vinagre/connect-reverse.page
share/help/pt_BR/vinagre/connect.page
+share/help/pt_BR/vinagre/figures/preferences-desktop-remote-desktop.png
+share/help/pt_BR/vinagre/figures/vinagre-connected-3-16.png
share/help/pt_BR/vinagre/fullscreen.page
share/help/pt_BR/vinagre/index.page
share/help/pt_BR/vinagre/introduction.page
@@ -177,11 +179,11 @@ share/help/pt_BR/vinagre/legal.xml
share/help/pt_BR/vinagre/scaling.page
share/help/pt_BR/vinagre/take-screenshot.page
share/help/pt_BR/vinagre/view-only.page
-share/help/pt_BR/vinagre/figures/preferences-desktop-remote-desktop.png
-share/help/pt_BR/vinagre/figures/vinagre-connected.png
share/help/ru/vinagre/connect-file.page
share/help/ru/vinagre/connect-reverse.page
share/help/ru/vinagre/connect.page
+share/help/ru/vinagre/figures/preferences-desktop-remote-desktop.png
+share/help/ru/vinagre/figures/vinagre-connected-3-16.png
share/help/ru/vinagre/fullscreen.page
share/help/ru/vinagre/index.page
share/help/ru/vinagre/introduction.page
@@ -190,11 +192,11 @@ share/help/ru/vinagre/legal.xml
share/help/ru/vinagre/scaling.page
share/help/ru/vinagre/take-screenshot.page
share/help/ru/vinagre/view-only.page
-share/help/ru/vinagre/figures/preferences-desktop-remote-desktop.png
-share/help/ru/vinagre/figures/vinagre-connected.png
share/help/sl/vinagre/connect-file.page
share/help/sl/vinagre/connect-reverse.page
share/help/sl/vinagre/connect.page
+share/help/sl/vinagre/figures/preferences-desktop-remote-desktop.png
+share/help/sl/vinagre/figures/vinagre-connected-3-16.png
share/help/sl/vinagre/fullscreen.page
share/help/sl/vinagre/index.page
share/help/sl/vinagre/introduction.page
@@ -203,11 +205,11 @@ share/help/sl/vinagre/legal.xml
share/help/sl/vinagre/scaling.page
share/help/sl/vinagre/take-screenshot.page
share/help/sl/vinagre/view-only.page
-share/help/sl/vinagre/figures/preferences-desktop-remote-desktop.png
-share/help/sl/vinagre/figures/vinagre-connected.png
share/help/zh_CN/vinagre/connect-file.page
share/help/zh_CN/vinagre/connect-reverse.page
share/help/zh_CN/vinagre/connect.page
+share/help/zh_CN/vinagre/figures/preferences-desktop-remote-desktop.png
+share/help/zh_CN/vinagre/figures/vinagre-connected-3-16.png
share/help/zh_CN/vinagre/fullscreen.page
share/help/zh_CN/vinagre/index.page
share/help/zh_CN/vinagre/introduction.page
@@ -216,8 +218,6 @@ share/help/zh_CN/vinagre/legal.xml
share/help/zh_CN/vinagre/scaling.page
share/help/zh_CN/vinagre/take-screenshot.page
share/help/zh_CN/vinagre/view-only.page
-share/help/zh_CN/vinagre/figures/preferences-desktop-remote-desktop.png
-share/help/zh_CN/vinagre/figures/vinagre-connected.png
share/icons/hicolor/16x16/mimetypes/application-x-remote-connection.png
share/icons/hicolor/16x16/mimetypes/application-x-vnc.png
share/icons/hicolor/16x16/status/view-minimize.png
@@ -242,6 +242,7 @@ share/locale/be@latin/LC_MESSAGES/vinagre.mo
share/locale/bg/LC_MESSAGES/vinagre.mo
share/locale/bn/LC_MESSAGES/vinagre.mo
share/locale/bn_IN/LC_MESSAGES/vinagre.mo
+share/locale/bs/LC_MESSAGES/vinagre.mo
share/locale/ca/LC_MESSAGES/vinagre.mo
share/locale/ca@valencia/LC_MESSAGES/vinagre.mo
share/locale/cs/LC_MESSAGES/vinagre.mo
diff --git a/net/vino/Makefile b/net/vino/Makefile
index 6add74d25b7a..3f71fccb021c 100644
--- a/net/vino/Makefile
+++ b/net/vino/Makefile
@@ -1,9 +1,8 @@
# Created by: Tom McLaughlin <tmclaugh@sdf.lonestar.org>
# $FreeBSD$
-# $MCom: ports/trunk/net/vino/Makefile 20063 2014-11-10 22:11:39Z gusi $
PORTNAME= vino
-PORTVERSION= 3.14.2
+PORTVERSION= 3.16.0
CATEGORIES= net gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -19,22 +18,16 @@ LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls \
libnotify.so:${PORTSDIR}/devel/libnotify \
libavahi-glib.so:${PORTSDIR}/net/avahi-app
+PORTSCOUT= limitw:1,even
+
USES= cpe gettext gmake pathfix pkgconfig tar:xz
CPE_VENDOR= david_king
-USE_GNOME= gnomeprefix gtk30 intlhack
+USE_GNOME= gtk30 intlhack
USE_XORG= xdamage xfixes xtst
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
-CONFIGURE_ARGS= --without-network-manager \
- --disable-http-server
CPPFLAGS+= -I${LOCALBASE}/include -Wno-format-nonliteral
LDFLAGS+= -L${LOCALBASE}/lib
GLIB_SCHEMAS= org.gnome.Vino.enums.xml org.gnome.Vino.gschema.xml
-OPTIONS_SUB= yes
-OPTIONS_DEFINE= NOTIFY
-OPTIONS_DEFAULT=NOTIFY
-NOTIFY_LIBS_DEPENDS= libnotify.so:${PORTSDIR}/devel/libnotify
-NOTIFY_CONFIGURE_WITH= libnotify
-
.include <bsd.port.mk>
diff --git a/net/vino/distinfo b/net/vino/distinfo
index 41d9d5c4c2e5..1eca56fdc188 100644
--- a/net/vino/distinfo
+++ b/net/vino/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/vino-3.14.2.tar.xz) = 9042ca347968617f831a472a5c6c123b71bb9ba5339e45ccf46004a7452da3a5
-SIZE (gnome3/vino-3.14.2.tar.xz) = 750452
+SHA256 (gnome3/vino-3.16.0.tar.xz) = 608d3613d4e0ad40566759df06587effcfae77f205fce83e3bcf7574bc608dc5
+SIZE (gnome3/vino-3.16.0.tar.xz) = 760508
diff --git a/net/vino/pkg-plist b/net/vino/pkg-plist
index 3f9db0b5a747..fe78373833df 100644
--- a/net/vino/pkg-plist
+++ b/net/vino/pkg-plist
@@ -1,5 +1,4 @@
libexec/vino-server
-share/GConf/gsettings/org.gnome.Vino.convert
share/applications/vino-server.desktop
share/dbus-1/services/org.freedesktop.Telepathy.Client.Vino.service
share/locale/an/LC_MESSAGES/vino.mo