- s/INSTALL_MAN/BSD_INSTALL_MAN/ in patch-ac, remove unnecessary MAKE_ENV.

- restore Id in patch-ab and remove dollar signs around it

4 files changed, 9 insertions, 10 deletions

diff --git a/sysutils/top/Makefile b/sysutils/top/Makefile
index 4a37305b1f0..443247cef09 100644
--- a/sysutils/top/Makefile
+++ b/sysutils/top/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2002/12/07 02:39:05 schmonz Exp $
+# $NetBSD: Makefile,v 1.26 2003/01/19 09:39:06 salo Exp $
 # FreeBSD Id: Makefile,v 1.14 1997/04/30 23:49:14 asami Exp
 #
 
@@ -29,8 +29,7 @@ CONFIGURE_ARGS+=	${CONF}
 PKG_SKIP_REASON=	"${PKGNAME} is part of your ${OPSYS} distribution"
 .endif
 
-MAKE_ENV+=	INSTALL_MAN="${INSTALL_MAN}" \
-		COPY="${COPY}" STRIPFLAG="${_STRIPFLAG_INSTALL}"
+MAKE_ENV+=	COPY="${COPY}" STRIPFLAG="${_STRIPFLAG_INSTALL}"
 
 pre-configure:
 	${CP} ${FILESDIR}/defaults.${CONF} ${WRKSRC}/.defaults
diff --git a/sysutils/top/distinfo b/sysutils/top/distinfo
index 5fe1a2a4107..d9987a1daa9 100644
--- a/sysutils/top/distinfo
+++ b/sysutils/top/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 11:29:09 agc Exp $
+$NetBSD: distinfo,v 1.3 2003/01/19 09:39:06 salo Exp $
 
 SHA1 (top-3.5beta9.tar.gz) = e8766e316f5199cb32bc0ea8e95a4d3e3713c0cc
 Size (top-3.5beta9.tar.gz) = 234762 bytes
 SHA1 (patch-aa) = 53e906a829188247f66f29a341c9d9a82ca9f12f
-SHA1 (patch-ab) = 33d998f5e9e6f75d5a48cc659b4e59fa352af802
-SHA1 (patch-ac) = b9b4ec6857063f3c4b66b8b917c89a2aab71166c
+SHA1 (patch-ab) = 61b2c944eeef35cca65e799817d15daddc6a1e76
+SHA1 (patch-ac) = 0c15733aec3580e7899f6f3f780e1532dae6824a
 SHA1 (patch-ae) = 457a49f2d8aa9f81e15947a100fb83f52ff16f30
 SHA1 (patch-af) = 50242c5c0fbf57ba2b404299d13881a4ec6ba206
 SHA1 (patch-ag) = 5844930d052539e3a99f48edab098ad5f50b9e92
diff --git a/sysutils/top/patches/patch-ab b/sysutils/top/patches/patch-ab
index 4e03a990022..b67b972dd43 100644
--- a/sysutils/top/patches/patch-ab
+++ b/sysutils/top/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.10 2000/12/08 15:35:24 wiz Exp $
+$NetBSD: patch-ab,v 1.11 2003/01/19 09:39:06 salo Exp $
 
 --- ./machine/m_netbsd13.c.orig	Sat Feb 19 03:24:47 2000
 +++ ./machine/m_netbsd13.c	Sat Feb 19 03:31:13 2000
@@ -31,7 +31,7 @@ $NetBSD: patch-ab,v 1.10 2000/12/08 15:35:24 wiz Exp $
 + *		matthew green <mrg@eterna.com.au>
 + *
 + *
-+ * $Id: patch-ab,v 1.10 2000/12/08 15:35:24 wiz Exp $
++ * Id: machine.c,v 1.5 1995/01/06 02:04:39 swallace Exp
 + */
 +
 +#include <sys/types.h>
diff --git a/sysutils/top/patches/patch-ac b/sysutils/top/patches/patch-ac
index 437deaaf447..b02a5512d60 100644
--- a/sysutils/top/patches/patch-ac
+++ b/sysutils/top/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.6 2000/02/19 02:40:35 wiz Exp $
+$NetBSD: patch-ac,v 1.7 2003/01/19 09:39:06 salo Exp $
 
 --- ./Makefile.X.orig	Wed Nov 20 03:19:24 1996
 +++ ./Makefile.X	Sat Feb 19 03:34:17 2000
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.6 2000/02/19 02:40:35 wiz Exp $
  
  install-man:
 -	$(INSTALL) top.1 $(MANDIR)/top.$(MANEXT)
-+	${INSTALL_MAN} top.1 $(MANDIR)/top.$(MANEXT)
++	${BSD_INSTALL_MAN} top.1 $(MANDIR)/top.$(MANEXT)
  
  install-catman:
  	tbl top.1 | nroff -man > $(MANDIR)/top.$(MANEXT)