Update to 2.5.91.

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

12 files changed, 68 insertions, 52 deletions

diff --git a/net/gnome-netstatus/Makefile b/net/gnome-netstatus/Makefile
index 4f18fe90c..21f8151cc 100644
--- a/net/gnome-netstatus/Makefile
+++ b/net/gnome-netstatus/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gnomenetstatus
-PORTVERSION=	0.16
-PORTREVISION=	1
+PORTVERSION=	2.5.91
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-netstatus/0.16
+MASTER_SITE_SUBDIR=	sources/gnome-netstatus/2.5
 DISTNAME=	gnome-netstatus-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/net/gnome-netstatus/distinfo b/net/gnome-netstatus/distinfo
index a76d52129..649393657 100644
--- a/net/gnome-netstatus/distinfo
+++ b/net/gnome-netstatus/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-netstatus-0.16.tar.bz2) = 50b7e43d2840200ab13fe5fb1b5577ed
-SIZE (gnome2/gnome-netstatus-0.16.tar.bz2) = 356995
+MD5 (gnome2/gnome-netstatus-2.5.91.tar.bz2) = f626b0c3cfb247c8200a6b840c116270
+SIZE (gnome2/gnome-netstatus-2.5.91.tar.bz2) = 363269
diff --git a/net/gnome-netstatus/files/patch-icons_Makefile.in b/net/gnome-netstatus/files/patch-icons_Makefile.in
new file mode 100644
index 000000000..a47c7f9e2
--- /dev/null
+++ b/net/gnome-netstatus/files/patch-icons_Makefile.in
@@ -0,0 +1,11 @@
+--- icons/Makefile.in.orig	Mon Mar  8 22:22:36 2004
++++ icons/Makefile.in	Mon Mar  8 22:22:53 2004
+@@ -133,7 +133,7 @@
+ 
+ iconsize = 48x48
+ category = apps
+-iconsdir = $(datadir)/icons/hicolor/$(iconsize)/$(category)
++iconsdir = $(prefix)/share/icons/hicolor/$(iconsize)/$(category)
+ icons_DATA = \
+ 	gnome-netstatus-disconn.png	\
+ 	gnome-netstatus-idle.png	\
diff --git a/net/gnome-netstatus/files/patch-src_netstatus-iface.c b/net/gnome-netstatus/files/patch-src_netstatus-iface.c
index 47056d2f1..97882f089 100644
--- a/net/gnome-netstatus/files/patch-src_netstatus-iface.c
+++ b/net/gnome-netstatus/files/patch-src_netstatus-iface.c
@@ -1,12 +1,15 @@
---- src/netstatus-iface.c.orig	Tue Jan 20 10:00:20 2004
-+++ src/netstatus-iface.c	Wed Feb  4 15:39:09 2004
-@@ -32,9 +32,12 @@
+--- src/netstatus-iface.c.orig	Wed Mar  3 08:07:35 2004
++++ src/netstatus-iface.c	Mon Mar  8 22:18:03 2004
+@@ -32,12 +32,15 @@
  
  #include <libgnome/gnome-i18n.h>
  
 +#include <sys/types.h>
 +#include <sys/socket.h>
  #include <sys/ioctl.h>
+ #ifdef HAVE_SYS_SOCKIO_H
+ #include <sys/sockio.h>
+ #endif /* HAVE_SYS_SOCKIO_H */
  #include <net/if.h>
  #include <net/if_arp.h>
 +#include <netinet/in.h>
diff --git a/net/gnome-netstatus/files/patch-src_netstatus-sysdeps.c b/net/gnome-netstatus/files/patch-src_netstatus-sysdeps.c
deleted file mode 100644
index 85b3f084d..000000000
--- a/net/gnome-netstatus/files/patch-src_netstatus-sysdeps.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/netstatus-sysdeps.c.orig	Wed Feb 18 18:20:48 2004
-+++ src/netstatus-sysdeps.c	Wed Feb 18 18:21:02 2004
-@@ -267,7 +267,7 @@
-   *out_bytes   = -1;
- 
-   error = NULL;
--  command_line = g_strdup_printf ("/usr/bin/netstat netstat -n -I %s -b -f inet", iface);
-+  command_line = g_strdup_printf ("/usr/bin/netstat -n -I %s -b -f inet", iface);
-   if (!g_shell_parse_argv (command_line, NULL, &argv, &error))
-     {
-       error_message = g_strdup_printf (_("Could not parse command line '%s': %s"),
diff --git a/net/gnome-netstatus/pkg-plist b/net/gnome-netstatus/pkg-plist
index 7c08ac2bf..04710577e 100644
--- a/net/gnome-netstatus/pkg-plist
+++ b/net/gnome-netstatus/pkg-plist
@@ -14,30 +14,36 @@ share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-tx.png
 share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-txrx.png
 share/gnome/help/gnome-netstatus/C/gnome-netstatus.xml
 share/gnome/help/gnome-netstatus/C/legal.xml
-share/gnome/icons/gnome-netstatus/gnome-netstatus-disconn.png
-share/gnome/icons/gnome-netstatus/gnome-netstatus-error.png
-share/gnome/icons/gnome-netstatus/gnome-netstatus-idle.png
-share/gnome/icons/gnome-netstatus/gnome-netstatus-rx.png
-share/gnome/icons/gnome-netstatus/gnome-netstatus-tx.png
-share/gnome/icons/gnome-netstatus/gnome-netstatus-txrx.png
 share/gnome/omf/gnome-netstatus/gnome-netstatus-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/gnome-netstatus-tx.png
+share/icons/hicolor/48x48/apps/gnome-netstatus-disconn.png
+share/icons/hicolor/48x48/apps/gnome-netstatus-error.png
+share/icons/hicolor/48x48/apps/gnome-netstatus-idle.png
+share/icons/hicolor/48x48/apps/gnome-netstatus-rx.png
+share/icons/hicolor/48x48/apps/gnome-netstatus-tx.png
+share/icons/hicolor/48x48/apps/gnome-netstatus-txrx.png
 share/locale/ar/LC_MESSAGES/gnome-netstatus.mo
 share/locale/az/LC_MESSAGES/gnome-netstatus.mo
+share/locale/ca/LC_MESSAGES/gnome-netstatus.mo
 share/locale/cs/LC_MESSAGES/gnome-netstatus.mo
+share/locale/da/LC_MESSAGES/gnome-netstatus.mo
 share/locale/de/LC_MESSAGES/gnome-netstatus.mo
 share/locale/el/LC_MESSAGES/gnome-netstatus.mo
+share/locale/en_CA/LC_MESSAGES/gnome-netstatus.mo
 share/locale/es/LC_MESSAGES/gnome-netstatus.mo
+share/locale/fi/LC_MESSAGES/gnome-netstatus.mo
 share/locale/fr/LC_MESSAGES/gnome-netstatus.mo
 share/locale/ga/LC_MESSAGES/gnome-netstatus.mo
 share/locale/hr/LC_MESSAGES/gnome-netstatus.mo
 share/locale/it/LC_MESSAGES/gnome-netstatus.mo
 share/locale/ja/LC_MESSAGES/gnome-netstatus.mo
 share/locale/ko/LC_MESSAGES/gnome-netstatus.mo
+share/locale/lt/LC_MESSAGES/gnome-netstatus.mo
 share/locale/mn/LC_MESSAGES/gnome-netstatus.mo
 share/locale/ms/LC_MESSAGES/gnome-netstatus.mo
 share/locale/nl/LC_MESSAGES/gnome-netstatus.mo
+share/locale/pa/LC_MESSAGES/gnome-netstatus.mo
 share/locale/pl/LC_MESSAGES/gnome-netstatus.mo
 share/locale/pt/LC_MESSAGES/gnome-netstatus.mo
 share/locale/ru/LC_MESSAGES/gnome-netstatus.mo
@@ -46,11 +52,11 @@ share/locale/sq/LC_MESSAGES/gnome-netstatus.mo
 share/locale/sr/LC_MESSAGES/gnome-netstatus.mo
 share/locale/sr@Latn/LC_MESSAGES/gnome-netstatus.mo
 share/locale/sv/LC_MESSAGES/gnome-netstatus.mo
+share/locale/th/LC_MESSAGES/gnome-netstatus.mo
 share/locale/tr/LC_MESSAGES/gnome-netstatus.mo
 share/locale/vi/LC_MESSAGES/gnome-netstatus.mo
 share/locale/wa/LC_MESSAGES/gnome-netstatus.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-netstatus.mo
-@dirrm share/gnome/icons/gnome-netstatus
 @dirrm share/gnome/help/gnome-netstatus/C/figures
 @dirrm share/gnome/help/gnome-netstatus/C
 @dirrm share/gnome/help/gnome-netstatus
diff --git a/net/gnomenetstatus/Makefile b/net/gnomenetstatus/Makefile
index 4f18fe90c..21f8151cc 100644
--- a/net/gnomenetstatus/Makefile
+++ b/net/gnomenetstatus/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gnomenetstatus
-PORTVERSION=	0.16
-PORTREVISION=	1
+PORTVERSION=	2.5.91
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-netstatus/0.16
+MASTER_SITE_SUBDIR=	sources/gnome-netstatus/2.5
 DISTNAME=	gnome-netstatus-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/net/gnomenetstatus/distinfo b/net/gnomenetstatus/distinfo
index a76d52129..649393657 100644
--- a/net/gnomenetstatus/distinfo
+++ b/net/gnomenetstatus/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-netstatus-0.16.tar.bz2) = 50b7e43d2840200ab13fe5fb1b5577ed
-SIZE (gnome2/gnome-netstatus-0.16.tar.bz2) = 356995
+MD5 (gnome2/gnome-netstatus-2.5.91.tar.bz2) = f626b0c3cfb247c8200a6b840c116270
+SIZE (gnome2/gnome-netstatus-2.5.91.tar.bz2) = 363269
diff --git a/net/gnomenetstatus/files/patch-icons_Makefile.in b/net/gnomenetstatus/files/patch-icons_Makefile.in
new file mode 100644
index 000000000..a47c7f9e2
--- /dev/null
+++ b/net/gnomenetstatus/files/patch-icons_Makefile.in
@@ -0,0 +1,11 @@
+--- icons/Makefile.in.orig	Mon Mar  8 22:22:36 2004
++++ icons/Makefile.in	Mon Mar  8 22:22:53 2004
+@@ -133,7 +133,7 @@
+ 
+ iconsize = 48x48
+ category = apps
+-iconsdir = $(datadir)/icons/hicolor/$(iconsize)/$(category)
++iconsdir = $(prefix)/share/icons/hicolor/$(iconsize)/$(category)
+ icons_DATA = \
+ 	gnome-netstatus-disconn.png	\
+ 	gnome-netstatus-idle.png	\
diff --git a/net/gnomenetstatus/files/patch-src_netstatus-iface.c b/net/gnomenetstatus/files/patch-src_netstatus-iface.c
index 47056d2f1..97882f089 100644
--- a/net/gnomenetstatus/files/patch-src_netstatus-iface.c
+++ b/net/gnomenetstatus/files/patch-src_netstatus-iface.c
@@ -1,12 +1,15 @@
---- src/netstatus-iface.c.orig	Tue Jan 20 10:00:20 2004
-+++ src/netstatus-iface.c	Wed Feb  4 15:39:09 2004
-@@ -32,9 +32,12 @@
+--- src/netstatus-iface.c.orig	Wed Mar  3 08:07:35 2004
++++ src/netstatus-iface.c	Mon Mar  8 22:18:03 2004
+@@ -32,12 +32,15 @@
  
  #include <libgnome/gnome-i18n.h>
  
 +#include <sys/types.h>
 +#include <sys/socket.h>
  #include <sys/ioctl.h>
+ #ifdef HAVE_SYS_SOCKIO_H
+ #include <sys/sockio.h>
+ #endif /* HAVE_SYS_SOCKIO_H */
  #include <net/if.h>
  #include <net/if_arp.h>
 +#include <netinet/in.h>
diff --git a/net/gnomenetstatus/files/patch-src_netstatus-sysdeps.c b/net/gnomenetstatus/files/patch-src_netstatus-sysdeps.c
deleted file mode 100644
index 85b3f084d..000000000
--- a/net/gnomenetstatus/files/patch-src_netstatus-sysdeps.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/netstatus-sysdeps.c.orig	Wed Feb 18 18:20:48 2004
-+++ src/netstatus-sysdeps.c	Wed Feb 18 18:21:02 2004
-@@ -267,7 +267,7 @@
-   *out_bytes   = -1;
- 
-   error = NULL;
--  command_line = g_strdup_printf ("/usr/bin/netstat netstat -n -I %s -b -f inet", iface);
-+  command_line = g_strdup_printf ("/usr/bin/netstat -n -I %s -b -f inet", iface);
-   if (!g_shell_parse_argv (command_line, NULL, &argv, &error))
-     {
-       error_message = g_strdup_printf (_("Could not parse command line '%s': %s"),
diff --git a/net/gnomenetstatus/pkg-plist b/net/gnomenetstatus/pkg-plist
index 7c08ac2bf..04710577e 100644
--- a/net/gnomenetstatus/pkg-plist
+++ b/net/gnomenetstatus/pkg-plist
@@ -14,30 +14,36 @@ share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-tx.png
 share/gnome/help/gnome-netstatus/C/figures/gnome-netstatus-txrx.png
 share/gnome/help/gnome-netstatus/C/gnome-netstatus.xml
 share/gnome/help/gnome-netstatus/C/legal.xml
-share/gnome/icons/gnome-netstatus/gnome-netstatus-disconn.png
-share/gnome/icons/gnome-netstatus/gnome-netstatus-error.png
-share/gnome/icons/gnome-netstatus/gnome-netstatus-idle.png
-share/gnome/icons/gnome-netstatus/gnome-netstatus-rx.png
-share/gnome/icons/gnome-netstatus/gnome-netstatus-tx.png
-share/gnome/icons/gnome-netstatus/gnome-netstatus-txrx.png
 share/gnome/omf/gnome-netstatus/gnome-netstatus-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-netstatus/gnome-netstatus-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/gnome-netstatus-tx.png
+share/icons/hicolor/48x48/apps/gnome-netstatus-disconn.png
+share/icons/hicolor/48x48/apps/gnome-netstatus-error.png
+share/icons/hicolor/48x48/apps/gnome-netstatus-idle.png
+share/icons/hicolor/48x48/apps/gnome-netstatus-rx.png
+share/icons/hicolor/48x48/apps/gnome-netstatus-tx.png
+share/icons/hicolor/48x48/apps/gnome-netstatus-txrx.png
 share/locale/ar/LC_MESSAGES/gnome-netstatus.mo
 share/locale/az/LC_MESSAGES/gnome-netstatus.mo
+share/locale/ca/LC_MESSAGES/gnome-netstatus.mo
 share/locale/cs/LC_MESSAGES/gnome-netstatus.mo
+share/locale/da/LC_MESSAGES/gnome-netstatus.mo
 share/locale/de/LC_MESSAGES/gnome-netstatus.mo
 share/locale/el/LC_MESSAGES/gnome-netstatus.mo
+share/locale/en_CA/LC_MESSAGES/gnome-netstatus.mo
 share/locale/es/LC_MESSAGES/gnome-netstatus.mo
+share/locale/fi/LC_MESSAGES/gnome-netstatus.mo
 share/locale/fr/LC_MESSAGES/gnome-netstatus.mo
 share/locale/ga/LC_MESSAGES/gnome-netstatus.mo
 share/locale/hr/LC_MESSAGES/gnome-netstatus.mo
 share/locale/it/LC_MESSAGES/gnome-netstatus.mo
 share/locale/ja/LC_MESSAGES/gnome-netstatus.mo
 share/locale/ko/LC_MESSAGES/gnome-netstatus.mo
+share/locale/lt/LC_MESSAGES/gnome-netstatus.mo
 share/locale/mn/LC_MESSAGES/gnome-netstatus.mo
 share/locale/ms/LC_MESSAGES/gnome-netstatus.mo
 share/locale/nl/LC_MESSAGES/gnome-netstatus.mo
+share/locale/pa/LC_MESSAGES/gnome-netstatus.mo
 share/locale/pl/LC_MESSAGES/gnome-netstatus.mo
 share/locale/pt/LC_MESSAGES/gnome-netstatus.mo
 share/locale/ru/LC_MESSAGES/gnome-netstatus.mo
@@ -46,11 +52,11 @@ share/locale/sq/LC_MESSAGES/gnome-netstatus.mo
 share/locale/sr/LC_MESSAGES/gnome-netstatus.mo
 share/locale/sr@Latn/LC_MESSAGES/gnome-netstatus.mo
 share/locale/sv/LC_MESSAGES/gnome-netstatus.mo
+share/locale/th/LC_MESSAGES/gnome-netstatus.mo
 share/locale/tr/LC_MESSAGES/gnome-netstatus.mo
 share/locale/vi/LC_MESSAGES/gnome-netstatus.mo
 share/locale/wa/LC_MESSAGES/gnome-netstatus.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-netstatus.mo
-@dirrm share/gnome/icons/gnome-netstatus
 @dirrm share/gnome/help/gnome-netstatus/C/figures
 @dirrm share/gnome/help/gnome-netstatus/C
 @dirrm share/gnome/help/gnome-netstatus