Update to 2.26.0:

gnome-nettool 2.26.0, 2009-03-16
---------------------------------

 - Removed warnings from the Glade UI (Diego Escalante)
 - #573147: Remove deprecated gtk/gdk functions (Andre Klapper)
 - #557055: Improved accesability (Germán Póo-Caamaño)
 - #522934: Fixed support for unlimited pings (Germán Póo-Caamaño)
 - #554733: Gnome Nettool now is 1024x600 friendly (Germán Póo-Caamaño)
 - #563044: Added basic NetBSD support (Thomas Klausner)
 - #394648: Added menu for the documentation (Germán Póo-Caamaño)
 - #487308: Restored the behaviour of 'Edit/Copy' as default in
            Gnome.  Added 'Copy as text report' to copy all the values
            in a tab window (Germán Póo-Caamaño)
 - #156176: Removed Linux-dependency on NIC Information through the
            use of ligbtop instead of ioctl calls and reading from
            /proc/net (Germán Póo-Caamaño)
 - #341070: Updated About dialog (Alejandro Andrés)
 - #549588: Use pinky instead of finger to reduce one dependency in
            Linux systems (Germán Póo-Caamaño)
 - #560435: Removed deprecated symbols from glib (Maxim Ermilov)
 - #559852: Fixed unlocalized string in copyright (Claude Paroz)
 - #551754: Fixed unlocalized string in port scan (Takao Fujiwara)
 - #500773: Improved documentation metadata for library.gnome.org
            (Germán Póo-Caamaño)
 - #561229: Clean up Gtk+ includes (Maxim Ermilov)

 - Updated translations:
	- as (Amitakhya Phukan)
	- ast (Mikel González)
	- bn_IN (Runa Bhattacharjee)
	- ca (Gil Forcada, Joan Duran, David Planella)
	- cs (Lucas Lommer)
	- da (Kenneth Nielsen)
	- de (Mario Blättermann, Christian Kirbach)
	- el (Jennie Petoumenou)
	- en_GB (Philip Withnall, Jen Ockwell)
	- es (Jorge González)
	- et (Ivar Smolin)
	- eu (Inaki Larranaga Murgoitio)
	- fi (Ilkka Tuohela)
	- fr (Claude Paroz)
	- gl (Suso Baleato)
	- gu (Sweta Kothari)
	- he (Yair Hershkoviz, Yaron Sharabani)
	- hu (Gabor Kelemen)
	- it (Francesco Marletta)
	- ja (Takeshi AIHANA)
	- ko (Changwoo Ryu)
	- lt (Gintautas Miliauskas)
	- lv (Raivis Dejus)
	- ml (Hari Vishnu)
	. mr (Sandeep Shedmake)
	- nl (Wouter Bolsterlee)
	- no (Kjartan Maraas)
	- or (Manoj Kumar Giri)
	- pl (Tomasz Dominikowski)
	- po (A S Alam)
	- pt (Duarte Loreto)
	- pt_BT (Leonardo Gregianin, André Pinheiro,
	         Vladimir Melo, Djavan Fagundes)
	- ro (Adi Roiban)
	- ru (Nickolay V. Shmyrev)
	- sl (Matej Urbančič)
	- sv (Daniel Nylander)
	- ta (I. Felix)
	- te (Krishnababu K)
	- th (Theppitak Karoonboonyanan)
	- tr (Baris Cicek)
	- vi (Clytie Siddall)
	- zh_CN (甘露(Gan Lu))

 - Added translations:
	- af (Friedel Wolff)
	- ps (Zabeeh Khan)

6 files changed, 55 insertions, 31 deletions

diff --git a/net/gnome-nettool/Makefile b/net/gnome-nettool/Makefile
index 8beac9f39aa..9cfc2b4aa95 100644
--- a/net/gnome-nettool/Makefile
+++ b/net/gnome-nettool/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2009/03/08 15:56:47 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2009/03/22 18:11:57 wiz Exp $
 #
 
-DISTNAME=	gnome-nettool-2.22.1
+DISTNAME=	gnome-nettool-2.26.0
 CATEGORIES=	net gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-nettool/2.22/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-nettool/2.26/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -21,7 +21,9 @@ USE_PKGLOCALEDIR=	yes
 .include "../../devel/GConf/buildlink3.mk"
 .include "../../devel/libglade/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../sysutils/libgtop/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../mk/omf-scrollkeeper.mk"
+BUILDLINK_API_DEPENDS.gtk2+=	gtk2+>=2.6.0
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/gnome-nettool/PLIST b/net/gnome-nettool/PLIST
index 810cfe8d6f9..c5d4832a543 100644
--- a/net/gnome-nettool/PLIST
+++ b/net/gnome-nettool/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/12/02 20:56:49 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/03/22 18:11:57 wiz Exp $
 bin/gnome-nettool
 share/applications/gnome-nettool.desktop
 share/gnome-nettool/dialogs/gnome-nettool.glade
@@ -15,20 +15,26 @@ share/gnome/help/gnome-nettool/C/legal.xml
 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/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/sv/gnome-nettool.xml
 share/gnome/help/gnome-nettool/uk/gnome-nettool.xml
 share/gnome/help/gnome-nettool/vi/gnome-nettool.xml
+share/gnome/help/gnome-nettool/zh_CN/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/af/LC_MESSAGES/gnome-nettool.mo
 share/locale/ar/LC_MESSAGES/gnome-nettool.mo
 share/locale/as/LC_MESSAGES/gnome-nettool.mo
+share/locale/ast/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
@@ -79,6 +85,7 @@ share/locale/oc/LC_MESSAGES/gnome-nettool.mo
 share/locale/or/LC_MESSAGES/gnome-nettool.mo
 share/locale/pa/LC_MESSAGES/gnome-nettool.mo
 share/locale/pl/LC_MESSAGES/gnome-nettool.mo
+share/locale/ps/LC_MESSAGES/gnome-nettool.mo
 share/locale/pt/LC_MESSAGES/gnome-nettool.mo
 share/locale/pt_BR/LC_MESSAGES/gnome-nettool.mo
 share/locale/ro/LC_MESSAGES/gnome-nettool.mo
@@ -108,28 +115,42 @@ share/omf/gnome-nettool/gnome-nettool-C.omf
 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-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-sv.omf
 share/omf/gnome-nettool/gnome-nettool-uk.omf
 share/omf/gnome-nettool/gnome-nettool-vi.omf
+share/omf/gnome-nettool/gnome-nettool-zh_CN.omf
 @dirrm share/omf/gnome-nettool
 @comment in rarian: @dirrm share/omf
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/24x24/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/24x24
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/22x22/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/22x22
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor
+@comment in xdg-dirs: @dirrm share/icons
+@dirrm share/gnome/help/gnome-nettool/zh_CN
 @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/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/de
 @dirrm share/gnome/help/gnome-nettool/da
 @dirrm share/gnome/help/gnome-nettool/cs
 @dirrm share/gnome/help/gnome-nettool/ca
@@ -139,4 +160,5 @@ share/omf/gnome-nettool/gnome-nettool-vi.omf
 @dirrm share/gnome-nettool/pixmaps
 @dirrm share/gnome-nettool/dialogs
 @dirrm share/gnome-nettool
+@comment in gnome2-dirs: @dirrm share/gnome
 @comment in xdg-dirs: @dirrm share/applications
diff --git a/net/gnome-nettool/distinfo b/net/gnome-nettool/distinfo
index 322e157e6f5..38c015d2346 100644
--- a/net/gnome-nettool/distinfo
+++ b/net/gnome-nettool/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2008/12/25 05:35:50 hasso Exp $
+$NetBSD: distinfo,v 1.3 2009/03/22 18:11:57 wiz Exp $
 
-SHA1 (gnome-nettool-2.22.1.tar.bz2) = 41e66c37beb677cf5ac17a2ec6254cd24b0e18d4
-RMD160 (gnome-nettool-2.22.1.tar.bz2) = 43b78d53ae5805f97f031821b37b7e739ca5866a
-Size (gnome-nettool-2.22.1.tar.bz2) = 600085 bytes
-SHA1 (patch-aa) = 587c1c7d011d5d8a4feafc63a7a505979296a8a1
-SHA1 (patch-ab) = 8d89efa54803da97d962e43990728f56e60a5ab2
-SHA1 (patch-ac) = b4ec8fb2cbaa799717b11dc9d9036a7bac1a9e51
+SHA1 (gnome-nettool-2.26.0.tar.bz2) = acc287c08f6099dbe82d03820002dae9dcdaef8a
+RMD160 (gnome-nettool-2.26.0.tar.bz2) = 4a3bdcdfd5b8e1fee389d54ae9f7b2ab8ee206da
+Size (gnome-nettool-2.26.0.tar.bz2) = 627982 bytes
+SHA1 (patch-aa) = 1b6dd7ce4da481113a42d31401f10dd3871da088
+SHA1 (patch-ab) = 71357f8eb9ece41069b1e286727c1f06e420b7b9
+SHA1 (patch-ac) = e83bff9d598834bd68f036001e403868a962f371
diff --git a/net/gnome-nettool/patches/patch-aa b/net/gnome-nettool/patches/patch-aa
index f0fafbe4151..9506d303f2f 100644
--- a/net/gnome-nettool/patches/patch-aa
+++ b/net/gnome-nettool/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.2 2008/12/25 05:35:50 hasso Exp $
+$NetBSD: patch-aa,v 1.3 2009/03/22 18:11:57 wiz Exp $
 
---- src/ping.h.orig	2008-09-22 22:04:12.000000000 +0000
+--- 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 -c %d -n %s"
+ #   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__)
+-#elif defined(__OSF__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
 +#elif defined(__OSF__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
- #   define PING_PROGRAM_FORMAT "%s ping -c %d -n %s"
- #   define PING_PROGRAM_FORMAT_6 "%s ping6 -c %d -n %s"
- #   define PING_FORMAT "%d bytes from %s icmp_seq=%d ttl=%d time=%s %s"
+     /*  <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
index 83462355479..eee3d4652db 100644
--- a/net/gnome-nettool/patches/patch-ab
+++ b/net/gnome-nettool/patches/patch-ab
@@ -1,12 +1,12 @@
-$NetBSD: patch-ab,v 1.2 2008/12/25 05:35:50 hasso Exp $
+$NetBSD: patch-ab,v 1.3 2009/03/22 18:11:57 wiz Exp $
 
---- src/netstat.h.orig	2008-09-22 22:04:12.000000000 +0000
+--- 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__)
+-#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"
diff --git a/net/gnome-nettool/patches/patch-ac b/net/gnome-nettool/patches/patch-ac
index 33c9a37c7ab..4554738ec7c 100644
--- a/net/gnome-nettool/patches/patch-ac
+++ b/net/gnome-nettool/patches/patch-ac
@@ -1,12 +1,12 @@
-$NetBSD: patch-ac,v 1.2 2008/12/25 05:35:50 hasso Exp $
+$NetBSD: patch-ac,v 1.3 2009/03/22 18:11:57 wiz Exp $
 
---- src/netstat.c.orig	2008-09-22 22:04:12.000000000 +0000
+--- 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__)
+-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
 +#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
  	    	option = g_strdup ("-a -f inet -ln");
  #else
@@ -15,7 +15,7 @@ $NetBSD: patch-ac,v 1.2 2008/12/25 05:35:50 hasso Exp $
  	g_return_if_fail (line != NULL);
  
  	count = strip_protocol_line (line, &data);
--#if defined(__FreeBSD__) || defined(__OpenBSD__)
+-#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
@@ -24,7 +24,7 @@ $NetBSD: patch-ac,v 1.2 2008/12/25 05:35:50 hasso Exp $
  strip_protocol_line (gchar * line, netstat_protocol_data *data)
  {
  	gint count = 0;
--#if defined(__FreeBSD__) || defined(__OpenBSD__)
+-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
 +#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
  	gint a1, a2, a3, a4;
  	gchar s9[30];
@@ -33,7 +33,7 @@ $NetBSD: patch-ac,v 1.2 2008/12/25 05:35:50 hasso Exp $
  
  	/*line = g_strdelimit (line, ":", ' ');*/
  
--#if defined(__FreeBSD__) || defined(__OpenBSD__)
+-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
 +#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
  	line = g_strdelimit (line, ":", ' ');
  	
@@ -42,7 +42,7 @@ $NetBSD: patch-ac,v 1.2 2008/12/25 05:35:50 hasso Exp $
  	g_return_if_fail (line != NULL);
  
  	count = strip_route_line (line, &data);
--#if defined(__FreeBSD__) || defined(__OpenBSD__)
+-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
 +#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
  	if (count == 6) {
  #else
@@ -51,7 +51,7 @@ $NetBSD: patch-ac,v 1.2 2008/12/25 05:35:50 hasso Exp $
  	gchar **items;
  #endif
  
--#if defined(__FreeBSD__) || defined(__OpenBSD__)
+-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
 +#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
  	count = sscanf (line, NETSTAT_ROUTE_FORMAT,
  			data->destination,
@@ -60,7 +60,7 @@ $NetBSD: patch-ac,v 1.2 2008/12/25 05:35:50 hasso Exp $
  	renderer = gtk_cell_renderer_text_new ();
  	column =
  	    gtk_tree_view_column_new_with_attributes
--#if defined(__FreeBSD__) || defined(__OpenBSD__)
+-#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
 +#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
  	    (_("Destination/Prefix"), renderer, "text", 0, NULL);
  #else
@@ -69,7 +69,7 @@ $NetBSD: patch-ac,v 1.2 2008/12/25 05:35:50 hasso Exp $
  	gtk_tree_view_column_set_alignment (column, 0.5);
  	gtk_tree_view_append_column (widget, column);
  
--#if ! (defined(__FreeBSD__) || defined(__OpenBSD__))
+-#if ! (defined(__FreeBSD__) || defined(__OpenBSD__)) || defined(__NetBSD__)
 +#if ! (defined(__FreeBSD__) || defined(__OpenBSD__)) || defined(__NetBSD__) || defined(__DragonFly__)
  	renderer = gtk_cell_renderer_text_new ();
  	column =