summaryrefslogtreecommitdiff
path: root/x11/kdebase2
diff options
context:
space:
mode:
authorskrll <skrll@pkgsrc.org>2001-03-15 17:58:48 +0000
committerskrll <skrll@pkgsrc.org>2001-03-15 17:58:48 +0000
commit79378a2802ffd6f3a0a65de3c1b7a32e52c45083 (patch)
tree61930f3f179ee05ac122b05071798196b7651849 /x11/kdebase2
parentb364b6211bf809927f51188b84902715ae97e0f6 (diff)
downloadpkgsrc-79378a2802ffd6f3a0a65de3c1b7a32e52c45083.tar.gz
Get the right includes file for versions after 1.5.x
Diffstat (limited to 'x11/kdebase2')
-rw-r--r--x11/kdebase2/files/patch-sum4
-rw-r--r--x11/kdebase2/patches/patch-ai19
2 files changed, 18 insertions, 5 deletions
diff --git a/x11/kdebase2/files/patch-sum b/x11/kdebase2/files/patch-sum
index 77704c79b92..3a69b3b37e2 100644
--- a/x11/kdebase2/files/patch-sum
+++ b/x11/kdebase2/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.3 2001/03/14 22:14:18 skrll Exp $
+$NetBSD: patch-sum,v 1.4 2001/03/15 17:58:48 skrll Exp $
SHA1 (patch-aa) = 69618f1b6542f66b99922f6f0c00ea777597a6f8
SHA1 (patch-ab) = 06386d9f87a4782265b00375f4847517be48c1fc
@@ -8,7 +8,7 @@ SHA1 (patch-ae) = 1d39b67f5d2a4cc23cf0cc4a74622adb86ec3492
SHA1 (patch-af) = b91246a123ade7fc354308839e1363a4ee513c7f
SHA1 (patch-ag) = 1666f52f9d31f972c49879d8f314c7f93fd992d4
SHA1 (patch-ah) = d30d837719e8bbdf4bc6f5ff377d6febcd85c502
-SHA1 (patch-ai) = 4a1df296ca58cb6ef4362d591daf049302216ec1
+SHA1 (patch-ai) = 2681287d8817be3d95f97abba834c906b1226c96
SHA1 (patch-aj) = 3233b247a68a4184a6e85630a6718bd7f2978d67
SHA1 (patch-ak) = 923b3cb036f5c6e8024dd432138b29ddf203a84c
SHA1 (patch-al) = 8f8d0ebd8691d73b1ab9c3328e73a81b56c9e47b
diff --git a/x11/kdebase2/patches/patch-ai b/x11/kdebase2/patches/patch-ai
index b7825cb59b6..37e444d9d30 100644
--- a/x11/kdebase2/patches/patch-ai
+++ b/x11/kdebase2/patches/patch-ai
@@ -1,8 +1,21 @@
-$NetBSD: patch-ai,v 1.1.1.1 2001/03/14 16:03:13 skrll Exp $
+$NetBSD: patch-ai,v 1.2 2001/03/15 17:58:48 skrll Exp $
--- ksysguard/ksysguardd/FreeBSD/Memory.c.orig Fri Jul 28 00:59:28 2000
+++ ksysguard/ksysguardd/FreeBSD/Memory.c
-@@ -65,9 +65,16 @@
+@@ -29,7 +29,12 @@
+
+ #include <sys/param.h>
+ #include <sys/sysctl.h>
++/* Everything post 1.5.x uses uvm/uvm_* includes */
++#if __NetBSD_Version__ >= 105010000
++#include <uvm/uvm_param.h>
++#else
+ #include <vm/vm_param.h>
++#endif
+ #include <sys/vmmeter.h>
+ #include <string.h>
+ #include <unistd.h>
+@@ -65,9 +70,16 @@
struct vmtotal p;
FILE *file;
char buf[256];
@@ -19,7 +32,7 @@ $NetBSD: patch-ai,v 1.1.1.1 2001/03/14 16:03:13 skrll Exp $
Total /= 1024;
/* Q&D hack for swap display. Borrowed from xsysinfo-1.4 */
-@@ -92,23 +99,40 @@
+@@ -92,23 +104,40 @@
}