4 files changed, 34 insertions, 9 deletions

diff --git a/net/vinagre/Makefile b/net/vinagre/Makefile
index 5c18b870d9e9..fbffd7b562c1 100644
--- a/net/vinagre/Makefile
+++ b/net/vinagre/Makefile
@@ -3,12 +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.40 2010/05/04 14:13:29 kwm Exp $
 #
 
 PORTNAME=	vinagre
-PORTVERSION=	2.28.1
-PORTREVISION=	2
+PORTVERSION=	2.30.1
 CATEGORIES=	net gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/net/vinagre/distinfo b/net/vinagre/distinfo
index 26137b5073ff..b8e940468dbb 100644
--- a/net/vinagre/distinfo
+++ b/net/vinagre/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/vinagre-2.28.1.tar.bz2) = 3fec37a3e20d6f3641d905b580f7306a
-SHA256 (gnome2/vinagre-2.28.1.tar.bz2) = 774276784b3f097faf165dff37d1e9372098db5570421f4e213fa3c8e9808ad4
-SIZE (gnome2/vinagre-2.28.1.tar.bz2) = 1888223
+MD5 (gnome2/vinagre-2.30.1.tar.bz2) = 6ce972d2766ff5b3a64d2e5f1173b672
+SHA256 (gnome2/vinagre-2.30.1.tar.bz2) = cbe5bff8e6f7a81e46fde5b1d8a53a7dbdd66d13d998c24508cae08de657f2cf
+SIZE (gnome2/vinagre-2.30.1.tar.bz2) = 2413882
diff --git a/net/vinagre/files/patch-plugins_vnc_vinagre-vnc-listener-dialog.c b/net/vinagre/files/patch-plugins_vnc_vinagre-vnc-listener-dialog.c
new file mode 100644
index 000000000000..e855de33e28f
--- /dev/null
+++ b/net/vinagre/files/patch-plugins_vnc_vinagre-vnc-listener-dialog.c
@@ -0,0 +1,11 @@
+--- plugins/vnc/vinagre-vnc-listener-dialog.c.orig	2010-01-06 19:49:40.000000000 -0500
++++ plugins/vnc/vinagre-vnc-listener-dialog.c	2010-01-06 19:49:55.000000000 -0500
+@@ -18,6 +18,8 @@
+  * along with this program. If not, see <http://www.gnu.org/licenses/>.
+  */
+ 
++#include <sys/types.h>
++#include <sys/socket.h>
+ #include <net/if.h>
+ #include <arpa/inet.h>
+ #include <netinet/in.h>
diff --git a/net/vinagre/pkg-plist b/net/vinagre/pkg-plist
index 6f9d4155544f..4dcdd7cc677e 100644
--- a/net/vinagre/pkg-plist
+++ b/net/vinagre/pkg-plist
@@ -8,6 +8,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
@@ -19,6 +20,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 +36,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 +198,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
@@ -208,6 +211,7 @@ share/locale/gu/LC_MESSAGES/vinagre.mo
 share/locale/he/LC_MESSAGES/vinagre.mo
 share/locale/hi/LC_MESSAGES/vinagre.mo
 share/locale/hu/LC_MESSAGES/vinagre.mo
+share/locale/id/LC_MESSAGES/vinagre.mo
 share/locale/it/LC_MESSAGES/vinagre.mo
 share/locale/ja/LC_MESSAGES/vinagre.mo
 share/locale/kn/LC_MESSAGES/vinagre.mo
@@ -231,6 +235,7 @@ share/locale/pt_BR/LC_MESSAGES/vinagre.mo
 share/locale/ro/LC_MESSAGES/vinagre.mo
 share/locale/ru/LC_MESSAGES/vinagre.mo
 share/locale/si/LC_MESSAGES/vinagre.mo
+share/locale/sk/LC_MESSAGES/vinagre.mo
 share/locale/sl/LC_MESSAGES/vinagre.mo
 share/locale/sq/LC_MESSAGES/vinagre.mo
 share/locale/sr/LC_MESSAGES/vinagre.mo
@@ -265,10 +270,18 @@ 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
 %%DATADIR%%/vinagre-ui.xml
 %%DATADIR%%/vinagre.ui
 @dirrm %%DATADIR%%
+@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
@@ -332,8 +345,10 @@ share/omf/vinagre/vinagre-zh_CN.omf
 @dirrmtry share/locale/mai
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
-@dirrmtry share/locale/ca@valencia//LC_MESSAGES
-@dirrmtry share/locale/ca@valencia/
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/be@latin/LC_MESSAGES