19 files changed, 444 insertions, 53 deletions

diff --git a/net/desktop-data-model/Makefile b/net/desktop-data-model/Makefile
index 3311277558f2..e3b34d4f4758 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=	5
+PORTREVISION=	6
 CATEGORIES=	net
 MASTER_SITES=	GNOME
 
diff --git a/net/gnome-netstatus/Makefile b/net/gnome-netstatus/Makefile
index 365776934e95..46e86f18e4b5 100644
--- a/net/gnome-netstatus/Makefile
+++ b/net/gnome-netstatus/Makefile
@@ -3,12 +3,11 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/net/gnome-netstatus/Makefile,v 1.54 2009/09/22 20:42:40 kwm Exp $
+#   $MCom: ports/net/gnome-netstatus/Makefile,v 1.56 2010/04/01 16:16:57 kwm Exp $
 #
 
 PORTNAME=	gnome-netstatus
-PORTVERSION=	2.28.0
-PORTREVISION=	3
+PORTVERSION=	2.28.1
 CATEGORIES=	net gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/net/gnome-netstatus/distinfo b/net/gnome-netstatus/distinfo
index eb908566bc84..f2ab01fcae52 100644
--- a/net/gnome-netstatus/distinfo
+++ b/net/gnome-netstatus/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (gnome2/gnome-netstatus-2.28.1.tar.bz2) = 8ecc95396c9d1c7d963a7f232ca370f8
+SHA256 (gnome2/gnome-netstatus-2.28.1.tar.bz2) = 9e6bb618283d2c96afd7365f998b415a7ee9539957fcf8bd4cd58cf8e877a335
+SIZE (gnome2/gnome-netstatus-2.28.1.tar.bz2) = 572012
diff --git a/net/gnome-netstatus/pkg-plist b/net/gnome-netstatus/pkg-plist
index a55923c77d1f..874acacb75f2 100644
--- a/net/gnome-netstatus/pkg-plist
+++ b/net/gnome-netstatus/pkg-plist
@@ -196,6 +196,7 @@ 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/ast/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
@@ -211,6 +212,7 @@ share/locale/da/LC_MESSAGES/gnome-netstatus.mo
 share/locale/de/LC_MESSAGES/gnome-netstatus.mo
 share/locale/dz/LC_MESSAGES/gnome-netstatus.mo
 share/locale/el/LC_MESSAGES/gnome-netstatus.mo
+share/locale/en@shaw/LC_MESSAGES/gnome-netstatus.mo
 share/locale/en_CA/LC_MESSAGES/gnome-netstatus.mo
 share/locale/en_GB/LC_MESSAGES/gnome-netstatus.mo
 share/locale/es/LC_MESSAGES/gnome-netstatus.mo
@@ -349,13 +351,17 @@ share/locale/zh_TW/LC_MESSAGES/gnome-netstatus.mo
 @dirrmtry share/locale/ku
 @dirrmtry share/locale/fur/LC_MESSAGES
 @dirrmtry share/locale/fur
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
 @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
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/be@latin/LC_MESSAGES
 @dirrmtry share/locale/be@latin
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
diff --git a/net/gnome-nettool/Makefile b/net/gnome-nettool/Makefile
index ef26029e4d07..87861e32c4b2 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.53 2009/09/22 20:29:52 kwm Exp $
+#   $MCom: ports/net/gnome-nettool/Makefile,v 1.55 2010/04/01 16:28:19 kwm Exp $
 #
 
 PORTNAME=	gnome-nettool
-PORTVERSION=	2.28.0
-PORTREVISION=	2
+PORTVERSION=	2.30.0
 PORTEPOCH=	1
 CATEGORIES=	net gnome
 MASTER_SITES=	GNOME
diff --git a/net/gnome-nettool/distinfo b/net/gnome-nettool/distinfo
index 54837e4ca6a1..e008c15021a6 100644
--- a/net/gnome-nettool/distinfo
+++ b/net/gnome-nettool/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (gnome2/gnome-nettool-2.30.0.tar.bz2) = 2087259219cf16d434c52b4a5710b4c7
+SHA256 (gnome2/gnome-nettool-2.30.0.tar.bz2) = 42fdc867d26b31145986fd99e06509229b118430f2d666070c5dac7cff1dd000
+SIZE (gnome2/gnome-nettool-2.30.0.tar.bz2) = 651732
diff --git a/net/gnome-nettool/pkg-plist b/net/gnome-nettool/pkg-plist
index 514782f3a70e..c0c67a307737 100644
--- a/net/gnome-nettool/pkg-plist
+++ b/net/gnome-nettool/pkg-plist
@@ -50,6 +50,7 @@ share/locale/da/LC_MESSAGES/gnome-nettool.mo
 share/locale/de/LC_MESSAGES/gnome-nettool.mo
 share/locale/dz/LC_MESSAGES/gnome-nettool.mo
 share/locale/el/LC_MESSAGES/gnome-nettool.mo
+share/locale/en@shaw/LC_MESSAGES/gnome-nettool.mo
 share/locale/en_CA/LC_MESSAGES/gnome-nettool.mo
 share/locale/en_GB/LC_MESSAGES/gnome-nettool.mo
 share/locale/es/LC_MESSAGES/gnome-nettool.mo
@@ -180,6 +181,8 @@ share/pixmaps/gnome-nettool.png
 @dirrmtry share/locale/mai
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/ca@valencia/LC_MESSAGES
diff --git a/net/libgweather/Makefile b/net/libgweather/Makefile
index b9c1675e9a65..0f12b9971c48 100644
--- a/net/libgweather/Makefile
+++ b/net/libgweather/Makefile
@@ -3,24 +3,25 @@
 # Whom:					Koop Mast <kwm@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/net/libgweather/Makefile,v 1.29 2009/09/22 02:46:21 avl Exp $
+#   $MCom: ports/net/libgweather/Makefile,v 1.40 2010/04/02 05:22:25 avl Exp $
 #
 
 PORTNAME=	libgweather
-PORTVERSION=	2.28.0
-PORTREVISION=	2
+PORTVERSION=	2.30.0
 CATEGORIES=	net gnome
 MASTER_SITES=	GNOME
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Library to accessing online weather informations
 
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
 LIB_DEPENDS=	soup-2.4.1:${PORTSDIR}/devel/libsoup
+RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
 
 USE_GETTEXT=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack gtk20 gnomevfs2 ltverhack
+USE_GNOME=	gnomeprefix gnomehack intlhack gconf2 ltverhack
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool:22
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/net/libgweather/distinfo b/net/libgweather/distinfo
index f9586ba79f19..8bcf1e8d0807 100644
--- a/net/libgweather/distinfo
+++ b/net/libgweather/distinfo
@@ -1,3 +1,3 @@
-MD5 (libgweather-2.28.0.tar.bz2) = 9f4457144d32d4004e0e045240ab51dc
-SHA256 (libgweather-2.28.0.tar.bz2) = 65fd8e4d7b617de7aac5a5d7d9bebde63ead828bcdc3e8f73f038ce03e669654
-SIZE (libgweather-2.28.0.tar.bz2) = 6320631
+MD5 (libgweather-2.30.0.tar.bz2) = bf7ae6cb4eca85be3e9099a5de94c655
+SHA256 (libgweather-2.30.0.tar.bz2) = 25cd8976f98b79f7c336551bea7179a5b29027e95d3ba6a046c638422d440548
+SIZE (libgweather-2.30.0.tar.bz2) = 7314206
diff --git a/net/libgweather/pkg-plist b/net/libgweather/pkg-plist
index b163c08c25d5..5b9f540b9702 100644
--- a/net/libgweather/pkg-plist
+++ b/net/libgweather/pkg-plist
@@ -30,15 +30,367 @@ libdata/pkgconfig/gweather.pc
 %%DOCSDIR%%/right.png
 %%DOCSDIR%%/style.css
 %%DOCSDIR%%/up.png
+share/icons/gnome/16x16/status/weather-clear-night-000.png
+share/icons/gnome/16x16/status/weather-clear-night-010.png
+share/icons/gnome/16x16/status/weather-clear-night-020.png
+share/icons/gnome/16x16/status/weather-clear-night-030.png
+share/icons/gnome/16x16/status/weather-clear-night-040.png
+share/icons/gnome/16x16/status/weather-clear-night-050.png
+share/icons/gnome/16x16/status/weather-clear-night-060.png
+share/icons/gnome/16x16/status/weather-clear-night-070.png
+share/icons/gnome/16x16/status/weather-clear-night-080.png
+share/icons/gnome/16x16/status/weather-clear-night-090.png
+share/icons/gnome/16x16/status/weather-clear-night-100.png
+share/icons/gnome/16x16/status/weather-clear-night-110.png
+share/icons/gnome/16x16/status/weather-clear-night-120.png
+share/icons/gnome/16x16/status/weather-clear-night-130.png
+share/icons/gnome/16x16/status/weather-clear-night-140.png
+share/icons/gnome/16x16/status/weather-clear-night-150.png
+share/icons/gnome/16x16/status/weather-clear-night-160.png
+share/icons/gnome/16x16/status/weather-clear-night-170.png
+share/icons/gnome/16x16/status/weather-clear-night-190.png
+share/icons/gnome/16x16/status/weather-clear-night-200.png
+share/icons/gnome/16x16/status/weather-clear-night-210.png
+share/icons/gnome/16x16/status/weather-clear-night-220.png
+share/icons/gnome/16x16/status/weather-clear-night-230.png
+share/icons/gnome/16x16/status/weather-clear-night-240.png
+share/icons/gnome/16x16/status/weather-clear-night-250.png
+share/icons/gnome/16x16/status/weather-clear-night-260.png
+share/icons/gnome/16x16/status/weather-clear-night-270.png
+share/icons/gnome/16x16/status/weather-clear-night-280.png
+share/icons/gnome/16x16/status/weather-clear-night-290.png
+share/icons/gnome/16x16/status/weather-clear-night-300.png
+share/icons/gnome/16x16/status/weather-clear-night-310.png
+share/icons/gnome/16x16/status/weather-clear-night-320.png
+share/icons/gnome/16x16/status/weather-clear-night-330.png
+share/icons/gnome/16x16/status/weather-clear-night-340.png
+share/icons/gnome/16x16/status/weather-clear-night-350.png
+share/icons/gnome/16x16/status/weather-few-clouds-night-000.png
+share/icons/gnome/16x16/status/weather-few-clouds-night-010.png
+share/icons/gnome/16x16/status/weather-few-clouds-night-020.png
+share/icons/gnome/16x16/status/weather-few-clouds-night-030.png
+share/icons/gnome/16x16/status/weather-few-clouds-night-040.png
+share/icons/gnome/16x16/status/weather-few-clouds-night-050.png
+share/icons/gnome/16x16/status/weather-few-clouds-night-060.png
+share/icons/gnome/16x16/status/weather-few-clouds-night-070.png
+share/icons/gnome/16x16/status/weather-few-clouds-night-080.png
+share/icons/gnome/16x16/status/weather-few-clouds-night-090.png
+share/icons/gnome/16x16/status/weather-few-clouds-night-100.png
+share/icons/gnome/16x16/status/weather-few-clouds-night-110.png
+share/icons/gnome/16x16/status/weather-few-clouds-night-120.png
+share/icons/gnome/16x16/status/weather-few-clouds-night-130.png
+share/icons/gnome/16x16/status/weather-few-clouds-night-140.png
+share/icons/gnome/16x16/status/weather-few-clouds-night-150.png
+share/icons/gnome/16x16/status/weather-few-clouds-night-160.png
+share/icons/gnome/16x16/status/weather-few-clouds-night-170.png
+share/icons/gnome/16x16/status/weather-few-clouds-night-190.png
+share/icons/gnome/16x16/status/weather-few-clouds-night-200.png
+share/icons/gnome/16x16/status/weather-few-clouds-night-210.png
+share/icons/gnome/16x16/status/weather-few-clouds-night-220.png
+share/icons/gnome/16x16/status/weather-few-clouds-night-230.png
+share/icons/gnome/16x16/status/weather-few-clouds-night-240.png
+share/icons/gnome/16x16/status/weather-few-clouds-night-250.png
+share/icons/gnome/16x16/status/weather-few-clouds-night-260.png
+share/icons/gnome/16x16/status/weather-few-clouds-night-270.png
+share/icons/gnome/16x16/status/weather-few-clouds-night-280.png
+share/icons/gnome/16x16/status/weather-few-clouds-night-290.png
+share/icons/gnome/16x16/status/weather-few-clouds-night-300.png
+share/icons/gnome/16x16/status/weather-few-clouds-night-310.png
+share/icons/gnome/16x16/status/weather-few-clouds-night-320.png
+share/icons/gnome/16x16/status/weather-few-clouds-night-330.png
+share/icons/gnome/16x16/status/weather-few-clouds-night-340.png
+share/icons/gnome/16x16/status/weather-few-clouds-night-350.png
+share/icons/gnome/22x22/status/weather-clear-night-000.png
+share/icons/gnome/22x22/status/weather-clear-night-010.png
+share/icons/gnome/22x22/status/weather-clear-night-020.png
+share/icons/gnome/22x22/status/weather-clear-night-030.png
+share/icons/gnome/22x22/status/weather-clear-night-040.png
+share/icons/gnome/22x22/status/weather-clear-night-050.png
+share/icons/gnome/22x22/status/weather-clear-night-060.png
+share/icons/gnome/22x22/status/weather-clear-night-070.png
+share/icons/gnome/22x22/status/weather-clear-night-080.png
+share/icons/gnome/22x22/status/weather-clear-night-090.png
+share/icons/gnome/22x22/status/weather-clear-night-100.png
+share/icons/gnome/22x22/status/weather-clear-night-110.png
+share/icons/gnome/22x22/status/weather-clear-night-120.png
+share/icons/gnome/22x22/status/weather-clear-night-130.png
+share/icons/gnome/22x22/status/weather-clear-night-140.png
+share/icons/gnome/22x22/status/weather-clear-night-150.png
+share/icons/gnome/22x22/status/weather-clear-night-160.png
+share/icons/gnome/22x22/status/weather-clear-night-170.png
+share/icons/gnome/22x22/status/weather-clear-night-190.png
+share/icons/gnome/22x22/status/weather-clear-night-200.png
+share/icons/gnome/22x22/status/weather-clear-night-210.png
+share/icons/gnome/22x22/status/weather-clear-night-220.png
+share/icons/gnome/22x22/status/weather-clear-night-230.png
+share/icons/gnome/22x22/status/weather-clear-night-240.png
+share/icons/gnome/22x22/status/weather-clear-night-250.png
+share/icons/gnome/22x22/status/weather-clear-night-260.png
+share/icons/gnome/22x22/status/weather-clear-night-270.png
+share/icons/gnome/22x22/status/weather-clear-night-280.png
+share/icons/gnome/22x22/status/weather-clear-night-290.png
+share/icons/gnome/22x22/status/weather-clear-night-300.png
+share/icons/gnome/22x22/status/weather-clear-night-310.png
+share/icons/gnome/22x22/status/weather-clear-night-320.png
+share/icons/gnome/22x22/status/weather-clear-night-330.png
+share/icons/gnome/22x22/status/weather-clear-night-340.png
+share/icons/gnome/22x22/status/weather-clear-night-350.png
+share/icons/gnome/22x22/status/weather-few-clouds-night-000.png
+share/icons/gnome/22x22/status/weather-few-clouds-night-010.png
+share/icons/gnome/22x22/status/weather-few-clouds-night-020.png
+share/icons/gnome/22x22/status/weather-few-clouds-night-030.png
+share/icons/gnome/22x22/status/weather-few-clouds-night-040.png
+share/icons/gnome/22x22/status/weather-few-clouds-night-050.png
+share/icons/gnome/22x22/status/weather-few-clouds-night-060.png
+share/icons/gnome/22x22/status/weather-few-clouds-night-070.png
+share/icons/gnome/22x22/status/weather-few-clouds-night-080.png
+share/icons/gnome/22x22/status/weather-few-clouds-night-090.png
+share/icons/gnome/22x22/status/weather-few-clouds-night-100.png
+share/icons/gnome/22x22/status/weather-few-clouds-night-110.png
+share/icons/gnome/22x22/status/weather-few-clouds-night-120.png
+share/icons/gnome/22x22/status/weather-few-clouds-night-130.png
+share/icons/gnome/22x22/status/weather-few-clouds-night-140.png
+share/icons/gnome/22x22/status/weather-few-clouds-night-150.png
+share/icons/gnome/22x22/status/weather-few-clouds-night-160.png
+share/icons/gnome/22x22/status/weather-few-clouds-night-170.png
+share/icons/gnome/22x22/status/weather-few-clouds-night-190.png
+share/icons/gnome/22x22/status/weather-few-clouds-night-200.png
+share/icons/gnome/22x22/status/weather-few-clouds-night-210.png
+share/icons/gnome/22x22/status/weather-few-clouds-night-220.png
+share/icons/gnome/22x22/status/weather-few-clouds-night-230.png
+share/icons/gnome/22x22/status/weather-few-clouds-night-240.png
+share/icons/gnome/22x22/status/weather-few-clouds-night-250.png
+share/icons/gnome/22x22/status/weather-few-clouds-night-260.png
+share/icons/gnome/22x22/status/weather-few-clouds-night-270.png
+share/icons/gnome/22x22/status/weather-few-clouds-night-280.png
+share/icons/gnome/22x22/status/weather-few-clouds-night-290.png
+share/icons/gnome/22x22/status/weather-few-clouds-night-300.png
+share/icons/gnome/22x22/status/weather-few-clouds-night-310.png
+share/icons/gnome/22x22/status/weather-few-clouds-night-320.png
+share/icons/gnome/22x22/status/weather-few-clouds-night-330.png
+share/icons/gnome/22x22/status/weather-few-clouds-night-340.png
+share/icons/gnome/22x22/status/weather-few-clouds-night-350.png
+share/icons/gnome/24x24/status/weather-clear-night-000.png
+share/icons/gnome/24x24/status/weather-clear-night-010.png
+share/icons/gnome/24x24/status/weather-clear-night-020.png
+share/icons/gnome/24x24/status/weather-clear-night-030.png
+share/icons/gnome/24x24/status/weather-clear-night-040.png
+share/icons/gnome/24x24/status/weather-clear-night-050.png
+share/icons/gnome/24x24/status/weather-clear-night-060.png
+share/icons/gnome/24x24/status/weather-clear-night-070.png
+share/icons/gnome/24x24/status/weather-clear-night-080.png
+share/icons/gnome/24x24/status/weather-clear-night-090.png
+share/icons/gnome/24x24/status/weather-clear-night-100.png
+share/icons/gnome/24x24/status/weather-clear-night-110.png
+share/icons/gnome/24x24/status/weather-clear-night-120.png
+share/icons/gnome/24x24/status/weather-clear-night-130.png
+share/icons/gnome/24x24/status/weather-clear-night-140.png
+share/icons/gnome/24x24/status/weather-clear-night-150.png
+share/icons/gnome/24x24/status/weather-clear-night-160.png
+share/icons/gnome/24x24/status/weather-clear-night-170.png
+share/icons/gnome/24x24/status/weather-clear-night-190.png
+share/icons/gnome/24x24/status/weather-clear-night-200.png
+share/icons/gnome/24x24/status/weather-clear-night-210.png
+share/icons/gnome/24x24/status/weather-clear-night-220.png
+share/icons/gnome/24x24/status/weather-clear-night-230.png
+share/icons/gnome/24x24/status/weather-clear-night-240.png
+share/icons/gnome/24x24/status/weather-clear-night-250.png
+share/icons/gnome/24x24/status/weather-clear-night-260.png
+share/icons/gnome/24x24/status/weather-clear-night-270.png
+share/icons/gnome/24x24/status/weather-clear-night-280.png
+share/icons/gnome/24x24/status/weather-clear-night-290.png
+share/icons/gnome/24x24/status/weather-clear-night-300.png
+share/icons/gnome/24x24/status/weather-clear-night-310.png
+share/icons/gnome/24x24/status/weather-clear-night-320.png
+share/icons/gnome/24x24/status/weather-clear-night-330.png
+share/icons/gnome/24x24/status/weather-clear-night-340.png
+share/icons/gnome/24x24/status/weather-clear-night-350.png
+share/icons/gnome/24x24/status/weather-few-clouds-night-000.png
+share/icons/gnome/24x24/status/weather-few-clouds-night-010.png
+share/icons/gnome/24x24/status/weather-few-clouds-night-020.png
+share/icons/gnome/24x24/status/weather-few-clouds-night-030.png
+share/icons/gnome/24x24/status/weather-few-clouds-night-040.png
+share/icons/gnome/24x24/status/weather-few-clouds-night-050.png
+share/icons/gnome/24x24/status/weather-few-clouds-night-060.png
+share/icons/gnome/24x24/status/weather-few-clouds-night-070.png
+share/icons/gnome/24x24/status/weather-few-clouds-night-080.png
+share/icons/gnome/24x24/status/weather-few-clouds-night-090.png
+share/icons/gnome/24x24/status/weather-few-clouds-night-100.png
+share/icons/gnome/24x24/status/weather-few-clouds-night-110.png
+share/icons/gnome/24x24/status/weather-few-clouds-night-120.png
+share/icons/gnome/24x24/status/weather-few-clouds-night-130.png
+share/icons/gnome/24x24/status/weather-few-clouds-night-140.png
+share/icons/gnome/24x24/status/weather-few-clouds-night-150.png
+share/icons/gnome/24x24/status/weather-few-clouds-night-160.png
+share/icons/gnome/24x24/status/weather-few-clouds-night-170.png
+share/icons/gnome/24x24/status/weather-few-clouds-night-190.png
+share/icons/gnome/24x24/status/weather-few-clouds-night-200.png
+share/icons/gnome/24x24/status/weather-few-clouds-night-210.png
+share/icons/gnome/24x24/status/weather-few-clouds-night-220.png
+share/icons/gnome/24x24/status/weather-few-clouds-night-230.png
+share/icons/gnome/24x24/status/weather-few-clouds-night-240.png
+share/icons/gnome/24x24/status/weather-few-clouds-night-250.png
+share/icons/gnome/24x24/status/weather-few-clouds-night-260.png
+share/icons/gnome/24x24/status/weather-few-clouds-night-270.png
+share/icons/gnome/24x24/status/weather-few-clouds-night-280.png
+share/icons/gnome/24x24/status/weather-few-clouds-night-290.png
+share/icons/gnome/24x24/status/weather-few-clouds-night-300.png
+share/icons/gnome/24x24/status/weather-few-clouds-night-310.png
+share/icons/gnome/24x24/status/weather-few-clouds-night-320.png
+share/icons/gnome/24x24/status/weather-few-clouds-night-330.png
+share/icons/gnome/24x24/status/weather-few-clouds-night-340.png
+share/icons/gnome/24x24/status/weather-few-clouds-night-350.png
+share/icons/gnome/32x32/status/weather-clear-night-000.png
+share/icons/gnome/32x32/status/weather-clear-night-010.png
+share/icons/gnome/32x32/status/weather-clear-night-020.png
+share/icons/gnome/32x32/status/weather-clear-night-030.png
+share/icons/gnome/32x32/status/weather-clear-night-040.png
+share/icons/gnome/32x32/status/weather-clear-night-050.png
+share/icons/gnome/32x32/status/weather-clear-night-060.png
+share/icons/gnome/32x32/status/weather-clear-night-070.png
+share/icons/gnome/32x32/status/weather-clear-night-080.png
+share/icons/gnome/32x32/status/weather-clear-night-090.png
+share/icons/gnome/32x32/status/weather-clear-night-100.png
+share/icons/gnome/32x32/status/weather-clear-night-110.png
+share/icons/gnome/32x32/status/weather-clear-night-120.png
+share/icons/gnome/32x32/status/weather-clear-night-130.png
+share/icons/gnome/32x32/status/weather-clear-night-140.png
+share/icons/gnome/32x32/status/weather-clear-night-150.png
+share/icons/gnome/32x32/status/weather-clear-night-160.png
+share/icons/gnome/32x32/status/weather-clear-night-170.png
+share/icons/gnome/32x32/status/weather-clear-night-190.png
+share/icons/gnome/32x32/status/weather-clear-night-200.png
+share/icons/gnome/32x32/status/weather-clear-night-210.png
+share/icons/gnome/32x32/status/weather-clear-night-220.png
+share/icons/gnome/32x32/status/weather-clear-night-230.png
+share/icons/gnome/32x32/status/weather-clear-night-240.png
+share/icons/gnome/32x32/status/weather-clear-night-250.png
+share/icons/gnome/32x32/status/weather-clear-night-260.png
+share/icons/gnome/32x32/status/weather-clear-night-270.png
+share/icons/gnome/32x32/status/weather-clear-night-280.png
+share/icons/gnome/32x32/status/weather-clear-night-290.png
+share/icons/gnome/32x32/status/weather-clear-night-300.png
+share/icons/gnome/32x32/status/weather-clear-night-310.png
+share/icons/gnome/32x32/status/weather-clear-night-320.png
+share/icons/gnome/32x32/status/weather-clear-night-330.png
+share/icons/gnome/32x32/status/weather-clear-night-340.png
+share/icons/gnome/32x32/status/weather-clear-night-350.png
+share/icons/gnome/32x32/status/weather-few-clouds-night-000.png
+share/icons/gnome/32x32/status/weather-few-clouds-night-010.png
+share/icons/gnome/32x32/status/weather-few-clouds-night-020.png
+share/icons/gnome/32x32/status/weather-few-clouds-night-030.png
+share/icons/gnome/32x32/status/weather-few-clouds-night-040.png
+share/icons/gnome/32x32/status/weather-few-clouds-night-050.png
+share/icons/gnome/32x32/status/weather-few-clouds-night-060.png
+share/icons/gnome/32x32/status/weather-few-clouds-night-070.png
+share/icons/gnome/32x32/status/weather-few-clouds-night-080.png
+share/icons/gnome/32x32/status/weather-few-clouds-night-090.png
+share/icons/gnome/32x32/status/weather-few-clouds-night-100.png
+share/icons/gnome/32x32/status/weather-few-clouds-night-110.png
+share/icons/gnome/32x32/status/weather-few-clouds-night-120.png
+share/icons/gnome/32x32/status/weather-few-clouds-night-130.png
+share/icons/gnome/32x32/status/weather-few-clouds-night-140.png
+share/icons/gnome/32x32/status/weather-few-clouds-night-150.png
+share/icons/gnome/32x32/status/weather-few-clouds-night-160.png
+share/icons/gnome/32x32/status/weather-few-clouds-night-170.png
+share/icons/gnome/32x32/status/weather-few-clouds-night-190.png
+share/icons/gnome/32x32/status/weather-few-clouds-night-200.png
+share/icons/gnome/32x32/status/weather-few-clouds-night-210.png
+share/icons/gnome/32x32/status/weather-few-clouds-night-220.png
+share/icons/gnome/32x32/status/weather-few-clouds-night-230.png
+share/icons/gnome/32x32/status/weather-few-clouds-night-240.png
+share/icons/gnome/32x32/status/weather-few-clouds-night-250.png
+share/icons/gnome/32x32/status/weather-few-clouds-night-260.png
+share/icons/gnome/32x32/status/weather-few-clouds-night-270.png
+share/icons/gnome/32x32/status/weather-few-clouds-night-280.png
+share/icons/gnome/32x32/status/weather-few-clouds-night-290.png
+share/icons/gnome/32x32/status/weather-few-clouds-night-300.png
+share/icons/gnome/32x32/status/weather-few-clouds-night-310.png
+share/icons/gnome/32x32/status/weather-few-clouds-night-320.png
+share/icons/gnome/32x32/status/weather-few-clouds-night-330.png
+share/icons/gnome/32x32/status/weather-few-clouds-night-340.png
+share/icons/gnome/32x32/status/weather-few-clouds-night-350.png
+share/icons/gnome/scalable/status/weather-clear-night-000.svg
+share/icons/gnome/scalable/status/weather-clear-night-010.svg
+share/icons/gnome/scalable/status/weather-clear-night-020.svg
+share/icons/gnome/scalable/status/weather-clear-night-030.svg
+share/icons/gnome/scalable/status/weather-clear-night-040.svg
+share/icons/gnome/scalable/status/weather-clear-night-050.svg
+share/icons/gnome/scalable/status/weather-clear-night-060.svg
+share/icons/gnome/scalable/status/weather-clear-night-070.svg
+share/icons/gnome/scalable/status/weather-clear-night-080.svg
+share/icons/gnome/scalable/status/weather-clear-night-090.svg
+share/icons/gnome/scalable/status/weather-clear-night-100.svg
+share/icons/gnome/scalable/status/weather-clear-night-110.svg
+share/icons/gnome/scalable/status/weather-clear-night-120.svg
+share/icons/gnome/scalable/status/weather-clear-night-130.svg
+share/icons/gnome/scalable/status/weather-clear-night-140.svg
+share/icons/gnome/scalable/status/weather-clear-night-150.svg
+share/icons/gnome/scalable/status/weather-clear-night-160.svg
+share/icons/gnome/scalable/status/weather-clear-night-170.svg
+share/icons/gnome/scalable/status/weather-clear-night-190.svg
+share/icons/gnome/scalable/status/weather-clear-night-200.svg
+share/icons/gnome/scalable/status/weather-clear-night-210.svg
+share/icons/gnome/scalable/status/weather-clear-night-220.svg
+share/icons/gnome/scalable/status/weather-clear-night-230.svg
+share/icons/gnome/scalable/status/weather-clear-night-240.svg
+share/icons/gnome/scalable/status/weather-clear-night-250.svg
+share/icons/gnome/scalable/status/weather-clear-night-260.svg
+share/icons/gnome/scalable/status/weather-clear-night-270.svg
+share/icons/gnome/scalable/status/weather-clear-night-280.svg
+share/icons/gnome/scalable/status/weather-clear-night-290.svg
+share/icons/gnome/scalable/status/weather-clear-night-300.svg
+share/icons/gnome/scalable/status/weather-clear-night-310.svg
+share/icons/gnome/scalable/status/weather-clear-night-320.svg
+share/icons/gnome/scalable/status/weather-clear-night-330.svg
+share/icons/gnome/scalable/status/weather-clear-night-340.svg
+share/icons/gnome/scalable/status/weather-clear-night-350.svg
+share/icons/gnome/scalable/status/weather-few-clouds-night-000.svg
+share/icons/gnome/scalable/status/weather-few-clouds-night-010.svg
+share/icons/gnome/scalable/status/weather-few-clouds-night-020.svg
+share/icons/gnome/scalable/status/weather-few-clouds-night-030.svg
+share/icons/gnome/scalable/status/weather-few-clouds-night-040.svg
+share/icons/gnome/scalable/status/weather-few-clouds-night-050.svg
+share/icons/gnome/scalable/status/weather-few-clouds-night-060.svg
+share/icons/gnome/scalable/status/weather-few-clouds-night-070.svg
+share/icons/gnome/scalable/status/weather-few-clouds-night-080.svg
+share/icons/gnome/scalable/status/weather-few-clouds-night-090.svg
+share/icons/gnome/scalable/status/weather-few-clouds-night-100.svg
+share/icons/gnome/scalable/status/weather-few-clouds-night-110.svg
+share/icons/gnome/scalable/status/weather-few-clouds-night-120.svg
+share/icons/gnome/scalable/status/weather-few-clouds-night-130.svg
+share/icons/gnome/scalable/status/weather-few-clouds-night-140.svg
+share/icons/gnome/scalable/status/weather-few-clouds-night-150.svg
+share/icons/gnome/scalable/status/weather-few-clouds-night-160.svg
+share/icons/gnome/scalable/status/weather-few-clouds-night-170.svg
+share/icons/gnome/scalable/status/weather-few-clouds-night-190.svg
+share/icons/gnome/scalable/status/weather-few-clouds-night-200.svg
+share/icons/gnome/scalable/status/weather-few-clouds-night-210.svg
+share/icons/gnome/scalable/status/weather-few-clouds-night-220.svg
+share/icons/gnome/scalable/status/weather-few-clouds-night-230.svg
+share/icons/gnome/scalable/status/weather-few-clouds-night-240.svg
+share/icons/gnome/scalable/status/weather-few-clouds-night-250.svg
+share/icons/gnome/scalable/status/weather-few-clouds-night-260.svg
+share/icons/gnome/scalable/status/weather-few-clouds-night-270.svg
+share/icons/gnome/scalable/status/weather-few-clouds-night-280.svg
+share/icons/gnome/scalable/status/weather-few-clouds-night-290.svg
+share/icons/gnome/scalable/status/weather-few-clouds-night-300.svg
+share/icons/gnome/scalable/status/weather-few-clouds-night-310.svg
+share/icons/gnome/scalable/status/weather-few-clouds-night-320.svg
+share/icons/gnome/scalable/status/weather-few-clouds-night-330.svg
+share/icons/gnome/scalable/status/weather-few-clouds-night-340.svg
+share/icons/gnome/scalable/status/weather-few-clouds-night-350.svg
 %%DATADIR%%/Locations.ang.xml
 %%DATADIR%%/Locations.ar.xml
 %%DATADIR%%/Locations.as.xml
+%%DATADIR%%/Locations.ast.xml
 %%DATADIR%%/Locations.az.xml
 %%DATADIR%%/Locations.be.xml
 %%DATADIR%%/Locations.be@latin.xml
 %%DATADIR%%/Locations.bg.xml
 %%DATADIR%%/Locations.bn.xml
 %%DATADIR%%/Locations.bn_IN.xml
+%%DATADIR%%/Locations.br.xml
 %%DATADIR%%/Locations.bs.xml
 %%DATADIR%%/Locations.ca.xml
 %%DATADIR%%/Locations.ca@valencia.xml
@@ -50,6 +402,7 @@ libdata/pkgconfig/gweather.pc
 %%DATADIR%%/Locations.el.xml
 %%DATADIR%%/Locations.en_CA.xml
 %%DATADIR%%/Locations.en_GB.xml
+%%DATADIR%%/Locations.en@shaw.xml
 %%DATADIR%%/Locations.es.xml
 %%DATADIR%%/Locations.et.xml
 %%DATADIR%%/Locations.eu.xml
@@ -81,6 +434,7 @@ libdata/pkgconfig/gweather.pc
 %%DATADIR%%/Locations.mr.xml
 %%DATADIR%%/Locations.ms.xml
 %%DATADIR%%/Locations.nb.xml
+%%DATADIR%%/Locations.nds.xml
 %%DATADIR%%/Locations.ne.xml
 %%DATADIR%%/Locations.nl.xml
 %%DATADIR%%/Locations.nn.xml
@@ -114,12 +468,14 @@ libdata/pkgconfig/gweather.pc
 share/locale/am/LC_MESSAGES/libgweather.mo
 share/locale/ar/LC_MESSAGES/libgweather.mo
 share/locale/as/LC_MESSAGES/libgweather.mo
+share/locale/ast/LC_MESSAGES/libgweather.mo
 share/locale/az/LC_MESSAGES/libgweather.mo
 share/locale/be/LC_MESSAGES/libgweather.mo
 share/locale/be@latin/LC_MESSAGES/libgweather.mo
 share/locale/bg/LC_MESSAGES/libgweather.mo
 share/locale/bn/LC_MESSAGES/libgweather.mo
 share/locale/bn_IN/LC_MESSAGES/libgweather.mo
+share/locale/br/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
@@ -131,6 +487,7 @@ share/locale/dz/LC_MESSAGES/libgweather.mo
 share/locale/el/LC_MESSAGES/libgweather.mo
 share/locale/en_CA/LC_MESSAGES/libgweather.mo
 share/locale/en_GB/LC_MESSAGES/libgweather.mo
+share/locale/en@shaw/LC_MESSAGES/libgweather.mo
 share/locale/es/LC_MESSAGES/libgweather.mo
 share/locale/es_AR/LC_MESSAGES/libgweather.mo
 share/locale/es_CL/LC_MESSAGES/libgweather.mo
@@ -181,6 +538,7 @@ share/locale/mn/LC_MESSAGES/libgweather.mo
 share/locale/mr/LC_MESSAGES/libgweather.mo
 share/locale/ms/LC_MESSAGES/libgweather.mo
 share/locale/nb/LC_MESSAGES/libgweather.mo
+share/locale/nds/LC_MESSAGES/libgweather.mo
 share/locale/ne/LC_MESSAGES/libgweather.mo
 share/locale/nl/LC_MESSAGES/libgweather.mo
 share/locale/nn/LC_MESSAGES/libgweather.mo
@@ -211,6 +569,8 @@ share/locale/xh/LC_MESSAGES/libgweather.mo
 share/locale/zh_CN/LC_MESSAGES/libgweather.mo
 share/locale/zh_HK/LC_MESSAGES/libgweather.mo
 share/locale/zh_TW/LC_MESSAGES/libgweather.mo
+@dirrmtry share/icons/gnome/scalable/status
+@dirrmtry share/icons/gnome/scalable
 @dirrm %%DATADIR%%
 @dirrm %%DOCSDIR%%
 @dirrm include/libgweather
@@ -228,6 +588,8 @@ share/locale/zh_TW/LC_MESSAGES/libgweather.mo
 @dirrmtry share/locale/rw
 @dirrmtry share/locale/oc/LC_MESSAGES
 @dirrmtry share/locale/oc
+@dirrmtry share/locale/nds/LC_MESSAGES
+@dirrmtry share/locale/nds
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mg/LC_MESSAGES
@@ -270,6 +632,8 @@ share/locale/zh_TW/LC_MESSAGES/libgweather.mo
 @dirrmtry share/locale/es_CL
 @dirrmtry share/locale/es_AR/LC_MESSAGES
 @dirrmtry share/locale/es_AR
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/ca@valencia/LC_MESSAGES
@@ -278,5 +642,7 @@ share/locale/zh_TW/LC_MESSAGES/libgweather.mo
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/be@latin/LC_MESSAGES
 @dirrmtry share/locale/be@latin
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
 @dirrmtry share/locale/as/LC_MESSAGES
 @dirrmtry share/locale/as
diff --git a/net/link-monitor-applet/Makefile b/net/link-monitor-applet/Makefile
index e0c818431fde..c735a8bbd528 100644
--- a/net/link-monitor-applet/Makefile
+++ b/net/link-monitor-applet/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	link-monitor-applet
 PORTVERSION=	2.1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	net ipv6
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	link-monitor
@@ -17,7 +17,7 @@ COMMENT=	A GNOME applet displaying the round-trip time to one or more hosts
 
 LIB_DEPENDS=	GeoIP:${PORTSDIR}/net/GeoIP
 
-USE_GNOME=	gnomehack gnomeprefix gnomepanel eel2 librsvg2
+USE_GNOME=	gnomehack gnomeprefix gnomepanel eel2 librsvg2 libgnomeui
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
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
diff --git a/net/vino/Makefile b/net/vino/Makefile
index 2c1d338f67d6..6407107cf82a 100644
--- a/net/vino/Makefile
+++ b/net/vino/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Tom McLaughlin <tmclaugh@sdf.lonestar.org>
 #
 # $FreeBSD$
-#   $MCom: ports/net/vino/Makefile,v 1.76 2009/10/19 13:48:42 avl Exp $
+#   $MCom: ports/net/vino/Makefile,v 1.78 2010/04/01 15:02:57 kwm Exp $
 #
 
 PORTNAME=	vino
-PORTVERSION=	2.28.1
-PORTREVISION=	2
+PORTVERSION=	2.28.2
 CATEGORIES=	net gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/net/vino/distinfo b/net/vino/distinfo
index 32f15ef71773..80e7fccad5ae 100644
--- a/net/vino/distinfo
+++ b/net/vino/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (gnome2/vino-2.28.2.tar.bz2) = 7b7fcd23925efb628da2d2f12d73b485
+SHA256 (gnome2/vino-2.28.2.tar.bz2) = f2a0b7c77fe58f3918b202a9f0f4ae3295518ac43eeceade0875b096038a72e0
+SIZE (gnome2/vino-2.28.2.tar.bz2) = 795208
diff --git a/net/vino/files/patch-configure b/net/vino/files/patch-configure
index 6cb7065fc880..7d5508317db8 100644
--- a/net/vino/files/patch-configure
+++ b/net/vino/files/patch-configure
@@ -1,7 +1,7 @@
---- configure.orig	2009-04-15 11:26:27.000000000 +0200
-+++ configure	2009-04-15 11:26:27.000000000 +0200
-@@ -18108,6 +18108,8 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
+--- configure.orig	2010-04-01 16:50:38.000000000 +0200
++++ configure	2010-04-01 16:50:38.000000000 +0200
+@@ -15144,6 +15144,8 @@
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
 +      #include <sys/types.h>
@@ -9,11 +9,3 @@
        #include <ifaddrs.h>
  
  int
-@@ -18122,6 +18124,7 @@ main ()
- }
- _ACEOF
- rm -f conftest.$ac_objext
-+have_getifaddrs=yes
- if { (ac_try="$ac_compile"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
diff --git a/net/vino/pkg-plist b/net/vino/pkg-plist
index c065c6eff60e..524f06d7884d 100644
--- a/net/vino/pkg-plist
+++ b/net/vino/pkg-plist
@@ -22,6 +22,7 @@ share/locale/da/LC_MESSAGES/vino.mo
 share/locale/de/LC_MESSAGES/vino.mo
 share/locale/dz/LC_MESSAGES/vino.mo
 share/locale/el/LC_MESSAGES/vino.mo
+share/locale/en@shaw/LC_MESSAGES/vino.mo
 share/locale/en_CA/LC_MESSAGES/vino.mo
 share/locale/en_GB/LC_MESSAGES/vino.mo
 share/locale/es/LC_MESSAGES/vino.mo
@@ -111,6 +112,8 @@ share/locale/zh_TW/LC_MESSAGES/vino.mo
 @dirrmtry share/locale/mai
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
+@dirrmtry share/locale/en@shaw/LC_MESSAGES
+@dirrmtry share/locale/en@shaw
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/ca@valencia/LC_MESSAGES
@@ -119,8 +122,6 @@ share/locale/zh_TW/LC_MESSAGES/vino.mo
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/be@latin/LC_MESSAGES
 @dirrmtry share/locale/be@latin
-@dirrmtry share/locale/be/LC_MESSAGES
-@dirrmtry share/locale/be
 @dirrmtry share/locale/ast/LC_MESSAGES
 @dirrmtry share/locale/ast
 @dirrmtry share/locale/as/LC_MESSAGES