Make this build under NetBSD-current after the morge of "nathanw_sa".

Unfortunately a bit of functionality is lost there but it should still
work. Bump package revision to reflect the changes.

6 files changed, 95 insertions, 9 deletions

diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index 23a9c179038..b017612dac8 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.66 2002/12/07 02:38:54 schmonz Exp $
+# $NetBSD: Makefile,v 1.67 2003/01/21 10:12:29 tron Exp $
 
 DISTNAME=		libgtop-1.0.13
+PKGREVISION=		1
 CATEGORIES=		devel gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libgtop/1.0/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/devel/libgtop/distinfo b/devel/libgtop/distinfo
index 4f66856e4f8..9590eb4f5d5 100644
--- a/devel/libgtop/distinfo
+++ b/devel/libgtop/distinfo
@@ -1,12 +1,15 @@
-$NetBSD: distinfo,v 1.10 2002/11/30 23:21:37 salo Exp $
+$NetBSD: distinfo,v 1.11 2003/01/21 10:12:30 tron Exp $
 
 SHA1 (libgtop-1.0.13.tar.bz2) = 7002d37ab43ebac14315298472a170ceaedbd072
 Size (libgtop-1.0.13.tar.bz2) = 733873 bytes
+SHA1 (patch-aa) = a640afa2d6a8b7f418052fabbdb04bfc6805b42d
 SHA1 (patch-ab) = 3ce99bf4d72cf4e4203364d78361c8a2df081d8d
 SHA1 (patch-ac) = 644bfe717bdcc993a668a3d075acda8ef39571d8
 SHA1 (patch-ad) = 9522d20b1467b73678003d5c0f98dcac7d312893
 SHA1 (patch-ae) = cf277165382c17d938593934b59d8035175fd8d0
-SHA1 (patch-al) = e771b022a5c2176138c5f49561ac64a15ce11809
+SHA1 (patch-af) = 6874f04a186a4dccfecadaa2e40a372bc9f2e2fe
+SHA1 (patch-ag) = eb02b990d1316ac5f2ec0430e49b9c4487c6dab8
+SHA1 (patch-al) = 1d24ce5af3fcabe0a50abaebd07e24c606fad9cf
 SHA1 (patch-an) = 339df94fd374d99565be913d1f8b59ea2f7b7881
 SHA1 (patch-ao) = 09cb66ba7ee9a7368ec1cd1d4bd40ea3f6637a31
 SHA1 (patch-ap) = 07a83340eb9d6a36a3f5b2db33eb50c74fbc4777
diff --git a/devel/libgtop/patches/patch-aa b/devel/libgtop/patches/patch-aa
new file mode 100644
index 00000000000..68a17338e22
--- /dev/null
+++ b/devel/libgtop/patches/patch-aa
@@ -0,0 +1,19 @@
+$NetBSD: patch-aa,v 1.13 2003/01/21 10:12:31 tron Exp $
+
+--- sysdeps/freebsd/glibtop_machine.h.orig	Mon Nov 26 23:37:59 2001
++++ sysdeps/freebsd/glibtop_machine.h	Sun Jan 19 23:18:04 2003
+@@ -39,6 +39,14 @@
+ #include <osreldate.h>
+ #endif
+ 
++#ifdef __NetBSD__
++#include <sys/proc.h>
++
++#ifndef SRUN
++#define SRUN	SACTIVE
++#endif
++#endif
++
+ BEGIN_LIBGTOP_DECLS
+ 
+ typedef struct _glibtop_machine glibtop_machine;
diff --git a/devel/libgtop/patches/patch-af b/devel/libgtop/patches/patch-af
new file mode 100644
index 00000000000..4eba5c7623a
--- /dev/null
+++ b/devel/libgtop/patches/patch-af
@@ -0,0 +1,28 @@
+$NetBSD: patch-af,v 1.8 2003/01/21 10:12:31 tron Exp $
+
+--- sysdeps/freebsd/procstate.c.orig	Mon Nov 26 23:37:59 2001
++++ sysdeps/freebsd/procstate.c	Sun Jan 19 23:21:15 2003
+@@ -99,9 +99,11 @@
+ 	case SRUN:
+ 		buf->state = GLIBTOP_PROCESS_RUNNING;
+ 		break;
++#ifdef SSLEEP
+ 	case SSLEEP:
+ 		buf->state = GLIBTOP_PROCESS_INTERRUPTIBLE;
+ 		break;
++#endif
+ 	case SSTOP:
+ 		buf->state = GLIBTOP_PROCESS_STOPPED;
+ 		break;
+@@ -119,9 +121,11 @@
+ 	case SRUN:
+ 		buf->state = 'R';
+ 		break;
++#ifdef SSLEEP
+ 	case SSLEEP:
+ 		buf->state = 'S';
+ 		break;
++#endif
+ 	case SSTOP:
+ 		buf->state = 'T';
+ 		break;
diff --git a/devel/libgtop/patches/patch-ag b/devel/libgtop/patches/patch-ag
new file mode 100644
index 00000000000..cd7a52b4398
--- /dev/null
+++ b/devel/libgtop/patches/patch-ag
@@ -0,0 +1,16 @@
+$NetBSD: patch-ag,v 1.6 2003/01/21 10:12:31 tron Exp $
+
+--- sysdeps/freebsd/procuid.c.orig	Mon Nov 26 23:37:59 2001
++++ sysdeps/freebsd/procuid.c	Sun Jan 19 23:26:08 2003
+@@ -94,7 +94,11 @@
+ 	buf->tpgid = pinfo [0].kp_eproc.e_tpgid;
+ 
+ 	buf->nice     = pinfo [0].kp_proc.p_nice;
++#if defined(__NetBSD__) && defined(SACTIVE)
++	buf->priority = 0;
++#else
+ 	buf->priority = pinfo [0].kp_proc.p_priority;
++#endif
+ 
+ 	/* Set the flags for the data we're about to return*/
+ 	buf->flags = _glibtop_sysdeps_proc_uid;
diff --git a/devel/libgtop/patches/patch-al b/devel/libgtop/patches/patch-al
index a82a9e715c8..94f7c4d0647 100644
--- a/devel/libgtop/patches/patch-al
+++ b/devel/libgtop/patches/patch-al
@@ -1,7 +1,7 @@
-$NetBSD: patch-al,v 1.13 2001/08/10 10:48:13 martin Exp $
+$NetBSD: patch-al,v 1.14 2003/01/21 10:12:31 tron Exp $
 
---- sysdeps/freebsd/prockernel.c.orig	Sat Oct 16 20:31:43 1999
-+++ sysdeps/freebsd/prockernel.c	Fri Aug 10 12:38:19 2001
+--- sysdeps/freebsd/prockernel.c.orig	Mon Nov 26 23:37:59 2001
++++ sysdeps/freebsd/prockernel.c	Tue Jan 21 11:09:24 2003
 @@ -34,7 +34,7 @@
  #if (!defined __OpenBSD__) && (!defined __bsdi__)
  #include <sys/user.h>
@@ -26,10 +26,27 @@ $NetBSD: patch-al,v 1.13 2001/08/10 10:48:13 martin Exp $
  static const unsigned long _glibtop_sysdeps_proc_kernel_pstats =
  (1L << GLIBTOP_PROC_KERNEL_MIN_FLT) +
  (1L << GLIBTOP_PROC_KERNEL_MAJ_FLT) +
-@@ -129,8 +137,15 @@
+@@ -101,6 +109,7 @@
+ 	if ((pinfo == NULL) || (count != 1))
+ 		glibtop_error_io_r (server, "kvm_getprocs (%d)", pid);
+ 
++#if !defined(__NetBSD__) || !defined(SACTIVE)
+ 	buf->nwchan = (unsigned long) pinfo [0].kp_proc.p_wchan &~ KERNBASE;
+ 	buf->flags |= (1L << GLIBTOP_PROC_KERNEL_NWCHAN);
+ 
+@@ -112,6 +121,7 @@
+ 	} else {
+ 		buf->wchan [0] = 0;
+ 	}
++#endif
+ 
+ 	/* Taken from `saveuser ()' in `/usr/src/bin/ps/ps.c'. */
+ 
+@@ -129,8 +139,16 @@
  
  	glibtop_suid_enter (server);
  
++#if !defined(__NetBSD__) || !defined(SACTIVE)
 +#ifdef __NetBSD__
 +	/* On NetBSD, there is no kvm_uread(), and kvm_read() always reads
 +	 * from kernel memory.  */
@@ -42,9 +59,11 @@ $NetBSD: patch-al,v 1.13 2001/08/10 10:48:13 martin Exp $
  		       (unsigned long) &u_addr->u_stats,
  		       (char *) &pstats, sizeof (pstats)) == sizeof (pstats))
  		{
-@@ -149,8 +164,12 @@
+@@ -148,9 +166,14 @@
+ 			
  			buf->flags |= _glibtop_sysdeps_proc_kernel_pstats;
  		}
++#endif
  
 +#ifdef __NetBSD__
 +	if (kvm_read (server->machine.kd,
@@ -55,7 +74,7 @@ $NetBSD: patch-al,v 1.13 2001/08/10 10:48:13 martin Exp $
  		       (unsigned long) &u_addr->u_pcb,
  		       (char *) &pcb, sizeof (pcb)) == sizeof (pcb))
  		{
-@@ -167,14 +186,39 @@
+@@ -167,14 +190,39 @@
  			/*xxx FreeBSD/Alpha? */
  #endif
  #else