CATEGORIES+= --> CATEGORIES=

Misc variable reordering, cleaning up, etc.

36 files changed, 88 insertions, 90 deletions

diff --git a/misc/amanda-client/Makefile b/misc/amanda-client/Makefile
index bab9551cd03f..11faa11b84e6 100644
--- a/misc/amanda-client/Makefile
+++ b/misc/amanda-client/Makefile
@@ -3,11 +3,11 @@
 # Date created:				28th Feb 1995
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.3 1995/04/15 03:45:27 asami Exp $
+# $Id: Makefile,v 1.5 1996/03/25 10:56:38 asami Exp $
 #
 
 DISTNAME=	amanda-2.2.6.5
-CATEGORIES+=	misc
+CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.cs.umd.edu/pub/amanda/contrib/wpi-patches/
 
 MAINTAINER=	gpalmer@FreeBSD.ORG
diff --git a/misc/amanda-server/Makefile b/misc/amanda-server/Makefile
index bab9551cd03f..11faa11b84e6 100644
--- a/misc/amanda-server/Makefile
+++ b/misc/amanda-server/Makefile
@@ -3,11 +3,11 @@
 # Date created:				28th Feb 1995
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.3 1995/04/15 03:45:27 asami Exp $
+# $Id: Makefile,v 1.5 1996/03/25 10:56:38 asami Exp $
 #
 
 DISTNAME=	amanda-2.2.6.5
-CATEGORIES+=	misc
+CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.cs.umd.edu/pub/amanda/contrib/wpi-patches/
 
 MAINTAINER=	gpalmer@FreeBSD.ORG
diff --git a/misc/amanda/Makefile b/misc/amanda/Makefile
index bab9551cd03f..11faa11b84e6 100644
--- a/misc/amanda/Makefile
+++ b/misc/amanda/Makefile
@@ -3,11 +3,11 @@
 # Date created:				28th Feb 1995
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.3 1995/04/15 03:45:27 asami Exp $
+# $Id: Makefile,v 1.5 1996/03/25 10:56:38 asami Exp $
 #
 
 DISTNAME=	amanda-2.2.6.5
-CATEGORIES+=	misc
+CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.cs.umd.edu/pub/amanda/contrib/wpi-patches/
 
 MAINTAINER=	gpalmer@FreeBSD.ORG
diff --git a/misc/amanda24-client/Makefile b/misc/amanda24-client/Makefile
index bab9551cd03f..11faa11b84e6 100644
--- a/misc/amanda24-client/Makefile
+++ b/misc/amanda24-client/Makefile
@@ -3,11 +3,11 @@
 # Date created:				28th Feb 1995
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.3 1995/04/15 03:45:27 asami Exp $
+# $Id: Makefile,v 1.5 1996/03/25 10:56:38 asami Exp $
 #
 
 DISTNAME=	amanda-2.2.6.5
-CATEGORIES+=	misc
+CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.cs.umd.edu/pub/amanda/contrib/wpi-patches/
 
 MAINTAINER=	gpalmer@FreeBSD.ORG
diff --git a/misc/amanda24-server/Makefile b/misc/amanda24-server/Makefile
index bab9551cd03f..11faa11b84e6 100644
--- a/misc/amanda24-server/Makefile
+++ b/misc/amanda24-server/Makefile
@@ -3,11 +3,11 @@
 # Date created:				28th Feb 1995
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.3 1995/04/15 03:45:27 asami Exp $
+# $Id: Makefile,v 1.5 1996/03/25 10:56:38 asami Exp $
 #
 
 DISTNAME=	amanda-2.2.6.5
-CATEGORIES+=	misc
+CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.cs.umd.edu/pub/amanda/contrib/wpi-patches/
 
 MAINTAINER=	gpalmer@FreeBSD.ORG
diff --git a/misc/amanda24/Makefile b/misc/amanda24/Makefile
index bab9551cd03f..11faa11b84e6 100644
--- a/misc/amanda24/Makefile
+++ b/misc/amanda24/Makefile
@@ -3,11 +3,11 @@
 # Date created:				28th Feb 1995
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.3 1995/04/15 03:45:27 asami Exp $
+# $Id: Makefile,v 1.5 1996/03/25 10:56:38 asami Exp $
 #
 
 DISTNAME=	amanda-2.2.6.5
-CATEGORIES+=	misc
+CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.cs.umd.edu/pub/amanda/contrib/wpi-patches/
 
 MAINTAINER=	gpalmer@FreeBSD.ORG
diff --git a/misc/amanda25-client/Makefile b/misc/amanda25-client/Makefile
index bab9551cd03f..11faa11b84e6 100644
--- a/misc/amanda25-client/Makefile
+++ b/misc/amanda25-client/Makefile
@@ -3,11 +3,11 @@
 # Date created:				28th Feb 1995
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.3 1995/04/15 03:45:27 asami Exp $
+# $Id: Makefile,v 1.5 1996/03/25 10:56:38 asami Exp $
 #
 
 DISTNAME=	amanda-2.2.6.5
-CATEGORIES+=	misc
+CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.cs.umd.edu/pub/amanda/contrib/wpi-patches/
 
 MAINTAINER=	gpalmer@FreeBSD.ORG
diff --git a/misc/amanda25-server/Makefile b/misc/amanda25-server/Makefile
index bab9551cd03f..11faa11b84e6 100644
--- a/misc/amanda25-server/Makefile
+++ b/misc/amanda25-server/Makefile
@@ -3,11 +3,11 @@
 # Date created:				28th Feb 1995
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.3 1995/04/15 03:45:27 asami Exp $
+# $Id: Makefile,v 1.5 1996/03/25 10:56:38 asami Exp $
 #
 
 DISTNAME=	amanda-2.2.6.5
-CATEGORIES+=	misc
+CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.cs.umd.edu/pub/amanda/contrib/wpi-patches/
 
 MAINTAINER=	gpalmer@FreeBSD.ORG
diff --git a/misc/amanda26-client/Makefile b/misc/amanda26-client/Makefile
index bab9551cd03f..11faa11b84e6 100644
--- a/misc/amanda26-client/Makefile
+++ b/misc/amanda26-client/Makefile
@@ -3,11 +3,11 @@
 # Date created:				28th Feb 1995
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.3 1995/04/15 03:45:27 asami Exp $
+# $Id: Makefile,v 1.5 1996/03/25 10:56:38 asami Exp $
 #
 
 DISTNAME=	amanda-2.2.6.5
-CATEGORIES+=	misc
+CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.cs.umd.edu/pub/amanda/contrib/wpi-patches/
 
 MAINTAINER=	gpalmer@FreeBSD.ORG
diff --git a/misc/amanda26-server/Makefile b/misc/amanda26-server/Makefile
index bab9551cd03f..11faa11b84e6 100644
--- a/misc/amanda26-server/Makefile
+++ b/misc/amanda26-server/Makefile
@@ -3,11 +3,11 @@
 # Date created:				28th Feb 1995
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.3 1995/04/15 03:45:27 asami Exp $
+# $Id: Makefile,v 1.5 1996/03/25 10:56:38 asami Exp $
 #
 
 DISTNAME=	amanda-2.2.6.5
-CATEGORIES+=	misc
+CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.cs.umd.edu/pub/amanda/contrib/wpi-patches/
 
 MAINTAINER=	gpalmer@FreeBSD.ORG
diff --git a/misc/amanda32-client/Makefile b/misc/amanda32-client/Makefile
index bab9551cd03f..11faa11b84e6 100644
--- a/misc/amanda32-client/Makefile
+++ b/misc/amanda32-client/Makefile
@@ -3,11 +3,11 @@
 # Date created:				28th Feb 1995
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.3 1995/04/15 03:45:27 asami Exp $
+# $Id: Makefile,v 1.5 1996/03/25 10:56:38 asami Exp $
 #
 
 DISTNAME=	amanda-2.2.6.5
-CATEGORIES+=	misc
+CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.cs.umd.edu/pub/amanda/contrib/wpi-patches/
 
 MAINTAINER=	gpalmer@FreeBSD.ORG
diff --git a/misc/amanda32-server/Makefile b/misc/amanda32-server/Makefile
index bab9551cd03f..11faa11b84e6 100644
--- a/misc/amanda32-server/Makefile
+++ b/misc/amanda32-server/Makefile
@@ -3,11 +3,11 @@
 # Date created:				28th Feb 1995
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.3 1995/04/15 03:45:27 asami Exp $
+# $Id: Makefile,v 1.5 1996/03/25 10:56:38 asami Exp $
 #
 
 DISTNAME=	amanda-2.2.6.5
-CATEGORIES+=	misc
+CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.cs.umd.edu/pub/amanda/contrib/wpi-patches/
 
 MAINTAINER=	gpalmer@FreeBSD.ORG
diff --git a/misc/astrolog/Makefile b/misc/astrolog/Makefile
index 8dc118591903..41994a46e958 100644
--- a/misc/astrolog/Makefile
+++ b/misc/astrolog/Makefile
@@ -7,21 +7,22 @@
 # Date created:         31 July 1995
 # Whom:                 faulkner@cactus.org
 #
-# $Id: Makefile,v 1.2 1996/01/16 02:45:29 asami Exp $
+# $Id: Makefile,v 1.4 1996/07/14 07:28:54 ache Exp $
 #
 
 DISTNAME=       astrolog-5.20
-DIST_SUBDIR=    astrolog
-EPHEM=          lrz5_24 chi_24 cpjv_24
-CATEGORIES+=    misc x11
+CATEGORIES=     misc x11
 MASTER_SITES=   http://www-rpk.mach.uni-karlsruhe.de/~ferber/astrolog/ \
 		ftp://ftp.relcom.ru/unix/magick/astrology/astrolog/
-EXTRACT_ONLY=   ${DISTNAME}${EXTRACT_SUFX}
 DISTFILES=      ${EXTRACT_ONLY} ${EPHEM:S/$/.gz/}
+EXTRACT_ONLY=   ${DISTNAME}${EXTRACT_SUFX}
 
+MAINTAINER=     ache@FreeBSD.ORG
+
+DIST_SUBDIR=    astrolog
 WRKSRC=         ${WRKDIR}/${DISTNAME}/src
 
-MAINTAINER=     ache@FreeBSD.ORG
+EPHEM=          lrz5_24 chi_24 cpjv_24
 
 post-extract:
 	cd ${WRKSRC}/..; \
diff --git a/misc/buffer/Makefile b/misc/buffer/Makefile
index 947153159e5c..923d94cdbc02 100644
--- a/misc/buffer/Makefile
+++ b/misc/buffer/Makefile
@@ -3,11 +3,11 @@
 # Date created:         17 Nov 1995
 # Whom:                 markm
 #
-# $Id: Makefile,v 1.3 1995/11/20 13:43:45 asami Exp $
+# $Id: Makefile,v 1.4 1995/11/26 10:47:25 asami Exp $
 #
 
 DISTNAME=       buffer-1.17
-CATEGORIES+=	misc
+CATEGORIES=	misc
 MASTER_SITES=   ftp://ftp.sun.ac.za/pub/unix/misc/
 
 MAINTAINER=	markm@FreeBSD.ORG
diff --git a/misc/chord/Makefile b/misc/chord/Makefile
index 5656718929a0..d6cebdb6dda9 100644
--- a/misc/chord/Makefile
+++ b/misc/chord/Makefile
@@ -3,12 +3,12 @@
 # Date created:		24 April 1995
 # Whom:			Satoshi Asami
 #
-# $Id: Makefile,v 1.1.1.1 1995/04/25 07:29:35 asami Exp $
+# $Id: Makefile,v 1.2 1995/11/26 10:47:29 asami Exp $
 #
 
 DISTNAME=	chord
 PKGNAME=	chord-3.6
-CATEGORIES+=	misc
+CATEGORIES=	misc
 MASTER_SITES=	ftp://freebsd.org/pub/FreeBSD/LOCAL_PORTS/
 
 MAINTAINER=	asami@FreeBSD.ORG
diff --git a/misc/colorls/Makefile b/misc/colorls/Makefile
index 60db61a438d1..f8d80db5a427 100644
--- a/misc/colorls/Makefile
+++ b/misc/colorls/Makefile
@@ -3,12 +3,12 @@
 # Date created:		8 March 1995
 # Whom:			Satoshi Asami
 #
-# $Id: Makefile,v 1.8 1995/11/26 10:47:32 asami Exp $
+# $Id: Makefile,v 1.9 1996/03/06 23:08:43 asami Exp $
 #
 
 DISTNAME=	colorls
 PKGNAME=	colorls-2.1
-CATEGORIES+=	misc
+CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.freebsd.org/pub/FreeBSD/FreeBSD-current/src/bin/
 DISTFILES=	ls.tar.gz
 
@@ -17,6 +17,6 @@ MAINTAINER=	asami@FreeBSD.ORG
 WRKSRC=		${WRKDIR}/ls
 
 pre-patch:
-	cp ${WRKSRC}/ls.1 ${WRKSRC}/colorls.1
+	${CP} ${WRKSRC}/ls.1 ${WRKSRC}/colorls.1
 
 .include <bsd.port.mk>
diff --git a/misc/dejagnu/Makefile b/misc/dejagnu/Makefile
index 4180c997bc0f..b133d7cbff5a 100644
--- a/misc/dejagnu/Makefile
+++ b/misc/dejagnu/Makefile
@@ -3,11 +3,11 @@
 # Date created:		12 October 1996
 # Whom:			markm
 #
-# $Id: Makefile,v 1.1.1.1 1996/10/31 19:53:40 markm Exp $
+# $Id: Makefile,v 1.2 1996/11/01 06:10:22 markm Exp $
 #
 
 DISTNAME=	dejagnu-1.3
-CATEGORIES+=	misc
+CATEGORIES=	misc
 MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
 
 MAINTAINER=	markm@FreeBSD.ORG
diff --git a/misc/fd/Makefile b/misc/fd/Makefile
index 8372d7d64ddb..4467893744f6 100644
--- a/misc/fd/Makefile
+++ b/misc/fd/Makefile
@@ -3,12 +3,12 @@
 # Date created:         20 Feb 1996
 # Whom:                 Nobuhiro Yasutomi <nobu@psrc.isac.co.jp>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1996/03/20 07:53:43 asami Exp $
 #
 
 DISTNAME=       FD-1.01
 PKGNAME=        fd-1.01
-CATEGORIES+=	misc
+CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.mei.co.jp/free/others/Utilities/
 
 MAINTAINER=	nobu@psrc.isac.co.jp
diff --git a/misc/fep/Makefile b/misc/fep/Makefile
index e7e4a1789e29..fd07d5414497 100644
--- a/misc/fep/Makefile
+++ b/misc/fep/Makefile
@@ -3,12 +3,12 @@
 # Date created:         20 Feb 1996
 # Whom:                 Nobuhiro Yasutomi <nobu@psrc.isac.co.jp>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1996/03/18 11:56:34 asami Exp $
 #
 
 DISTNAME=	fep
 PKGNAME=	fep-1.0
-CATEGORIES+=	misc
+CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.sra.co.jp/pub/cmd/
 
 MAINTAINER=	nobu@psrc.isac.co.jp
diff --git a/misc/figlet/Makefile b/misc/figlet/Makefile
index 326a1604ba2f..5fdd82f04a39 100644
--- a/misc/figlet/Makefile
+++ b/misc/figlet/Makefile
@@ -3,12 +3,12 @@
 # Date created:         Sat July 20, 1996
 # Whom:                 David O'Brien (obrien@cs.ucdavis.edu)
 #
-# $Id: Makefile,v 1.1.1.1 1996/08/09 04:17:16 asami Exp $
+# $Id: Makefile,v 1.2 1996/11/03 06:56:33 obrien Exp $
 #
 
 DISTNAME=	figlet2.1.1
 PKGNAME=	figlet-2.1.1
-CATEGORIES+=	misc
+CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.nicoh.com/pub/figlet/program/unix/  \
 		ftp://ftp.wwa.com/pub/Scarecrow/Figlet/Unix/
 EXTRACT_SUFX=	.tar.Z
diff --git a/misc/git/Makefile b/misc/git/Makefile
index 4d96fb149736..f0f06370d6fc 100644
--- a/misc/git/Makefile
+++ b/misc/git/Makefile
@@ -3,7 +3,7 @@
 # Date created:		12 Jul 1995
 # Whom:			torstenb@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.3 1996/06/17 08:33:34 asami Exp $
+# $Id: Makefile,v 1.4 1996/10/16 09:14:08 asami Exp $
 #
 
 DISTNAME=	git-4.3.11
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
 GNU_CONFIGURE=	YES
 
 pre-install:
-	cp ${WRKSRC}/term/.gitrc.ansi \
+	${CP} ${WRKSRC}/term/.gitrc.ansi \
 		${WRKSRC}/term/.gitrc.cons25
 	(cd ${WRKSRC}/term ; patch --quiet -p0 <${FILESDIR}/gitrc.cons25.patch )
 
diff --git a/misc/gnuit/Makefile b/misc/gnuit/Makefile
index 4d96fb149736..f0f06370d6fc 100644
--- a/misc/gnuit/Makefile
+++ b/misc/gnuit/Makefile
@@ -3,7 +3,7 @@
 # Date created:		12 Jul 1995
 # Whom:			torstenb@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.3 1996/06/17 08:33:34 asami Exp $
+# $Id: Makefile,v 1.4 1996/10/16 09:14:08 asami Exp $
 #
 
 DISTNAME=	git-4.3.11
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
 GNU_CONFIGURE=	YES
 
 pre-install:
-	cp ${WRKSRC}/term/.gitrc.ansi \
+	${CP} ${WRKSRC}/term/.gitrc.ansi \
 		${WRKSRC}/term/.gitrc.cons25
 	(cd ${WRKSRC}/term ; patch --quiet -p0 <${FILESDIR}/gitrc.cons25.patch )
 
diff --git a/misc/gnuls/Makefile b/misc/gnuls/Makefile
index 8bddb5e54865..b7491fbd6958 100644
--- a/misc/gnuls/Makefile
+++ b/misc/gnuls/Makefile
@@ -3,22 +3,22 @@
 # Date created:				06 January 1996
 # Whom:					bmc@WillsCreek.COM
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1996/01/15 10:37:17 asami Exp $
 #
 
 DISTNAME=	fileutils-3.12
 PKGNAME=	linuxls-3.12.0.2
-CATEGORIES+=	misc
+CATEGORIES=	misc
 MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/ \
 		ftp://ftp.cdrom.com/pub/linux/slackware_source/a/bin/
 
 PATCHFILES=	color-ls-3.12.0.2.patch.gz
 PATCH_SITES=	ftp://sunsite.unc.edu/pub/Linux/distributions/slackware/source/a/bin/ \
 		ftp://ftp.cdrom.com/pub/linux/slackware_source/a/bin/
-PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	bmc@WillsCreek.COM
 
+PATCH_DIST_STRIP=	-p1
 GNU_CONFIGURE=	yes
 
 post-install:
diff --git a/misc/kp/Makefile b/misc/kp/Makefile
index aa3025d0612f..2bebc5916bd6 100644
--- a/misc/kp/Makefile
+++ b/misc/kp/Makefile
@@ -3,11 +3,11 @@
 # Date created:         8 May 1995
 # Whom:                 asami
 #
-# $Id: Makefile,v 1.4 1996/03/21 12:50:15 asami Exp $
+# $Id: Makefile,v 1.5 1996/10/16 08:55:30 asami Exp $
 #
 
 DISTNAME=       kp-0.96
-CATEGORIES+=	misc
+CATEGORIES=	misc
 MASTER_SITES=   ftp://stampede.cs.berkeley.edu/pub/kp/
 
 MAINTAINER=	asami@FreeBSD.org
diff --git a/misc/less/Makefile b/misc/less/Makefile
index 95dcf25a0791..2cd6dddd8306 100644
--- a/misc/less/Makefile
+++ b/misc/less/Makefile
@@ -3,11 +3,11 @@
 # Date created:         8 Nov 1994
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.10 1996/05/13 16:17:58 markm Exp $
+# $Id: Makefile,v 1.11 1996/07/26 04:25:29 ache Exp $
 #
 
 DISTNAME=       less-321
-CATEGORIES+=	misc
+CATEGORIES=	misc
 MASTER_SITES=   ftp://prep.ai.mit.edu/pub/gnu/ ftp://ftp.uu.net/systems/gnu/
 
 MAINTAINER=	ache@FreeBSD.ORG
diff --git a/misc/mc/Makefile b/misc/mc/Makefile
index 253b4808434c..0b0c10875bd9 100644
--- a/misc/mc/Makefile
+++ b/misc/mc/Makefile
@@ -3,16 +3,17 @@
 # Date created:		15 Jul 1995
 # Whom:			torstenb@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.5 1996/10/20 15:22:09 max Exp $
+# $Id: Makefile,v 1.6 1996/10/20 19:23:42 max Exp $
 #
 
 DISTNAME=	mc-3.2.1
 CATEGORIES=	misc
 MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
 
+MAINTAINER=	torstenb@FreeBSD.ORG
+
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS=	--with-ncurses
-
 STRIP=
 
 post-install:
diff --git a/misc/mmv/Makefile b/misc/mmv/Makefile
index 2433ba935583..08eac9081572 100644
--- a/misc/mmv/Makefile
+++ b/misc/mmv/Makefile
@@ -3,13 +3,12 @@
 # Date created:		2 Feb 1995
 # Whom:			Michael Elbel (me)
 #
-# $Id: Makefile,v 1.10 1996/04/12 08:38:33 asami Exp $
+# $Id: Makefile,v 1.11 1996/06/26 22:33:17 gpalmer Exp $
 #
 
-
 DISTNAME=	mmv
 PKGNAME=	mmv-1.01b
-CATEGORIES+=	misc
+CATEGORIES=	misc
 MASTER_SITES=	ftp://gatekeeper.dec.com/pub/usenet/comp.sources.unix/
 DISTFILES=	part01.Z part02.Z mmv.pch.Z
 
@@ -47,10 +46,10 @@ pre-extract:
 	chmod +x scripts/unshar scripts/makeitapatch
 
 do-extract:
-	@rm -rf ${WRKDIR}
-	@mkdir -p ${WRKDIR}/tmp
+	@${RM} -rf ${WRKDIR}
+	@${MKDIR} ${WRKDIR}/tmp
 	@(cd ${DISTDIR} ; for file in ${DISTFILES}; do \
-		cp $$file ${WRKDIR}/tmp; \
+		${CP} $$file ${WRKDIR}/tmp; \
 	 done ; \
 	 cd ${WRKDIR}/tmp; \
 	 uncompress *; \
@@ -60,21 +59,19 @@ do-extract:
 	 done ; \
 	 ${SCRIPTDIR}/makeitapatch tmp/mmv.pch ; \
 	 mv tmp/mmv.pch ${PATCHDIR}/patch-0a ; \
-	 cat mmv.c.? >mmv.c ; rm mmv.c.? )
+	 ${CAT} mmv.c.? >mmv.c ; rm mmv.c.? )
 
 
 do-install:
 	(cd ${PREFIX}/bin ; rm -f mmv mad mcp mln ; \
 	 cd ${WRKSRC}; \
-	 install ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-	  mmv ${PREFIX}/bin ; \
+	 ${INSTALL_PROGRAM} mmv ${PREFIX}/bin ; \
 	 ln ${PREFIX}/bin/mmv ${PREFIX}/bin/mad ; \
 	 ln ${PREFIX}/bin/mmv ${PREFIX}/bin/mcp ; \
 	 ln ${PREFIX}/bin/mmv ${PREFIX}/bin/mln ; \
 	 if [ ! -f mmv.1.gz ] ; then gzip mmv.1 ; fi ; \
-	 if [ ! -d ${PREFIX}/man/man1 ]; then mkdir -p ${PREFIX}/man/man1; fi; \
-	 install ${COPY} -o ${BINOWN} -g ${BINGRP} \
-	  mmv.1.gz ${PREFIX}/man/man1 ; )
+	 if [ ! -d ${PREFIX}/man/man1 ]; then ${MKDIR} ${PREFIX}/man/man1; fi; \
+	 ${INSTALL_MAN} mmv.1.gz ${PREFIX}/man/man1 ; )
 
 pre-clean:
 	@rm -f ${PATCHDIR}/patch-0a	# created by do-extract above
diff --git a/misc/mshell/Makefile b/misc/mshell/Makefile
index 8c1fba2efccc..eb649ff65dd5 100644
--- a/misc/mshell/Makefile
+++ b/misc/mshell/Makefile
@@ -3,12 +3,12 @@
 # Date created:         24 September 1994
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.6 1995/04/23 13:02:33 asami Exp $
+# $Id: Makefile,v 1.7 1995/11/26 10:48:04 asami Exp $
 #
 
 DISTNAME=	mshell
 PKGNAME=	mshell-1.0
-CATEGORIES+=	misc
+CATEGORIES=	misc
 MASTER_SITES=	ftp://src.doc.ic.ac.uk/usenet/alt.sources/articles/07000-07999/
 DISTFILES=	7432.Z
 
@@ -18,7 +18,7 @@ NO_WRKSUBDIR=	yes
 
 do-extract:
 	@rm -rf ${WRKDIR}
-	@mkdir -p ${WRKDIR}
+	@${MKDIR} ${WRKDIR}
 	zcat ${DISTDIR}/${DISTFILES} |(cd ${WRKDIR}; \
 	awk '{if (/^#!/) x++} {if(x) print $$0'}| /bin/sh)
 
diff --git a/misc/p5-Array-PrintCols/Makefile b/misc/p5-Array-PrintCols/Makefile
index 7e07e1d551c3..ad44816706ff 100644
--- a/misc/p5-Array-PrintCols/Makefile
+++ b/misc/p5-Array-PrintCols/Makefile
@@ -3,12 +3,12 @@
 # Date created:				October 17th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.1.1.1 1996/10/24 08:21:50 jfitz Exp $
+#   $Id: Makefile,v 1.2 1996/10/24 09:57:40 jfitz Exp $
 #
 
 DISTNAME=	Array-PrintCols-1.2
 PKGNAME=	p5-Array-PrintCols-1.2
-CATEGORIES+=	misc
+CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.digital.com/pub/plan/perl/CPAN/modules/by-module/Array/ \
 		ftp://ftp.cdrom.com/pub/perl/CPAN/modules/by-module/Array/ \
 		ftp://ftp.cis.ufl.edu/pub/perl/CPAN/modules/by-module/Array/ \
diff --git a/misc/p5-Business-CreditCard/Makefile b/misc/p5-Business-CreditCard/Makefile
index e2c8fcd0d595..ab7045066a00 100644
--- a/misc/p5-Business-CreditCard/Makefile
+++ b/misc/p5-Business-CreditCard/Makefile
@@ -3,12 +3,12 @@
 # Date created:				October 20th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.1.1.1 1996/10/24 08:23:42 jfitz Exp $
+#   $Id: Makefile,v 1.2 1996/10/24 09:57:50 jfitz Exp $
 #
 
 DISTNAME=	Business-CreditCard-0.1
 PKGNAME=	p5-Business-CreditCard-0.1
-CATEGORIES+=	misc
+CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.digital.com/pub/plan/perl/CPAN/modules/by-module/Business/ \
 		ftp://ftp.cdrom.com/pub/perl/CPAN/modules/by-module/Business/ \
 		ftp://ftp.cis.ufl.edu/pub/perl/CPAN/modules/by-module/Business/ \
diff --git a/misc/screen/Makefile b/misc/screen/Makefile
index fd05f4737815..c1bf5c42939b 100644
--- a/misc/screen/Makefile
+++ b/misc/screen/Makefile
@@ -3,11 +3,11 @@
 # Date created:         25 Nov 1994
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.11 1995/11/26 10:48:23 asami Exp $
+# $Id: Makefile,v 1.12 1995/12/18 07:33:27 ache Exp $
 #
 
 DISTNAME=       screen-3.7.1
-CATEGORIES+=	misc
+CATEGORIES=	misc
 MASTER_SITES=   ftp://ftp.uni-erlangen.de/pub/utilities/screen/
 
 MAINTAINER=	ache@FreeBSD.ORG
diff --git a/misc/splitvt/Makefile b/misc/splitvt/Makefile
index bd27511f4781..0bd7de4bb342 100644
--- a/misc/splitvt/Makefile
+++ b/misc/splitvt/Makefile
@@ -3,11 +3,11 @@
 # Date created:         Fri Oct 4, 1996
 # Whom:                 David O'Brien (obrien@cs.ucdavis.edu)
 #
-# $Id: Makefile,v 1.5 1995/04/24 03:38:04 asami Exp $
+# $Id: Makefile,v 1.1.1.1 1996/11/03 08:42:02 obrien Exp $
 #
 
 DISTNAME=	splitvt-1.6.1
-CATEGORIES+=	misc
+CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.cc.gatech.edu/pub/linux/utils/console/  \
 		ftp://sunsite.unc.edu/pub/Linux/utils/console/  \
 		ftp://ftp.funet.fi/pub/Linux/sunsite/utils/console/  \
diff --git a/misc/team/Makefile b/misc/team/Makefile
index b87ccd70b7e6..d7c33335b4bf 100644
--- a/misc/team/Makefile
+++ b/misc/team/Makefile
@@ -3,11 +3,11 @@
 # Date created:		1 July 1995
 # Whom:			joerg
 #
-# $Id: Makefile,v 1.3 1995/11/26 10:48:29 asami Exp $
+# $Id: Makefile,v 1.4 1996/06/03 02:17:28 asami Exp $
 #
 
 DISTNAME=	team-3.1
-CATEGORIES+=	misc
+CATEGORIES=	misc
 MASTER_SITES=	ftp://freefall.freebsd.org/pub/FreeBSD/LOCAL_PORTS/
 
 MAINTAINER=	joerg@FreeBSD.org
diff --git a/misc/tkinfo/Makefile b/misc/tkinfo/Makefile
index c1fc8c60d6a3..d23d2974a7db 100644
--- a/misc/tkinfo/Makefile
+++ b/misc/tkinfo/Makefile
@@ -3,11 +3,11 @@
 # Date created:         16 Jan 1995
 # Whom:                 thomas@ghpc8.ihf.rwth-aachen.de
 #
-# $Id: Makefile,v 1.7 1996/06/05 09:08:22 tg Exp $
+# $Id: Makefile,v 1.8 1996/09/27 07:19:26 tg Exp $
 #
 
 DISTNAME=	tkinfo-0.6
-CATEGORIES+=	misc
+CATEGORIES=	misc
 MASTER_SITES=	ftp://ptolemy.eecs.berkeley.edu/pub/misc/
 
 MAINTAINER=	tg@freebsd.org
diff --git a/misc/tkman/Makefile b/misc/tkman/Makefile
index efa5739f713d..4c84603d3138 100644
--- a/misc/tkman/Makefile
+++ b/misc/tkman/Makefile
@@ -3,11 +3,11 @@
 # Date created:         27 Dec 1994
 # Whom:                 thomas@ghpc8.ihf.rwth-aachen.de
 #
-# $Id: Makefile,v 1.16 1996/06/15 06:24:23 asami Exp $
+# $Id: Makefile,v 1.17 1996/10/21 06:46:52 tg Exp $
 #
 
 DISTNAME=	tkman-1.8b5
-CATEGORIES+=	misc
+CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.cs.berkeley.edu/ucb/people/phelps/tcltk/
 EXTRACT_SUFX=	.tar.Z
 
diff --git a/misc/unclutter/Makefile b/misc/unclutter/Makefile
index e7468ecbb05c..6beb8929169b 100644
--- a/misc/unclutter/Makefile
+++ b/misc/unclutter/Makefile
@@ -3,18 +3,17 @@
 # Date created:		03 Aug 1996
 # Whom:			shanee@rabbit.augusta.de
 #
-# $Id: Makefile,v 1.1.1.1 1996/08/24 03:44:09 chuckr Exp $
+# $Id: Makefile,v 1.2 1996/08/24 17:02:29 chuckr Exp $
 #
 
 DISTNAME=	unclutter-8
+CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.cs.umn.edu/packages/X11/contrib/utilities/ \
 		ftp://csg.uwaterloo.ca/pub/lhf/net/ \
 		ftp://ftp.univ-angers.fr/pub2/X11/contrib/utilities/ \
 		ftp://ftp.huji.ac.il/mirror/X11/contrib/utilities/ \
 		ftp://ftp.rz.uni-wuerzburg.de/pub/X11/contrib/utilities/
 
-CATEGORIES+=	misc
-
 MAINTAINER=	shanee@rabbit.augusta.de
 
 WRKSRC=		$(WRKDIR)/unclutter