make this build on recent -current, fixes PR pkg/33631

by Steven M. Bellovin

4 files changed, 53 insertions, 22 deletions

diff --git a/sysutils/libgtop2/distinfo b/sysutils/libgtop2/distinfo
index 5e0282d0b12..550f7f59a79 100644
--- a/sysutils/libgtop2/distinfo
+++ b/sysutils/libgtop2/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.22 2006/06/06 22:11:57 minskim Exp $
+$NetBSD: distinfo,v 1.23 2006/06/26 12:14:25 drochner 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) = 9d5735babbc4cbc4aeb7d55762cd6cc63f46ca9b
+SHA1 (patch-ab) = 20d01f064e5dae28abf3ad9cdd631d2bc5ca7676
 SHA1 (patch-ac) = c645307376eddb5c469ab00bd7ec8217feb3e2d5
 SHA1 (patch-ad) = b91a701e92e9594b27925cdb9a982866f06483d4
 SHA1 (patch-ae) = 035419a4e8a505c672f727c843dbd977acd8ce35
@@ -14,7 +14,7 @@ SHA1 (patch-ah) = 57d112d551149190a6b9c24074427457f8591691
 SHA1 (patch-ai) = 57d891785a45ec532757a48e77adafec091f3953
 SHA1 (patch-aj) = c244b5c60e61594c3d2c0bc95e05e12ad68938db
 SHA1 (patch-ak) = 0a29c6b7daf1ae34b528dbb2535d05009ad61b84
-SHA1 (patch-al) = d214415937d2c227ad1bcb1c14b9ddc001ad7cb4
+SHA1 (patch-al) = cda2af81f098924be5f1fa1975c684257fc233ff
 SHA1 (patch-am) = 2e10fd8096449ebc3428ef493e1ae4fe61a98e00
 SHA1 (patch-an) = 57a79bddc3f0e8237b72486aa8f8906f318ca38d
 SHA1 (patch-ao) = 72aa455cbc10afc6a744fd0684ec2d7a2e2c19c7
@@ -26,6 +26,6 @@ SHA1 (patch-bc) = 3638dfee30a4f10bc9662c23063df3f6a8cdc914
 SHA1 (patch-bd) = 7825fd4d2e6c06510fa3d76b4efa4d2ffab2a7d8
 SHA1 (patch-be) = ba1b688ea04f41a88b5d65b8af90927843619c0f
 SHA1 (patch-bf) = 1cf732d7ad22fbf34aa3511e77d17cacedbc810f
-SHA1 (patch-bg) = 330de57b732550a92b4e077ad8e850acf7e0e24d
+SHA1 (patch-bg) = f4adb1f60c777a92e63f4ad0fef6d9addea5f856
 SHA1 (patch-bh) = afdf0dec92984528efd181a24d3ef8f3eb383173
 SHA1 (patch-bj) = f0d1a877f7aab9d1c191cd24172d39a032ead5f2
diff --git a/sysutils/libgtop2/patches/patch-ab b/sysutils/libgtop2/patches/patch-ab
index d3c64551715..8cf6050d38d 100644
--- a/sysutils/libgtop2/patches/patch-ab
+++ b/sysutils/libgtop2/patches/patch-ab
@@ -1,8 +1,19 @@
-$NetBSD: patch-ab,v 1.4 2006/03/03 15:02:13 adam Exp $
+$NetBSD: patch-ab,v 1.5 2006/06/26 12:14:25 drochner Exp $
 
---- sysdeps/freebsd/proctime.c.orig	2005-02-23 08:20:45.000000000 +0000
+--- sysdeps/freebsd/proctime.c.orig	2005-12-12 11:09:39.000000000 +0100
 +++ sysdeps/freebsd/proctime.c
-@@ -57,7 +57,7 @@ glibtop_init_proc_time_p (glibtop *serve
+@@ -32,6 +32,10 @@
+ #include <osreldate.h>
+ #endif
+ 
++#ifdef __NetBSD__
++#include <sys/resourcevar.h>
++#endif
++
+ static const unsigned long _glibtop_sysdeps_proc_time =
+ (1L << GLIBTOP_PROC_TIME_RTIME) + (1L << GLIBTOP_PROC_TIME_FREQUENCY);
+ 
+@@ -58,7 +62,7 @@ glibtop_init_proc_time_p (glibtop *serve
   * system, and interrupt time usage.
   */
  
@@ -11,7 +22,7 @@ $NetBSD: patch-ab,v 1.4 2006/03/03 15:02:13 adam Exp $
  
  #ifndef __FreeBSD__
  static void
-@@ -137,21 +137,20 @@ glibtop_get_proc_time_p (glibtop *server
+@@ -138,20 +142,19 @@ glibtop_get_proc_time_p (glibtop *server
  #if (defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000))
  	if (server->sysdeps.proc_time == 0)
  		return;
@@ -33,14 +44,12 @@ $NetBSD: patch-ab,v 1.4 2006/03/03 15:02:13 adam Exp $
  
  #if defined(__FreeBSD__) && (__FreeBSD_version >= 500013)
  	buf->rtime = pinfo [0].ki_runtime;
--#elif (defined __FreeBSD__) && (__FreeBSD_version <= 500013)
 +#elif defined(__DragonFly__)
 +	buf->rtime = pinfo[0].kp_eproc.e_uticks / 100000;
-+#elif (defined __FreeBSD__) && (__FreeBSD_version <= 500013)
+ #elif (defined __FreeBSD__) && (__FreeBSD_version <= 500013)
  	buf->rtime = pinfo [0].kp_proc.p_runtime;
  #else
- 	buf->rtime = tv2sec (pinfo [0].kp_proc.p_rtime);
-@@ -193,18 +192,26 @@ glibtop_get_proc_time_p (glibtop *server
+@@ -194,18 +197,26 @@ glibtop_get_proc_time_p (glibtop *server
         if ((pinfo [0].ki_flag & P_INMEM)) {
  #endif
             buf->utime = pinfo [0].ki_runtime;
@@ -70,7 +79,7 @@ $NetBSD: patch-ab,v 1.4 2006/03/03 15:02:13 adam Exp $
              kvm_uread (server->machine.kd, &(pinfo [0]).kp_proc,
                         (unsigned long) &u_addr->u_stats,
                         (char *) &pstats, sizeof (pstats)) == sizeof (pstats))
-@@ -214,13 +221,21 @@ glibtop_get_proc_time_p (glibtop *server
+@@ -215,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-al b/sysutils/libgtop2/patches/patch-al
index 3214d3df34f..5289c195125 100644
--- a/sysutils/libgtop2/patches/patch-al
+++ b/sysutils/libgtop2/patches/patch-al
@@ -1,8 +1,19 @@
-$NetBSD: patch-al,v 1.3 2006/02/28 23:48:12 joerg Exp $
+$NetBSD: patch-al,v 1.4 2006/06/26 12:14:25 drochner Exp $
 
---- sysdeps/freebsd/procmem.c.orig	2005-03-01 23:03:57.000000000 +0000
+--- sysdeps/freebsd/procmem.c.orig	2005-12-12 11:09:39.000000000 +0100
 +++ sysdeps/freebsd/procmem.c
-@@ -213,8 +213,8 @@ glibtop_get_proc_mem_p (glibtop *server,
+@@ -63,6 +63,10 @@
+ #include <uvm/uvm.h>
+ #endif
+ 
++#ifdef __NetBSD__
++#include <sys/resourcevar.h>
++#endif
++
+ static const unsigned long _glibtop_sysdeps_proc_mem =
+ (1L << GLIBTOP_PROC_MEM_SIZE) +
+ (1L << GLIBTOP_PROC_MEM_VSIZE) +
+@@ -214,8 +218,8 @@ glibtop_get_proc_mem_p (glibtop *server,
  			return;
  		}
  
diff --git a/sysutils/libgtop2/patches/patch-bg b/sysutils/libgtop2/patches/patch-bg
index e25c7986c1d..bea74aabdcf 100644
--- a/sysutils/libgtop2/patches/patch-bg
+++ b/sysutils/libgtop2/patches/patch-bg
@@ -1,10 +1,21 @@
-$NetBSD: patch-bg,v 1.1 2005/10/12 21:49:39 jmmv Exp $
+$NetBSD: patch-bg,v 1.2 2006/06/26 12:14:25 drochner Exp $
 
-From FreeBSD's GNOME development repository.
-
---- sysdeps/freebsd/prockernel.c	Mon Jul 19 05:33:56 2004
-+++ sysdeps/freebsd/prockernel.c.orig	Sat Mar 19 02:39:47 2005
-@@ -115,8 +115,10 @@
+--- sysdeps/freebsd/prockernel.c.orig	2006-06-13 22:20:53.000000000 +0200
++++ sysdeps/freebsd/prockernel.c
+@@ -56,11 +56,7 @@
+ #endif
+ 
+ #ifdef __NetBSD__
+-#include <machine/vmparam.h>
+-#include <machine/pmap.h>
+-#ifdef __arm32__
+-#define	KERNBASE	KERNEL_BASE
+-#endif
++#include <sys/resourcevar.h>
+ #endif
+ 
+ 
+@@ -116,8 +112,10 @@ glibtop_get_proc_kernel_p (glibtop *serv
  
  	/* Get the process information */
  	pinfo = kvm_getprocs (server->machine.kd, KERN_PROC_PID, pid, &count);