4 files changed, 49 insertions, 38 deletions

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