${UVM} cleanup: now detect by NetBSD version if it has UVM or not.

(copied from x11/kdebase/files/memory_netbsd.cpp)

4 files changed, 17 insertions, 33 deletions

diff --git a/sysutils/top/Makefile b/sysutils/top/Makefile
index 6505d8e39f0..1b387ed688c 100644
--- a/sysutils/top/Makefile
+++ b/sysutils/top/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2000/02/05 07:04:47 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2000/02/19 02:40:33 wiz Exp $
 # FreeBSD Id: Makefile,v 1.14 1997/04/30 23:49:14 asami Exp
 #
 
@@ -28,11 +28,8 @@ CONFIGURE_ARGS+=	${CONF}
 IGNORE=			"is part of your NetBSD distribution"
 .endif
 
-# UVM definition will be pulled in from pkgsrc's mk/bsd.own.mk for now
-
 MAKE_ENV+=	INSTALL_MAN="${INSTALL_MAN}" \
-		COPY="${COPY}" STRIPFLAG="${STRIPFLAG}" \
-		UVM=${UVM}
+		COPY="${COPY}" STRIPFLAG="${STRIPFLAG}"
 
 pre-configure:
 	${CP} ${FILESDIR}/defaults.${CONF} ${WRKSRC}/.defaults
diff --git a/sysutils/top/files/patch-sum b/sysutils/top/files/patch-sum
index d5ac6dc5dd9..c89da801b2d 100644
--- a/sysutils/top/files/patch-sum
+++ b/sysutils/top/files/patch-sum
@@ -1,8 +1,8 @@
-$NetBSD: patch-sum,v 1.3 1999/12/08 16:18:48 agc Exp $
+$NetBSD: patch-sum,v 1.4 2000/02/19 02:40:35 wiz Exp $
 
 MD5 (patch-aa) = 233a2cce23bbbc15181093662c27e2e1
-MD5 (patch-ab) = 71a6230b5eb767d8cd1a9366339d66f3
-MD5 (patch-ac) = cff80f7b4ce2067d12d0b306a1f62b90
+MD5 (patch-ab) = 4c23db250848bd00ed80c6220b404bdb
+MD5 (patch-ac) = 3f83e316913340c9bf47e9189fda82f7
 MD5 (patch-ae) = 3edecc1bc00be6512c21b7320fd6aa5f
 MD5 (patch-af) = af572aee1b594fff3f66c815d2538f56
 MD5 (patch-ag) = d844db470a4f8e935a577a5cd5cff61f
diff --git a/sysutils/top/patches/patch-ab b/sysutils/top/patches/patch-ab
index cc5749e2201..149fe21ea03 100644
--- a/sysutils/top/patches/patch-ab
+++ b/sysutils/top/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.8 1999/06/28 22:19:12 tron Exp $
+$NetBSD: patch-ab,v 1.9 2000/02/19 02:40:35 wiz Exp $
 
---- machine/m_netbsd13.c.orig	Tue Jun 29 00:14:19 1999
-+++ machine/m_netbsd13.c	Tue Jun 29 00:16:18 1999
-@@ -0,0 +1,884 @@
+--- ./machine/m_netbsd13.c.orig	Sat Feb 19 03:24:47 2000
++++ ./machine/m_netbsd13.c	Sat Feb 19 03:31:13 2000
+@@ -0,0 +1,887 @@
 +/*
 + * top - a top users display for Unix
 + *
@@ -31,12 +31,15 @@ $NetBSD: patch-ab,v 1.8 1999/06/28 22:19:12 tron Exp $
 + *		matthew green <mrg@eterna.com.au>
 + *
 + *
-+ * $Id: patch-ab,v 1.8 1999/06/28 22:19:12 tron Exp $
++ * $Id: patch-ab,v 1.9 2000/02/19 02:40:35 wiz Exp $
 + */
 +
 +#include <sys/types.h>
 +#include <sys/signal.h>
 +#include <sys/param.h>
++#if __NetBSD_Version__ > 103080000
++#define UVM
++#endif
 +#include <sys/stat.h>
 +#include <sys/errno.h>
 +#include <sys/sysctl.h>
diff --git a/sysutils/top/patches/patch-ac b/sysutils/top/patches/patch-ac
index d016249993e..437deaaf447 100644
--- a/sysutils/top/patches/patch-ac
+++ b/sysutils/top/patches/patch-ac
@@ -1,24 +1,8 @@
-$NetBSD: patch-ac,v 1.5 1999/03/17 10:47:42 agc Exp $
+$NetBSD: patch-ac,v 1.6 2000/02/19 02:40:35 wiz Exp $
 
-Add UVM definition for NetBSD
-Correct the install commands
-
---- Makefile.X.orig	Wed Nov 20 02:19:24 1996
-+++ Makefile.X	Wed Mar 17 10:21:02 1999
-@@ -55,6 +55,12 @@
- TERMCAP = %termcap%
- 
- CFLAGS = %cflgs% $(CDEFS)
-+.ifndef UVM
-+UVM=	
-+.endif
-+.if ${UVM} != ""
-+CFLAGS+=        -DUVM
-+.endif
- LINTFLAGS = -x $(CDEFS)
- 
- all: Makefile top.local.h top
-@@ -100,10 +106,10 @@
+--- ./Makefile.X.orig	Wed Nov 20 03:19:24 1996
++++ ./Makefile.X	Sat Feb 19 03:34:17 2000
+@@ -100,10 +100,10 @@
  install: top top.1 install-top install-$(MANSTY)
  
  install-top: