Update to 2.29.6.

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

4 files changed, 21 insertions, 6 deletions

diff --git a/net/vinagre/Makefile b/net/vinagre/Makefile
index 690a79091..58c7b684d 100644
--- a/net/vinagre/Makefile
+++ b/net/vinagre/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/net/vinagre/Makefile,v 1.32 2009/10/19 13:20:56 avl Exp $
+#   $MCom: ports/net/vinagre/Makefile,v 1.34 2010/01/07 00:55:47 marcus Exp $
 #
 
 PORTNAME=	vinagre
-PORTVERSION=	2.29.1
+PORTVERSION=	2.29.6
 CATEGORIES=	net gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/net/vinagre/distinfo b/net/vinagre/distinfo
index 4be3e71b2..20d4387ac 100644
--- a/net/vinagre/distinfo
+++ b/net/vinagre/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/vinagre-2.29.1.tar.bz2) = c716d8aad8d3074bf6c02d5daba17ec4
-SHA256 (gnome2/vinagre-2.29.1.tar.bz2) = b4f35eec2d8398e5cf1aa20ca99de3633758a19bfed38f5e44f8901907db7eea
-SIZE (gnome2/vinagre-2.29.1.tar.bz2) = 1908464
+MD5 (gnome2/vinagre-2.29.6.tar.bz2) = ec40e514f16087bb1cf47626f54e7fe0
+SHA256 (gnome2/vinagre-2.29.6.tar.bz2) = 5ec2127ddc6de4c5521617c3d5a4452e8df084e3bbe99b86ef659f0e09849cef
+SIZE (gnome2/vinagre-2.29.6.tar.bz2) = 2281061
diff --git a/net/vinagre/files/patch-plugins_vnc_vinagre-vnc-tunnel.c b/net/vinagre/files/patch-plugins_vnc_vinagre-vnc-tunnel.c
new file mode 100644
index 000000000..13faf3de6
--- /dev/null
+++ b/net/vinagre/files/patch-plugins_vnc_vinagre-vnc-tunnel.c
@@ -0,0 +1,10 @@
+--- plugins/vnc/vinagre-vnc-tunnel.c.orig	2010-01-28 10:23:44.000000000 +0900
++++ plugins/vnc/vinagre-vnc-tunnel.c	2010-01-28 10:24:39.000000000 +0900
+@@ -21,6 +21,7 @@
+ 
+ #include <config.h>
+ #include <netinet/in.h>
++#include <sys/socket.h>
+ #include <unistd.h>
+ #include <glib/gi18n.h>
+ 
diff --git a/net/vinagre/pkg-plist b/net/vinagre/pkg-plist
index f5d1901e2..c2c0d541f 100644
--- a/net/vinagre/pkg-plist
+++ b/net/vinagre/pkg-plist
@@ -19,6 +19,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
@@ -34,7 +35,7 @@ lib/vinagre-1/plugins/vnc.vinagre-plugin
 libdata/pkgconfig/vinagre-1.0.pc
 share/applications/vinagre-file.desktop
 share/applications/vinagre.desktop
-%%TELEPATHY%%share/dbus-1/services/org.gnome.Empathy.StreamTubeHandler.rfb.service
+%%TELEPATHY%%share/dbus-1/services/org.freedesktop.Telepathy.Client.Vinagre.service
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
@@ -196,6 +197,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
@@ -265,6 +267,7 @@ 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-1/plugins/vnc/vnc.ui
 %%DATADIR%%/vinagre-fav-ui.xml
 %%DATADIR%%/GNOME_VinagreApplet.xml
@@ -274,6 +277,8 @@ share/vinagre-1/plugins/vnc/vnc.ui
 @dirrm share/vinagre-1/plugins/vnc
 @dirrm share/vinagre-1/plugins
 @dirrm share/vinagre-1
+%%TELEPATHY%%@dirrmtry share/telepathy/clients
+%%TELEPATHY%%@dirrmtry share/telepathy
 @dirrm share/omf/vinagre
 @dirrm share/gnome/help/vinagre/zh_CN/figures
 @dirrm share/gnome/help/vinagre/zh_CN