Fri Jan 11 23:33:36 2013 UTC ()
NetBSD/current needs uvm/uvm_extern.h


(joerg)
diff -r1.25 -r1.26 pkgsrc/sysutils/xosview/distinfo
diff -r1.12 -r1.13 pkgsrc/sysutils/xosview/patches/patch-ab
cvs diff -r1.25 -r1.26 pkgsrc/sysutils/xosview/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/xosview/distinfo 2012/09/15 09:03:50 1.25
+++ pkgsrc/sysutils/xosview/distinfo 2013/01/11 23:33:35 1.26
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: distinfo,v 1.25 2012/09/15 09:03:50 cheusov Exp $ 1$NetBSD: distinfo,v 1.26 2013/01/11 23:33:35 joerg Exp $
2 2
3SHA1 (xosview-1.8.3.tar.gz) = 420fd0620ff9fb9ba83fc833eeb8b872414e377e 3SHA1 (xosview-1.8.3.tar.gz) = 420fd0620ff9fb9ba83fc833eeb8b872414e377e
4RMD160 (xosview-1.8.3.tar.gz) = 595e812dee686ccaa5d95eb537782679d752271b 4RMD160 (xosview-1.8.3.tar.gz) = 595e812dee686ccaa5d95eb537782679d752271b
5Size (xosview-1.8.3.tar.gz) = 259793 bytes 5Size (xosview-1.8.3.tar.gz) = 259793 bytes
6SHA1 (patch-aa) = 4a618b50e5c852b454db84019e7fa281c4b67337 6SHA1 (patch-aa) = 4a618b50e5c852b454db84019e7fa281c4b67337
7SHA1 (patch-ab) = 274b83fd3488af8e0c4ce0184b8c78f4f6ef87df 7SHA1 (patch-ab) = 2bc4ca0772c931dc208edb99158e7f7ae7261b3b
8SHA1 (patch-ac) = 3e9073c4ccd7e08d29a76b08f2ed0c7f9f9d9ede 8SHA1 (patch-ac) = 3e9073c4ccd7e08d29a76b08f2ed0c7f9f9d9ede
9SHA1 (patch-ad) = 02ae8395e200e5cbf8d6339eced33fe5aa421d38 9SHA1 (patch-ad) = 02ae8395e200e5cbf8d6339eced33fe5aa421d38
10SHA1 (patch-ae) = 6ff69eeffd40ec4ee3686f2069fd46853f346fff 10SHA1 (patch-ae) = 6ff69eeffd40ec4ee3686f2069fd46853f346fff
11SHA1 (patch-af) = c556f02c7d8297968a78eb087f413f9472371c54 11SHA1 (patch-af) = c556f02c7d8297968a78eb087f413f9472371c54
12SHA1 (patch-linux_lmstemp.cc) = d46c27884963901d0e5f5bed7cc880dc7fddc01c 12SHA1 (patch-linux_lmstemp.cc) = d46c27884963901d0e5f5bed7cc880dc7fddc01c
13SHA1 (patch-sunos5_diskmeter.cc) = 99e119cb645c9982f2a116950ac2ffe84eeff1d4 13SHA1 (patch-sunos5_diskmeter.cc) = 99e119cb645c9982f2a116950ac2ffe84eeff1d4
cvs diff -r1.12 -r1.13 pkgsrc/sysutils/xosview/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/sysutils/xosview/patches/Attic/patch-ab 2006/10/28 02:15:12 1.12
+++ pkgsrc/sysutils/xosview/patches/Attic/patch-ab 2013/01/11 23:33:36 1.13
@@ -1,29 +1,32 @@ @@ -1,29 +1,32 @@
1$NetBSD: patch-ab,v 1.12 2006/10/28 02:15:12 christos Exp $ 1$NetBSD: patch-ab,v 1.13 2013/01/11 23:33:36 joerg Exp $
2 2
3--- bsd/memmeter.cc.orig 2002-07-13 23:48:45.000000000 -0400 3--- bsd/memmeter.cc.orig 2002-07-14 03:48:45.000000000 +0000
4+++ bsd/memmeter.cc 2006-10-27 22:09:54.000000000 -0400 4+++ bsd/memmeter.cc
5@@ -77,7 +77,7 @@ 5@@ -26,6 +26,8 @@
6 struct vmtotal meminfo; 6 #include <sys/sysctl.h> /* Needed for kvm_cnt, kvm_uvm_exp. */
7 int params[] = {CTL_VM, VM_METER}; 7-#if defined(XOSVIEW_BSDI) || defined(XOSVIEW_FREEBSD) || defined(XOSVIEW_OPENBSD) /* Does
 8- OpenBSD need this? */
 9+#if defined(XOSVIEW_BSDI) || defined(XOSVIEW_FREEBSD) || defined(XOSVIEW_OPENBSD)
 10 # include <sys/vmmeter.h>
 11 #endif
 12+#if defined(__NetBSD__)
 13+#include <uvm/uvm_extern.h>
 14+#endif
 15
 16@@ -79,3 +81,3 @@ void MemMeter::getmeminfo (void) {
8 size_t meminfosize = sizeof (struct vmtotal); 17 size_t meminfosize = sizeof (struct vmtotal);
9- sysctl (params, 2, &meminfo, &meminfosize, NULL, NULL); 18- sysctl (params, 2, &meminfo, &meminfosize, NULL, NULL);
10+ sysctl (params, 2, &meminfo, &meminfosize, NULL, 0); 19+ sysctl (params, 2, &meminfo, &meminfosize, NULL, 0);
11 /* Note that the numbers are in terms of 4K pages. */ 20 /* Note that the numbers are in terms of 4K pages. */
12  21@@ -93,4 +95,11 @@ void MemMeter::getmeminfo (void) {
13 total_ = 4096*(meminfo.t_free+meminfo.t_rm); 
14@@ -91,8 +91,15 @@ 
15 * this, and later we'll add all the common fields to this. */ 
16 total_ = 0.0; 
17 #if defined(UVM) && (defined(XOSVIEW_NETBSD) || defined(XOSVIEW_OPENBSD)) 22 #if defined(UVM) && (defined(XOSVIEW_NETBSD) || defined(XOSVIEW_OPENBSD))
18+#ifdef VM_UVMEXP2 23+#ifdef VM_UVMEXP2
19+ int params[] = {CTL_VM, VM_UVMEXP2}; 24+ int params[] = {CTL_VM, VM_UVMEXP2};
20+ struct uvmexp_sysctl kvm_uvm_exp; 25+ struct uvmexp_sysctl kvm_uvm_exp;
21+ size_t kvm_uvm_exp_size = sizeof (kvm_uvm_exp); 26+ size_t kvm_uvm_exp_size = sizeof (kvm_uvm_exp);
22+ sysctl (params, 2, &kvm_uvm_exp, &kvm_uvm_exp_size, NULL, 0); 27+ sysctl (params, 2, &kvm_uvm_exp, &kvm_uvm_exp_size, NULL, 0);
23+#else 28+#else
24 struct uvmexp kvm_uvm_exp; 29 struct uvmexp kvm_uvm_exp;
25 BSDGetUVMPageStats(&kvm_uvm_exp); 30 BSDGetUVMPageStats(&kvm_uvm_exp);
26+#endif 31+#endif
27 int pgsize = kvm_uvm_exp.pagesize; 32 int pgsize = kvm_uvm_exp.pagesize;
28 fields_[0] = kvm_uvm_exp.active*pgsize; 
29 fields_[1] = kvm_uvm_exp.inactive*pgsize;