Update to 2.10.0:

Mars 7, 2005: Overview of Changes from 2.9.92 to 2.10.0
=======================================================
* Updated i18n.

February 28, 2005: Overview of Changes from 2.9.90 to 2.9.92
============================================================
* *BSD updated by marcus@freebsd.org (Joe Marcus Clarke).
* Removed a lot of dead files :)
* Don't build&install libgtop_daemon when it's never used.

February 6, 2004: Overview of Changes from 2.9.90 to 2.9.91
==========================================================
* Fixed typo in stub.
* Updated i18n.

January 24, 2004: Overview of Changes from 2.9.4 to 2.9.90
==========================================================
* Updated Linux support.

January 10, 2004: Overview of Changes from 2.9.3 to 2.9.4
=========================================================
* New glibtop_proc_open_files nick@reloco.com.ar (Nicolás Lichtmaier).
* Updated AIX support (Christophe Belle).

December 20, 2004: Overview of Changes from 2.9.0 to 2.9.3
==========================================================
* Removed libgtop_names.
* Fixed Argument passing between library and server. #139809.
* *BSD updated by marcus@freebsd.org (Joe Marcus Clarke).
* glibtop_get_mountlist(False) now ignores 'unknown' fs.

6 files changed, 69 insertions, 72 deletions

diff --git a/sysutils/libgtop2/Makefile b/sysutils/libgtop2/Makefile
index eac9bae2885..4bad38395b7 100644
--- a/sysutils/libgtop2/Makefile
+++ b/sysutils/libgtop2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2005/02/26 17:24:08 jmmv Exp $
+# $NetBSD: Makefile,v 1.14 2005/03/22 16:03:37 jmmv Exp $
 
-DISTNAME=		libgtop-2.8.3
+DISTNAME=		libgtop-2.10.0
 PKGNAME=		${DISTNAME:S/-/2-/}
 CATEGORIES=		sysutils gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libgtop/2.8/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libgtop/2.10/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		tech-pkg@NetBSD.org
@@ -75,6 +75,8 @@ post-install:
 	@${CHMOD} g+s ${PREFIX}/bin/libgtop_server2
 .endif
 
+BUILDLINK_DEPENDS.glib2+=	glib2>=2.6.0
+
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libgnome/buildlink3.mk"
diff --git a/sysutils/libgtop2/PLIST b/sysutils/libgtop2/PLIST
index a6b4fb01bf7..a36dd1a1b8c 100644
--- a/sysutils/libgtop2/PLIST
+++ b/sysutils/libgtop2/PLIST
@@ -1,11 +1,10 @@
-@comment $NetBSD: PLIST,v 1.6 2004/11/19 10:58:16 sketch Exp $
+@comment $NetBSD: PLIST,v 1.7 2005/03/22 16:03:37 jmmv Exp $
 bin/libgtop_daemon2
 ${LIBGTOP_SERVER}bin/libgtop_server2
 include/libgtop-2.0/glibtop.h
 include/libgtop-2.0/glibtop/close.h
 include/libgtop-2.0/glibtop/command.h
 include/libgtop-2.0/glibtop/cpu.h
-include/libgtop-2.0/glibtop/error.h
 include/libgtop-2.0/glibtop/fsusage.h
 include/libgtop-2.0/glibtop/global.h
 include/libgtop-2.0/glibtop/gnuserv.h
@@ -14,8 +13,8 @@ include/libgtop-2.0/glibtop/loadavg.h
 include/libgtop-2.0/glibtop/mem.h
 include/libgtop-2.0/glibtop/mountlist.h
 include/libgtop-2.0/glibtop/msg_limits.h
+include/libgtop-2.0/glibtop/netlist.h
 include/libgtop-2.0/glibtop/netload.h
-include/libgtop-2.0/glibtop/open.h
 include/libgtop-2.0/glibtop/parameter.h
 include/libgtop-2.0/glibtop/ppp.h
 include/libgtop-2.0/glibtop/procargs.h
@@ -23,27 +22,25 @@ include/libgtop-2.0/glibtop/prockernel.h
 include/libgtop-2.0/glibtop/proclist.h
 include/libgtop-2.0/glibtop/procmap.h
 include/libgtop-2.0/glibtop/procmem.h
+include/libgtop-2.0/glibtop/procopenfiles.h
 include/libgtop-2.0/glibtop/procsegment.h
 include/libgtop-2.0/glibtop/procsignal.h
 include/libgtop-2.0/glibtop/procstate.h
 include/libgtop-2.0/glibtop/proctime.h
 include/libgtop-2.0/glibtop/procuid.h
-include/libgtop-2.0/glibtop/read.h
-include/libgtop-2.0/glibtop/read_data.h
 include/libgtop-2.0/glibtop/sem_limits.h
 include/libgtop-2.0/glibtop/shm_limits.h
 include/libgtop-2.0/glibtop/signal.h
 include/libgtop-2.0/glibtop/swap.h
 include/libgtop-2.0/glibtop/sysdeps.h
 include/libgtop-2.0/glibtop/sysinfo.h
-include/libgtop-2.0/glibtop/types.h
 include/libgtop-2.0/glibtop/union.h
 include/libgtop-2.0/glibtop/uptime.h
 include/libgtop-2.0/glibtop/version.h
-include/libgtop-2.0/glibtop/write.h
 include/libgtop-2.0/glibtop_machine.h
 include/libgtop-2.0/glibtop_server.h
 ${LIBGTOP_SUID_H}include/libgtop-2.0/glibtop_suid.h
+include/libgtop-2.0/libgtopconfig.h
 lib/libgtop-2.0.la
 lib/pkgconfig/libgtop-2.0.pc
 ${PKGLOCALEDIR}/locale/am/LC_MESSAGES/libgtop-2.0.mo
@@ -86,6 +83,7 @@ ${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/nb/LC_MESSAGES/libgtop-2.0.mo
+${PKGLOCALEDIR}/locale/ne/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/libgtop-2.0.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/libgtop-2.0.mo
diff --git a/sysutils/libgtop2/buildlink3.mk b/sysutils/libgtop2/buildlink3.mk
index 4f369888aed..59703d84d37 100644
--- a/sysutils/libgtop2/buildlink3.mk
+++ b/sysutils/libgtop2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2004/09/21 16:49:46 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2005/03/22 16:03:37 jmmv Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGTOP2_BUILDLINK3_MK:=	${LIBGTOP2_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgtop2}
 BUILDLINK_PACKAGES+=	libgtop2
 
 .if !empty(LIBGTOP2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgtop2+=	libgtop2>=2.8.0
+BUILDLINK_DEPENDS.libgtop2+=	libgtop2>=2.10.0
 BUILDLINK_PKGSRCDIR.libgtop2?=	../../sysutils/libgtop2
 .endif	# LIBGTOP2_BUILDLINK3_MK
 
diff --git a/sysutils/libgtop2/distinfo b/sysutils/libgtop2/distinfo
index b21417ef18c..e77d446adc1 100644
--- a/sysutils/libgtop2/distinfo
+++ b/sysutils/libgtop2/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.9 2005/02/26 17:24:08 jmmv Exp $
+$NetBSD: distinfo,v 1.10 2005/03/22 16:03:37 jmmv Exp $
 
-SHA1 (libgtop-2.8.3.tar.bz2) = 4c25758d1f8b94286ae1786bb87577f578b07708
-RMD160 (libgtop-2.8.3.tar.bz2) = f4aa41b636e524ffc098871615691fff299c65d6
-Size (libgtop-2.8.3.tar.bz2) = 1047504 bytes
+SHA1 (libgtop-2.10.0.tar.bz2) = cf2f999de7de7397a4aee638b0423c6f61c1aee0
+RMD160 (libgtop-2.10.0.tar.bz2) = 8b8e631511e61ef72d22bdd364e96b1881b73314
+Size (libgtop-2.10.0.tar.bz2) = 746223 bytes
 SHA1 (patch-aa) = 5fe5ccdf8444b3efaaa1bc3cff4c2d4944729f1e
-SHA1 (patch-ab) = a8eebfb379887dfc338d7422a70821511b79f94e
+SHA1 (patch-ab) = 55f4c875e4886194cba25874ab042da8e17261c7
 SHA1 (patch-ac) = dea1b6fba42d77a4fe6b2e9269cdab0521d3a305
+SHA1 (patch-ad) = f3724aeb1469bb55bf19835947733566c88a28b6
diff --git a/sysutils/libgtop2/patches/patch-ab b/sysutils/libgtop2/patches/patch-ab
index 93dd1945a6d..b347ce45d04 100644
--- a/sysutils/libgtop2/patches/patch-ab
+++ b/sysutils/libgtop2/patches/patch-ab
@@ -1,58 +1,16 @@
-$NetBSD: patch-ab,v 1.1 2004/04/12 15:53:42 jmmv Exp $
+$NetBSD: patch-ab,v 1.2 2005/03/22 16:03:37 jmmv Exp $
 
---- lib/lib.pl.orig	2004-03-04 15:16:46.000000000 +0100
-+++ lib/lib.pl
-@@ -106,6 +106,8 @@ sub output {
- 
-     if ($param_def eq 'string') {
- 	$call_param = ', ' . $line_fields[5];
-+	$param_buf = '';
-+	$buf_set = '';
- 	$param_decl = ",\n            " . $space . '    const char *' .
- 
- 	  $line_fields[5];
-@@ -127,6 +130,17 @@ sub output {
- 	    $list =~ s/^.*\(//;
- 	    $list =~ s/\)$//;
- 	    $count = (@fields = split(/,/, $list, 9999));
-+
-+	    if ($count > 0) {
-+		$param_buf = "\n\tstruct {\n";
-+		$buf_set = '';
-+		for ($field = 1; $field <= $count; $field++) {
-+		    $param_buf .= "\t\t$convert{$type} buf_$fields[$field];\n";
-+		    $buf_set .= "\tparam_buf.buf_$fields[$field] = $fields[$field];\n";
-+		}
-+		$param_buf .= "\t} param_buf;";
-+	    }
-+
- 	    for ($field = 1; $field <= $count; $field++) {
- 		if ($param_decl eq '') {
- 		    $param_decl = ",\n            " . $space . '    ';
-@@ -139,9 +153,7 @@ sub output {
- 		  $fields[$field];
- 		$call_param = $call_param . ', ' . $fields[$field];
- 		if ($send_ptr eq '') {
--		    $send_ptr = "\n\tconst void *send_ptr = &" .
+--- sysdeps/freebsd/proctime.c.orig	2005-02-23 09:20:45.000000000 +0100
++++ sysdeps/freebsd/proctime.c
+@@ -137,11 +137,6 @@ glibtop_get_proc_time_p (glibtop *server
+ #if (defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000))
+ 	if (server->sysdeps.proc_time == 0)
+ 		return;
 -
--		      $fields[$field] . ';';
-+		    $send_ptr = "\n\tconst void *send_ptr = &param_buf;";
- 		}
- 		if ($send_size eq '') {
- 		    $send_size = "\n\tconst size_t send_size =\n\t\t";
-@@ -167,11 +179,13 @@ sub output {
- 
-       $feature . ' *buf' . $param_decl . ')';
- 
--    print '{' . $send_ptr . '' . $send_size;
-+    print "{" . $param_buf;
-+
-+    print $send_ptr . '' . $send_size;
-     if ($retval !~ /^void$/) {
- 	print "\t" . $retval . ' retval = (' . $retval . ') 0;';
-     }
--    print '';
-+    print $buf_set;
- 
-     print "\tglibtop_init_r (&server, (1 << GLIBTOP_SYSDEPS_" .
+-#ifndef __bsdi__
+-	sprintf (filename, "/proc/%d/mem", (int) pid);
+-	if (stat (filename, &statb)) return;
+-#endif
+ #endif
  
+ 	/* Get the process information */
diff --git a/sysutils/libgtop2/patches/patch-ad b/sysutils/libgtop2/patches/patch-ad
new file mode 100644
index 00000000000..8fd30adfccb
--- /dev/null
+++ b/sysutils/libgtop2/patches/patch-ad
@@ -0,0 +1,38 @@
+$NetBSD: patch-ad,v 1.1 2005/03/22 16:03:37 jmmv Exp $
+
+--- sysdeps/freebsd/fsusage.c.orig	2005-02-28 09:54:41.000000000 +0100
++++ sysdeps/freebsd/fsusage.c
+@@ -1,3 +1,7 @@
++#ifdef HAVE_CONFIG_H
++#include <config.h>
++#endif
++
+ #include <glibtop.h>
+ #include <glibtop/error.h>
+ #include <glibtop/fsusage.h>
+@@ -9,6 +13,9 @@
+ #include <unistd.h>
+ #include <sys/param.h>
+ #include <sys/mount.h>
++#ifdef HAVE_SYS_STATVFS_H
++#include <sys/statvfs.h>
++#endif
+ 
+ #include <stdio.h>
+ #include <string.h>
+@@ -26,9 +33,15 @@ _glibtop_freebsd_get_fsusage_read_write(
+ 				      const char *path)
+ {
+ 	int result;
++#ifdef STAT_STATVFS
++	struct statvfs sfs;
++
++	result = statvfs (path, &sfs);
++#else
+ 	struct statfs sfs;
+ 
+ 	result = statfs (path, &sfs);
++#endif
+ 
+ 	if (result == -1) {
+ 		return;