Make this compile again under NetBSD-1.5L by "#ifdef"-ing checks which

are not required any more after UBC has been integrated. The information
for the fix was provided by Chuck Silvers in private e-mail.

3 files changed, 37 insertions, 9 deletions

diff --git a/devel/libgtop/files/patch-sum b/devel/libgtop/files/patch-sum
index 09d72ffd6ae..d2cacef043e 100644
--- a/devel/libgtop/files/patch-sum
+++ b/devel/libgtop/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.19 2000/11/26 09:32:11 tron Exp $
+$NetBSD: patch-sum,v 1.20 2000/11/29 21:02:04 tron Exp $
 
 MD5 (patch-aa) = c20fbf8c437f72a35bd5dada09aca1a4
 MD5 (patch-ac) = f84a83914548206edccb11e1f84bf1bf
@@ -8,5 +8,5 @@ MD5 (patch-al) = 726c76511c3ce6d00d53780ae983d576
 MD5 (patch-an) = 92fc474edf1d713540f7ee0a35a6dbf2
 MD5 (patch-ao) = ae10e3b4bd4ee612c4fac54fccbb15a8
 MD5 (patch-ap) = 3239fe91aca4679f906470f8bc21cb43
-MD5 (patch-aq) = e4e32b725cafc81840dc10d4a3af1fff
-MD5 (patch-ar) = 998a4ed999a66a5e3f6372250cb023cc
+MD5 (patch-aq) = f8250e6d1b449ffce1fc0d4678cac028
+MD5 (patch-ar) = 17327cdd254a043848ac05617e126ce1
diff --git a/devel/libgtop/patches/patch-aq b/devel/libgtop/patches/patch-aq
index 381ce21ff67..96e8f7a0b91 100644
--- a/devel/libgtop/patches/patch-aq
+++ b/devel/libgtop/patches/patch-aq
@@ -1,7 +1,7 @@
-$NetBSD: patch-aq,v 1.1 2000/07/30 02:45:41 jlam Exp $
+$NetBSD: patch-aq,v 1.2 2000/11/29 21:02:05 tron Exp $
 
---- sysdeps/freebsd/procmap.c.orig	Thu May 27 14:56:48 1999
-+++ sysdeps/freebsd/procmap.c	Sat Jul 29 22:09:34 2000
+--- sysdeps/freebsd/procmap.c.orig	Thu May 27 20:56:48 1999
++++ sysdeps/freebsd/procmap.c	Wed Nov 29 21:57:15 2000
 @@ -32,9 +32,13 @@
  #include <sys/param.h>
  #include <sys/proc.h>
@@ -30,3 +30,17 @@ $NetBSD: patch-aq,v 1.1 2000/07/30 02:45:41 jlam Exp $
  /* Fixme ... */
  #undef _KERNEL
  #define _UVM_UVM_AMAP_I_H_ 1
+@@ -214,11 +221,13 @@
+ #endif
+ 
+ #if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)
++#if defined(UVM_VNODE_VALID)
+ 		if (!vnode.v_uvm.u_flags & UVM_VNODE_VALID)
+ 			continue;
+ 
+ 		if ((vnode.v_type != VREG) || (vnode.v_tag != VT_UFS) ||
+ 		    !vnode.v_data) continue;
++#endif
+ 
+ 		if (kvm_read (server->machine.kd,
+ 			      (unsigned long) vnode.v_data,
diff --git a/devel/libgtop/patches/patch-ar b/devel/libgtop/patches/patch-ar
index e66541a119b..2b1336b9620 100644
--- a/devel/libgtop/patches/patch-ar
+++ b/devel/libgtop/patches/patch-ar
@@ -1,7 +1,7 @@
-$NetBSD: patch-ar,v 1.1 2000/07/30 02:45:41 jlam Exp $
+$NetBSD: patch-ar,v 1.2 2000/11/29 21:02:05 tron Exp $
 
---- sysdeps/freebsd/procmem.c.orig	Thu May 27 14:56:49 1999
-+++ sysdeps/freebsd/procmem.c	Sat Jul 29 22:23:54 2000
+--- sysdeps/freebsd/procmem.c.orig	Thu May 27 20:56:49 1999
++++ sysdeps/freebsd/procmem.c	Wed Nov 29 21:57:31 2000
 @@ -31,8 +31,12 @@
  #include <sys/param.h>
  #include <sys/proc.h>
@@ -39,3 +39,17 @@ $NetBSD: patch-ar,v 1.1 2000/07/30 02:45:41 jlam Exp $
  #else
  	struct vm_object object;
  #endif
+@@ -233,11 +241,13 @@
+ 		/* If the object is of type vnode, add its size */
+ 
+ #if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)
++#if defined(UVM_VNODE_VALID)
+ 		if (!vnode.v_uvm.u_flags & UVM_VNODE_VALID)
+ 			continue;
+ 
+ 		if ((vnode.v_type != VREG) || (vnode.v_tag != VT_UFS) ||
+ 		    !vnode.v_data) continue;
++#endif
+ 
+ 		/* Reference count must be at least two. */
+ 		if (vnode.v_uvm.u_obj.uo_refs <= 1)