CATAGORIES+= -> CATAGORIES=

Reordered vars where needed.  Added MAINTAINERS where needed, many
mkdir --> ${MKDIR}, install -> ${INSTALL_*}, etc.

15 files changed, 38 insertions, 36 deletions

diff --git a/archivers/arc/Makefile b/archivers/arc/Makefile
index d19ec6aa786..7beebded0e3 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 1ab840d825b..9798541f9b3 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 891aabd2be3..c8e6c13ac61 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 efb29a745d4..19c8ac9bd9e 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 e4d0db7593a..aa1764efe08 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 1d7e4dcd099..ed908832cd2 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 547d59caf4b..014b2534ab4 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 beaa9ab8b1c..55395e1f928 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 a3179a248c2..eb96659e5d1 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 efb29a745d4..19c8ac9bd9e 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 4fe7483fb81..bb3d01a7a26 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 438e3ba99cb..a0e9f6b2fb0 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 a169baed359..428855872e3 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 4f089c549a3..e1c0651f068 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 64820d3e236..6af3116e770 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