26 files changed, 285 insertions, 70 deletions

diff --git a/net/Makefile b/net/Makefile
index c9e7f5278815..858e2d55c7cc 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -172,6 +172,7 @@
     SUBDIR += geotrace
     SUBDIR += ggsd
     SUBDIR += gini
+    SUBDIR += gir-repository-avahi
     SUBDIR += gkrellm_snmp
     SUBDIR += gkrellmmultiping2
     SUBDIR += gkrellmqst
diff --git a/net/desktop-data-model/Makefile b/net/desktop-data-model/Makefile
index 48f6c6121a81..1384f38b98dc 100644
--- a/net/desktop-data-model/Makefile
+++ b/net/desktop-data-model/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	desktop-data-model
 PORTVERSION=	1.2.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	GNOME
 
@@ -28,7 +28,7 @@ LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre \
 USE_GMAKE=	yes
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
-USE_GNOME=	gnomehack gtk20 glib20 gnomedesktop
+USE_GNOME=	gnomehack gtk20 glib20 gnomedesktop gnomevfs2
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-maemo=no
 USE_XORG=	xscrnsaver
diff --git a/net/gir-repository-avahi/Makefile b/net/gir-repository-avahi/Makefile
new file mode 100644
index 000000000000..f56d432ae9fa
--- /dev/null
+++ b/net/gir-repository-avahi/Makefile
@@ -0,0 +1,15 @@
+# New ports collection makefile for:	gir-repository-avahi
+# Date created:				12 September 2009
+# Whom:					Alexander Logvinov <avl@FreeBSD.org>
+#
+# $FreeBSD$
+#   $MCom: ports/net/gir-repository-avahi/Makefile,v 1.1 2009/09/16 02:05:12 avl Exp $
+#
+
+CATEGORIES=	net
+
+MASTERDIR=	${.CURDIR}/../../devel/gir-repository
+
+PKGNAMESUFFIX=	-avahi
+
+.include "${MASTERDIR}/bsd.gir.mk"
diff --git a/net/gnome-netstatus/Makefile b/net/gnome-netstatus/Makefile
index 96cabbd421e5..3e3c718afa8c 100644
--- a/net/gnome-netstatus/Makefile
+++ b/net/gnome-netstatus/Makefile
@@ -3,11 +3,11 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/net/gnome-netstatus/Makefile,v 1.52 2009/03/08 19:32:04 marcus Exp $
+#   $MCom: ports/net/gnome-netstatus/Makefile,v 1.54 2009/09/22 20:42:40 kwm Exp $
 #
 
 PORTNAME=	gnome-netstatus
-PORTVERSION=	2.26.0
+PORTVERSION=	2.28.0
 PORTREVISION=	1
 CATEGORIES=	net gnome
 MASTER_SITES=	GNOME
@@ -19,7 +19,7 @@ COMMENT=	A GNOME applet that shows network status
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 USE_BZIP2=	yes
-USE_GNOME=	gnomehack intlhack gnomeprefix libgnome gnomepanel libglade2 \
+USE_GNOME=	gnomehack intlhack gnomeprefix libgnome gnomepanel \
 		gnomedocutils
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
diff --git a/net/gnome-netstatus/distinfo b/net/gnome-netstatus/distinfo
index 818e6650a3e8..eb908566bc84 100644
--- a/net/gnome-netstatus/distinfo
+++ b/net/gnome-netstatus/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-netstatus-2.26.0.tar.bz2) = f116157535ec185f0ea7503fafc5edd6
-SHA256 (gnome2/gnome-netstatus-2.26.0.tar.bz2) = 17169ef602037ac40e5d6b43a7add0593c9fe3f04da65aa06d70c59bc6bbccd8
-SIZE (gnome2/gnome-netstatus-2.26.0.tar.bz2) = 552061
+MD5 (gnome2/gnome-netstatus-2.28.0.tar.bz2) = c8469bbaae5cb84e17ef02e0e3560623
+SHA256 (gnome2/gnome-netstatus-2.28.0.tar.bz2) = 1b279a0ff92b0952d70dbcaccfcfb2fc7378e8f15355bc01e2d478313a31d90d
+SIZE (gnome2/gnome-netstatus-2.28.0.tar.bz2) = 542242
diff --git a/net/gnome-netstatus/pkg-plist b/net/gnome-netstatus/pkg-plist
index b3c64e8bcbd5..a55923c77d1f 100644
--- a/net/gnome-netstatus/pkg-plist
+++ b/net/gnome-netstatus/pkg-plist
@@ -1,7 +1,7 @@
 libdata/bonobo/servers/GNOME_NetstatusApplet_Factory.server
 libexec/gnome-netstatus-applet
 share/gnome-2.0/ui/GNOME_NetstatusApplet.xml
-share/gnome-netstatus/gnome-netstatus.glade
+share/gnome-netstatus/gnome-netstatus.ui
 share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-disconn.png
 share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-error.png
 share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-idle.png
@@ -24,6 +24,13 @@ share/gnome/help/gnome-netstatus/ca/figures/gnome-netstatus-rx.png
 share/gnome/help/gnome-netstatus/ca/figures/gnome-netstatus-tx.png
 share/gnome/help/gnome-netstatus/ca/figures/gnome-netstatus-txrx.png
 share/gnome/help/gnome-netstatus/ca/gnome-netstatus.xml
+share/gnome/help/gnome-netstatus/cs/figures/gnome-netstatus-disconn.png
+share/gnome/help/gnome-netstatus/cs/figures/gnome-netstatus-error.png
+share/gnome/help/gnome-netstatus/cs/figures/gnome-netstatus-idle.png
+share/gnome/help/gnome-netstatus/cs/figures/gnome-netstatus-rx.png
+share/gnome/help/gnome-netstatus/cs/figures/gnome-netstatus-tx.png
+share/gnome/help/gnome-netstatus/cs/figures/gnome-netstatus-txrx.png
+share/gnome/help/gnome-netstatus/cs/gnome-netstatus.xml
 share/gnome/help/gnome-netstatus/de/figures/gnome-netstatus-disconn.png
 share/gnome/help/gnome-netstatus/de/figures/gnome-netstatus-error.png
 share/gnome/help/gnome-netstatus/de/figures/gnome-netstatus-idle.png
@@ -31,7 +38,6 @@ share/gnome/help/gnome-netstatus/de/figures/gnome-netstatus-rx.png
 share/gnome/help/gnome-netstatus/de/figures/gnome-netstatus-tx.png
 share/gnome/help/gnome-netstatus/de/figures/gnome-netstatus-txrx.png
 share/gnome/help/gnome-netstatus/de/gnome-netstatus.xml
-share/gnome/help/gnome-netstatus/de/legal.xml
 share/gnome/help/gnome-netstatus/el/figures/gnome-netstatus-disconn.png
 share/gnome/help/gnome-netstatus/el/figures/gnome-netstatus-error.png
 share/gnome/help/gnome-netstatus/el/figures/gnome-netstatus-idle.png
@@ -139,7 +145,6 @@ share/gnome/help/gnome-netstatus/zh_CN/figures/gnome-netstatus-rx.png
 share/gnome/help/gnome-netstatus/zh_CN/figures/gnome-netstatus-tx.png
 share/gnome/help/gnome-netstatus/zh_CN/figures/gnome-netstatus-txrx.png
 share/gnome/help/gnome-netstatus/zh_CN/gnome-netstatus.xml
-share/gnome/help/gnome-netstatus/zh_CN/legal.xml
 share/gnome/help/gnome-netstatus/zh_HK/figures/gnome-netstatus-disconn.png
 share/gnome/help/gnome-netstatus/zh_HK/figures/gnome-netstatus-error.png
 share/gnome/help/gnome-netstatus/zh_HK/figures/gnome-netstatus-idle.png
@@ -157,8 +162,9 @@ share/gnome/help/gnome-netstatus/zh_TW/figures/gnome-netstatus-txrx.png
 share/gnome/help/gnome-netstatus/zh_TW/gnome-netstatus.xml
 share/gnome/help/gnome-netstatus/zh_TW/legal.xml
 share/omf/gnome-netstatus/gnome-netstatus-C.omf
-share/omf/gnome-netstatus/gnome-netstatus-ca.omf
 share/omf/gnome-netstatus/gnome-netstatus-bg.omf
+share/omf/gnome-netstatus/gnome-netstatus-ca.omf
+share/omf/gnome-netstatus/gnome-netstatus-cs.omf
 share/omf/gnome-netstatus/gnome-netstatus-de.omf
 share/omf/gnome-netstatus/gnome-netstatus-el.omf
 share/omf/gnome-netstatus/gnome-netstatus-en_GB.omf
@@ -189,6 +195,7 @@ share/icons/hicolor/48x48/apps/gnome-netstatus-tx.png
 share/icons/hicolor/48x48/apps/gnome-netstatus-txrx.png
 share/locale/af/LC_MESSAGES/gnome-netstatus.mo
 share/locale/ar/LC_MESSAGES/gnome-netstatus.mo
+share/locale/as/LC_MESSAGES/gnome-netstatus.mo
 share/locale/az/LC_MESSAGES/gnome-netstatus.mo
 share/locale/be@latin/LC_MESSAGES/gnome-netstatus.mo
 share/locale/bg/LC_MESSAGES/gnome-netstatus.mo
@@ -196,6 +203,7 @@ share/locale/bn/LC_MESSAGES/gnome-netstatus.mo
 share/locale/bn_IN/LC_MESSAGES/gnome-netstatus.mo
 share/locale/bs/LC_MESSAGES/gnome-netstatus.mo
 share/locale/ca/LC_MESSAGES/gnome-netstatus.mo
+share/locale/ca@valencia/LC_MESSAGES/gnome-netstatus.mo
 share/locale/crh/LC_MESSAGES/gnome-netstatus.mo
 share/locale/cs/LC_MESSAGES/gnome-netstatus.mo
 share/locale/cy/LC_MESSAGES/gnome-netstatus.mo
@@ -229,6 +237,7 @@ share/locale/ku/LC_MESSAGES/gnome-netstatus.mo
 share/locale/ko/LC_MESSAGES/gnome-netstatus.mo
 share/locale/lt/LC_MESSAGES/gnome-netstatus.mo
 share/locale/lv/LC_MESSAGES/gnome-netstatus.mo
+share/locale/mai/LC_MESSAGES/gnome-netstatus.mo
 share/locale/mg/LC_MESSAGES/gnome-netstatus.mo
 share/locale/ml/LC_MESSAGES/gnome-netstatus.mo
 share/locale/mn/LC_MESSAGES/gnome-netstatus.mo
@@ -304,6 +313,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-netstatus.mo
 @dirrm share/gnome/help/gnome-netstatus/el
 @dirrm share/gnome/help/gnome-netstatus/de/figures
 @dirrm share/gnome/help/gnome-netstatus/de
+@dirrm share/gnome/help/gnome-netstatus/cs/figures
+@dirrm share/gnome/help/gnome-netstatus/cs
 @dirrm share/gnome/help/gnome-netstatus/ca/figures
 @dirrm share/gnome/help/gnome-netstatus/ca
 @dirrm share/gnome/help/gnome-netstatus/bg/figures
@@ -332,12 +343,16 @@ share/locale/zh_TW/LC_MESSAGES/gnome-netstatus.mo
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mg/LC_MESSAGES
 @dirrmtry share/locale/mg
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
 @dirrmtry share/locale/fur/LC_MESSAGES
 @dirrmtry share/locale/fur
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
 @dirrmtry share/locale/crh/LC_MESSAGES
 @dirrmtry share/locale/crh
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
diff --git a/net/gnome-nettool/Makefile b/net/gnome-nettool/Makefile
index e9ab805f3663..1ba69bea6726 100644
--- a/net/gnome-nettool/Makefile
+++ b/net/gnome-nettool/Makefile
@@ -3,12 +3,11 @@
 # Whom:				Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/net/gnome-nettool/Makefile,v 1.50 2009/04/01 04:33:15 marcus Exp $
+#   $MCom: ports/net/gnome-nettool/Makefile,v 1.53 2009/09/22 20:29:52 kwm Exp $
 #
 
 PORTNAME=	gnome-nettool
-PORTVERSION=	2.26.2
-PORTREVISION=	1
+PORTVERSION=	2.28.0
 PORTEPOCH=	1
 CATEGORIES=	net gnome
 MASTER_SITES=	GNOME
diff --git a/net/gnome-nettool/distinfo b/net/gnome-nettool/distinfo
index 78126b6982d8..54837e4ca6a1 100644
--- a/net/gnome-nettool/distinfo
+++ b/net/gnome-nettool/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-nettool-2.26.2.tar.bz2) = fc1a730e25aa09dc1bef613c8ed6ab92
-SHA256 (gnome2/gnome-nettool-2.26.2.tar.bz2) = ac71ed4ba64e551f9905e69aa4472a9486030702e3712dd7e34b978ba582edc7
-SIZE (gnome2/gnome-nettool-2.26.2.tar.bz2) = 631631
+MD5 (gnome2/gnome-nettool-2.28.0.tar.bz2) = e5d44454cfa4c5ca5e640c304f18fe0e
+SHA256 (gnome2/gnome-nettool-2.28.0.tar.bz2) = ecce19920e2bf5b7cac8ffd26d8592adff7b895d1ee219b18a84a46313f36dd5
+SIZE (gnome2/gnome-nettool-2.28.0.tar.bz2) = 641475
diff --git a/net/gnome-nettool/files/patch-src_nettool.c b/net/gnome-nettool/files/patch-src_nettool.c
index 1009298e6f59..40e45446775a 100644
--- a/net/gnome-nettool/files/patch-src_nettool.c
+++ b/net/gnome-nettool/files/patch-src_nettool.c
@@ -1,5 +1,5 @@
---- src/nettool.c.orig	Fri Apr 14 08:36:08 2006
-+++ src/nettool.c	Fri May 12 15:54:15 2006
+--- src/nettool.c.orig	2009-06-18 13:51:14.000000000 -0400
++++ src/nettool.c	2009-07-19 16:05:59.000000000 -0400
 @@ -24,6 +24,7 @@
  #include <string.h>
  #include <sys/types.h>
@@ -8,7 +8,7 @@
  #include <signal.h>
  #include <errno.h>
  #include <sys/wait.h>
-@@ -360,6 +361,10 @@ netinfo_io_text_buffer_dialog (GIOChanne
+@@ -374,6 +375,10 @@ netinfo_io_text_buffer_dialog (GIOChanne
  						 	len, NULL);
  			}
  
@@ -19,14 +19,26 @@
  		} else if (status == G_IO_STATUS_AGAIN) {
  			char buf[1];
  
-@@ -371,12 +376,13 @@ netinfo_io_text_buffer_dialog (GIOChanne
+@@ -385,6 +390,8 @@ netinfo_io_text_buffer_dialog (GIOChanne
  				}
  				g_string_append_c (netinfo->command_output, buf[0]);
  			}
-+
 +			g_free (text);
 +			return TRUE;
  		} else if (status == G_IO_STATUS_EOF) {
+ 			
+ 		} else if (status == G_IO_STATUS_ERROR) {
+@@ -402,15 +409,15 @@ netinfo_io_text_buffer_dialog (GIOChanne
+ 
+ 			} else {
+ 				g_warning ("Error: %s\n", err->message);
+-				g_free (text);
+ 				g_free (err);
+ 			}
+ 
++			g_free (text);
++			return TRUE;
++
  		}
  
  		g_free (text);
diff --git a/net/gnome-nettool/pkg-plist b/net/gnome-nettool/pkg-plist
index cd15a3acf584..514782f3a70e 100644
--- a/net/gnome-nettool/pkg-plist
+++ b/net/gnome-nettool/pkg-plist
@@ -1,6 +1,6 @@
 bin/gnome-nettool
 share/applications/gnome-nettool.desktop
-%%DATADIR%%/dialogs/gnome-nettool.glade
+%%DATADIR%%/dialogs/gnome-nettool.ui
 %%DATADIR%%/pixmaps/16_ethernet.xpm
 %%DATADIR%%/pixmaps/16_loopback.xpm
 %%DATADIR%%/pixmaps/16_plip.xpm
@@ -40,8 +40,10 @@ share/locale/az/LC_MESSAGES/gnome-nettool.mo
 share/locale/bg/LC_MESSAGES/gnome-nettool.mo
 share/locale/bn/LC_MESSAGES/gnome-nettool.mo
 share/locale/bn_IN/LC_MESSAGES/gnome-nettool.mo
+share/locale/br/LC_MESSAGES/gnome-nettool.mo
 share/locale/bs/LC_MESSAGES/gnome-nettool.mo
 share/locale/ca/LC_MESSAGES/gnome-nettool.mo
+share/locale/ca@valencia/LC_MESSAGES/gnome-nettool.mo
 share/locale/cs/LC_MESSAGES/gnome-nettool.mo
 share/locale/cy/LC_MESSAGES/gnome-nettool.mo
 share/locale/da/LC_MESSAGES/gnome-nettool.mo
@@ -72,6 +74,7 @@ share/locale/ko/LC_MESSAGES/gnome-nettool.mo
 share/locale/ku/LC_MESSAGES/gnome-nettool.mo
 share/locale/lt/LC_MESSAGES/gnome-nettool.mo
 share/locale/lv/LC_MESSAGES/gnome-nettool.mo
+share/locale/mai/LC_MESSAGES/gnome-nettool.mo
 share/locale/mg/LC_MESSAGES/gnome-nettool.mo
 share/locale/mk/LC_MESSAGES/gnome-nettool.mo
 share/locale/ml/LC_MESSAGES/gnome-nettool.mo
@@ -173,10 +176,14 @@ share/pixmaps/gnome-nettool.png
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mg/LC_MESSAGES
 @dirrmtry share/locale/mg
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
+@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/as/LC_MESSAGES
diff --git a/net/gtk-vnc/Makefile b/net/gtk-vnc/Makefile
index 9f65e2bc0e2b..0d4a1c738629 100644
--- a/net/gtk-vnc/Makefile
+++ b/net/gtk-vnc/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gtk-vnc
-PORTVERSION=	0.3.9
-PORTREVISION=	1
+PORTVERSION=	0.3.10
 CATEGORIES=	net gnome
 MASTER_SITES=	GNOME
 
@@ -20,6 +19,7 @@ LIB_DEPENDS=	gnutls:${PORTSDIR}/security/gnutls \
 
 USE_GNOME=	pygtk2 gnomehack
 USE_GMAKE=	yes
+USE_GETTEXT=	yes
 USE_LDCONFIG=	yes
 USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
diff --git a/net/gtk-vnc/distinfo b/net/gtk-vnc/distinfo
index ea4379447be0..7d8a8e121f4a 100644
--- a/net/gtk-vnc/distinfo
+++ b/net/gtk-vnc/distinfo
@@ -1,3 +1,3 @@
-MD5 (gtk-vnc-0.3.9.tar.gz) = 26690465f413a017ae95514af9f4e41d
-SHA256 (gtk-vnc-0.3.9.tar.gz) = f0ac2dfcc814e1cf627eebd3efd2f93383f495e859c8ba2977d4d6afa73c44ca
-SIZE (gtk-vnc-0.3.9.tar.gz) = 577009
+MD5 (gtk-vnc-0.3.10.tar.gz) = 4d6ae40f7d9e6eff7b62488a2b728b2b
+SHA256 (gtk-vnc-0.3.10.tar.gz) = 61fdc1824e5621ba77a116fae7e512ced377a914ad34b2a694188277ca679384
+SIZE (gtk-vnc-0.3.10.tar.gz) = 604228
diff --git a/net/gtk-vnc/pkg-plist b/net/gtk-vnc/pkg-plist
index a53715865f5f..e57277615288 100644
--- a/net/gtk-vnc/pkg-plist
+++ b/net/gtk-vnc/pkg-plist
@@ -7,4 +7,17 @@ lib/libgtk-vnc-1.0.so.0
 %%PYTHON_SITELIBDIR%%/gtkvnc.la
 %%PYTHON_SITELIBDIR%%/gtkvnc.so
 libdata/pkgconfig/gtk-vnc-1.0.pc
+share/locale/de/LC_MESSAGES/gtk-vnc.mo
+share/locale/el/LC_MESSAGES/gtk-vnc.mo
+share/locale/en_GB/LC_MESSAGES/gtk-vnc.mo
+share/locale/es/LC_MESSAGES/gtk-vnc.mo
+share/locale/eu/LC_MESSAGES/gtk-vnc.mo
+share/locale/fr/LC_MESSAGES/gtk-vnc.mo
+share/locale/gl/LC_MESSAGES/gtk-vnc.mo
+share/locale/hu/LC_MESSAGES/gtk-vnc.mo
+share/locale/it/LC_MESSAGES/gtk-vnc.mo
+share/locale/pl/LC_MESSAGES/gtk-vnc.mo
+share/locale/pt/LC_MESSAGES/gtk-vnc.mo
+share/locale/pt_BR/LC_MESSAGES/gtk-vnc.mo
+share/locale/sv/LC_MESSAGES/gtk-vnc.mo
 @dirrm include/gtk-vnc-1.0
diff --git a/net/libgweather/Makefile b/net/libgweather/Makefile
index b5a62e7d2f79..5d8edd3b3429 100644
--- a/net/libgweather/Makefile
+++ b/net/libgweather/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Koop Mast <kwm@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports-stable/net/libgweather/Makefile,v 1.1 2009/04/15 22:11:37 kwm Exp $
+#   $MCom: ports/net/libgweather/Makefile,v 1.29 2009/09/22 02:46:21 avl Exp $
 #
 
 PORTNAME=	libgweather
-PORTVERSION=	2.26.2.1
-PORTREVISION=	1
+PORTVERSION=	2.28.0
 CATEGORIES=	net gnome
 MASTER_SITES=	GNOME
 
diff --git a/net/libgweather/distinfo b/net/libgweather/distinfo
index 4b824da42679..f9586ba79f19 100644
--- a/net/libgweather/distinfo
+++ b/net/libgweather/distinfo
@@ -1,3 +1,3 @@
-MD5 (libgweather-2.26.2.1.tar.bz2) = cef0447b62235c4662aa9691dd9a6c92
-SHA256 (libgweather-2.26.2.1.tar.bz2) = 70cf977060a5e71ade98346070856f09fbf33f6d88f4d49632d7ae0f6b314834
-SIZE (libgweather-2.26.2.1.tar.bz2) = 6367411
+MD5 (libgweather-2.28.0.tar.bz2) = 9f4457144d32d4004e0e045240ab51dc
+SHA256 (libgweather-2.28.0.tar.bz2) = 65fd8e4d7b617de7aac5a5d7d9bebde63ead828bcdc3e8f73f038ce03e669654
+SIZE (libgweather-2.28.0.tar.bz2) = 6320631
diff --git a/net/libgweather/pkg-plist b/net/libgweather/pkg-plist
index 049dc64a0c0a..b163c08c25d5 100644
--- a/net/libgweather/pkg-plist
+++ b/net/libgweather/pkg-plist
@@ -41,6 +41,7 @@ libdata/pkgconfig/gweather.pc
 %%DATADIR%%/Locations.bn_IN.xml
 %%DATADIR%%/Locations.bs.xml
 %%DATADIR%%/Locations.ca.xml
+%%DATADIR%%/Locations.ca@valencia.xml
 %%DATADIR%%/Locations.cs.xml
 %%DATADIR%%/Locations.cy.xml
 %%DATADIR%%/Locations.da.xml
@@ -121,6 +122,7 @@ share/locale/bn/LC_MESSAGES/libgweather.mo
 share/locale/bn_IN/LC_MESSAGES/libgweather.mo
 share/locale/bs/LC_MESSAGES/libgweather.mo
 share/locale/ca/LC_MESSAGES/libgweather.mo
+share/locale/ca@valencia/LC_MESSAGES/libgweather.mo
 share/locale/cs/LC_MESSAGES/libgweather.mo
 share/locale/cy/LC_MESSAGES/libgweather.mo
 share/locale/da/LC_MESSAGES/libgweather.mo
@@ -171,6 +173,7 @@ share/locale/ku/LC_MESSAGES/libgweather.mo
 share/locale/ky/LC_MESSAGES/libgweather.mo
 share/locale/lt/LC_MESSAGES/libgweather.mo
 share/locale/lv/LC_MESSAGES/libgweather.mo
+share/locale/mai/LC_MESSAGES/libgweather.mo
 share/locale/mg/LC_MESSAGES/libgweather.mo
 share/locale/mk/LC_MESSAGES/libgweather.mo
 share/locale/ml/LC_MESSAGES/libgweather.mo
@@ -229,6 +232,8 @@ share/locale/zh_TW/LC_MESSAGES/libgweather.mo
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mg/LC_MESSAGES
 @dirrmtry share/locale/mg
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
 @dirrmtry share/locale/ky/LC_MESSAGES
 @dirrmtry share/locale/ky
 @dirrmtry share/locale/ku/LC_MESSAGES
@@ -267,6 +272,8 @@ share/locale/zh_TW/LC_MESSAGES/libgweather.mo
 @dirrmtry share/locale/es_AR
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
+@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
diff --git a/net/libproxy-mozjs/Makefile b/net/libproxy-mozjs/Makefile
index bda76b26d235..7502d6229705 100644
--- a/net/libproxy-mozjs/Makefile
+++ b/net/libproxy-mozjs/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	net devel
 PKGNAMESUFFIX=	-mozjs
 
@@ -19,11 +19,15 @@ BUILD_WRKSRC=	${WRKSRC}/src/plugins
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 DESCR=		${.CURDIR}/pkg-descr
 PLIST=		${.CURDIR}/pkg-plist
-USE_GECKO=	firefox libxul
+USE_GECKO=	libxul
 CONFIGURE_ARGS=--without-gnome --without-kde --without-webkit \
 		--with-mozjs --without-networkmanager --without-python \
 		--without-envvar --without-file
 
 LIBPROXY_SLAVE=	yes
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|mozilla-js|mozilla-js libxul-unstable|g' \
+		${WRKSRC}/configure
+
 .include "${MASTERDIR}/Makefile"
diff --git a/net/libproxy-webkit/Makefile b/net/libproxy-webkit/Makefile
index a1ee24dc632b..67c44cb36a09 100644
--- a/net/libproxy-webkit/Makefile
+++ b/net/libproxy-webkit/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	7
 CATEGORIES=	net devel
 PKGNAMESUFFIX=	-webkit
 
@@ -13,7 +13,7 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	WebKit Javascript plug-in for libproxy
 
 LIB_DEPENDS=	proxy.0:${PORTSDIR}/net/libproxy \
-    		webkit-1.0.1:${PORTSDIR}/www/webkit-gtk2
+    		webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2
 
 MASTERDIR=	${.CURDIR}/../libproxy
 BUILD_WRKSRC=	${WRKSRC}/src/plugins
diff --git a/net/liferea/Makefile b/net/liferea/Makefile
index 880ce4a0bf45..b14e724c9443 100644
--- a/net/liferea/Makefile
+++ b/net/liferea/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	liferea
 PORTVERSION=	1.4.28
-PORTREVISION=	2
+PORTREVISION=	7
 CATEGORIES=	net gnome
 MASTER_SITES=	SF/${PORTNAME}/Liferea%20Stable/${PORTVERSION}
 
@@ -61,7 +61,7 @@ PLIST_SUB+=	GTKHTML="@comment "
 .endif
 
 .ifdef WITH_WEBKIT
-LIB_DEPENDS+=	webkit-1.0.1:${PORTSDIR}/www/webkit-gtk2
+LIB_DEPENDS+=	webkit-1.0.13:${PORTSDIR}/www/webkit-gtk2
 CONFIGURE_ARGS+=--enable-webkit
 PLIST_SUB+=	WEBKIT=""
 .else
diff --git a/net/vinagre/Makefile b/net/vinagre/Makefile
index ea7bd27f417b..692a0ab46a7b 100644
--- a/net/vinagre/Makefile
+++ b/net/vinagre/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports-stable/net/vinagre/Makefile,v 1.1 2009/04/15 09:36:08 kwm Exp $
+#   $MCom: ports/net/vinagre/Makefile,v 1.32 2009/10/19 13:20:56 avl Exp $
 #
 
 PORTNAME=	vinagre
-PORTVERSION=	2.26.2
-PORTREVISION=	1
+PORTVERSION=	2.28.1
 CATEGORIES=	net gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -23,13 +22,13 @@ LIB_DEPENDS=	gtk-vnc-1.0.0:${PORTSDIR}/net/gtk-vnc \
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
-USE_GNOME=	gnomeprefix intlhack gnomehack libglade2 gconf2 gnomedocutils \
+USE_GNOME=	gnomeprefix intlhack gnomehack vte gconf2 gnomedocutils \
 		gnomepanel
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
-CONFIGURE_ARGS=	--enable-avahi
+CONFIGURE_ARGS=	--enable-avahi --enable-applet -enable-ssh
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
@@ -37,6 +36,19 @@ GCONF_SCHEMAS=	vinagre.schemas
 
 MAN1=		vinagre.1
 
+OPTIONS=	TELEPATHY "Enable telepathy integration" on
+
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_TELEPATHY)
+CONFIGURE_ARGS+=--enable-telepathy
+LIB_DEPENDS+=	telepathy-glib.0:${PORTSDIR}/net-im/telepathy-glib
+PLIST_SUB+=	TELEPATHY=""
+.else
+CONFIGURE_ARGS+=--disable-telepathy
+PLIST_SUB+=	TELEPATHY="@comment "
+.endif
+
 post-install:
 	@-update-desktop-database > /dev/null
 	@-update-mime-database ${PREFIX}/share/mime > /dev/null
@@ -47,4 +59,4 @@ post-install:
 .endfor
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net/vinagre/distinfo b/net/vinagre/distinfo
index be3f82179e45..26137b5073ff 100644
--- a/net/vinagre/distinfo
+++ b/net/vinagre/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/vinagre-2.26.2.tar.bz2) = 86686bb8ba70a6cf38de48c45515c7fc
-SHA256 (gnome2/vinagre-2.26.2.tar.bz2) = 8a1e86dff5e1c14bb53f8f5ee579c7ddaaf532d5d7b1f66a2b5a239a65a15fb5
-SIZE (gnome2/vinagre-2.26.2.tar.bz2) = 1445532
+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
diff --git a/net/vinagre/pkg-plist b/net/vinagre/pkg-plist
index 01d26136148b..6f9d4155544f 100644
--- a/net/vinagre/pkg-plist
+++ b/net/vinagre/pkg-plist
@@ -1,45 +1,164 @@
 bin/vinagre
 libdata/bonobo/servers/GNOME_VinagreApplet.server
 libexec/vinagre-applet
+include/vinagre-1.0/vinagre/vinagre-app.h
+include/vinagre-1.0/vinagre/vinagre-bacon.h
+include/vinagre-1.0/vinagre/vinagre-bookmarks-entry.h
+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-commands.h
+include/vinagre-1.0/vinagre/vinagre-connect.h
+include/vinagre-1.0/vinagre/vinagre-connection.h
+include/vinagre-1.0/vinagre/vinagre-debug.h
+include/vinagre-1.0/vinagre/vinagre-dirs.h
+include/vinagre-1.0/vinagre/vinagre-dnd.h
+include/vinagre-1.0/vinagre/vinagre-fav.h
+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-tab.h
+include/vinagre-1.0/vinagre/vinagre-ui.h
+include/vinagre-1.0/vinagre/vinagre-utils.h
+include/vinagre-1.0/vinagre/vinagre-window.h
+lib/vinagre-1/plugin-loaders/libcloader.la
+lib/vinagre-1/plugin-loaders/libcloader.so
+lib/vinagre-1/plugins/libssh.la
+lib/vinagre-1/plugins/libssh.so
+lib/vinagre-1/plugins/libvnc.la
+lib/vinagre-1/plugins/libvnc.so
+lib/vinagre-1/plugins/ssh.vinagre-plugin
+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
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/MAINTAINERS
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
+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/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/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/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/icons/hicolor/16x16/apps/vinagre.png
@@ -69,8 +188,10 @@ share/locale/as/LC_MESSAGES/vinagre.mo
 share/locale/ast/LC_MESSAGES/vinagre.mo
 share/locale/be@latin/LC_MESSAGES/vinagre.mo
 share/locale/bg/LC_MESSAGES/vinagre.mo
+share/locale/bn/LC_MESSAGES/vinagre.mo
 share/locale/bn_IN/LC_MESSAGES/vinagre.mo
 share/locale/ca/LC_MESSAGES/vinagre.mo
+share/locale/ca@valencia/LC_MESSAGES/vinagre.mo
 share/locale/cs/LC_MESSAGES/vinagre.mo
 share/locale/da/LC_MESSAGES/vinagre.mo
 share/locale/de/LC_MESSAGES/vinagre.mo
@@ -81,6 +202,7 @@ share/locale/et/LC_MESSAGES/vinagre.mo
 share/locale/eu/LC_MESSAGES/vinagre.mo
 share/locale/fi/LC_MESSAGES/vinagre.mo
 share/locale/fr/LC_MESSAGES/vinagre.mo
+share/locale/ga/LC_MESSAGES/vinagre.mo
 share/locale/gl/LC_MESSAGES/vinagre.mo
 share/locale/gu/LC_MESSAGES/vinagre.mo
 share/locale/he/LC_MESSAGES/vinagre.mo
@@ -93,6 +215,7 @@ share/locale/ko/LC_MESSAGES/vinagre.mo
 share/locale/ku/LC_MESSAGES/vinagre.mo
 share/locale/lt/LC_MESSAGES/vinagre.mo
 share/locale/lv/LC_MESSAGES/vinagre.mo
+share/locale/mai/LC_MESSAGES/vinagre.mo
 share/locale/mk/LC_MESSAGES/vinagre.mo
 share/locale/ml/LC_MESSAGES/vinagre.mo
 share/locale/mr/LC_MESSAGES/vinagre.mo
@@ -135,6 +258,7 @@ 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-sq.omf
@@ -143,7 +267,7 @@ share/omf/vinagre/vinagre-th.omf
 share/omf/vinagre/vinagre-zh_CN.omf
 %%DATADIR%%/GNOME_VinagreApplet.xml
 %%DATADIR%%/vinagre-ui.xml
-%%DATADIR%%/vinagre.glade
+%%DATADIR%%/vinagre.ui
 @dirrm %%DATADIR%%
 @dirrm share/omf/vinagre
 @dirrm share/gnome/help/vinagre/zh_CN/figures
@@ -158,6 +282,8 @@ share/omf/vinagre/vinagre-zh_CN.omf
 @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
@@ -181,6 +307,11 @@ share/omf/vinagre/vinagre-zh_CN.omf
 @dirrm share/gnome/help/vinagre
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry share/applications
+@dirrm lib/vinagre-1/plugins
+@dirrm lib/vinagre-1/plugin-loaders
+@dirrm lib/vinagre-1
+@dirrm include/vinagre-1.0/vinagre
+@dirrm include/vinagre-1.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
@@ -197,8 +328,12 @@ share/omf/vinagre/vinagre-zh_CN.omf
 @dirrmtry share/locale/oc
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
+@dirrmtry share/locale/mai/LC_MESSAGES
+@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/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/be@latin/LC_MESSAGES
diff --git a/net/vino/Makefile b/net/vino/Makefile
index 590ec5fff2f1..34758e57111d 100644
--- a/net/vino/Makefile
+++ b/net/vino/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Tom McLaughlin <tmclaugh@sdf.lonestar.org>
 #
 # $FreeBSD$
-#   $MCom: ports-stable/net/vino/Makefile,v 1.1 2009/04/15 09:28:05 kwm Exp $
+#   $MCom: ports/net/vino/Makefile,v 1.76 2009/10/19 13:48:42 avl Exp $
 #
 
 PORTNAME=	vino
-PORTVERSION=	2.26.2
-PORTREVISION=	2
+PORTVERSION=	2.28.1
 CATEGORIES=	net gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/net/vino/distinfo b/net/vino/distinfo
index a8c196cd559d..32f15ef71773 100644
--- a/net/vino/distinfo
+++ b/net/vino/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/vino-2.26.2.tar.bz2) = 580a8f79130273f03cb57c32bba59120
-SHA256 (gnome2/vino-2.26.2.tar.bz2) = b42580887d91ed2ffc1f2e8e05f4dd0f7304abd98a04139bdb9a674022dd6913
-SIZE (gnome2/vino-2.26.2.tar.bz2) = 724845
+MD5 (gnome2/vino-2.28.1.tar.bz2) = 5cf3c006f0d0b5e0daa3b10bc94f0e0d
+SHA256 (gnome2/vino-2.28.1.tar.bz2) = bd86825546d2639ec3ea724efa013a84971f289c7903740418b2f2ca38f28ebe
+SIZE (gnome2/vino-2.28.1.tar.bz2) = 794178
diff --git a/net/vino/files/patch-server_vino-dbus-listener.c b/net/vino/files/patch-server_vino-dbus-listener.c
deleted file mode 100644
index 0744af11668d..000000000000
--- a/net/vino/files/patch-server_vino-dbus-listener.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- server/vino-dbus-listener.c.orig	2009-05-18 17:59:03.000000000 +0200
-+++ server/vino-dbus-listener.c	2009-05-19 10:13:22.000000000 +0200
-@@ -35,6 +35,8 @@
- #include <string.h>
- #include <unistd.h>
- #include <netdb.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/vino/pkg-plist b/net/vino/pkg-plist
index 9438f2de6b85..c065c6eff60e 100644
--- a/net/vino/pkg-plist
+++ b/net/vino/pkg-plist
@@ -3,6 +3,7 @@ bin/vino-preferences
 etc/xdg/autostart/vino-server.desktop
 libexec/vino-server
 share/applications/vino-preferences.desktop
+share/dbus-1/services/org.gnome.Vino.service
 share/locale/ar/LC_MESSAGES/vino.mo
 share/locale/as/LC_MESSAGES/vino.mo
 share/locale/ast/LC_MESSAGES/vino.mo
@@ -14,6 +15,7 @@ share/locale/bn/LC_MESSAGES/vino.mo
 share/locale/bn_IN/LC_MESSAGES/vino.mo
 share/locale/bs/LC_MESSAGES/vino.mo
 share/locale/ca/LC_MESSAGES/vino.mo
+share/locale/ca@valencia/LC_MESSAGES/vino.mo
 share/locale/cs/LC_MESSAGES/vino.mo
 share/locale/cy/LC_MESSAGES/vino.mo
 share/locale/da/LC_MESSAGES/vino.mo
@@ -28,6 +30,7 @@ share/locale/eu/LC_MESSAGES/vino.mo
 share/locale/fa/LC_MESSAGES/vino.mo
 share/locale/fi/LC_MESSAGES/vino.mo
 share/locale/fr/LC_MESSAGES/vino.mo
+share/locale/ga/LC_MESSAGES/vino.mo
 share/locale/gl/LC_MESSAGES/vino.mo
 share/locale/gu/LC_MESSAGES/vino.mo
 share/locale/he/LC_MESSAGES/vino.mo
@@ -43,6 +46,7 @@ share/locale/ko/LC_MESSAGES/vino.mo
 share/locale/ku/LC_MESSAGES/vino.mo
 share/locale/lt/LC_MESSAGES/vino.mo
 share/locale/lv/LC_MESSAGES/vino.mo
+share/locale/mai/LC_MESSAGES/vino.mo
 share/locale/mk/LC_MESSAGES/vino.mo
 share/locale/ml/LC_MESSAGES/vino.mo
 share/locale/mn/LC_MESSAGES/vino.mo
@@ -80,8 +84,8 @@ share/locale/xh/LC_MESSAGES/vino.mo
 share/locale/zh_CN/LC_MESSAGES/vino.mo
 share/locale/zh_HK/LC_MESSAGES/vino.mo
 share/locale/zh_TW/LC_MESSAGES/vino.mo
-%%DATADIR%%/vino-preferences.glade
-%%DATADIR%%/vino-prompt.glade
+%%DATADIR%%/vino-preferences.ui
+%%DATADIR%%/vino-prompt.ui
 %%DATADIR%%/webservices
 @dirrm %%DATADIR%%
 @dirrmtry share/applications
@@ -103,10 +107,14 @@ share/locale/zh_TW/LC_MESSAGES/vino.mo
 @dirrmtry share/locale/oc
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
+@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