Fix "xosview" to build under NetBSD 1.5 again.

4 files changed, 35 insertions, 9 deletions

diff --git a/sysutils/xosview/files/patch-sum b/sysutils/xosview/files/patch-sum
index 0b007c3020c..1aaeed2022e 100644
--- a/sysutils/xosview/files/patch-sum
+++ b/sysutils/xosview/files/patch-sum
@@ -1,6 +1,7 @@
-$NetBSD: patch-sum,v 1.2 2000/04/13 10:34:19 mrg Exp $
+$NetBSD: patch-sum,v 1.3 2000/06/27 08:15:50 tron Exp $
 
 MD5 (patch-aa) = 01835431e31147cef93fe1cb89aff6a2
 MD5 (patch-ab) = 53e16001747ad96a9403eb1c9cde5c1a
-MD5 (patch-ac) = 3cf8565324039faeb040d808bd3b9bd5
-MD5 (patch-ad) = 4b29fb6aad803d43856119d49509fd62
+MD5 (patch-ac) = 4b87a0726f1b944586ad2f861014503a
+MD5 (patch-ad) = 079f697213f77a037d77ff69dbfcc72d
+MD5 (patch-ae) = b24bf723df0478f212a2acad79973743
diff --git a/sysutils/xosview/patches/patch-ac b/sysutils/xosview/patches/patch-ac
index 8aa7cc88206..db36a0775c8 100644
--- a/sysutils/xosview/patches/patch-ac
+++ b/sysutils/xosview/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.5 1999/04/11 12:15:42 tron Exp $
+$NetBSD: patch-ac,v 1.6 2000/06/27 08:15:51 tron Exp $
 
 --- configure.orig	Tue Feb 16 17:06:16 1999
 +++ configure	Sun Apr 11 14:11:30 1999
@@ -6,7 +6,7 @@ $NetBSD: patch-ac,v 1.5 1999/04/11 12:15:42 tron Exp $
    host_dir=bsd
  
  ;;
-+netbsd1.4*)  
++netbsd1.[45]*)  
 +	host_os=netbsd
 +        EXTRALIBS="-lkvm $XPMLIB"
 +        INSTALL_ARGS='-s -g kmem -m 02555'
diff --git a/sysutils/xosview/patches/patch-ad b/sysutils/xosview/patches/patch-ad
index c1f2638b2c8..eadda40b4b8 100644
--- a/sysutils/xosview/patches/patch-ad
+++ b/sysutils/xosview/patches/patch-ad
@@ -1,8 +1,19 @@
-$NetBSD: patch-ad,v 1.3 2000/04/13 10:03:53 mrg Exp $
+$NetBSD: patch-ad,v 1.4 2000/06/27 08:15:51 tron Exp $
 
---- bsd/kernel.cc.orig	Wed Feb 17 01:09:21 1999
-+++ bsd/kernel.cc	Thu Apr 13 18:37:29 2000
-@@ -67,7 +67,11 @@
+--- bsd/kernel.cc.orig	Tue Feb 16 15:09:21 1999
++++ bsd/kernel.cc	Tue Jun 27 10:13:23 2000
+@@ -30,6 +30,10 @@
+ #include <errno.h>
+ #include <sys/dkstat.h>         /*  For CPUSTATES, which tells us how
+                                       many cpu states there are.  */
++#if defined(XOSVIEW_NETBSD) && !defined(CPUSTATES)
++#include <sys/sched.h>
++#endif
++
+ #ifndef XOSVIEW_FREEBSD
+ #include <sys/disk.h>		/*  For disk statistics.  */
+ #endif
+@@ -67,7 +71,11 @@
  
  #ifdef HAVE_SWAPCTL
  #include <unistd.h>		/*  For swapctl proto.  */
diff --git a/sysutils/xosview/patches/patch-ae b/sysutils/xosview/patches/patch-ae
new file mode 100644
index 00000000000..eba078825ba
--- /dev/null
+++ b/sysutils/xosview/patches/patch-ae
@@ -0,0 +1,14 @@
+$NetBSD: patch-ae,v 1.5 2000/06/27 08:15:51 tron Exp $
+
+--- bsd/cpumeter.cc.orig	Tue Feb 16 15:09:22 1999
++++ bsd/cpumeter.cc	Tue Jun 27 10:13:36 2000
+@@ -15,6 +15,9 @@
+ // $Id: patch-ae,v 1.5 2000/06/27 08:15:51 tron Exp $
+ //
+ #include <sys/dkstat.h>         //  For CPUSTATES #define.  BCG
++#if defined(XOSVIEW_NETBSD) && !defined(CPUSTATES)
++#include <sys/sched.h>
++#endif
+ #include <stdlib.h>		//  For use of atoi  BCG
+ #include "general.h"
+ #include "cpumeter.h"