Update to 2.14.2. Grrr, how much I hate this package -- and its collection

of patches --, you can't imagine.

July 27, 2006: Overview of changes in 2.14.2
============================================
* Updated solaris support (hua.zhang@sun.com)
* Small linux updates and improvments.

April 10, 2006: Overview of changes in 2.14.1
=============================================
* Updated translations.
* Fixed NetBSD port (Julio M. Merino Vidal  <jmmv@NetBSD.org>).
* Fixed some warnings.

12 files changed, 41 insertions, 267 deletions

diff --git a/sysutils/libgtop2/Makefile b/sysutils/libgtop2/Makefile
index 6b717d5b9dd..b4caecb4fdd 100644
--- a/sysutils/libgtop2/Makefile
+++ b/sysutils/libgtop2/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.36 2006/04/13 18:23:38 jlam Exp $
+# $NetBSD: Makefile,v 1.37 2006/08/06 19:06:44 jmmv Exp $
 
-DISTNAME=		libgtop-2.14.0
+DISTNAME=		libgtop-2.14.2
 PKGNAME=		${DISTNAME:S/-/2-/}
 CATEGORIES=		sysutils gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libgtop/2.14/}
@@ -17,7 +17,7 @@ USE_TOOLS+=		gmake makeinfo msgfmt perl pkg-config
 USE_LIBTOOL=		YES
 PKGCONFIG_OVERRIDE=	libgtop-2.0.pc.in
 PKGCONFIG_OVERRIDE+=	support/gnome-support-2.0.pc.in
-INFO_FILES=		# PLIST
+INFO_FILES=		YES
 TEXINFO_REQD=		4.6
 
 # The following flags are for debugging purposes.  They don't need to
@@ -66,7 +66,7 @@ PLIST_SUBST+=	LIBGTOP_SUID_H=""
 
 .if ${OPSYS} != "Linux"
 post-install:
-	@${CHMOD} g+s ${PREFIX}/bin/libgtop_server2
+	${CHMOD} g+s ${PREFIX}/bin/libgtop_server2
 .endif
 
 # XXX This needs a check in the configure script, which should be clean
diff --git a/sysutils/libgtop2/PLIST b/sysutils/libgtop2/PLIST
index e4bd59493ad..76328e6c70e 100644
--- a/sysutils/libgtop2/PLIST
+++ b/sysutils/libgtop2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2006/04/17 07:07:34 jlam Exp $
+@comment $NetBSD: PLIST,v 1.14 2006/08/06 19:06:44 jmmv Exp $
 bin/libgtop_daemon2
 ${LIBGTOP_SERVER}bin/libgtop_server2
 include/libgtop-2.0/glibtop.h
@@ -51,6 +51,7 @@ share/locale/az/LC_MESSAGES/libgtop-2.0.mo
 share/locale/be/LC_MESSAGES/libgtop-2.0.mo
 share/locale/bg/LC_MESSAGES/libgtop-2.0.mo
 share/locale/bn/LC_MESSAGES/libgtop-2.0.mo
+share/locale/bn_IN/LC_MESSAGES/libgtop-2.0.mo
 share/locale/bs/LC_MESSAGES/libgtop-2.0.mo
 share/locale/ca/LC_MESSAGES/libgtop-2.0.mo
 share/locale/cs/LC_MESSAGES/libgtop-2.0.mo
@@ -60,6 +61,7 @@ share/locale/de/LC_MESSAGES/libgtop-2.0.mo
 share/locale/el/LC_MESSAGES/libgtop-2.0.mo
 share/locale/en_CA/LC_MESSAGES/libgtop-2.0.mo
 share/locale/en_GB/LC_MESSAGES/libgtop-2.0.mo
+share/locale/eo/LC_MESSAGES/libgtop-2.0.mo
 share/locale/es/LC_MESSAGES/libgtop-2.0.mo
 share/locale/et/LC_MESSAGES/libgtop-2.0.mo
 share/locale/eu/LC_MESSAGES/libgtop-2.0.mo
@@ -76,11 +78,13 @@ share/locale/hu/LC_MESSAGES/libgtop-2.0.mo
 share/locale/id/LC_MESSAGES/libgtop-2.0.mo
 share/locale/it/LC_MESSAGES/libgtop-2.0.mo
 share/locale/ja/LC_MESSAGES/libgtop-2.0.mo
+share/locale/ka/LC_MESSAGES/libgtop-2.0.mo
 share/locale/ko/LC_MESSAGES/libgtop-2.0.mo
 share/locale/ku/LC_MESSAGES/libgtop-2.0.mo
 share/locale/ky/LC_MESSAGES/libgtop-2.0.mo
 share/locale/lt/LC_MESSAGES/libgtop-2.0.mo
 share/locale/lv/LC_MESSAGES/libgtop-2.0.mo
+share/locale/mg/LC_MESSAGES/libgtop-2.0.mo
 share/locale/mi/LC_MESSAGES/libgtop-2.0.mo
 share/locale/mk/LC_MESSAGES/libgtop-2.0.mo
 share/locale/ml/LC_MESSAGES/libgtop-2.0.mo
@@ -90,7 +94,6 @@ share/locale/nb/LC_MESSAGES/libgtop-2.0.mo
 share/locale/ne/LC_MESSAGES/libgtop-2.0.mo
 share/locale/nl/LC_MESSAGES/libgtop-2.0.mo
 share/locale/nn/LC_MESSAGES/libgtop-2.0.mo
-share/locale/no/LC_MESSAGES/libgtop-2.0.mo
 share/locale/or/LC_MESSAGES/libgtop-2.0.mo
 share/locale/pa/LC_MESSAGES/libgtop-2.0.mo
 share/locale/pl/LC_MESSAGES/libgtop-2.0.mo
@@ -112,6 +115,7 @@ share/locale/uk/LC_MESSAGES/libgtop-2.0.mo
 share/locale/vi/LC_MESSAGES/libgtop-2.0.mo
 share/locale/xh/LC_MESSAGES/libgtop-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/libgtop-2.0.mo
+share/locale/zh_HK/LC_MESSAGES/libgtop-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/libgtop-2.0.mo
 @dirrm include/libgtop-2.0/glibtop
 @dirrm include/libgtop-2.0
diff --git a/sysutils/libgtop2/distinfo b/sysutils/libgtop2/distinfo
index 550f7f59a79..2c1f448599d 100644
--- a/sysutils/libgtop2/distinfo
+++ b/sysutils/libgtop2/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.23 2006/06/26 12:14:25 drochner Exp $
+$NetBSD: distinfo,v 1.24 2006/08/06 19:06:44 jmmv Exp $
 
-SHA1 (libgtop-2.14.0.tar.bz2) = a396a72c415c678efb94ad3cdc9a2543d543c248
-RMD160 (libgtop-2.14.0.tar.bz2) = f6622a5e8b27e18fde9b5a728f18371afe95858a
-Size (libgtop-2.14.0.tar.bz2) = 659522 bytes
-SHA1 (patch-aa) = db6132ff556d1a20e24a817bb6d8ba247f202659
-SHA1 (patch-ab) = 20d01f064e5dae28abf3ad9cdd631d2bc5ca7676
+SHA1 (libgtop-2.14.2.tar.bz2) = 20e79a58c08e06e5f5e68d8ebbd575471f754e96
+RMD160 (libgtop-2.14.2.tar.bz2) = cb51f7252e015e17dcf3f1f991b36bf3e5496efe
+Size (libgtop-2.14.2.tar.bz2) = 664817 bytes
+SHA1 (patch-aa) = 5c4429cbd87b732b766794d57de8a81c558cbe2b
+SHA1 (patch-ab) = 27d2cac2281cb2bc2214fddcdb505c6b46b39dfd
 SHA1 (patch-ac) = c645307376eddb5c469ab00bd7ec8217feb3e2d5
-SHA1 (patch-ad) = b91a701e92e9594b27925cdb9a982866f06483d4
+SHA1 (patch-ad) = ada3c0128c0b7d3b670f8d30c910fe4c1e2e351a
 SHA1 (patch-ae) = 035419a4e8a505c672f727c843dbd977acd8ce35
 SHA1 (patch-af) = 520dbdec4a8cba6e82b08c169d97c3caebacd419
 SHA1 (patch-ag) = 74d20bdc56224ae553935cc81ce47504e98701fe
@@ -19,13 +19,9 @@ SHA1 (patch-am) = 2e10fd8096449ebc3428ef493e1ae4fe61a98e00
 SHA1 (patch-an) = 57a79bddc3f0e8237b72486aa8f8906f318ca38d
 SHA1 (patch-ao) = 72aa455cbc10afc6a744fd0684ec2d7a2e2c19c7
 SHA1 (patch-ap) = 1b842a59b821b2703b68935f59a65ffb6db3a68f
-SHA1 (patch-aq) = ca24cc64eaa6a27f7d140b2999edf5f0b524140f
-SHA1 (patch-ba) = ebe5f9a5148ff72ae978934b259e63ce15f2d4c8
-SHA1 (patch-bb) = 2e98f16668f74b64848f54db57037289623ed3f2
+SHA1 (patch-ba) = fc99c68ec9765439bc82a38223a74bde319d26d5
+SHA1 (patch-bb) = 2940eeb9468f34683bd6d8adca196b669c412bfd
 SHA1 (patch-bc) = 3638dfee30a4f10bc9662c23063df3f6a8cdc914
 SHA1 (patch-bd) = 7825fd4d2e6c06510fa3d76b4efa4d2ffab2a7d8
-SHA1 (patch-be) = ba1b688ea04f41a88b5d65b8af90927843619c0f
-SHA1 (patch-bf) = 1cf732d7ad22fbf34aa3511e77d17cacedbc810f
 SHA1 (patch-bg) = f4adb1f60c777a92e63f4ad0fef6d9addea5f856
 SHA1 (patch-bh) = afdf0dec92984528efd181a24d3ef8f3eb383173
-SHA1 (patch-bj) = f0d1a877f7aab9d1c191cd24172d39a032ead5f2
diff --git a/sysutils/libgtop2/patches/patch-aa b/sysutils/libgtop2/patches/patch-aa
index cd13607c6c2..9c38235421d 100644
--- a/sysutils/libgtop2/patches/patch-aa
+++ b/sysutils/libgtop2/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.6 2006/03/30 21:09:48 jmmv Exp $
+$NetBSD: patch-aa,v 1.7 2006/08/06 19:06:44 jmmv Exp $
 
 --- configure.orig	2006-03-13 10:04:55.000000000 +0100
 +++ configure
@@ -23,15 +23,6 @@ $NetBSD: patch-aa,v 1.6 2006/03/30 21:09:48 jmmv Exp $
  	  ;;
  	aix*)
  	  libgtop_sysdeps_dir=aix
-@@ -20300,7 +20300,7 @@ echo "${ECHO_T}$libgtop_sysdeps_dir" >&6
- 
- 
- 	case "$host_os" in
--	*bsd*)
-+	*bsd*|dragonfly*)
- 
- for ac_header in net/if_var.h
- do
 @@ -20472,7 +20472,9 @@ cat >>conftest.$ac_ext <<_ACEOF
  #include <net/netisr.h>
  #include <net/route.h>
diff --git a/sysutils/libgtop2/patches/patch-ab b/sysutils/libgtop2/patches/patch-ab
index 8cf6050d38d..e35cd9b6e60 100644
--- a/sysutils/libgtop2/patches/patch-ab
+++ b/sysutils/libgtop2/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.5 2006/06/26 12:14:25 drochner Exp $
+$NetBSD: patch-ab,v 1.6 2006/08/06 19:06:44 jmmv Exp $
 
---- sysdeps/freebsd/proctime.c.orig	2005-12-12 11:09:39.000000000 +0100
+--- sysdeps/freebsd/proctime.c.orig	2006-04-04 22:01:43.000000000 +0200
 +++ sysdeps/freebsd/proctime.c
 @@ -32,6 +32,10 @@
  #include <osreldate.h>
@@ -22,16 +22,7 @@ $NetBSD: patch-ab,v 1.5 2006/06/26 12:14:25 drochner Exp $
  
  #ifndef __FreeBSD__
  static void
-@@ -138,20 +142,19 @@ glibtop_get_proc_time_p (glibtop *server
- #if (defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000))
- 	if (server->sysdeps.proc_time == 0)
- 		return;
--
--#ifndef __bsdi__
--	sprintf (filename, "/proc/%d/mem", (int) pid);
--	if (stat (filename, &statb)) return;
--#endif
- #endif
+@@ -142,11 +146,15 @@ glibtop_get_proc_time_p (glibtop *server
  
  	/* Get the process information */
  	pinfo = kvm_getprocs (server->machine.kd, KERN_PROC_PID, pid, &count);
@@ -45,11 +36,11 @@ $NetBSD: patch-ab,v 1.5 2006/06/26 12:14:25 drochner Exp $
  #if defined(__FreeBSD__) && (__FreeBSD_version >= 500013)
  	buf->rtime = pinfo [0].ki_runtime;
 +#elif defined(__DragonFly__)
-+	buf->rtime = pinfo[0].kp_eproc.e_uticks / 100000;
++	buf->rtime = pinfo [0].kp_eproc.e.uticks / 100000;
  #elif (defined __FreeBSD__) && (__FreeBSD_version <= 500013)
  	buf->rtime = pinfo [0].kp_proc.p_runtime;
  #else
-@@ -194,18 +197,26 @@ glibtop_get_proc_time_p (glibtop *server
+@@ -189,18 +197,26 @@ glibtop_get_proc_time_p (glibtop *server
         if ((pinfo [0].ki_flag & P_INMEM)) {
  #endif
             buf->utime = pinfo [0].ki_runtime;
@@ -79,7 +70,7 @@ $NetBSD: patch-ab,v 1.5 2006/06/26 12:14:25 drochner Exp $
              kvm_uread (server->machine.kd, &(pinfo [0]).kp_proc,
                         (unsigned long) &u_addr->u_stats,
                         (char *) &pstats, sizeof (pstats)) == sizeof (pstats))
-@@ -215,13 +226,21 @@ glibtop_get_proc_time_p (glibtop *server
+@@ -210,13 +226,21 @@ glibtop_get_proc_time_p (glibtop *server
                         buf->stime = tv2sec (pinfo[0].kp_eproc.e_stats.p_ru.ru_stime);
                         buf->cutime = tv2sec (pinfo[0].kp_eproc.e_stats.p_cru.ru_utime);
                         buf->cstime = tv2sec (pinfo[0].kp_eproc.e_stats.p_cru.ru_stime);
diff --git a/sysutils/libgtop2/patches/patch-ad b/sysutils/libgtop2/patches/patch-ad
index 672faff61b8..b90d11b38a4 100644
--- a/sysutils/libgtop2/patches/patch-ad
+++ b/sysutils/libgtop2/patches/patch-ad
@@ -1,41 +1,8 @@
-$NetBSD: patch-ad,v 1.4 2006/06/06 22:11:57 minskim Exp $
+$NetBSD: patch-ad,v 1.5 2006/08/06 19:06:44 jmmv Exp $
 
---- sysdeps/freebsd/fsusage.c.orig	2005-12-12 10:09:39.000000000 +0000
+--- sysdeps/freebsd/fsusage.c.orig	2006-04-09 18:52:45.000000000 +0200
 +++ sysdeps/freebsd/fsusage.c
-@@ -1,4 +1,8 @@
- #include <config.h>
-+#ifdef HAVE_CONFIG_H
-+#include <config.h>
-+#endif
-+
- #include <glibtop.h>
- #include <glibtop/error.h>
- #include <glibtop/fsusage.h>
-@@ -10,6 +14,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>
-@@ -27,16 +34,26 @@ _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) {
+@@ -47,8 +47,12 @@ _glibtop_freebsd_get_fsusage_read_write(
  		return;
  	}
  
diff --git a/sysutils/libgtop2/patches/patch-aq b/sysutils/libgtop2/patches/patch-aq
deleted file mode 100644
index 8569fa50dd4..00000000000
--- a/sysutils/libgtop2/patches/patch-aq
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aq,v 1.1 2006/03/30 21:09:48 jmmv Exp $
-
---- sysdeps/freebsd/msg_limits.c.orig	2005-12-12 11:09:39.000000000 +0100
-+++ sysdeps/freebsd/msg_limits.c
-@@ -49,7 +49,7 @@ glibtop_get_msg_limits_p (glibtop *serve
- 
- #if (defined(__FreeBSD__) && (__FreeBSD_version < 410000)) || (defined __bsdi__)
- #define KERNEL 1
--#else
-+#elif !defined(__NetBSD__)
- #define _KERNEL 1
- #endif
- 
diff --git a/sysutils/libgtop2/patches/patch-ba b/sysutils/libgtop2/patches/patch-ba
index 4236c888dc8..92a3d4177be 100644
--- a/sysutils/libgtop2/patches/patch-ba
+++ b/sysutils/libgtop2/patches/patch-ba
@@ -1,8 +1,8 @@
-$NetBSD: patch-ba,v 1.1 2005/10/12 21:49:39 jmmv Exp $
+$NetBSD: patch-ba,v 1.2 2006/08/06 19:06:44 jmmv Exp $
 
 From FreeBSD's GNOME development repository.
 
---- lib/read.c.orig	2005-06-06 14:33:42.000000000 +0200
+--- lib/read.c.orig	2006-04-10 10:41:46.000000000 +0200
 +++ lib/read.c
 @@ -22,6 +22,7 @@
  */
@@ -13,7 +13,7 @@ From FreeBSD's GNOME development repository.
  #include <glibtop/error.h>
  #include <glib/gi18n-lib.h>
 @@ -56,14 +57,18 @@ glibtop_read_l (glibtop *server, size_t 
- 	fprintf (stderr, "LIBRARY: really reading %d bytes.\n", size);
+ 	fprintf (stderr, "LIBRARY: really reading %d bytes.\n", (int)size);
  #endif
  
 +retry:
@@ -28,7 +28,7 @@ From FreeBSD's GNOME development repository.
  				server,
  				ngettext ("read %d byte",
  					  "read %d bytes", size),
- 				size);
+ 				(int)size);
 +		}
  	}
  }
diff --git a/sysutils/libgtop2/patches/patch-bb b/sysutils/libgtop2/patches/patch-bb
index 359713af24f..bc7ccdc621b 100644
--- a/sysutils/libgtop2/patches/patch-bb
+++ b/sysutils/libgtop2/patches/patch-bb
@@ -1,8 +1,8 @@
-$NetBSD: patch-bb,v 1.1 2005/10/12 21:49:39 jmmv Exp $
+$NetBSD: patch-bb,v 1.2 2006/08/06 19:06:44 jmmv Exp $
 
 From FreeBSD's GNOME development repository.
 
---- lib/write.c.orig	2005-06-06 14:33:42.000000000 +0200
+--- lib/write.c.orig	2006-04-10 10:41:46.000000000 +0200
 +++ lib/write.c
 @@ -22,6 +22,7 @@
  */
@@ -12,8 +12,8 @@ From FreeBSD's GNOME development repository.
  
  #include <glibtop/write.h>
  #include <glibtop/error.h>
-@@ -42,12 +43,16 @@ glibtop_write_l (glibtop *server, size_t
- 	fprintf (stderr, "LIBRARY: really writing %d bytes.\n", size);
+@@ -42,15 +43,19 @@ glibtop_write_l (glibtop *server, size_t
+ 	fprintf (stderr, "LIBRARY: really writing %d bytes.\n", (int)size);
  #endif
  
 +retry:
@@ -27,6 +27,9 @@ From FreeBSD's GNOME development repository.
 +	if (ret < 0) {
 +		if (errno == EINTR)
 +			goto retry;
- 		glibtop_error_io_r (server, ngettext ("wrote %d byte", "wrote %d bytes", size), size);
+ 		glibtop_error_io_r (server,
+ 				    ngettext("wrote %d byte",
+ 					     "wrote %d bytes", size),
+ 				    (int) size);
 +	}
  }
diff --git a/sysutils/libgtop2/patches/patch-be b/sysutils/libgtop2/patches/patch-be
deleted file mode 100644
index 375b3bc5858..00000000000
--- a/sysutils/libgtop2/patches/patch-be
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-be,v 1.1 2005/10/12 21:49:39 jmmv Exp $
-
-From FreeBSD's GNOME development repository.
-
---- sysdeps/freebsd/glibtop_server.h.orig	Mon Oct 20 11:19:49 2003
-+++ sysdeps/freebsd/glibtop_server.h	Mon Aug  8 15:10:14 2005
-@@ -21,8 +21,8 @@
-    Boston, MA 02111-1307, USA.
- */
- 
--#ifndef __GLIBTOP_SERVER_H__
--#define __GLIBTOP_SERVER_H__
-+#ifndef __FREEBSD__GLIBTOP_SERVER_H__
-+#define __FREEBSD__GLIBTOP_SERVER_H__
- 
- G_BEGIN_DECLS
- 
-@@ -45,6 +45,7 @@ G_BEGIN_DECLS
- #define GLIBTOP_SUID_PROC_ARGS		(1 << GLIBTOP_SYSDEPS_PROC_ARGS)
- #define GLIBTOP_SUID_PROC_MAP		(1 << GLIBTOP_SYSDEPS_PROC_MAP)
- #define GLIBTOP_SUID_NETLOAD		(1 << GLIBTOP_SYSDEPS_NETLOAD)
-+#define GLIBTOP_SUID_NETLIST		0
- #define GLIBTOP_SUID_PPP		(1 << GLIBTOP_SYSDEPS_PPP)
- 
- G_END_DECLS
diff --git a/sysutils/libgtop2/patches/patch-bf b/sysutils/libgtop2/patches/patch-bf
deleted file mode 100644
index 56001dac851..00000000000
--- a/sysutils/libgtop2/patches/patch-bf
+++ /dev/null
@@ -1,98 +0,0 @@
-$NetBSD: patch-bf,v 1.2 2005/11/15 14:26:44 rillig Exp $
-
-From FreeBSD's GNOME development repository.
-
---- sysdeps/freebsd/sysinfo.c.orig	Thu Jun  9 22:56:29 2005
-+++ sysdeps/freebsd/sysinfo.c	Thu Jun  9 22:58:36 2005
-@@ -0,0 +1,91 @@
-+/* Copyright (C) 1998-99 Martin Baulig
-+   This file is part of LibGTop 1.0.
-+
-+   Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
-+
-+   LibGTop is free software; you can redistribute it and/or modify it
-+   under the terms of the GNU General Public License as published by
-+   the Free Software Foundation; either version 2 of the License,
-+   or (at your option) any later version.
-+
-+   LibGTop is distributed in the hope that it will be useful, but WITHOUT
-+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-+   for more details.
-+
-+   You should have received a copy of the GNU General Public License
-+   along with LibGTop; see the file COPYING. If not, write to the
-+   Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-+   Boston, MA 02111-1307, USA.
-+*/
-+
-+#include <config.h>
-+#include <sys/param.h>
-+#include <sys/types.h>
-+#include <sys/sysctl.h>
-+#include <glibtop/error.h>
-+#include <glibtop/cpu.h>
-+#include <glibtop/sysinfo.h>
-+
-+static const unsigned long _glibtop_sysdeps_sysinfo =
-+(1L << GLIBTOP_SYSINFO_CPUINFO);
-+
-+static glibtop_sysinfo sysinfo = { .flags = 0 };
-+
-+static void
-+init_sysinfo (glibtop *server)
-+{
-+	char *model;
-+	int ncpus = 1;
-+	int mhz = 0;
-+	size_t len;
-+
-+	if(G_LIKELY(sysinfo.flags)) return;
-+
-+	glibtop_init_s (&server, GLIBTOP_SYSDEPS_CPU, 0);
-+
-+	len = sizeof (ncpus);
-+	sysctlbyname ("hw.ncpu", &ncpus, &len, NULL, 0);
-+	len = 0;
-+	sysctlbyname ("hw.model", NULL, &len, NULL, 0);
-+	model = malloc (len);
-+	sysctlbyname ("hw.model", model, &len, NULL, 0);
-+	len = sizeof (mhz);
-+	sysctlbyname ("hw.clockrate", &mhz, &len, NULL, 0);
-+
-+	for(sysinfo.ncpu = 0;
-+	    sysinfo.ncpu < GLIBTOP_NCPU && sysinfo.ncpu < ncpus;
-+	    sysinfo.ncpu++) {
-+
-+		glibtop_entry * const cpuinfo = &sysinfo.cpuinfo[sysinfo.ncpu];
-+
-+		cpuinfo->labels = g_ptr_array_new ();
-+
-+		cpuinfo->values = g_hash_table_new_full(g_str_hash, g_str_equal,
-+							g_free, g_free);
-+
-+		cpuinfo->descriptions = g_hash_table_new_full(g_str_hash, g_str_equal,
-+							g_free, g_free);
-+
-+		g_ptr_array_add (cpuinfo->labels, "processor");
-+		g_hash_table_insert (cpuinfo->values, "processor", &sysinfo.ncpu);
-+
-+		g_ptr_array_add (cpuinfo->labels, "vendor_id");
-+		g_hash_table_insert (cpuinfo->values, "vendor_id", model);
-+
-+		g_ptr_array_add (cpuinfo->labels, "cpu MHz");
-+		g_hash_table_insert (cpuinfo->values, "cpu MHz", &mhz);
-+
-+	}
-+
-+	free (model);
-+
-+	sysinfo.flags = _glibtop_sysdeps_sysinfo;
-+}
-+
-+const glibtop_sysinfo *
-+glibtop_get_sysinfo_s (glibtop *server)
-+{
-+	init_sysinfo (server);
-+	return &sysinfo;
-+}
diff --git a/sysutils/libgtop2/patches/patch-bj b/sysutils/libgtop2/patches/patch-bj
deleted file mode 100644
index 8472a174805..00000000000
--- a/sysutils/libgtop2/patches/patch-bj
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-bj,v 1.2 2006/03/30 21:09:48 jmmv Exp $
-
-From FreeBSD's GNOME development repository.
-
---- sysdeps/freebsd/Makefile.in.orig	2006-03-13 10:04:48.000000000 +0100
-+++ sysdeps/freebsd/Makefile.in
-@@ -50,15 +50,15 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/m
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
- LTLIBRARIES = $(noinst_LTLIBRARIES)
--libgtop_sysdeps_2_0_la_LIBADD =
--am_libgtop_sysdeps_2_0_la_OBJECTS = nosuid.lo siglist.lo
-+libgtop_sysdeps_2_0_la_LIBADD = @KVM_LIBS@
-+am_libgtop_sysdeps_2_0_la_OBJECTS = nosuid.lo siglist.lo sysinfo.lo netlist.lo
- libgtop_sysdeps_2_0_la_OBJECTS = $(am_libgtop_sysdeps_2_0_la_OBJECTS)
--libgtop_sysdeps_suid_2_0_la_LIBADD =
-+libgtop_sysdeps_suid_2_0_la_LIBADD = @KVM_LIBS@
- am_libgtop_sysdeps_suid_2_0_la_OBJECTS = open.lo close.lo cpu.lo \
- 	mem.lo swap.lo uptime.lo loadavg.lo shm_limits.lo \
- 	msg_limits.lo sem_limits.lo proclist.lo procstate.lo \
- 	procuid.lo proctime.lo procmem.lo procsignal.lo prockernel.lo \
--	procsegment.lo procargs.lo procmap.lo netlist.lo netload.lo \
-+	procsegment.lo procargs.lo procmap.lo netload.lo \
- 	ppp.lo procopenfiles.lo fsusage.lo
- libgtop_sysdeps_suid_2_0_la_OBJECTS =  \
- 	$(am_libgtop_sysdeps_suid_2_0_la_OBJECTS)
-@@ -256,13 +256,13 @@ target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
- noinst_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la
--libgtop_sysdeps_2_0_la_SOURCES = nosuid.c siglist.c
-+libgtop_sysdeps_2_0_la_SOURCES = nosuid.c siglist.c sysinfo.c netlist.c
- libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO)
- libgtop_sysdeps_suid_2_0_la_SOURCES = open.c close.c cpu.c mem.c swap.c \
- 				  uptime.c loadavg.c shm_limits.c msg_limits.c \
- 				  sem_limits.c proclist.c procstate.c procuid.c \
- 				  proctime.c procmem.c procsignal.c prockernel.c \
--				  procsegment.c procargs.c procmap.c netlist.c \
-+				  procsegment.c procargs.c procmap.c \
- 				  netload.c ppp.c procopenfiles.c fsusage.c
- 
- libgtop_sysdeps_suid_2_0_la_LDFLAGS = $(LT_VERSION_INFO)