diff options
author | jlam <jlam> | 2000-07-30 02:45:40 +0000 |
---|---|---|
committer | jlam <jlam> | 2000-07-30 02:45:40 +0000 |
commit | c3b94db188afb2a2f1d3e0a224c4b6da57d2c547 (patch) | |
tree | d3824b07b9ee630a5f719c8eb142e49f9b34697b /devel/libgtop | |
parent | d8557ecc7e3a359a7a4702f8cbe262ee7a8577d4 (diff) | |
download | pkgsrc-c3b94db188afb2a2f1d3e0a224c4b6da57d2c547.tar.gz |
Make this compile now that <vm/vm*.h> has gone away in -current.
Should fix part of pkg/10497.
Diffstat (limited to 'devel/libgtop')
-rw-r--r-- | devel/libgtop/files/patch-sum | 7 | ||||
-rw-r--r-- | devel/libgtop/patches/patch-al | 27 | ||||
-rw-r--r-- | devel/libgtop/patches/patch-ap | 22 | ||||
-rw-r--r-- | devel/libgtop/patches/patch-aq | 32 | ||||
-rw-r--r-- | devel/libgtop/patches/patch-ar | 41 |
5 files changed, 119 insertions, 10 deletions
diff --git a/devel/libgtop/files/patch-sum b/devel/libgtop/files/patch-sum index 3f82237267d..d07b934c685 100644 --- a/devel/libgtop/files/patch-sum +++ b/devel/libgtop/files/patch-sum @@ -1,9 +1,12 @@ -$NetBSD: patch-sum,v 1.16 2000/06/30 03:13:36 wiz Exp $ +$NetBSD: patch-sum,v 1.17 2000/07/30 02:45:40 jlam Exp $ MD5 (patch-ab) = 1be0d48b1e41fea46ee459a320fb11c7 MD5 (patch-ac) = f84a83914548206edccb11e1f84bf1bf MD5 (patch-ad) = 617e9e681d3576d14d2b9dd4185dfd68 MD5 (patch-ae) = 500e5a7bf247842cef93af16027a7cbf -MD5 (patch-al) = 010ee10f093b399b82479da2f64ee92e +MD5 (patch-al) = 87476bbb3824bb8bfaa32ab3f3b42be9 MD5 (patch-an) = 92fc474edf1d713540f7ee0a35a6dbf2 MD5 (patch-ao) = ae10e3b4bd4ee612c4fac54fccbb15a8 +MD5 (patch-ap) = 3239fe91aca4679f906470f8bc21cb43 +MD5 (patch-aq) = e4e32b725cafc81840dc10d4a3af1fff +MD5 (patch-ar) = 998a4ed999a66a5e3f6372250cb023cc diff --git a/devel/libgtop/patches/patch-al b/devel/libgtop/patches/patch-al index 778f5870a8d..431ad76a1b3 100644 --- a/devel/libgtop/patches/patch-al +++ b/devel/libgtop/patches/patch-al @@ -1,15 +1,18 @@ -$NetBSD: patch-al,v 1.9 2000/06/26 18:05:46 dmcmahill Exp $ +$NetBSD: patch-al,v 1.10 2000/07/30 02:45:40 jlam Exp $ --- sysdeps/freebsd/prockernel.c.orig Sat Oct 16 14:31:43 1999 -+++ sysdeps/freebsd/prockernel.c Mon Jun 26 08:42:11 2000 -@@ -35,5 +35,5 @@ ++++ sysdeps/freebsd/prockernel.c Sun Jul 23 06:16:47 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 -@@ -49,4 +49,9 @@ + #if defined(__FreeBSD__) && !defined(__alpha__) +@@ -48,6 +48,11 @@ + #include <osreldate.h> #endif +#if defined(__NetBSD__) && defined(__arm32__) @@ -19,7 +22,9 @@ $NetBSD: patch-al,v 1.9 2000/06/26 18:05:46 dmcmahill Exp $ + static const unsigned long _glibtop_sysdeps_proc_kernel_pstats = (1L << GLIBTOP_PROC_KERNEL_MIN_FLT) + -@@ -130,6 +135,13 @@ + (1L << GLIBTOP_PROC_KERNEL_MAJ_FLT) + +@@ -129,8 +134,15 @@ + glibtop_suid_enter (server); +#ifdef __NetBSD__ @@ -33,7 +38,9 @@ $NetBSD: patch-al,v 1.9 2000/06/26 18:05:46 dmcmahill Exp $ +#endif (unsigned long) &u_addr->u_stats, (char *) &pstats, sizeof (pstats)) == sizeof (pstats)) -@@ -150,6 +162,10 @@ + { +@@ -149,8 +161,12 @@ + buf->flags |= _glibtop_sysdeps_proc_kernel_pstats; } +#ifdef __NetBSD__ @@ -44,13 +51,16 @@ $NetBSD: patch-al,v 1.9 2000/06/26 18:05:46 dmcmahill Exp $ +#endif (unsigned long) &u_addr->u_pcb, (char *) &pcb, sizeof (pcb)) == sizeof (pcb)) -@@ -168,4 +184,5 @@ + { +@@ -167,14 +183,36 @@ + /*xxx FreeBSD/Alpha? */ #endif #else +#ifdef __i386__ buf->kstk_esp = (u_int64_t) pcb.pcb_tss.tss_esp0; #ifdef __bsdi__ -@@ -174,6 +191,27 @@ + buf->kstk_eip = (u_int64_t) pcb.pcb_tss.tss_eip; + #else buf->kstk_eip = (u_int64_t) pcb.pcb_tss.__tss_eip; #endif +#else @@ -78,3 +88,4 @@ $NetBSD: patch-al,v 1.9 2000/06/26 18:05:46 dmcmahill Exp $ +#endif #endif } + diff --git a/devel/libgtop/patches/patch-ap b/devel/libgtop/patches/patch-ap new file mode 100644 index 00000000000..20c8d81ab09 --- /dev/null +++ b/devel/libgtop/patches/patch-ap @@ -0,0 +1,22 @@ +$NetBSD: patch-ap,v 1.1 2000/07/30 02:45:41 jlam Exp $ + +--- sysdeps/freebsd/mem.c.orig Sun Feb 13 10:47:58 2000 ++++ sysdeps/freebsd/mem.c Sat Jul 29 22:32:44 2000 +@@ -29,7 +29,9 @@ + + #include <sys/sysctl.h> + #include <sys/vmmeter.h> ++#if defined(__NetBSD__) && (__NetBSD_Version__ < 105020000) + #include <vm/vm_param.h> ++#endif + + #if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) + #include <uvm/uvm_extern.h> +@@ -74,7 +76,6 @@ + }; + + /* MIB array for sysctl */ +-static int mib_length=2; + #ifdef __bsdi__ + static int mib [] = { CTL_VM, VM_TOTAL }; + #else diff --git a/devel/libgtop/patches/patch-aq b/devel/libgtop/patches/patch-aq new file mode 100644 index 00000000000..381ce21ff67 --- /dev/null +++ b/devel/libgtop/patches/patch-aq @@ -0,0 +1,32 @@ +$NetBSD: patch-aq,v 1.1 2000/07/30 02:45:41 jlam Exp $ + +--- sysdeps/freebsd/procmap.c.orig Thu May 27 14:56:48 1999 ++++ sysdeps/freebsd/procmap.c Sat Jul 29 22:09:34 2000 +@@ -32,9 +32,13 @@ + #include <sys/param.h> + #include <sys/proc.h> + #include <sys/resource.h> ++#if defined(__NetBSD__) && (__NetBSD_Version__ < 105020000) + #include <vm/vm_object.h> + #include <vm/vm_prot.h> + #include <vm/vm_map.h> ++#else ++#include <uvm/uvm_extern.h> ++#endif + + #include <sys/vnode.h> + #include <sys/mount.h> +@@ -46,9 +50,12 @@ + #include <sys/user.h> + #endif + #include <sys/sysctl.h> ++#if defined(__NetBSD__) && (__NetBSD_Version__ < 105020000) + #include <vm/vm.h> ++#endif + +-#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) ++#if defined(__NetBSD__) && \ ++ (__NetBSD_Version__ >= 104000000) && (__NetBSD_Version < 105020000) + /* Fixme ... */ + #undef _KERNEL + #define _UVM_UVM_AMAP_I_H_ 1 diff --git a/devel/libgtop/patches/patch-ar b/devel/libgtop/patches/patch-ar new file mode 100644 index 00000000000..e66541a119b --- /dev/null +++ b/devel/libgtop/patches/patch-ar @@ -0,0 +1,41 @@ +$NetBSD: patch-ar,v 1.1 2000/07/30 02:45:41 jlam Exp $ + +--- sysdeps/freebsd/procmem.c.orig Thu May 27 14:56:49 1999 ++++ sysdeps/freebsd/procmem.c Sat Jul 29 22:23:54 2000 +@@ -31,8 +31,12 @@ + #include <sys/param.h> + #include <sys/proc.h> + #include <sys/resource.h> ++#if defined(__NetBSD__) && (__NetBSD_Version__ < 105020000) + #include <vm/vm_object.h> + #include <vm/vm_map.h> ++#else ++#include <uvm/uvm_extern.h> ++#endif + + #include <sys/vnode.h> + #include <ufs/ufs/quota.h> +@@ -43,9 +47,14 @@ + #include <sys/user.h> + #endif + #include <sys/sysctl.h> ++#if defined(__NetBSD__) && (__NetBSD_Version__ < 105020000) + #include <vm/vm.h> ++#else ++#include <uvm/uvm.h> ++#endif + +-#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) ++#if defined(__NetBSD__) && \ ++ (__NetBSD_Version__ >= 104000000) && (__NetBSD_Version__ < 105020000) + /* Fixme ... */ + #undef _KERNEL + #define _UVM_UVM_AMAP_I_H_ 1 +@@ -113,7 +122,6 @@ + struct vmspace *vms, vmspace; + #if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000) + struct vnode vnode; +- struct inode inode; + #else + struct vm_object object; + #endif |