3 files changed, 20 insertions, 10 deletions

diff --git a/net/gnome-nettool/Makefile b/net/gnome-nettool/Makefile
index 5463ef66074c..fc2ffbd0db89 100644
--- a/net/gnome-nettool/Makefile
+++ b/net/gnome-nettool/Makefile
@@ -3,22 +3,19 @@
 # Whom:				Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/net/gnome-nettool/Makefile,v 1.40 2007/09/18 14:09:24 ahze Exp $
+#   $MCom: ports/net/gnome-nettool/Makefile,v 1.42 2008/03/10 21:33:09 mezz Exp $
 #
 
 PORTNAME=	gnome-nettool
-PORTVERSION=	2.20.0
+PORTVERSION=	2.22.0
 PORTEPOCH=	1
 CATEGORIES=	net gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-nettool/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
-DISTNAME=	gnome-nettool-${PORTVERSION}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A GNOME utility that provides network information statistics
 
-USE_XLIB=	yes
 USE_BZIP2=	yes
 USE_GNOME=	gnomehack intlhack gnomeprefix libglade2 gconf2 gnomedocutils
 USE_GMAKE=	yes
diff --git a/net/gnome-nettool/distinfo b/net/gnome-nettool/distinfo
index 60572e77e0f0..6bf5e40c6e7e 100644
--- a/net/gnome-nettool/distinfo
+++ b/net/gnome-nettool/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-nettool-2.20.0.tar.bz2) = 8f16e4207655ccf1e7af679fc0f58bbd
-SHA256 (gnome2/gnome-nettool-2.20.0.tar.bz2) = 8668dfa5b7d97245ffe5d53630b891d17f22e86c237ca9b8345774b20d745c15
-SIZE (gnome2/gnome-nettool-2.20.0.tar.bz2) = 572137
+MD5 (gnome2/gnome-nettool-2.22.0.tar.bz2) = 290dd50a08a3859332afb6daf46dde25
+SHA256 (gnome2/gnome-nettool-2.22.0.tar.bz2) = ddf6de5d2df6515423ef8aad12750a69a553584685854fa47073126b89fc25a3
+SIZE (gnome2/gnome-nettool-2.22.0.tar.bz2) = 617193
diff --git a/net/gnome-nettool/pkg-plist b/net/gnome-nettool/pkg-plist
index 50ceb8333f26..3dceffc9e15f 100644
--- a/net/gnome-nettool/pkg-plist
+++ b/net/gnome-nettool/pkg-plist
@@ -21,9 +21,11 @@ share/gnome/help/gnome-nettool/uk/gnome-nettool.xml
 share/gnome/help/gnome-nettool/vi/gnome-nettool.xml
 share/icons/hicolor/16x16/apps/gnome-nettool.png
 share/icons/hicolor/22x22/apps/gnome-nettool.png
+share/icons/hicolor/24x24/apps/gnome-nettool.png
 share/icons/hicolor/32x32/apps/gnome-nettool.png
 share/icons/hicolor/scalable/apps/gnome-nettool.svg
 share/locale/ar/LC_MESSAGES/gnome-nettool.mo
+share/locale/as/LC_MESSAGES/gnome-nettool.mo
 share/locale/az/LC_MESSAGES/gnome-nettool.mo
 share/locale/bg/LC_MESSAGES/gnome-nettool.mo
 share/locale/bn/LC_MESSAGES/gnome-nettool.mo
@@ -55,6 +57,7 @@ share/locale/id/LC_MESSAGES/gnome-nettool.mo
 share/locale/it/LC_MESSAGES/gnome-nettool.mo
 share/locale/ja/LC_MESSAGES/gnome-nettool.mo
 share/locale/ka/LC_MESSAGES/gnome-nettool.mo
+share/locale/kn/LC_MESSAGES/gnome-nettool.mo
 share/locale/ko/LC_MESSAGES/gnome-nettool.mo
 share/locale/ku/LC_MESSAGES/gnome-nettool.mo
 share/locale/lt/LC_MESSAGES/gnome-nettool.mo
@@ -63,10 +66,12 @@ share/locale/mg/LC_MESSAGES/gnome-nettool.mo
 share/locale/mk/LC_MESSAGES/gnome-nettool.mo
 share/locale/ml/LC_MESSAGES/gnome-nettool.mo
 share/locale/mn/LC_MESSAGES/gnome-nettool.mo
+share/locale/mr/LC_MESSAGES/gnome-nettool.mo
 share/locale/ms/LC_MESSAGES/gnome-nettool.mo
 share/locale/nb/LC_MESSAGES/gnome-nettool.mo
 share/locale/ne/LC_MESSAGES/gnome-nettool.mo
 share/locale/nl/LC_MESSAGES/gnome-nettool.mo
+share/locale/nn/LC_MESSAGES/gnome-nettool.mo
 share/locale/oc/LC_MESSAGES/gnome-nettool.mo
 share/locale/or/LC_MESSAGES/gnome-nettool.mo
 share/locale/pa/LC_MESSAGES/gnome-nettool.mo
@@ -88,6 +93,8 @@ share/locale/te/LC_MESSAGES/gnome-nettool.mo
 share/locale/th/LC_MESSAGES/gnome-nettool.mo
 share/locale/tr/LC_MESSAGES/gnome-nettool.mo
 share/locale/uk/LC_MESSAGES/gnome-nettool.mo
+share/locale/uz/LC_MESSAGES/gnome-nettool.mo
+share/locale/uz@cyrillic/LC_MESSAGES/gnome-nettool.mo
 share/locale/vi/LC_MESSAGES/gnome-nettool.mo
 share/locale/wa/LC_MESSAGES/gnome-nettool.mo
 share/locale/xh/LC_MESSAGES/gnome-nettool.mo
@@ -118,10 +125,13 @@ share/pixmaps/gnome-nettool.png
 @dirrm %%DATADIR%%/pixmaps
 @dirrm %%DATADIR%%/dialogs
 @dirrm %%DATADIR%%
+@dirrmtry share/applications
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
+@dirrmtry share/locale/uz@cyrillic/LC_MESSAGES
+@dirrmtry share/locale/uz@cyrillic
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
 @dirrmtry share/locale/si/LC_MESSAGES
@@ -130,6 +140,8 @@ share/pixmaps/gnome-nettool.png
 @dirrmtry share/locale/rw
 @dirrmtry share/locale/oc/LC_MESSAGES
 @dirrmtry share/locale/oc
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
 @dirrmtry share/locale/mg/LC_MESSAGES
 @dirrmtry share/locale/mg
 @dirrmtry share/locale/ku/LC_MESSAGES
@@ -138,4 +150,5 @@ share/pixmaps/gnome-nettool.png
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
-@dirrmtry share/applications
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as