CATAGORIES+= -> CATAGORIES=

Reordered vars where needed. Added MAINTAINERS where needed, many mkdir --> ${MKDIR}, install -> ${INSTALL_*}, etc.
author: David E. O'Brien <obrien@FreeBSD.org> 1996-11-12 02:19:40 +0000
committer: David E. O'Brien <obrien@FreeBSD.org> 1996-11-12 02:19:40 +0000
commit: d23a79568090d280bf3beb199bb97f0572234984 (patch)
tree: 8af4f4b16bdda8a7b54ff123a7cfe5fcc38c203c
parent: CATAGORIES+= -> CATAGORIES= (diff)
97 files changed, 320 insertions, 304 deletions
diff --git a/archivers/arc/Makefile b/archivers/arc/Makefile
index d19ec6aa7864..7beebded0e38 100644
--- a/archivers/arc/Makefile
+++ b/archivers/arc/Makefile
@@ -3,12 +3,12 @@
 # Date created:         31 Dec 1994
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.2 1995/04/01 12:43:14 jkh Exp $
+# $Id: Makefile,v 1.3 1995/04/12 04:48:15 asami Exp $
 #
 
 DISTNAME=       arc521e.pl8
 PKGNAME=        arc-5.21e
-CATEGORIES+=	archivers
+CATEGORIES=	archivers
 MASTER_SITES=   ftp://ftp.kiae.su/unix/arcers/
 EXTRACT_SUFX=   .tar.Z
 
diff --git a/archivers/bzip/Makefile b/archivers/bzip/Makefile
index 1ab840d825bb..9798541f9b3b 100644
--- a/archivers/bzip/Makefile
+++ b/archivers/bzip/Makefile
@@ -3,11 +3,11 @@
 # Date created:         Fr  27 Sep 1996 11:47:35 MET DST
 # Whom:                 Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.4 1996/10/15 19:56:29 andreas Exp $
+# $Id: Makefile,v 1.5 1996/10/19 09:12:02 andreas Exp $
 #
 
 DISTNAME=       bzip-0.21
-CATEGORIES+=	archivers
+CATEGORIES=	archivers
 MASTER_SITES=   http://www.cs.man.ac.uk/arch/people/j-seward/
 
 MAINTAINER=     andreas@klemm.gtn.com
@@ -15,7 +15,7 @@ MAINTAINER=     andreas@klemm.gtn.com
 NO_CDROM=       yes     # Restrictive copyright (don't sell for profit)
 
 pre-install:
-	@cat ${FILESDIR}/COPYRIGHT
+	@${CAT} ${FILESDIR}/COPYRIGHT
 
 do-install:
 	rm -f ${PREFIX}/bin/bzip ${PREFIX}/bin/bunzip
diff --git a/archivers/freeze/Makefile b/archivers/freeze/Makefile
index 891aabd2be38..c8e6c13ac618 100644
--- a/archivers/freeze/Makefile
+++ b/archivers/freeze/Makefile
@@ -3,11 +3,11 @@
 # Date created:         20 Jul 1996
 # Whom:                 lukin@okbmei.msk.su
 #
-# $Id: Makefile,v 1.1 1996/07/20 00:17:21 lukin Exp $
+# $Id: Makefile,v 1.1.1.1 1996/08/09 08:16:16 asami Exp $
 #
 
 DISTNAME=       freeze-2.5
-CATEGORIES+=	archivers
+CATEGORIES=	archivers
 MASTER_SITES=	ftp://lupin.csv.warwick.ac.uk/pub/compression/
 
 MAINTAINER=     lukin@okbmei.msk.su
diff --git a/archivers/gshar+gunshar/Makefile b/archivers/gshar+gunshar/Makefile
index efb29a745d42..19c8ac9bd9ee 100644
--- a/archivers/gshar+gunshar/Makefile
+++ b/archivers/gshar+gunshar/Makefile
@@ -3,10 +3,10 @@
 # Date created:         28 Dec 1994
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.6 1995/04/16 01:44:03 ache Exp $
+# $Id: Makefile,v 1.7 1996/08/16 14:38:14 peter Exp $
 #
 DISTNAME=       sharutils-4.1.4
-CATEGORIES+=	archivers
+CATEGORIES=	archivers
 MASTER_SITES=   ftp://ftp.iro.umontreal.ca/pub/contrib/pinard/gnu/
 
 MAINTAINER=     ache@FreeBSD.ORG
diff --git a/archivers/ha/Makefile b/archivers/ha/Makefile
index e4d0db7593a3..aa1764efe08f 100644
--- a/archivers/ha/Makefile
+++ b/archivers/ha/Makefile
@@ -3,12 +3,12 @@
 # Date created:         24 Jan 1995
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.5 1995/04/16 00:18:36 asami Exp $
+# $Id: Makefile,v 1.6 1995/04/24 10:58:46 asami Exp $
 #
 
 DISTNAME=       ha0999
 PKGNAME=        ha-0.999b
-CATEGORIES+=	archivers
+CATEGORIES=	archivers
 MASTER_SITES=   ftp://ftp.kiae.su/unix/arcers/
 EXTRACT_SUFX=   .tgz
 
diff --git a/archivers/hpack.non-usa.only/Makefile b/archivers/hpack.non-usa.only/Makefile
index 1d7e4dcd0995..ed908832cd28 100644
--- a/archivers/hpack.non-usa.only/Makefile
+++ b/archivers/hpack.non-usa.only/Makefile
@@ -3,12 +3,12 @@
 # Date created:         7 Jan 1995
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.4 1995/04/12 04:53:57 asami Exp $
+# $Id: Makefile,v 1.5 1996/04/12 08:16:45 asami Exp $
 #
 
 DISTNAME=       hpack79src
 PKGNAME=        hpack-0.79a
-CATEGORIES+=	archivers
+CATEGORIES=	archivers
 MASTER_SITES=   ftp://src.doc.ic.ac.uk/packages/hpack/
 EXTRACT_SUFX=   .tar.Z
 
diff --git a/archivers/lha/Makefile b/archivers/lha/Makefile
index 547d59caf4b1..014b2534ab4b 100644
--- a/archivers/lha/Makefile
+++ b/archivers/lha/Makefile
@@ -3,12 +3,12 @@
 # Date created:         26 Dec 1994
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.6 1996/08/29 16:05:54 ache Exp $
+# $Id: Makefile,v 1.7 1996/09/08 21:48:25 ache Exp $
 #
 
 DISTNAME=       lha-114c
 PKGNAME=        lha-1.14c
-CATEGORIES+=	archivers
+CATEGORIES=	archivers
 MASTER_SITES=   ftp://ftp.leo.chubu.ac.jp/pub/tools/
 EXTRACT_SUFX=   .tgz
 
diff --git a/archivers/p5-Compress-Zlib/Makefile b/archivers/p5-Compress-Zlib/Makefile
index beaa9ab8b1c3..55395e1f9280 100644
--- a/archivers/p5-Compress-Zlib/Makefile
+++ b/archivers/p5-Compress-Zlib/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/23 23:51:34 jfitz Exp $
+#   $Id: Makefile,v 1.2 1996/10/24 09:58:05 jfitz Exp $
 #
 
 DISTNAME=	Compress-Zlib-0.4
 PKGNAME=	p5-Compress-Zlib-0.4
-CATEGORIES+=	archivers
+CATEGORIES=	archivers
 MASTER_SITES=	ftp://ftp.digital.com/pub/plan/perl/CPAN/modules/by-module/Compress/ \
 		ftp://ftp.cdrom.com/pub/perl/CPAN/modules/by-module/Compress/ \
 		ftp://ftp.cis.ufl.edu/pub/perl/CPAN/modules/by-module/Compress/ \
diff --git a/archivers/rar/Makefile b/archivers/rar/Makefile
index a3179a248c2a..eb96659e5d13 100644
--- a/archivers/rar/Makefile
+++ b/archivers/rar/Makefile
@@ -3,22 +3,22 @@
 # Date created:         15 May 1996
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.4 1995/05/15 20:55:27 ache Exp $
+# $Id: Makefile,v 1.1.1.1 1996/05/15 19:19:40 ache Exp $
 #
 
 DISTNAME=       rar2bsdb
 PKGNAME=        rar-2.00b
-CATEGORIES+=	archivers
+CATEGORIES=	archivers
 MASTER_SITES=   ftp://ftp.relcom.ru/unix/arcers/
 EXTRACT_SUFX=   .tgz
 
-NO_BUILD=       yes
-
 MAINTAINER=     ache@FreeBSD.ORG
 
+NO_BUILD=       yes
+
 do-install:
 	cd ${WRKSRC}; \
-	$(INSTALL) -c -m $(BINMODE) -o $(BINOWN) -g $(BINGRP) rar_bsd $(PREFIX)/bin/rar; \
-	$(INSTALL) -c -m $(MANMODE) -o $(MANOWN) -g $(MANGRP) rar.man $(PREFIX)/man/cat1/rar.1
+	${INSTALL_PROGRAM} rar_bsd ${PREFIX}/bin/rar; \
+	${INSTALL_MAN} rar.man ${PREFIX}/man/cat1/rar.1
 
 .include <bsd.port.mk>
diff --git a/archivers/sharutils/Makefile b/archivers/sharutils/Makefile
index efb29a745d42..19c8ac9bd9ee 100644
--- a/archivers/sharutils/Makefile
+++ b/archivers/sharutils/Makefile
@@ -3,10 +3,10 @@
 # Date created:         28 Dec 1994
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.6 1995/04/16 01:44:03 ache Exp $
+# $Id: Makefile,v 1.7 1996/08/16 14:38:14 peter Exp $
 #
 DISTNAME=       sharutils-4.1.4
-CATEGORIES+=	archivers
+CATEGORIES=	archivers
 MASTER_SITES=   ftp://ftp.iro.umontreal.ca/pub/contrib/pinard/gnu/
 
 MAINTAINER=     ache@FreeBSD.ORG
diff --git a/archivers/unarj/Makefile b/archivers/unarj/Makefile
index 4fe7483fb81d..bb3d01a7a266 100644
--- a/archivers/unarj/Makefile
+++ b/archivers/unarj/Makefile
@@ -3,18 +3,18 @@
 # Date created:         28 Dec 1994
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.4 1995/04/16 00:23:30 asami Exp $
+# $Id: Makefile,v 1.5 1995/04/24 10:58:54 asami Exp $
 #
 
 DISTNAME=       unarj
 PKGNAME=	unarj-2.41
-CATEGORIES+=	archivers
+CATEGORIES=	archivers
 MASTER_SITES=	ftp://garbo.uwasa.fi/unix/arcers/
 DISTFILES=      unarj241.tar.Z
 
 MAINTAINER=     ache@FreeBSD.ORG
 
 do-install:
-	cd ${WRKSRC}; install -cs -o bin -g bin -m755 ${DISTNAME} ${PREFIX}/bin
+	cd ${WRKSRC}; ${INSTALL_PROGRAM} ${DISTNAME} ${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/archivers/unrar/Makefile b/archivers/unrar/Makefile
index 438e3ba99cba..a0e9f6b2fb08 100644
--- a/archivers/unrar/Makefile
+++ b/archivers/unrar/Makefile
@@ -3,12 +3,12 @@
 # Date created:         28 Dec 1994
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.5 1996/05/15 04:59:28 ache Exp $
+# $Id: Makefile,v 1.6 1996/05/16 08:59:57 asami Exp $
 #
 
 DISTNAME=       unrar101
 PKGNAME=        unrar-1.01a
-CATEGORIES+=	archivers
+CATEGORIES=	archivers
 MASTER_SITES=   ftp://ftp.relcom.ru/unix/arcers/
 EXTRACT_SUFX=   .tgz
 
diff --git a/archivers/unzip/Makefile b/archivers/unzip/Makefile
index a169baed359f..428855872e30 100644
--- a/archivers/unzip/Makefile
+++ b/archivers/unzip/Makefile
@@ -3,11 +3,11 @@
 # Date created:         17 October 1994
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.4 1995/04/15 04:45:17 asami Exp $
+# $Id: Makefile,v 1.5 1996/05/04 12:30:40 ache Exp $
 #
 
 DISTNAME=       unzip-5.2
-CATEGORIES+=	archivers
+CATEGORIES=	archivers
 MASTER_SITES=   ftp://quest.jpl.nasa.gov/pub/
 DISTFILES=      unzip52.tar.Z
 
diff --git a/archivers/zip/Makefile b/archivers/zip/Makefile
index 4f089c549a3d..e1c0651f068a 100644
--- a/archivers/zip/Makefile
+++ b/archivers/zip/Makefile
@@ -3,12 +3,12 @@
 # Date created:         22 Dec 1994
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.5 1995/04/24 10:58:57 asami Exp $
+# $Id: Makefile,v 1.6 1996/05/04 11:34:16 ache Exp $
 #
 
 DISTNAME=       zip21
 PKGNAME=        zip-2.1
-CATEGORIES+=	archivers
+CATEGORIES=	archivers
 MASTER_SITES=   ftp://quest.jpl.nasa.gov/pub/
 EXTRACT_SUFX=   .zip
 
diff --git a/archivers/zoo/Makefile b/archivers/zoo/Makefile
index 64820d3e236d..6af3116e7704 100644
--- a/archivers/zoo/Makefile
+++ b/archivers/zoo/Makefile
@@ -3,14 +3,16 @@
 # Date created:         18 October 1994
 # Whom:                 jmz
 #
-# $Id$
+# $Id: Makefile,v 1.4 1995/04/15 04:45:25 asami Exp $
 #
 
 DISTNAME=       zoo-2.10pl1
 PKGNAME=	zoo-2.10.1
-CATEGORIES+=	archivers
+CATEGORIES=	archivers
 MASTER_SITES=   ftp://ftp.kiae.su/unix/arcers/
 
+MAINTAINER=	jmz@FreeBSD.org
+
 NO_WRKSUBDIR=	yes
 ALL_TARGET=     bsdansi
 MAKEFILE=       makefile
diff --git a/chinese/cxterm/Makefile b/chinese/cxterm/Makefile
index 1ee7abcbcc04..1f47f81bbdc3 100644
--- a/chinese/cxterm/Makefile
+++ b/chinese/cxterm/Makefile
@@ -15,6 +15,7 @@ MASTER_SITES=	ftp://ftp.cs.purdue.edu/pub/ygz/  \
 		ftp://ftp.edu.tw/Chinese/ifcss/software/x-win/cxterm/  \
 		ftp://ftp.mpi-sb.mpg.de/pub/chinese/mirror/ftp.ifcss.org/software/x-win/cxterm/
 
+
 MAINTAINER=     obrien@cs.ucdavis.edu
 
 WRKSRC=		${WRKDIR}/cxterm-5.0
diff --git a/converters/uudeview/Makefile b/converters/uudeview/Makefile
index e6b4ccb44c69..d46aaa74d2bb 100644
--- a/converters/uudeview/Makefile
+++ b/converters/uudeview/Makefile
@@ -3,11 +3,11 @@
 # Date Created:		04 Aug 1996
 # Whom:			Tim Vanderhoek <ac199@freenet.hamilton.on.ca>
 #
-# $Id: Makefile,v 1.2 1996/08/23 09:04:06 asami Exp $
+# $Id: Makefile,v 1.3 1996/10/15 08:24:22 asami Exp $
 #
 
 DISTNAME=	uudeview-0.5.4
-CATEGORIES+=	archivers mail
+CATEGORIES=	archivers mail
 MASTER_SITES=	http://www.uni-frankfurt.de/~fp/uudeview/Apps/frank/
 
 MAINTAINER=	ac199@freenet.hamilton.on.ca
@@ -33,7 +33,7 @@ DOCFILES+=	HOWTO
 post-patch:
 	@${ECHO_MSG} "===>  Adding extra files";
 	@for l in ${EXTRAFILES}; do \
-		cp ${FILESDIR}/$${l} ${WRKSRC}/$${l}; \
+		${CP} ${FILESDIR}/$${l} ${WRKSRC}/$${l}; \
 	done
 
 # Maybe we should pay attention to DOCOWN, DOCGRP, and DOCMODE, set in 
@@ -44,10 +44,10 @@ post-install:
 	then \
 		${ECHO_MSG} "===>  Copying documents to ${PREFIX}/${PORTDOCDIR}"; \
 	fi;
-	mkdir -p ${PREFIX}/${PORTDOCDIR};
+	${MKDIR} ${PREFIX}/${PORTDOCDIR};
 	@for l in ${DOCFILES}; \
 	do \
-		cp ${WRKSRC}/$$l ${PREFIX}/${PORTDOCDIR}; \
+		${CP} ${WRKSRC}/$$l ${PREFIX}/${PORTDOCDIR}; \
 	done
 .else
 	@if [ 'x${DOCFILES}' != x ] ; \
diff --git a/converters/uudx/Makefile b/converters/uudx/Makefile
index 4e58aac3bb86..177432b9f640 100644
--- a/converters/uudx/Makefile
+++ b/converters/uudx/Makefile
@@ -2,13 +2,12 @@
 # Version required:	2.99
 # Date created:		2 June 1996
 # Whom:			ABURAYER Rewsirow <pcs51674@asciinet.or.jp>
-#
-#
+# $Id$
 #
 
 DISTNAME=	uudx_299
 PKGNAME=	uudx-2.99
-CATEGORIES+=	archivers
+CATEGORIES=	archivers
 MASTER_SITES=	ftp://ftp.ae.keio.ac.jp/pub/msdos/archivers/uu/
 
 MAINTAINER=	pcs51674@asciinet.or.jp
@@ -23,6 +22,6 @@ PATCH_STRIP=	-p1
 
 pre-patch:
 	@echo "===>  Installing custom Makefile for ${DISTNAME}"
-	@(cp ${FILESDIR}/Makefile ${WRKSRC})
+	@(${CP} ${FILESDIR}/Makefile ${WRKSRC})
 
 .include <bsd.port.mk>
diff --git a/editors/sam/Makefile b/editors/sam/Makefile
index 8490314c32c8..fd342453ff0d 100644
--- a/editors/sam/Makefile
+++ b/editors/sam/Makefile
@@ -3,12 +3,12 @@
 # Date created:         Sun Aug 13 12:36:14 CDT 1995
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.1.1.1 1995/08/14 04:08:00 asami Exp $
+# $Id: Makefile,v 1.2 1995/10/28 20:35:56 erich Exp $
 #
 
 DISTNAME=	sam
 PKGNAME=	sam-4.3
-CATEGORIES+=	plan9
+CATEGORIES=	plan9
 MASTER_SITES=	ftp://ftp.ecf.toronto.edu/pub/plan9/matty/
 EXTRACT_SUFX=	.msg.gz
 
diff --git a/emulators/cpmemu/Makefile b/emulators/cpmemu/Makefile
index 594fae524777..13cd8cb7a817 100644
--- a/emulators/cpmemu/Makefile
+++ b/emulators/cpmemu/Makefile
@@ -2,12 +2,15 @@
 # Version required:	0.2
 # Date created:		28 June 1995
 # Whom:			janek@gaja.ipan.lublin.pl
+# $Id$
 #
 
 DISTNAME=	cpm-0.2
 PKGNAME=	cpmemu-0.2
-CATEGORIES+=	emulators
+CATEGORIES=	emulators
 MASTER_SITES=	ftp://sunsite.unc.edu/pub/Linux/distributions/slackware/source/extra-stuff/CPM-80-emulator/ \
 		ftp://ftp.icm.edu.pl/pub2/linux/distributions/slackware/source/extra-stuff/CPM-80-emulator/
 
+MAINTAINER=	ports@FreeBSD.org
+
 .include <bsd.port.mk>
diff --git a/emulators/cpmtools/Makefile b/emulators/cpmtools/Makefile
index b3bc48a47ae3..5acdac104092 100644
--- a/emulators/cpmtools/Makefile
+++ b/emulators/cpmtools/Makefile
@@ -3,12 +3,12 @@
 # Date created:		25 December 1994
 # Whom:			joerg
 #
-# $Id: Makefile,v 1.12 1995/11/22 11:48:07 asami Exp $
+# $Id: Makefile,v 1.13 1996/06/03 02:17:05 asami Exp $
 #
 
 DISTNAME=	cpm-1.1
 PKGNAME=	cpmtools-1.1
-CATEGORIES+=	emulators
+CATEGORIES=	emulators
 MASTER_SITES=	ftp://freefall.freebsd.org/pub/FreeBSD/LOCAL_PORTS/
 MAINTAINER=	joerg@FreeBSD.org
 
diff --git a/emulators/hfs/Makefile b/emulators/hfs/Makefile
index 752fdf6f94ef..beb1c9e85e7b 100644
--- a/emulators/hfs/Makefile
+++ b/emulators/hfs/Makefile
@@ -3,20 +3,20 @@
 # Date created:         17 November 1994
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.6 1995/07/13 01:13:13 asami Exp $
+# $Id: Makefile,v 1.7 1995/11/22 11:48:10 asami Exp $
 #
 
 DISTNAME=	hfs0_37
 PKGNAME=	hfs-0.37
-CATEGORIES+=	emulators
+CATEGORIES=	emulators
 MASTER_SITES=	ftp://ftp.obs-besancon.fr/pub/outgoing/
 
 MAINTAINER=	jmz@FreeBSD.org
 
 USE_GMAKE=	yes
 
-.include <bsd.port.mk>
-
 pre-install:
-	@mkdir -p ${PREFIX}/bin
-	@mkdir -p ${PREFIX}/man/man1
+	@${MKDIR} ${PREFIX}/bin
+	@${MKDIR} ${PREFIX}/man/man1
+
+.include <bsd.port.mk>
diff --git a/emulators/linux_base-6/Makefile b/emulators/linux_base-6/Makefile
index 5a0f23409ac9..9829821038f7 100644
--- a/emulators/linux_base-6/Makefile
+++ b/emulators/linux_base-6/Makefile
@@ -3,7 +3,7 @@
 # Date created:         
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.8 1996/03/29 14:46:25 erich Exp $
+# $Id: Makefile,v 1.9 1996/10/28 15:20:13 erich Exp $
 #
 
 DISTNAME=	linux_lib-2.1
@@ -16,6 +16,6 @@ WRKSRC=		${WRKDIR}
 NO_MTREE=	yes
 
 pre-install:
-	@[ -d ${PREFIX} ] || mkdir -p ${PREFIX}
+	@[ -d ${PREFIX} ] || ${MKDIR} ${PREFIX}
 
 .include <bsd.port.mk>
diff --git a/emulators/linux_base-62/Makefile b/emulators/linux_base-62/Makefile
index 5a0f23409ac9..9829821038f7 100644
--- a/emulators/linux_base-62/Makefile
+++ b/emulators/linux_base-62/Makefile
@@ -3,7 +3,7 @@
 # Date created:         
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.8 1996/03/29 14:46:25 erich Exp $
+# $Id: Makefile,v 1.9 1996/10/28 15:20:13 erich Exp $
 #
 
 DISTNAME=	linux_lib-2.1
@@ -16,6 +16,6 @@ WRKSRC=		${WRKDIR}
 NO_MTREE=	yes
 
 pre-install:
-	@[ -d ${PREFIX} ] || mkdir -p ${PREFIX}
+	@[ -d ${PREFIX} ] || ${MKDIR} ${PREFIX}
 
 .include <bsd.port.mk>
diff --git a/emulators/linux_base-8/Makefile b/emulators/linux_base-8/Makefile
index 5a0f23409ac9..9829821038f7 100644
--- a/emulators/linux_base-8/Makefile
+++ b/emulators/linux_base-8/Makefile
@@ -3,7 +3,7 @@
 # Date created:         
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.8 1996/03/29 14:46:25 erich Exp $
+# $Id: Makefile,v 1.9 1996/10/28 15:20:13 erich Exp $
 #
 
 DISTNAME=	linux_lib-2.1
@@ -16,6 +16,6 @@ WRKSRC=		${WRKDIR}
 NO_MTREE=	yes
 
 pre-install:
-	@[ -d ${PREFIX} ] || mkdir -p ${PREFIX}
+	@[ -d ${PREFIX} ] || ${MKDIR} ${PREFIX}
 
 .include <bsd.port.mk>
diff --git a/emulators/linux_base-rh-9/Makefile b/emulators/linux_base-rh-9/Makefile
index 5a0f23409ac9..9829821038f7 100644
--- a/emulators/linux_base-rh-9/Makefile
+++ b/emulators/linux_base-rh-9/Makefile
@@ -3,7 +3,7 @@
 # Date created:         
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.8 1996/03/29 14:46:25 erich Exp $
+# $Id: Makefile,v 1.9 1996/10/28 15:20:13 erich Exp $
 #
 
 DISTNAME=	linux_lib-2.1
@@ -16,6 +16,6 @@ WRKSRC=		${WRKDIR}
 NO_MTREE=	yes
 
 pre-install:
-	@[ -d ${PREFIX} ] || mkdir -p ${PREFIX}
+	@[ -d ${PREFIX} ] || ${MKDIR} ${PREFIX}
 
 .include <bsd.port.mk>
diff --git a/emulators/linux_base-suse-9.1/Makefile b/emulators/linux_base-suse-9.1/Makefile
index 5a0f23409ac9..9829821038f7 100644
--- a/emulators/linux_base-suse-9.1/Makefile
+++ b/emulators/linux_base-suse-9.1/Makefile
@@ -3,7 +3,7 @@
 # Date created:         
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.8 1996/03/29 14:46:25 erich Exp $
+# $Id: Makefile,v 1.9 1996/10/28 15:20:13 erich Exp $
 #
 
 DISTNAME=	linux_lib-2.1
@@ -16,6 +16,6 @@ WRKSRC=		${WRKDIR}
 NO_MTREE=	yes
 
 pre-install:
-	@[ -d ${PREFIX} ] || mkdir -p ${PREFIX}
+	@[ -d ${PREFIX} ] || ${MKDIR} ${PREFIX}
 
 .include <bsd.port.mk>
diff --git a/emulators/linux_base-suse-9.2/Makefile b/emulators/linux_base-suse-9.2/Makefile
index 5a0f23409ac9..9829821038f7 100644
--- a/emulators/linux_base-suse-9.2/Makefile
+++ b/emulators/linux_base-suse-9.2/Makefile
@@ -3,7 +3,7 @@
 # Date created:         
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.8 1996/03/29 14:46:25 erich Exp $
+# $Id: Makefile,v 1.9 1996/10/28 15:20:13 erich Exp $
 #
 
 DISTNAME=	linux_lib-2.1
@@ -16,6 +16,6 @@ WRKSRC=		${WRKDIR}
 NO_MTREE=	yes
 
 pre-install:
-	@[ -d ${PREFIX} ] || mkdir -p ${PREFIX}
+	@[ -d ${PREFIX} ] || ${MKDIR} ${PREFIX}
 
 .include <bsd.port.mk>
diff --git a/emulators/linux_base-suse-9.3/Makefile b/emulators/linux_base-suse-9.3/Makefile
index 5a0f23409ac9..9829821038f7 100644
--- a/emulators/linux_base-suse-9.3/Makefile
+++ b/emulators/linux_base-suse-9.3/Makefile
@@ -3,7 +3,7 @@
 # Date created:         
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.8 1996/03/29 14:46:25 erich Exp $
+# $Id: Makefile,v 1.9 1996/10/28 15:20:13 erich Exp $
 #
 
 DISTNAME=	linux_lib-2.1
@@ -16,6 +16,6 @@ WRKSRC=		${WRKDIR}
 NO_MTREE=	yes
 
 pre-install:
-	@[ -d ${PREFIX} ] || mkdir -p ${PREFIX}
+	@[ -d ${PREFIX} ] || ${MKDIR} ${PREFIX}
 
 .include <bsd.port.mk>
diff --git a/emulators/linux_base/Makefile b/emulators/linux_base/Makefile
index 5a0f23409ac9..9829821038f7 100644
--- a/emulators/linux_base/Makefile
+++ b/emulators/linux_base/Makefile
@@ -3,7 +3,7 @@
 # Date created:         
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.8 1996/03/29 14:46:25 erich Exp $
+# $Id: Makefile,v 1.9 1996/10/28 15:20:13 erich Exp $
 #
 
 DISTNAME=	linux_lib-2.1
@@ -16,6 +16,6 @@ WRKSRC=		${WRKDIR}
 NO_MTREE=	yes
 
 pre-install:
-	@[ -d ${PREFIX} ] || mkdir -p ${PREFIX}
+	@[ -d ${PREFIX} ] || ${MKDIR} ${PREFIX}
 
 .include <bsd.port.mk>
diff --git a/emulators/mtools/Makefile b/emulators/mtools/Makefile
index 6fe4a8b2db54..8002012ca48e 100644
--- a/emulators/mtools/Makefile
+++ b/emulators/mtools/Makefile
@@ -3,11 +3,11 @@
 # Date created:         5 October 1994
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.7 1996/05/27 14:09:17 jmz Exp $
+# $Id: Makefile,v 1.8 1996/05/29 01:46:49 ache Exp $
 #
 
 DISTNAME=	mtools-3.0
-CATEGORIES+=	emulators
+CATEGORIES=	emulators
 MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
 
 MAINTAINER=	jmz@FreeBSD.org
diff --git a/emulators/pcemu/Makefile b/emulators/pcemu/Makefile
index e9dc2d987ea5..63ee83c68020 100644
--- a/emulators/pcemu/Makefile
+++ b/emulators/pcemu/Makefile
@@ -3,12 +3,12 @@
 # Date created:		7 March 1995
 # Whom:			joerg
 #
-# $Id: Makefile,v 1.6 1995/07/13 01:13:16 asami Exp $
+# $Id: Makefile,v 1.7 1995/11/22 11:48:17 asami Exp $
 #
 
 DISTNAME=	pcemu1.01alpha
 PKGNAME=	pcemu-1.01a
-CATEGORIES+=	emulators
+CATEGORIES=	emulators
 
 # Warning notice:  by now, you'll have to live with those warnings:
 #
diff --git a/emulators/sim6811/Makefile b/emulators/sim6811/Makefile
index e5736055f655..e70d0b7bf209 100644
--- a/emulators/sim6811/Makefile
+++ b/emulators/sim6811/Makefile
@@ -3,12 +3,12 @@
 # Date created:         Thu Sep 14 11:10:01 CDT 1995
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.1.1.1 1995/10/03 02:43:49 erich Exp $
+# $Id: Makefile,v 1.2 1995/11/22 11:48:19 asami Exp $
 #
 
 DISTNAME=	sim
 PKGNAME=	sim6811-1.6
-CATEGORIES+=	emulators
+CATEGORIES=	emulators
 MASTER_SITES=	ftp://crl.nmsu.edu/pub/non-lexical/6811/
 EXTRACT_SUFX=	.tar.Z
 
diff --git a/emulators/spim/Makefile b/emulators/spim/Makefile
index b3bedcb45400..b3f70efa6509 100644
--- a/emulators/spim/Makefile
+++ b/emulators/spim/Makefile
@@ -4,12 +4,12 @@
 # Date created:         Mon Oct 28, 1996
 # Whom:                 David O'Brien (obrien@cs.ucdavis.edu)
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1996/10/30 01:58:56 obrien Exp $
 #
 
 DISTNAME=	spim
 PKGNAME=	spim-5.8
-CATEGORIES+=	emulators
+CATEGORIES=	emulators
 MASTER_SITES=	ftp://ftp.cs.wisc.edu/pub/spim/
 
 MAINTAINER=	obrien@cs.ucdavis.edu
@@ -27,7 +27,7 @@ pre-configure:
 	@${RM} -f ${WRKSRC}/y.tab.*
 	
 pre-install:
-	@${MKDIR} -p ${PREFIX}/share/spim && chmod a+rx ${PREFIX}/share/spim
+	@${MKDIR} ${PREFIX}/share/spim && chmod a+rx ${PREFIX}/share/spim
 
 post-install:
 	[ -e ${PREFIX}/bin/cl-spim ] &&  \
@@ -36,7 +36,7 @@ post-install:
 		/bin/ln -f ${PREFIX}/bin/cl-xspim ${PREFIX}/bin/xspim
 .if !defined(NOPORTDOCS)
 	@${ECHO} "Installing spim/xspim documentation"
-	@${MKDIR} -p ${PREFIX}/share/doc/spim  \
+	@${MKDIR} ${PREFIX}/share/doc/spim  \
 		&& chmod a+rx ${PREFIX}/share/doc/spim
 	${INSTALL_DATA} ${WRKSRC}/Documentation/spim.ps  \
 		${PREFIX}/share/doc/spim
diff --git a/emulators/tkhfs/Makefile b/emulators/tkhfs/Makefile
index e5b0a0deee44..dd3ad740ba74 100644
--- a/emulators/tkhfs/Makefile
+++ b/emulators/tkhfs/Makefile
@@ -3,12 +3,12 @@
 # Date created:         17 November 1994
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.11 1995/11/26 12:21:03 asami Exp $
+# $Id: Makefile,v 1.12 1996/11/04 14:53:03 jmz Exp $
 #
 
 DISTNAME=	tkhfs
 PKGNAME=	tkhfs-1.27
-CATEGORIES+=	emulators x11
+CATEGORIES=	emulators x11
 MASTER_SITES=	ftp://ftp.obs-besancon.fr/pub/outgoing/
 
 MAINTAINER=	jmz@FreeBSD.org
diff --git a/emulators/vmsbackup/Makefile b/emulators/vmsbackup/Makefile
index 88fda0b6e504..97ebc28ee5d2 100644
--- a/emulators/vmsbackup/Makefile
+++ b/emulators/vmsbackup/Makefile
@@ -2,12 +2,12 @@
 # Version required:	3.0
 # Date created:		18 Apr 1994
 # Whom:			Jonathan M. Bresler (jmb)
-#
+# $Id$
 #
 
 DISTNAME=	vmsbackup
 PKGNAME=	vmsbackup-3.0
-CATEGORIES+=	emulators sysutils
+CATEGORIES=	emulators sysutils
 MASTER_SITES=	ftp://ftp.cs.uni-sb.de/pub/utils/
 # slightly different version
 # MASTER_SITES+=	ftp://ftp.uni-passau.de/pub/unix/system/backup/
diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index 0e6568006af7..b4f2330fb3c8 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -3,13 +3,13 @@
 # Date created:         Sa   9 Nov 1996 00:52:22 MET
 # Whom:			se
 #
-# $Id: Makefile,v 1.32 1996/10/29 19:08:20 se Exp $
+# $Id: Makefile,v 1.33 1996/11/08 23:57:24 se Exp $
 #
 
 DATE=		961102
 DISTNAME=	Wine-${DATE}
 PKGNAME=	wine-96.11.02
-CATEGORIES+=	emulators x11
+CATEGORIES=	emulators x11
 MASTER_SITES=	ftp://sunsite.unc.edu/pub/Linux/ALPHA/wine/development/ \
 		ftp://tsx-11.mit.edu/pub/linux/ALPHA/Wine/development/ \
 		ftp://ftp.dfv.rwth-aachen.de/pub/linux/sunsite/ALPHA/wine/development/ \
@@ -24,7 +24,7 @@ WRKSRC=		${WRKDIR}/wine${DATE}
 GNU_CONFIGURE=	yes
 
 pre-configure:
-	@echo "WINE_INI_GLOBAL \"${PREFIX}/etc/wine.conf\"" \
+	@${ECHO} "WINE_INI_GLOBAL \"${PREFIX}/etc/wine.conf\"" \
 		>> ${WRKSRC}/autoconf.h
 
 post-configure:
@@ -32,9 +32,9 @@ post-configure:
 
 do-install:
 	install -c ${WRKSRC}/wine ${PREFIX}/bin
-	-@mkdir ${PREFIX}/etc 2>/dev/null
+	-@${MKDIR} ${PREFIX}/etc 2>/dev/null
 	[ -f ${PREFIX}/etc/wine.conf ] \
-		|| cp ${WRKSRC}/wine.ini ${PREFIX}/etc/wine.conf
+		|| ${CP} ${WRKSRC}/wine.ini ${PREFIX}/etc/wine.conf
 	cp ${WRKSRC}/wine.sym ${PREFIX}/etc
 	cp ${WRKSRC}/wine.man ${PREFIX}/man/man1/wine.1
 .if !defined(NOMANCOMPRESS)
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 0e6568006af7..b4f2330fb3c8 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -3,13 +3,13 @@
 # Date created:         Sa   9 Nov 1996 00:52:22 MET
 # Whom:			se
 #
-# $Id: Makefile,v 1.32 1996/10/29 19:08:20 se Exp $
+# $Id: Makefile,v 1.33 1996/11/08 23:57:24 se Exp $
 #
 
 DATE=		961102
 DISTNAME=	Wine-${DATE}
 PKGNAME=	wine-96.11.02
-CATEGORIES+=	emulators x11
+CATEGORIES=	emulators x11
 MASTER_SITES=	ftp://sunsite.unc.edu/pub/Linux/ALPHA/wine/development/ \
 		ftp://tsx-11.mit.edu/pub/linux/ALPHA/Wine/development/ \
 		ftp://ftp.dfv.rwth-aachen.de/pub/linux/sunsite/ALPHA/wine/development/ \
@@ -24,7 +24,7 @@ WRKSRC=		${WRKDIR}/wine${DATE}
 GNU_CONFIGURE=	yes
 
 pre-configure:
-	@echo "WINE_INI_GLOBAL \"${PREFIX}/etc/wine.conf\"" \
+	@${ECHO} "WINE_INI_GLOBAL \"${PREFIX}/etc/wine.conf\"" \
 		>> ${WRKSRC}/autoconf.h
 
 post-configure:
@@ -32,9 +32,9 @@ post-configure:
 
 do-install:
 	install -c ${WRKSRC}/wine ${PREFIX}/bin
-	-@mkdir ${PREFIX}/etc 2>/dev/null
+	-@${MKDIR} ${PREFIX}/etc 2>/dev/null
 	[ -f ${PREFIX}/etc/wine.conf ] \
-		|| cp ${WRKSRC}/wine.ini ${PREFIX}/etc/wine.conf
+		|| ${CP} ${WRKSRC}/wine.ini ${PREFIX}/etc/wine.conf
 	cp ${WRKSRC}/wine.sym ${PREFIX}/etc
 	cp ${WRKSRC}/wine.man ${PREFIX}/man/man1/wine.1
 .if !defined(NOMANCOMPRESS)
diff --git a/emulators/x48/Makefile b/emulators/x48/Makefile
index 1fe9455c1897..94724dab1a23 100644
--- a/emulators/x48/Makefile
+++ b/emulators/x48/Makefile
@@ -3,11 +3,11 @@
 # Date created:         Thu Oct 24 13:10:59 CDT 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1996/10/24 20:41:37 erich Exp $
 #
 
 DISTNAME=	x48-0.4.0
-CATEGORIES+=	emulators
+CATEGORIES=	emulators
 MASTER_SITES=	ftp://sunsite.unc.edu/pub/Linux/system/Emulators/
 
 MAINTAINER=	erich@FreeBSD.org
@@ -16,8 +16,8 @@ USE_IMAKE=	yes
 NO_INSTALL_MANPAGES=	yes
 
 post-install:
-	mkdir -p ${PREFIX}/share/x48
-	cp ${WRKSRC}/README ${PREFIX}/share/x48/README-x48
-	cp ${WRKSRC}/doc/CARDS.doc ${WRKSRC}/doc/ROMDump.doc ${PREFIX}/share/x48
+	${MKDIR} ${PREFIX}/share/x48
+	${CP} ${WRKSRC}/README ${PREFIX}/share/x48/README-x48
+	${CP} ${WRKSRC}/doc/CARDS.doc ${WRKSRC}/doc/ROMDump.doc ${PREFIX}/share/x48
 
 .include <bsd.port.mk>
diff --git a/lang/Gofer/Makefile b/lang/Gofer/Makefile
index 68f3f2a6548d..9dc2340f6f75 100644
--- a/lang/Gofer/Makefile
+++ b/lang/Gofer/Makefile
@@ -3,19 +3,21 @@
 # Date created:         Wed Feb  1 01:51:59 PST 1995
 # Whom:                 hsu
 #
-# $Id: Makefile,v 1.7 1996/10/19 05:56:26 max Exp $
+# $Id: Makefile,v 1.8 1996/10/27 00:20:27 max Exp $
 #
 
 DISTNAME =	gofer230a
 PKGNAME =	gofer-2.30a
-CATEGORIES+=	lang
+CATEGORIES=	lang
 MASTER_SITES =	ftp://cs.nott.ac.uk/nott-fp/languages/haskell/gofer/
 
+MAINTAINER=	hsu@FreeBSD.org
+
 WRKSRC = ${WRKDIR}/src
 LIBDIR = ${PREFIX}/lib/Gofer
 
 do-install:
-	${MKDIR} -p ${LIBDIR}
+	${MKDIR} ${LIBDIR}
 	${INSTALL_DATA} ${WRKDIR}/*.prelude ${LIBDIR}
 	${INSTALL_DATA} ${WRKDIR}/src/prelude.h ${LIBDIR}
 	${INSTALL_DATA} ${WRKDIR}/src/gofc.h ${LIBDIR}
@@ -29,7 +31,7 @@ do-install:
 .if !defined(NOMANCOMPRESS)
 	gzip -9nf ${PREFIX}/man/man1/gofer.1
 .endif
-	${MKDIR} -p ${LIBDIR}/docs
+	${MKDIR} ${LIBDIR}/docs
 	${INSTALL_DATA} ${WRKDIR}/docs/* ${LIBDIR}/docs
 
 .include <bsd.port.mk>
diff --git a/lang/STk/Makefile b/lang/STk/Makefile
index 68787be2c166..02461b27c4aa 100644
--- a/lang/STk/Makefile
+++ b/lang/STk/Makefile
@@ -3,11 +3,11 @@
 # Date created:         17 Sep 96 
 # Whom:                 jmacd@cs.berkeley.edu
 #
-# $Id$
+# $Id: Makefile,v 1.11 1996/09/17 23:55:28 jmacd Exp $
 #
 
 DISTNAME=       STk-3.1
-CATEGORIES+=	lang
+CATEGORIES=	lang
 MASTER_SITES=	ftp://kaolin.unice.fr/pub/
 
 MAINTAINER=	jmacd@FreeBSD.ORG
diff --git a/lang/Sather/Makefile b/lang/Sather/Makefile
index d3ba1d756307..b4b82d3248ab 100644
--- a/lang/Sather/Makefile
+++ b/lang/Sather/Makefile
@@ -3,26 +3,28 @@
 # Date created:         Mon Oct 31 22:04:12 PST 1994
 # Whom:                 hsu
 #
-# $Id: Makefile,v 1.10 1995/11/22 13:12:26 asami Exp $
+# $Id: Makefile,v 1.11 1996/03/07 13:00:53 asami Exp $
 #
 
 DISTNAME=       Sather-1.0.5
 PKGNAME=        sather-1.0.5
-CATEGORIES+=	lang
+CATEGORIES=	lang
 MASTER_SITES=   ftp://ftp.icsi.berkeley.edu/pub/sather/
 
+MAINTAINER=	ports@FreeBSD.org
+
 WRKSRC=		${WRKDIR}/Sather
 ALL_TARGET=	testall
 
 do-install:
-	install -c -m 555 ${WRKSRC}/Compiler/cs ${PREFIX}/bin
-	install -c -m 444 ${WRKSRC}/Doc/man/man1/cs.1 ${PREFIX}/man/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/Compiler/cs ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/Doc/man/man1/cs.1 ${PREFIX}/man/man1
 	-gzip -9nf ${PREFIX}/man/man1/cs.1
-	mkdir -p ${PREFIX}/share/doc/sather
-	install -c -m 444 ${WRKSRC}/Doc/License ${PREFIX}/share/doc/sather
+	${MKDIR} ${PREFIX}/share/doc/sather
+	${INSTALL_DATA} ${WRKSRC}/Doc/License ${PREFIX}/share/doc/sather
 .if !defined(NOPORTDOCS)
 .for file in Bugs Changes Contributing FAQ README manual.ps
-	install -c -m 444 ${WRKSRC}/Doc/${file} ${PREFIX}/share/doc/sather
+	${INSTALL_DATA} ${WRKSRC}/Doc/${file} ${PREFIX}/share/doc/sather
 .endfor
 .endif
 
diff --git a/lang/bwbasic/Makefile b/lang/bwbasic/Makefile
index 4e9b0805e292..d8bc4cdf5b6d 100644
--- a/lang/bwbasic/Makefile
+++ b/lang/bwbasic/Makefile
@@ -3,11 +3,11 @@
 # Date created:		9 Aug 1995
 # Whom:			msmith@atrad.adelaide.edu.au
 #
-# $Id: Makefile,v 1.2 1995/08/09 14:46:58 asami Exp $
+# $Id: Makefile,v 1.3 1995/11/22 13:12:28 asami Exp $
 #
 
 DISTNAME=	bwbasic-2.10
-CATEGORIES+=	lang
+CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.eng.umd.edu/pub/basic/
 
 MAINTAINER=	msmith@atrad.adelaide.edu.au
@@ -19,8 +19,8 @@ GNU_CONFIGURE=	yes
 # test programs in ${PREFIX}/share/bwbasic/bwbtest.
 
 post-install:
-	-mkdir ${PREFIX}/share/bwbasic
-	cp ${WRKSRC}/bwbasic.doc ${PREFIX}/share/bwbasic/
-	cp -r ${WRKSRC}/bwbtest ${PREFIX}/share/bwbasic/
+	-${MKDIR} ${PREFIX}/share/bwbasic
+	${CP} ${WRKSRC}/bwbasic.doc ${PREFIX}/share/bwbasic/
+	${CP} -r ${WRKSRC}/bwbtest ${PREFIX}/share/bwbasic/
 
 .include <bsd.port.mk>
diff --git a/lang/eiffel/Makefile b/lang/eiffel/Makefile
index 81e709cb63bd..71080cfbfc3a 100644
--- a/lang/eiffel/Makefile
+++ b/lang/eiffel/Makefile
@@ -3,12 +3,12 @@
 # Date created:         Thu Sep 14 11:10:01 CDT 1995
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.2 1995/11/22 13:12:31 asami Exp $
+# $Id: Makefile,v 1.3 1996/01/13 07:03:07 asami Exp $
 #
 
 DISTNAME=	eiffels13a
 PKGNAME=	eiffel-13a
-CATEGORIES+=	lang
+CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.cm.cf.ac.uk/pub/Eiffel/SIG/Eiffel-S-1.3/BSD/
 EXTRACT_SUFX=	.freebsd.tar.gz
 
diff --git a/lang/elk/Makefile b/lang/elk/Makefile
index 2af84cc0d727..cbe73dd3fbcc 100644
--- a/lang/elk/Makefile
+++ b/lang/elk/Makefile
@@ -3,12 +3,12 @@
 # Date created:         08 March 1995
 # Whom:                 thomas@ghpc8.ihf.rwth-aachen.de
 #
-# $Id: Makefile,v 1.10 1996/03/06 08:20:07 asami Exp $
+# $Id: Makefile,v 1.11 1996/11/08 07:32:48 tg Exp $
 #
 
 DISTNAME=	elk-3.0
 PKGNAME=	elk-3.0.2
-CATEGORIES+=	lang
+CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.uni-bremen.de/pub/programming/languages/scheme/elk/ \
 		ftp://crl.dec.com/pub/X11/contrib/devel_tools/ \
 		ftp://ftp.th-darmstadt.de/pub/X11/contrib/devel_tools/
diff --git a/lang/expect/Makefile b/lang/expect/Makefile
index b23bc0fb3cd7..47b7bb0f0999 100644
--- a/lang/expect/Makefile
+++ b/lang/expect/Makefile
@@ -3,25 +3,25 @@
 # Date created:		20 November 1994
 # Whom:			pst
 #
-# $Id: Makefile,v 1.10 1996/02/07 09:36:41 asami Exp $
+# $Id: Makefile,v 1.11 1996/10/30 09:46:01 peter Exp $
 #
 
 DISTNAME=	expect-5.21
-CATEGORIES+=	lang
+CATEGORIES=	lang
 MASTER_SITES=	http://expect.nist.gov/ \
 		ftp://expect.nist.gov/mel/div826/subject/expect/
 DISTFILES=	expect.tar.gz
 
 LIB_DEPENDS=	tk41\\.1\\.:${PORTSDIR}/x11/tk41
 
-test:
-	@(cd ${WRKSRC}; make test)
-
 HAS_CONFIGURE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS= --enable-shared --with-tclconfig=/usr/libdata/tcl \
 		--with-tclinclude=/usr/include/tcl
 
+test:
+	@(cd ${WRKSRC}; make test)
+
 # Sigh, all this just to get tkInt.h..
 post-extract:
 	(cd ${PORTSDIR}/x11/tk41 && make extract)
diff --git a/lang/forth/Makefile b/lang/forth/Makefile
index 3c462a192814..0e77c3e103b1 100644
--- a/lang/forth/Makefile
+++ b/lang/forth/Makefile
@@ -3,19 +3,17 @@
 # Date created:         23 November 1994
 # Whom:                 mr
 #
-# $Id: Makefile,v 1.6 1995/04/24 11:29:06 asami Exp $
+# $Id: Makefile,v 1.7 1995/11/22 13:12:39 asami Exp $
 #
 
-#This is pfe Version 0.9.9
-#By mr
 DISTNAME=	pfe099
 PKGNAME=	pfe-0.9.9
-DISTFILES=	pfe-0.9.9.tar.gz
-CATEGORIES+=	lang
+CATEGORIES=	lang
 MASTER_SITES=	ftp://sunsite.unc.edu/pub/languages/forth/
+DISTFILES=	pfe-0.9.9.tar.gz
 
 pre-install:
-	@cp ${WRKSRC}/pfe.1 ${PREFIX}/man/man1/pfe.1
+	@${CP} ${WRKSRC}/pfe.1 ${PREFIX}/man/man1/pfe.1
 	@gzip -9nf ${PREFIX}/man/man1/pfe.1
 
 .include <bsd.port.mk>
diff --git a/lang/gcl/Makefile b/lang/gcl/Makefile
index 6481e7dc9647..2e7206e99065 100644
--- a/lang/gcl/Makefile
+++ b/lang/gcl/Makefile
@@ -3,13 +3,16 @@
 # Date created:         Wed Feb  8 01:49:11  1995
 # Whom:                 hsu
 #
-# $Id: Makefile,v 1.5 1995/04/24 11:29:11 asami Exp $
+# $Id: Makefile,v 1.6 1995/11/22 13:12:44 asami Exp $
 #
 
 DISTNAME=       gcl-2.0
-CATEGORIES+=	lang
+CATEGORIES=	lang
 MASTER_SITES=   ftp://ftp.cli.com/pub/gcl/ ftp://math.utexas.edu/pub/gcl/
 EXTRACT_SUFX=	.tgz
+
+MAINTAINER=	ports@FreeBSD.org
+
 MAKEFILE=	makefile
 
 do-install:
diff --git a/lang/gnat/Makefile b/lang/gnat/Makefile
index 94b431c66f79..a168dd714a75 100644
--- a/lang/gnat/Makefile
+++ b/lang/gnat/Makefile
@@ -5,13 +5,14 @@
 # Date created:         Sat Mar 18 02:16:45 1995
 # Porter:               nils@guru.ims.uni-stuttgart.de
 #
-# $Id: Makefile,v 1.6 1995/11/22 13:12:46 asami Exp $
+# $Id: Makefile,v 1.7 1996/04/12 08:33:25 asami Exp $
 
 DISTNAME=       gnat-2.03-src
 PKGNAME=        gnat-2.03
-CATEGORIES+=	lang
+CATEGORIES=	lang
 MASTER_SITES=   ftp://cs.nyu.edu/pub/gnat/
-EXTRACT_SUFX=	.tar.gz
+
+MAINTAINER=	nils@guru.ims.uni-stuttgart.de
 
 .if !exists(/usr/local/bin/gnatf)
 BROKEN=		yes	# requires existing gnat compiler
diff --git a/lang/guile/Makefile b/lang/guile/Makefile
index 42bb818c37d0..8780e1784aa8 100644
--- a/lang/guile/Makefile
+++ b/lang/guile/Makefile
@@ -3,12 +3,12 @@
 # Date created:         29 Aug 1995
 # Whom:                 jkh@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.3 1995/11/22 13:12:49 asami Exp $
+# $Id: Makefile,v 1.5 1996/06/16 06:52:22 jkh Exp $
 #
 
 DISTNAME= 	guile-iii
 PKGNAME=	guile-iii
-CATEGORIES+=	lang
+CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.cygnus.com/pub/lord/guile-iii/
 
 MAINTAINER=	jkh@FreeBSD.ORG
diff --git a/lang/icon/Makefile b/lang/icon/Makefile
index 97957b1d367d..f549b27b3f71 100644
--- a/lang/icon/Makefile
+++ b/lang/icon/Makefile
@@ -3,12 +3,12 @@
 # Date created:         05 April 1995
 # Whom:                 thomas@ghpc8.ihf.rwth-aachen.de
 #
-# $Id: Makefile,v 1.4 1995/11/22 13:12:50 asami Exp $
+# $Id: Makefile,v 1.5 1996/11/05 08:33:57 tg Exp $
 #
 
 DISTNAME=       icon-9.1
 DISTFILES=	unix.tar.gz
-CATEGORIES+=	lang
+CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.cs.arizona.edu/icon/packages/unix/
 
 MAINTAINER=	ports@freebsd.org
diff --git a/lang/itcl/Makefile b/lang/itcl/Makefile
index 6c921280df8d..2e2d2f4c22f5 100644
--- a/lang/itcl/Makefile
+++ b/lang/itcl/Makefile
@@ -3,12 +3,12 @@
 # Date created:		Aug 17 1996
 # Whom:			chuckr
 #
-# $Id: Makefile,v 1.13 1996/08/25 23:47:09 chuckr Exp $
+# $Id: Makefile,v 1.14 1996/08/26 03:00:41 chuckr Exp $
 #
 
 DISTNAME=	itcl2.1
 PKGNAME=	itcl-2.1
-CATEGORIES+=	lang
+CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.neosoft.com/pub/tcl/NEW/
 
 MAINTAINER=	chuckr@freebsd.org
diff --git a/lang/logo/Makefile b/lang/logo/Makefile
index ed49c7820289..d1e6976ff4a7 100644
--- a/lang/logo/Makefile
+++ b/lang/logo/Makefile
@@ -3,11 +3,11 @@
 # Date created:		22 October 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.8 1995/08/16 23:55:38 jkh Exp $
+# $Id: Makefile,v 1.9 1995/11/22 13:12:54 asami Exp $
 #
 
 DISTNAME=	ucblogo-3.3
-CATEGORIES+=	lang
+CATEGORIES=	lang
 MASTER_SITES=	ftp://gatekeeper.dec.com/pub/GNU/
 
 MAINTAINER=	jmacd@FreeBSD.ORG
diff --git a/lang/mit-scheme/Makefile b/lang/mit-scheme/Makefile
index 5d317435f62e..457d66c589c7 100644
--- a/lang/mit-scheme/Makefile
+++ b/lang/mit-scheme/Makefile
@@ -6,7 +6,7 @@
 
 DISTNAME=       mit-scheme
 PKGNAME=	mit-scheme-7.3
-CATEGORIES+=	lang
+CATEGORIES=	lang
 MASTER_SITES=   ftp://freefall.freebsd.org/pub/FreeBSD/LOCAL_PORTS/
 DISTFILES=	scheme-microcode+dist-7.3-freebsd.tgz
 
diff --git a/lang/modula-3-lib/Makefile b/lang/modula-3-lib/Makefile
index 1054f5826b3b..faf31c31a1f0 100644
--- a/lang/modula-3-lib/Makefile
+++ b/lang/modula-3-lib/Makefile
@@ -3,11 +3,11 @@
 # Date created:		28 Oct 1996
 # Whom:			John Polstra <jdp@polstra.com>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1996/10/29 23:01:51 jdp Exp $
 #
 
 DISTNAME=	modula-3-lib-3.6
-CATEGORIES+=	lang
+CATEGORIES=	lang
 MASTER_SITES=	ftp://freefall.FreeBSD.ORG/pub/FreeBSD/LOCAL_PORTS/
 DISTFILES=	m3-fbsd-src-3.6.tar.gz m3-fbsd-m3cc-3.6.tar.gz
 # Note: Depending on what is already installed on the system, the code
@@ -73,34 +73,34 @@ post-extract:
 	    chmod +x config.sub configure move-if-change
 
 do-build:
-	@test -d ${temp_prefix}/bin || mkdir -p ${temp_prefix}/bin
-	@test -d ${temp_prefix}/man/man1 || mkdir -p ${temp_prefix}/man/man1
+	@test -d ${temp_prefix}/bin || ${MKDIR} ${temp_prefix}/bin
+	@test -d ${temp_prefix}/man/man1 || ${MKDIR} ${temp_prefix}/man/man1
 	@test -d ${temp_prefix}/lib/m3/pkg/m3build/templates || \
-	    mkdir -p ${temp_prefix}/lib/m3/pkg/m3build/templates
+	    ${MKDIR} ${temp_prefix}/lib/m3/pkg/m3build/templates
 	@echo "++++++++++ quake ++++++++++"
 	@test -d ${WRKSRC}/m3/quake/FreeBSD2 || \
-	    mkdir -p ${WRKSRC}/m3/quake/FreeBSD2
+	    ${MKDIR} ${WRKSRC}/m3/quake/FreeBSD2
 	@cd ${WRKSRC}/m3/quake/FreeBSD2; \
 	    make -f ../src/makefile TARGET=FreeBSD2 COPT=-O CDEBUG= ; \
-	    cp -p quake ${temp_prefix}/bin; \
-	    cp -p ../src/quake.1 ${temp_prefix}/man/man1
+	    ${CP} -p quake ${temp_prefix}/bin; \
+	    ${CP} -p ../src/quake.1 ${temp_prefix}/man/man1
 	@echo "++++++++++ m3build ++++++++++"
 	@cd ${WRKSRC}/m3/m3build; \
 	    PATH=${temp_prefix}/bin:$$PATH ./build FreeBSD2; \
-	    cp -p FreeBSD2/m3build FreeBSD2/m3ship FreeBSD2/m3where \
+	    ${CP} -p FreeBSD2/m3build FreeBSD2/m3ship FreeBSD2/m3where \
 		${temp_prefix}/bin; \
-	    cp -p FreeBSD2/m3mkdir ${temp_prefix}/lib/m3/FreeBSD2; \
-	    cp -p templates/CLEANUP templates/COMMON templates/COMMON.BOOT \
+	    ${CP} -p FreeBSD2/m3mkdir ${temp_prefix}/lib/m3/FreeBSD2; \
+	    ${CP} -p templates/CLEANUP templates/COMMON templates/COMMON.BOOT \
 		templates/FreeBSD2 templates/PLATFORMS templates/POSIX \
 		${temp_prefix}/lib/m3/pkg/m3build/templates; \
-	    cp -p FreeBSD2/m3build.1 FreeBSD2/m3ship.1 FreeBSD2/m3where.1 \
+	    ${CP} -p FreeBSD2/m3build.1 FreeBSD2/m3ship.1 FreeBSD2/m3where.1 \
 		${temp_prefix}/man/man1
 	@echo "++++++++++ m3cc ++++++++++"
-	@test -d ${WRKSRC}/m3cc/FreeBSD2 || mkdir -p ${WRKSRC}/m3cc/FreeBSD2
+	@test -d ${WRKSRC}/m3cc/FreeBSD2 || ${MKDIR} ${WRKSRC}/m3cc/FreeBSD2
 	@cd ${WRKSRC}/m3cc/FreeBSD2; \
 	    ../gcc/configure i486-unknown-freebsd; \
 	    make m3cgc1 CC=cc CFLAGS=-O; \
-	    cp -p m3cgc1 ${temp_prefix}/lib/m3/FreeBSD2
+	    ${CP} -p m3cgc1 ${temp_prefix}/lib/m3/FreeBSD2
 	@echo "++++++++++ everything else ++++++++++"
 	@cd ${WRKSRC}/m3; \
 	    LD_LIBRARY_PATH=${temp_prefix}/lib/m3/FreeBSD2:$$LD_LIBRARY_PATH; \
@@ -117,14 +117,14 @@ do-install:
 	@cd ${temp_prefix}; \
 	    umask 022; \
 	    grep '^lib/m3/' ${PKGDIR}/PLIST | \
-		cpio -dump -R ${BINOWN}.${BINGRP} ${PREFIX}
+		${CP} -dump -R ${BINOWN}.${BINGRP} ${PREFIX}
 	@cd ${PREFIX}; \
 	    grep '^lib/m3/' ${PKGDIR}/PLIST | xargs chmod go=u-w; \
 	    find -X lib/m3 -type d | xargs chown ${BINOWN}.${BINGRP}; \
 	    find -X lib/m3 -type d | xargs chmod 755
 	@if [ ! -f ${startup_script} ]; then \
 	    echo "Installing ${startup_script} file"; \
-	    test -d ${startup_dir} || mkdir -p ${startup_dir}; \
+	    test -d ${startup_dir} || ${MKDIR} ${startup_dir}; \
 	    echo "#!/bin/sh" > ${startup_script}; \
 	    echo "echo -n ' Modula-3'" >> ${startup_script}; \
 	    echo "/sbin/ldconfig -m ${PREFIX}/lib/m3/FreeBSD2" \
diff --git a/lang/modula-3-socks/Makefile b/lang/modula-3-socks/Makefile
index f8ee0777fce4..f67f65db4bac 100644
--- a/lang/modula-3-socks/Makefile
+++ b/lang/modula-3-socks/Makefile
@@ -3,12 +3,12 @@
 # Date created:		31 Oct 1996
 # Whom:			John Polstra <jdp@polstra.com>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1996/11/01 02:37:33 jdp Exp $
 #
 
 DISTNAME=	modula-3-socks
 PKGNAME=	modula-3-socks-1.0
-CATEGORIES+=	lang
+CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.cup.hp.com/dist/socks/A.B9.06/
 DISTFILES=	socks.tar.gz
 
@@ -25,20 +25,20 @@ libm3socks_files=	accept.c bind.c close.c connect.c dup.c dup2.c \
 m3socks_files=		m3socks.sh m3socks.1 m3socks.conf.5
 
 post-extract:
-	@cp -p ${FILESDIR}/Makefile.top ${WRKSRC}/Makefile
-	@test -d ${WRKSRC}/libm3socks || mkdir ${WRKSRC}/libm3socks
+	@${CP} -p ${FILESDIR}/Makefile.top ${WRKSRC}/Makefile
+	@test -d ${WRKSRC}/libm3socks || ${MKDIR} ${WRKSRC}/libm3socks
 	@cd ${FILESDIR}; \
-	    cp -p Makefile.libm3socks ${WRKSRC}/libm3socks/Makefile; \
-	    cp -p ${libm3socks_files} ${WRKSRC}/libm3socks
-	@test -d ${WRKSRC}/m3socks || mkdir ${WRKSRC}/m3socks
+	    ${CP} -p Makefile.libm3socks ${WRKSRC}/libm3socks/Makefile; \
+	    ${CP} -p ${libm3socks_files} ${WRKSRC}/libm3socks
+	@test -d ${WRKSRC}/m3socks || ${MKDIR} ${WRKSRC}/m3socks
 	@cd ${FILESDIR}; \
-	    cp -p Makefile.m3socks ${WRKSRC}/m3socks/Makefile; \
-	    cp -p ${m3socks_files} ${WRKSRC}/m3socks
+	    ${CP} -p Makefile.m3socks ${WRKSRC}/m3socks/Makefile; \
+	    ${CP} -p ${m3socks_files} ${WRKSRC}/m3socks
 
 pre-install:
 	@cd ${PREFIX}/lib; \
 	    test -d m3/FreeBSD2 || { \
-		mkdir -p m3/FreeBSD2; \
+		${MKDIR} m3/FreeBSD2; \
 		chown ${BINOWN}.${BINGRP} m3 m3/FreeBSD2; \
 	    }
 
diff --git a/lang/modula-3/Makefile b/lang/modula-3/Makefile
index ae4e11771305..2f579664d306 100644
--- a/lang/modula-3/Makefile
+++ b/lang/modula-3/Makefile
@@ -3,11 +3,11 @@
 # Date created:		18 Mar 1996
 # Whom:			John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.7 1996/10/29 23:14:05 jdp Exp $
+# $Id: Makefile,v 1.8 1996/11/01 20:27:12 jdp Exp $
 #
 
 DISTNAME=	modula-3-3.6
-CATEGORIES+=	lang
+CATEGORIES=	lang
 DISTFILES=
 
 MAINTAINER=	jdp@polstra.com
@@ -56,7 +56,7 @@ do-install:
 	    export LD_LIBRARY_PATH PATH; \
 	    umask 022; \
 	    rm -rf FreeBSD2; \
-	    mkdir FreeBSD2; \
+	    ${MKDIR} FreeBSD2; \
 	    cd FreeBSD2; \
 	    quake -D_bootstrap -D_all -DPACKAGE_DIR=${WRKSRC}/m3/m3build \
 		-DPACKAGE=m3build -DBUILD_DIR=FreeBSD2 \
diff --git a/lang/moscow_ml/Makefile b/lang/moscow_ml/Makefile
index 468643fe7210..4b6d5e13ea27 100644
--- a/lang/moscow_ml/Makefile
+++ b/lang/moscow_ml/Makefile
@@ -3,12 +3,12 @@
 # Date created:         26 July 1996
 # Whom:                 chuckr
 #
-# $Id: Makefile,v 1.4 1996/07/30 01:24:55 chuckr Exp $
+# $Id: Makefile,v 1.5 1996/10/11 18:58:01 asami Exp $
 #
 
 DISTNAME=       mos14src
 PKGNAME=        moscow_ml-1.4
-CATEGORIES+=	lang
+CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.dina.kvl.dk/pub/mosml/ \
 		ftp://ftp.csd.uu.se/pub/mirror/mosml/ \
 		ftp://ftp.dcs.ed.ac.uk/pub/ml/Moscow/
@@ -20,14 +20,14 @@ WRKSRC=		${WRKDIR}/mosml/src
 
 post-install:
 .if !defined(NOPORTDOCS)
-	mkdir -p ${PREFIX}/moscow_ml/doc
-	mkdir -p ${PREFIX}/moscow_ml/examples
+	${MKDIR} ${PREFIX}/moscow_ml/doc
+	${MKDIR} ${PREFIX}/moscow_ml/examples
 	for file in ${WRKDIR}/mosml/doc/*;do \
 	${INSTALL_DATA} $${file} ${PREFIX}/moscow_ml/doc;done
 	(cd ${WRKDIR}/mosml/examples; \
 	${INSTALL_DATA} README ${PREFIX}/moscow_ml/examples; \
 	for sdirs in manual mls helpsigs calc pretty lexyacc;do \
-	mkdir -p ${PREFIX}/moscow_ml/examples/$${sdirs}; \
+	${MKDRI} ${PREFIX}/moscow_ml/examples/$${sdirs}; \
 	for file in $${sdirs}/*;do \
 	${INSTALL_DATA} $${file} ${PREFIX}/moscow_ml/examples/$${sdirs}; \
 	done; done;)
diff --git a/lang/p2c/Makefile b/lang/p2c/Makefile
index f90e0384584d..4ae43ecadaa6 100644
--- a/lang/p2c/Makefile
+++ b/lang/p2c/Makefile
@@ -3,23 +3,23 @@
 # Date created:         4 October 1994
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.6 1995/04/16 21:24:49 asami Exp $
+# $Id: Makefile,v 1.7 1995/11/22 13:12:58 asami Exp $
 #
 
 DISTNAME=	p2c-1.21alpha-07.Dec.93
 PKGNAME=	p2c-1.21a
-CATEGORIES+=	lang
+CATEGORIES=	lang
 MASTER_SITES=	ftp://src.doc.ic.ac.uk/gnu/hurd/
 DISTFILES=	p2c-1.21alpha2.tar.gz
 
 MAINTAINER=	jmz@FreeBSD.org
 
 pre-install: build
-	@mkdir -p ${PREFIX}/bin
-	@mkdir -p ${PREFIX}/lib
-	@mkdir -p ${PREFIX}/man/man1
-	@mkdir -p ${PREFIX}/include/p2c
-	@cp ${WRKSRC}/src/p2cc.man ${PREFIX}/man/man1/p2cc.1
+	@${MKDIR} ${PREFIX}/bin
+	@${MKDIR} ${PREFIX}/lib
+	@${MKDIR} ${PREFIX}/man/man1
+	@${MKDIR} ${PREFIX}/include/p2c
+	@${INSTALL_MAN} ${WRKSRC}/src/p2cc.man ${PREFIX}/man/man1/p2cc.1
 
 .include <bsd.port.mk>
 
diff --git a/lang/pbasic/Makefile b/lang/pbasic/Makefile
index 059321ee062e..8179f8968095 100644
--- a/lang/pbasic/Makefile
+++ b/lang/pbasic/Makefile
@@ -3,12 +3,12 @@
 # Date created:		13th August 1995
 # Whom:			Julian Stacey <jhs@freebsd.org>
 #
-# $Id: Makefile,v 1.2 1995/11/22 13:13:02 asami Exp $
+# $Id: Makefile,v 1.3 1996/03/06 08:20:10 asami Exp $
 #
 
 DISTNAME=	pbasic-2.0-950813
 PKGNAME=	pbasic-2.0
-CATEGORIES+=	lang
+CATEGORIES=	lang
 MASTER_SITES=	ftp://freefall.freebsd.org/pub/FreeBSD/LOCAL_PORTS/
 
 MAINTAINER=	asami@FreeBSD.ORG
@@ -23,8 +23,8 @@ do-configure:
 			pdp11 cursor/cursor.dos cursor/cursor.ukc 
 
 do-install:
-	install -c -s -m 775 ${WRKSRC}/basic ${PREFIX}/bin/pbasic
-	install -c -m 644 ${WRKSRC}/docs/basic.1 ${PREFIX}/man/man1/pbasic.1
+	${INSTALL_PROGRAM} ${WRKSRC}/basic ${PREFIX}/bin/pbasic
+	${INSTALL_MAN} ${WRKSRC}/docs/basic.1 ${PREFIX}/man/man1/pbasic.1
 .if !defined(NOMANCOMPRESS)
 	gzip -9nf ${PREFIX}/man/man1/pbasic.1
 .endif
diff --git a/lang/perl5.10/Makefile b/lang/perl5.10/Makefile
index ba3e58fd6c01..59b6628e19f6 100644
--- a/lang/perl5.10/Makefile
+++ b/lang/perl5.10/Makefile
@@ -3,12 +3,12 @@
 # Date created:		16 April 1995
 # Whom:			markm
 #
-# $Id: Makefile,v 1.9 1996/03/18 01:01:44 asami Exp $
+# $Id: Makefile,v 1.10 1996/07/13 19:29:37 markm Exp $
 #
 
 DISTNAME=	perl5.003
 PKGNAME=	perl-5.003
-CATEGORIES+=	lang devel
+CATEGORIES=	lang devel
 MASTER_SITES=	ftp://ftp.funet.fi/pub/languages/perl/CPAN/src/5.0/ \
 		ftp://ftp.is.co.za/pub/perl/CPAN/src/5.0/ \
 		ftp://dong.math.ncu.edu.tw/perl/CPAN/src/5.0/ \
diff --git a/lang/perl5.12/Makefile b/lang/perl5.12/Makefile
index ba3e58fd6c01..59b6628e19f6 100644
--- a/lang/perl5.12/Makefile
+++ b/lang/perl5.12/Makefile
@@ -3,12 +3,12 @@
 # Date created:		16 April 1995
 # Whom:			markm
 #
-# $Id: Makefile,v 1.9 1996/03/18 01:01:44 asami Exp $
+# $Id: Makefile,v 1.10 1996/07/13 19:29:37 markm Exp $
 #
 
 DISTNAME=	perl5.003
 PKGNAME=	perl-5.003
-CATEGORIES+=	lang devel
+CATEGORIES=	lang devel
 MASTER_SITES=	ftp://ftp.funet.fi/pub/languages/perl/CPAN/src/5.0/ \
 		ftp://ftp.is.co.za/pub/perl/CPAN/src/5.0/ \
 		ftp://dong.math.ncu.edu.tw/perl/CPAN/src/5.0/ \
diff --git a/lang/perl5.14/Makefile b/lang/perl5.14/Makefile
index ba3e58fd6c01..59b6628e19f6 100644
--- a/lang/perl5.14/Makefile
+++ b/lang/perl5.14/Makefile
@@ -3,12 +3,12 @@
 # Date created:		16 April 1995
 # Whom:			markm
 #
-# $Id: Makefile,v 1.9 1996/03/18 01:01:44 asami Exp $
+# $Id: Makefile,v 1.10 1996/07/13 19:29:37 markm Exp $
 #
 
 DISTNAME=	perl5.003
 PKGNAME=	perl-5.003
-CATEGORIES+=	lang devel
+CATEGORIES=	lang devel
 MASTER_SITES=	ftp://ftp.funet.fi/pub/languages/perl/CPAN/src/5.0/ \
 		ftp://ftp.is.co.za/pub/perl/CPAN/src/5.0/ \
 		ftp://dong.math.ncu.edu.tw/perl/CPAN/src/5.0/ \
diff --git a/lang/perl5.16/Makefile b/lang/perl5.16/Makefile
index ba3e58fd6c01..59b6628e19f6 100644
--- a/lang/perl5.16/Makefile
+++ b/lang/perl5.16/Makefile
@@ -3,12 +3,12 @@
 # Date created:		16 April 1995
 # Whom:			markm
 #
-# $Id: Makefile,v 1.9 1996/03/18 01:01:44 asami Exp $
+# $Id: Makefile,v 1.10 1996/07/13 19:29:37 markm Exp $
 #
 
 DISTNAME=	perl5.003
 PKGNAME=	perl-5.003
-CATEGORIES+=	lang devel
+CATEGORIES=	lang devel
 MASTER_SITES=	ftp://ftp.funet.fi/pub/languages/perl/CPAN/src/5.0/ \
 		ftp://ftp.is.co.za/pub/perl/CPAN/src/5.0/ \
 		ftp://dong.math.ncu.edu.tw/perl/CPAN/src/5.0/ \
diff --git a/lang/perl5.6/Makefile b/lang/perl5.6/Makefile
index ba3e58fd6c01..59b6628e19f6 100644
--- a/lang/perl5.6/Makefile
+++ b/lang/perl5.6/Makefile
@@ -3,12 +3,12 @@
 # Date created:		16 April 1995
 # Whom:			markm
 #
-# $Id: Makefile,v 1.9 1996/03/18 01:01:44 asami Exp $
+# $Id: Makefile,v 1.10 1996/07/13 19:29:37 markm Exp $
 #
 
 DISTNAME=	perl5.003
 PKGNAME=	perl-5.003
-CATEGORIES+=	lang devel
+CATEGORIES=	lang devel
 MASTER_SITES=	ftp://ftp.funet.fi/pub/languages/perl/CPAN/src/5.0/ \
 		ftp://ftp.is.co.za/pub/perl/CPAN/src/5.0/ \
 		ftp://dong.math.ncu.edu.tw/perl/CPAN/src/5.0/ \
diff --git a/lang/perl5.8/Makefile b/lang/perl5.8/Makefile
index ba3e58fd6c01..59b6628e19f6 100644
--- a/lang/perl5.8/Makefile
+++ b/lang/perl5.8/Makefile
@@ -3,12 +3,12 @@
 # Date created:		16 April 1995
 # Whom:			markm
 #
-# $Id: Makefile,v 1.9 1996/03/18 01:01:44 asami Exp $
+# $Id: Makefile,v 1.10 1996/07/13 19:29:37 markm Exp $
 #
 
 DISTNAME=	perl5.003
 PKGNAME=	perl-5.003
-CATEGORIES+=	lang devel
+CATEGORIES=	lang devel
 MASTER_SITES=	ftp://ftp.funet.fi/pub/languages/perl/CPAN/src/5.0/ \
 		ftp://ftp.is.co.za/pub/perl/CPAN/src/5.0/ \
 		ftp://dong.math.ncu.edu.tw/perl/CPAN/src/5.0/ \
diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile
index ba3e58fd6c01..59b6628e19f6 100644
--- a/lang/perl5/Makefile
+++ b/lang/perl5/Makefile
@@ -3,12 +3,12 @@
 # Date created:		16 April 1995
 # Whom:			markm
 #
-# $Id: Makefile,v 1.9 1996/03/18 01:01:44 asami Exp $
+# $Id: Makefile,v 1.10 1996/07/13 19:29:37 markm Exp $
 #
 
 DISTNAME=	perl5.003
 PKGNAME=	perl-5.003
-CATEGORIES+=	lang devel
+CATEGORIES=	lang devel
 MASTER_SITES=	ftp://ftp.funet.fi/pub/languages/perl/CPAN/src/5.0/ \
 		ftp://ftp.is.co.za/pub/perl/CPAN/src/5.0/ \
 		ftp://dong.math.ncu.edu.tw/perl/CPAN/src/5.0/ \
diff --git a/lang/python+ipv6/Makefile b/lang/python+ipv6/Makefile
index 462301361731..b73a80dad343 100644
--- a/lang/python+ipv6/Makefile
+++ b/lang/python+ipv6/Makefile
@@ -3,12 +3,12 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.7 1996/10/14 23:14:37 asami Exp $
+# $Id: Makefile,v 1.8 1996/11/02 19:04:22 jkh Exp $
 #
 
 DISTNAME=       python1.4
 PKGNAME=        python-1.4
-CATEGORIES+=	lang
+CATEGORIES=	lang
 MASTER_SITES=	ftp://www.python.org/pub/python/src/ \
 		ftp://ftp.cwi.nl/pub/python/src/
 
@@ -23,7 +23,7 @@ MAKE_FLAGS+=	'OPT=${CFLAGS}'
 INSTALL_TARGET=	install
 
 post-configure:
-	cp ${FILESDIR}/Setup ${WRKSRC}/Modules
+	${CP} ${FILESDIR}/Setup ${WRKSRC}/Modules
 
 post-install:
 	strip ${PREFIX}/bin/python
diff --git a/lang/python-devel/Makefile b/lang/python-devel/Makefile
index 462301361731..b73a80dad343 100644
--- a/lang/python-devel/Makefile
+++ b/lang/python-devel/Makefile
@@ -3,12 +3,12 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.7 1996/10/14 23:14:37 asami Exp $
+# $Id: Makefile,v 1.8 1996/11/02 19:04:22 jkh Exp $
 #
 
 DISTNAME=       python1.4
 PKGNAME=        python-1.4
-CATEGORIES+=	lang
+CATEGORIES=	lang
 MASTER_SITES=	ftp://www.python.org/pub/python/src/ \
 		ftp://ftp.cwi.nl/pub/python/src/
 
@@ -23,7 +23,7 @@ MAKE_FLAGS+=	'OPT=${CFLAGS}'
 INSTALL_TARGET=	install
 
 post-configure:
-	cp ${FILESDIR}/Setup ${WRKSRC}/Modules
+	${CP} ${FILESDIR}/Setup ${WRKSRC}/Modules
 
 post-install:
 	strip ${PREFIX}/bin/python
diff --git a/lang/python/Makefile b/lang/python/Makefile
index 462301361731..b73a80dad343 100644
--- a/lang/python/Makefile
+++ b/lang/python/Makefile
@@ -3,12 +3,12 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.7 1996/10/14 23:14:37 asami Exp $
+# $Id: Makefile,v 1.8 1996/11/02 19:04:22 jkh Exp $
 #
 
 DISTNAME=       python1.4
 PKGNAME=        python-1.4
-CATEGORIES+=	lang
+CATEGORIES=	lang
 MASTER_SITES=	ftp://www.python.org/pub/python/src/ \
 		ftp://ftp.cwi.nl/pub/python/src/
 
@@ -23,7 +23,7 @@ MAKE_FLAGS+=	'OPT=${CFLAGS}'
 INSTALL_TARGET=	install
 
 post-configure:
-	cp ${FILESDIR}/Setup ${WRKSRC}/Modules
+	${CP} ${FILESDIR}/Setup ${WRKSRC}/Modules
 
 post-install:
 	strip ${PREFIX}/bin/python
diff --git a/lang/python15/Makefile b/lang/python15/Makefile
index 462301361731..b73a80dad343 100644
--- a/lang/python15/Makefile
+++ b/lang/python15/Makefile
@@ -3,12 +3,12 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.7 1996/10/14 23:14:37 asami Exp $
+# $Id: Makefile,v 1.8 1996/11/02 19:04:22 jkh Exp $
 #
 
 DISTNAME=       python1.4
 PKGNAME=        python-1.4
-CATEGORIES+=	lang
+CATEGORIES=	lang
 MASTER_SITES=	ftp://www.python.org/pub/python/src/ \
 		ftp://ftp.cwi.nl/pub/python/src/
 
@@ -23,7 +23,7 @@ MAKE_FLAGS+=	'OPT=${CFLAGS}'
 INSTALL_TARGET=	install
 
 post-configure:
-	cp ${FILESDIR}/Setup ${WRKSRC}/Modules
+	${CP} ${FILESDIR}/Setup ${WRKSRC}/Modules
 
 post-install:
 	strip ${PREFIX}/bin/python
diff --git a/lang/python20/Makefile b/lang/python20/Makefile
index 462301361731..b73a80dad343 100644
--- a/lang/python20/Makefile
+++ b/lang/python20/Makefile
@@ -3,12 +3,12 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.7 1996/10/14 23:14:37 asami Exp $
+# $Id: Makefile,v 1.8 1996/11/02 19:04:22 jkh Exp $
 #
 
 DISTNAME=       python1.4
 PKGNAME=        python-1.4
-CATEGORIES+=	lang
+CATEGORIES=	lang
 MASTER_SITES=	ftp://www.python.org/pub/python/src/ \
 		ftp://ftp.cwi.nl/pub/python/src/
 
@@ -23,7 +23,7 @@ MAKE_FLAGS+=	'OPT=${CFLAGS}'
 INSTALL_TARGET=	install
 
 post-configure:
-	cp ${FILESDIR}/Setup ${WRKSRC}/Modules
+	${CP} ${FILESDIR}/Setup ${WRKSRC}/Modules
 
 post-install:
 	strip ${PREFIX}/bin/python
diff --git a/lang/python21/Makefile b/lang/python21/Makefile
index 462301361731..b73a80dad343 100644
--- a/lang/python21/Makefile
+++ b/lang/python21/Makefile
@@ -3,12 +3,12 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.7 1996/10/14 23:14:37 asami Exp $
+# $Id: Makefile,v 1.8 1996/11/02 19:04:22 jkh Exp $
 #
 
 DISTNAME=       python1.4
 PKGNAME=        python-1.4
-CATEGORIES+=	lang
+CATEGORIES=	lang
 MASTER_SITES=	ftp://www.python.org/pub/python/src/ \
 		ftp://ftp.cwi.nl/pub/python/src/
 
@@ -23,7 +23,7 @@ MAKE_FLAGS+=	'OPT=${CFLAGS}'
 INSTALL_TARGET=	install
 
 post-configure:
-	cp ${FILESDIR}/Setup ${WRKSRC}/Modules
+	${CP} ${FILESDIR}/Setup ${WRKSRC}/Modules
 
 post-install:
 	strip ${PREFIX}/bin/python
diff --git a/lang/python22/Makefile b/lang/python22/Makefile
index 462301361731..b73a80dad343 100644
--- a/lang/python22/Makefile
+++ b/lang/python22/Makefile
@@ -3,12 +3,12 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.7 1996/10/14 23:14:37 asami Exp $
+# $Id: Makefile,v 1.8 1996/11/02 19:04:22 jkh Exp $
 #
 
 DISTNAME=       python1.4
 PKGNAME=        python-1.4
-CATEGORIES+=	lang
+CATEGORIES=	lang
 MASTER_SITES=	ftp://www.python.org/pub/python/src/ \
 		ftp://ftp.cwi.nl/pub/python/src/
 
@@ -23,7 +23,7 @@ MAKE_FLAGS+=	'OPT=${CFLAGS}'
 INSTALL_TARGET=	install
 
 post-configure:
-	cp ${FILESDIR}/Setup ${WRKSRC}/Modules
+	${CP} ${FILESDIR}/Setup ${WRKSRC}/Modules
 
 post-install:
 	strip ${PREFIX}/bin/python
diff --git a/lang/python23/Makefile b/lang/python23/Makefile
index 462301361731..b73a80dad343 100644
--- a/lang/python23/Makefile
+++ b/lang/python23/Makefile
@@ -3,12 +3,12 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.7 1996/10/14 23:14:37 asami Exp $
+# $Id: Makefile,v 1.8 1996/11/02 19:04:22 jkh Exp $
 #
 
 DISTNAME=       python1.4
 PKGNAME=        python-1.4
-CATEGORIES+=	lang
+CATEGORIES=	lang
 MASTER_SITES=	ftp://www.python.org/pub/python/src/ \
 		ftp://ftp.cwi.nl/pub/python/src/
 
@@ -23,7 +23,7 @@ MAKE_FLAGS+=	'OPT=${CFLAGS}'
 INSTALL_TARGET=	install
 
 post-configure:
-	cp ${FILESDIR}/Setup ${WRKSRC}/Modules
+	${CP} ${FILESDIR}/Setup ${WRKSRC}/Modules
 
 post-install:
 	strip ${PREFIX}/bin/python
diff --git a/lang/python24/Makefile b/lang/python24/Makefile
index 462301361731..b73a80dad343 100644
--- a/lang/python24/Makefile
+++ b/lang/python24/Makefile
@@ -3,12 +3,12 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.7 1996/10/14 23:14:37 asami Exp $
+# $Id: Makefile,v 1.8 1996/11/02 19:04:22 jkh Exp $
 #
 
 DISTNAME=       python1.4
 PKGNAME=        python-1.4
-CATEGORIES+=	lang
+CATEGORIES=	lang
 MASTER_SITES=	ftp://www.python.org/pub/python/src/ \
 		ftp://ftp.cwi.nl/pub/python/src/
 
@@ -23,7 +23,7 @@ MAKE_FLAGS+=	'OPT=${CFLAGS}'
 INSTALL_TARGET=	install
 
 post-configure:
-	cp ${FILESDIR}/Setup ${WRKSRC}/Modules
+	${CP} ${FILESDIR}/Setup ${WRKSRC}/Modules
 
 post-install:
 	strip ${PREFIX}/bin/python
diff --git a/lang/python25/Makefile b/lang/python25/Makefile
index 462301361731..b73a80dad343 100644
--- a/lang/python25/Makefile
+++ b/lang/python25/Makefile
@@ -3,12 +3,12 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.7 1996/10/14 23:14:37 asami Exp $
+# $Id: Makefile,v 1.8 1996/11/02 19:04:22 jkh Exp $
 #
 
 DISTNAME=       python1.4
 PKGNAME=        python-1.4
-CATEGORIES+=	lang
+CATEGORIES=	lang
 MASTER_SITES=	ftp://www.python.org/pub/python/src/ \
 		ftp://ftp.cwi.nl/pub/python/src/
 
@@ -23,7 +23,7 @@ MAKE_FLAGS+=	'OPT=${CFLAGS}'
 INSTALL_TARGET=	install
 
 post-configure:
-	cp ${FILESDIR}/Setup ${WRKSRC}/Modules
+	${CP} ${FILESDIR}/Setup ${WRKSRC}/Modules
 
 post-install:
 	strip ${PREFIX}/bin/python
diff --git a/lang/python26/Makefile b/lang/python26/Makefile
index 462301361731..b73a80dad343 100644
--- a/lang/python26/Makefile
+++ b/lang/python26/Makefile
@@ -3,12 +3,12 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.7 1996/10/14 23:14:37 asami Exp $
+# $Id: Makefile,v 1.8 1996/11/02 19:04:22 jkh Exp $
 #
 
 DISTNAME=       python1.4
 PKGNAME=        python-1.4
-CATEGORIES+=	lang
+CATEGORIES=	lang
 MASTER_SITES=	ftp://www.python.org/pub/python/src/ \
 		ftp://ftp.cwi.nl/pub/python/src/
 
@@ -23,7 +23,7 @@ MAKE_FLAGS+=	'OPT=${CFLAGS}'
 INSTALL_TARGET=	install
 
 post-configure:
-	cp ${FILESDIR}/Setup ${WRKSRC}/Modules
+	${CP} ${FILESDIR}/Setup ${WRKSRC}/Modules
 
 post-install:
 	strip ${PREFIX}/bin/python
diff --git a/lang/python27/Makefile b/lang/python27/Makefile
index 462301361731..b73a80dad343 100644
--- a/lang/python27/Makefile
+++ b/lang/python27/Makefile
@@ -3,12 +3,12 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.7 1996/10/14 23:14:37 asami Exp $
+# $Id: Makefile,v 1.8 1996/11/02 19:04:22 jkh Exp $
 #
 
 DISTNAME=       python1.4
 PKGNAME=        python-1.4
-CATEGORIES+=	lang
+CATEGORIES=	lang
 MASTER_SITES=	ftp://www.python.org/pub/python/src/ \
 		ftp://ftp.cwi.nl/pub/python/src/
 
@@ -23,7 +23,7 @@ MAKE_FLAGS+=	'OPT=${CFLAGS}'
 INSTALL_TARGET=	install
 
 post-configure:
-	cp ${FILESDIR}/Setup ${WRKSRC}/Modules
+	${CP} ${FILESDIR}/Setup ${WRKSRC}/Modules
 
 post-install:
 	strip ${PREFIX}/bin/python
diff --git a/lang/python30/Makefile b/lang/python30/Makefile
index 462301361731..b73a80dad343 100644
--- a/lang/python30/Makefile
+++ b/lang/python30/Makefile
@@ -3,12 +3,12 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.7 1996/10/14 23:14:37 asami Exp $
+# $Id: Makefile,v 1.8 1996/11/02 19:04:22 jkh Exp $
 #
 
 DISTNAME=       python1.4
 PKGNAME=        python-1.4
-CATEGORIES+=	lang
+CATEGORIES=	lang
 MASTER_SITES=	ftp://www.python.org/pub/python/src/ \
 		ftp://ftp.cwi.nl/pub/python/src/
 
@@ -23,7 +23,7 @@ MAKE_FLAGS+=	'OPT=${CFLAGS}'
 INSTALL_TARGET=	install
 
 post-configure:
-	cp ${FILESDIR}/Setup ${WRKSRC}/Modules
+	${CP} ${FILESDIR}/Setup ${WRKSRC}/Modules
 
 post-install:
 	strip ${PREFIX}/bin/python
diff --git a/lang/python31/Makefile b/lang/python31/Makefile
index 462301361731..b73a80dad343 100644
--- a/lang/python31/Makefile
+++ b/lang/python31/Makefile
@@ -3,12 +3,12 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.7 1996/10/14 23:14:37 asami Exp $
+# $Id: Makefile,v 1.8 1996/11/02 19:04:22 jkh Exp $
 #
 
 DISTNAME=       python1.4
 PKGNAME=        python-1.4
-CATEGORIES+=	lang
+CATEGORIES=	lang
 MASTER_SITES=	ftp://www.python.org/pub/python/src/ \
 		ftp://ftp.cwi.nl/pub/python/src/
 
@@ -23,7 +23,7 @@ MAKE_FLAGS+=	'OPT=${CFLAGS}'
 INSTALL_TARGET=	install
 
 post-configure:
-	cp ${FILESDIR}/Setup ${WRKSRC}/Modules
+	${CP} ${FILESDIR}/Setup ${WRKSRC}/Modules
 
 post-install:
 	strip ${PREFIX}/bin/python
diff --git a/lang/python32/Makefile b/lang/python32/Makefile
index 462301361731..b73a80dad343 100644
--- a/lang/python32/Makefile
+++ b/lang/python32/Makefile
@@ -3,12 +3,12 @@
 # Date created:         08 August 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.7 1996/10/14 23:14:37 asami Exp $
+# $Id: Makefile,v 1.8 1996/11/02 19:04:22 jkh Exp $
 #
 
 DISTNAME=       python1.4
 PKGNAME=        python-1.4
-CATEGORIES+=	lang
+CATEGORIES=	lang
 MASTER_SITES=	ftp://www.python.org/pub/python/src/ \
 		ftp://ftp.cwi.nl/pub/python/src/
 
@@ -23,7 +23,7 @@ MAKE_FLAGS+=	'OPT=${CFLAGS}'
 INSTALL_TARGET=	install
 
 post-configure:
-	cp ${FILESDIR}/Setup ${WRKSRC}/Modules
+	${CP} ${FILESDIR}/Setup ${WRKSRC}/Modules
 
 post-install:
 	strip ${PREFIX}/bin/python
diff --git a/lang/rexx-imc/Makefile b/lang/rexx-imc/Makefile
index 645c738252ff..afc3296cdadc 100644
--- a/lang/rexx-imc/Makefile
+++ b/lang/rexx-imc/Makefile
@@ -3,11 +3,11 @@
 # Date created:				Septermber 21 96
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id$
+#   $Id: Makefile,v 1.1.1.1 1996/09/23 15:50:09 jfitz Exp $
 #
 
 DISTNAME=	rexx-imc-1.6d
-CATEGORIES+=	lang
+CATEGORIES=	lang
 MASTER_SITES=	http://www.comlab.ox.ac.uk/oucl/users/ian.collier/distribution/
 
 MAINTAINER=	jfitz@FreeBSD.ORG
diff --git a/lang/scheme48/Makefile b/lang/scheme48/Makefile
index 9fe42fcf4d05..69585532ac44 100644
--- a/lang/scheme48/Makefile
+++ b/lang/scheme48/Makefile
@@ -3,11 +3,11 @@
 # Date created:         2 Jan 1995
 # Whom:                 jmacd@uclink.berkeley.edu
 #
-# $Id: Makefile,v 1.5 1995/04/24 22:31:59 asami Exp $
+# $Id: Makefile,v 1.6 1995/11/22 13:13:09 asami Exp $
 #
 
 DISTNAME=	scheme48-0.36
-CATEGORIES+=	lang
+CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp-swiss.ai.mit.edu/pub/s48/
 
 MAINTAINER= 	jmacd@FreeBSD.ORG
diff --git a/lang/schemetoc/Makefile b/lang/schemetoc/Makefile
index 54d7c6b81a7a..14ad13150d46 100644
--- a/lang/schemetoc/Makefile
+++ b/lang/schemetoc/Makefile
@@ -3,12 +3,12 @@
 # Date created:         28 Dec 1994
 # Whom:                 jmacd@uclink.berkeley.edu
 #
-# $Id: Makefile,v 1.7 1995/06/24 11:39:42 asami Exp $
+# $Id: Makefile,v 1.8 1995/11/22 13:13:11 asami Exp $
 #
 
 DISTNAME= 	schemetoc-93.3.15
 PKGNAME=	schemetoc-93.3.15
-CATEGORIES+=	lang
+CATEGORIES=	lang
 MASTER_SITES=	ftp://gatekeeper.dec.com/pub/DEC/Scheme-to-C/
 DISTFILES=      15mar93.tar.Z
 
diff --git a/lang/scm/Makefile b/lang/scm/Makefile
index 1edfda544a7e..cd78c0858342 100644
--- a/lang/scm/Makefile
+++ b/lang/scm/Makefile
@@ -3,12 +3,12 @@
 # Date created:         Sat Nov  5 17:11:01 PST 1994
 # Whom:                 hsu
 #
-# $Id: Makefile,v 1.8 1995/04/24 23:07:29 asami Exp $
+# $Id: Makefile,v 1.9 1995/11/22 13:13:13 asami Exp $
 #
 
 DISTNAME=       scm
 PKGNAME=	scm-4e1
-CATEGORIES+=	lang
+CATEGORIES=	lang
 MASTER_SITES=   ftp://swiss-ftp.ai.mit.edu/pub/scm/
 DISTFILES=      scm4e1.tar.gz \
 		slib.info.tar.gz slib2a2.tar.gz slib-psd1-3.tar.gz \
@@ -19,10 +19,10 @@ USE_GMAKE=
 MAKE_FLAGS=	CFLAGS=-O2 LDFLAGS=-s defines="-DSICP -DHAVE_CONFIG_H -DFLOATS -DIO_EXTENSIONS -DMEMOIZE_LOCALS -DGC_FREE_SEGMENTS" -f
 
 pre-install:
-	cp -rp ${WRKDIR}/slib ${PREFIX}/lib
+	${CP} -rp ${WRKDIR}/slib ${PREFIX}/lib
 	(cd ${WRKDIR}/slib; \
 		makeinfo slib.texi; \
-		install -c -m 444 slib.info slib.info-1 slib.info-2 \
+		${INSTALL_MAN} slib.info slib.info-1 slib.info-2 \
 				  slib.info-3 slib.info-4 /usr/local/info)
 
 .include <bsd.port.mk>
diff --git a/lang/smalltalk/Makefile b/lang/smalltalk/Makefile
index 12b188563e39..384d5c06dbf6 100644
--- a/lang/smalltalk/Makefile
+++ b/lang/smalltalk/Makefile
@@ -3,11 +3,11 @@
 # Date created:		09 Feb 1995
 # Whom:			gpalmer
 #
-# $Id: Makefile,v 1.8 1996/06/03 00:27:35 jraynard Exp $
+# $Id: Makefile,v 1.9 1996/06/05 17:35:13 jraynard Exp $
 #
 
 DISTNAME=	smalltalk-1.1.1
-CATEGORIES+=	lang
+CATEGORIES=	lang
 MASTER_SITES=	ftp://prep.ai.mit.edu/pub/gnu/
 
 MAINTAINER=	jraynard@FreeBSD.ORG
@@ -16,17 +16,17 @@ IS_INTERACTIVE=	yes
 NO_PACKAGE=yes
 
 pre-configure:
-	@cp ${FILESDIR}/m-fbsd-2.h ${WRKSRC}/config/m-fbsd-2.h
+	@{CP} ${FILESDIR}/m-fbsd-2.h ${WRKSRC}/config/m-fbsd-2.h
 	@(cd ${WRKSRC} ; ./config.mst fbsd-2)
 	@${TOUCH} ${TOUCH_FLAGS} ${CONFIGURE_COOKIE}
 
 do-build:
-	if [ -d ${X11BASE} ]; then (cd ${WRKSRC}/stix; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET}; cp mst *.st ${WRKSRC}); else (cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET}); fi;
+	if [ -d ${X11BASE} ]; then (cd ${WRKSRC}/stix; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET}; ${CP} mst *.st ${WRKSRC}); else (cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${ALL_TARGET}); fi;
 
 do-install:
 	@echo "Installing method definitions..."
-	@ if [ ! -d ${PREFIX}/lib/smalltalk ]; then mkdir -p ${PREFIX}/lib/smalltalk; fi
-	@(cd ${WRKSRC}; cp *.st ${PREFIX}/lib/smalltalk)
+	@ if [ ! -d ${PREFIX}/lib/smalltalk ]; then ${MKDIR} ${PREFIX}/lib/smalltalk; fi
+	@(cd ${WRKSRC}; ${CP} *.st ${PREFIX}/lib/smalltalk)
 	@(cd ${PREFIX}/lib/smalltalk ; chmod +r *.st)
 	@echo
 	@echo
diff --git a/lang/swi-pl/Makefile b/lang/swi-pl/Makefile
index 4b882e30b3f8..b416b2136383 100644
--- a/lang/swi-pl/Makefile
+++ b/lang/swi-pl/Makefile
@@ -3,19 +3,18 @@
 # Date created:			10 August 1996
 # Whom:				Michael Butschky <butsch@computi.erols.com>
 #
-# $Id: Makefile,v 1.3 1996/10/31 01:40:26 max Exp $              
+# $Id: Makefile,v 1.4 1996/11/02 20:24:09 max Exp $              
 #
 
 DISTNAME=	pl-2.7.15
 PKGNAME=	swi-pl-2.7.15
-CATEGORIES+=    lang
+CATEGORIES=     lang
 MASTER_SITES=	ftp://swi.psy.uva.nl/pub/SWI-Prolog/
 
 MAINTAINER=	max@FreeBSD.ORG
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 GNU_CONFIGURE=	yes
-
 CONFIGURE_ARGS=	i386-freebsd
 STRIP=
 MAKE_FLAGS+=	CIFLAGS=-DRTLD_LAZY -f
diff --git a/lang/tclX/Makefile b/lang/tclX/Makefile
index 0e8067e31348..92a057c5b1b9 100644
--- a/lang/tclX/Makefile
+++ b/lang/tclX/Makefile
@@ -3,19 +3,15 @@
 # Date created:		6 February 1996
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.7 1996/07/10 07:56:31 asami Exp $
+# $Id: Makefile,v 1.8 1996/09/24 18:14:41 markm Exp $
 #
 
 DISTNAME=	tclX7.5.2
 PKGNAME=	tclX-7.5.2
-CATEGORIES+=	lang
+CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.neosoft.com/pub/tcl/tclx-distrib/
 
-TCL_BASE=	/usr/libdata/tcl
-TCL_SRC=	/usr/src/contrib/tcl
-
-TK_DIR=		${PORTSDIR}/x11/tk41
-TK_SRC=		${TK_DIR}/work/tk4.1
+MAINTAINER=	jkh@FreeBSD.org
 
 DEPENDS=	${TK_DIR}
 LIB_DEPENDS=	tk41\\.1:${TK_DIR}
@@ -24,6 +20,12 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/unix
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared --with-tk
 
+TCL_BASE=	/usr/libdata/tcl
+TCL_SRC=	/usr/src/contrib/tcl
+
+TK_DIR=		${PORTSDIR}/x11/tk41
+TK_SRC=		${TK_DIR}/work/tk4.1
+
 pre-configure:
 	cd ${WRKSRC} ; \
 	mv Config.mk Config.mk.orig2 && \
diff --git a/lang/tclX80/Makefile b/lang/tclX80/Makefile
index 0e8067e31348..92a057c5b1b9 100644
--- a/lang/tclX80/Makefile
+++ b/lang/tclX80/Makefile
@@ -3,19 +3,15 @@
 # Date created:		6 February 1996
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.7 1996/07/10 07:56:31 asami Exp $
+# $Id: Makefile,v 1.8 1996/09/24 18:14:41 markm Exp $
 #
 
 DISTNAME=	tclX7.5.2
 PKGNAME=	tclX-7.5.2
-CATEGORIES+=	lang
+CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.neosoft.com/pub/tcl/tclx-distrib/
 
-TCL_BASE=	/usr/libdata/tcl
-TCL_SRC=	/usr/src/contrib/tcl
-
-TK_DIR=		${PORTSDIR}/x11/tk41
-TK_SRC=		${TK_DIR}/work/tk4.1
+MAINTAINER=	jkh@FreeBSD.org
 
 DEPENDS=	${TK_DIR}
 LIB_DEPENDS=	tk41\\.1:${TK_DIR}
@@ -24,6 +20,12 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/unix
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared --with-tk
 
+TCL_BASE=	/usr/libdata/tcl
+TCL_SRC=	/usr/src/contrib/tcl
+
+TK_DIR=		${PORTSDIR}/x11/tk41
+TK_SRC=		${TK_DIR}/work/tk4.1
+
 pre-configure:
 	cd ${WRKSRC} ; \
 	mv Config.mk Config.mk.orig2 && \
diff --git a/lang/tclX82/Makefile b/lang/tclX82/Makefile
index 0e8067e31348..92a057c5b1b9 100644
--- a/lang/tclX82/Makefile
+++ b/lang/tclX82/Makefile
@@ -3,19 +3,15 @@
 # Date created:		6 February 1996
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.7 1996/07/10 07:56:31 asami Exp $
+# $Id: Makefile,v 1.8 1996/09/24 18:14:41 markm Exp $
 #
 
 DISTNAME=	tclX7.5.2
 PKGNAME=	tclX-7.5.2
-CATEGORIES+=	lang
+CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.neosoft.com/pub/tcl/tclx-distrib/
 
-TCL_BASE=	/usr/libdata/tcl
-TCL_SRC=	/usr/src/contrib/tcl
-
-TK_DIR=		${PORTSDIR}/x11/tk41
-TK_SRC=		${TK_DIR}/work/tk4.1
+MAINTAINER=	jkh@FreeBSD.org
 
 DEPENDS=	${TK_DIR}
 LIB_DEPENDS=	tk41\\.1:${TK_DIR}
@@ -24,6 +20,12 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/unix
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared --with-tk
 
+TCL_BASE=	/usr/libdata/tcl
+TCL_SRC=	/usr/src/contrib/tcl
+
+TK_DIR=		${PORTSDIR}/x11/tk41
+TK_SRC=		${TK_DIR}/work/tk4.1
+
 pre-configure:
 	cd ${WRKSRC} ; \
 	mv Config.mk Config.mk.orig2 && \
diff --git a/shells/rc/Makefile b/shells/rc/Makefile
index cba4fc72a090..350446d9f55d 100644
--- a/shells/rc/Makefile
+++ b/shells/rc/Makefile
@@ -3,12 +3,12 @@
 # Date created:         Sun Aug 13 12:36:14 CDT 1995
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.1.1.1 1995/08/14 04:08:01 asami Exp $
+# $Id: Makefile,v 1.2 1995/10/28 20:34:39 erich Exp $
 #
 
 DISTNAME=       rc-1.5betadev-1
 PKGNAME=	rc-1.5b1
-CATEGORIES+=	plan9
+CATEGORIES=	plan9
 MASTER_SITES=   ftp://ftp.sys.toronto.edu/pub/rc/
 
 MAINTAINER=	erich@FreeBSD.org
diff --git a/x11-fonts/Xg/Makefile b/x11-fonts/Xg/Makefile
index a62d7f16886c..714e05ddd7ac 100644
--- a/x11-fonts/Xg/Makefile
+++ b/x11-fonts/Xg/Makefile
@@ -3,12 +3,12 @@
 # Date created:         Sun Aug 13 12:36:14 CDT 1995
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.1.1.1 1995/08/14 04:08:02 asami Exp $
+# $Id: Makefile,v 1.2 1995/10/28 20:28:37 erich Exp $
 #
 
 DISTNAME=	libXg.utf.fonts
 PKGNAME=	libXgFonts-1.0
-CATEGORIES+=	plan9
+CATEGORIES=	plan9
 MASTER_SITES=	ftp://ftp.ecf.toronto.edu/pub/plan9/matty/
 EXTRACT_SUFX=	.tar.Z
 
diff --git a/x11-wm/9menu/Makefile b/x11-wm/9menu/Makefile
index 35faf8ba741d..0cb3cfb80479 100644
--- a/x11-wm/9menu/Makefile
+++ b/x11-wm/9menu/Makefile
@@ -3,11 +3,11 @@
 # Date created:         Sun Aug 13 12:36:14 CDT 1995
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.1.1.1 1995/08/14 04:07:57 asami Exp $
+# $Id: Makefile,v 1.2 1995/10/28 20:23:00 erich Exp $
 #
 
 DISTNAME=	9menu-1.4
-CATEGORIES+=	plan9
+CATEGORIES=	plan9
 MASTER_SITES=	ftp://ftp.ecf.toronto.edu/pub/plan9/arnold/
 EXTRACT_SUFX=	.shar.gz
 
diff --git a/x11-wm/9wm/Makefile b/x11-wm/9wm/Makefile
index bb9d7682d136..52de2518be55 100644
--- a/x11-wm/9wm/Makefile
+++ b/x11-wm/9wm/Makefile
@@ -3,11 +3,11 @@
 # Date created:         Sun Aug 13 12:36:14 CDT 1995
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.1.1.1 1995/08/14 04:07:57 asami Exp $
+# $Id: Makefile,v 1.2 1995/10/28 20:27:20 erich Exp $
 #
 
 DISTNAME=	9wm-1.1
-CATEGORIES+=	plan9
+CATEGORIES=	plan9
 MASTER_SITES=	ftp://ftp.ecf.toronto.edu/pub/plan9/arnold/
 EXTRACT_SUFX=	.shar.gz
 
diff --git a/x11/9menu/Makefile b/x11/9menu/Makefile
index 35faf8ba741d..0cb3cfb80479 100644
--- a/x11/9menu/Makefile
+++ b/x11/9menu/Makefile
@@ -3,11 +3,11 @@
 # Date created:         Sun Aug 13 12:36:14 CDT 1995
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.1.1.1 1995/08/14 04:07:57 asami Exp $
+# $Id: Makefile,v 1.2 1995/10/28 20:23:00 erich Exp $
 #
 
 DISTNAME=	9menu-1.4
-CATEGORIES+=	plan9
+CATEGORIES=	plan9
 MASTER_SITES=	ftp://ftp.ecf.toronto.edu/pub/plan9/arnold/
 EXTRACT_SUFX=	.shar.gz
 
diff --git a/x11/9term/Makefile b/x11/9term/Makefile
index d288cf415d04..f6f8a6339079 100644
--- a/x11/9term/Makefile
+++ b/x11/9term/Makefile
@@ -3,12 +3,12 @@
 # Date created:         Sun Aug 13 12:36:14 CDT 1995
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.1.1.1 1995/08/14 04:07:58 asami Exp $
+# $Id: Makefile,v 1.2 1995/10/28 20:25:56 erich Exp $
 #
 
 DISTNAME=       9term.1.6.3
 PKGNAME=	9term-1.6.3
-CATEGORIES+=	plan9
+CATEGORIES=	plan9
 MASTER_SITES=   ftp://ftp.ecf.toronto.edu/pub/plan9/matty/
 
 MAINTAINER=	erich@FreeBSD.org
author	David E. O'Brien <obrien@FreeBSD.org>	1996-11-12 02:19:40 +0000
committer	David E. O'Brien <obrien@FreeBSD.org>	1996-11-12 02:19:40 +0000
commit	d23a79568090d280bf3beb199bb97f0572234984 (patch)
tree	8af4f4b16bdda8a7b54ff123a7cfe5fcc38c203c
parent	CATAGORIES+= -> CATAGORIES= (diff)