diff options
| author | wiz <wiz> | 2001-09-25 01:31:18 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2001-09-25 01:31:18 +0000 |
| commit | bdfc290695a96ff72a005d47043e243fac893fd3 (patch) | |
| tree | 8ed83026eb30813ec0f2084f9b9ca582869cea2c /devel | |
| parent | 819c1f5df7f5bacec6cde10578c6119caa24e3bc (diff) | |
| download | pkgsrc-bdfc290695a96ff72a005d47043e243fac893fd3.tar.gz | |
Make build again on 1.5Y, with some help by chuq.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/libgtop/distinfo | 4 | ||||
| -rw-r--r-- | devel/libgtop/patches/patch-ar | 22 |
2 files changed, 20 insertions, 6 deletions
diff --git a/devel/libgtop/distinfo b/devel/libgtop/distinfo index c6c09f9aa6c..20dc870ecbb 100644 --- a/devel/libgtop/distinfo +++ b/devel/libgtop/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2001/08/10 10:48:13 martin Exp $ +$NetBSD: distinfo,v 1.7 2001/09/25 01:31:18 wiz Exp $ SHA1 (libgtop-1.0.12.tar.gz) = 7ff6ae62b599db4bd51b54d4d549627eacfc8509 Size (libgtop-1.0.12.tar.gz) = 882461 bytes @@ -12,5 +12,5 @@ SHA1 (patch-an) = 339df94fd374d99565be913d1f8b59ea2f7b7881 SHA1 (patch-ao) = 09cb66ba7ee9a7368ec1cd1d4bd40ea3f6637a31 SHA1 (patch-ap) = 07a83340eb9d6a36a3f5b2db33eb50c74fbc4777 SHA1 (patch-aq) = 93ebb47710f1c4cc70406a92503bdc4a5bfa50d2 -SHA1 (patch-ar) = 0ab882d06c2b18dc0bee3e13fd2257b960a70c3a +SHA1 (patch-ar) = 470e29d999b079a5f75993978b3cdcdec2fd7d9c SHA1 (patch-as) = 0374fc36c418871e929fbb3c53ab4979e780e8d5 diff --git a/devel/libgtop/patches/patch-ar b/devel/libgtop/patches/patch-ar index 2b1336b9620..c8b6af82da4 100644 --- a/devel/libgtop/patches/patch-ar +++ b/devel/libgtop/patches/patch-ar @@ -1,7 +1,7 @@ -$NetBSD: patch-ar,v 1.2 2000/11/29 21:02:05 tron Exp $ +$NetBSD: patch-ar,v 1.3 2001/09/25 01:31:18 wiz Exp $ --- sysdeps/freebsd/procmem.c.orig Thu May 27 20:56:49 1999 -+++ sysdeps/freebsd/procmem.c Wed Nov 29 21:57:31 2000 ++++ sysdeps/freebsd/procmem.c @@ -31,8 +31,12 @@ #include <sys/param.h> #include <sys/proc.h> @@ -39,17 +39,31 @@ $NetBSD: patch-ar,v 1.2 2000/11/29 21:02:05 tron Exp $ #else struct vm_object object; #endif -@@ -233,11 +241,13 @@ +@@ -233,17 +241,27 @@ /* 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; ++#endif if ((vnode.v_type != VREG) || (vnode.v_tag != VT_UFS) || !vnode.v_data) continue; -+#endif ++#if (__NetBSD_Version__ >= 105250000) ++ /* Reference count must be at least two. */ ++ if (vnode.v_usecount <= 1) ++ continue; ++ ++ buf->share += pagetok (vnode.v_uobj.uo_npages) << LOG1024; ++#else /* Reference count must be at least two. */ if (vnode.v_uvm.u_obj.uo_refs <= 1) + continue; + + buf->share += pagetok (vnode.v_uvm.u_obj.uo_npages) << LOG1024; ++#endif /* __NetBSD_Version__ >= 105250000 */ + #endif + + #ifdef __FreeBSD__ |