Update to 0.99.2.

7 files changed, 30 insertions, 70 deletions

diff --git a/net/gnome-nettool/Makefile b/net/gnome-nettool/Makefile
index 9c2a52cad100..d5d6cfb34330 100644
--- a/net/gnome-nettool/Makefile
+++ b/net/gnome-nettool/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnomenettool
-PORTVERSION=	0.99.1
-PORTREVISION=	1
+PORTVERSION=	0.99.2
 PORTEPOCH=	1
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
diff --git a/net/gnome-nettool/distinfo b/net/gnome-nettool/distinfo
index 67cc3f2009a2..f30e590a47f3 100644
--- a/net/gnome-nettool/distinfo
+++ b/net/gnome-nettool/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-nettool-0.99.1.tar.bz2) = 090c425dc85415e1525298c7014c95a2
-SIZE (gnome2/gnome-nettool-0.99.1.tar.bz2) = 498036
+MD5 (gnome2/gnome-nettool-0.99.2.tar.bz2) = 4843be3554710f4b0e3f3cbdc5134e7b
+SIZE (gnome2/gnome-nettool-0.99.2.tar.bz2) = 496851
diff --git a/net/gnome-nettool/files/patch-configure b/net/gnome-nettool/files/patch-configure
deleted file mode 100644
index deab160ccad3..000000000000
--- a/net/gnome-nettool/files/patch-configure
+++ /dev/null
@@ -1,40 +0,0 @@
---- configure.orig	Sun Jul  4 16:00:33 2004
-+++ configure	Sun Jul  4 16:02:31 2004
-@@ -22038,13 +22038,13 @@
- if test "x${prefix}" = "xNONE"; then
- 
- cat >>confdefs.h <<_ACEOF
--#define GNOME_ICONDIR "${ac_default_prefix}/share/pixmaps"
-+#define GNOME_ICONDIR "${ac_default_prefix}/share/gnome/pixmaps"
- _ACEOF
- 
- else
- 
- cat >>confdefs.h <<_ACEOF
--#define GNOME_ICONDIR "${prefix}/share/pixmaps"
-+#define GNOME_ICONDIR "${prefix}/share/gnome/pixmaps"
- _ACEOF
- 
- fi
-@@ -22052,17 +22052,17 @@
- if test "x${prefix}" = "xNONE"; then
- 
- cat >>confdefs.h <<_ACEOF
--#define PIXMAPS_DIR "${ac_default_prefix}/${DATADIRNAME}/${PACKAGE}/pixmaps"
-+#define PIXMAPS_DIR "${ac_default_prefix}/${DATADIRNAME}/gnome/${PACKAGE}/pixmaps"
- _ACEOF
- 
--   pixmapsdir="${ac_default_prefix}/${DATADIRNAME}/${PACKAGE}/pixmaps"
-+   pixmapsdir="${ac_default_prefix}/${DATADIRNAME}/gnome/${PACKAGE}/pixmaps"
- else
- 
- cat >>confdefs.h <<_ACEOF
--#define PIXMAPS_DIR "${prefix}/${DATADIRNAME}/${PACKAGE}/pixmaps"
-+#define PIXMAPS_DIR "${prefix}/${DATADIRNAME}/gnome/${PACKAGE}/pixmaps"
- _ACEOF
- 
--   pixmapsdir="${prefix}/${DATADIRNAME}/${PACKAGE}/pixmaps"
-+   pixmapsdir="${prefix}/${DATADIRNAME}/gnome/${PACKAGE}/pixmaps"
- fi
- 
- 
diff --git a/net/gnome-nettool/files/patch-po_Makefile.in.in b/net/gnome-nettool/files/patch-po_Makefile.in.in
new file mode 100644
index 000000000000..2c6b6128215e
--- /dev/null
+++ b/net/gnome-nettool/files/patch-po_Makefile.in.in
@@ -0,0 +1,10 @@
+--- po/Makefile.in.in.orig	Fri Aug 20 15:59:14 2004
++++ po/Makefile.in.in	Fri Aug 20 15:59:26 2004
+@@ -32,6 +32,7 @@
+ gnulocaledir = $(prefix)/share/locale
+ gettextsrcdir = $(datadir)/glib-2.0/gettext/po
+ subdir = po
++mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ 
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
diff --git a/net/gnome-nettool/files/patch-src_info.c b/net/gnome-nettool/files/patch-src_info.c
index d5602ae5be80..c4bd8e09b1b9 100644
--- a/net/gnome-nettool/files/patch-src_info.c
+++ b/net/gnome-nettool/files/patch-src_info.c
@@ -1,5 +1,5 @@
---- src/info.c.orig	Fri Jun 11 07:14:17 2004
-+++ src/info.c	Tue Jul  6 01:19:20 2004
+--- src/info.c.orig	Mon Jun 14 06:52:59 2004
++++ src/info.c	Fri Aug 20 15:52:34 2004
 @@ -37,6 +37,9 @@
  #include <sys/ioctl.h>
  #include <stdlib.h>
@@ -10,20 +10,7 @@
  
  #include "info.h"
  #include "utils.h"
-@@ -57,10 +60,11 @@
- 	{ N_("Ethernet Interface"),      INFO_INTERFACE_ETH,     "16_ethernet.xpm", "eth",        NULL },
- 	{ N_("Wireless Interface"),      INFO_INTERFACE_WLAN,    "wavelan-16.png",  "wlan",       NULL },
- 	{ N_("Modem Interface"),         INFO_INTERFACE_PPP,     "16_ppp.xpm",      "ppp",        NULL },
-+	{ N_("Modem Interface"),         INFO_INTERFACE_PPP,     "16_ppp.xpm",      "tun",        NULL },
- 	{ N_("Parallel Line Interface"), INFO_INTERFACE_PLIP,    "16_plip.xpm",     "plip",       NULL },
- 	{ N_("Infrared Interface"),      INFO_INTERFACE_IRLAN,   "irda-16.png",     "irlan",      NULL },
- 	{ N_("Loopback Interface"),      INFO_INTERFACE_LO,      "16_loopback.xpm", "lo",         NULL },
--	{ N_("Unknown Interface"),       INFO_INTERFACE_UNKNOWN, "network.png",     NULL,         NULL },
-+	{ N_("Unknown Interface"),       INFO_INTERFACE_UNKNOWN, "network.png",     "",         NULL },
- 	{ NULL,                          INFO_INTERFACE_UNKNOWN,  NULL,             NULL,         NULL }
- };
- 
-@@ -97,9 +101,39 @@
+@@ -97,9 +100,39 @@
  {
  	gint i;
  	gchar *path;
@@ -65,7 +52,7 @@
  			(*iface) = g_strdup_printf ("%s (%s)", info_iface_desc[i].name, dev_name);
  			if (info_iface_desc[i].pixbuf == NULL) {
  				path = g_build_filename (PIXMAPS_DIR, info_iface_desc[i].icon, NULL);
-@@ -187,17 +221,26 @@
+@@ -187,17 +220,26 @@
  	gchar tx[10], tx_error[10], tx_drop[10], tx_ovr[10]; 
  	*/
  	gchar iface[30]; /*, flags[30]; */
@@ -96,7 +83,7 @@
  	g_return_val_if_fail (info != NULL, FALSE);
  
  	model = gtk_combo_box_get_model (GTK_COMBO_BOX (info->combo));
-@@ -206,21 +249,61 @@
+@@ -206,21 +248,61 @@
  	else
  		return FALSE;
  	/*text = gtk_entry_get_text (GTK_ENTRY (info->nic));*/
@@ -160,7 +147,7 @@
  
  		if (g_ascii_strcasecmp (iface, text) == 0) {
  			/*
-@@ -248,7 +331,9 @@
+@@ -248,7 +330,9 @@
  	}
  	
  	g_io_channel_unref (io);
@@ -171,7 +158,7 @@
  
  	return TRUE;
  }
-@@ -384,6 +469,7 @@
+@@ -384,6 +468,7 @@
  	mii_data_result data;
  
  	getifaddrs (&ifa0);
@@ -179,7 +166,7 @@
  
  	for (ifr6 = ifa0; ifr6; ifr6 = ifr6->ifa_next) {
  		if (strcmp (ifr6->ifa_name, nic) != 0) {
-@@ -425,7 +511,9 @@
+@@ -429,7 +514,9 @@
  			ifc.ifc_req = (struct ifreq *) buf;
  			ioctl (sockfd, SIOCGIFCONF, &ifc);
  
diff --git a/net/gnome-nettool/files/patch-src_netstat.c b/net/gnome-nettool/files/patch-src_netstat.c
index eed0a328c47c..1eec8492793a 100644
--- a/net/gnome-nettool/files/patch-src_netstat.c
+++ b/net/gnome-nettool/files/patch-src_netstat.c
@@ -1,5 +1,5 @@
---- src/netstat.c.orig	Sun Jul  4 17:57:03 2004
-+++ src/netstat.c	Sun Jul  4 17:57:48 2004
+--- src/netstat.c.orig	Tue Jul  6 13:55:25 2004
++++ src/netstat.c	Fri Aug 20 15:55:40 2004
 @@ -108,12 +108,17 @@
  	g_return_val_if_fail (netinfo != NULL, NULL);
  	
@@ -15,6 +15,6 @@
  			option = g_strdup ("-rn -A inet");
  		}
 +#endif
- 	}
- 	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (netinfo->protocol))) {
- 		/* Only works for Solaris */
+ 
+ 		if (netinfo->stbar_text)
+ 			g_free (netinfo->stbar_text);
diff --git a/net/gnome-nettool/pkg-plist b/net/gnome-nettool/pkg-plist
index 3823c7ebffd5..1686fe529e4b 100644
--- a/net/gnome-nettool/pkg-plist
+++ b/net/gnome-nettool/pkg-plist
@@ -13,6 +13,7 @@ share/gnome/pixmaps/gnome-nettool.png
 share/locale/az/LC_MESSAGES/gnome-nettool.mo
 share/locale/ca/LC_MESSAGES/gnome-nettool.mo
 share/locale/cs/LC_MESSAGES/gnome-nettool.mo
+share/locale/bn/LC_MESSAGES/gnome-nettool.mo
 share/locale/da/LC_MESSAGES/gnome-nettool.mo
 share/locale/de/LC_MESSAGES/gnome-nettool.mo
 share/locale/el/LC_MESSAGES/gnome-nettool.mo
@@ -22,6 +23,7 @@ share/locale/es/LC_MESSAGES/gnome-nettool.mo
 share/locale/fr/LC_MESSAGES/gnome-nettool.mo
 share/locale/ga/LC_MESSAGES/gnome-nettool.mo
 share/locale/gl/LC_MESSAGES/gnome-nettool.mo
+share/locale/gu/LC_MESSAGES/gnome-nettool.mo
 share/locale/he/LC_MESSAGES/gnome-nettool.mo
 share/locale/hu/LC_MESSAGES/gnome-nettool.mo
 share/locale/it/LC_MESSAGES/gnome-nettool.mo
@@ -30,9 +32,11 @@ share/locale/ko/LC_MESSAGES/gnome-nettool.mo
 share/locale/ms/LC_MESSAGES/gnome-nettool.mo
 share/locale/nl/LC_MESSAGES/gnome-nettool.mo
 share/locale/no/LC_MESSAGES/gnome-nettool.mo
+share/locale/pa/LC_MESSAGES/gnome-nettool.mo
 share/locale/pl/LC_MESSAGES/gnome-nettool.mo
 share/locale/pt/LC_MESSAGES/gnome-nettool.mo
 share/locale/pt_BR/LC_MESSAGES/gnome-nettool.mo
+share/locale/sq/LC_MESSAGES/gnome-nettool.mo
 share/locale/ru/LC_MESSAGES/gnome-nettool.mo
 share/locale/sr/LC_MESSAGES/gnome-nettool.mo
 share/locale/sr@Latn/LC_MESSAGES/gnome-nettool.mo