Update to 3.1.91.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@16266 df743ca5-7f9a-e211-a948-0013205c9059

6 files changed, 136 insertions, 245 deletions

diff --git a/net/vinagre3/Makefile b/net/vinagre3/Makefile
index ed6e4dfc2..a2b768c2c 100644
--- a/net/vinagre3/Makefile
+++ b/net/vinagre3/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#  $MCom: ports/net/vinagre3/Makefile,v 1.10 2011/08/31 08:29:21 kwm Exp $
+#  $MCom: ports/net/vinagre3/Makefile,v 1.11 2011/09/17 16:26:44 kwm Exp $
 #
 
 PORTNAME=	vinagre
-PORTVERSION=	3.0.2
+PORTVERSION=	3.1.91
 CATEGORIES=	net gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -16,7 +16,6 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	VNC client for the GNOME Desktop
 
 LIB_DEPENDS=	gtk-vnc-2.0.0:${PORTSDIR}/net/gtk-vnc3 \
-		peas-1.0.0:${PORTSDIR}/devel/libpeas \
     		avahi-core.7:${PORTSDIR}/net/avahi-app \
 		avahi-ui-gtk3.0:${PORTSDIR}/net/avahi-gtk3 \
 		gdbm.4:${PORTSDIR}/databases/gdbm \
@@ -34,19 +33,18 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
-CONFIGURE_ARGS=	--disable-spice -enable-ssh
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS=	--disable-spice --enable-ssh
+CPPFLAGS=	-I${LOCALBASE}/include
+CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
 
 GLIB_SCHEMAS=	org.gnome.Vinagre.gschema.xml
 
 MAN1=		vinagre.1
 
 OPTIONS=	TELEPATHY "Enable telepathy integration" on \
-		RDP "Enable MS Windows remote desktop support" off \
-		PANEL "Build gnome-panel applet" off
+		RDP "Enable MS Windows remote desktop support" off
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if !defined(WITHOUT_TELEPATHY)
 LIB_DEPENDS+=	telepathy-glib.0:${PORTSDIR}/net-im/telepathy-glib \
@@ -67,14 +65,6 @@ CONFIGURE_ARGS+=--disable-rdp
 PLIST_SUB+=	RDP="@comment "
 .endif
 
-.if defined(WITH_PANEL)
-USE_GNOME+=	gnomepanel3
-PLIST_SUB+=	PANEL=""
-.else
-CONFIGURE_ARGS+=--without-panelapplet
-PLIST_SUB+=	PANEL="@comment "
-.endif
-
 post-install:
 	@-update-desktop-database > /dev/null
 	@-update-mime-database ${PREFIX}/share/mime > /dev/null
@@ -85,4 +75,4 @@ post-install:
 .endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/vinagre3/distinfo b/net/vinagre3/distinfo
index 2bcabfd48..b4db58796 100644
--- a/net/vinagre3/distinfo
+++ b/net/vinagre3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/vinagre-3.0.2.tar.xz) = cddc604ca6b2e45aaa5af55306eb29fc4910b29e1273c4915b7f60fd78da264e
-SIZE (gnome3/vinagre-3.0.2.tar.xz) = 2193892
+SHA256 (gnome3/vinagre-3.1.91.tar.xz) = 6e62ce78e0fb867444f4403668684c05394f55d1f3468f725297431b1a14fbc8
+SIZE (gnome3/vinagre-3.1.91.tar.xz) = 2426384
diff --git a/net/vinagre3/files/patch-plugins_reverse-vnc_vinagre-reverse-vnc-listener-dialog.c b/net/vinagre3/files/patch-plugins_reverse-vnc_vinagre-reverse-vnc-listener-dialog.c
deleted file mode 100644
index b62727128..000000000
--- a/net/vinagre3/files/patch-plugins_reverse-vnc_vinagre-reverse-vnc-listener-dialog.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugins/reverse-vnc/vinagre-reverse-vnc-listener-dialog.c.orig	2011-03-29 21:27:53.000000000 -0500
-+++ plugins/reverse-vnc/vinagre-reverse-vnc-listener-dialog.c	2011-03-29 21:28:10.000000000 -0500
-@@ -20,6 +20,8 @@
- 
- #include <config.h>
- 
-+#include <sys/types.h>
-+#include <sys/socket.h>
- #include <net/if.h>
- #include <arpa/inet.h>
- #include <netinet/in.h>
diff --git a/net/vinagre3/files/patch-vinagre_vinagre-reverse-vnc-listener-dialog.c b/net/vinagre3/files/patch-vinagre_vinagre-reverse-vnc-listener-dialog.c
new file mode 100644
index 000000000..e694af953
--- /dev/null
+++ b/net/vinagre3/files/patch-vinagre_vinagre-reverse-vnc-listener-dialog.c
@@ -0,0 +1,11 @@
+--- vinagre/vinagre-reverse-vnc-listener-dialog.c.orig	2011-09-17 23:36:02.000000000 +0200
++++ vinagre/vinagre-reverse-vnc-listener-dialog.c	2011-09-17 23:39:04.000000000 +0200
+@@ -20,6 +20,8 @@
+ 
+ #include <config.h>
+ 
++#include <sys/types.h>
++#include <sys/socket.h>
+ #include <net/if.h>
+ #include <arpa/inet.h>
+ #include <netinet/in.h>
diff --git a/net/vinagre3/files/patch-vinagre_vinagre-ssh.c b/net/vinagre3/files/patch-vinagre_vinagre-ssh.c
new file mode 100644
index 000000000..7bc19e9ae
--- /dev/null
+++ b/net/vinagre3/files/patch-vinagre_vinagre-ssh.c
@@ -0,0 +1,11 @@
+--- vinagre/vinagre-ssh.c.orig	2011-09-18 22:03:12.000000000 +0200
++++ vinagre/vinagre-ssh.c	2011-09-18 22:03:20.000000000 +0200
+@@ -44,7 +44,7 @@ static const int SSH_READ_TIMEOUT = 40; 
+ 
+ #ifdef HAVE_GRANTPT
+ /* We only use this on systems with unix98 ptys */
+-#define USE_PTY 1
++//#define USE_PTY 1
+ #endif
+ 
+ typedef enum {
diff --git a/net/vinagre3/pkg-plist b/net/vinagre3/pkg-plist
index 2a21a6510..98bb8f1d0 100644
--- a/net/vinagre3/pkg-plist
+++ b/net/vinagre3/pkg-plist
@@ -1,181 +1,127 @@
 bin/vinagre
-include/vinagre-3.0/vinagre/vinagre-bookmarks-entry.h
-include/vinagre-3.0/vinagre/vinagre-bookmarks-migration.h
-include/vinagre-3.0/vinagre/vinagre-bookmarks-tree.h
-include/vinagre-3.0/vinagre/vinagre-bookmarks-ui.h
-include/vinagre-3.0/vinagre/vinagre-bookmarks.h
-include/vinagre-3.0/vinagre/vinagre-cache-prefs.h
-include/vinagre-3.0/vinagre/vinagre-commands.h
-include/vinagre-3.0/vinagre/vinagre-connect.h
-include/vinagre-3.0/vinagre/vinagre-connection.h
-include/vinagre-3.0/vinagre/vinagre-debug.h
-include/vinagre-3.0/vinagre/vinagre-dirs.h
-include/vinagre-3.0/vinagre/vinagre-dnd.h
-include/vinagre-3.0/vinagre/vinagre-fav.h
-include/vinagre-3.0/vinagre/vinagre-notebook.h
-include/vinagre-3.0/vinagre/vinagre-plugins-engine.h
-include/vinagre-3.0/vinagre/vinagre-prefs.h
-include/vinagre-3.0/vinagre/vinagre-protocol.h
-include/vinagre-3.0/vinagre/vinagre-ssh.h
-include/vinagre-3.0/vinagre/vinagre-tab.h
-include/vinagre-3.0/vinagre/vinagre-ui.h
-include/vinagre-3.0/vinagre/vinagre-utils.h
-include/vinagre-3.0/vinagre/vinagre-window.h
-lib/vinagre-3.0/girepository-1.0/Vinagre-3.0.typelib
-lib/vinagre-3.0/plugins/im-status.js
-lib/vinagre-3.0/plugins/im-status.plugin
 %%RDP%%lib/vinagre-3.0/plugins/librdp.la
 %%RDP%%lib/vinagre-3.0/plugins/librdp.so
-lib/vinagre-3.0/plugins/libreversevnc.la
-lib/vinagre-3.0/plugins/libreversevnc.so
 lib/vinagre-3.0/plugins/libssh.la
 lib/vinagre-3.0/plugins/libssh.so
 lib/vinagre-3.0/plugins/libvnc.la
 lib/vinagre-3.0/plugins/libvnc.so
-%%RDP%%lib/vinagre-3.0/plugins/rdp.plugin
-lib/vinagre-3.0/plugins/reverse-vnc.plugin
-lib/vinagre-3.0/plugins/ssh.plugin
-lib/vinagre-3.0/plugins/vnc.plugin
-libdata/pkgconfig/vinagre-3.0.pc
-%%PANEL%%libexec/vinagre-applet
 share/GConf/gsettings/org.gnome.Vinagre.convert
 share/applications/vinagre-file.desktop
 share/applications/vinagre.desktop
 %%TELEPATHY%%share/dbus-1/services/org.freedesktop.Telepathy.Client.Vinagre.service
-%%PANEL%%share/dbus-1/services/org.gnome.panel.applet.Vinagre.service
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PANEL%%share/gnome-panel/4.0/applets/org.gnome.panel.Vinagre.panel-applet
+share/gnome/help/vinagre/C/connect-file.page
+share/gnome/help/vinagre/C/connect.page
 share/gnome/help/vinagre/C/figures/vinagre-auth-needed.png
-share/gnome/help/vinagre/C/figures/vinagre-bookmarks-side-panel.png
 share/gnome/help/vinagre/C/figures/vinagre-connect-dialog.png
-share/gnome/help/vinagre/C/figures/vinagre-editing-bookmarks.png
-share/gnome/help/vinagre/C/figures/vinagre-saving-bookmarks.png
-share/gnome/help/vinagre/C/figures/vinagre-screenshot.png
-share/gnome/help/vinagre/C/legal.xml
-share/gnome/help/vinagre/C/vinagre.xml
-share/gnome/help/vinagre/ca/figures/vinagre-auth-needed.png
-share/gnome/help/vinagre/ca/figures/vinagre-bookmarks-side-panel.png
-share/gnome/help/vinagre/ca/figures/vinagre-connect-dialog.png
-share/gnome/help/vinagre/ca/figures/vinagre-editing-bookmarks.png
-share/gnome/help/vinagre/ca/figures/vinagre-saving-bookmarks.png
-share/gnome/help/vinagre/ca/figures/vinagre-screenshot.png
-share/gnome/help/vinagre/ca/vinagre.xml
-share/gnome/help/vinagre/cs/figures/vinagre-auth-needed.png
-share/gnome/help/vinagre/cs/figures/vinagre-bookmarks-side-panel.png
-share/gnome/help/vinagre/cs/figures/vinagre-connect-dialog.png
-share/gnome/help/vinagre/cs/figures/vinagre-editing-bookmarks.png
-share/gnome/help/vinagre/cs/figures/vinagre-saving-bookmarks.png
-share/gnome/help/vinagre/cs/figures/vinagre-screenshot.png
-share/gnome/help/vinagre/cs/vinagre.xml
+share/gnome/help/vinagre/C/figures/vinagre-connected.png
+share/gnome/help/vinagre/C/figures/vinagre-connection-closed.png
+share/gnome/help/vinagre/C/figures/vinagre-fullscreen.png
+share/gnome/help/vinagre/C/figures/vinagre-no-scaling.png
+share/gnome/help/vinagre/C/figures/vinagre-reverse-connections.png
+share/gnome/help/vinagre/C/figures/vinagre-scaling.png
+share/gnome/help/vinagre/C/fullscreen.page
+share/gnome/help/vinagre/C/index.page
+share/gnome/help/vinagre/C/introduction.page
+share/gnome/help/vinagre/C/keyboard-shortcuts.page
+share/gnome/help/vinagre/C/reverse-connections.page
+share/gnome/help/vinagre/C/scaling.page
+share/gnome/help/vinagre/C/take-screenshot.page
+share/gnome/help/vinagre/C/view-only.page
+share/gnome/help/vinagre/de/connect-file.page
+share/gnome/help/vinagre/de/connect.page
 share/gnome/help/vinagre/de/figures/vinagre-auth-needed.png
-share/gnome/help/vinagre/de/figures/vinagre-bookmarks-side-panel.png
 share/gnome/help/vinagre/de/figures/vinagre-connect-dialog.png
-share/gnome/help/vinagre/de/figures/vinagre-editing-bookmarks.png
-share/gnome/help/vinagre/de/figures/vinagre-saving-bookmarks.png
-share/gnome/help/vinagre/de/figures/vinagre-screenshot.png
-share/gnome/help/vinagre/de/vinagre.xml
-share/gnome/help/vinagre/el/figures/vinagre-auth-needed.png
-share/gnome/help/vinagre/el/figures/vinagre-bookmarks-side-panel.png
-share/gnome/help/vinagre/el/figures/vinagre-connect-dialog.png
-share/gnome/help/vinagre/el/figures/vinagre-editing-bookmarks.png
-share/gnome/help/vinagre/el/figures/vinagre-saving-bookmarks.png
-share/gnome/help/vinagre/el/figures/vinagre-screenshot.png
-share/gnome/help/vinagre/el/vinagre.xml
-share/gnome/help/vinagre/en_GB/figures/vinagre-auth-needed.png
-share/gnome/help/vinagre/en_GB/figures/vinagre-bookmarks-side-panel.png
-share/gnome/help/vinagre/en_GB/figures/vinagre-connect-dialog.png
-share/gnome/help/vinagre/en_GB/figures/vinagre-editing-bookmarks.png
-share/gnome/help/vinagre/en_GB/figures/vinagre-saving-bookmarks.png
-share/gnome/help/vinagre/en_GB/figures/vinagre-screenshot.png
-share/gnome/help/vinagre/en_GB/vinagre.xml
+share/gnome/help/vinagre/de/figures/vinagre-connected.png
+share/gnome/help/vinagre/de/figures/vinagre-connection-closed.png
+share/gnome/help/vinagre/de/figures/vinagre-fullscreen.png
+share/gnome/help/vinagre/de/figures/vinagre-no-scaling.png
+share/gnome/help/vinagre/de/figures/vinagre-reverse-connections.png
+share/gnome/help/vinagre/de/figures/vinagre-scaling.png
+share/gnome/help/vinagre/de/fullscreen.page
+share/gnome/help/vinagre/de/index.page
+share/gnome/help/vinagre/de/introduction.page
+share/gnome/help/vinagre/de/keyboard-shortcuts.page
+share/gnome/help/vinagre/de/reverse-connections.page
+share/gnome/help/vinagre/de/scaling.page
+share/gnome/help/vinagre/de/take-screenshot.page
+share/gnome/help/vinagre/de/view-only.page
+share/gnome/help/vinagre/es/connect-file.page
+share/gnome/help/vinagre/es/connect.page
 share/gnome/help/vinagre/es/figures/vinagre-auth-needed.png
-share/gnome/help/vinagre/es/figures/vinagre-bookmarks-side-panel.png
 share/gnome/help/vinagre/es/figures/vinagre-connect-dialog.png
-share/gnome/help/vinagre/es/figures/vinagre-editing-bookmarks.png
-share/gnome/help/vinagre/es/figures/vinagre-saving-bookmarks.png
-share/gnome/help/vinagre/es/figures/vinagre-screenshot.png
-share/gnome/help/vinagre/es/vinagre.xml
-share/gnome/help/vinagre/fr/figures/vinagre-auth-needed.png
-share/gnome/help/vinagre/fr/figures/vinagre-bookmarks-side-panel.png
-share/gnome/help/vinagre/fr/figures/vinagre-connect-dialog.png
-share/gnome/help/vinagre/fr/figures/vinagre-editing-bookmarks.png
-share/gnome/help/vinagre/fr/figures/vinagre-saving-bookmarks.png
-share/gnome/help/vinagre/fr/figures/vinagre-screenshot.png
-share/gnome/help/vinagre/fr/vinagre.xml
-share/gnome/help/vinagre/it/figures/vinagre-auth-needed.png
-share/gnome/help/vinagre/it/figures/vinagre-bookmarks-side-panel.png
-share/gnome/help/vinagre/it/figures/vinagre-connect-dialog.png
-share/gnome/help/vinagre/it/figures/vinagre-editing-bookmarks.png
-share/gnome/help/vinagre/it/figures/vinagre-saving-bookmarks.png
-share/gnome/help/vinagre/it/figures/vinagre-screenshot.png
-share/gnome/help/vinagre/it/vinagre.xml
-share/gnome/help/vinagre/oc/figures/vinagre-auth-needed.png
-share/gnome/help/vinagre/oc/figures/vinagre-bookmarks-side-panel.png
-share/gnome/help/vinagre/oc/figures/vinagre-connect-dialog.png
-share/gnome/help/vinagre/oc/figures/vinagre-editing-bookmarks.png
-share/gnome/help/vinagre/oc/figures/vinagre-saving-bookmarks.png
-share/gnome/help/vinagre/oc/figures/vinagre-screenshot.png
-share/gnome/help/vinagre/oc/vinagre.xml
-share/gnome/help/vinagre/pl/figures/vinagre-auth-needed.png
-share/gnome/help/vinagre/pl/figures/vinagre-bookmarks-side-panel.png
-share/gnome/help/vinagre/pl/figures/vinagre-connect-dialog.png
-share/gnome/help/vinagre/pl/figures/vinagre-editing-bookmarks.png
-share/gnome/help/vinagre/pl/figures/vinagre-saving-bookmarks.png
-share/gnome/help/vinagre/pl/figures/vinagre-screenshot.png
-share/gnome/help/vinagre/pl/vinagre.xml
-share/gnome/help/vinagre/pt/figures/vinagre-auth-needed.png
-share/gnome/help/vinagre/pt/figures/vinagre-bookmarks-side-panel.png
-share/gnome/help/vinagre/pt/figures/vinagre-connect-dialog.png
-share/gnome/help/vinagre/pt/figures/vinagre-editing-bookmarks.png
-share/gnome/help/vinagre/pt/figures/vinagre-saving-bookmarks.png
-share/gnome/help/vinagre/pt/figures/vinagre-screenshot.png
-share/gnome/help/vinagre/pt/vinagre.xml
-share/gnome/help/vinagre/pt_BR/figures/vinagre-auth-needed.png
-share/gnome/help/vinagre/pt_BR/figures/vinagre-bookmarks-side-panel.png
-share/gnome/help/vinagre/pt_BR/figures/vinagre-connect-dialog.png
-share/gnome/help/vinagre/pt_BR/figures/vinagre-editing-bookmarks.png
-share/gnome/help/vinagre/pt_BR/figures/vinagre-saving-bookmarks.png
-share/gnome/help/vinagre/pt_BR/figures/vinagre-screenshot.png
-share/gnome/help/vinagre/pt_BR/vinagre.xml
+share/gnome/help/vinagre/es/figures/vinagre-connected.png
+share/gnome/help/vinagre/es/figures/vinagre-connection-closed.png
+share/gnome/help/vinagre/es/figures/vinagre-fullscreen.png
+share/gnome/help/vinagre/es/figures/vinagre-no-scaling.png
+share/gnome/help/vinagre/es/figures/vinagre-reverse-connections.png
+share/gnome/help/vinagre/es/figures/vinagre-scaling.png
+share/gnome/help/vinagre/es/fullscreen.page
+share/gnome/help/vinagre/es/index.page
+share/gnome/help/vinagre/es/introduction.page
+share/gnome/help/vinagre/es/keyboard-shortcuts.page
+share/gnome/help/vinagre/es/reverse-connections.page
+share/gnome/help/vinagre/es/scaling.page
+share/gnome/help/vinagre/es/take-screenshot.page
+share/gnome/help/vinagre/es/view-only.page
+share/gnome/help/vinagre/eu/connect-file.page
+share/gnome/help/vinagre/eu/connect.page
+share/gnome/help/vinagre/eu/figures/vinagre-auth-needed.png
+share/gnome/help/vinagre/eu/figures/vinagre-connect-dialog.png
+share/gnome/help/vinagre/eu/figures/vinagre-connected.png
+share/gnome/help/vinagre/eu/figures/vinagre-connection-closed.png
+share/gnome/help/vinagre/eu/figures/vinagre-fullscreen.png
+share/gnome/help/vinagre/eu/figures/vinagre-no-scaling.png
+share/gnome/help/vinagre/eu/figures/vinagre-reverse-connections.png
+share/gnome/help/vinagre/eu/figures/vinagre-scaling.png
+share/gnome/help/vinagre/eu/fullscreen.page
+share/gnome/help/vinagre/eu/index.page
+share/gnome/help/vinagre/eu/introduction.page
+share/gnome/help/vinagre/eu/keyboard-shortcuts.page
+share/gnome/help/vinagre/eu/reverse-connections.page
+share/gnome/help/vinagre/eu/scaling.page
+share/gnome/help/vinagre/eu/take-screenshot.page
+share/gnome/help/vinagre/eu/view-only.page
+share/gnome/help/vinagre/hu/connect-file.page
+share/gnome/help/vinagre/hu/connect.page
+share/gnome/help/vinagre/hu/figures/vinagre-auth-needed.png
+share/gnome/help/vinagre/hu/figures/vinagre-connect-dialog.png
+share/gnome/help/vinagre/hu/figures/vinagre-connected.png
+share/gnome/help/vinagre/hu/figures/vinagre-connection-closed.png
+share/gnome/help/vinagre/hu/figures/vinagre-fullscreen.png
+share/gnome/help/vinagre/hu/figures/vinagre-no-scaling.png
+share/gnome/help/vinagre/hu/figures/vinagre-reverse-connections.png
+share/gnome/help/vinagre/hu/figures/vinagre-scaling.png
+share/gnome/help/vinagre/hu/fullscreen.page
+share/gnome/help/vinagre/hu/index.page
+share/gnome/help/vinagre/hu/introduction.page
+share/gnome/help/vinagre/hu/keyboard-shortcuts.page
+share/gnome/help/vinagre/hu/reverse-connections.page
+share/gnome/help/vinagre/hu/scaling.page
+share/gnome/help/vinagre/hu/take-screenshot.page
+share/gnome/help/vinagre/hu/view-only.page
+share/gnome/help/vinagre/sl/connect-file.page
+share/gnome/help/vinagre/sl/connect.page
 share/gnome/help/vinagre/sl/figures/vinagre-auth-needed.png
-share/gnome/help/vinagre/sl/figures/vinagre-bookmarks-side-panel.png
 share/gnome/help/vinagre/sl/figures/vinagre-connect-dialog.png
-share/gnome/help/vinagre/sl/figures/vinagre-editing-bookmarks.png
-share/gnome/help/vinagre/sl/figures/vinagre-saving-bookmarks.png
-share/gnome/help/vinagre/sl/figures/vinagre-screenshot.png
-share/gnome/help/vinagre/sl/vinagre.xml
-share/gnome/help/vinagre/sq/figures/vinagre-auth-needed.png
-share/gnome/help/vinagre/sq/figures/vinagre-bookmarks-side-panel.png
-share/gnome/help/vinagre/sq/figures/vinagre-connect-dialog.png
-share/gnome/help/vinagre/sq/figures/vinagre-editing-bookmarks.png
-share/gnome/help/vinagre/sq/figures/vinagre-saving-bookmarks.png
-share/gnome/help/vinagre/sq/figures/vinagre-screenshot.png
-share/gnome/help/vinagre/sq/vinagre.xml
-share/gnome/help/vinagre/sv/figures/vinagre-auth-needed.png
-share/gnome/help/vinagre/sv/figures/vinagre-bookmarks-side-panel.png
-share/gnome/help/vinagre/sv/figures/vinagre-connect-dialog.png
-share/gnome/help/vinagre/sv/figures/vinagre-editing-bookmarks.png
-share/gnome/help/vinagre/sv/figures/vinagre-saving-bookmarks.png
-share/gnome/help/vinagre/sv/figures/vinagre-screenshot.png
-share/gnome/help/vinagre/sv/vinagre.xml
-share/gnome/help/vinagre/th/figures/vinagre-auth-needed.png
-share/gnome/help/vinagre/th/figures/vinagre-bookmarks-side-panel.png
-share/gnome/help/vinagre/th/figures/vinagre-connect-dialog.png
-share/gnome/help/vinagre/th/figures/vinagre-editing-bookmarks.png
-share/gnome/help/vinagre/th/figures/vinagre-saving-bookmarks.png
-share/gnome/help/vinagre/th/figures/vinagre-screenshot.png
-share/gnome/help/vinagre/th/vinagre.xml
-share/gnome/help/vinagre/zh_CN/figures/vinagre-auth-needed.png
-share/gnome/help/vinagre/zh_CN/figures/vinagre-bookmarks-side-panel.png
-share/gnome/help/vinagre/zh_CN/figures/vinagre-connect-dialog.png
-share/gnome/help/vinagre/zh_CN/figures/vinagre-editing-bookmarks.png
-share/gnome/help/vinagre/zh_CN/figures/vinagre-saving-bookmarks.png
-share/gnome/help/vinagre/zh_CN/figures/vinagre-screenshot.png
-share/gnome/help/vinagre/zh_CN/vinagre.xml
+share/gnome/help/vinagre/sl/figures/vinagre-connected.png
+share/gnome/help/vinagre/sl/figures/vinagre-connection-closed.png
+share/gnome/help/vinagre/sl/figures/vinagre-fullscreen.png
+share/gnome/help/vinagre/sl/figures/vinagre-no-scaling.png
+share/gnome/help/vinagre/sl/figures/vinagre-reverse-connections.png
+share/gnome/help/vinagre/sl/figures/vinagre-scaling.png
+share/gnome/help/vinagre/sl/fullscreen.page
+share/gnome/help/vinagre/sl/index.page
+share/gnome/help/vinagre/sl/introduction.page
+share/gnome/help/vinagre/sl/keyboard-shortcuts.page
+share/gnome/help/vinagre/sl/reverse-connections.page
+share/gnome/help/vinagre/sl/scaling.page
+share/gnome/help/vinagre/sl/take-screenshot.page
+share/gnome/help/vinagre/sl/view-only.page
 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
@@ -262,39 +208,12 @@ share/locale/zh_CN/LC_MESSAGES/vinagre.mo
 share/locale/zh_HK/LC_MESSAGES/vinagre.mo
 share/locale/zh_TW/LC_MESSAGES/vinagre.mo
 share/mime/packages/vinagre-mime.xml
-share/omf/vinagre/vinagre-C.omf
-share/omf/vinagre/vinagre-ca.omf
-share/omf/vinagre/vinagre-cs.omf
-share/omf/vinagre/vinagre-de.omf
-share/omf/vinagre/vinagre-el.omf
-share/omf/vinagre/vinagre-en_GB.omf
-share/omf/vinagre/vinagre-es.omf
-share/omf/vinagre/vinagre-fr.omf
-share/omf/vinagre/vinagre-it.omf
-share/omf/vinagre/vinagre-oc.omf
-share/omf/vinagre/vinagre-pl.omf
-share/omf/vinagre/vinagre-pt.omf
-share/omf/vinagre/vinagre-pt_BR.omf
-share/omf/vinagre/vinagre-sl.omf
-share/omf/vinagre/vinagre-sq.omf
-share/omf/vinagre/vinagre-sv.omf
-share/omf/vinagre/vinagre-th.omf
-share/omf/vinagre/vinagre-zh_CN.omf
 %%TELEPATHY%%share/telepathy/clients/Vinagre.client
-share/vinagre-3.0/plugins/reverse-vnc/reverse-vnc.ui
-%%DATADIR%%/GNOME_VinagreApplet.xml
-%%DATADIR%%/gir-1.0/Vinagre-3.0.gir
-%%DATADIR%%/vinagre-fav-ui.xml
 %%DATADIR%%/vinagre-ui.xml
 %%DATADIR%%/vinagre.ui
-@dirrm %%DATADIR%%/gir-1.0
-@dirrm share/vinagre-3.0/plugins/reverse-vnc
-@dirrm share/vinagre-3.0/plugins
-@dirrm share/vinagre-3.0
 @dirrm %%DATADIR%%
 %%TELEPATHY%%@dirrmtry share/telepathy/clients
 %%TELEPATHY%%@dirrmtry share/telepathy
-@dirrm share/omf/vinagre
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/ug/LC_MESSAGES
@@ -327,50 +246,21 @@ share/vinagre-3.0/plugins/reverse-vnc/reverse-vnc.ui
 @dirrmtry share/locale/ast
 @dirrmtry share/locale/as/LC_MESSAGES
 @dirrmtry share/locale/as
-@dirrm share/gnome/help/vinagre/zh_CN/figures
-@dirrm share/gnome/help/vinagre/zh_CN
-@dirrm share/gnome/help/vinagre/th/figures
-@dirrm share/gnome/help/vinagre/th
-@dirrm share/gnome/help/vinagre/sv/figures
-@dirrm share/gnome/help/vinagre/sv
-@dirrm share/gnome/help/vinagre/sq/figures
-@dirrm share/gnome/help/vinagre/sq
 @dirrm share/gnome/help/vinagre/sl/figures
 @dirrm share/gnome/help/vinagre/sl
-@dirrm share/gnome/help/vinagre/pt_BR/figures
-@dirrm share/gnome/help/vinagre/pt_BR
-@dirrm share/gnome/help/vinagre/pt/figures
-@dirrm share/gnome/help/vinagre/pt
-@dirrm share/gnome/help/vinagre/pl/figures
-@dirrm share/gnome/help/vinagre/pl
-@dirrm share/gnome/help/vinagre/oc/figures
-@dirrm share/gnome/help/vinagre/oc
-@dirrm share/gnome/help/vinagre/it/figures
-@dirrm share/gnome/help/vinagre/it
-@dirrm share/gnome/help/vinagre/fr/figures
-@dirrm share/gnome/help/vinagre/fr
+@dirrm share/gnome/help/vinagre/hu/figures
+@dirrm share/gnome/help/vinagre/hu
+@dirrm share/gnome/help/vinagre/eu/figures
+@dirrm share/gnome/help/vinagre/eu
 @dirrm share/gnome/help/vinagre/es/figures
 @dirrm share/gnome/help/vinagre/es
-@dirrm share/gnome/help/vinagre/en_GB/figures
-@dirrm share/gnome/help/vinagre/en_GB
-@dirrm share/gnome/help/vinagre/el/figures
-@dirrm share/gnome/help/vinagre/el
 @dirrm share/gnome/help/vinagre/de/figures
 @dirrm share/gnome/help/vinagre/de
-@dirrm share/gnome/help/vinagre/cs/figures
-@dirrm share/gnome/help/vinagre/cs
-@dirrm share/gnome/help/vinagre/ca/figures
-@dirrm share/gnome/help/vinagre/ca
 @dirrm share/gnome/help/vinagre/C/figures
 @dirrm share/gnome/help/vinagre/C
 @dirrm share/gnome/help/vinagre
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry share/applications
-@dirrm lib/vinagre-3.0/plugins
-@dirrm lib/vinagre-3.0/girepository-1.0
-@dirrm lib/vinagre-3.0
-@dirrm include/vinagre-3.0/vinagre
-@dirrm include/vinagre-3.0
 @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true