summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorveego <veego@pkgsrc.org>2007-04-14 20:32:41 +0000
committerveego <veego@pkgsrc.org>2007-04-14 20:32:41 +0000
commit93995c1f4f40ba403362e6f4d304b882caef5848 (patch)
tree132606dbdededd549d901fd33b753b9b37c57717
parent8ff6ca1f15eb2b2b799c55f587609362e600f9a2 (diff)
downloadpkgsrc-93995c1f4f40ba403362e6f4d304b882caef5848.tar.gz
Move the include of <sys/sysctl.h> from pagemeter.cc to pagemeter.h.
This is a workaround for not using $Id in a patch file.
-rw-r--r--sysutils/xosview/patches/patch-ae16
-rw-r--r--sysutils/xosview/patches/patch-af19
2 files changed, 17 insertions, 18 deletions
diff --git a/sysutils/xosview/patches/patch-ae b/sysutils/xosview/patches/patch-ae
index c3ac8b96a1b..eddae16f903 100644
--- a/sysutils/xosview/patches/patch-ae
+++ b/sysutils/xosview/patches/patch-ae
@@ -1,8 +1,18 @@
-$NetBSD: patch-ae,v 1.11 2007/04/09 21:22:11 veego Exp $
+$NetBSD: patch-ae,v 1.12 2007/04/14 20:32:41 veego Exp $
--- bsd/pagemeter.h.orig 2003-10-09 06:22:32.000000000 +0200
-+++ bsd/pagemeter.h 2007-04-09 16:26:34.000000000 +0200
-@@ -48,7 +48,11 @@
++++ bsd/pagemeter.h 2007-04-14 22:23:47.000000000 +0200
+@@ -30,6 +30,9 @@
+ #include <vm/vm.h>
+ #endif
+ #include <uvm/uvm_extern.h>
++#if defined (VM_UVMEXP2)
++#include <sys/sysctl.h> /* Needed for uvmexp_sysctl. */
++#endif
+ #else
+ #include <sys/vmmeter.h>
+ #endif
+@@ -48,7 +51,11 @@
void getpageinfo( void );
private:
#if defined(UVM)
diff --git a/sysutils/xosview/patches/patch-af b/sysutils/xosview/patches/patch-af
index 660e497ae22..46fb6c6df98 100644
--- a/sysutils/xosview/patches/patch-af
+++ b/sysutils/xosview/patches/patch-af
@@ -1,19 +1,8 @@
-$NetBSD: patch-af,v 1.3 2007/04/09 21:22:11 veego Exp $
+$NetBSD: patch-af,v 1.4 2007/04/14 20:32:41 veego Exp $
--- bsd/pagemeter.cc.orig 2002-03-22 04:23:41.000000000 +0100
-+++ bsd/pagemeter.cc 2007-04-09 16:30:04.000000000 +0200
-@@ -20,6 +20,10 @@
- #include "pagemeter.h"
- #include "kernel.h" // For NetBSD Page functions.
-
-+#if defined(UVM) && defined (VM_UVMEXP2)
-+#include <sys/sysctl.h> /* Needed for uvmexp_sysctl. */
-+#endif
-+
- CVSID("$Id: patch-af,v 1.3 2007/04/09 21:22:11 veego Exp $");
- CVSID_DOT_H(PAGEMETER_H_CVSID);
-
-@@ -28,7 +32,13 @@
++++ bsd/pagemeter.cc 2007-04-14 22:24:12.000000000 +0200
+@@ -28,7 +28,13 @@
total_ = total;
BSDPageInit();
#ifdef UVM
@@ -27,7 +16,7 @@ $NetBSD: patch-af,v 1.3 2007/04/09 21:22:11 veego Exp $
#else
BSDGetPageStats(&prev_);
#endif
-@@ -57,8 +67,15 @@
+@@ -57,8 +63,15 @@
void PageMeter::getpageinfo (void) {
// Begin NetBSD-specific code...
#if defined(UVM)