Update to 2.26.2:

gnome-nettool 2.26.2, 2009-05-19
---------------------------------

 - #583286: Compilation fixes for DragonFly BSD (Thomas Klausner)

 - Updated translations:
        - el (Simos Xenitellis)
        - et (Ivar Smolin)
        - ru (Boris Egorov)

6 files changed, 13 insertions, 118 deletions

diff --git a/net/gnome-nettool/Makefile b/net/gnome-nettool/Makefile
index 1013dd5bc00..6373e59bdb8 100644
--- a/net/gnome-nettool/Makefile
+++ b/net/gnome-nettool/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2009/05/19 08:59:26 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2009/05/20 01:23:53 wiz Exp $
 #
 
-DISTNAME=	gnome-nettool-2.26.1
+DISTNAME=	gnome-nettool-2.26.2
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-nettool/2.26/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/net/gnome-nettool/PLIST b/net/gnome-nettool/PLIST
index c5d4832a543..953ef4180f4 100644
--- a/net/gnome-nettool/PLIST
+++ b/net/gnome-nettool/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2009/03/22 18:11:57 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/05/20 01:23:53 wiz Exp $
 bin/gnome-nettool
 share/applications/gnome-nettool.desktop
 share/gnome-nettool/dialogs/gnome-nettool.glade
@@ -16,12 +16,14 @@ share/gnome/help/gnome-nettool/ca/gnome-nettool.xml
 share/gnome/help/gnome-nettool/cs/gnome-nettool.xml
 share/gnome/help/gnome-nettool/da/gnome-nettool.xml
 share/gnome/help/gnome-nettool/de/gnome-nettool.xml
+share/gnome/help/gnome-nettool/el/gnome-nettool.xml
 share/gnome/help/gnome-nettool/en_GB/gnome-nettool.xml
 share/gnome/help/gnome-nettool/es/gnome-nettool.xml
 share/gnome/help/gnome-nettool/fr/gnome-nettool.xml
 share/gnome/help/gnome-nettool/oc/gnome-nettool.xml
 share/gnome/help/gnome-nettool/pa/gnome-nettool.xml
 share/gnome/help/gnome-nettool/pt_BR/gnome-nettool.xml
+share/gnome/help/gnome-nettool/ru/gnome-nettool.xml
 share/gnome/help/gnome-nettool/sv/gnome-nettool.xml
 share/gnome/help/gnome-nettool/uk/gnome-nettool.xml
 share/gnome/help/gnome-nettool/vi/gnome-nettool.xml
@@ -116,12 +118,14 @@ share/omf/gnome-nettool/gnome-nettool-ca.omf
 share/omf/gnome-nettool/gnome-nettool-cs.omf
 share/omf/gnome-nettool/gnome-nettool-da.omf
 share/omf/gnome-nettool/gnome-nettool-de.omf
+share/omf/gnome-nettool/gnome-nettool-el.omf
 share/omf/gnome-nettool/gnome-nettool-en_GB.omf
 share/omf/gnome-nettool/gnome-nettool-es.omf
 share/omf/gnome-nettool/gnome-nettool-fr.omf
 share/omf/gnome-nettool/gnome-nettool-oc.omf
 share/omf/gnome-nettool/gnome-nettool-pa.omf
 share/omf/gnome-nettool/gnome-nettool-pt_BR.omf
+share/omf/gnome-nettool/gnome-nettool-ru.omf
 share/omf/gnome-nettool/gnome-nettool-sv.omf
 share/omf/gnome-nettool/gnome-nettool-uk.omf
 share/omf/gnome-nettool/gnome-nettool-vi.omf
@@ -144,12 +148,14 @@ share/omf/gnome-nettool/gnome-nettool-zh_CN.omf
 @dirrm share/gnome/help/gnome-nettool/vi
 @dirrm share/gnome/help/gnome-nettool/uk
 @dirrm share/gnome/help/gnome-nettool/sv
+@dirrm share/gnome/help/gnome-nettool/ru
 @dirrm share/gnome/help/gnome-nettool/pt_BR
 @dirrm share/gnome/help/gnome-nettool/pa
 @dirrm share/gnome/help/gnome-nettool/oc
 @dirrm share/gnome/help/gnome-nettool/fr
 @dirrm share/gnome/help/gnome-nettool/es
 @dirrm share/gnome/help/gnome-nettool/en_GB
+@dirrm share/gnome/help/gnome-nettool/el
 @dirrm share/gnome/help/gnome-nettool/de
 @dirrm share/gnome/help/gnome-nettool/da
 @dirrm share/gnome/help/gnome-nettool/cs
diff --git a/net/gnome-nettool/distinfo b/net/gnome-nettool/distinfo
index 72a35c2ad16..300bf31076b 100644
--- a/net/gnome-nettool/distinfo
+++ b/net/gnome-nettool/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.5 2009/05/19 23:55:42 wiz Exp $
+$NetBSD: distinfo,v 1.6 2009/05/20 01:23:53 wiz Exp $
 
-SHA1 (gnome-nettool-2.26.1.tar.bz2) = f7a2f606ec0cdf3576e97177c636f8f0b201647f
-RMD160 (gnome-nettool-2.26.1.tar.bz2) = 64116468c39c3813574d971f77b3d1fd7670ab14
-Size (gnome-nettool-2.26.1.tar.bz2) = 611892 bytes
-SHA1 (patch-aa) = 5af8f44e221c44d1715e5720c914f865fd6a1f1a
-SHA1 (patch-ab) = 060945b4b255dc3fbbfcbebe77e21ebdb683f4bc
-SHA1 (patch-ac) = 8e6fe21f6f67a90032cc51395f62e8af142204c0
+SHA1 (gnome-nettool-2.26.2.tar.bz2) = dcb026f358a5797793391e5a90ae74c8401a8fec
+RMD160 (gnome-nettool-2.26.2.tar.bz2) = 20b2145d8d616fbbac0c6081a0d508439a9b31f7
+Size (gnome-nettool-2.26.2.tar.bz2) = 631631 bytes
diff --git a/net/gnome-nettool/patches/patch-aa b/net/gnome-nettool/patches/patch-aa
deleted file mode 100644
index 08445f3b2c0..00000000000
--- a/net/gnome-nettool/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2009/05/19 23:55:42 wiz Exp $
-
-http://bugzilla.gnome.org/show_bug.cgi?id=583286
-
---- src/ping.h.orig	2008-12-10 00:38:44.000000000 +0000
-+++ src/ping.h
-@@ -30,7 +30,7 @@
- #   define PING_PROGRAM_FORMAT_6 "%s ping6%s-n %s"
- #   define PING_FORMAT "%d bytes from %s icmp_seq=%d ttl=%d time=%s %s"
- #   define PING_PARAMS_6
--#elif defined(__OSF__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
-+#elif defined(__OSF__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
-     /*  <path to program> ping [-c <count>] -n <host> */
- #   define PING_PROGRAM_FORMAT "%s ping%s-n %s"
- #   define PING_PROGRAM_FORMAT_6 "%s ping6%s-n %s"
diff --git a/net/gnome-nettool/patches/patch-ab b/net/gnome-nettool/patches/patch-ab
deleted file mode 100644
index 974ef8766a3..00000000000
--- a/net/gnome-nettool/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2009/05/19 23:55:42 wiz Exp $
-
-http://bugzilla.gnome.org/show_bug.cgi?id=583286
-
---- src/netstat.h.orig	2008-12-10 00:38:30.000000000 +0000
-+++ src/netstat.h
-@@ -30,7 +30,7 @@
- #   define NETSTAT_ROUTE6_FORMAT "%s %s %s %d %d %d %s"
- #   define NETSTAT_MULTICAST_FORMAT "%s %d %s"
- 
--#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
-+#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
- #   define NETSTAT_PROTOCOL_FORMAT "%s %d %d %d.%d.%d.%d.%s %s %s"
- #   define ALT_NETSTAT_PROTOCOL_FORMAT "%s %d %d *.%s %s %s"
- #   define NETSTAT_ROUTE_FORMAT "%s %s %s %d %d %s"
diff --git a/net/gnome-nettool/patches/patch-ac b/net/gnome-nettool/patches/patch-ac
deleted file mode 100644
index 18ad4753db0..00000000000
--- a/net/gnome-nettool/patches/patch-ac
+++ /dev/null
@@ -1,78 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2009/05/19 23:55:42 wiz Exp $
-
-http://bugzilla.gnome.org/show_bug.cgi?id=583286
-
---- src/netstat.c.orig	2009-03-17 02:15:43.000000000 +0000
-+++ src/netstat.c
-@@ -123,7 +123,7 @@ netstat_get_active_option (Netinfo * net
- 	}
- 	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (netinfo->protocol))) {
- 		/* Only works for Solaris */
--#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
- 	    	option = g_strdup ("-a -f inet -ln");
- #else
- 		if (netinfo_is_ipv6_enable ()) {
-@@ -292,7 +292,7 @@ netstat_protocol_tree_insert (GtkTreeVie
- 	g_return_if_fail (line != NULL);
- 
- 	count = strip_protocol_line (line, &data);
--#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
- 	if (count == 5 || count == 6 || count == 9 || count == 10) {
- #else
- 	if (count == 5 || count == 6) {
-@@ -360,7 +360,7 @@ static gint
- strip_protocol_line (gchar * line, netstat_protocol_data *data)
- {
- 	gint count = 0;
--#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
- 	gint a1, a2, a3, a4;
- 	gchar s9[30];
- #else
-@@ -371,7 +371,7 @@ strip_protocol_line (gchar * line, netst
- 
- 	/*line = g_strdelimit (line, ":", ' ');*/
- 
--#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
- 	line = g_strdelimit (line, ":", ' ');
- 	
- 	count = sscanf (line, NETSTAT_PROTOCOL_FORMAT,
-@@ -485,7 +485,7 @@ netstat_route_tree_insert (GtkTreeView *
- 	g_return_if_fail (line != NULL);
- 
- 	count = strip_route_line (line, &data);
--#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
- 	if (count == 6) {
- #else
- 	if ((count == 8) || (count == 7)) {
-@@ -562,7 +562,7 @@ strip_route_line (gchar * line, netstat_
- 	gchar **items;
- #endif
- 
--#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
- 	count = sscanf (line, NETSTAT_ROUTE_FORMAT,
- 			data->destination,
- 			data->gateway, flags,
-@@ -605,7 +605,7 @@ netstat_create_route_model (GtkTreeView 
- 	renderer = gtk_cell_renderer_text_new ();
- 	column =
- 	    gtk_tree_view_column_new_with_attributes
--#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
-+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
- 	    (_("Destination/Prefix"), renderer, "text", 0, NULL);
- #else
- 	    (_("Destination"), renderer, "text", 0, NULL);
-@@ -619,7 +619,7 @@ netstat_create_route_model (GtkTreeView 
- 	gtk_tree_view_column_set_alignment (column, 0.5);
- 	gtk_tree_view_append_column (widget, column);
- 
--#if ! (defined(__FreeBSD__) || defined(__OpenBSD__)) || defined(__NetBSD__)
-+#if ! (defined(__FreeBSD__) || defined(__OpenBSD__)) || defined(__NetBSD__) || defined(__DragonFly__)
- 	renderer = gtk_cell_renderer_text_new ();
- 	column =
- 	    gtk_tree_view_column_new_with_attributes