diff --git a/x11/gnome/vinagre/Makefile b/x11/gnome/vinagre/Makefile
index 9221a21411f..40d09786917 100644
--- a/x11/gnome/vinagre/Makefile
+++ b/x11/gnome/vinagre/Makefile
@@ -1,18 +1,17 @@
-# $OpenBSD: Makefile,v 1.26 2010/03/29 07:53:51 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.27 2010/04/24 09:45:22 ajacoutot Exp $
SHARED_ONLY= Yes
COMMENT= VNC Client for the GNOME Desktop
-GNOME_VERSION= 2.28.1
+GNOME_VERSION= 2.30.0
GNOME_PROJECT= vinagre
-PKGNAME= ${DISTNAME}p1
CATEGORIES= net
HOMEPAGE= http://projects.gnome.org/vinagre/
-# GPLv2
+# GPLv3
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
@@ -22,13 +21,14 @@ WANTLIB += ICE ORBit-2 ORBitCosNaming-2 SM X11 Xau Xcomposite
WANTLIB += Xcursor Xdamage Xdmcp Xext Xfixes Xi Xinerama Xrandr
WANTLIB += Xrender art_lgpl_2 atk-1.0 avahi-client avahi-common
WANTLIB += avahi-glib avahi-gobject bonobo-2 bonobo-activation
-WANTLIB += bonoboui-2 c cairo crypto dbus-1 dbus-glib-1 expat
-WANTLIB += fontconfig freetype gailutil gcrypt gdbm gdk-x11-2.0
+WANTLIB += bonoboui-2 c cairo crypto dbus-1 dbus-glib-1 eggdbus-1
+WANTLIB += expat fontconfig freetype gailutil gcrypt gdbm gdk-x11-2.0
WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 glitz gmodule-2.0 gnome-2
WANTLIB += gnome-keyring gnomecanvas-2 gnomevfs-2 gnutls gobject-2.0
-WANTLIB += gpg-error gthread-2.0 gtk-x11-2.0 m pango-1.0 pangocairo-1.0
-WANTLIB += pangoft2-1.0 pcre pixman-1 png popt pthread pthread-stubs
-WANTLIB += sasl2 ssl tasn1 util xcb xml2 z
+WANTLIB += gpg-error gthread-2.0 gtk-x11-2.0 m pango-1.0
+WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png popt
+WANTLIB += pthread pthread-stubs sasl2 ssl tasn1 util xcb xcb-render
+WANTLIB += xcb-render-util xml2 z
MODULES= devel/gettext \
x11/gnome \
@@ -47,6 +47,10 @@ MODGCONF2_SCHEMAS_DIR= vinagre
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--enable-avahi
+
+# XXX console does not spawn (pthreads(3) or vte bug?)
+CONFIGURE_ARGS+= --enable-ssh=no
+
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11/gnome/vinagre/distinfo b/x11/gnome/vinagre/distinfo
index df82db025d9..c217c4641fb 100644
--- a/x11/gnome/vinagre/distinfo
+++ b/x11/gnome/vinagre/distinfo
@@ -1,5 +1,5 @@
-MD5 (gnome/vinagre-2.28.1.tar.bz2) = P+w3o+INbzZB2QW1gPcwag==
-RMD160 (gnome/vinagre-2.28.1.tar.bz2) = GIEr8GAyiTU1G2pL2THLYgQ+QQk=
-SHA1 (gnome/vinagre-2.28.1.tar.bz2) = DvD4dlWc9B5wsl6f290pEnGCLGg=
-SHA256 (gnome/vinagre-2.28.1.tar.bz2) = d0J2eEs/CX+vFl3/N9HpNyCY21VwQh9OIT+jyOmAitQ=
-SIZE (gnome/vinagre-2.28.1.tar.bz2) = 1888223
+MD5 (gnome/vinagre-2.30.0.tar.bz2) = eMXhiZ9l7P9sym7noq+kxQ==
+RMD160 (gnome/vinagre-2.30.0.tar.bz2) = 1C6FDjGjwIHKrKrbFNWt+FiOWfg=
+SHA1 (gnome/vinagre-2.30.0.tar.bz2) = vwRPENRJBLi5gjYOKD40icSX3+o=
+SHA256 (gnome/vinagre-2.30.0.tar.bz2) = d23nmRnXpEIOX6NXURH5vob0UD0F6rkhfiWJhfrTSCU=
+SIZE (gnome/vinagre-2.30.0.tar.bz2) = 2364794
diff --git a/x11/gnome/vinagre/patches/patch-Makefile_in b/x11/gnome/vinagre/patches/patch-Makefile_in
index 58550fed94e..901f5751aec 100644
--- a/x11/gnome/vinagre/patches/patch-Makefile_in
+++ b/x11/gnome/vinagre/patches/patch-Makefile_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-Makefile_in,v 1.4 2009/10/15 09:43:47 ajacoutot Exp $
---- Makefile.in.orig Mon Sep 21 13:46:09 2009
-+++ Makefile.in Wed Oct 14 14:34:06 2009
-@@ -702,7 +702,7 @@ info: info-recursive
+$OpenBSD: patch-Makefile_in,v 1.5 2010/04/24 09:45:22 ajacoutot Exp $
+--- Makefile.in.orig Mon Mar 29 14:58:55 2010
++++ Makefile.in Fri Apr 23 14:30:16 2010
+@@ -806,7 +806,7 @@ info: info-recursive
info-am:
diff --git a/x11/gnome/vinagre/patches/patch-plugins_vnc_vinagre-vnc-listener-dialog_c b/x11/gnome/vinagre/patches/patch-plugins_vnc_vinagre-vnc-listener-dialog_c
new file mode 100644
index 00000000000..c7407e78f94
--- /dev/null
+++ b/x11/gnome/vinagre/patches/patch-plugins_vnc_vinagre-vnc-listener-dialog_c
@@ -0,0 +1,12 @@
+$OpenBSD: patch-plugins_vnc_vinagre-vnc-listener-dialog_c,v 1.1 2010/04/24 09:45:22 ajacoutot Exp $
+--- plugins/vnc/vinagre-vnc-listener-dialog.c.orig Sat Apr 24 11:14:22 2010
++++ plugins/vnc/vinagre-vnc-listener-dialog.c Sat Apr 24 11:14:37 2010
+@@ -18,6 +18,8 @@
+ * along with this program. If not, see .
+ */
+
++#include
++#include
+ #include
+ #include
+ #include
diff --git a/x11/gnome/vinagre/patches/patch-plugins_vnc_vinagre-vnc-tunnel_c b/x11/gnome/vinagre/patches/patch-plugins_vnc_vinagre-vnc-tunnel_c
new file mode 100644
index 00000000000..f3ecc39aac4
--- /dev/null
+++ b/x11/gnome/vinagre/patches/patch-plugins_vnc_vinagre-vnc-tunnel_c
@@ -0,0 +1,11 @@
+$OpenBSD: patch-plugins_vnc_vinagre-vnc-tunnel_c,v 1.1 2010/04/24 09:45:22 ajacoutot Exp $
+--- plugins/vnc/vinagre-vnc-tunnel.c.orig Sat Apr 24 11:15:11 2010
++++ plugins/vnc/vinagre-vnc-tunnel.c Sat Apr 24 11:15:30 2010
+@@ -20,6 +20,7 @@
+ */
+
+ #include
++#include
+ #include
+ #include
+ #include
diff --git a/x11/gnome/vinagre/patches/patch-vinagre_vinagre-ssh_c b/x11/gnome/vinagre/patches/patch-vinagre_vinagre-ssh_c
new file mode 100644
index 00000000000..19c0b318c70
--- /dev/null
+++ b/x11/gnome/vinagre/patches/patch-vinagre_vinagre-ssh_c
@@ -0,0 +1,11 @@
+$OpenBSD: patch-vinagre_vinagre-ssh_c,v 1.1 2010/04/24 09:45:22 ajacoutot 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
++#include
+ #include
+ #include
+ #include
diff --git a/x11/gnome/vinagre/pkg/PLIST b/x11/gnome/vinagre/pkg/PLIST
index 90e94f6a82b..3d1361cb16b 100644
--- a/x11/gnome/vinagre/pkg/PLIST
+++ b/x11/gnome/vinagre/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.10 2009/12/21 18:03:20 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.11 2010/04/24 09:45:22 ajacoutot Exp $
@bin bin/vinagre
include/vinagre-1.0/
include/vinagre-1.0/vinagre/
@@ -9,6 +9,7 @@ include/vinagre-1.0/vinagre/vinagre-bookmarks-migration.h
include/vinagre-1.0/vinagre/vinagre-bookmarks-tree.h
include/vinagre-1.0/vinagre/vinagre-bookmarks-ui.h
include/vinagre-1.0/vinagre/vinagre-bookmarks.h
+include/vinagre-1.0/vinagre/vinagre-cache-prefs.h
include/vinagre-1.0/vinagre/vinagre-commands.h
include/vinagre-1.0/vinagre/vinagre-connect.h
include/vinagre-1.0/vinagre/vinagre-connection.h
@@ -20,6 +21,7 @@ include/vinagre-1.0/vinagre/vinagre-notebook.h
include/vinagre-1.0/vinagre/vinagre-plugin-loader.h
include/vinagre-1.0/vinagre/vinagre-plugin.h
include/vinagre-1.0/vinagre/vinagre-prefs.h
+include/vinagre-1.0/vinagre/vinagre-ssh.h
include/vinagre-1.0/vinagre/vinagre-tab.h
include/vinagre-1.0/vinagre/vinagre-ui.h
include/vinagre-1.0/vinagre/vinagre-utils.h
@@ -40,7 +42,7 @@ lib/vinagre-1/plugins/vnc.vinagre-plugin
@man man/man1/vinagre.1
share/applications/vinagre-file.desktop
share/applications/vinagre.desktop
-share/dbus-1/services/org.gnome.Empathy.StreamTubeHandler.rfb.service
+share/dbus-1/services/org.freedesktop.Telepathy.Client.Vinagre.service
share/gnome/help/vinagre/
share/gnome/help/vinagre/C/
share/gnome/help/vinagre/C/figures/
@@ -231,6 +233,7 @@ share/locale/cs/LC_MESSAGES/vinagre.mo
share/locale/da/LC_MESSAGES/vinagre.mo
share/locale/de/LC_MESSAGES/vinagre.mo
share/locale/el/LC_MESSAGES/vinagre.mo
+share/locale/en@shaw/LC_MESSAGES/vinagre.mo
share/locale/en_GB/LC_MESSAGES/vinagre.mo
share/locale/es/LC_MESSAGES/vinagre.mo
share/locale/et/LC_MESSAGES/vinagre.mo
@@ -303,8 +306,16 @@ share/omf/vinagre/vinagre-zh_CN.omf
${SCHEMAS_INSTDIR}/
${SCHEMAS_INSTDIR}/vinagre.schemas
@exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null
+share/telepathy/
+share/telepathy/clients/
+share/telepathy/clients/Vinagre.client
share/vinagre/
+share/vinagre-1/
+share/vinagre-1/plugins/
+share/vinagre-1/plugins/vnc/
+share/vinagre-1/plugins/vnc/vnc.ui
share/vinagre/GNOME_VinagreApplet.xml
+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