From e1e50990340638bb7a96f7237ba85adc0b4a2c56 Mon Sep 17 00:00:00 2001
From: agc <agc@pkgsrc.org>
Date: Wed, 17 Mar 1999 10:47:42 +0000
Subject: Make this package work on Solaris.

---
 sysutils/top/Makefile                | 16 +++++++++++++---
 sysutils/top/files/defaults          | 19 -------------------
 sysutils/top/files/defaults.netbsd13 | 19 +++++++++++++++++++
 sysutils/top/files/defaults.sunos5   | 19 +++++++++++++++++++
 sysutils/top/patches/patch-ac        |  9 ++++++---
 sysutils/top/pkg/DESCR               |  4 ++--
 6 files changed, 59 insertions(+), 27 deletions(-)
 delete mode 100644 sysutils/top/files/defaults
 create mode 100644 sysutils/top/files/defaults.netbsd13
 create mode 100644 sysutils/top/files/defaults.sunos5

(limited to 'sysutils')

diff --git a/sysutils/top/Makefile b/sysutils/top/Makefile
index e159f7a4b97..d020721887b 100644
--- a/sysutils/top/Makefile
+++ b/sysutils/top/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 1999/02/15 04:36:31 simonb Exp $
+# $NetBSD: Makefile,v 1.17 1999/03/17 10:47:42 agc Exp $
 # FreeBSD Id: Makefile,v 1.14 1997/04/30 23:49:14 asami Exp
 #
 
@@ -12,7 +12,17 @@ HOMEPAGE=	http://www.groupsys.com/topinfo/
 
 HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	Configure
-CONFIGURE_ARGS+=	netbsd13
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "NetBSD"
+CONF=			netbsd13
+.elif ${OPSYS} == "SunOS"
+CONF+=			sunos5
+MAKE_ENV+=		CPPFLAGS=
+.endif
+
+CONFIGURE_ARGS+=	${CONF}
 
 .if exists(/usr/bin/top)
 IGNORE=			"is part of your NetBSD distribution"
@@ -25,7 +35,7 @@ MAKE_ENV+=	INSTALL_MAN="${INSTALL_MAN}" \
 		UVM=${UVM}
 
 pre-configure:
-	${CP} ${FILESDIR}/defaults ${WRKSRC}/.defaults
+	${CP} ${FILESDIR}/defaults.${CONF} ${WRKSRC}/.defaults
 	chmod a-x ${WRKSRC}/install
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/top/files/defaults b/sysutils/top/files/defaults
deleted file mode 100644
index 06173481ee8..00000000000
--- a/sysutils/top/files/defaults
+++ /dev/null
@@ -1,19 +0,0 @@
-set module = 'netbsd13'
-set LoadMax = '5.0'
-set topn = '-1'
-set NominalTopn = '18'
-set delay = '2'
-set owner = 'root'
-set group = 'kmem'
-set mode = '2755'
-set random = '1'
-set TableSize = '47'
-set bindir = '$(PREFIX)/bin'
-set mandir = '$(PREFIX)/man/man1'
-set manext = '1'
-set mansty = 'man'
-set Cmdshell = '/bin/sh'
-set Cmdcc = 'cc'
-set Cmdawk = 'awk'
-set Cmdinstall = '/usr/bin/install'
-set cdefs = '-DHAVE_GETOPT -O'
diff --git a/sysutils/top/files/defaults.netbsd13 b/sysutils/top/files/defaults.netbsd13
new file mode 100644
index 00000000000..06173481ee8
--- /dev/null
+++ b/sysutils/top/files/defaults.netbsd13
@@ -0,0 +1,19 @@
+set module = 'netbsd13'
+set LoadMax = '5.0'
+set topn = '-1'
+set NominalTopn = '18'
+set delay = '2'
+set owner = 'root'
+set group = 'kmem'
+set mode = '2755'
+set random = '1'
+set TableSize = '47'
+set bindir = '$(PREFIX)/bin'
+set mandir = '$(PREFIX)/man/man1'
+set manext = '1'
+set mansty = 'man'
+set Cmdshell = '/bin/sh'
+set Cmdcc = 'cc'
+set Cmdawk = 'awk'
+set Cmdinstall = '/usr/bin/install'
+set cdefs = '-DHAVE_GETOPT -O'
diff --git a/sysutils/top/files/defaults.sunos5 b/sysutils/top/files/defaults.sunos5
new file mode 100644
index 00000000000..2b4a71a6225
--- /dev/null
+++ b/sysutils/top/files/defaults.sunos5
@@ -0,0 +1,19 @@
+set module = 'sunos5'
+set LoadMax = '5.0'
+set topn = '-1'
+set NominalTopn = '18'
+set delay = '2'
+set owner = 'root'
+set group = 'sys'
+set mode = '2755'
+set random = '1'
+set TableSize = '47'
+set bindir = '$(PREFIX)/bin'
+set mandir = '$(PREFIX)/man/man1'
+set manext = '1'
+set mansty = 'man'
+set Cmdshell = '/bin/sh'
+set Cmdcc = 'cc'
+set Cmdawk = 'nawk'
+set Cmdinstall = '/usr/ucb/install'
+set cdefs = '-DHAVE_GETOPT -O'
diff --git a/sysutils/top/patches/patch-ac b/sysutils/top/patches/patch-ac
index 42f16aecc9b..d016249993e 100644
--- a/sysutils/top/patches/patch-ac
+++ b/sysutils/top/patches/patch-ac
@@ -1,7 +1,10 @@
-$NetBSD: patch-ac,v 1.4 1999/02/10 15:20:06 frueauf Exp $
+$NetBSD: patch-ac,v 1.5 1999/03/17 10:47:42 agc Exp $
 
---- Makefile.X.orig	Wed Nov 20 03:19:24 1996
-+++ Makefile.X	Fri Feb 20 08:11:35 1998
+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%
  
diff --git a/sysutils/top/pkg/DESCR b/sysutils/top/pkg/DESCR
index 1c5a4e180a7..276e9cf8e4e 100644
--- a/sysutils/top/pkg/DESCR
+++ b/sysutils/top/pkg/DESCR
@@ -1,5 +1,5 @@
                              TOP
-                         Version 3.5beta6
+                         Version 3.5beta7
 
                        William LeFebvre
 		     and a cast of dozens
@@ -12,4 +12,4 @@ as portable as possible.
 
 Luke Mewburn <lukem@connect.com.au> is responsible for the NetBSD 1.2G
 machine module, with a further modification to that by
-christos@deshaw.com (Christos Zoulas).
+christos@netbsd.org (Christos Zoulas).
-- 
cgit v1.2.3