- update to 3.2.0

x11/gnome/vinagre/Makefile

@@ -1,12 +1,11 @@
-# $OpenBSD: Makefile,v 1.45 2011/09/20 21:10:01 jasper Exp $
+# $OpenBSD: Makefile,v 1.46 2011/09/26 17:32:12 jasper Exp $
 
 SHARED_ONLY=	Yes
 
 COMMENT=	remote desktop viewer for GNOME
 
-GNOME_VERSION=	3.0.2
+GNOME_VERSION=	3.2.0
 GNOME_PROJECT=	vinagre
-REVISION=	2
 
 CATEGORIES=	net
 
@@ -23,12 +22,12 @@ WANTLIB += Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 avahi-client
 WANTLIB += avahi-common avahi-glib avahi-gobject avahi-ui-gtk3
 WANTLIB += c cairo cairo-gobject dbus-1 dbus-glib-1 drm expat
 WANTLIB += ffi fontconfig freetype gcrypt gdbm gdk-3 gdk_pixbuf-2.0
-WANTLIB += gio-2.0 girepository-1.0 glib-2.0 gmodule-2.0 gmp gnome-keyring
+WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gmp gnome-keyring
 WANTLIB += gnutls gobject-2.0 gpg-error gthread-2.0 gtk-3 gtk-vnc-2.0
 WANTLIB += gvnc-1.0 hogweed m nettle pango-1.0 pangocairo-1.0
-WANTLIB += pangoft2-1.0 pcre peas-1.0 peas-gtk-1.0 pixman-1 png
+WANTLIB += pangoft2-1.0 pcre pixman-1 png p11-kit stdc++
 WANTLIB += pthread pthread-stubs sasl2 tasn1 telepathy-glib util
-WANTLIB += xcb xcb-render xcb-shm xml2 z
+WANTLIB += xcb xcb-render xcb-shm xml2 z kvm
 
 MODULES=	devel/gettext \
 		x11/gnome \
@@ -43,7 +42,7 @@ LIB_DEPENDS=	devel/libpeas \
 		net/avahi,-gtk3,no_mono,no_qt3,no_qt4
 
 MODGNOME_DESKTOP_FILE=	Yes
-MODGNOME_TOOLS= goi yelp
+MODGNOME_TOOLS= 	yelp
 
 CONFIGURE_ARGS=	--with-avahi \
 		--with-telepathy \

x11/gnome/vinagre/distinfo

@@ -1,5 +1,5 @@
-MD5 (gnome/vinagre-3.0.2.tar.xz) = HaH5t87AZXnZeRXDDbD/Vw==
-RMD160 (gnome/vinagre-3.0.2.tar.xz) = FQTYnAfyUww8jGHSyipL0p20T1U=
-SHA1 (gnome/vinagre-3.0.2.tar.xz) = 1VuqPirMhZaEME8e6HESyKtcrWM=
-SHA256 (gnome/vinagre-3.0.2.tar.xz) = zdxgTKay5FqqWvVTBusp/EkQsp4Sc8SRW39g/XjaJk4=
-SIZE (gnome/vinagre-3.0.2.tar.xz) = 2193892
+MD5 (gnome/vinagre-3.2.0.tar.xz) = m8UR/X/fXRIB+TkivWJXag==
+RMD160 (gnome/vinagre-3.2.0.tar.xz) = 40LNSX4CuM0IZGwMDp+GeKbrfNA=
+SHA1 (gnome/vinagre-3.2.0.tar.xz) = 2tx1Getx2aQnQEXsU3Y+XpnvzQ8=
+SHA256 (gnome/vinagre-3.2.0.tar.xz) = m6DRMADYHQ5H9FaxOPUu8st6YDxxOBmTlSrMh8JeLmE=
+SIZE (gnome/vinagre-3.2.0.tar.xz) = 2423852

x11/gnome/vinagre/patches/patch-plugins_reverse-vnc_vinagre-reverse-vnc-listener-dialog_c

@@ -1,12 +0,0 @@
-$OpenBSD: patch-plugins_reverse-vnc_vinagre-reverse-vnc-listener-dialog_c,v 1.1 2011/09/12 07:28:55 jasper Exp $
---- plugins/reverse-vnc/vinagre-reverse-vnc-listener-dialog.c.orig	Thu Jul 14 18:06:24 2011
-+++ plugins/reverse-vnc/vinagre-reverse-vnc-listener-dialog.c	Thu Jul 14 18:06:36 2011
-@@ -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>

x11/gnome/vinagre/patches/patch-vinagre_vinagre-ssh_c

@@ -1,11 +1,11 @@
-$OpenBSD: patch-vinagre_vinagre-ssh_c,v 1.2 2011/09/12 07:28:55 jasper Exp $
---- vinagre/vinagre-ssh.c.orig	Sat Apr 24 11:09:16 2010
-+++ vinagre/vinagre-ssh.c	Sat Apr 24 11:09:32 2010
-@@ -20,6 +20,7 @@
-  */
- 
- #include <config.h>
+$OpenBSD: patch-vinagre_vinagre-ssh_c,v 1.3 2011/09/26 17:32:12 jasper Exp $
+--- vinagre/vinagre-ssh.c.orig	Mon Sep 26 19:05:02 2011
++++ vinagre/vinagre-ssh.c	Mon Sep 26 19:05:30 2011
+@@ -30,6 +30,7 @@
+ #include <gio/gwin32inputstream.h>
+ #include <gio/gwin32outputstream.h>
+ #else /* !G_OS_WIN32 */
 +#include <arpa/inet.h>
  #include <netinet/in.h>
- #include <unistd.h>
- #include <fcntl.h>
+ #include <gio/gunixinputstream.h>
+ #include <gio/gunixoutputstream.h>

x11/gnome/vinagre/pkg/PLIST

@@ -1,48 +1,13 @@
-@comment $OpenBSD: PLIST,v 1.15 2011/09/12 07:28:55 jasper Exp $
+@comment $OpenBSD: PLIST,v 1.16 2011/09/26 17:32:12 jasper Exp $
 @bin bin/vinagre
-include/vinagre-3.0/
-include/vinagre-3.0/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/pkgconfig/vinagre-3.0.pc
 lib/vinagre-3.0/
-lib/vinagre-3.0/girepository-1.0/
-lib/vinagre-3.0/girepository-1.0/Vinagre-3.0.typelib
 lib/vinagre-3.0/plugins/
-lib/vinagre-3.0/plugins/im-status.js
-lib/vinagre-3.0/plugins/im-status.plugin
 @comment lib/vinagre-3.0/plugins/librdp.a
 @comment lib/vinagre-3.0/plugins/librdp.la
 lib/vinagre-3.0/plugins/librdp.so
-@comment lib/vinagre-3.0/plugins/libreversevnc.a
-@comment lib/vinagre-3.0/plugins/libreversevnc.la
-lib/vinagre-3.0/plugins/libreversevnc.so
 @comment lib/vinagre-3.0/plugins/libvnc.a
 @comment lib/vinagre-3.0/plugins/libvnc.la
 lib/vinagre-3.0/plugins/libvnc.so
-lib/vinagre-3.0/plugins/rdp.plugin
-lib/vinagre-3.0/plugins/reverse-vnc.plugin
-lib/vinagre-3.0/plugins/vnc.plugin
 @man man/man1/vinagre.1
 share/GConf/gsettings/org.gnome.Vinagre.convert
 share/applications/vinagre-file.desktop
@@ -51,168 +16,145 @@ share/dbus-1/services/org.freedesktop.Telepathy.Client.Vinagre.service
 share/glib-2.0/schemas/org.gnome.Vinagre.gschema.xml
 share/gnome/help/vinagre/
 share/gnome/help/vinagre/C/
+share/gnome/help/vinagre/C/connect-file.page
+share/gnome/help/vinagre/C/connect.page
 share/gnome/help/vinagre/C/figures/
 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/
-share/gnome/help/vinagre/ca/figures/
-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/
-share/gnome/help/vinagre/cs/figures/
-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/
+share/gnome/help/vinagre/de/connect-file.page
+share/gnome/help/vinagre/de/connect.page
 share/gnome/help/vinagre/de/figures/
 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/
-share/gnome/help/vinagre/el/figures/
-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/
-share/gnome/help/vinagre/en_GB/figures/
-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/
+share/gnome/help/vinagre/es/connect-file.page
+share/gnome/help/vinagre/es/connect.page
 share/gnome/help/vinagre/es/figures/
 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/
-share/gnome/help/vinagre/fr/figures/
-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/
-share/gnome/help/vinagre/it/figures/
-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/
-share/gnome/help/vinagre/oc/figures/
-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/
-share/gnome/help/vinagre/pl/figures/
-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/
-share/gnome/help/vinagre/pt/figures/
-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/
-share/gnome/help/vinagre/pt_BR/figures/
-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/
+share/gnome/help/vinagre/eu/connect-file.page
+share/gnome/help/vinagre/eu/connect.page
+share/gnome/help/vinagre/eu/figures/
+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/gl/
+share/gnome/help/vinagre/gl/connect-file.page
+share/gnome/help/vinagre/gl/connect.page
+share/gnome/help/vinagre/gl/figures/
+share/gnome/help/vinagre/gl/figures/vinagre-auth-needed.png
+share/gnome/help/vinagre/gl/figures/vinagre-connect-dialog.png
+share/gnome/help/vinagre/gl/figures/vinagre-connected.png
+share/gnome/help/vinagre/gl/figures/vinagre-connection-closed.png
+share/gnome/help/vinagre/gl/figures/vinagre-fullscreen.png
+share/gnome/help/vinagre/gl/figures/vinagre-no-scaling.png
+share/gnome/help/vinagre/gl/figures/vinagre-reverse-connections.png
+share/gnome/help/vinagre/gl/figures/vinagre-scaling.png
+share/gnome/help/vinagre/gl/fullscreen.page
+share/gnome/help/vinagre/gl/index.page
+share/gnome/help/vinagre/gl/introduction.page
+share/gnome/help/vinagre/gl/keyboard-shortcuts.page
+share/gnome/help/vinagre/gl/reverse-connections.page
+share/gnome/help/vinagre/gl/scaling.page
+share/gnome/help/vinagre/gl/take-screenshot.page
+share/gnome/help/vinagre/gl/view-only.page
+share/gnome/help/vinagre/hu/
+share/gnome/help/vinagre/hu/connect-file.page
+share/gnome/help/vinagre/hu/connect.page
+share/gnome/help/vinagre/hu/figures/
+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/
+share/gnome/help/vinagre/sl/connect-file.page
+share/gnome/help/vinagre/sl/connect.page
 share/gnome/help/vinagre/sl/figures/
 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/
-share/gnome/help/vinagre/sq/figures/
-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/
-share/gnome/help/vinagre/sv/figures/
-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/
-share/gnome/help/vinagre/th/figures/
-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/
-share/gnome/help/vinagre/zh_CN/figures/
-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
@@ -299,37 +241,10 @@ 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/
-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
 share/telepathy/
 share/telepathy/clients/
 share/telepathy/clients/Vinagre.client
 share/vinagre/
-share/vinagre-3.0/
-share/vinagre-3.0/plugins/
-share/vinagre-3.0/plugins/reverse-vnc/
-share/vinagre-3.0/plugins/reverse-vnc/reverse-vnc.ui
-share/vinagre/GNOME_VinagreApplet.xml
-share/vinagre/gir-1.0/
-share/vinagre/gir-1.0/Vinagre-3.0.gir
-share/vinagre/vinagre-fav-ui.xml
 share/vinagre/vinagre-ui.xml
 share/vinagre/vinagre.ui
 @exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor

x11/gnome/vino/Makefile

@@ -1,11 +1,9 @@
-# $OpenBSD: Makefile,v 1.33 2011/09/20 21:10:01 jasper Exp $
+# $OpenBSD: Makefile,v 1.34 2011/09/26 17:32:22 jasper Exp $
 
 COMMENT=	GNOME desktop sharing server
 
 GNOME_PROJECT=	vino
-GNOME_VERSION=	3.0.3
-
-REVISION=	1
+GNOME_VERSION=	3.2.0
 
 CATEGORIES=	net
 
@@ -28,7 +26,7 @@ WANTLIB += gmodule-2.0 gmp gnome-keyring gnutls gobject-2.0 gpg-error
 WANTLIB += gthread-2.0 gtk-3 hogweed jpeg m nettle notify pango-1.0
 WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread
 WANTLIB += pthread-stubs soup-2.4 tasn1 telepathy-glib xcb xcb-render
-WANTLIB += xcb-shm xml2 z
+WANTLIB += xcb-shm xml2 z ffi kvm p11-kit stdc++
 
 LIB_DEPENDS=	devel/libnotify \
 		devel/libsoup \
@@ -38,7 +36,7 @@ LIB_DEPENDS=	devel/libnotify \
 		security/gnutls \
 		x11/gnome/libgnome-keyring
 
-MODGNOME_DESKTOP_FILE=		Yes
+MODGNOME_DESKTOP_FILE=	Yes
 MODGNOME_TOOLS= yelp
 
 CONFIGURE_ARGS=	--with-gnome-keyring \
@@ -47,6 +45,7 @@ CONFIGURE_ARGS=	--with-gnome-keyring \
 		--with-libnotify \
 		--with-telepathy \
 		--disable-ipv6
+
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 

x11/gnome/vino/distinfo

@@ -1,5 +1,5 @@
-MD5 (gnome/vino-3.0.3.tar.xz) = TzvL81HKSr9jN/Ou8tNVnQ==
-RMD160 (gnome/vino-3.0.3.tar.xz) = 12DEttTPYPpPFoq0CVs4j7YyxBQ=
-SHA1 (gnome/vino-3.0.3.tar.xz) = WbF6w8HxjPEM424UKwSicu8knfI=
-SHA256 (gnome/vino-3.0.3.tar.xz) = DlgCfTwQZJ2mFEXN1SBeMcTRqgtj9JEd49tOcFLXu/s=
-SIZE (gnome/vino-3.0.3.tar.xz) = 728292
+MD5 (gnome/vino-3.2.0.tar.xz) = vJC7izw5xL9rlcvP+DBFEA==
+RMD160 (gnome/vino-3.2.0.tar.xz) = qOY9zHt1zuOIjRvGCVVocGoohTo=
+SHA1 (gnome/vino-3.2.0.tar.xz) = x6CwsvxJmAetgEgvTlEiuO9k104=
+SHA256 (gnome/vino-3.2.0.tar.xz) = KyJzeqhMFbB4FdRzkvmm70z2+UEM9wJLuuU4SW4u2jc=
+SIZE (gnome/vino-3.2.0.tar.xz) = 743336

x11/gnome/vino/patches/patch-capplet_vino-preferences_desktop_in_in

@@ -1,19 +0,0 @@
-$OpenBSD: patch-capplet_vino-preferences_desktop_in_in,v 1.1 2011/09/12 07:28:55 jasper Exp $
-
-commit c4cbb311e2033650aef8d11e95cc83aef7f95540
-Author: David King <amigadave@amigadave.com>
-Date:   Fri Jul 1 19:45:38 2011 +0200
-
-    Add more categories to preferences desktop file
-
---- capplet/vino-preferences.desktop.in.in.orig	Mon Jul 11 17:11:29 2011
-+++ capplet/vino-preferences.desktop.in.in	Mon Jul 11 17:11:44 2011
-@@ -6,7 +6,7 @@ Icon=preferences-desktop-remote-desktop
- Terminal=false
- Type=Application
- StartupNotify=true
--Categories=GNOME;GTK;Settings;X-GNOME-NetworkSettings;
-+Categories=GNOME;GTK;Settings;X-GNOME-NetworkSettings;RemoteAccess;Network;
- OnlyShowIn=GNOME;
- X-GNOME-Bugzilla-Bugzilla=GNOME
- X-GNOME-Bugzilla-Product=vino

x11/gnome/vino/patches/patch-capplet_vino-preferences_ui

@@ -1,20 +1,15 @@
-$OpenBSD: patch-capplet_vino-preferences_ui,v 1.1 2011/09/12 07:28:55 jasper Exp $
---- capplet/vino-preferences.ui.orig	Mon May  2 18:38:15 2011
-+++ capplet/vino-preferences.ui	Tue Jul 12 08:13:56 2011
-@@ -261,10 +261,11 @@
+$OpenBSD: patch-capplet_vino-preferences_ui,v 1.2 2011/09/26 17:32:22 jasper Exp $
+--- capplet/vino-preferences.ui.orig	Mon Sep 26 19:01:05 2011
++++ capplet/vino-preferences.ui	Mon Sep 26 19:01:48 2011
+@@ -275,6 +275,7 @@
                              <property name="position">1</property>
                            </packing>
                          </child>
-+			<!-- Disabled, as it's not supported on OpenBSD.
++			<!-- Disable as it's not supported on OpenBSD.
                          <child>
                            <object class="GtkCheckButton" id="use_upnp_toggle">
-                             <property name="label" translatable="yes">_Configure network automatically to accept connections</property>
--                            <property name="visible">True</property>
-+                            <property name="visible">False</property>
-                             <property name="can_focus">True</property>
-                             <property name="receives_default">False</property>
-                             <property name="use_underline">True</property>
-@@ -274,6 +275,7 @@
+                             <property name="label" translatable="yes">Automatically _configure UPnP router to open and forward ports</property>
+@@ -290,6 +291,7 @@
                              <property name="position">2</property>
                            </packing>
                          </child>