Update to libgtop-1.0.7. Incorporate fix submitted by R. C. Dowdeswell

in PR pkg/8691, to make it build on m68k. Also, kvm_uread() -> kvm_read().
This may fix the other problems alluded to in the PR.

LibGTop-1.0.7 is a bug fix release, no details available. LibGTop-1.06
incorporated some *BSD fixes (including some pkg patches), and updated
the reference manual somewhat.

15 files changed, 73 insertions, 146 deletions

diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index 256f28e6f16..9534e781bde 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.32 2000/01/20 14:00:55 tron Exp $
+# $NetBSD: Makefile,v 1.33 2000/05/02 00:27:28 fredb Exp $
 
-DISTNAME=		libgtop-1.0.6
+DISTNAME=		libgtop-1.0.7
 CATEGORIES=		devel gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=stable/sources/libgtop/}
 
diff --git a/devel/libgtop/files/md5 b/devel/libgtop/files/md5
index 2e40b13219d..db74baa35da 100644
--- a/devel/libgtop/files/md5
+++ b/devel/libgtop/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.8 2000/01/20 14:00:56 tron Exp $
+$NetBSD: md5,v 1.9 2000/05/02 00:27:29 fredb Exp $
 
-MD5 (libgtop-1.0.6.tar.gz) = ad63df637697915b5326494a0ae4a337
+MD5 (libgtop-1.0.7.tar.gz) = 5853822967955a172978142156dbc010
diff --git a/devel/libgtop/files/patch-sum b/devel/libgtop/files/patch-sum
index e3cbc9d15fe..080ab0c8a10 100644
--- a/devel/libgtop/files/patch-sum
+++ b/devel/libgtop/files/patch-sum
@@ -1,15 +1,7 @@
-$NetBSD: patch-sum,v 1.8 2000/02/01 16:43:43 rh Exp $
+$NetBSD: patch-sum,v 1.9 2000/05/02 00:27:29 fredb Exp $
 
 MD5 (patch-aa) = ff5a586a4aaf732a48a7dc7d614683ff
 MD5 (patch-ab) = 1be0d48b1e41fea46ee459a320fb11c7
 MD5 (patch-ac) = f84a83914548206edccb11e1f84bf1bf
-MD5 (patch-ad) = 000a57829625645fbda8abfe65135923
-MD5 (patch-ae) = f235bf998e1cd767f70e86d349804d40
-MD5 (patch-af) = 54b80df824e27168b3af28ecb799728c
-MD5 (patch-ag) = 3987e191391615a7e3516f7cbc8aa8df
-MD5 (patch-ah) = f6c0bc32c3905426377361e7c0373547
-MD5 (patch-ai) = 073358fd3107c404d419d0ef70cdd26c
-MD5 (patch-aj) = 4bc9021f359aee85e93d0caa24d9c71b
-MD5 (patch-ak) = 985f207c67e0288e6692d9796b995498
-MD5 (patch-al) = ec6beb180330ad8813a4d3893612d52b
-MD5 (patch-am) = abc8584e75f257303c6f23b087991b49
+MD5 (patch-al) = 6f00e7b2002aac3d3dbd0d8584033877
+MD5 (patch-an) = 92fc474edf1d713540f7ee0a35a6dbf2
diff --git a/devel/libgtop/patches/patch-ad b/devel/libgtop/patches/patch-ad
deleted file mode 100644
index 0f3a0465787..00000000000
--- a/devel/libgtop/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.4 1999/11/02 23:16:20 tron Exp $
-
---- sysdeps/freebsd/mem.c.orig	Thu May 27 20:56:47 1999
-+++ sysdeps/freebsd/mem.c	Wed Nov  3 00:05:33 1999
-@@ -92,7 +92,7 @@
- {
- 	register int pagesize;
- 
--	if (kvm_nlist (server->machine.kd, nlst) != 0) {
-+	if (kvm_nlist (server->machine.kd, nlst) < 0) {
- 		glibtop_warn_io_r (server, "kvm_nlist (mem)");
- 		return;
- 	}
diff --git a/devel/libgtop/patches/patch-ae b/devel/libgtop/patches/patch-ae
deleted file mode 100644
index 80525ad8c5f..00000000000
--- a/devel/libgtop/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.4 1999/11/02 23:16:21 tron Exp $
-
---- sysdeps/freebsd/netload.c.orig	Thu May 27 16:03:59 1999
-+++ sysdeps/freebsd/netload.c	Wed Nov  3 00:05:46 1999
-@@ -67,7 +67,7 @@
- {
-     server->sysdeps.netload = _glibtop_sysdeps_netload;
- 
--    if (kvm_nlist (server->machine.kd, nlst) != 0)
-+    if (kvm_nlist (server->machine.kd, nlst) < 0)
- 	glibtop_error_io_r (server, "kvm_nlist");
- }
- 
diff --git a/devel/libgtop/patches/patch-af b/devel/libgtop/patches/patch-af
deleted file mode 100644
index 5a712a77678..00000000000
--- a/devel/libgtop/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.4 1999/11/02 23:16:22 tron Exp $
-
---- sysdeps/freebsd/ppp.c.orig	Thu May 27 16:04:00 1999
-+++ sysdeps/freebsd/ppp.c	Wed Nov  3 00:05:51 1999
-@@ -82,7 +82,7 @@
- #endif
- #endif /* HAVE_I4B */
- 
--	if (kvm_nlist (server->machine.kd, nlst) != 0)
-+	if (kvm_nlist (server->machine.kd, nlst) < 0)
- 		glibtop_error_io_r (server, "kvm_nlist");
- }
- 
diff --git a/devel/libgtop/patches/patch-ag b/devel/libgtop/patches/patch-ag
deleted file mode 100644
index a9ffd1c7826..00000000000
--- a/devel/libgtop/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.4 1999/11/02 23:16:22 tron Exp $
-
---- sysdeps/freebsd/sem_limits.c.orig	Thu May 27 16:04:13 1999
-+++ sysdeps/freebsd/sem_limits.c	Wed Nov  3 00:06:02 1999
-@@ -78,7 +78,7 @@
- void
- glibtop_init_sem_limits_p (glibtop *server)
- {
--	if (kvm_nlist (server->machine.kd, nlst) != 0) {
-+	if (kvm_nlist (server->machine.kd, nlst) < 0) {
- 		glibtop_warn_io_r (server, "kvm_nlist (sem_limits)");
- 		return;
- 	}
diff --git a/devel/libgtop/patches/patch-ah b/devel/libgtop/patches/patch-ah
deleted file mode 100644
index b388096ce8e..00000000000
--- a/devel/libgtop/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.4 1999/11/02 23:16:23 tron Exp $
-
---- sysdeps/freebsd/shm_limits.c.orig	Thu May 27 16:04:14 1999
-+++ sysdeps/freebsd/shm_limits.c	Wed Nov  3 00:06:09 1999
-@@ -76,7 +76,7 @@
- void
- glibtop_init_shm_limits_p (glibtop *server)
- {
--	if (kvm_nlist (server->machine.kd, nlst) != 0) {
-+	if (kvm_nlist (server->machine.kd, nlst) < 0) {
- 		glibtop_warn_io_r (server, "kvm_nlist (shm_limits)");
- 		return;
- 	}
diff --git a/devel/libgtop/patches/patch-ai b/devel/libgtop/patches/patch-ai
deleted file mode 100644
index c53d16b30ed..00000000000
--- a/devel/libgtop/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.4 1999/11/02 23:16:24 tron Exp $
-
---- sysdeps/freebsd/swap.c.orig	Thu May 27 20:56:53 1999
-+++ sysdeps/freebsd/swap.c	Wed Nov  3 00:06:17 1999
-@@ -95,7 +95,7 @@
- {
- #if defined(__FreeBSD__) || defined(__bsdi__)
- #if __FreeBSD__ < 4 || defined(__bsdi__)
--	if (kvm_nlist (server->machine.kd, nlst) != 0) {
-+	if (kvm_nlist (server->machine.kd, nlst) < 0) {
- 		glibtop_warn_io_r (server, "kvm_nlist (swap)");
- 		return;
- 	}
diff --git a/devel/libgtop/patches/patch-aj b/devel/libgtop/patches/patch-aj
deleted file mode 100644
index 22f03e9e628..00000000000
--- a/devel/libgtop/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.4 1999/11/02 23:16:25 tron Exp $
-
---- sysdeps/freebsd/cpu.c.orig	Thu May 27 16:03:55 1999
-+++ sysdeps/freebsd/cpu.c	Wed Nov  3 00:05:27 1999
-@@ -51,7 +51,7 @@
- void
- glibtop_init_cpu_p (glibtop *server)
- {
--	if (kvm_nlist (server->machine.kd, nlst) != 0) {
-+	if (kvm_nlist (server->machine.kd, nlst) < 0) {
- 		glibtop_warn_io_r (server, "kvm_nlist (cpu)");
- 		return;
- 	}
diff --git a/devel/libgtop/patches/patch-ak b/devel/libgtop/patches/patch-ak
deleted file mode 100644
index c31aacc59ec..00000000000
--- a/devel/libgtop/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.4 1999/11/02 23:16:26 tron Exp $
-
---- sysdeps/freebsd/msg_limits.c.orig	Thu May 27 16:03:58 1999
-+++ sysdeps/freebsd/msg_limits.c	Wed Nov  3 00:05:39 1999
-@@ -76,7 +76,7 @@
- void
- glibtop_init_msg_limits_p (glibtop *server)
- {
--	if (kvm_nlist (server->machine.kd, nlst) != 0) {
-+	if (kvm_nlist (server->machine.kd, nlst) < 0) {
- 		glibtop_warn_io_r (server, "kvm_nlist (msg_limits)");
- 		return;
- 	}
diff --git a/devel/libgtop/patches/patch-al b/devel/libgtop/patches/patch-al
index 772a0e52483..1f5fa8c8da3 100644
--- a/devel/libgtop/patches/patch-al
+++ b/devel/libgtop/patches/patch-al
@@ -1,7 +1,16 @@
-$NetBSD: patch-al,v 1.6 2000/02/01 16:43:44 rh Exp $
+$NetBSD: patch-al,v 1.7 2000/05/02 00:27:35 fredb Exp $
 
---- sysdeps/freebsd/prockernel.c.orig	Sat Oct 16 20:31:43 1999
-+++ sysdeps/freebsd/prockernel.c	Sun Jan 30 20:00:03 2000
+--- sysdeps/freebsd/prockernel.c.orig	Fri Jan 21 17:20:51 2000
++++ sysdeps/freebsd/prockernel.c	Mon May  1 18:56:00 2000
+@@ -34,7 +34,7 @@
+ #if (!defined __OpenBSD__) && (!defined __bsdi__)
+ #include <sys/user.h>
+ #endif
+-#if !defined(__bsdi__) && !(defined(__FreeBSD__) && defined(__alpha__))
++#if !defined(__bsdi__) && !(defined(__FreeBSD__) && defined(__alpha__)) && !defined(__NetBSD__)
+ #include <machine/pcb.h>
+ #endif
+ #if defined(__FreeBSD__) && !defined(__alpha__)
 @@ -48,6 +48,11 @@
  #include <osreldate.h>
  #endif
@@ -14,7 +23,36 @@ $NetBSD: patch-al,v 1.6 2000/02/01 16:43:44 rh Exp $
  static const unsigned long _glibtop_sysdeps_proc_kernel_pstats =
  (1L << GLIBTOP_PROC_KERNEL_MIN_FLT) +
  (1L << GLIBTOP_PROC_KERNEL_MAJ_FLT) +
-@@ -167,14 +172,32 @@
+@@ -129,8 +134,15 @@
+ 
+ 	glibtop_suid_enter (server);
+ 
++#ifdef __NetBSD__
++	/* On NetBSD, there is no kvm_uread(), and kvm_read() always reads
++	 * from kernel memory.  */
++
++	if (kvm_read (server->machine.kd,
++#else
+ 	if ((pinfo [0].kp_proc.p_flag & P_INMEM) &&
+ 	    kvm_uread (server->machine.kd, &(pinfo [0]).kp_proc,
++#endif
+ 		       (unsigned long) &u_addr->u_stats,
+ 		       (char *) &pstats, sizeof (pstats)) == sizeof (pstats))
+ 		{
+@@ -149,8 +161,12 @@
+ 			buf->flags |= _glibtop_sysdeps_proc_kernel_pstats;
+ 		}
+ 
++#ifdef __NetBSD__
++	if (kvm_read (server->machine.kd,
++#else
+ 	if ((pinfo [0].kp_proc.p_flag & P_INMEM) &&
+ 	    kvm_uread (server->machine.kd, &(pinfo [0]).kp_proc,
++#endif
+ 		       (unsigned long) &u_addr->u_pcb,
+ 		       (char *) &pcb, sizeof (pcb)) == sizeof (pcb))
+ 		{
+@@ -167,14 +183,32 @@
  			/*xxx FreeBSD/Alpha? */
  #endif
  #else
diff --git a/devel/libgtop/patches/patch-am b/devel/libgtop/patches/patch-am
deleted file mode 100644
index 6cafcfcd017..00000000000
--- a/devel/libgtop/patches/patch-am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-am,v 1.5 2000/01/20 14:05:47 tron Exp $
-
---- sysdeps/freebsd/procsignal.c.orig	Sat Oct 16 20:31:43 1999
-+++ sysdeps/freebsd/procsignal.c	Thu Jan 20 14:41:21 2000
-@@ -26,7 +26,9 @@
- #include <glibtop/procsignal.h>
- 
- #include <glibtop_suid.h>
-+#ifdef __FreeBSD__
- #include <osreldate.h>
-+#endif
- 
- static const unsigned long _glibtop_sysdeps_proc_signal =
- (1L << GLIBTOP_PROC_SIGNAL_SIGNAL) +
diff --git a/devel/libgtop/patches/patch-an b/devel/libgtop/patches/patch-an
new file mode 100644
index 00000000000..c1acdfbcd46
--- /dev/null
+++ b/devel/libgtop/patches/patch-an
@@ -0,0 +1,15 @@
+$NetBSD: patch-an,v 1.1 2000/05/02 00:27:36 fredb Exp $
+
+--- doc/libgtop.texi.orig	Fri Jan 21 16:19:04 2000
++++ doc/libgtop.texi	Mon May  1 14:09:27 2000
+@@ -2,6 +2,10 @@
+ @c %**start of header
+ @setfilename libgtop.info
+ @settitle LibGTop Reference Manual
++@dircategory Gnome
++@direntry
++* LibGTop: (libgtop).            A library to retrieve system information.
++@end direntry
+ @setchapternewpage odd
+ @c %**end of header
+ 
diff --git a/devel/libgtop/pkg/PLIST b/devel/libgtop/pkg/PLIST
index 172c3bac7bd..b4675902613 100644
--- a/devel/libgtop/pkg/PLIST
+++ b/devel/libgtop/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2000/01/20 14:00:57 tron Exp $
+@comment $NetBSD: PLIST,v 1.10 2000/05/02 00:27:36 fredb Exp $
 bin/libgtop-config
 bin/libgtop_daemon
 bin/libgtop_server
@@ -51,22 +51,22 @@ info/libgtop.info
 @exec install-info %D/info/libgtop.info %D/info/dir
 lib/libgtop-features.def
 lib/libgtop.a
-lib/libgtop.so.1.5
+lib/libgtop.so.1.6
 lib/libgtopConf.sh
 lib/libgtop_common.a
-lib/libgtop_common.so.1.5
+lib/libgtop_common.so.1.6
 lib/libgtop_guile.a
-lib/libgtop_guile.so.1.5
+lib/libgtop_guile.so.1.6
 lib/libgtop_guile_names.a
-lib/libgtop_guile_names.so.1.5
+lib/libgtop_guile_names.so.1.6
 lib/libgtop_names.a
-lib/libgtop_names.so.1.5
+lib/libgtop_names.so.1.6
 lib/libgtop_suid_common.a
-lib/libgtop_suid_common.so.1.5
+lib/libgtop_suid_common.so.1.6
 lib/libgtop_sysdeps.a
-lib/libgtop_sysdeps.so.1.5
+lib/libgtop_sysdeps.so.1.6
 lib/libgtop_sysdeps_suid.a
-lib/libgtop_sysdeps_suid.so.1.5
+lib/libgtop_sysdeps_suid.so.1.6
 share/locale/da/LC_MESSAGES/libgtop.mo
 share/locale/de/LC_MESSAGES/libgtop.mo
 share/locale/es/LC_MESSAGES/libgtop.mo