Use MAN? macros. CATEGORIES+= -> CATEGORIES.

author: Satoshi Asami <asami@FreeBSD.org> 1996-11-18 11:44:27 +0000
committer: Satoshi Asami <asami@FreeBSD.org> 1996-11-18 11:44:27 +0000
commit: 300c45cf2e488b0b4bef726272d1259f14ae8ed9 (patch)
tree: 842a2dc4580fa0370f28faca34d61ab06c735859
parent: Remove spurious ^M at end of lines. (diff)
296 files changed, 765 insertions, 1025 deletions
diff --git a/archivers/freeze/Makefile b/archivers/freeze/Makefile
index c8e6c13ac618..64e5d167ab8a 100644
--- a/archivers/freeze/Makefile
+++ b/archivers/freeze/Makefile
@@ -3,7 +3,7 @@
 # Date created:         20 Jul 1996
 # Whom:                 lukin@okbmei.msk.su
 #
-# $Id: Makefile,v 1.1.1.1 1996/08/09 08:16:16 asami Exp $
+# $Id: Makefile,v 1.2 1996/11/12 02:17:22 obrien Exp $
 #
 
 DISTNAME=       freeze-2.5
@@ -14,12 +14,6 @@ MAINTAINER=     lukin@okbmei.msk.su
 
 GNU_CONFIGURE=	yes
 ALL_TARGET=	prog
-
-post-install:
-.if !defined(NOMANCOMPRESS)
-.for man in freeze melt unfreeze fcat statist
-	gzip -9nf ${PREFIX}/man/man1/${man}.1
-.endfor
-.endif
+MAN1=		freeze.1 melt.1 unfreeze.1 fcat.1 statist.1
 
 .include <bsd.port.mk>
diff --git a/audio/radio/Makefile b/audio/radio/Makefile
index d78a0e9e81f0..6bbb08e2d3bb 100644
--- a/audio/radio/Makefile
+++ b/audio/radio/Makefile
@@ -3,7 +3,7 @@
 # Date created:		5 July 1995
 # Whom:			janek@gaja.ipan.lublin.pl
 #
-# $Id: Makefile,v 1.4 1996/10/18 16:11:04 max Exp $
+# $Id: Makefile,v 1.5 1996/11/15 23:14:01 obrien Exp $
 #
 
 DISTNAME=	radio2.0.4
@@ -15,11 +15,6 @@ MAINTAINER=	janek@gaja.ipan.lublin.pl
 
 NO_WRKSUBDIR=	yes
 MAKE_FLAGS=	FreeBSD -f
-
-post-install:
-.if !defined(NOMANCOMPRESS)
-	gzip -9nf ${PREFIX}/man/man1/radio.1
-	gzip -9nf ${PREFIX}/man/man1/broadcast.1
-.endif
+MAN1=		radio.1 broadcast.1
 
 .include <bsd.port.mk>
diff --git a/audio/sox/Makefile b/audio/sox/Makefile
index babb95d97e28..ee4d2022899a 100644
--- a/audio/sox/Makefile
+++ b/audio/sox/Makefile
@@ -3,7 +3,7 @@
 # Date created:		17 Oct 1994
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.6 1995/05/05 20:54:27 torstenb Exp $
+# $Id: Makefile,v 1.7 1996/11/15 23:14:24 obrien Exp $
 #
 
 DISTNAME=	sox10p11
@@ -14,7 +14,6 @@ EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	torstenb@FreeBSD.ORG
 
-post-install:
-	gzip -9nf ${PREFIX}/man/man1/sox.1
+MAN1=		sox.1
 
 .include <bsd.port.mk>
diff --git a/audio/speak_freely/Makefile b/audio/speak_freely/Makefile
index f46be7b0f3b5..5e968297b445 100644
--- a/audio/speak_freely/Makefile
+++ b/audio/speak_freely/Makefile
@@ -4,7 +4,7 @@
 # Date created:         18 Apr 1996
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.1.1.1 1996/11/11 23:17:38 ache Exp $
+# $Id: Makefile,v 1.2 1996/11/11 23:24:31 ache Exp $
 #
 
 DISTNAME=       speak_freely-6.1b
@@ -19,6 +19,7 @@ UTILS=   sfspeaker sfmike sflwl
 DEMNS=   sfecho sflwld
 DDEMNS=  sfvod
 SFLIB=   ${PREFIX}/lib/speak_freely
+MAN1=	 ${UTILS:S/$/.1/} ${DEMNS:S/$/.1/} ${DDEMNS:S/$/.1/}
 
 do-install:
 	if [ ! -d ${SFLIB} ]; then \
@@ -41,10 +42,5 @@ do-install:
 		$(INSTALL_SCRIPT) $$p ${PREFIX}/sbin; \
 		$(INSTALL_MAN) $$p.1 ${PREFIX}/man/man1; \
 	done;
-.if !defined(NOMANCOMPRESS)
-	for p in ${UTILS} ${DEMNS} ${DDEMNS}; do \
-		gzip -9nf ${PREFIX}/man/man1/$$p.1; \
-	done
-.endif
 
 .include <bsd.port.mk>
diff --git a/benchmarks/bonnie/Makefile b/benchmarks/bonnie/Makefile
index 769d66f934c8..4446c6be7d66 100644
--- a/benchmarks/bonnie/Makefile
+++ b/benchmarks/bonnie/Makefile
@@ -3,21 +3,20 @@
 # Date created:         26 September 1994
 # Whom:                 se
 #
-# $Id: Makefile,v 1.2 1995/07/13 01:09:03 asami Exp $
+# $Id: Makefile,v 1.3 1995/11/22 11:36:48 asami Exp $
 #
 
 DISTNAME=       Bonnie
 PKGNAME=	bonnie-1.0
-CATEGORIES+=	benchmarks
+CATEGORIES=	benchmarks
 MASTER_SITES=   ftp://ftp.sunet.se/pub/benchmark/Bonnie/ \
 		ftp://swedishchef.lerc.nasa.gov/drlabs/io/
 EXTRACT_SUFX=   .tar.Z
 
 MAINTAINER=	se@FreeBSD.org
 
-CFLAGS+=	-static
+MAN1=		bonnie.1
 
-post-install:
-	gzip -9nf ${PREFIX}/man/man1/bonnie.1
+CFLAGS+=	-static
 
 .include <bsd.port.mk>
diff --git a/benchmarks/bytebench/Makefile b/benchmarks/bytebench/Makefile
index 5fa5bf80879a..54408f371646 100644
--- a/benchmarks/bytebench/Makefile
+++ b/benchmarks/bytebench/Makefile
@@ -3,13 +3,13 @@
 # Date created:         28 December 1995
 # Whom:                 se
 #
-# $Id: Makefile,v 1.3 1996/01/03 00:06:21 se Exp $
+# $Id: Makefile,v 1.4 1996/01/05 16:37:50 se Exp $
 #
 
 DISTNAME=       bytebench-3.1
-EXTRACT_SUFX=	.tar.Z
-CATEGORIES+=	benchmarks
+CATEGORIES=	benchmarks
 MASTER_SITES=   ftp://ftp.inria.fr/system/benchmark/
+EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	se@FreeBSD.org
 
diff --git a/benchmarks/iozone/Makefile b/benchmarks/iozone/Makefile
index f19e51f18228..5c322ad0dd2a 100644
--- a/benchmarks/iozone/Makefile
+++ b/benchmarks/iozone/Makefile
@@ -3,12 +3,12 @@
 # Date created:         26 September 1994
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.15 1995/11/22 11:36:56 asami Exp $
+# $Id: Makefile,v 1.16 1996/11/14 08:08:04 ache Exp $
 #
 
 DISTNAME=       iozone
 PKGNAME=	iozone-2.01
-CATEGORIES+=	benchmarks
+CATEGORIES=	benchmarks
 MASTER_SITES=   ftp://ftp.cs.uni-sb.de/pub/others/
 DISTFILES=      iozone-2.01.shar.gz
 
diff --git a/benchmarks/iozone21/Makefile b/benchmarks/iozone21/Makefile
index f19e51f18228..5c322ad0dd2a 100644
--- a/benchmarks/iozone21/Makefile
+++ b/benchmarks/iozone21/Makefile
@@ -3,12 +3,12 @@
 # Date created:         26 September 1994
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.15 1995/11/22 11:36:56 asami Exp $
+# $Id: Makefile,v 1.16 1996/11/14 08:08:04 ache Exp $
 #
 
 DISTNAME=       iozone
 PKGNAME=	iozone-2.01
-CATEGORIES+=	benchmarks
+CATEGORIES=	benchmarks
 MASTER_SITES=   ftp://ftp.cs.uni-sb.de/pub/others/
 DISTFILES=      iozone-2.01.shar.gz
 
diff --git a/benchmarks/lmbench/Makefile b/benchmarks/lmbench/Makefile
index 1a07dc8e9fb1..d48f89290538 100644
--- a/benchmarks/lmbench/Makefile
+++ b/benchmarks/lmbench/Makefile
@@ -3,16 +3,22 @@
 # Date created:		6 May 1995
 # Whom:			asami
 #
-# $Id: Makefile,v 1.4 1995/11/22 11:36:59 asami Exp $
+# $Id: Makefile,v 1.5 1996/03/21 11:35:08 asami Exp $
 #
 
 DISTNAME=	lmbench-1.0
-CATEGORIES+=	benchmarks
+CATEGORIES=	benchmarks
 MASTER_SITES=	ftp://forte.mathematik.uni-bremen.de/pub/unix/benchmarks/
 
 MAINTAINER=	asami@FreeBSD.ORG
 
 ALL_TARGET=	build
+MAN1=		bargraph.1 graph.1
+MAN8=		bw_file_rd.8 bw_mem_cp.8 bw_mem_rd.8 bw_mem_wr.8 \
+		bw_mmap_rd.8 bw_pipe.8 bw_tcp.8 lat_connect.8 lat_ctx.8 \
+		lat_fs.8 lat_mem_rd.8 lat_mmap.8 lat_pagefault.8 lat_pipe.8 \
+		lat_proc.8 lat_rpc.8 lat_syscall.8 lat_tcp.8 lat_udp.8 \
+		lmbench.8 lmdd.8 mhz.8
 
 test: build
 	@(cd ${WRKSRC}; make results)
@@ -27,21 +33,11 @@ do-install:
 	cp ${FILESDIR}/Makefile ${PREFIX}/lib/lmbench
 	tar -C ${WRKSRC} -cf - Results bin scripts | \
 	  tar -C ${PREFIX}/lib/lmbench -xf -
-.for man in bargraph.1 graph.1
+.for man in ${MAN1}
 	cp ${WRKSRC}/doc/${man} ${PREFIX}/man/man1
-.if !defined(NOMANCOMPRESS)
-	gzip -9nf ${PREFIX}/man/man1/${man}
-.endif
 .endfor
-.for man in bw_file_rd.8 bw_mem_cp.8 bw_mem_rd.8 bw_mem_wr.8 \
-	  bw_mmap_rd.8 bw_pipe.8 bw_tcp.8 lat_connect.8 lat_ctx.8 \
-	  lat_fs.8 lat_mem_rd.8 lat_mmap.8 lat_pagefault.8 lat_pipe.8 \
-	  lat_proc.8 lat_rpc.8 lat_syscall.8 lat_tcp.8 lat_udp.8 \
-	  lmbench.8 lmdd.8 mhz.8
+.for man in ${MAN8}
 	cp ${WRKSRC}/doc/${man} ${PREFIX}/man/man8
-.if !defined(NOMANCOMPRESS)
-	gzip -9nf ${PREFIX}/man/man8/${man}
-.endif
 .endfor
 
 .include <bsd.port.mk>
diff --git a/benchmarks/netperf/Makefile b/benchmarks/netperf/Makefile
index 2e5cd05277c5..43a0afafb601 100644
--- a/benchmarks/netperf/Makefile
+++ b/benchmarks/netperf/Makefile
@@ -3,27 +3,24 @@
 # Date created:		19 July 1996
 # Whom:			koshy
 #
-# $Id: Makefile,v 1.1.1.1 1996/08/03 19:51:04 pst Exp $
+# $Id: Makefile,v 1.2 1996/08/04 08:46:07 asami Exp $
 #
 
 DISTNAME=	netperf-2.1pl1
 PKGNAME=	netperf-2.1.1
-CATEGORIES+=	benchmarks
+CATEGORIES=	benchmarks
 MASTER_SITES=	ftp://ftp.cup.hp.com/dist/networking/benchmarks/netperf/
 
 MAINTAINER=	pst@freebsd.org
 
 MAKEFILE=	makefile
+MAN1=		netperf.1 netserver.1
 
 post-install:
 	strip ${PREFIX}/netperf/netperf
 	strip ${PREFIX}/netperf/netserver
 	cp ${WRKSRC}/netperf.man ${PREFIX}/man/man1/netperf.1
 	cp ${WRKSRC}/netserver.man ${PREFIX}/man/man1/netserver.1
-.if !defined(NOMANCOMPRESS)
-	gzip -9nf ${PREFIX}/man/man1/netperf.1
-	gzip -9nf ${PREFIX}/man/man1/netserver.1
-.endif
 .if !defined(NOPORTDOCS)
 	mkdir -p ${PREFIX}/share/doc/netperf
 	cp ${WRKSRC}/netperf.ps ${PREFIX}/share/doc/netperf
diff --git a/benchmarks/unixbench/Makefile b/benchmarks/unixbench/Makefile
index 5fa5bf80879a..54408f371646 100644
--- a/benchmarks/unixbench/Makefile
+++ b/benchmarks/unixbench/Makefile
@@ -3,13 +3,13 @@
 # Date created:         28 December 1995
 # Whom:                 se
 #
-# $Id: Makefile,v 1.3 1996/01/03 00:06:21 se Exp $
+# $Id: Makefile,v 1.4 1996/01/05 16:37:50 se Exp $
 #
 
 DISTNAME=       bytebench-3.1
-EXTRACT_SUFX=	.tar.Z
-CATEGORIES+=	benchmarks
+CATEGORIES=	benchmarks
 MASTER_SITES=   ftp://ftp.inria.fr/system/benchmark/
+EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	se@FreeBSD.org
 
diff --git a/chinese/celvis/Makefile b/chinese/celvis/Makefile
index fd5727783bff..65d68904d7d2 100644
--- a/chinese/celvis/Makefile
+++ b/chinese/celvis/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Thur Aug 15, 1996
 # Whom:                 David O'Brien (obrien@cs.ucdavis.edu)
 #
-# $Id: Makefile,v 1.2 1996/10/16 02:24:33 chuckr Exp $
+# $Id: Makefile,v 1.3 1996/11/12 02:16:27 obrien Exp $
 #
 
 DISTNAME=	celvis
@@ -14,13 +14,14 @@ MASTER_SITES=	ftp://ftp.cs.purdue.edu/pub/ygz/  \
 
 MAINTAINER=     obrien@cs.ucdavis.edu
 
+MAN1=		celvis.1
+
 do-install:
 	@# install target in celvis Makefile is not too good -- this is easier
 	${INSTALL_PROGRAM} ${WRKSRC}/celvis ${WRKSRC}/virec ${PREFIX}/bin
 	ln -sf ${PREFIX}/bin/celvis ${PREFIX}/bin/cvi
 	${INSTALL_MAN} ${FILESDIR}/celvis.1 ${PREFIX}/man/man1/celvis.1
 .if !defined{NOMANCOMPRESS}
-	gzip -9nf ${PREFIX}/man/man1/celvis.1
 	ln -sf ${PREFIX}/man/man1/celvis.1.gz ${PREFIX}/man/man1/cvi.1.gz
 .else
 	ln -sf ${PREFIX}/man/man1/celvis.1 ${PREFIX}/man/man1/cvi.1
diff --git a/chinese/cless/Makefile b/chinese/cless/Makefile
index bd3acc00c1fd..f6d52da346cd 100644
--- a/chinese/cless/Makefile
+++ b/chinese/cless/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Sat Aug 10, 1996
 # Whom:                 David O'Brien (obrien@cs.ucdavis.edu)
 #
-# $Id: Makefile,v 1.2 1996/10/29 04:55:52 max Exp $
+# $Id: Makefile,v 1.3 1996/11/12 02:16:34 obrien Exp $
 #
 
 DISTNAME=	cless-290
@@ -18,13 +18,9 @@ MAINTAINER=     obrien@cs.ucdavis.edu
 
 GNU_CONFIGURE=	yes
 CFLAGS+=	-DHANZI # LDFLAGS=-s datadir=/usr/local/lib/less
+MAN1=		cless.1 clesskey.1
 
 post-install:
-.if !defined(NOMANCOMPRESS)
-.for mp in cless clesskey
-	gzip -9nf ${PREFIX}/man/man1/${mp}.1
-.endfor
-.endif
 .if !defined(NOPORTDOCS)
 	${MKDIR} -p ${PREFIX}/share/doc/cless
 	${INSTALL_DATA} ${WRKSRC}/README.CLESS ${PREFIX}/share/doc/cless
diff --git a/comms/viewfax/Makefile b/comms/viewfax/Makefile
index a8f2e4b71ecd..fbaf94836fc8 100644
--- a/comms/viewfax/Makefile
+++ b/comms/viewfax/Makefile
@@ -3,10 +3,10 @@
 # Date created:         16 sept 1995
 # Whom:                 jmz
 #
-# $Id$
+# $Id: Makefile,v 1.6 1995/09/28 02:01:52 jmz Exp $
 #
 DISTNAME=        viewfax-2.2
-CATEGORIES+=	x11
+CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.leo.org/pub/comp/networking/communication/modem/mgetty/
 
 USE_IMAKE=	yes
diff --git a/converters/uudeview/Makefile b/converters/uudeview/Makefile
index d46aaa74d2bb..f1ce6a80019e 100644
--- a/converters/uudeview/Makefile
+++ b/converters/uudeview/Makefile
@@ -3,7 +3,7 @@
 # Date Created:		04 Aug 1996
 # Whom:			Tim Vanderhoek <ac199@freenet.hamilton.on.ca>
 #
-# $Id: Makefile,v 1.3 1996/10/15 08:24:22 asami Exp $
+# $Id: Makefile,v 1.4 1996/11/12 02:17:49 obrien Exp $
 #
 
 DISTNAME=	uudeview-0.5.4
@@ -22,6 +22,7 @@ GNU_CONFIGURE=	Yes
 # its own minews do-hicky.
 CONFIGURE_ARGS=		--disable-minews
 CONFIGURE_ARGS+=	--disable-tcl
+MAN1=			uudeview.1 uuenview.1
 
 EXTRAFILES+=	porting.notes
 
@@ -55,10 +56,6 @@ post-install:
 		${ECHO_MSG} "===>  Not copying available documents to ${PREFIX}/${PORTDOCDIR}"; \
 	fi;
 .endif
-.if !defined(NOMANCOMPRESS)
-	gzip -9nf ${PREFIX}/man/man1/uudeview.1
-	gzip -9nf ${PREFIX}/man/man1/uuenview.1
-.endif
 	strip ${PREFIX}/bin/uudeview
 	strip ${PREFIX}/bin/uuenview
 
diff --git a/converters/uulib/Makefile b/converters/uulib/Makefile
index f46b2947eff2..1c8208960bc9 100644
--- a/converters/uulib/Makefile
+++ b/converters/uulib/Makefile
@@ -3,12 +3,12 @@
 # Date Created:		04 Aug 1996
 # Whom:			Tim Vanderhoek <ac199@freenet.hamilton.on.ca>
 #
-# $Id: Makefile,v 1.1.1.1 1996/08/23 06:39:36 tg Exp $
+# $Id: Makefile,v 1.2 1996/09/24 11:41:35 asami Exp $
 #
 
 DISTNAME=	uudeview-0.5.4
 PKGNAME=	uulib-0.5.4
-CATEGORIES+=	devel
+CATEGORIES=	devel
 MASTER_SITES=	http://www.uni-frankfurt.de/~fp/uudeview/Apps/frank/
 
 MAINTAINER=	ac199@freenet.hamilton.on.ca
diff --git a/deskutils/xpostit/Makefile b/deskutils/xpostit/Makefile
index 65dc770af873..4332edf478ba 100644
--- a/deskutils/xpostit/Makefile
+++ b/deskutils/xpostit/Makefile
@@ -3,12 +3,12 @@
 # Date created:        6 May 1996
 # Whom:                joerg
 #
-# $Id: Makefile,v 1.1.1.1 1996/05/06 11:45:41 joerg Exp $
+# $Id: Makefile,v 1.2 1996/05/27 09:30:44 asami Exp $
 #
 
 DISTNAME=      xpostit3.3.1
 PKGNAME=       xpostit-3.3.1
-CATEGORIES+=   x11
+CATEGORIES=    x11
 #
 # Not all servers archie could find actually still have it.  Alas, some
 # servers only have the comp.sources.x version, with its distfile named
diff --git a/devel/SWIG-devel/Makefile b/devel/SWIG-devel/Makefile
index e7747170cc6a..5d9ca1132e93 100644
--- a/devel/SWIG-devel/Makefile
+++ b/devel/SWIG-devel/Makefile
@@ -3,17 +3,17 @@
 # Date created:         19 April 1996
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.2 1996/04/23 07:47:40 asami Exp $
+# $Id: Makefile,v 1.3 1996/10/09 20:54:24 erich Exp $
 #
 
 DISTNAME=	swig1.0
 PKGNAME=	swig-1.0
-CATEGORIES+=	devel
+CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.cs.utah.edu/pub/beazley/SWIG/
 
-GNU_CONFIGURE=	yes
 MAINTAINER=	erich@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/SWIG1.0
+GNU_CONFIGURE=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/SWIG/Makefile b/devel/SWIG/Makefile
index e7747170cc6a..5d9ca1132e93 100644
--- a/devel/SWIG/Makefile
+++ b/devel/SWIG/Makefile
@@ -3,17 +3,17 @@
 # Date created:         19 April 1996
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.2 1996/04/23 07:47:40 asami Exp $
+# $Id: Makefile,v 1.3 1996/10/09 20:54:24 erich Exp $
 #
 
 DISTNAME=	swig1.0
 PKGNAME=	swig-1.0
-CATEGORIES+=	devel
+CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.cs.utah.edu/pub/beazley/SWIG/
 
-GNU_CONFIGURE=	yes
 MAINTAINER=	erich@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/SWIG1.0
+GNU_CONFIGURE=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/bcc/Makefile b/devel/bcc/Makefile
index 8908106b009a..33232f7da7e6 100644
--- a/devel/bcc/Makefile
+++ b/devel/bcc/Makefile
@@ -3,12 +3,12 @@
 # Date created:		26 March 1995
 # Whom:			joerg
 #
-# $Id: Makefile,v 1.4 1995/04/09 10:04:54 asami Exp $
+# $Id: Makefile,v 1.5 1995/11/26 11:28:48 asami Exp $
 #
 
 DISTNAME=	bcc
 PKGNAME=	bcc-95.3.12
-CATEGORIES+=	devel lang
+CATEGORIES=	devel lang
 
 MAINTAINER=	joerg@FreeBSD.org
 
diff --git a/devel/cxref/Makefile b/devel/cxref/Makefile
index a756ccf98856..54b438089a68 100644
--- a/devel/cxref/Makefile
+++ b/devel/cxref/Makefile
@@ -3,24 +3,24 @@
 # Date created:		23 October 1996
 # Whom:			Thomas Gellekum <tg@freebsd.org>
 #
-# $Id: Makefile,v 1.1.1.1 1996/10/24 07:59:56 tg Exp $
+# $Id: Makefile,v 1.2 1996/10/25 06:11:05 tg Exp $
 #
 
 DISTNAME=	cxref-1.2
 PKGNAME=	cxref-1.2b
-CATEGORIES+=	devel
+CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.demon.co.uk/pub/unix/unix/tools/
 EXTRACT_SUFX=	.tgz
 
 PATCHFILES=	cxref-1.2-1.2a.diff.gz cxref-1.2a-1.2b.diff.gz
 PATCH_SITES=	${MASTER_SITES}
-PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tg@freebsd.org
 
 WRKSRC=		${WRKDIR}/cxref
 USE_GMAKE=	yes
 ALL_TARGET=	program
+PATCH_DIST_STRIP=	-p1
 
 DOCDIR=		${PREFIX}/share/doc/cxref
 
diff --git a/devel/libdlmalloc/Makefile b/devel/libdlmalloc/Makefile
index 253b05903555..5bd96b6b2067 100644
--- a/devel/libdlmalloc/Makefile
+++ b/devel/libdlmalloc/Makefile
@@ -3,12 +3,12 @@
 # Date created:		3 June 1995
 # Whom:			roberto
 #
-# $Id: Makefile,v 1.2 1995/06/24 11:37:11 asami Exp $
+# $Id: Makefile,v 1.3 1995/11/26 11:29:07 asami Exp $
 #
 
 DISTNAME=	dlmalloc
 PKGNAME=	dlmalloc-2.5.3b
-CATEGORIES+=	devel
+CATEGORIES=	devel
 MASTER_SITES=	ftp://gee.cs.oswego.edu/pub/misc/
 DISTFILES=	malloc-2.5.3b.c
 
diff --git a/devel/libmalloc/Makefile b/devel/libmalloc/Makefile
index 8581d5227cee..65fb10251bbc 100644
--- a/devel/libmalloc/Makefile
+++ b/devel/libmalloc/Makefile
@@ -3,12 +3,12 @@
 # Date created:		11 January 1995
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.5 1995/11/26 11:29:09 asami Exp $
+# $Id: Makefile,v 1.6 1996/04/12 08:25:58 asami Exp $
 #
 
 DISTNAME=	malloc
 PKGNAME=	malloc-1.17a
-CATEGORIES+=	devel
+CATEGORIES=	devel
 MASTER_SITES=	ftp.cs.toronto.edu:/pub/moraes/
 
 BROKEN=		yes
diff --git a/devel/libslang/Makefile b/devel/libslang/Makefile
index 306b10651834..ab7926c97ddf 100644
--- a/devel/libslang/Makefile
+++ b/devel/libslang/Makefile
@@ -3,12 +3,12 @@
 # Date created:         11 July 1996
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.5 1996/10/24 01:41:30 ache Exp $
+# $Id: Makefile,v 1.6 1996/10/25 00:51:47 ache Exp $
 #
 
 DISTNAME=       slang0.99-35
 PKGNAME=        libslang-0.99.35
-CATEGORIES+=	devel
+CATEGORIES=	devel
 MASTER_SITES=   ftp://space.mit.edu/pub/davis/slang/
 
 MAINTAINER=     ache@FreeBSD.org
diff --git a/devel/mkmf/Makefile b/devel/mkmf/Makefile
index a677f39c4c1e..3105f88606d5 100644
--- a/devel/mkmf/Makefile
+++ b/devel/mkmf/Makefile
@@ -3,12 +3,12 @@
 # Date created:		14 Mar 1996
 # Whom:			se
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1996/03/13 22:53:32 se Exp $
 #
 
 DISTNAME=	mkmf
 PKGNAME=	mkmf-4.11
-CATEGORIES+=	devel
+CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.uni-koeln.de/util/
 
 MAINTAINER=	se@FreeBSD.org
diff --git a/devel/mprof/Makefile b/devel/mprof/Makefile
index 13665225873b..68ff94fca3fa 100644
--- a/devel/mprof/Makefile
+++ b/devel/mprof/Makefile
@@ -3,23 +3,21 @@
 # Date created:         Sat Nov  5 01:16:33 PST 1994
 # Whom:                 hsu
 #
-# $Id: Makefile,v 1.6 1995/11/26 11:29:14 asami Exp $
+# $Id: Makefile,v 1.7 1996/10/18 08:38:18 max Exp $
 #
 
 DISTNAME=       mprof-3.0
-CATEGORIES+=	devel
+CATEGORIES=	devel
 MASTER_SITES=   ftp://cs.colorado.edu/pub/misc/
 EXTRACT_SUFX=	.tar.Z
 
 WRKSRC=		${WRKDIR}
 MAKEFILE=	Makefile.i386
+MAN1=		mprof.1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/mprof ${PREFIX}/bin
 	install -c -m 555 ${WRKSRC}/libc_mp.a ${PREFIX}/lib
 	${INSTALL_MAN} ${WRKSRC}/mprof.1 ${PREFIX}/man/man1
-.if !defined(NOMANCOMPRESS)
-	gzip -9nf ${PREFIX}/man/man1/mprof.1
-.endif
 
 .include <bsd.port.mk>
diff --git a/devel/noweb/Makefile b/devel/noweb/Makefile
index 0b405a49782d..aa2ffeeb0bc7 100644
--- a/devel/noweb/Makefile
+++ b/devel/noweb/Makefile
@@ -3,11 +3,11 @@
 # Date created:		29 July 1995
 # Whom:			thomas@ghpc8.ihf.rwth-aachen.de
 #
-# $Id: Makefile,v 1.4 1995/11/26 11:29:17 asami Exp $
+# $Id: Makefile,v 1.6 1996/03/27 08:42:13 tg Exp $
 #
 
 DISTNAME=	noweb-2.7d
-CATEGORIES+=	devel
+CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.cs.purdue.edu/pub/nr/
 EXTRACT_SUFX=	.tgz
 
@@ -17,13 +17,12 @@ BUILD_DEPENDS=	icont:${PORTSDIR}/lang/icon
 RUN_DEPENDS=	iconx:${PORTSDIR}/lang/icon
 
 WRKSRC=		${WRKDIR}/src
+MAN1=		htmltoc.1 nodefs.1 noindex.1 noroots.1 notangle.1 \
+		noweb.1 cpif.1 sl2h.1 nowebstyle.1 nuweb2noweb.1 \
+		nowebfilters.1
 
 .if !defined(NOMANCOMPRESS)
 post-install:
-	for i in htmltoc nodefs noindex noroots notangle noweb cpif sl2h nowebstyle nuweb2noweb nowebfilters; \
-	do \
-		gzip -9nf ${PREFIX}/man/man1/$$i.1; \
-	done
 	@rm ${PREFIX}/man/man1/noweave.1*
 	@rm ${PREFIX}/man/man1/nountangle.1*
 	ln ${PREFIX}/man/man1/notangle.1.gz ${PREFIX}/man/man1/noweave.1.gz
diff --git a/devel/prcs/Makefile b/devel/prcs/Makefile
index c424b7de6b06..343caa4fe305 100644
--- a/devel/prcs/Makefile
+++ b/devel/prcs/Makefile
@@ -3,11 +3,11 @@
 # Date created:         17 Sep 96
 # Whom:                 jmacd@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.2 1996/09/18 00:54:30 jmacd Exp $
+# $Id: Makefile,v 1.3 1996/10/08 07:32:33 asami Exp $
 #
 
 DISTNAME= 	prcs-1.0.1
-CATEGORIES+=	devel
+CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.xcf.berkeley.edu/pub/prcs/
 
 MAINTAINER=	jmacd@FreeBSD.ORG
diff --git a/devel/swig11/Makefile b/devel/swig11/Makefile
index e7747170cc6a..5d9ca1132e93 100644
--- a/devel/swig11/Makefile
+++ b/devel/swig11/Makefile
@@ -3,17 +3,17 @@
 # Date created:         19 April 1996
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.2 1996/04/23 07:47:40 asami Exp $
+# $Id: Makefile,v 1.3 1996/10/09 20:54:24 erich Exp $
 #
 
 DISTNAME=	swig1.0
 PKGNAME=	swig-1.0
-CATEGORIES+=	devel
+CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.cs.utah.edu/pub/beazley/SWIG/
 
-GNU_CONFIGURE=	yes
 MAINTAINER=	erich@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/SWIG1.0
+GNU_CONFIGURE=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/swig13/Makefile b/devel/swig13/Makefile
index e7747170cc6a..5d9ca1132e93 100644
--- a/devel/swig13/Makefile
+++ b/devel/swig13/Makefile
@@ -3,17 +3,17 @@
 # Date created:         19 April 1996
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.2 1996/04/23 07:47:40 asami Exp $
+# $Id: Makefile,v 1.3 1996/10/09 20:54:24 erich Exp $
 #
 
 DISTNAME=	swig1.0
 PKGNAME=	swig-1.0
-CATEGORIES+=	devel
+CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.cs.utah.edu/pub/beazley/SWIG/
 
-GNU_CONFIGURE=	yes
 MAINTAINER=	erich@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/SWIG1.0
+GNU_CONFIGURE=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/swig20/Makefile b/devel/swig20/Makefile
index e7747170cc6a..5d9ca1132e93 100644
--- a/devel/swig20/Makefile
+++ b/devel/swig20/Makefile
@@ -3,17 +3,17 @@
 # Date created:         19 April 1996
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.2 1996/04/23 07:47:40 asami Exp $
+# $Id: Makefile,v 1.3 1996/10/09 20:54:24 erich Exp $
 #
 
 DISTNAME=	swig1.0
 PKGNAME=	swig-1.0
-CATEGORIES+=	devel
+CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.cs.utah.edu/pub/beazley/SWIG/
 
-GNU_CONFIGURE=	yes
 MAINTAINER=	erich@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/SWIG1.0
+GNU_CONFIGURE=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/tkcvs/Makefile b/devel/tkcvs/Makefile
index f31a4ecae325..cee99dac6ebf 100644
--- a/devel/tkcvs/Makefile
+++ b/devel/tkcvs/Makefile
@@ -3,11 +3,11 @@
 # Date created:         02 Aug 1996
 # Whom:                 shanee@rabbit.augusta.de
 #
-# $Id: Makefile,v 1.5 1996/08/09 21:53:06 chuckr Exp $
+# $Id: Makefile,v 1.6 1996/10/06 09:58:38 markm Exp $
 #
 
 DISTNAME=	tkcvs-6.0
-CATEGORIES+=	devel
+CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.neosoft.com/pub/tcl/NEW/
 
 MAINTAINER=	shanee@rabbit.augusta.de
@@ -16,6 +16,8 @@ LIB_DEPENDS=	tk41\\.1\\.:${PORTSDIR}/x11/tk41
 
 NO_BUILD=	yes
 
+MAN1=		tkcvs.1 tkdiff.1
+
 do-install:
 	(cd $(WRKSRC)/tkcvs; sh ./doinstall)
 
@@ -28,9 +30,5 @@ post-install:
 	install -c ${WRKSRC}/README.tkcvs $(PREFIX)/lib/tkcvs/
 	install -c ${WRKSRC}/tkdiff/README $(PREFIX)/lib/tkcvs/README.tkdiff
 .endif
-.if !defined(NOMANCOMPRESS)
-	gzip -9nf $(PREFIX)/man/man1/tkcvs.1
-	gzip -9nf $(PREFIX)/man/man1/tkdiff.1
-.endif
 
 .include <bsd.port.mk>
diff --git a/editors/asedit/Makefile b/editors/asedit/Makefile
index 1da06d3a597c..4d396ac08091 100644
--- a/editors/asedit/Makefile
+++ b/editors/asedit/Makefile
@@ -4,12 +4,13 @@
 #
 # Whom:	Andreas Kohout <shanee@rabbit.augusta.de>
 #
-# $Id: Makefile,v 1.2 1996/08/08 16:49:40 jkh Exp $
+# $Id: Makefile,v 1.3 1996/08/09 00:38:43 asami Exp $
 #
 
 DISTNAME=	asedit-1.3.2
 CATEGORIES=	editors
-MASTER_SITES=	ftp://ftp.x.org/contrib/editors/
+MASTER_SITES=	${MASTER_SITE_CONTRIB}
+MASTER_SITE_SUBDIR=	editors
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	shanee@rabbit.augusta.de
diff --git a/ftp/mirror/Makefile b/ftp/mirror/Makefile
index 540f88e0c9c8..d06739b077e7 100644
--- a/ftp/mirror/Makefile
+++ b/ftp/mirror/Makefile
@@ -3,11 +3,11 @@
 # Date created:		15 May 1995
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.2 1995/11/27 04:05:15 asami Exp $
+# $Id: Makefile,v 1.3 1996/03/16 15:29:09 torstenb Exp $
 #
 
 DISTNAME=	mirror-2.8
-CATEGORIES+=	net
+CATEGORIES=	net
 MASTER_SITES=	ftp://src.doc.ic.ac.uk/computing/archiving/mirror/
 
 MAINTAINER=	torstenb@FreeBSD.ORG
diff --git a/ftp/ncftp/Makefile b/ftp/ncftp/Makefile
index f91acf5be362..9ea65a809a32 100644
--- a/ftp/ncftp/Makefile
+++ b/ftp/ncftp/Makefile
@@ -3,21 +3,20 @@
 # Date created:         20 Jun 1996
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.1.1.1 1996/06/20 15:17:26 jkh Exp $
+# $Id: Makefile,v 1.2 1996/07/05 06:26:52 asami Exp $
 #
 
 DISTNAME=       ncftp-1.9.5
-CATEGORIES+=	net
+CATEGORIES=	net
 MASTER_SITES=   ftp://ftp.probe.net/pub/ncftp/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	jkh@FreeBSD.ORG
 
+MAN1=		ncftp.1
+
 do-install:
 	cd ${WRKSRC}; $(INSTALL) -c $(STRIP) -o $(BINOWN) -g $(BINGRP) -m $(BINMODE) ncftp $(PREFIX)/bin
 	cd ${WRKSRC}; $(INSTALL) -c -o $(BINOWN) -g $(BINGRP) -m 644 ncftp.1 $(PREFIX)/man/man1
-.if !defined(NOMANCOMPRESS)
-	gzip -9nf $(PREFIX)/man/man1/ncftp.1
-.endif
 
 .include <bsd.port.mk>
diff --git a/ftp/ncftp1/Makefile b/ftp/ncftp1/Makefile
index f91acf5be362..9ea65a809a32 100644
--- a/ftp/ncftp1/Makefile
+++ b/ftp/ncftp1/Makefile
@@ -3,21 +3,20 @@
 # Date created:         20 Jun 1996
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.1.1.1 1996/06/20 15:17:26 jkh Exp $
+# $Id: Makefile,v 1.2 1996/07/05 06:26:52 asami Exp $
 #
 
 DISTNAME=       ncftp-1.9.5
-CATEGORIES+=	net
+CATEGORIES=	net
 MASTER_SITES=   ftp://ftp.probe.net/pub/ncftp/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	jkh@FreeBSD.ORG
 
+MAN1=		ncftp.1
+
 do-install:
 	cd ${WRKSRC}; $(INSTALL) -c $(STRIP) -o $(BINOWN) -g $(BINGRP) -m $(BINMODE) ncftp $(PREFIX)/bin
 	cd ${WRKSRC}; $(INSTALL) -c -o $(BINOWN) -g $(BINGRP) -m 644 ncftp.1 $(PREFIX)/man/man1
-.if !defined(NOMANCOMPRESS)
-	gzip -9nf $(PREFIX)/man/man1/ncftp.1
-.endif
 
 .include <bsd.port.mk>
diff --git a/ftp/ncftp2/Makefile b/ftp/ncftp2/Makefile
index c579be134685..d01078c292a6 100644
--- a/ftp/ncftp2/Makefile
+++ b/ftp/ncftp2/Makefile
@@ -3,23 +3,21 @@
 # Date created:         4 Nov 1994
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.35 1996/10/21 20:05:10 ache Exp $
+# $Id: Makefile,v 1.36 1996/11/10 03:10:35 peter Exp $
 #
 
 DISTNAME=       ncftp-2.4.2
-CATEGORIES+=	net
+CATEGORIES=	net
 MASTER_SITES=   ftp://ftp.probe.net/pub/ncftp/
 
 MAINTAINER=	ache@FreeBSD.ORG
 
 GNU_CONFIGURE=  yes
 CONFIGURE_ENV=  ac_cv_func_getmaxyx=yes
+MAN1=		ncftp2.1
 
 do-install:
 	$(INSTALL_PROGRAM) $(WRKSRC)/ncftp $(PREFIX)/bin/ncftp2
 	$(INSTALL_MAN) $(WRKSRC)/ncftp.1 $(PREFIX)/man/man1/ncftp2.1
-.if !defined(NOMANCOMPRESS)
-	gzip -9nf ${PREFIX}/man/man1/ncftp2.1
-.endif
 
 .include <bsd.port.mk>
diff --git a/ftp/ncftp3/Makefile b/ftp/ncftp3/Makefile
index c579be134685..d01078c292a6 100644
--- a/ftp/ncftp3/Makefile
+++ b/ftp/ncftp3/Makefile
@@ -3,23 +3,21 @@
 # Date created:         4 Nov 1994
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.35 1996/10/21 20:05:10 ache Exp $
+# $Id: Makefile,v 1.36 1996/11/10 03:10:35 peter Exp $
 #
 
 DISTNAME=       ncftp-2.4.2
-CATEGORIES+=	net
+CATEGORIES=	net
 MASTER_SITES=   ftp://ftp.probe.net/pub/ncftp/
 
 MAINTAINER=	ache@FreeBSD.ORG
 
 GNU_CONFIGURE=  yes
 CONFIGURE_ENV=  ac_cv_func_getmaxyx=yes
+MAN1=		ncftp2.1
 
 do-install:
 	$(INSTALL_PROGRAM) $(WRKSRC)/ncftp $(PREFIX)/bin/ncftp2
 	$(INSTALL_MAN) $(WRKSRC)/ncftp.1 $(PREFIX)/man/man1/ncftp2.1
-.if !defined(NOMANCOMPRESS)
-	gzip -9nf ${PREFIX}/man/man1/ncftp2.1
-.endif
 
 .include <bsd.port.mk>
diff --git a/ftp/wu-ftpd+ipv6/Makefile b/ftp/wu-ftpd+ipv6/Makefile
index 453363d68262..d3862437508b 100644
--- a/ftp/wu-ftpd+ipv6/Makefile
+++ b/ftp/wu-ftpd+ipv6/Makefile
@@ -3,11 +3,11 @@
 # Date created:		18 Oct 1994
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.5 1996/03/30 13:09:19 ache Exp $
+# $Id: Makefile,v 1.6 1996/09/05 18:37:46 ache Exp $
 #
 
 DISTNAME=	wu-ftpd-2.4
-CATEGORIES+=	net
+CATEGORIES=	net
 MASTER_SITES=   ftp://ftp.wustl.edu/packages/wuarchive-ftpd/ \
 		http://wuarchive.wustl.edu/packages/wuarchive-ftpd/
 EXTRACT_SUFX=   .tar.Z
diff --git a/ftp/wu-ftpd/Makefile b/ftp/wu-ftpd/Makefile
index 453363d68262..d3862437508b 100644
--- a/ftp/wu-ftpd/Makefile
+++ b/ftp/wu-ftpd/Makefile
@@ -3,11 +3,11 @@
 # Date created:		18 Oct 1994
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.5 1996/03/30 13:09:19 ache Exp $
+# $Id: Makefile,v 1.6 1996/09/05 18:37:46 ache Exp $
 #
 
 DISTNAME=	wu-ftpd-2.4
-CATEGORIES+=	net
+CATEGORIES=	net
 MASTER_SITES=   ftp://ftp.wustl.edu/packages/wuarchive-ftpd/ \
 		http://wuarchive.wustl.edu/packages/wuarchive-ftpd/
 EXTRACT_SUFX=   .tar.Z
diff --git a/ftp/yale-tftpd/Makefile b/ftp/yale-tftpd/Makefile
index 0098cb9d61d6..cc6f592ac168 100644
--- a/ftp/yale-tftpd/Makefile
+++ b/ftp/yale-tftpd/Makefile
@@ -3,11 +3,11 @@
 # Date created:		Oct 8, 1994
 # Whom:			pst
 #
-# $Id: Makefile,v 1.4 1995/04/15 05:42:10 asami Exp $
+# $Id: Makefile,v 1.5 1995/11/27 04:05:56 asami Exp $
 #
 
 DISTNAME=	yale-tftpd-3.0
-CATEGORIES+=	net
+CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.cisco.com/pub/
 
 NO_WRKSUBDIR=
diff --git a/games/acm/Makefile b/games/acm/Makefile
index e2df58233873..982dafdd6599 100644
--- a/games/acm/Makefile
+++ b/games/acm/Makefile
@@ -3,11 +3,11 @@
 # Date created:		5 March 1995
 # Whom:			joerg
 #
-# $Id: Makefile,v 1.6 1995/04/11 00:20:05 asami Exp $
+# $Id: Makefile,v 1.7 1996/08/13 20:09:54 markm Exp $
 #
 
 DISTNAME=	acm-4.7
-CATEGORIES+=	games
+CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.warwick.ac.uk/pub/x11/
 
 MAINTAINER=	joerg@FreeBSD.org
diff --git a/games/crossfire-client/Makefile b/games/crossfire-client/Makefile
index c41e8949fc76..5863d3787506 100644
--- a/games/crossfire-client/Makefile
+++ b/games/crossfire-client/Makefile
@@ -3,11 +3,11 @@
 # Date created:         So  27 Okt 1996 12:25:55 MET
 # Whom:                 Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.5 1996/11/04 10:04:36 asami Exp $
+# $Id: Makefile,v 1.6 1996/11/12 12:19:25 andreas Exp $
 #
 
 DISTNAME=	crossfire-0.92.8
-CATEGORIES+=	games
+CATEGORIES=	games
 MASTER_SITES=	ftp://ra.pyramid.com/pub/crossfire/ \
 		ftp://ftp.ifi.uio.no/pub/crossfire/ \
 		ftp://ftp.real-time.com/pub/games/crossfire/ \
diff --git a/games/crossfire-server/Makefile b/games/crossfire-server/Makefile
index c41e8949fc76..5863d3787506 100644
--- a/games/crossfire-server/Makefile
+++ b/games/crossfire-server/Makefile
@@ -3,11 +3,11 @@
 # Date created:         So  27 Okt 1996 12:25:55 MET
 # Whom:                 Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.5 1996/11/04 10:04:36 asami Exp $
+# $Id: Makefile,v 1.6 1996/11/12 12:19:25 andreas Exp $
 #
 
 DISTNAME=	crossfire-0.92.8
-CATEGORIES+=	games
+CATEGORIES=	games
 MASTER_SITES=	ftp://ra.pyramid.com/pub/crossfire/ \
 		ftp://ftp.ifi.uio.no/pub/crossfire/ \
 		ftp://ftp.real-time.com/pub/games/crossfire/ \
diff --git a/games/crossfire/Makefile b/games/crossfire/Makefile
index c41e8949fc76..5863d3787506 100644
--- a/games/crossfire/Makefile
+++ b/games/crossfire/Makefile
@@ -3,11 +3,11 @@
 # Date created:         So  27 Okt 1996 12:25:55 MET
 # Whom:                 Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.5 1996/11/04 10:04:36 asami Exp $
+# $Id: Makefile,v 1.6 1996/11/12 12:19:25 andreas Exp $
 #
 
 DISTNAME=	crossfire-0.92.8
-CATEGORIES+=	games
+CATEGORIES=	games
 MASTER_SITES=	ftp://ra.pyramid.com/pub/crossfire/ \
 		ftp://ftp.ifi.uio.no/pub/crossfire/ \
 		ftp://ftp.real-time.com/pub/games/crossfire/ \
diff --git a/games/golddig/Makefile b/games/golddig/Makefile
index e67bb33ce20c..180497974cbe 100644
--- a/games/golddig/Makefile
+++ b/games/golddig/Makefile
@@ -3,12 +3,12 @@
 # Date created:         20 November 1994
 # Whom:                 jmz
 #
-# $Id$
+# $Id: Makefile,v 1.4 1995/04/11 00:20:13 asami Exp $
 #
 
 DISTNAME=	golddig2
 PKGNAME=	golddig-2.0
-CATEGORIES+=	games
+CATEGORIES=	games
 MASTER_SITES=	ftp://qiclab.scn.rain.com/pub/games/
 EXTRACT_SUFX=	.tar.Z
 
diff --git a/games/imaze/Makefile b/games/imaze/Makefile
index a17f96f1071a..82a81852d642 100644
--- a/games/imaze/Makefile
+++ b/games/imaze/Makefile
@@ -7,7 +7,7 @@
 
 DISTNAME=       imaze
 PKGNAME=	imaze-1.3
-CATEGORIES+=	games
+CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.tu-clausthal.de/pub/unix/games/imaze/ \
 		ftp://ftp.tu-clausthal.de/pub/unix/games/imaze/sounds/
 DISTFILES=	imaze1.3.tar.Z imaze.tar
diff --git a/games/jetpack/Makefile b/games/jetpack/Makefile
index 0d30e7a7a6dc..5bca004308de 100644
--- a/games/jetpack/Makefile
+++ b/games/jetpack/Makefile
@@ -3,12 +3,12 @@
 # Date created:         21 September 1994
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.13 1995/04/24 09:10:11 asami Exp $
+# $Id: Makefile,v 1.14 1995/05/02 11:30:04 asami Exp $
 #
 
 DISTNAME=	jetpack
 PKGNAME=	jetpack-1.0
-CATEGORIES+=	games
+CATEGORIES=	games
 MASTER_SITES=	ftp://qiclab.scn.rain.com/pub/games/
 DISTFILES=	jetpack.tar.Z
 
diff --git a/games/oneko/Makefile b/games/oneko/Makefile
index 74dfb7d50fbe..e19bc128886a 100644
--- a/games/oneko/Makefile
+++ b/games/oneko/Makefile
@@ -3,11 +3,11 @@
 # Date created:		5 December 1994
 # Whom:			asami
 #
-# $Id: Makefile,v 1.4 1995/04/01 12:45:06 jkh Exp $
+# $Id: Makefile,v 1.5 1995/04/11 00:20:20 asami Exp $
 #
 
 DISTNAME=	oneko-1.1b
-CATEGORIES+=	games
+CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.cs.columbia.edu/archives/X11R5/contrib/
 
 MAINTAINER=	asami@FreeBSD.ORG
diff --git a/games/qcc/Makefile b/games/qcc/Makefile
index c694c13afea6..d503c3a6d710 100644
--- a/games/qcc/Makefile
+++ b/games/qcc/Makefile
@@ -3,12 +3,12 @@
 # Date created:					October 25th 1996
 # Whom:						jfitz@FreeBSD.ORG
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1996/10/27 05:18:54 jfitz Exp $
 #
 
 DISTNAME=	qcc
 PKGNAME=	qcc-1.01
-CATEGORIES+=	games
+CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.stomped.com/pub/idgames2/quakec/
 
 MAINTAINER=	jfitz@freebsd.org
diff --git a/games/quakeserver/Makefile b/games/quakeserver/Makefile
index 83f00eaf7d36..38af61f622a0 100644
--- a/games/quakeserver/Makefile
+++ b/games/quakeserver/Makefile
@@ -3,11 +3,11 @@
 # Date created:				October 26th 1996
 # Whom:					jfitz@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.2 1996/10/28 19:16:36 jfitz Exp $
+# $Id: Makefile,v 1.3 1996/10/30 16:22:51 jfitz Exp $
 #
 
 PKGNAME=	quakeserver-1.01
-CATEGORIES+=	games
+CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.stomped.com/pub/idstuff/quake/ \
 		ftp://ftp.stomped.com/pub/quake/x_linux/ \
 		ftp://ftp1.idsoftware.com/idstuff/quake/ \
@@ -18,7 +18,6 @@ MASTER_SITES=	ftp://ftp.stomped.com/pub/idstuff/quake/ \
 		ftp://PC/games/DOOM/idstuff/quake/ \
 		ftp://ftp.sun.ac.za/pub/msdos/idgames/idstuff/quake/ \
 		ftp://iconz.co.nz/pub/quake/
-
 DISTFILES=	quake101.zip \
 		quake-FreeBSD.tar.gz \
 		intel_linux_quake101.tgz
diff --git a/games/spider/Makefile b/games/spider/Makefile
index 9306aa1d3700..1c5df3d48aa9 100644
--- a/games/spider/Makefile
+++ b/games/spider/Makefile
@@ -3,12 +3,12 @@
 # Date created:         2 Oct 1995
 # Whom:                 se
 #
-# $Id: Makefile,v 1.1.1.1 1995/10/03 11:32:53 asami Exp $
+# $Id: Makefile,v 1.2 1995/10/10 23:56:56 asami Exp $
 #
 
 DISTNAME=	spider
 PKGNAME=	spider-1.1
-CATEGORIES+=	games
+CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.uni-koeln.de/windows/xcontrib/
 
 MAINTAINER=	asami@FreeBSD.ORG
diff --git a/games/tksol/Makefile b/games/tksol/Makefile
index b22e57210fa2..cf66c4b51a50 100644
--- a/games/tksol/Makefile
+++ b/games/tksol/Makefile
@@ -3,11 +3,11 @@
 # Date created:         26 June 1995
 # Whom:                 thomas@ghpc8.ihf.rwth-aachen.de
 #
-# $Id: Makefile,v 1.3 1996/03/06 08:19:59 asami Exp $
+# $Id: Makefile,v 1.4 1996/10/09 06:19:14 tg Exp $
 #
 
 DISTNAME=       tksol-1.0
-CATEGORIES+=	games
+CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.cs.umd.edu/pub/misc_software/tksol/
 EXTRACT_SUFX=	.tar.Z
 
@@ -17,8 +17,6 @@ RUN_DEPENDS=	wish4.1:${PORTSDIR}/x11/tk41
 
 PATCH_STRIP=	-p1
 WRKSRC=		${WRKDIR}/release
-
-post-install:
-	gzip -9nf ${PREFIX}/man/man1/tksol.1
+MAN1=		tksol.1
 
 .include <bsd.port.mk>
diff --git a/games/xasteroids/Makefile b/games/xasteroids/Makefile
index 1fe9dc5c2b2b..9a22fa0d1aa7 100644
--- a/games/xasteroids/Makefile
+++ b/games/xasteroids/Makefile
@@ -3,12 +3,12 @@
 # Date created:         3 Jan 1995
 # Whom:                 swallace
 #
-# $Id: Makefile,v 1.4 1995/04/01 12:45:08 jkh Exp $
+# $Id: Makefile,v 1.5 1995/04/11 00:20:22 asami Exp $
 #
 
 DISTNAME=       xasteroids
 PKGNAME=	xasteroids-5.0
-CATEGORIES+=	games
+CATEGORIES=	games
 MASTER_SITES=	ftp://calypso-2.oit.unc.edu/pub/X11/contrib/
 EXTRACT_SUFX=	.sh.Z
 
diff --git a/games/xchomp/Makefile b/games/xchomp/Makefile
index 227f5174a105..9468a17d82c2 100644
--- a/games/xchomp/Makefile
+++ b/games/xchomp/Makefile
@@ -3,11 +3,11 @@
 # Date created:         4 Jan 1995
 # Whom:                 swallace
 #
-# $Id: Makefile,v 1.4 1995/05/13 11:10:21 asami Exp $
+# $Id: Makefile,v 1.5 1995/10/11 00:00:26 asami Exp $
 #
 
 DISTNAME=       xchomp-pl1
-CATEGORIES+=	games
+CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.uoknor.edu/mirrors/X/R5contrib/
 #
 # Original sources in multi-part compressed shell archive
diff --git a/games/xemeraldia/Makefile b/games/xemeraldia/Makefile
index 50e89ca24188..af1dd949be86 100644
--- a/games/xemeraldia/Makefile
+++ b/games/xemeraldia/Makefile
@@ -3,11 +3,11 @@
 # Date created:         22 Mar 1995
 # Whom:                 asami
 #
-# $Id: Makefile,v 1.8 1995/04/11 00:20:32 asami Exp $
+# $Id: Makefile,v 1.9 1995/04/20 18:21:06 asami Exp $
 #
 
 DISTNAME=       xemeraldia-0.3
-CATEGORIES+=	games
+CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.kuis.kyoto-u.ac.jp/News.Archives/fj.sources/1995/
 DISTFILES=	271.gz
 
diff --git a/games/xeyesplus/Makefile b/games/xeyesplus/Makefile
index 9587fe34cdc1..d4677aeca8f0 100644
--- a/games/xeyesplus/Makefile
+++ b/games/xeyesplus/Makefile
@@ -3,13 +3,12 @@
 # Date created:         20 Oct 1996
 # Whom:                 Yukihiro Nakai <nakai@mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.1.1.1 1996/10/10 05:12:00 max Exp $
+# $Id: Makefile,v 1.2 1996/10/10 05:19:29 max Exp $
 #
 
 DISTNAME=		xeyes+2.01
 PKGNAME=		xeyes+-2.01
-CATEGORIES+=		games
-
+CATEGORIES=		games
 MASTER_SITES=		ftp://ftp.eos.hokudai.ac.jp/pub/X/contrib/misc/
 
 MAINTAINER=		nakai@mlab.t.u-tokyo.ac.jp
diff --git a/games/xjewel/Makefile b/games/xjewel/Makefile
index 74d9e3864585..2e66f41fe2fb 100644
--- a/games/xjewel/Makefile
+++ b/games/xjewel/Makefile
@@ -3,11 +3,11 @@
 # Date created:         22 November 1994
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.7 1995/04/24 09:10:22 asami Exp $
+# $Id: Makefile,v 1.8 1995/05/02 11:42:00 asami Exp $
 #
 
 DISTNAME=	xjewel-1.6
-CATEGORIES+=	games
+CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.warwick.ac.uk/pub/x11/
 DISTFILES=	xjewel-1.6.tar.z
 
diff --git a/games/xkobo/Makefile b/games/xkobo/Makefile
index 0de2c85c306e..c5be2eced283 100644
--- a/games/xkobo/Makefile
+++ b/games/xkobo/Makefile
@@ -3,11 +3,11 @@
 # Date created:         18 Jul 1995
 # Whom:                 jkh
 #
-# $Id: Makefile,v 1.3 1996/02/13 10:29:08 jkh Exp $
+# $Id: Makefile,v 1.4 1996/02/16 10:33:05 asami Exp $
 #
 
 DISTNAME=       xkobo-1.7
-CATEGORIES+=	games
+CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.uoknor.edu/mirrors/X/contrib/games/
 
 MAINTAINER=	jkh@FreeBSD.ORG
diff --git a/games/xlife/Makefile b/games/xlife/Makefile
index 6d17f82e009e..71e65c810de8 100644
--- a/games/xlife/Makefile
+++ b/games/xlife/Makefile
@@ -3,12 +3,12 @@
 # Date created:         15 March 1995
 # Whom:                 asami
 #
-# $Id: Makefile,v 1.3 1995/04/01 12:45:21 jkh Exp $
+# $Id: Makefile,v 1.4 1995/04/11 00:20:39 asami Exp $
 #
 
 DISTNAME=       xlife
 PKGNAME=	xlife-3.0
-CATEGORIES+=	games
+CATEGORIES=	games
 MASTER_SITES=	ftp://gatekeeper.dec.com/pub/X11/R5-contrib/
 EXTRACT_SUFX=	.tar.Z
 
diff --git a/games/xmahjongg/Makefile b/games/xmahjongg/Makefile
index 3a7547950ac2..014b049663bd 100644
--- a/games/xmahjongg/Makefile
+++ b/games/xmahjongg/Makefile
@@ -3,11 +3,12 @@
 # Date created:		16 Aug 1996
 # Whom:			joerg@freebsd.org
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1996/08/27 20:16:32 joerg Exp $
 #
 
 DISTNAME=	xmahjongg
-CATEGORIES+=	games
+PKGNAME=	xmahjongg-1.0
+CATEGORIES=	games
 # Most Usenet archive sites don't store it as a .tar.gz, but Slackware
 # and it's mirrors do.
 MASTER_SITES=	ftp://wcarchive.cdrom.com/pub/linux/slackware/source/xap/xgames/
@@ -19,4 +20,7 @@ USE_IMAKE=	yes
 
 NO_CDROM=	"Restrictive copyright."
 
+post-extract:
+	@cp ${WRKSRC}/xmahjongg.6 ${WRKSRC}/xmahjongg.man
+
 .include <bsd.port.mk>
diff --git a/games/xmille/Makefile b/games/xmille/Makefile
index 2bc3e9578b43..c5496d1b3e6e 100644
--- a/games/xmille/Makefile
+++ b/games/xmille/Makefile
@@ -3,12 +3,12 @@
 # Date created:         30 Dec 1994
 # Whom:                 swallace
 #
-# $Id: Makefile,v 1.5 1995/04/15 23:43:20 asami Exp $
+# $Id: Makefile,v 1.6 1995/10/19 22:11:55 asami Exp $
 #
 
 DISTNAME=       xmille
 PKGNAME=	xmille-2.0
-CATEGORIES+=	games
+CATEGORIES=	games
 MASTER_SITES=	ftp://gatekeeper.dec.com/pub/X11-contrib/
 EXTRACT_SUFX=   .tar.Z
 
diff --git a/games/xmine/Makefile b/games/xmine/Makefile
index 464fc367a9a7..7073069c2f90 100644
--- a/games/xmine/Makefile
+++ b/games/xmine/Makefile
@@ -3,13 +3,13 @@
 # Date created:		25 December 1994
 # Whom:			joerg
 #
-# $Id: Makefile,v 1.8 1995/04/17 08:29:17 joerg Exp $
+# $Id: Makefile,v 1.9 1996/06/03 02:17:18 asami Exp $
 #
 
 DISTNAME=	xmine-1.0.3-Xaw
-MASTER_SITES=	ftp://freefall.freebsd.org/pub/FreeBSD/LOCAL_PORTS/
 PKGNAME=	xmine-1.0.3
-CATEGORIES+=	games
+CATEGORIES=	games
+MASTER_SITES=	ftp://freefall.freebsd.org/pub/FreeBSD/LOCAL_PORTS/
 
 MAINTAINER=	joerg@FreeBSD.org
 
diff --git a/games/xminesweep/Makefile b/games/xminesweep/Makefile
index 302be4ccb5c0..377271b70e38 100644
--- a/games/xminesweep/Makefile
+++ b/games/xminesweep/Makefile
@@ -3,12 +3,12 @@
 # Date created:		31 Januar 1995
 # Whom:			janek
 #
-# $Id$
+# $Id: Makefile,v 1.6 1995/04/11 00:20:45 asami Exp $
 #
 
 DISTNAME=	xminesweep3.0
 PKGNAME=	xminesweep-3.0
-CATEGORIES+=	games
+CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.icm.edu.pl/pub/X11/contrib/games/
 EXTRACT_SUFX=	.tar.Z
 
diff --git a/games/xmj/Makefile b/games/xmj/Makefile
index cdcdd67d9907..fa5e80ceba2e 100644
--- a/games/xmj/Makefile
+++ b/games/xmj/Makefile
@@ -3,12 +3,12 @@
 # Date created:         2 Jan 1995
 # Whom:                 swallace
 #
-# $Id: Makefile,v 1.4 1995/04/11 00:20:47 asami Exp $
+# $Id: Makefile,v 1.5 1995/05/13 11:27:56 asami Exp $
 #
 
 DISTNAME=       xmj
 PKGNAME=	xmj-1.0
-CATEGORIES+=	games
+CATEGORIES=	games
 MASTER_SITES=	ftp://forte.mathematik.uni-bremen.de/pub/unix/X11/
 
 USE_IMAKE=	yes
diff --git a/games/xmris/Makefile b/games/xmris/Makefile
index dfa96613c794..feea364792c4 100644
--- a/games/xmris/Makefile
+++ b/games/xmris/Makefile
@@ -3,12 +3,12 @@
 # Date created:         21 September 1994
 # Whom:                 jmz
 #
-# $Id$
+# $Id: Makefile,v 1.10 1995/04/11 00:20:50 asami Exp $
 
 DISTNAME=	xmris.4.02
 PKGNAME=	xmris-4.02
+CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.x.org/R5contrib/
-CATEGORIES+=	games
 
 MAINTAINER=	jmz@FreeBSD.org
 
diff --git a/games/xneko/Makefile b/games/xneko/Makefile
index 0e8d90404981..de20fa4fa620 100644
--- a/games/xneko/Makefile
+++ b/games/xneko/Makefile
@@ -3,12 +3,12 @@
 # Date created:		22 December 1995
 # Whom:			markm
 #
-# $Id: Makefile,v 1.2 1995/12/25 07:38:41 asami Exp $
+# $Id: Makefile,v 1.3 1995/12/25 07:53:54 asami Exp $
 #
 
 DISTNAME=	xneko
 PKGNAME=	xneko-4.4
-CATEGORIES+=	x11 games
+CATEGORIES=	x11 games
 MASTER_SITES=	ftp://ftp.cdrom.com/pub/bsd-sources/4.4BSD-Lite/usr/src/games/
 
 MAINTAINER=	markm@FreeBSD.ORG
diff --git a/games/xonix/Makefile b/games/xonix/Makefile
index 0f457e56c3c8..7a078a190da0 100644
--- a/games/xonix/Makefile
+++ b/games/xonix/Makefile
@@ -3,12 +3,12 @@
 # Date created:		3 May 1995
 # Whom:			joerg
 #
-# $Id: Makefile,v 1.2 1995/05/04 12:02:55 asami Exp $
+# $Id: Makefile,v 1.3 1995/09/23 08:52:40 joerg Exp $
 #
 
 DISTNAME=	xonix-1.4
+CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.inf.tu-dresden.de/pub/people/wunsch/xonix/
-CATEGORIES+=	games
 
 MAINTAINER=	joerg@FreeBSD.org
 
diff --git a/games/xpacman/Makefile b/games/xpacman/Makefile
index d383576e32c3..136ef2271501 100644
--- a/games/xpacman/Makefile
+++ b/games/xpacman/Makefile
@@ -3,12 +3,12 @@
 # Date created:         19 Aug 1995
 # Whom:                 joerg
 #
-# $Id: Makefile,v 1.2 1995/08/21 09:52:09 asami Exp $
+# $Id: Makefile,v 1.3 1995/09/23 20:10:42 joerg Exp $
 #
 
 DISTNAME=       pacman10
 PKGNAME=	xpacman-1.0
-CATEGORIES+=	games
+CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.nvg.unit.no/pub/pacman/
 EXTRACT_SUFX=	.zip
 
diff --git a/games/xpilot/Makefile b/games/xpilot/Makefile
index a5d2eb2e70ca..c147d6011220 100644
--- a/games/xpilot/Makefile
+++ b/games/xpilot/Makefile
@@ -3,11 +3,11 @@
 # Date created:         18 July 1995
 # Whom:                 jmacd
 #
-# $Id: Makefile,v 1.2 1995/07/20 20:47:02 asami Exp $
+# $Id: Makefile,v 1.4 1996/06/28 20:45:24 gpalmer Exp $
 #
 
 DISTNAME=       xpilot-3.3.1
-CATEGORIES+=	games
+CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.cs.uit.no/pub/games/xpilot/
 
 USE_IMAKE=	yes
diff --git a/games/xpipeman/Makefile b/games/xpipeman/Makefile
index eca46d0144d9..7bd032fb81f6 100644
--- a/games/xpipeman/Makefile
+++ b/games/xpipeman/Makefile
@@ -3,12 +3,12 @@
 # Date created:         2 Jan 1995
 # Whom:                 swallace
 #
-# $Id: Makefile,v 1.5 1995/04/20 18:21:12 asami Exp $
+# $Id: Makefile,v 1.6 1995/05/17 14:48:53 asami Exp $
 #
 
 DISTNAME=       xpipeman
 PKGNAME=        xpipeman-1.0
-CATEGORIES+=	games
+CATEGORIES=	games
 MASTER_SITES=	ftp://iraun1.ira.uka.de/pub/x11/
 EXTRACT_SUFX=	.tar.Z
 
diff --git a/games/xripple/Makefile b/games/xripple/Makefile
index 908dd6a20184..3866cd395d5a 100644
--- a/games/xripple/Makefile
+++ b/games/xripple/Makefile
@@ -3,12 +3,12 @@
 # Date created:				6 Oct 1996
 # Whom:					oly
 #
-# $Id: Makefile,v 1.1.1.1 1996/11/09 00:01:31 obrien Exp $
+# $Id: Makefile,v 1.2 1996/11/09 01:09:20 asami Exp $
 #
 
 DISTNAME=	xripple
 PKGNAME=	xripple-1.0
-CATEGORIES+=	games
+CATEGORIES=	games
 MASTER_SITES=	ftp://www.cse.unsw.edu.au/pub/users/s2154962/
 
 MAINTAINER=	oly@world.std.com
diff --git a/games/xrisk/Makefile b/games/xrisk/Makefile
index 7f442434a4c5..bdb91ba41940 100644
--- a/games/xrisk/Makefile
+++ b/games/xrisk/Makefile
@@ -3,11 +3,11 @@
 # Date created:         4 Jan 1995
 # Whom:                 swallace
 #
-# $Id: Makefile,v 1.6 1996/03/07 02:19:45 asami Exp $
+# $Id: Makefile,v 1.7 1996/06/14 03:21:40 asami Exp $
 #
 
 DISTNAME=       xrisk-2.13
-CATEGORIES+=	games
+CATEGORIES=	games
 MASTER_SITES=   ftp://geocub.greco-prog.fr/pub/Games/
 EXTRACT_SUFX=   .tar.Z
 
diff --git a/games/xroach/Makefile b/games/xroach/Makefile
index 8ba2b6b259de..acac2e9a3391 100644
--- a/games/xroach/Makefile
+++ b/games/xroach/Makefile
@@ -3,12 +3,12 @@
 # Date created:		22 December 1995
 # Whom:			markm
 #
-# $Id: Makefile,v 1.2 1995/12/25 07:38:32 asami Exp $
+# $Id: Makefile,v 1.3 1995/12/25 07:53:59 asami Exp $
 #
 
 DISTNAME=	xroach
 PKGNAME=	xroach-4.4
-CATEGORIES+=	x11 games
+CATEGORIES=	x11 games
 MASTER_SITES=	ftp://ftp.cdrom.com/pub/bsd-sources/4.4BSD-Lite/usr/src/games/
 
 MAINTAINER=	markm@FreeBSD.ORG
diff --git a/games/xrobots/Makefile b/games/xrobots/Makefile
index cecc25c431de..148c7790fcfc 100644
--- a/games/xrobots/Makefile
+++ b/games/xrobots/Makefile
@@ -3,12 +3,12 @@
 # Date created:         2 Jan 1995
 # Whom:                 swallace
 #
-# $Id: Makefile,v 1.5 1995/04/20 18:21:16 asami Exp $
+# $Id: Makefile,v 1.6 1995/05/17 14:49:00 asami Exp $
 #
 
 DISTNAME=       xrobots
 PKGNAME=        xrobots-1.0
-CATEGORIES+=	games
+CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.cs.orst.edu/pub/src/X11R4/contrib/games/
 
 USE_IMAKE=	yes
diff --git a/games/xrubik/Makefile b/games/xrubik/Makefile
index bce15e0d04d4..96c966604aca 100644
--- a/games/xrubik/Makefile
+++ b/games/xrubik/Makefile
@@ -3,12 +3,12 @@
 # Date created:		20 October 1996
 # Whom:			Yukihiro Nakai <nakai@mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.2 1996/10/15 02:10:18 max Exp $
+# $Id: Makefile,v 1.3 1996/10/15 07:30:48 max Exp $
 #
 
 DISTNAME=	xrubik
 PKGNAME=	xrubik-5.3.2
-CATEGORIES+=	games x11
+CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.iis.u-tokyo.ac.jp/pub1/X/contrib/games/puzzles/
 
 MAINTAINER=	nakai@mlab.t.u-tokyo.ac.jp
diff --git a/games/xshisen/Makefile b/games/xshisen/Makefile
index eb7e2573a374..ebcdc70857d6 100644
--- a/games/xshisen/Makefile
+++ b/games/xshisen/Makefile
@@ -3,11 +3,11 @@
 # Date created:               9 Oct 1996
 # Whom:                 Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.1.1.1 1996/11/03 21:11:08 jfitz Exp $
+# $Id: Makefile,v 1.2 1996/11/04 12:59:50 jfitz Exp $
 #
 
 DISTNAME=       xshisen-1.35
-CATEGORIES+=	games
+CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.iis.u-tokyo.ac.jp/pub1/X/contrib/games/
 
 MAINTAINER=	Nakai@Mlab.t.u-tokyo.ac.jp
diff --git a/games/xskat/Makefile b/games/xskat/Makefile
index e751a89e7c11..d49879cee199 100644
--- a/games/xskat/Makefile
+++ b/games/xskat/Makefile
@@ -3,11 +3,11 @@
 # Date created:		27 Apr 1996
 # Whom:			thomas@ghpc8.ihf.rwth-aachen.de
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1996/05/14 12:13:07 tg Exp $
 #
 
 DISTNAME=	xskat-1.6
-CATEGORIES+=	games
+CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.germany.eu.net/pub/X11/misc/
 
 MAINTAINER=	thomas@ghpc8.ihf.rwth-aachen.de
diff --git a/games/xsol/Makefile b/games/xsol/Makefile
index e32f6dd0ad2c..b67f68d8490a 100644
--- a/games/xsol/Makefile
+++ b/games/xsol/Makefile
@@ -3,12 +3,12 @@
 # Date created:         2 Jan 1995
 # Whom:                 swallace
 #
-# $Id: Makefile,v 1.4 1995/04/01 12:45:38 jkh Exp $
+# $Id: Makefile,v 1.5 1995/04/11 00:20:58 asami Exp $
 #
 
 DISTNAME=       xsol-new
 PKGNAME=	xsol-2.1.1
-CATEGORIES+=	games
+CATEGORIES=	games
 MASTER_SITES=	ftp://iraun1.ira.uka.de/pub/x11/games/
 
 USE_IMAKE=      yes
diff --git a/games/yamsweeper/Makefile b/games/yamsweeper/Makefile
index 440e61c501c7..93811453cd7d 100644
--- a/games/yamsweeper/Makefile
+++ b/games/yamsweeper/Makefile
@@ -3,18 +3,17 @@
 # Date created:		14 Sep 1996
 # Whom:			Hidekazu Kuroki <hidekazu@cs.titech.ac.jp>
 #
-# $Id: Makefile,v 1.1.1.1 1996/09/21 16:56:45 max Exp $
+# $Id: Makefile,v 1.2 1996/09/22 08:55:35 max Exp $
 #
 
 DISTNAME=       yamsweeper-1.9
-CATEGORIES+=	games
+CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.tut.ac.jp/X11/Contrib/Games/
 
 MAINTAINER=	hidekazu@cs.titech.ac.jp
 
 USE_IMAKE=	yes
 
-
 pre-configure:
 	@mv ${WRKSRC}/Imakefile ${WRKSRC}/Imakefile.old
 	@cp ${FILESDIR}/Imakefile ${WRKSRC}
diff --git a/graphics/Mesa3/Makefile b/graphics/Mesa3/Makefile
index eeda56b89685..cae56d17efc9 100644
--- a/graphics/Mesa3/Makefile
+++ b/graphics/Mesa3/Makefile
@@ -3,11 +3,11 @@
 # Date created:         Tue Feb  7 12:02:49  1995
 # Whom:                 hsu
 #
-# $Id: Makefile,v 1.9 1996/04/12 08:29:07 asami Exp $
+# $Id: Makefile,v 1.10 1996/05/16 06:19:11 asami Exp $
 #
 
 DISTNAME=       Mesa-1.2.7
-CATEGORIES+=	graphics
+CATEGORIES=	graphics
 MASTER_SITES=   ftp://iris.ssec.wisc.edu/pub/Mesa/
 
 ALL_TARGET=     freebsd
diff --git a/graphics/aero/Makefile b/graphics/aero/Makefile
index 6e0940c584b9..7d713f74c748 100644
--- a/graphics/aero/Makefile
+++ b/graphics/aero/Makefile
@@ -3,12 +3,12 @@
 # Date created:         Mon Aug 28 13:35:31 CDT 1995
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.4 1996/08/20 13:32:17 erich Exp $
+# $Id: Makefile,v 1.5 1996/08/22 12:46:41 erich Exp $
 #
 
 DISTNAME=	aero_1.5.2_src
 PKGNAME=	aero-1.5.2
-CATEGORIES+=	graphics
+CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.povray.org/pub/povray/modellers/aero/
 
 MAINTAINER=	erich@FreeBSD.org
diff --git a/graphics/dore/Makefile b/graphics/dore/Makefile
index 08f01cae21e9..ffe8833b7e10 100644
--- a/graphics/dore/Makefile
+++ b/graphics/dore/Makefile
@@ -3,11 +3,11 @@
 # Date created:		10 February 1995
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.3 1995/04/09 07:09:33 asami Exp $
+# $Id: Makefile,v 1.4 1996/03/07 00:21:43 asami Exp $
 #
 
 DISTNAME=	pdore-6.0
-CATEGORIES+=	graphics
+CATEGORIES=	graphics
 MASTER_SITES=   ftp://freefall.freebsd.org/pub/FreeBSD/LOCAL_PORTS/
 EXTRACT_SUFX=	.tar.Z
 
diff --git a/graphics/giftool/Makefile b/graphics/giftool/Makefile
index ef814245aa46..add0f27747bb 100644
--- a/graphics/giftool/Makefile
+++ b/graphics/giftool/Makefile
@@ -3,12 +3,12 @@
 # Date created:        14 October 1996
 # Whom:                Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1996/10/30 13:44:05 jfitz Exp $
 #
 
 DISTNAME=	giftool
 PKGNAME=        giftool-0.9
-CATEGORIES+=	graphics
+CATEGORIES=	graphics
 MASTER_SITES=   ftp://ftp.huie.hokudai.ac.jp/pub/tool/graphics/
 
 MAINTAINER=	Nakai@Mlab.t.u-tokyo.ac.jp
diff --git a/graphics/giftrans/Makefile b/graphics/giftrans/Makefile
index def41d97bcb1..8358d75af402 100644
--- a/graphics/giftrans/Makefile
+++ b/graphics/giftrans/Makefile
@@ -3,17 +3,18 @@
 # Date created:        14 October 1996
 # Whom:                Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1996/10/30 11:12:25 jfitz Exp $
 #
 
 DISTNAME=	giftrans
 PKGNAME=        giftrans-1.12
-CATEGORIES+=	graphics
+CATEGORIES=	graphics
 MASTER_SITES=   ftp://ftp.lab.kdd.co.jp/infosystems/misc/tools/
 
 MAINTAINER=	Nakai@Mlab.t.u-tokyo.ac.jp
 
-CONFIGURE_ENV+=	X11BASE=${X11BASE}
+CONFIGURE_ENV=	X11BASE=${X11BASE}
+MAN1=		giftrans.1
 
 do-build:
 	(cd ${WRKSRC}; cc -O2 -m486 giftrans.c -o giftrans)
@@ -22,8 +23,4 @@ do-install:
 	@ ${INSTALL_PROGRAM} ${WRKSRC}/giftrans ${PREFIX}/bin
 	@ ${INSTALL_MAN} ${WRKSRC}/giftrans.1 ${PREFIX}/man/man1
 
-.if !defined(NOMANCOMPRESS)
-	gzip -9nf ${PREFIX}/man/man1/giftrans.1
-.endif
-
 .include <bsd.port.mk>
diff --git a/graphics/hpscan/Makefile b/graphics/hpscan/Makefile
index 7a20d9613646..a0fe599f9d60 100644
--- a/graphics/hpscan/Makefile
+++ b/graphics/hpscan/Makefile
@@ -3,12 +3,12 @@
 # Date created:		12 January 1996
 # Whom:			nate
 #
-# $Id: Makefile,v 1.4 1996/06/03 02:17:20 asami Exp $
+# $Id: Makefile,v 1.5 1996/09/26 10:54:43 jkh Exp $
 #
 
 DISTNAME=	scanner
 PKGNAME=	hpscan-1.0
-CATEGORIES+=	graphics
+CATEGORIES=	graphics
 MASTER_SITES=	ftp://freefall.freebsd.org/pub/FreeBSD/LOCAL_PORTS/ \
 		ftp://macbeth.cogsci.ed.ac.uk/pub/
 
diff --git a/graphics/mesagl/Makefile b/graphics/mesagl/Makefile
index eeda56b89685..cae56d17efc9 100644
--- a/graphics/mesagl/Makefile
+++ b/graphics/mesagl/Makefile
@@ -3,11 +3,11 @@
 # Date created:         Tue Feb  7 12:02:49  1995
 # Whom:                 hsu
 #
-# $Id: Makefile,v 1.9 1996/04/12 08:29:07 asami Exp $
+# $Id: Makefile,v 1.10 1996/05/16 06:19:11 asami Exp $
 #
 
 DISTNAME=       Mesa-1.2.7
-CATEGORIES+=	graphics
+CATEGORIES=	graphics
 MASTER_SITES=   ftp://iris.ssec.wisc.edu/pub/Mesa/
 
 ALL_TARGET=     freebsd
diff --git a/graphics/mpeg-lib/Makefile b/graphics/mpeg-lib/Makefile
index 1a0f2a2a017e..47a197518224 100644
--- a/graphics/mpeg-lib/Makefile
+++ b/graphics/mpeg-lib/Makefile
@@ -3,11 +3,11 @@
 # Date created:		16 November 1994
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.3 1995/04/09 07:09:35 asami Exp $
+# $Id: Makefile,v 1.4 1995/06/24 11:38:07 asami Exp $
 #
 
 DISTNAME=	mpeg_lib-1.1
-CATEGORIES+=	graphics
+CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.mni.mcgill.ca/pub/mpeg/
 
 WRKSRC=		${WRKDIR}/mpeg_lib
diff --git a/graphics/mpeg2codec/Makefile b/graphics/mpeg2codec/Makefile
index 7fe575fb24d5..99c6415367c4 100644
--- a/graphics/mpeg2codec/Makefile
+++ b/graphics/mpeg2codec/Makefile
@@ -3,11 +3,11 @@
 # Date created:		June 21, 1996
 # Whom:			"Philippe Charnier" <charnier@lirmm.fr>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1996/07/10 05:32:53 asami Exp $
 #
 
 DISTNAME=	mpeg2codec-1.1a
-CATEGORIES+=	graphics
+CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.netcom.com/pub/cf/cfogg/mpeg2/
 DISTFILES=	mpeg2codec_v1.1a.tar.gz
 
diff --git a/graphics/mpeg2play/Makefile b/graphics/mpeg2play/Makefile
index 55504a2be18d..a402195e4e56 100644
--- a/graphics/mpeg2play/Makefile
+++ b/graphics/mpeg2play/Makefile
@@ -3,11 +3,11 @@
 # Date created:		June 21, 1996
 # Whom:			"Philippe Charnier" <charnier@lirmm.fr>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1996/07/10 05:38:41 asami Exp $
 #
 
 DISTNAME=	mpeg2play-1.1b
-CATEGORIES+=	graphics
+CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.netcom.com/pub/cf/cfogg/mpeg2/
 DISTFILES=	mpeg2play_v1.1b.tar.gz
 
diff --git a/graphics/mpeg_encode/Makefile b/graphics/mpeg_encode/Makefile
index f962097b1185..56c51150c5d6 100644
--- a/graphics/mpeg_encode/Makefile
+++ b/graphics/mpeg_encode/Makefile
@@ -3,12 +3,12 @@
 # Date created:         
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.1.1.1 1996/08/01 20:04:36 erich Exp $
+# $Id: Makefile,v 1.2 1996/08/02 07:32:41 asami Exp $
 #
 
 DISTNAME=	mpeg_encode-1.5b-src
 PKGNAME=	mpeg_encode-1.5b
-CATEGORIES+=	graphics
+CATEGORIES=	graphics
 MASTER_SITES=	ftp://s2k-ftp.CS.Berkeley.EDU/pub/multimedia/mpeg/encode/
 
 MAINTAINER=	erich@FreeBSD.org
diff --git a/graphics/mpeg_play/Makefile b/graphics/mpeg_play/Makefile
index 6673592b671d..14c83dd0f180 100644
--- a/graphics/mpeg_play/Makefile
+++ b/graphics/mpeg_play/Makefile
@@ -3,11 +3,11 @@
 # Date created:		17 December 1994
 # Whom:			asami
 #
-# $Id: Makefile,v 1.6 1996/02/07 09:28:22 asami Exp $
+# $Id: Makefile,v 1.7 1996/06/12 03:09:02 asami Exp $
 #
 
 DISTNAME=	mpeg_play-2.3
-CATEGORIES+=	graphics
+CATEGORIES=	graphics
 MASTER_SITES=	ftp://mm-ftp.cs.berkeley.edu/pub/multimedia/mpeg/play/
 EXTRACT_SUFX=	-src.tar.gz
 
diff --git a/graphics/mpeg_stat/Makefile b/graphics/mpeg_stat/Makefile
index c4998334cfe6..14cc5839e88e 100644
--- a/graphics/mpeg_stat/Makefile
+++ b/graphics/mpeg_stat/Makefile
@@ -3,12 +3,12 @@
 # Date created:         Thu Aug  1 21:52:06 CDT 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.1.1.1 1996/08/16 13:40:48 erich Exp $
+# $Id: Makefile,v 1.2 1996/08/17 10:31:50 asami Exp $
 #
 
 DISTNAME=	mpeg_stat-2.2b-src
 PKGNAME=	mpeg_stat-2.2b
-CATEGORIES+=	graphics
+CATEGORIES=	graphics
 MASTER_SITES=	ftp://s2k-ftp.CS.Berkeley.EDU/pub/multimedia/mpeg/stat/
 
 MAINTAINER=	erich@FreeBSD.org
diff --git a/graphics/mpegedit/Makefile b/graphics/mpegedit/Makefile
index e2db7ffbd328..f403d725a140 100644
--- a/graphics/mpegedit/Makefile
+++ b/graphics/mpegedit/Makefile
@@ -3,12 +3,12 @@
 # Date created:         Thu Aug  1 10:50:57 CDT 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.1.1.1 1996/08/01 20:11:56 erich Exp $
+# $Id: Makefile,v 1.2 1996/08/02 07:43:06 asami Exp $
 #
 
 DISTNAME=	mpegedit_v2.2
 PKGNAME=	mpegedit-2.2
-CATEGORIES+=	graphics
+CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.demon.co.uk/.d2/unix/unix/tools/
 
 MAINTAINER=	erich@FreeBSD.org
diff --git a/graphics/mplex/Makefile b/graphics/mplex/Makefile
index 2fea73450e95..48e2eae48e55 100644
--- a/graphics/mplex/Makefile
+++ b/graphics/mplex/Makefile
@@ -3,12 +3,12 @@
 # Date created:         Wed Jul 31 20:54:54 CDT 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1996/08/01 20:18:17 erich Exp $
 #
 
 DISTNAME=	mplex-1.1
 
-CATEGORIES+=	graphics
+CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.informatik.tu-muenchen.de/pub/comp/graphics/mpeg/mplex/
 
 MAINTAINER=	erich@FreeBSD.org
diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index 597e465d3184..e298c10b9df9 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -3,12 +3,12 @@
 # Date created:		?
 # Whom:			jmz (original)
 #
-# $Id: Makefile,v 1.6 1995/04/01 12:45:56 jkh Exp $
+# $Id: Makefile,v 1.7 1995/04/09 07:09:38 asami Exp $
 #
 
 DISTNAME=	netpbm
 PKGNAME=	netpbm-94.3.1
-CATEGORIES+=	graphics
+CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.x.org/R5contrib/
 DISTFILES=	netpbm-1mar1994.tar.gz
 
diff --git a/graphics/png/Makefile b/graphics/png/Makefile
index 1f550fa3b602..377baac40ce7 100644
--- a/graphics/png/Makefile
+++ b/graphics/png/Makefile
@@ -3,12 +3,12 @@
 # Date created:         5 Dec 1995
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.6 1996/07/17 20:07:25 ache Exp $
+# $Id: Makefile,v 1.7 1996/08/19 10:30:59 asami Exp $
 #
 
 DISTNAME=       libpng-0.89c
 PKGNAME=        png-0.89c
-CATEGORIES+=    graphics
+CATEGORIES=     graphics
 MASTER_SITES=   ftp://ftp.uu.net/graphics/png/src/
 
 MAINTAINER=     ache@FreeBSD.org
diff --git a/graphics/povray/Makefile b/graphics/povray/Makefile
index 724b47fdcd0d..39e5fd08dd7e 100644
--- a/graphics/povray/Makefile
+++ b/graphics/povray/Makefile
@@ -3,12 +3,12 @@
 # Date created:         28 Dec 1994
 # Whom:                 jmacd@uclink.berkeley.edu
 #
-# $Id: Makefile,v 1.2 1995/04/01 12:45:59 jkh Exp $
+# $Id: Makefile,v 1.3 1995/04/09 07:09:41 asami Exp $
 #
 
 DISTNAME=       POV-Ray-2.2
 PKGNAME=	povray-2.2
-CATEGORIES+=	graphics
+CATEGORIES=	graphics
 MASTER_SITES=	ftp://povray.cdrom.com/pub/povray/Official/Generic-Unix/
 DISTFILES=      povdoc.tar.Z povscn.tar.Z povsrc.tar.Z
 
diff --git a/graphics/povray36/Makefile b/graphics/povray36/Makefile
index 724b47fdcd0d..39e5fd08dd7e 100644
--- a/graphics/povray36/Makefile
+++ b/graphics/povray36/Makefile
@@ -3,12 +3,12 @@
 # Date created:         28 Dec 1994
 # Whom:                 jmacd@uclink.berkeley.edu
 #
-# $Id: Makefile,v 1.2 1995/04/01 12:45:59 jkh Exp $
+# $Id: Makefile,v 1.3 1995/04/09 07:09:41 asami Exp $
 #
 
 DISTNAME=       POV-Ray-2.2
 PKGNAME=	povray-2.2
-CATEGORIES+=	graphics
+CATEGORIES=	graphics
 MASTER_SITES=	ftp://povray.cdrom.com/pub/povray/Official/Generic-Unix/
 DISTFILES=      povdoc.tar.Z povscn.tar.Z povsrc.tar.Z
 
diff --git a/graphics/povray37/Makefile b/graphics/povray37/Makefile
index 724b47fdcd0d..39e5fd08dd7e 100644
--- a/graphics/povray37/Makefile
+++ b/graphics/povray37/Makefile
@@ -3,12 +3,12 @@
 # Date created:         28 Dec 1994
 # Whom:                 jmacd@uclink.berkeley.edu
 #
-# $Id: Makefile,v 1.2 1995/04/01 12:45:59 jkh Exp $
+# $Id: Makefile,v 1.3 1995/04/09 07:09:41 asami Exp $
 #
 
 DISTNAME=       POV-Ray-2.2
 PKGNAME=	povray-2.2
-CATEGORIES+=	graphics
+CATEGORIES=	graphics
 MASTER_SITES=	ftp://povray.cdrom.com/pub/povray/Official/Generic-Unix/
 DISTFILES=      povdoc.tar.Z povscn.tar.Z povsrc.tar.Z
 
diff --git a/graphics/spigot/Makefile b/graphics/spigot/Makefile
index 1a0d0cdef8ca..2096af50e722 100644
--- a/graphics/spigot/Makefile
+++ b/graphics/spigot/Makefile
@@ -3,11 +3,11 @@
 # Date Created:		Fri Sep 15 10:04:46 CDT 1995
 # Whom:			james@cs.uwm.edu
 #
-# $Id$
+# $Id: Makefile,v 1.2 1995/10/12 09:19:57 asami Exp $
 #
 
 DISTNAME= 	spigot-1.6
-CATEGORIES+=	graphics
+CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.cs.uwm.edu/pub/FreeBSD/spigot/
 DISTFILES=	spigot.tar.gz
 
diff --git a/graphics/splitmpg/Makefile b/graphics/splitmpg/Makefile
index 093cd0a7c4d3..9e6fb786b1f9 100644
--- a/graphics/splitmpg/Makefile
+++ b/graphics/splitmpg/Makefile
@@ -3,12 +3,12 @@
 # Date created:         Wed Jul 31 21:59:42 CDT 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.1.1.1 1996/08/01 20:22:28 erich Exp $
+# $Id: Makefile,v 1.2 1996/08/02 08:25:02 asami Exp $
 #
 
 DISTNAME=	splitmpg
 PKGNAME=	splitmpg-1.0
-CATEGORIES+=	graphics
+CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.ecel.uwa.edu.au/users/michael/
 EXTRACT_SUFX=	.tgz
 
diff --git a/graphics/vcg/Makefile b/graphics/vcg/Makefile
index f6235cfe148d..9084e11d3ccc 100644
--- a/graphics/vcg/Makefile
+++ b/graphics/vcg/Makefile
@@ -3,12 +3,12 @@
 # Date created: 19 February 1995
 # Whom: hsu
 #
-# $Id: Makefile,v 1.3 1995/04/09 07:09:43 asami Exp $
+# $Id: Makefile,v 1.4 1995/05/16 11:34:33 asami Exp $
 #
 
 DISTNAME=	vcg.1.30
 PKGNAME=	vcg-1.30
-CATEGORIES+=	graphics
+CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.cs.uni-sb.de/pub/graphics/vcg/
 DISTFILES=	vcg.1.30.r3.17.tgz
 
diff --git a/graphics/xanim/Makefile b/graphics/xanim/Makefile
index 3c6241bb3450..52074373ee1d 100644
--- a/graphics/xanim/Makefile
+++ b/graphics/xanim/Makefile
@@ -3,12 +3,12 @@
 # Date created:         Sat Nov 5 11:43:03 PST 1994
 # Whom:                 piero
 #
-# $Id: Makefile,v 1.8 1996/03/26 04:02:32 ache Exp $
+# $Id: Makefile,v 1.9 1996/09/26 21:27:12 ache Exp $
 #
 
 DISTNAME=       xanim27063
 PKGNAME=        xanim-2.70.6.3
-CATEGORIES+=	graphics x11
+CATEGORIES=	graphics x11
 MASTER_SITES=	ftp://ftp.portal.com/pub/podlipec/ \
 		ftp://ftp.portal.com/pub/podlipec/cinepak/ \
 		ftp://ftp.portal.com/pub/podlipec/indeo/ \
diff --git a/graphics/xdl/Makefile b/graphics/xdl/Makefile
index 384cc3a2cce6..d7d3b2d407d0 100644
--- a/graphics/xdl/Makefile
+++ b/graphics/xdl/Makefile
@@ -3,18 +3,16 @@
 # Date created:         17 July 1995
 # Whom:                 asami
 #
-# $Id: Makefile,v 1.1.1.1 1995/07/18 00:32:33 asami Exp $
+# $Id: Makefile,v 1.2 1995/07/27 10:11:27 ats Exp $
 #
 
 DISTNAME=	xdl-2.1
-CATEGORIES+=	graphics x11
+CATEGORIES=	graphics x11
 MASTER_SITES=	ftp://ftp.uoknor.edu/src/X11R5/
 
 MAINTAINER=	asami@FreeBSD.ORG
 
 USE_X11=	yes
-
-post-install:
-	gzip -9nf ${PREFIX}/man/man1/xdl.1
+MAN1=		xdl.1
 
 .include <bsd.port.mk>
diff --git a/graphics/xfractint/Makefile b/graphics/xfractint/Makefile
index c189cc0fffc4..59a2d61a6359 100644
--- a/graphics/xfractint/Makefile
+++ b/graphics/xfractint/Makefile
@@ -3,12 +3,12 @@
 # Date created:         7 Sept 1995
 # Whom:                 cacho@mexicano.gdl.iteso.mx
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1995/09/09 04:21:56 asami Exp $
 #
 
 DISTNAME=       xfract300
 PKGNAME=	xfractint-3.00
-CATEGORIES+=	graphics
+CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.cs.berkeley.edu/ucb/sprite/
 EXTRACT_SUFX=	.shar.Z
 
@@ -16,10 +16,6 @@ EXTRACT_CMD=	zcat
 EXTRACT_BEFORE_ARGS=
 EXTRACT_AFTER_ARGS=	|sh
 NO_WRKSUBDIR=	yes
-
-post-install:
-.if !defined(NOMANCOMPRESS)
-	gzip -9nf ${PREFIX}/man/man1/xfractint.1
-.endif
+MAN1=		xfractint.1
 
 .include <bsd.port.mk>
diff --git a/graphics/xgrasp/Makefile b/graphics/xgrasp/Makefile
index 742bf245bc85..14c03996f2e6 100644
--- a/graphics/xgrasp/Makefile
+++ b/graphics/xgrasp/Makefile
@@ -3,12 +3,12 @@
 # Date created:         23 July 1995
 # Whom:                 asami
 #
-# $Id: Makefile,v 1.1.1.1 1995/07/18 00:32:33 asami Exp $
+# $Id: Makefile,v 1.1.1.1 1995/07/29 11:30:49 asami Exp $
 #
 
 DISTNAME=	xgrasp.1.7d
 PKGNAME=	xgrasp-1.7d
-CATEGORIES+=	graphics x11
+CATEGORIES=	graphics x11
 MASTER_SITES=	ftp://qiclab.scn.rain.com/pub/X11/	\
 		ftp://ftp.cs.ubc.ca/mirror1/x-contrib.R5/
 EXTRACT_SUFX=	.tar.Z
diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile
index d2ba853c40a3..305b4e137ad7 100644
--- a/graphics/xpaint/Makefile
+++ b/graphics/xpaint/Makefile
@@ -3,11 +3,11 @@
 # Date created:         2 Jan 1995
 # Whom:                 swallace
 #
-# $Id: Makefile,v 1.8 1996/06/15 00:51:15 asami Exp $
+# $Id: Makefile,v 1.9 1996/09/29 16:08:44 chuckr Exp $
 #
 
 DISTNAME=       xpaint-2.4.6
-CATEGORIES+=	graphics x11
+CATEGORIES=	graphics x11
 MASTER_SITES=	http://www2.dk-online.dk/users/Torsten_Martinsen/xpaint/
 
 LIB_DEPENDS=    jpeg\\.6\\.:${PORTSDIR}/graphics/jpeg \
diff --git a/graphics/xpdf/Makefile b/graphics/xpdf/Makefile
index d582855eb394..a7e3cb6b0060 100644
--- a/graphics/xpdf/Makefile
+++ b/graphics/xpdf/Makefile
@@ -3,22 +3,20 @@
 # Date created:         02 Feb 1996
 # Whom:                 chuckr@glue.umd.edu
 #
-# $Id: Makefile,v 1.5 1996/05/30 11:11:10 peter Exp $
+# $Id: Makefile,v 1.6 1996/06/03 00:13:01 asami Exp $
 #
 
 DISTNAME=       xpdf-0.5
-CATEGORIES+=	graphics
+CATEGORIES=	graphics
 MASTER_SITES=   ftp://ftp.andrew.cmu.edu/pub/xpdf/
 
 MAINTAINER=	chuckr@glue.umd.edu
 
 USE_X11=	yes
+MAN1=		xpdf.1 pdftops.1
 
 post-install:
-	install -c -m 444 ${WRKSRC}/xpdf.1 ${PREFIX}/man/man1
-	install -c -m 444 ${WRKSRC}/pdftops.1 ${PREFIX}/man/man1
-.if !defined(NOMANCOMPRESS)
-	gzip -9nf ${PREFIX}/man/man1/xpdf.1 ${PREFIX}/man/man1/pdftops.1
-.endif
+	${INSTALL_MAN} ${WRKSRC}/xpdf.1 ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/pdftops.1 ${PREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/graphics/xpm/Makefile b/graphics/xpm/Makefile
index b27a30d30783..c028ea6f55bf 100644
--- a/graphics/xpm/Makefile
+++ b/graphics/xpm/Makefile
@@ -3,11 +3,11 @@
 # Date created:		14 September 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.9 1995/08/06 22:16:27 torstenb Exp $
+# $Id: Makefile,v 1.10 1996/09/14 22:52:09 torstenb Exp $
 #
 
 DISTNAME=	xpm-3.4i
-CATEGORIES+=	graphics x11
+CATEGORIES=	graphics x11
 MASTER_SITES=	ftp://avahi.inria.fr/pub/xpm/
 
 USE_IMAKE=	yes
diff --git a/irc/irc/Makefile b/irc/irc/Makefile
index 006bdec3a4b2..938af98c1429 100644
--- a/irc/irc/Makefile
+++ b/irc/irc/Makefile
@@ -3,12 +3,12 @@
 # Date created:		23 August 1994
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.9 1995/11/27 04:05:02 asami Exp $
+# $Id: Makefile,v 1.10 1996/06/14 08:52:47 asami Exp $
 #
 
 DISTNAME=	irc2.8.21
 PKGNAME=	irc-2.8.21
-CATEGORIES+=	net
+CATEGORIES=	net
 MASTER_SITES=	ftp://cs-ftp.bu.edu/irc/servers/
 
 MAINTAINER=	torstenb@FreeBSD.ORG
@@ -18,11 +18,9 @@ MAINTAINER=	torstenb@FreeBSD.ORG
 
 # Restrictive copyright in irc2.8.21/ircd/res.c
 RESTRICTED=	"No redistribution allowed."
+MAN8=		ircd.8
 
 pre-install:
 	mkdir -p ${PREFIX}/lib/ircd
 
-post-install:
-	gzip -9nf ${PREFIX}/man/man8/ircd.8
-
 .include <bsd.port.mk>
diff --git a/irc/ircII/Makefile b/irc/ircII/Makefile
index be71d27d8831..8218b28c4907 100644
--- a/irc/ircII/Makefile
+++ b/irc/ircII/Makefile
@@ -3,12 +3,12 @@
 # Date created:		18 Oct 1994
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.11 1996/06/17 22:24:20 torstenb Exp $
+# $Id: Makefile,v 1.12 1996/10/28 07:32:37 dima Exp $
 #
 
 DISTNAME=	ircii-2.9-roof
 PKGNAME=	ircii-2.9
-CATEGORIES+=	net
+CATEGORIES=	net
 MASTER_SITES=	ftp://cs-ftp.bu.edu/irc/clients/
 
 MAINTAINER=	torstenb@FreeBSD.ORG
@@ -18,10 +18,6 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS= --with-default-server="irc.FreeBSD.ORG"
 
 WRKSRC=		${WRKDIR}/${PKGNAME}
-
-.if !defined(NOMANCOMPRESS)
-post-install:
-	gzip -9nf ${PREFIX}/man/man1/ircII.1 ${PREFIX}/man/man1/ircbug.1
-.endif
+MAN1=		ircII.1 ircbug.1
 
 .include <bsd.port.mk>
diff --git a/irc/zircon/Makefile b/irc/zircon/Makefile
index b8716e670092..2a75dd7dca52 100644
--- a/irc/zircon/Makefile
+++ b/irc/zircon/Makefile
@@ -3,11 +3,11 @@
 # Date created:		19 Aug 1995
 # Whom:			jkh / pst
 #
-# $Id: Makefile,v 1.7 1996/08/16 12:24:55 peter Exp $
+# $Id: Makefile,v 1.8 1996/08/17 11:07:53 peter Exp $
 #
 
 DISTNAME=	zircon-1.17p3
-CATEGORIES+=	net
+CATEGORIES=	net
 MASTER_SITES=	ftp://catless.ncl.ac.uk/pub/
 
 #
diff --git a/japanese/today/Makefile b/japanese/today/Makefile
index 60f156a76ffc..25c9bbc2bdd1 100644
--- a/japanese/today/Makefile
+++ b/japanese/today/Makefile
@@ -3,12 +3,12 @@
 # Date created:		24 June 1996
 # Whom:			ABURAYER Rewsirow <pcs51674@asciinet.or.jp>
 #
-# $Id: Makefile,v 1.1.1.1 1996/10/18 15:04:49 asami Exp $
+# $Id: Makefile,v 1.1.1.2 1996/11/10 12:40:13 asami Exp $
 #
 
 DISTNAME=	td210bs
 PKGNAME=	jp-today-2.10b
-CATEGORIES+=	japanese games
+CATEGORIES=	japanese games
 MASTER_SITES=	ftp://ftp.waseda.ac.jp/pub/archive/fj.binaries.msdos/
 
 DISTFILES=	td210bs.lzh td210bm.lzh
diff --git a/java/jdk/Makefile b/java/jdk/Makefile
index c12c2d78890c..dcc46949b708 100644
--- a/java/jdk/Makefile
+++ b/java/jdk/Makefile
@@ -3,12 +3,12 @@
 # Date created:		8 April 1996
 # Whom:			Sujal Patel <smpatel@freebsd.org>
 #
-# $Id: Makefile,v 1.2 1996/06/16 04:34:18 smpatel Exp $
+# $Id: Makefile,v 1.3 1996/07/10 03:13:10 asami Exp $
 #
 
 DISTNAME=       jdk
 PKGNAME=	jdk-1.0.2
-CATEGORIES+=	www devel
+CATEGORIES=	www devel
 MASTER_SITES=   ftp://ftp.javasoft.com/pub/ \
 		ftp://www.blackdown.org/pub/Java/pub/
 DISTFILES=      JDK-1_0_2-solaris2-sparc.tar.Z
diff --git a/java/jdk11/Makefile b/java/jdk11/Makefile
index c12c2d78890c..dcc46949b708 100644
--- a/java/jdk11/Makefile
+++ b/java/jdk11/Makefile
@@ -3,12 +3,12 @@
 # Date created:		8 April 1996
 # Whom:			Sujal Patel <smpatel@freebsd.org>
 #
-# $Id: Makefile,v 1.2 1996/06/16 04:34:18 smpatel Exp $
+# $Id: Makefile,v 1.3 1996/07/10 03:13:10 asami Exp $
 #
 
 DISTNAME=       jdk
 PKGNAME=	jdk-1.0.2
-CATEGORIES+=	www devel
+CATEGORIES=	www devel
 MASTER_SITES=   ftp://ftp.javasoft.com/pub/ \
 		ftp://www.blackdown.org/pub/Java/pub/
 DISTFILES=      JDK-1_0_2-solaris2-sparc.tar.Z
diff --git a/java/kaffe/Makefile b/java/kaffe/Makefile
index ae8bd9ff947e..9bf479d2fadf 100644
--- a/java/kaffe/Makefile
+++ b/java/kaffe/Makefile
@@ -3,14 +3,14 @@
 # Date created:         18 September 1996
 # Whom:                 Mark Huizer <xaa@stack.urc.tue.nl>
 #
-# $Id: Makefile,v 1.9 1996/09/23 23:44:25 chuckr Exp $
+# $Id: Makefile,v 1.10 1996/10/11 21:56:09 chuckr Exp $
 #
 
 DISTNAME=	kaffe-0.5.5
 PKGNAME=	kaffe-0.5.5
-CATEGORIES+=	www
-MASTER_SITES=	ftp://ftp.sarc.city.ac.uk/pub/kaffe/
-MASTER_SITES+=	ftp://alterego.stack.urc.tue.nl/pub/kaffe/
+CATEGORIES=	www
+MASTER_SITES=	ftp://ftp.sarc.city.ac.uk/pub/kaffe/ \
+		ftp://alterego.stack.urc.tue.nl/pub/kaffe/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	xaa@stack.urc.tue.nl
@@ -18,6 +18,7 @@ MAINTAINER=	xaa@stack.urc.tue.nl
 RUN_DEPENDS=	${PREFIX}/share/java/classes.zip:${PORTSDIR}/www/jdk
 
 GNU_CONFIGURE=	yes
+MAN1=		kaffe.1
 
 do-configure:
 		@(cd ${WRKSRC}; ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS})
@@ -29,11 +30,8 @@ pre-install:
 	fi)
 
 post-install:
-.if !defined(NOMANCOMPRESS)
-	gzip -9nf ${PREFIX}/man/man1/kaffe.1
-.endif
-	test -d ${PREFIX}/share/kaffe || mkdir -p ${PREFIX}/share/kaffe
-	install -c -m 644  ${WRKSRC}/license.terms ${PREFIX}/share/kaffe
+	${MKDIR} ${PREFIX}/share/kaffe
+	${INSTALL_DATA} ${WRKSRC}/license.terms ${PREFIX}/share/kaffe
 	/sbin/ldconfig -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/math/blas/Makefile b/math/blas/Makefile
index 70f1218e7e9f..16d0a643480a 100644
--- a/math/blas/Makefile
+++ b/math/blas/Makefile
@@ -3,12 +3,12 @@
 # Date created:         27 October 1994
 # Whom:                 ljo
 #
-# $Id: Makefile,v 1.8 1995/06/24 11:40:16 asami Exp $
+# $Id: Makefile,v 1.9 1996/03/10 09:00:53 asami Exp $
 #
 
 DISTNAME=	blas
 PKGNAME=	blas-1.0
-CATEGORIES+=	math
+CATEGORIES=	math
 MASTER_SITES=	ftp://netlib.att.com/netlib/blas/
 
 DIST_SUBDIR=	${DISTNAME}
diff --git a/math/calc/Makefile b/math/calc/Makefile
index c57358b90f26..34e76e0566df 100644
--- a/math/calc/Makefile
+++ b/math/calc/Makefile
@@ -3,17 +3,16 @@
 # Date created:         3 October 1994
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.5 1995/04/16 23:19:07 asami Exp $
+# $Id: Makefile,v 1.6 1995/04/28 13:35:26 jkh Exp $
 #
 
 DISTNAME=	calc-2.9.3t6
 PKGNAME=	calc-2.9.3
+CATEGORIES=	math
 MASTER_SITES=	ftp://ftp.cs.uni-sb.de/pub/misc/4.4BSD-Lite/contrib/
 
 MAINTAINER=	jmz@FreeBSD.org
 
-CATEGORIES+=	math
-
 pre-install:
 	@mkdir -p ${PREFIX}/lib/calc/help
 	@mkdir -p ${PREFIX}/man/man1
diff --git a/math/eispack/Makefile b/math/eispack/Makefile
index 3d1316794103..39a1ea20f2e8 100644
--- a/math/eispack/Makefile
+++ b/math/eispack/Makefile
@@ -3,12 +3,12 @@
 # Date created:         31 October 1994
 # Whom:                 ljo
 #
-# $Id: Makefile,v 1.8 1995/06/24 11:40:23 asami Exp $
+# $Id: Makefile,v 1.9 1996/03/10 09:01:00 asami Exp $
 #
 
 DISTNAME=	eispack
 PKGNAME=	eispack-1.0
-CATEGORIES+=	math
+CATEGORIES=	math
 MASTER_SITES=	ftp://netlib.att.com/netlib/eispack/
 
 DIST_SUBDIR=	${DISTNAME}
diff --git a/math/hexcalc/Makefile b/math/hexcalc/Makefile
index d47261369027..fcc27bc87165 100644
--- a/math/hexcalc/Makefile
+++ b/math/hexcalc/Makefile
@@ -3,12 +3,12 @@
 # Date created:		5 December 1994
 # Whom:			asami
 #
-# $Id: Makefile,v 1.5 1995/04/28 13:35:37 jkh Exp $
+# $Id: Makefile,v 1.6 1996/10/09 03:14:34 asami Exp $
 #
 
 DISTNAME=	hexcalc
 PKGNAME=	hexcalc-1.11
-CATEGORIES+=	math
+CATEGORIES=	math
 MASTER_SITES=	ftp://aixpdslib.seas.ucla.edu/pub/hexcalc/RISC/3.2/src/
 EXTRACT_SUFX=	..tar.Z
 
diff --git a/math/lapack/Makefile b/math/lapack/Makefile
index 89be1300fe78..e7424521a648 100644
--- a/math/lapack/Makefile
+++ b/math/lapack/Makefile
@@ -3,12 +3,12 @@
 # Date created:         2 July 1994
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.1.1.1 1996/06/07 15:39:53 jmz Exp $
+# $Id: Makefile,v 1.2 1996/06/10 21:19:55 asami Exp $
 #
 
 DISTNAME=	LAPACK
 PKGNAME=	lapack-2.0
-CATEGORIES+=	math
+CATEGORIES=	math
 MASTER_SITES=	ftp://ftp.netlib.org/lapack/
 DISTFILES=	lapack.tar.gz manpages.tar.gz
 
diff --git a/math/linpack/Makefile b/math/linpack/Makefile
index 3b19cc65477e..e71b53b7d30b 100644
--- a/math/linpack/Makefile
+++ b/math/linpack/Makefile
@@ -3,12 +3,12 @@
 # Date created:         31 October 1994
 # Whom:                 ljo
 #
-# $Id: Makefile,v 1.8 1995/06/24 11:40:37 asami Exp $
+# $Id: Makefile,v 1.9 1996/03/10 09:01:03 asami Exp $
 #
 
 DISTNAME=	linpack
 PKGNAME=	linpack-1.0
-CATEGORIES+=	math
+CATEGORIES=	math
 MASTER_SITES=	ftp://netlib.att.com/netlib/linpack/
 
 DIST_SUBDIR=	${DISTNAME}
diff --git a/math/octave-devel/Makefile b/math/octave-devel/Makefile
index dab1b5ebedf9..a904f5e6a350 100644
--- a/math/octave-devel/Makefile
+++ b/math/octave-devel/Makefile
@@ -3,11 +3,11 @@
 # Date created:		26 Apr 1995
 # Whom:			thomas@ghpc8.ihf.rwth-aachen.de
 #
-# $Id: Makefile,v 1.2 1995/10/04 10:18:49 asami Exp $
+# $Id: Makefile,v 1.3 1996/03/06 08:20:13 asami Exp $
 #
 
 DISTNAME=	octave-1.1.1
-CATEGORIES+=	math 
+CATEGORIES=	math 
 MASTER_SITES=	ftp://ftp.che.utexas.edu/pub/octave/
 
 MAINTAINER=	ports@FreeBSD.ORG
diff --git a/math/octave/Makefile b/math/octave/Makefile
index dab1b5ebedf9..a904f5e6a350 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -3,11 +3,11 @@
 # Date created:		26 Apr 1995
 # Whom:			thomas@ghpc8.ihf.rwth-aachen.de
 #
-# $Id: Makefile,v 1.2 1995/10/04 10:18:49 asami Exp $
+# $Id: Makefile,v 1.3 1996/03/06 08:20:13 asami Exp $
 #
 
 DISTNAME=	octave-1.1.1
-CATEGORIES+=	math 
+CATEGORIES=	math 
 MASTER_SITES=	ftp://ftp.che.utexas.edu/pub/octave/
 
 MAINTAINER=	ports@FreeBSD.ORG
diff --git a/math/xlispstat/Makefile b/math/xlispstat/Makefile
index 68ee36d90e47..a85a8ba75923 100644
--- a/math/xlispstat/Makefile
+++ b/math/xlispstat/Makefile
@@ -3,12 +3,12 @@
 # Date created:         Tue Aug 15 17:57:48 CDT 1995
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.2 1995/10/28 20:42:42 erich Exp $
+# $Id: Makefile,v 1.3 1995/11/22 13:14:04 asami Exp $
 #
 
 DISTNAME=	xlispstat-3-44
 PKGNAME=	xlispstat-3.44
-CATEGORIES+=	math lang
+CATEGORIES=	math lang
 MASTER_SITES=	ftp://ftp.stat.umn.edu/pub/xlispstat/
 
 MAINTAINER=	erich@FreeBSD.org
diff --git a/mbone/imm/Makefile b/mbone/imm/Makefile
index b2aaa4110b58..88488dc14876 100644
--- a/mbone/imm/Makefile
+++ b/mbone/imm/Makefile
@@ -3,11 +3,11 @@
 # Date created:		13 October 1994
 # Whom:			wollman
 #
-# $Id: Makefile,v 1.7 1996/11/07 12:25:45 asami Exp $
+# $Id: Makefile,v 1.8 1996/11/11 07:05:28 asami Exp $
 #
 
 DISTNAME=	imm-3.3
-CATEGORIES+=	mbone
+CATEGORIES=	mbone
 MASTER_SITES=	ftp://ftp.ucs.ed.ac.uk/pub/videoconference/imm/
 DISTFILES=	imm.src.tar.Z
 
diff --git a/mbone/nte/Makefile b/mbone/nte/Makefile
index b9ace9939754..6e7b7ae2407b 100644
--- a/mbone/nte/Makefile
+++ b/mbone/nte/Makefile
@@ -3,12 +3,12 @@
 # Date created:				5 September 1996
 # Whom:	      Bill Fenner <fenner@FreeBSD.ORG>
 #
-#   $Id$
+#   $Id: Makefile,v 1.1.1.1 1996/11/10 21:14:51 fenner Exp $
 #
 
 DISTNAME=	nt.1.5a23
 PKGNAME=	nte-1.5a23
-CATEGORIES+=	mbone
+CATEGORIES=	mbone
 MASTER_SITES=	ftp://cs.ucl.ac.uk/mice/nte/
 RESTRICTED=	"Contains DES encryption"
 
diff --git a/mbone/sdr/Makefile b/mbone/sdr/Makefile
index d24bad61947e..a0141ce495e3 100644
--- a/mbone/sdr/Makefile
+++ b/mbone/sdr/Makefile
@@ -3,12 +3,12 @@
 # Date created:				5 September 1996
 # Whom:	      Bill Fenner <fenner@FreeBSD.ORG>
 #
-#   $Id$
+#   $Id: Makefile,v 1.1.1.1 1996/11/10 21:16:46 fenner Exp $
 #
 
 DISTNAME=	sdr.V2.3a1
 PKGNAME=	sdr-2.3a1
-CATEGORIES+=	mbone
+CATEGORIES=	mbone
 MASTER_SITES=	ftp://cs.ucl.ac.uk/mice/sdr/
 RESTRICTED=	"Contains DES encryption"
 
diff --git a/mbone/speak_freely/Makefile b/mbone/speak_freely/Makefile
index f46be7b0f3b5..5e968297b445 100644
--- a/mbone/speak_freely/Makefile
+++ b/mbone/speak_freely/Makefile
@@ -4,7 +4,7 @@
 # Date created:         18 Apr 1996
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.1.1.1 1996/11/11 23:17:38 ache Exp $
+# $Id: Makefile,v 1.2 1996/11/11 23:24:31 ache Exp $
 #
 
 DISTNAME=       speak_freely-6.1b
@@ -19,6 +19,7 @@ UTILS=   sfspeaker sfmike sflwl
 DEMNS=   sfecho sflwld
 DDEMNS=  sfvod
 SFLIB=   ${PREFIX}/lib/speak_freely
+MAN1=	 ${UTILS:S/$/.1/} ${DEMNS:S/$/.1/} ${DDEMNS:S/$/.1/}
 
 do-install:
 	if [ ! -d ${SFLIB} ]; then \
@@ -41,10 +42,5 @@ do-install:
 		$(INSTALL_SCRIPT) $$p ${PREFIX}/sbin; \
 		$(INSTALL_MAN) $$p.1 ${PREFIX}/man/man1; \
 	done;
-.if !defined(NOMANCOMPRESS)
-	for p in ${UTILS} ${DEMNS} ${DDEMNS}; do \
-		gzip -9nf ${PREFIX}/man/man1/$$p.1; \
-	done
-.endif
 
 .include <bsd.port.mk>
diff --git a/mbone/vic/Makefile b/mbone/vic/Makefile
index a1892ebe338f..4dd2af16c988 100644
--- a/mbone/vic/Makefile
+++ b/mbone/vic/Makefile
@@ -3,11 +3,11 @@
 # Date created:		14 December 1994
 # Whom:			wollman
 #
-# $Id: Makefile,v 1.8 1996/11/07 12:27:06 asami Exp $
+# $Id: Makefile,v 1.9 1996/11/13 12:41:20 asami Exp $
 #
 
 DISTNAME=	vic-2.8
-CATEGORIES+=	mbone
+CATEGORIES=	mbone
 MASTER_SITES=	ftp://ftp.ee.lbl.gov/conferencing/vic/
 DISTFILES=	vicsrc-2.8.tar.gz
 
diff --git a/mbone/wb/Makefile b/mbone/wb/Makefile
index c4d92ce6c6e2..181bba230e0d 100644
--- a/mbone/wb/Makefile
+++ b/mbone/wb/Makefile
@@ -3,11 +3,11 @@
 # Date created:		2 Novermber 1996
 # Whom:			fenner
 #
-# $Id: $
+# $Id: Makefile,v 1.1.1.1 1996/11/10 21:13:06 fenner Exp $
 #
 
 DISTNAME=       wb-1.59
-CATEGORIES+=	mbone
+CATEGORIES=	mbone
 MASTER_SITES=   ftp://ftp.ee.lbl.gov/conferencing/wb/
 DISTFILES=      i386-wb-1.59.tar.Z
 
diff --git a/multimedia/mpeg2codec/Makefile b/multimedia/mpeg2codec/Makefile
index 7fe575fb24d5..99c6415367c4 100644
--- a/multimedia/mpeg2codec/Makefile
+++ b/multimedia/mpeg2codec/Makefile
@@ -3,11 +3,11 @@
 # Date created:		June 21, 1996
 # Whom:			"Philippe Charnier" <charnier@lirmm.fr>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1996/07/10 05:32:53 asami Exp $
 #
 
 DISTNAME=	mpeg2codec-1.1a
-CATEGORIES+=	graphics
+CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.netcom.com/pub/cf/cfogg/mpeg2/
 DISTFILES=	mpeg2codec_v1.1a.tar.gz
 
diff --git a/multimedia/mpeg2play/Makefile b/multimedia/mpeg2play/Makefile
index 55504a2be18d..a402195e4e56 100644
--- a/multimedia/mpeg2play/Makefile
+++ b/multimedia/mpeg2play/Makefile
@@ -3,11 +3,11 @@
 # Date created:		June 21, 1996
 # Whom:			"Philippe Charnier" <charnier@lirmm.fr>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1996/07/10 05:38:41 asami Exp $
 #
 
 DISTNAME=	mpeg2play-1.1b
-CATEGORIES+=	graphics
+CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.netcom.com/pub/cf/cfogg/mpeg2/
 DISTFILES=	mpeg2play_v1.1b.tar.gz
 
diff --git a/multimedia/mpeg_encode/Makefile b/multimedia/mpeg_encode/Makefile
index f962097b1185..56c51150c5d6 100644
--- a/multimedia/mpeg_encode/Makefile
+++ b/multimedia/mpeg_encode/Makefile
@@ -3,12 +3,12 @@
 # Date created:         
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.1.1.1 1996/08/01 20:04:36 erich Exp $
+# $Id: Makefile,v 1.2 1996/08/02 07:32:41 asami Exp $
 #
 
 DISTNAME=	mpeg_encode-1.5b-src
 PKGNAME=	mpeg_encode-1.5b
-CATEGORIES+=	graphics
+CATEGORIES=	graphics
 MASTER_SITES=	ftp://s2k-ftp.CS.Berkeley.EDU/pub/multimedia/mpeg/encode/
 
 MAINTAINER=	erich@FreeBSD.org
diff --git a/multimedia/mpeg_play/Makefile b/multimedia/mpeg_play/Makefile
index 6673592b671d..14c83dd0f180 100644
--- a/multimedia/mpeg_play/Makefile
+++ b/multimedia/mpeg_play/Makefile
@@ -3,11 +3,11 @@
 # Date created:		17 December 1994
 # Whom:			asami
 #
-# $Id: Makefile,v 1.6 1996/02/07 09:28:22 asami Exp $
+# $Id: Makefile,v 1.7 1996/06/12 03:09:02 asami Exp $
 #
 
 DISTNAME=	mpeg_play-2.3
-CATEGORIES+=	graphics
+CATEGORIES=	graphics
 MASTER_SITES=	ftp://mm-ftp.cs.berkeley.edu/pub/multimedia/mpeg/play/
 EXTRACT_SUFX=	-src.tar.gz
 
diff --git a/multimedia/mpeg_stat/Makefile b/multimedia/mpeg_stat/Makefile
index c4998334cfe6..14cc5839e88e 100644
--- a/multimedia/mpeg_stat/Makefile
+++ b/multimedia/mpeg_stat/Makefile
@@ -3,12 +3,12 @@
 # Date created:         Thu Aug  1 21:52:06 CDT 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.1.1.1 1996/08/16 13:40:48 erich Exp $
+# $Id: Makefile,v 1.2 1996/08/17 10:31:50 asami Exp $
 #
 
 DISTNAME=	mpeg_stat-2.2b-src
 PKGNAME=	mpeg_stat-2.2b
-CATEGORIES+=	graphics
+CATEGORIES=	graphics
 MASTER_SITES=	ftp://s2k-ftp.CS.Berkeley.EDU/pub/multimedia/mpeg/stat/
 
 MAINTAINER=	erich@FreeBSD.org
diff --git a/multimedia/mpegedit/Makefile b/multimedia/mpegedit/Makefile
index e2db7ffbd328..f403d725a140 100644
--- a/multimedia/mpegedit/Makefile
+++ b/multimedia/mpegedit/Makefile
@@ -3,12 +3,12 @@
 # Date created:         Thu Aug  1 10:50:57 CDT 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.1.1.1 1996/08/01 20:11:56 erich Exp $
+# $Id: Makefile,v 1.2 1996/08/02 07:43:06 asami Exp $
 #
 
 DISTNAME=	mpegedit_v2.2
 PKGNAME=	mpegedit-2.2
-CATEGORIES+=	graphics
+CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.demon.co.uk/.d2/unix/unix/tools/
 
 MAINTAINER=	erich@FreeBSD.org
diff --git a/multimedia/mplex/Makefile b/multimedia/mplex/Makefile
index 2fea73450e95..48e2eae48e55 100644
--- a/multimedia/mplex/Makefile
+++ b/multimedia/mplex/Makefile
@@ -3,12 +3,12 @@
 # Date created:         Wed Jul 31 20:54:54 CDT 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1996/08/01 20:18:17 erich Exp $
 #
 
 DISTNAME=	mplex-1.1
 
-CATEGORIES+=	graphics
+CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.informatik.tu-muenchen.de/pub/comp/graphics/mpeg/mplex/
 
 MAINTAINER=	erich@FreeBSD.org
diff --git a/multimedia/spigot/Makefile b/multimedia/spigot/Makefile
index 1a0d0cdef8ca..2096af50e722 100644
--- a/multimedia/spigot/Makefile
+++ b/multimedia/spigot/Makefile
@@ -3,11 +3,11 @@
 # Date Created:		Fri Sep 15 10:04:46 CDT 1995
 # Whom:			james@cs.uwm.edu
 #
-# $Id$
+# $Id: Makefile,v 1.2 1995/10/12 09:19:57 asami Exp $
 #
 
 DISTNAME= 	spigot-1.6
-CATEGORIES+=	graphics
+CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.cs.uwm.edu/pub/FreeBSD/spigot/
 DISTFILES=	spigot.tar.gz
 
diff --git a/multimedia/splitmpg/Makefile b/multimedia/splitmpg/Makefile
index 093cd0a7c4d3..9e6fb786b1f9 100644
--- a/multimedia/splitmpg/Makefile
+++ b/multimedia/splitmpg/Makefile
@@ -3,12 +3,12 @@
 # Date created:         Wed Jul 31 21:59:42 CDT 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.1.1.1 1996/08/01 20:22:28 erich Exp $
+# $Id: Makefile,v 1.2 1996/08/02 08:25:02 asami Exp $
 #
 
 DISTNAME=	splitmpg
 PKGNAME=	splitmpg-1.0
-CATEGORIES+=	graphics
+CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.ecel.uwa.edu.au/users/michael/
 EXTRACT_SUFX=	.tgz
 
diff --git a/multimedia/vic/Makefile b/multimedia/vic/Makefile
index a1892ebe338f..4dd2af16c988 100644
--- a/multimedia/vic/Makefile
+++ b/multimedia/vic/Makefile
@@ -3,11 +3,11 @@
 # Date created:		14 December 1994
 # Whom:			wollman
 #
-# $Id: Makefile,v 1.8 1996/11/07 12:27:06 asami Exp $
+# $Id: Makefile,v 1.9 1996/11/13 12:41:20 asami Exp $
 #
 
 DISTNAME=	vic-2.8
-CATEGORIES+=	mbone
+CATEGORIES=	mbone
 MASTER_SITES=	ftp://ftp.ee.lbl.gov/conferencing/vic/
 DISTFILES=	vicsrc-2.8.tar.gz
 
diff --git a/multimedia/xanim/Makefile b/multimedia/xanim/Makefile
index 3c6241bb3450..52074373ee1d 100644
--- a/multimedia/xanim/Makefile
+++ b/multimedia/xanim/Makefile
@@ -3,12 +3,12 @@
 # Date created:         Sat Nov 5 11:43:03 PST 1994
 # Whom:                 piero
 #
-# $Id: Makefile,v 1.8 1996/03/26 04:02:32 ache Exp $
+# $Id: Makefile,v 1.9 1996/09/26 21:27:12 ache Exp $
 #
 
 DISTNAME=       xanim27063
 PKGNAME=        xanim-2.70.6.3
-CATEGORIES+=	graphics x11
+CATEGORIES=	graphics x11
 MASTER_SITES=	ftp://ftp.portal.com/pub/podlipec/ \
 		ftp://ftp.portal.com/pub/podlipec/cinepak/ \
 		ftp://ftp.portal.com/pub/podlipec/indeo/ \
diff --git a/net-mgmt/net-snmp-devel/Makefile b/net-mgmt/net-snmp-devel/Makefile
index ae4e27a130b4..c0bad231b02c 100644
--- a/net-mgmt/net-snmp-devel/Makefile
+++ b/net-mgmt/net-snmp-devel/Makefile
@@ -3,11 +3,11 @@
 # Date created:				26 June 1996
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.1.1.1 1996/07/06 08:14:47 gpalmer Exp $
+# $Id: Makefile,v 1.2 1996/07/09 19:00:08 gpalmer Exp $
 #
 
 DISTNAME=	ucd-snmp-3.1
-CATEGORIES+=	net
+CATEGORIES=	net
 MASTER_SITES= 	ftp://ftp.ece.ucdavis.edu/pub/snmp/
 
 MAINTAINER=	gpalmer@FreeBSD.ORG
@@ -29,13 +29,7 @@ MAN8=		snmptrapd.8 snmpd.8
 post-install:
 	( cd ${PREFIX}/bin; strip ${BIN} )
 	( cd ${PREFIX}/sbin; strip ${SBIN} )
-.if !defined(NOMANCOMPRESS)
-	( cd ${PREFIX}/man/man1; gzip -9nf ${MAN1} )
-	( cd ${PREFIX}/man/man3; gzip -9nf ${MAN3} )
-	( cd ${PREFIX}/man/man5; gzip -9nf ${MAN5} )
-	( cd ${PREFIX}/man/man8; gzip -9nf ${MAN8} )
-.endif
-	mkdir -p ${PREFIX}/share/examples/ucd-snmp
+	${MKDIR} ${PREFIX}/share/examples/ucd-snmp
 	( cd ${WRKSRC}/etc; cp * ${PREFIX}/share/examples/ucd-snmp )
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile
index ae4e27a130b4..c0bad231b02c 100644
--- a/net-mgmt/net-snmp/Makefile
+++ b/net-mgmt/net-snmp/Makefile
@@ -3,11 +3,11 @@
 # Date created:				26 June 1996
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.1.1.1 1996/07/06 08:14:47 gpalmer Exp $
+# $Id: Makefile,v 1.2 1996/07/09 19:00:08 gpalmer Exp $
 #
 
 DISTNAME=	ucd-snmp-3.1
-CATEGORIES+=	net
+CATEGORIES=	net
 MASTER_SITES= 	ftp://ftp.ece.ucdavis.edu/pub/snmp/
 
 MAINTAINER=	gpalmer@FreeBSD.ORG
@@ -29,13 +29,7 @@ MAN8=		snmptrapd.8 snmpd.8
 post-install:
 	( cd ${PREFIX}/bin; strip ${BIN} )
 	( cd ${PREFIX}/sbin; strip ${SBIN} )
-.if !defined(NOMANCOMPRESS)
-	( cd ${PREFIX}/man/man1; gzip -9nf ${MAN1} )
-	( cd ${PREFIX}/man/man3; gzip -9nf ${MAN3} )
-	( cd ${PREFIX}/man/man5; gzip -9nf ${MAN5} )
-	( cd ${PREFIX}/man/man8; gzip -9nf ${MAN8} )
-.endif
-	mkdir -p ${PREFIX}/share/examples/ucd-snmp
+	${MKDIR} ${PREFIX}/share/examples/ucd-snmp
 	( cd ${WRKSRC}/etc; cp * ${PREFIX}/share/examples/ucd-snmp )
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/net-snmp4/Makefile b/net-mgmt/net-snmp4/Makefile
index ae4e27a130b4..c0bad231b02c 100644
--- a/net-mgmt/net-snmp4/Makefile
+++ b/net-mgmt/net-snmp4/Makefile
@@ -3,11 +3,11 @@
 # Date created:				26 June 1996
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.1.1.1 1996/07/06 08:14:47 gpalmer Exp $
+# $Id: Makefile,v 1.2 1996/07/09 19:00:08 gpalmer Exp $
 #
 
 DISTNAME=	ucd-snmp-3.1
-CATEGORIES+=	net
+CATEGORIES=	net
 MASTER_SITES= 	ftp://ftp.ece.ucdavis.edu/pub/snmp/
 
 MAINTAINER=	gpalmer@FreeBSD.ORG
@@ -29,13 +29,7 @@ MAN8=		snmptrapd.8 snmpd.8
 post-install:
 	( cd ${PREFIX}/bin; strip ${BIN} )
 	( cd ${PREFIX}/sbin; strip ${SBIN} )
-.if !defined(NOMANCOMPRESS)
-	( cd ${PREFIX}/man/man1; gzip -9nf ${MAN1} )
-	( cd ${PREFIX}/man/man3; gzip -9nf ${MAN3} )
-	( cd ${PREFIX}/man/man5; gzip -9nf ${MAN5} )
-	( cd ${PREFIX}/man/man8; gzip -9nf ${MAN8} )
-.endif
-	mkdir -p ${PREFIX}/share/examples/ucd-snmp
+	${MKDIR} ${PREFIX}/share/examples/ucd-snmp
 	( cd ${WRKSRC}/etc; cp * ${PREFIX}/share/examples/ucd-snmp )
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/net-snmp53/Makefile b/net-mgmt/net-snmp53/Makefile
index ae4e27a130b4..c0bad231b02c 100644
--- a/net-mgmt/net-snmp53/Makefile
+++ b/net-mgmt/net-snmp53/Makefile
@@ -3,11 +3,11 @@
 # Date created:				26 June 1996
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.1.1.1 1996/07/06 08:14:47 gpalmer Exp $
+# $Id: Makefile,v 1.2 1996/07/09 19:00:08 gpalmer Exp $
 #
 
 DISTNAME=	ucd-snmp-3.1
-CATEGORIES+=	net
+CATEGORIES=	net
 MASTER_SITES= 	ftp://ftp.ece.ucdavis.edu/pub/snmp/
 
 MAINTAINER=	gpalmer@FreeBSD.ORG
@@ -29,13 +29,7 @@ MAN8=		snmptrapd.8 snmpd.8
 post-install:
 	( cd ${PREFIX}/bin; strip ${BIN} )
 	( cd ${PREFIX}/sbin; strip ${SBIN} )
-.if !defined(NOMANCOMPRESS)
-	( cd ${PREFIX}/man/man1; gzip -9nf ${MAN1} )
-	( cd ${PREFIX}/man/man3; gzip -9nf ${MAN3} )
-	( cd ${PREFIX}/man/man5; gzip -9nf ${MAN5} )
-	( cd ${PREFIX}/man/man8; gzip -9nf ${MAN8} )
-.endif
-	mkdir -p ${PREFIX}/share/examples/ucd-snmp
+	${MKDIR} ${PREFIX}/share/examples/ucd-snmp
 	( cd ${WRKSRC}/etc; cp * ${PREFIX}/share/examples/ucd-snmp )
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/scotty3/Makefile b/net-mgmt/scotty3/Makefile
index e0d41e1575e0..3496328fd9d0 100644
--- a/net-mgmt/scotty3/Makefile
+++ b/net-mgmt/scotty3/Makefile
@@ -3,11 +3,11 @@
 # Date created:		18 Februar 1995
 # Whom:			Gennady Sorokopud <gena@netvision.net.il>
 #
-# $Id: Makefile,v 1.11 1996/09/17 12:50:34 erich Exp $
+# $Id: Makefile,v 1.12 1996/10/10 14:54:36 erich Exp $
 #
 
 DISTNAME=	scotty-2.1.3
-CATEGORIES+=	net
+CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.ibr.cs.tu-bs.de/pub/local/tkined/
 
 LIB_DEPENDS=	tk41\\.1\\.:${PORTSDIR}/x11/tk41
@@ -17,6 +17,11 @@ CONFIGURE_ARGS= --with-tcl-config=/usr/libdata/tcl \
 		--with-tk-config=/usr/local/lib
 
 WRKSRC=${WRKDIR}/${DISTNAME}/unix
+MAN1=		tkined.1 scotty.1
+MAN8=		ntping.8 straps.8
+MANN=		Tnm.n cmip.n dns.n gdmo.n http.n icmp.n ined.n job.n \
+		mib.n msqltcl.n netdb.n ntp.n rpc.n snmp.n sunrpc.n \
+		syslog.n udp.n
 
 pre-install:
 	@cd ${WRKSRC};make sinstall
@@ -29,31 +34,6 @@ pre-install:
 .endif
 	@rm /tmp/PLIST
 
-post-install:
-.if !defined(NOMANCOMPRESS)
-	gzip -9nf ${PREFIX}/man/man1/tkined.1
-	gzip -9nf ${PREFIX}/man/man1/scotty.1
-	gzip -9nf ${PREFIX}/man/man8/ntping.8
-	gzip -9nf ${PREFIX}/man/man8/straps.8
-	gzip -9nf ${PREFIX}/man/mann/Tnm.n
-	gzip -9nf ${PREFIX}/man/mann/cmip.n
-	gzip -9nf ${PREFIX}/man/mann/dns.n
-	gzip -9nf ${PREFIX}/man/mann/gdmo.n
-	gzip -9nf ${PREFIX}/man/mann/http.n
-	gzip -9nf ${PREFIX}/man/mann/icmp.n
-	gzip -9nf ${PREFIX}/man/mann/ined.n
-	gzip -9nf ${PREFIX}/man/mann/job.n
-	gzip -9nf ${PREFIX}/man/mann/mib.n
-	gzip -9nf ${PREFIX}/man/mann/msqltcl.n
-	gzip -9nf ${PREFIX}/man/mann/netdb.n
-	gzip -9nf ${PREFIX}/man/mann/ntp.n
-	gzip -9nf ${PREFIX}/man/mann/rpc.n
-	gzip -9nf ${PREFIX}/man/mann/snmp.n
-	gzip -9nf ${PREFIX}/man/mann/sunrpc.n
-	gzip -9nf ${PREFIX}/man/mann/syslog.n
-	gzip -9nf ${PREFIX}/man/mann/udp.n
-.endif
-
 pre-clean:
 	@rm -f pkg/PLIST
 
diff --git a/net-mgmt/wide-dhcp/Makefile b/net-mgmt/wide-dhcp/Makefile
index 0a08daf896f7..88225bbdfdca 100644
--- a/net-mgmt/wide-dhcp/Makefile
+++ b/net-mgmt/wide-dhcp/Makefile
@@ -3,12 +3,12 @@
 # Date created:         21 November 1995
 # Whom:                 Yoshiro MIHIRA <sanpei@yy.cs.keio.ac.jp>
 #
-# $Id: Makefile,v 1.2 1996/05/20 08:06:55 asami Exp $
+# $Id: Makefile,v 1.3 1996/05/30 08:54:17 asami Exp $
 #
 
 DISTNAME=       dhcp-1.3beta
 PKGNAME=        wide-dhcp-1.3b
-CATEGORIES+=    net
+CATEGORIES=     net
 MASTER_SITES=   ftp://sh.wide.ad.jp/WIDE/free-ware/dhcp/ \
 		ftp://ftp.freebsd.org/pub/FreeBSD/FreeBSD-current/src/lib/libc/stdtime/
 DISTFILES=	dhcp-1.3beta.tar.gz tzfile.h
diff --git a/net/archie/Makefile b/net/archie/Makefile
index 55f7e721abe6..5b0a6c991d96 100644
--- a/net/archie/Makefile
+++ b/net/archie/Makefile
@@ -3,20 +3,18 @@
 # Date created:		20 Oct 1994
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.4 1995/05/06 00:27:35 torstenb Exp $
+# $Id: Makefile,v 1.5 1995/11/27 04:04:36 asami Exp $
 #
 
 DISTNAME=	c-archie-1.4.1-FIXED
 PKGNAME=	archie-1.4.1
-CATEGORIES+=	net
+CATEGORIES=	net
 MASTER_SITES=	ftp://nic.sura.net/pub/archie/clients/
 EXTRACT_SUFX=	.tar.Z
 
-WRKSRC=		${WRKDIR}/archie-1.4.1-FIX
-
 MAINTAINER=	torstenb@FreeBSD.ORG
 
-post-install:
-	gzip -9nf ${PREFIX}/man/man1/archie.1
+WRKSRC=		${WRKDIR}/archie-1.4.1-FIX
+MAN1=		archie.1
 
 .include <bsd.port.mk>
diff --git a/net/ascend-radius/Makefile b/net/ascend-radius/Makefile
index 41d5aa8411cd..def133ccb756 100644
--- a/net/ascend-radius/Makefile
+++ b/net/ascend-radius/Makefile
@@ -3,12 +3,12 @@
 # Date created:				August 28th 96
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.3 1996/10/18 11:44:20 jfitz Exp $
+#   $Id: Makefile,v 1.4 1996/10/18 11:50:13 jfitz Exp $
 #
 
 DISTNAME=	radius-961015
 PKGNAME=	ascend-radius-961015
-CATEGORIES+=	net
+CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.ascend.com/pub/Software-Releases/Radius/Current/ \
 		ftp://ftp.ascend.com/pub/Software-Releases/Radius/Archive/
 
diff --git a/net/cvsup/Makefile b/net/cvsup/Makefile
index 07fe5d8c81ed..ffab43b7774d 100644
--- a/net/cvsup/Makefile
+++ b/net/cvsup/Makefile
@@ -3,13 +3,12 @@
 # Date created:		7 August 1996
 # Whom:			asami
 #
-# $Id: Makefile,v 1.12 1996/11/01 17:02:06 jdp Exp $
+# $Id: Makefile,v 1.13 1996/11/01 20:30:46 jdp Exp $
 #
 
 DISTNAME=	cvsup-13.5
-CATEGORIES+=	devel
-CATEGORIES+=	net
-MASTER_SITES=	ftp://freefall.freebsd.org/pub/CVSup/
+CATEGORIES=	devel net
+MASTERSITES=	ftp://freefall.freebsd.org/pub/CVSup/
 
 MAINTAINER=	jdp@FreeBSD.org
 
diff --git a/net/dgd-lpmud/Makefile b/net/dgd-lpmud/Makefile
index 300f0feca0b9..23d64476b5b3 100644
--- a/net/dgd-lpmud/Makefile
+++ b/net/dgd-lpmud/Makefile
@@ -3,15 +3,14 @@
 # Date created:		10 November 1994
 # Whom:			adam
 #
-# $Id: Makefile,v 1.14 1996/10/31 19:33:20 adam Exp $
+# $Id: Makefile,v 1.15 1996/11/06 22:52:03 adam Exp $
 #
 
 DISTNAME=	dgd-lpmud
 PKGNAME=	dgd-lpmud-2.4.5
-CATEGORIES+=	net devel games
+CATEGORIES=	net devel games
 MASTER_SITES=	ftp://ftp.lysator.liu.se/pub/lpmud/drivers/dgd/
 DISTFILES=	2.4.5-for-1.1.tgz
-DIST_SUBDIR=	dgd
 
 MAINTAINER=	adam@veda.is
 
@@ -20,6 +19,7 @@ RESTRICTED=	no monetary gain, tarball OK for CDROM
 
 RUN_DEPENDS=	${PREFIX}/dgd/bin/driver:${PORTSDIR}/net/dgd
 
+DIST_SUBDIR=	dgd
 WRKSRC=		${WRKDIR}/mud
 PKG_ARGS=	-v -c ${PKGDIR}/COMMENT -d ${PKGDIR}/DESCR -f ${PKGDIR}/PLIST \
 		-p ${PREFIX}/dgd
diff --git a/net/fspclient/Makefile b/net/fspclient/Makefile
index d74f25cf54f7..1b01c3f94080 100644
--- a/net/fspclient/Makefile
+++ b/net/fspclient/Makefile
@@ -3,12 +3,12 @@
 # Date created:         7 Nov 1994
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.5 1995/04/18 20:13:11 ache Exp $
+# $Id: Makefile,v 1.6 1995/11/27 04:04:54 asami Exp $
 #
 
 DISTNAME=       fspclient.0.0-h+
 PKGNAME=        fspclient.0.0.h
-CATEGORIES+=	net
+CATEGORIES=	net
 MASTER_SITES=   ftp://ftp.germany.eu.net/pub/networking/tcpip/fsp/
 EXTRACT_SUFX=   .tar.z
 
diff --git a/net/gated/Makefile b/net/gated/Makefile
index 9a4e898d4b2f..5c58b906b44c 100644
--- a/net/gated/Makefile
+++ b/net/gated/Makefile
@@ -3,12 +3,12 @@
 # Date created:		29 October 1994
 # Whom:			pst
 #
-# $Id: Makefile,v 1.8 1995/11/27 04:04:56 asami Exp $
+# $Id: Makefile,v 1.9 1996/01/31 17:40:47 gpalmer Exp $
 #
 
 DISTNAME=       gated-R3_5Beta_3
 PKGNAME=        gated-3.5b3
-CATEGORIES+=	net
+CATEGORIES=	net
 MASTER_SITES=   ftp://ftp.gated.merit.edu/net-research/gated/
 
 ALL_TARGET=	gated
diff --git a/net/imm/Makefile b/net/imm/Makefile
index b2aaa4110b58..88488dc14876 100644
--- a/net/imm/Makefile
+++ b/net/imm/Makefile
@@ -3,11 +3,11 @@
 # Date created:		13 October 1994
 # Whom:			wollman
 #
-# $Id: Makefile,v 1.7 1996/11/07 12:25:45 asami Exp $
+# $Id: Makefile,v 1.8 1996/11/11 07:05:28 asami Exp $
 #
 
 DISTNAME=	imm-3.3
-CATEGORIES+=	mbone
+CATEGORIES=	mbone
 MASTER_SITES=	ftp://ftp.ucs.ed.ac.uk/pub/videoconference/imm/
 DISTFILES=	imm.src.tar.Z
 
diff --git a/net/isc-dhcp2/Makefile b/net/isc-dhcp2/Makefile
index 1f8498ac15c2..bf21c2495fde 100644
--- a/net/isc-dhcp2/Makefile
+++ b/net/isc-dhcp2/Makefile
@@ -3,23 +3,22 @@
 # Date created:         7 Mar 1996
 # Whom:                 se
 #
-# $Id: Makefile,v 1.2 1996/03/09 23:50:05 asami Exp $
+# $Id: Makefile,v 1.3 1996/08/27 10:23:06 torstenb Exp $
 #
 
 DISTNAME=       DHCPD-BETA-0
 PKGNAME=	isc-dhcp-b0
-CATEGORIES+=	net
+CATEGORIES=	net
 MASTER_SITES=   ftp://ftp.vix.com/pub/dhcp/
 
 MAINTAINER=	se@FreeBSD.ORG
 
+MAN5=		dhcpd.conf.5${ZEXTENSION}
+MAN8=		dhcpd.8${ZEXTENSION}
+
 do-install:
-	cd ${WRKSRC}; $(INSTALL) -c $(STRIP) -o $(BINOWN) -g $(BINGRP) -m $(BINMODE) dhcpd dhclient $(PREFIX)/sbin
-	cd ${WRKSRC}; $(INSTALL) -c -o $(MANOWN) -g $(MANGRP) -m $(MANMODE) dhcpd.conf.5${ZEXTENSION} $(PREFIX)/man/man5
-	cd ${WRKSRC}; $(INSTALL) -c -o $(MANOWN) -g $(MANGRP) -m $(MANMODE) dhcpd.8${ZEXTENSION} $(PREFIX)/man/man8
-.if !defined(NOMANCOMPRESS)
-	gzip -9nf $(PREFIX)/man/man5/dhcpd.conf.5${ZEXTENSION}
-	gzip -9nf $(PREFIX)/man/man8/dhcpd.8${ZEXTENSION}
-.endif
+	cd ${WRKSRC}; $(INSTALL_PROGRAM) dhcpd dhclient $(PREFIX)/sbin
+	cd ${WRKSRC}; $(INSTALL_MAN) dhcpd.conf.5${ZEXTENSION} $(PREFIX)/man/man5
+	cd ${WRKSRC}; $(INSTALL_MAN) dhcpd.8${ZEXTENSION} $(PREFIX)/man/man8
 
 .include <bsd.port.mk>
diff --git a/net/isc-dhcp3-server/Makefile b/net/isc-dhcp3-server/Makefile
index 1f8498ac15c2..bf21c2495fde 100644
--- a/net/isc-dhcp3-server/Makefile
+++ b/net/isc-dhcp3-server/Makefile
@@ -3,23 +3,22 @@
 # Date created:         7 Mar 1996
 # Whom:                 se
 #
-# $Id: Makefile,v 1.2 1996/03/09 23:50:05 asami Exp $
+# $Id: Makefile,v 1.3 1996/08/27 10:23:06 torstenb Exp $
 #
 
 DISTNAME=       DHCPD-BETA-0
 PKGNAME=	isc-dhcp-b0
-CATEGORIES+=	net
+CATEGORIES=	net
 MASTER_SITES=   ftp://ftp.vix.com/pub/dhcp/
 
 MAINTAINER=	se@FreeBSD.ORG
 
+MAN5=		dhcpd.conf.5${ZEXTENSION}
+MAN8=		dhcpd.8${ZEXTENSION}
+
 do-install:
-	cd ${WRKSRC}; $(INSTALL) -c $(STRIP) -o $(BINOWN) -g $(BINGRP) -m $(BINMODE) dhcpd dhclient $(PREFIX)/sbin
-	cd ${WRKSRC}; $(INSTALL) -c -o $(MANOWN) -g $(MANGRP) -m $(MANMODE) dhcpd.conf.5${ZEXTENSION} $(PREFIX)/man/man5
-	cd ${WRKSRC}; $(INSTALL) -c -o $(MANOWN) -g $(MANGRP) -m $(MANMODE) dhcpd.8${ZEXTENSION} $(PREFIX)/man/man8
-.if !defined(NOMANCOMPRESS)
-	gzip -9nf $(PREFIX)/man/man5/dhcpd.conf.5${ZEXTENSION}
-	gzip -9nf $(PREFIX)/man/man8/dhcpd.8${ZEXTENSION}
-.endif
+	cd ${WRKSRC}; $(INSTALL_PROGRAM) dhcpd dhclient $(PREFIX)/sbin
+	cd ${WRKSRC}; $(INSTALL_MAN) dhcpd.conf.5${ZEXTENSION} $(PREFIX)/man/man5
+	cd ${WRKSRC}; $(INSTALL_MAN) dhcpd.8${ZEXTENSION} $(PREFIX)/man/man8
 
 .include <bsd.port.mk>
diff --git a/net/isc-dhcp3/Makefile b/net/isc-dhcp3/Makefile
index 1f8498ac15c2..bf21c2495fde 100644
--- a/net/isc-dhcp3/Makefile
+++ b/net/isc-dhcp3/Makefile
@@ -3,23 +3,22 @@
 # Date created:         7 Mar 1996
 # Whom:                 se
 #
-# $Id: Makefile,v 1.2 1996/03/09 23:50:05 asami Exp $
+# $Id: Makefile,v 1.3 1996/08/27 10:23:06 torstenb Exp $
 #
 
 DISTNAME=       DHCPD-BETA-0
 PKGNAME=	isc-dhcp-b0
-CATEGORIES+=	net
+CATEGORIES=	net
 MASTER_SITES=   ftp://ftp.vix.com/pub/dhcp/
 
 MAINTAINER=	se@FreeBSD.ORG
 
+MAN5=		dhcpd.conf.5${ZEXTENSION}
+MAN8=		dhcpd.8${ZEXTENSION}
+
 do-install:
-	cd ${WRKSRC}; $(INSTALL) -c $(STRIP) -o $(BINOWN) -g $(BINGRP) -m $(BINMODE) dhcpd dhclient $(PREFIX)/sbin
-	cd ${WRKSRC}; $(INSTALL) -c -o $(MANOWN) -g $(MANGRP) -m $(MANMODE) dhcpd.conf.5${ZEXTENSION} $(PREFIX)/man/man5
-	cd ${WRKSRC}; $(INSTALL) -c -o $(MANOWN) -g $(MANGRP) -m $(MANMODE) dhcpd.8${ZEXTENSION} $(PREFIX)/man/man8
-.if !defined(NOMANCOMPRESS)
-	gzip -9nf $(PREFIX)/man/man5/dhcpd.conf.5${ZEXTENSION}
-	gzip -9nf $(PREFIX)/man/man8/dhcpd.8${ZEXTENSION}
-.endif
+	cd ${WRKSRC}; $(INSTALL_PROGRAM) dhcpd dhclient $(PREFIX)/sbin
+	cd ${WRKSRC}; $(INSTALL_MAN) dhcpd.conf.5${ZEXTENSION} $(PREFIX)/man/man5
+	cd ${WRKSRC}; $(INSTALL_MAN) dhcpd.8${ZEXTENSION} $(PREFIX)/man/man8
 
 .include <bsd.port.mk>
diff --git a/net/isc-dhcp30-server/Makefile b/net/isc-dhcp30-server/Makefile
index 1f8498ac15c2..bf21c2495fde 100644
--- a/net/isc-dhcp30-server/Makefile
+++ b/net/isc-dhcp30-server/Makefile
@@ -3,23 +3,22 @@
 # Date created:         7 Mar 1996
 # Whom:                 se
 #
-# $Id: Makefile,v 1.2 1996/03/09 23:50:05 asami Exp $
+# $Id: Makefile,v 1.3 1996/08/27 10:23:06 torstenb Exp $
 #
 
 DISTNAME=       DHCPD-BETA-0
 PKGNAME=	isc-dhcp-b0
-CATEGORIES+=	net
+CATEGORIES=	net
 MASTER_SITES=   ftp://ftp.vix.com/pub/dhcp/
 
 MAINTAINER=	se@FreeBSD.ORG
 
+MAN5=		dhcpd.conf.5${ZEXTENSION}
+MAN8=		dhcpd.8${ZEXTENSION}
+
 do-install:
-	cd ${WRKSRC}; $(INSTALL) -c $(STRIP) -o $(BINOWN) -g $(BINGRP) -m $(BINMODE) dhcpd dhclient $(PREFIX)/sbin
-	cd ${WRKSRC}; $(INSTALL) -c -o $(MANOWN) -g $(MANGRP) -m $(MANMODE) dhcpd.conf.5${ZEXTENSION} $(PREFIX)/man/man5
-	cd ${WRKSRC}; $(INSTALL) -c -o $(MANOWN) -g $(MANGRP) -m $(MANMODE) dhcpd.8${ZEXTENSION} $(PREFIX)/man/man8
-.if !defined(NOMANCOMPRESS)
-	gzip -9nf $(PREFIX)/man/man5/dhcpd.conf.5${ZEXTENSION}
-	gzip -9nf $(PREFIX)/man/man8/dhcpd.8${ZEXTENSION}
-.endif
+	cd ${WRKSRC}; $(INSTALL_PROGRAM) dhcpd dhclient $(PREFIX)/sbin
+	cd ${WRKSRC}; $(INSTALL_MAN) dhcpd.conf.5${ZEXTENSION} $(PREFIX)/man/man5
+	cd ${WRKSRC}; $(INSTALL_MAN) dhcpd.8${ZEXTENSION} $(PREFIX)/man/man8
 
 .include <bsd.port.mk>
diff --git a/net/isc-dhcp31-server/Makefile b/net/isc-dhcp31-server/Makefile
index 1f8498ac15c2..bf21c2495fde 100644
--- a/net/isc-dhcp31-server/Makefile
+++ b/net/isc-dhcp31-server/Makefile
@@ -3,23 +3,22 @@
 # Date created:         7 Mar 1996
 # Whom:                 se
 #
-# $Id: Makefile,v 1.2 1996/03/09 23:50:05 asami Exp $
+# $Id: Makefile,v 1.3 1996/08/27 10:23:06 torstenb Exp $
 #
 
 DISTNAME=       DHCPD-BETA-0
 PKGNAME=	isc-dhcp-b0
-CATEGORIES+=	net
+CATEGORIES=	net
 MASTER_SITES=   ftp://ftp.vix.com/pub/dhcp/
 
 MAINTAINER=	se@FreeBSD.ORG
 
+MAN5=		dhcpd.conf.5${ZEXTENSION}
+MAN8=		dhcpd.8${ZEXTENSION}
+
 do-install:
-	cd ${WRKSRC}; $(INSTALL) -c $(STRIP) -o $(BINOWN) -g $(BINGRP) -m $(BINMODE) dhcpd dhclient $(PREFIX)/sbin
-	cd ${WRKSRC}; $(INSTALL) -c -o $(MANOWN) -g $(MANGRP) -m $(MANMODE) dhcpd.conf.5${ZEXTENSION} $(PREFIX)/man/man5
-	cd ${WRKSRC}; $(INSTALL) -c -o $(MANOWN) -g $(MANGRP) -m $(MANMODE) dhcpd.8${ZEXTENSION} $(PREFIX)/man/man8
-.if !defined(NOMANCOMPRESS)
-	gzip -9nf $(PREFIX)/man/man5/dhcpd.conf.5${ZEXTENSION}
-	gzip -9nf $(PREFIX)/man/man8/dhcpd.8${ZEXTENSION}
-.endif
+	cd ${WRKSRC}; $(INSTALL_PROGRAM) dhcpd dhclient $(PREFIX)/sbin
+	cd ${WRKSRC}; $(INSTALL_MAN) dhcpd.conf.5${ZEXTENSION} $(PREFIX)/man/man5
+	cd ${WRKSRC}; $(INSTALL_MAN) dhcpd.8${ZEXTENSION} $(PREFIX)/man/man8
 
 .include <bsd.port.mk>
diff --git a/net/isc-dhcp40-server/Makefile b/net/isc-dhcp40-server/Makefile
index 1f8498ac15c2..bf21c2495fde 100644
--- a/net/isc-dhcp40-server/Makefile
+++ b/net/isc-dhcp40-server/Makefile
@@ -3,23 +3,22 @@
 # Date created:         7 Mar 1996
 # Whom:                 se
 #
-# $Id: Makefile,v 1.2 1996/03/09 23:50:05 asami Exp $
+# $Id: Makefile,v 1.3 1996/08/27 10:23:06 torstenb Exp $
 #
 
 DISTNAME=       DHCPD-BETA-0
 PKGNAME=	isc-dhcp-b0
-CATEGORIES+=	net
+CATEGORIES=	net
 MASTER_SITES=   ftp://ftp.vix.com/pub/dhcp/
 
 MAINTAINER=	se@FreeBSD.ORG
 
+MAN5=		dhcpd.conf.5${ZEXTENSION}
+MAN8=		dhcpd.8${ZEXTENSION}
+
 do-install:
-	cd ${WRKSRC}; $(INSTALL) -c $(STRIP) -o $(BINOWN) -g $(BINGRP) -m $(BINMODE) dhcpd dhclient $(PREFIX)/sbin
-	cd ${WRKSRC}; $(INSTALL) -c -o $(MANOWN) -g $(MANGRP) -m $(MANMODE) dhcpd.conf.5${ZEXTENSION} $(PREFIX)/man/man5
-	cd ${WRKSRC}; $(INSTALL) -c -o $(MANOWN) -g $(MANGRP) -m $(MANMODE) dhcpd.8${ZEXTENSION} $(PREFIX)/man/man8
-.if !defined(NOMANCOMPRESS)
-	gzip -9nf $(PREFIX)/man/man5/dhcpd.conf.5${ZEXTENSION}
-	gzip -9nf $(PREFIX)/man/man8/dhcpd.8${ZEXTENSION}
-.endif
+	cd ${WRKSRC}; $(INSTALL_PROGRAM) dhcpd dhclient $(PREFIX)/sbin
+	cd ${WRKSRC}; $(INSTALL_MAN) dhcpd.conf.5${ZEXTENSION} $(PREFIX)/man/man5
+	cd ${WRKSRC}; $(INSTALL_MAN) dhcpd.8${ZEXTENSION} $(PREFIX)/man/man8
 
 .include <bsd.port.mk>
diff --git a/net/net-snmp/Makefile b/net/net-snmp/Makefile
index ae4e27a130b4..c0bad231b02c 100644
--- a/net/net-snmp/Makefile
+++ b/net/net-snmp/Makefile
@@ -3,11 +3,11 @@
 # Date created:				26 June 1996
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.1.1.1 1996/07/06 08:14:47 gpalmer Exp $
+# $Id: Makefile,v 1.2 1996/07/09 19:00:08 gpalmer Exp $
 #
 
 DISTNAME=	ucd-snmp-3.1
-CATEGORIES+=	net
+CATEGORIES=	net
 MASTER_SITES= 	ftp://ftp.ece.ucdavis.edu/pub/snmp/
 
 MAINTAINER=	gpalmer@FreeBSD.ORG
@@ -29,13 +29,7 @@ MAN8=		snmptrapd.8 snmpd.8
 post-install:
 	( cd ${PREFIX}/bin; strip ${BIN} )
 	( cd ${PREFIX}/sbin; strip ${SBIN} )
-.if !defined(NOMANCOMPRESS)
-	( cd ${PREFIX}/man/man1; gzip -9nf ${MAN1} )
-	( cd ${PREFIX}/man/man3; gzip -9nf ${MAN3} )
-	( cd ${PREFIX}/man/man5; gzip -9nf ${MAN5} )
-	( cd ${PREFIX}/man/man8; gzip -9nf ${MAN8} )
-.endif
-	mkdir -p ${PREFIX}/share/examples/ucd-snmp
+	${MKDIR} ${PREFIX}/share/examples/ucd-snmp
 	( cd ${WRKSRC}/etc; cp * ${PREFIX}/share/examples/ucd-snmp )
 
 .include <bsd.port.mk>
diff --git a/net/net-snmp4/Makefile b/net/net-snmp4/Makefile
index ae4e27a130b4..c0bad231b02c 100644
--- a/net/net-snmp4/Makefile
+++ b/net/net-snmp4/Makefile
@@ -3,11 +3,11 @@
 # Date created:				26 June 1996
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.1.1.1 1996/07/06 08:14:47 gpalmer Exp $
+# $Id: Makefile,v 1.2 1996/07/09 19:00:08 gpalmer Exp $
 #
 
 DISTNAME=	ucd-snmp-3.1
-CATEGORIES+=	net
+CATEGORIES=	net
 MASTER_SITES= 	ftp://ftp.ece.ucdavis.edu/pub/snmp/
 
 MAINTAINER=	gpalmer@FreeBSD.ORG
@@ -29,13 +29,7 @@ MAN8=		snmptrapd.8 snmpd.8
 post-install:
 	( cd ${PREFIX}/bin; strip ${BIN} )
 	( cd ${PREFIX}/sbin; strip ${SBIN} )
-.if !defined(NOMANCOMPRESS)
-	( cd ${PREFIX}/man/man1; gzip -9nf ${MAN1} )
-	( cd ${PREFIX}/man/man3; gzip -9nf ${MAN3} )
-	( cd ${PREFIX}/man/man5; gzip -9nf ${MAN5} )
-	( cd ${PREFIX}/man/man8; gzip -9nf ${MAN8} )
-.endif
-	mkdir -p ${PREFIX}/share/examples/ucd-snmp
+	${MKDIR} ${PREFIX}/share/examples/ucd-snmp
 	( cd ${WRKSRC}/etc; cp * ${PREFIX}/share/examples/ucd-snmp )
 
 .include <bsd.port.mk>
diff --git a/net/pcnfsd/Makefile b/net/pcnfsd/Makefile
index fa2b31a86e65..d06117ca641c 100644
--- a/net/pcnfsd/Makefile
+++ b/net/pcnfsd/Makefile
@@ -3,12 +3,12 @@
 # Date created:		Oct 6, 1994
 # Whom:			pst
 #
-# $Id$
+# $Id: Makefile,v 1.5 1996/04/21 19:26:10 asami Exp $
 #
 
 DISTNAME=	pcnfsd.93.02.16
 PKGNAME=	pcnfsd-93.02.16
-CATEGORIES+=	net
+CATEGORIES=	net
 MASTER_SITES=	ftp://bcm.tmc.edu/pcnfs/
 EXTRACT_SUFX=	.tar.Z
 
diff --git a/net/pmf/Makefile b/net/pmf/Makefile
index 1ebb0cf0e41d..5040b6a18bdc 100644
--- a/net/pmf/Makefile
+++ b/net/pmf/Makefile
@@ -3,11 +3,11 @@
 # Date created:         24 Sep 1994
 # Whom:                 adam
 #
-# $Id: Makefile,v 1.5 1995/04/15 05:41:49 asami Exp $
+# $Id: Makefile,v 1.6 1995/11/27 04:05:24 asami Exp $
 #
 
 DISTNAME=       pmf-1.13.1
-CATEGORIES+=	net
+CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.lysator.liu.se/pub/lpmud/clients/
 
 WRKSRC=		${WRKDIR}/pmfdir/src
diff --git a/net/radius/Makefile b/net/radius/Makefile
index f454fd536a52..f61a2158cacd 100644
--- a/net/radius/Makefile
+++ b/net/radius/Makefile
@@ -3,7 +3,7 @@
 # Date created:		4. July 1996
 # Whom:			torstenb@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.2 1996/07/07 10:50:48 torstenb Exp $
+# $Id: Makefile,v 1.3 1996/07/12 10:53:34 asami Exp $
 #
 
 DISTNAME=	radius.2.4.21
@@ -16,17 +16,10 @@ RESTRICTED= "use for non-profit, non-commercial purposes on a shareware basis"
 
 NO_WRKSUBDIR=	yes
 INSTALL_TARGET=	install-all
+MAN5=		authfile.5 clients.5 dictionary.5 users.5
+MAN8=		builddbm.8 radcheck.8 radiusd.8 radpwtst.8 rlmadmin.8
 
 pre-install:
-	mkdir -p ${PREFIX}/lib/radius/db ${PREFIX}/lib/radius/acct
-
-.if !defined(NOMANCOMPRESS)
-post-install:
-	gzip -9nf ${PREFIX}/man/man5/authfile.5 ${PREFIX}/man/man5/clients.5 \
-		${PREFIX}/man/man5/dictionary.5 ${PREFIX}/man/man5/users.5 \
-		${PREFIX}/man/man8/builddbm.8 ${PREFIX}/man/man8/radcheck.8 \
-		${PREFIX}/man/man8/radiusd.8 ${PREFIX}/man/man8/radpwtst.8 \
-		${PREFIX}/man/man8/rlmadmin.8
-.endif
+	${MKDIR} ${PREFIX}/lib/radius/db ${PREFIX}/lib/radius/acct
 
 .include <bsd.port.mk>
diff --git a/net/rdist6/Makefile b/net/rdist6/Makefile
index f922d518dcca..69a974e43cde 100644
--- a/net/rdist6/Makefile
+++ b/net/rdist6/Makefile
@@ -3,11 +3,11 @@
 # Date created:		19 August 1995
 # Whom:			peter
 #
-# $Id: Makefile,v 1.8 1996/09/21 05:29:51 peter Exp $
+# $Id: Makefile,v 1.9 1996/11/13 12:41:24 asami Exp $
 #
 
 DISTNAME=	rdist-6.1.3
-CATEGORIES+=	net
+CATEGORIES=	net
 MASTER_SITES=	ftp://usc.edu/pub/rdist/
 
 MAINTAINER=	peter@FreeBSD.org
diff --git a/net/rmsg/Makefile b/net/rmsg/Makefile
index 9d2066fbea6e..2b63a5d205db 100644
--- a/net/rmsg/Makefile
+++ b/net/rmsg/Makefile
@@ -3,7 +3,7 @@
 # Date created:		9 October 1995
 # Whom:			torstenb@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.2 1995/11/27 04:05:29 asami Exp $
+# $Id: Makefile,v 1.3 1996/10/20 15:33:33 max Exp $
 #
 
 DISTNAME=	rmsg-1.64
@@ -12,10 +12,6 @@ MASTER_SITES=	ftp://ftp.funet.fi/pub/networking/tcpip/ \
 		ftp://proton.elka.pw.edu.pl/pub/unix/network/
 
 WRKSRC=		${WRKDIR}/rmsg
-
-post-install:
-.if !defined(NOMANCOMPRESS)
-	gzip -9nf ${PREFIX}/man/man1/rmsg.1 ${PREFIX}/man/man8/rmsgd.8
-.endif
+MAN1=		rmsg.1 rmsgd.8
 
 .include <bsd.port.mk>
diff --git a/net/rsync/Makefile b/net/rsync/Makefile
index 53106ac17bdf..b746203a9b34 100644
--- a/net/rsync/Makefile
+++ b/net/rsync/Makefile
@@ -3,23 +3,21 @@
 # Date created:         Sat Aug 3, 1996
 # Whom:                 David O'Brien (obrien@cs.ucdavis.edu)
 #
-# $Id: Makefile,v 1.1.1.1 1996/08/16 07:23:00 asami Exp $
+# $Id: Makefile,v 1.2 1996/10/22 17:06:47 max Exp $
 #
 
 DISTNAME=	rsync-1.6.2
-CATEGORIES+=	net
+CATEGORIES=	net
 MASTER_SITES=	ftp://samba.anu.edu.au/pub/rsync/  \
 		ftp://sunsite.auc.dk/pub/unix/rsync/
 
 MAINTAINER=     obrien@cs.ucdavis.edu
 
 GNU_CONFIGURE=	yes
+MAN1=		rsync.1
 
 post-install:
 	strip ${PREFIX}/bin/rsync
-.if !defined(NOMANCOMPRESS)
-	gzip -9nf ${PREFIX}/man/man1/rsync.1
-.endif
 .if !defined(NOPORTDOCS)
 	mkdir -p ${PREFIX}/share/doc/rsync
 	${INSTALL_DATA} ${WRKSRC}/tech_report.ps ${PREFIX}/share/doc/rsync
diff --git a/net/samba-devel/Makefile b/net/samba-devel/Makefile
index 1da70ed49956..a4ef5711b79d 100644
--- a/net/samba-devel/Makefile
+++ b/net/samba-devel/Makefile
@@ -3,31 +3,22 @@
 # Date created:				11th Feb 1995
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.9 1995/12/11 09:16:11 pst Exp $
+# $Id: Makefile,v 1.10 1996/03/01 00:37:45 gpalmer Exp $
 #
 
 DISTNAME=	samba-1.9.15p8
-CATEGORIES+=	net
+CATEGORIES=	net
 MASTER_SITES=	ftp://nimbus.anu.edu.au/pub/tridge/samba/
 WRKSRC=		${WRKDIR}/${DISTNAME}/source
 
 MAINTAINER=	gpalmer@FreeBSD.ORG
 
-pre-install:
-	@mkdir -p /usr/local/samba
+MAN1=		smbstatus.1 smbclient.1 smbrun.1 smbtar.1 testparm.1 testprns.1
+MAN5=		smb.conf.5
+MAN7=		samba.7
+MAN8=		smbd.8 nmbd.8
 
-post-install:
-.if !defined(NOMANCOMPRESS)
-	gzip -9nf ${PREFIX}/man/man1/smbstatus.1
-	gzip -9nf ${PREFIX}/man/man1/smbclient.1
-	gzip -9nf ${PREFIX}/man/man1/smbrun.1
-	gzip -9nf ${PREFIX}/man/man1/smbtar.1
-	gzip -9nf ${PREFIX}/man/man1/testparm.1
-	gzip -9nf ${PREFIX}/man/man1/testprns.1
-	gzip -9nf ${PREFIX}/man/man5/smb.conf.5
-	gzip -9nf ${PREFIX}/man/man7/samba.7
-	gzip -9nf ${PREFIX}/man/man8/smbd.8
-	gzip -9nf ${PREFIX}/man/man8/nmbd.8
-.endif
+pre-install:
+	@${MKDIR} /usr/local/samba
 
 .include <bsd.port.mk>
diff --git a/net/samba/Makefile b/net/samba/Makefile
index 1da70ed49956..a4ef5711b79d 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -3,31 +3,22 @@
 # Date created:				11th Feb 1995
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.9 1995/12/11 09:16:11 pst Exp $
+# $Id: Makefile,v 1.10 1996/03/01 00:37:45 gpalmer Exp $
 #
 
 DISTNAME=	samba-1.9.15p8
-CATEGORIES+=	net
+CATEGORIES=	net
 MASTER_SITES=	ftp://nimbus.anu.edu.au/pub/tridge/samba/
 WRKSRC=		${WRKDIR}/${DISTNAME}/source
 
 MAINTAINER=	gpalmer@FreeBSD.ORG
 
-pre-install:
-	@mkdir -p /usr/local/samba
+MAN1=		smbstatus.1 smbclient.1 smbrun.1 smbtar.1 testparm.1 testprns.1
+MAN5=		smb.conf.5
+MAN7=		samba.7
+MAN8=		smbd.8 nmbd.8
 
-post-install:
-.if !defined(NOMANCOMPRESS)
-	gzip -9nf ${PREFIX}/man/man1/smbstatus.1
-	gzip -9nf ${PREFIX}/man/man1/smbclient.1
-	gzip -9nf ${PREFIX}/man/man1/smbrun.1
-	gzip -9nf ${PREFIX}/man/man1/smbtar.1
-	gzip -9nf ${PREFIX}/man/man1/testparm.1
-	gzip -9nf ${PREFIX}/man/man1/testprns.1
-	gzip -9nf ${PREFIX}/man/man5/smb.conf.5
-	gzip -9nf ${PREFIX}/man/man7/samba.7
-	gzip -9nf ${PREFIX}/man/man8/smbd.8
-	gzip -9nf ${PREFIX}/man/man8/nmbd.8
-.endif
+pre-install:
+	@${MKDIR} /usr/local/samba
 
 .include <bsd.port.mk>
diff --git a/net/samba3/Makefile b/net/samba3/Makefile
index 1da70ed49956..a4ef5711b79d 100644
--- a/net/samba3/Makefile
+++ b/net/samba3/Makefile
@@ -3,31 +3,22 @@
 # Date created:				11th Feb 1995
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.9 1995/12/11 09:16:11 pst Exp $
+# $Id: Makefile,v 1.10 1996/03/01 00:37:45 gpalmer Exp $
 #
 
 DISTNAME=	samba-1.9.15p8
-CATEGORIES+=	net
+CATEGORIES=	net
 MASTER_SITES=	ftp://nimbus.anu.edu.au/pub/tridge/samba/
 WRKSRC=		${WRKDIR}/${DISTNAME}/source
 
 MAINTAINER=	gpalmer@FreeBSD.ORG
 
-pre-install:
-	@mkdir -p /usr/local/samba
+MAN1=		smbstatus.1 smbclient.1 smbrun.1 smbtar.1 testparm.1 testprns.1
+MAN5=		smb.conf.5
+MAN7=		samba.7
+MAN8=		smbd.8 nmbd.8
 
-post-install:
-.if !defined(NOMANCOMPRESS)
-	gzip -9nf ${PREFIX}/man/man1/smbstatus.1
-	gzip -9nf ${PREFIX}/man/man1/smbclient.1
-	gzip -9nf ${PREFIX}/man/man1/smbrun.1
-	gzip -9nf ${PREFIX}/man/man1/smbtar.1
-	gzip -9nf ${PREFIX}/man/man1/testparm.1
-	gzip -9nf ${PREFIX}/man/man1/testprns.1
-	gzip -9nf ${PREFIX}/man/man5/smb.conf.5
-	gzip -9nf ${PREFIX}/man/man7/samba.7
-	gzip -9nf ${PREFIX}/man/man8/smbd.8
-	gzip -9nf ${PREFIX}/man/man8/nmbd.8
-.endif
+pre-install:
+	@${MKDIR} /usr/local/samba
 
 .include <bsd.port.mk>
diff --git a/net/scotty/Makefile b/net/scotty/Makefile
index e0d41e1575e0..3496328fd9d0 100644
--- a/net/scotty/Makefile
+++ b/net/scotty/Makefile
@@ -3,11 +3,11 @@
 # Date created:		18 Februar 1995
 # Whom:			Gennady Sorokopud <gena@netvision.net.il>
 #
-# $Id: Makefile,v 1.11 1996/09/17 12:50:34 erich Exp $
+# $Id: Makefile,v 1.12 1996/10/10 14:54:36 erich Exp $
 #
 
 DISTNAME=	scotty-2.1.3
-CATEGORIES+=	net
+CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.ibr.cs.tu-bs.de/pub/local/tkined/
 
 LIB_DEPENDS=	tk41\\.1\\.:${PORTSDIR}/x11/tk41
@@ -17,6 +17,11 @@ CONFIGURE_ARGS= --with-tcl-config=/usr/libdata/tcl \
 		--with-tk-config=/usr/local/lib
 
 WRKSRC=${WRKDIR}/${DISTNAME}/unix
+MAN1=		tkined.1 scotty.1
+MAN8=		ntping.8 straps.8
+MANN=		Tnm.n cmip.n dns.n gdmo.n http.n icmp.n ined.n job.n \
+		mib.n msqltcl.n netdb.n ntp.n rpc.n snmp.n sunrpc.n \
+		syslog.n udp.n
 
 pre-install:
 	@cd ${WRKSRC};make sinstall
@@ -29,31 +34,6 @@ pre-install:
 .endif
 	@rm /tmp/PLIST
 
-post-install:
-.if !defined(NOMANCOMPRESS)
-	gzip -9nf ${PREFIX}/man/man1/tkined.1
-	gzip -9nf ${PREFIX}/man/man1/scotty.1
-	gzip -9nf ${PREFIX}/man/man8/ntping.8
-	gzip -9nf ${PREFIX}/man/man8/straps.8
-	gzip -9nf ${PREFIX}/man/mann/Tnm.n
-	gzip -9nf ${PREFIX}/man/mann/cmip.n
-	gzip -9nf ${PREFIX}/man/mann/dns.n
-	gzip -9nf ${PREFIX}/man/mann/gdmo.n
-	gzip -9nf ${PREFIX}/man/mann/http.n
-	gzip -9nf ${PREFIX}/man/mann/icmp.n
-	gzip -9nf ${PREFIX}/man/mann/ined.n
-	gzip -9nf ${PREFIX}/man/mann/job.n
-	gzip -9nf ${PREFIX}/man/mann/mib.n
-	gzip -9nf ${PREFIX}/man/mann/msqltcl.n
-	gzip -9nf ${PREFIX}/man/mann/netdb.n
-	gzip -9nf ${PREFIX}/man/mann/ntp.n
-	gzip -9nf ${PREFIX}/man/mann/rpc.n
-	gzip -9nf ${PREFIX}/man/mann/snmp.n
-	gzip -9nf ${PREFIX}/man/mann/sunrpc.n
-	gzip -9nf ${PREFIX}/man/mann/syslog.n
-	gzip -9nf ${PREFIX}/man/mann/udp.n
-.endif
-
 pre-clean:
 	@rm -f pkg/PLIST
 
diff --git a/net/scotty3/Makefile b/net/scotty3/Makefile
index e0d41e1575e0..3496328fd9d0 100644
--- a/net/scotty3/Makefile
+++ b/net/scotty3/Makefile
@@ -3,11 +3,11 @@
 # Date created:		18 Februar 1995
 # Whom:			Gennady Sorokopud <gena@netvision.net.il>
 #
-# $Id: Makefile,v 1.11 1996/09/17 12:50:34 erich Exp $
+# $Id: Makefile,v 1.12 1996/10/10 14:54:36 erich Exp $
 #
 
 DISTNAME=	scotty-2.1.3
-CATEGORIES+=	net
+CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.ibr.cs.tu-bs.de/pub/local/tkined/
 
 LIB_DEPENDS=	tk41\\.1\\.:${PORTSDIR}/x11/tk41
@@ -17,6 +17,11 @@ CONFIGURE_ARGS= --with-tcl-config=/usr/libdata/tcl \
 		--with-tk-config=/usr/local/lib
 
 WRKSRC=${WRKDIR}/${DISTNAME}/unix
+MAN1=		tkined.1 scotty.1
+MAN8=		ntping.8 straps.8
+MANN=		Tnm.n cmip.n dns.n gdmo.n http.n icmp.n ined.n job.n \
+		mib.n msqltcl.n netdb.n ntp.n rpc.n snmp.n sunrpc.n \
+		syslog.n udp.n
 
 pre-install:
 	@cd ${WRKSRC};make sinstall
@@ -29,31 +34,6 @@ pre-install:
 .endif
 	@rm /tmp/PLIST
 
-post-install:
-.if !defined(NOMANCOMPRESS)
-	gzip -9nf ${PREFIX}/man/man1/tkined.1
-	gzip -9nf ${PREFIX}/man/man1/scotty.1
-	gzip -9nf ${PREFIX}/man/man8/ntping.8
-	gzip -9nf ${PREFIX}/man/man8/straps.8
-	gzip -9nf ${PREFIX}/man/mann/Tnm.n
-	gzip -9nf ${PREFIX}/man/mann/cmip.n
-	gzip -9nf ${PREFIX}/man/mann/dns.n
-	gzip -9nf ${PREFIX}/man/mann/gdmo.n
-	gzip -9nf ${PREFIX}/man/mann/http.n
-	gzip -9nf ${PREFIX}/man/mann/icmp.n
-	gzip -9nf ${PREFIX}/man/mann/ined.n
-	gzip -9nf ${PREFIX}/man/mann/job.n
-	gzip -9nf ${PREFIX}/man/mann/mib.n
-	gzip -9nf ${PREFIX}/man/mann/msqltcl.n
-	gzip -9nf ${PREFIX}/man/mann/netdb.n
-	gzip -9nf ${PREFIX}/man/mann/ntp.n
-	gzip -9nf ${PREFIX}/man/mann/rpc.n
-	gzip -9nf ${PREFIX}/man/mann/snmp.n
-	gzip -9nf ${PREFIX}/man/mann/sunrpc.n
-	gzip -9nf ${PREFIX}/man/mann/syslog.n
-	gzip -9nf ${PREFIX}/man/mann/udp.n
-.endif
-
 pre-clean:
 	@rm -f pkg/PLIST
 
diff --git a/net/sdr/Makefile b/net/sdr/Makefile
index d24bad61947e..a0141ce495e3 100644
--- a/net/sdr/Makefile
+++ b/net/sdr/Makefile
@@ -3,12 +3,12 @@
 # Date created:				5 September 1996
 # Whom:	      Bill Fenner <fenner@FreeBSD.ORG>
 #
-#   $Id$
+#   $Id: Makefile,v 1.1.1.1 1996/11/10 21:16:46 fenner Exp $
 #
 
 DISTNAME=	sdr.V2.3a1
 PKGNAME=	sdr-2.3a1
-CATEGORIES+=	mbone
+CATEGORIES=	mbone
 MASTER_SITES=	ftp://cs.ucl.ac.uk/mice/sdr/
 RESTRICTED=	"Contains DES encryption"
 
diff --git a/net/slirp/Makefile b/net/slirp/Makefile
index 5ca0e3c2dcf1..1b2a6de1b539 100644
--- a/net/slirp/Makefile
+++ b/net/slirp/Makefile
@@ -3,11 +3,11 @@
 # Date created:		25 Aug 1995
 # Whom:			Alain Kalker <A.C.P.M.Kalker@student.utwente.nl>
 #
-# $Id: Makefile,v 1.4 1995/10/06 05:18:34 asami Exp $
+# $Id: Makefile,v 1.5 1995/11/27 04:05:35 asami Exp $
 #
 
 DISTNAME=	slirp-0.95f
-CATEGORIES+=	net
+CATEGORIES=	net
 MASTER_SITES=	ftp://blitzen.canberra.edu.au/pub/slirp/ \
 		ftp://freedom.wit.com/misc4/danjo/SLiRP/
 
@@ -15,10 +15,6 @@ MAINTAINER=	A.C.P.M.Kalker@student.utwente.nl
 
 WRKSRC=		${WRKDIR}/slirp-0.95f/src
 HAS_CONFIGURE=	yes
-
-post-install:
-.if !defined(NOMANCOMPRESS)
-	gzip -9nf ${PREFIX}/man/man1/slirp.1
-.endif
+MAN1=		slirp.1
 
 .include <bsd.port.mk>
diff --git a/net/socks5/Makefile b/net/socks5/Makefile
index 4e4287841148..4c5f07497904 100644
--- a/net/socks5/Makefile
+++ b/net/socks5/Makefile
@@ -3,12 +3,12 @@
 # Date created:				24 Apr 1996
 # Whom:					pst
 #
-# $Id: Makefile,v 1.6 1996/08/14 16:02:42 jdp Exp $
+# $Id: Makefile,v 1.7 1996/08/14 18:52:40 jdp Exp $
 #
 
 PKGNAME=	socks5-0.16.6
 DISTNAME=	socks5-beta-0.16.6-exportable
-CATEGORIES+=	net security
+CATEGORIES=	net security
 MASTER_SITES=	ftp://ftp.nec.com/pub/socks/socks5/
 
 MAINTAINER=	ambrisko@ambrisko.roble.com
diff --git a/net/sup/Makefile b/net/sup/Makefile
index 67487ce90db6..6924d49eba71 100644
--- a/net/sup/Makefile
+++ b/net/sup/Makefile
@@ -3,12 +3,12 @@
 # Date created:		21 August 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.6 1995/11/27 04:05:37 asami Exp $
+# $Id: Makefile,v 1.7 1996/06/03 02:17:32 asami Exp $
 #
 
 DISTNAME=	sup
 PKGNAME=	sup-2.0
-CATEGORIES+=	net
+CATEGORIES=	net
 MASTER_SITES=	ftp://freefall.freebsd.org/pub/FreeBSD/LOCAL_PORTS/
 
 MAINTAINER=	gibbs@FreeBSD.org
diff --git a/net/telnetx/Makefile b/net/telnetx/Makefile
index 502b82272748..2dc82bda6f16 100644
--- a/net/telnetx/Makefile
+++ b/net/telnetx/Makefile
@@ -3,12 +3,12 @@
 # Date created:			22 Sep 1996
 # Whom:				Masafumi NAKANE <max@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.2 1996/11/05 04:14:42 max Exp $
+# $Id: Makefile,v 1.3 1996/11/13 12:41:28 asami Exp $
 #
 
 DISTNAME=	telnetx+transit.src.940401
 PKGNAME=	telnetx-940401
-CATEGORIES+=	net
+CATEGORIES=	net
 MASTER_SITES=	ftp://freefall.FreeBSD.ORG/pub/FreeBSD/LOCAL_PORTS/ \
 		http://www.sfc.wide.ad.jp/~max/FreeBSD/ports/distfiles/
 
diff --git a/net/tintin++-devel/Makefile b/net/tintin++-devel/Makefile
index e7a648a3e621..d9a8622e4a3b 100644
--- a/net/tintin++-devel/Makefile
+++ b/net/tintin++-devel/Makefile
@@ -3,12 +3,12 @@
 # Date created:         15 Nov 1994
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.5 1995/05/13 12:59:50 ache Exp $
+# $Id: Makefile,v 1.6 1995/11/27 04:05:41 asami Exp $
 #
 
 DISTNAME=       tintin++v1.5pl6
 PKGNAME=	tintin-1.5.6
-CATEGORIES+=    net games
+CATEGORIES=     net games
 MASTER_SITES=   ftp://princeton.edu/pub/tintin++/dist/
 EXTRACT_SUFX=   .tar.Z
 
diff --git a/net/tintin++/Makefile b/net/tintin++/Makefile
index e7a648a3e621..d9a8622e4a3b 100644
--- a/net/tintin++/Makefile
+++ b/net/tintin++/Makefile
@@ -3,12 +3,12 @@
 # Date created:         15 Nov 1994
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.5 1995/05/13 12:59:50 ache Exp $
+# $Id: Makefile,v 1.6 1995/11/27 04:05:41 asami Exp $
 #
 
 DISTNAME=       tintin++v1.5pl6
 PKGNAME=	tintin-1.5.6
-CATEGORIES+=    net games
+CATEGORIES=     net games
 MASTER_SITES=   ftp://princeton.edu/pub/tintin++/dist/
 EXTRACT_SUFX=   .tar.Z
 
diff --git a/net/tinyfugue/Makefile b/net/tinyfugue/Makefile
index b65152cbe837..49575d97d042 100644
--- a/net/tinyfugue/Makefile
+++ b/net/tinyfugue/Makefile
@@ -3,11 +3,11 @@
 # Date created:		22 Mar 1996
 # Whom:			mike@binghamton.edu
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1996/03/25 10:12:09 asami Exp $
 #
 
 DISTNAME=	tf-35a16
-CATEGORIES+=	net games
+CATEGORIES=	net games
 MASTER_SITES=	ftp://tf.tcp.com/pub/tinyfugue/ \
 		ftp://ftp.tcp.com/pub/mud/Clients/tf/ \
 		ftp://ftp7.freebsd.org/pub/tf/
diff --git a/net/trafshow/Makefile b/net/trafshow/Makefile
index 267c25e53329..85b476223d58 100644
--- a/net/trafshow/Makefile
+++ b/net/trafshow/Makefile
@@ -3,19 +3,16 @@
 # Date created:         25 September 1996
 # Whom:                 igor@zynaps.ru
 #
-# $Id$
+# $Id: Makefile,v 1.4 1996/10/19 17:30:01 chuckr Exp $
 #
 
 DISTNAME=	trafshow-2.0
-CATEGORIES+=	net
+CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.kiae.su/unix/tcpip/netmaint/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=     igor@zynaps.ru
 
-post-install:
-.if !defined(NOMANCOMPRESS)
-	gzip -9nf ${PREFIX}/man/man1/trafshow.1
-.endif
+MAN1=		trafshow.1
 
 .include <bsd.port.mk>
diff --git a/net/trafshow3/Makefile b/net/trafshow3/Makefile
index 267c25e53329..85b476223d58 100644
--- a/net/trafshow3/Makefile
+++ b/net/trafshow3/Makefile
@@ -3,19 +3,16 @@
 # Date created:         25 September 1996
 # Whom:                 igor@zynaps.ru
 #
-# $Id$
+# $Id: Makefile,v 1.4 1996/10/19 17:30:01 chuckr Exp $
 #
 
 DISTNAME=	trafshow-2.0
-CATEGORIES+=	net
+CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.kiae.su/unix/tcpip/netmaint/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=     igor@zynaps.ru
 
-post-install:
-.if !defined(NOMANCOMPRESS)
-	gzip -9nf ${PREFIX}/man/man1/trafshow.1
-.endif
+MAN1=		trafshow.1
 
 .include <bsd.port.mk>
diff --git a/net/trafshow4/Makefile b/net/trafshow4/Makefile
index 267c25e53329..85b476223d58 100644
--- a/net/trafshow4/Makefile
+++ b/net/trafshow4/Makefile
@@ -3,19 +3,16 @@
 # Date created:         25 September 1996
 # Whom:                 igor@zynaps.ru
 #
-# $Id$
+# $Id: Makefile,v 1.4 1996/10/19 17:30:01 chuckr Exp $
 #
 
 DISTNAME=	trafshow-2.0
-CATEGORIES+=	net
+CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.kiae.su/unix/tcpip/netmaint/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=     igor@zynaps.ru
 
-post-install:
-.if !defined(NOMANCOMPRESS)
-	gzip -9nf ${PREFIX}/man/man1/trafshow.1
-.endif
+MAN1=		trafshow.1
 
 .include <bsd.port.mk>
diff --git a/net/ucd-snmp/Makefile b/net/ucd-snmp/Makefile
index ae4e27a130b4..c0bad231b02c 100644
--- a/net/ucd-snmp/Makefile
+++ b/net/ucd-snmp/Makefile
@@ -3,11 +3,11 @@
 # Date created:				26 June 1996
 # Whom:					gpalmer
 #
-# $Id: Makefile,v 1.1.1.1 1996/07/06 08:14:47 gpalmer Exp $
+# $Id: Makefile,v 1.2 1996/07/09 19:00:08 gpalmer Exp $
 #
 
 DISTNAME=	ucd-snmp-3.1
-CATEGORIES+=	net
+CATEGORIES=	net
 MASTER_SITES= 	ftp://ftp.ece.ucdavis.edu/pub/snmp/
 
 MAINTAINER=	gpalmer@FreeBSD.ORG
@@ -29,13 +29,7 @@ MAN8=		snmptrapd.8 snmpd.8
 post-install:
 	( cd ${PREFIX}/bin; strip ${BIN} )
 	( cd ${PREFIX}/sbin; strip ${SBIN} )
-.if !defined(NOMANCOMPRESS)
-	( cd ${PREFIX}/man/man1; gzip -9nf ${MAN1} )
-	( cd ${PREFIX}/man/man3; gzip -9nf ${MAN3} )
-	( cd ${PREFIX}/man/man5; gzip -9nf ${MAN5} )
-	( cd ${PREFIX}/man/man8; gzip -9nf ${MAN8} )
-.endif
-	mkdir -p ${PREFIX}/share/examples/ucd-snmp
+	${MKDIR} ${PREFIX}/share/examples/ucd-snmp
 	( cd ${WRKSRC}/etc; cp * ${PREFIX}/share/examples/ucd-snmp )
 
 .include <bsd.port.mk>
diff --git a/net/wais/Makefile b/net/wais/Makefile
index a2d6efa25ea5..cf602082937d 100644
--- a/net/wais/Makefile
+++ b/net/wais/Makefile
@@ -3,11 +3,11 @@
 # Date created:         20 Sep 1994
 # Whom:                 adam
 #
-# $Id: Makefile,v 1.8 1996/04/12 08:43:43 asami Exp $
+# $Id: Makefile,v 1.9 1996/11/13 10:55:46 adam Exp $
 #
 
 DISTNAME=       freeWAIS-0.5
-CATEGORIES+=	net
+CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.cnidr.org/pub/NIDR.tools/freewais/
 
 NO_PACKAGE=	not yet
diff --git a/net/wb/Makefile b/net/wb/Makefile
index c4d92ce6c6e2..181bba230e0d 100644
--- a/net/wb/Makefile
+++ b/net/wb/Makefile
@@ -3,11 +3,11 @@
 # Date created:		2 Novermber 1996
 # Whom:			fenner
 #
-# $Id: $
+# $Id: Makefile,v 1.1.1.1 1996/11/10 21:13:06 fenner Exp $
 #
 
 DISTNAME=       wb-1.59
-CATEGORIES+=	mbone
+CATEGORIES=	mbone
 MASTER_SITES=   ftp://ftp.ee.lbl.gov/conferencing/wb/
 DISTFILES=      i386-wb-1.59.tar.Z
 
diff --git a/net/wide-dhcp/Makefile b/net/wide-dhcp/Makefile
index 0a08daf896f7..88225bbdfdca 100644
--- a/net/wide-dhcp/Makefile
+++ b/net/wide-dhcp/Makefile
@@ -3,12 +3,12 @@
 # Date created:         21 November 1995
 # Whom:                 Yoshiro MIHIRA <sanpei@yy.cs.keio.ac.jp>
 #
-# $Id: Makefile,v 1.2 1996/05/20 08:06:55 asami Exp $
+# $Id: Makefile,v 1.3 1996/05/30 08:54:17 asami Exp $
 #
 
 DISTNAME=       dhcp-1.3beta
 PKGNAME=        wide-dhcp-1.3b
-CATEGORIES+=    net
+CATEGORIES=     net
 MASTER_SITES=   ftp://sh.wide.ad.jp/WIDE/free-ware/dhcp/ \
 		ftp://ftp.freebsd.org/pub/FreeBSD/FreeBSD-current/src/lib/libc/stdtime/
 DISTFILES=	dhcp-1.3beta.tar.gz tzfile.h
diff --git a/net/ytalk/Makefile b/net/ytalk/Makefile
index 14814b13a5e3..fd5d28da2f6a 100644
--- a/net/ytalk/Makefile
+++ b/net/ytalk/Makefile
@@ -3,12 +3,12 @@
 # Date created:		18 March 1995
 # Whom:			asami
 #
-# $Id: Makefile,v 1.4 1995/04/15 05:42:11 asami Exp $
+# $Id: Makefile,v 1.5 1995/11/27 04:05:58 asami Exp $
 #
 
 DISTNAME=	ytalk-v3pl2
 PKGNAME=	ytalk-3.0.2
-CATEGORIES+=	net
+CATEGORIES=	net
 MASTER_SITES=	ftp://knot.queensu.ca/pub/unix/software/
 
 MAINTAINER=	asami@FreeBSD.ORG
diff --git a/net/zephyr/Makefile b/net/zephyr/Makefile
index 0634cca6a987..8c77b910dd0f 100644
--- a/net/zephyr/Makefile
+++ b/net/zephyr/Makefile
@@ -3,29 +3,29 @@
 # Date created:		1-Aug-1995
 # Whom:			pst
 #
-# $Id: Makefile,v 1.2 1995/11/27 04:06:01 asami Exp $
+# $Id: Makefile,v 1.3 1996/11/07 17:49:38 pst Exp $
 #
 
 DISTNAME=	zephyr-2.0.4
-CATEGORIES+=	net
+CATEGORIES=	net
 MASTER_SITES=	ftp://athena-dist.mit.edu/pub/ATHENA/zephyr/dist/
-HAS_CONFIGURE=	yes
 
 .if exists(/usr/lib/libkrb.a) && defined(MAKE_EBONES)
 CONFIGURE_ARGS="--with-krb4"
 .endif
 
-ZEPHYR_RCDIR=	${PREFIX}/etc/rc.d
+HAS_CONFIGURE=	yes
 
+ZEPHYR_RCDIR=	${PREFIX}/etc/rc.d
 ZEPHYR_DOCDIR=	${PREFIX}/share/doc/zephyr
 ZEPHYR_DOCS=	INSTALL NOTES OPERATING README USING
 
 post-install:
 	${INSTALL} -c -m 755 -o bin -g bin ${FILESDIR}/zhm.sh ${ZEPHYR_RCDIR}
-	-test -d ${ZEPHYR_DOCDIR} || mkdir -p ${ZEPHYR_DOCDIR}
+	${MKDIR} ${ZEPHYR_DOCDIR}
 	for file in ${ZEPHYR_DOCS} ; do \
 	    ${INSTALL} -c ${WRKSRC}/$$file ${ZEPHYR_DOCDIR} ; \
 	    done
-	-test -d ${ZEPHYR_RCDIR} || mkdir -p ${ZEPHYR_RCDIR}
+	${MKDIR} ${ZEPHYR_RCDIR}
 
 .include <bsd.port.mk>
diff --git a/news/cnews/Makefile b/news/cnews/Makefile
index f5982e253af3..80dcc741bc34 100644
--- a/news/cnews/Makefile
+++ b/news/cnews/Makefile
@@ -3,12 +3,12 @@
 # Date created:		28 September 1994
 # Whom:			adam
 #
-# $Id: Makefile,v 1.11 1995/07/02 12:40:13 asami Exp $
+# $Id: Makefile,v 1.12 1995/10/05 10:20:26 adam Exp $
 #
 
 DISTNAME=	cnews
 PKGNAME=	cnews-cr.g
-CATEGORIES+=	news
+CATEGORIES=	news
 MASTER_SITES=	ftp://ftp.zoo.toronto.edu/pub/
 EXTRACT_SUFX=	.tar.Z
 
diff --git a/news/inn-current/Makefile b/news/inn-current/Makefile
index 7477c0f2faa3..0cbdd83d2bda 100644
--- a/news/inn-current/Makefile
+++ b/news/inn-current/Makefile
@@ -3,12 +3,12 @@
 # Date created:		20 Oct 1994
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.15 1996/06/24 21:52:17 torstenb Exp $
+# $Id: Makefile,v 1.16 1996/07/08 22:55:17 torstenb Exp $
 #
 
 DISTNAME=	inn1.4sec
 PKGNAME=	inn-1.4
-CATEGORIES+=	news
+CATEGORIES=	news
 MASTER_SITES=	ftp://ftp.uu.net/networking/news/nntp/inn/
 EXTRACT_SUFX=	.tar.Z
 
diff --git a/news/inn-stable/Makefile b/news/inn-stable/Makefile
index 7477c0f2faa3..0cbdd83d2bda 100644
--- a/news/inn-stable/Makefile
+++ b/news/inn-stable/Makefile
@@ -3,12 +3,12 @@
 # Date created:		20 Oct 1994
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.15 1996/06/24 21:52:17 torstenb Exp $
+# $Id: Makefile,v 1.16 1996/07/08 22:55:17 torstenb Exp $
 #
 
 DISTNAME=	inn1.4sec
 PKGNAME=	inn-1.4
-CATEGORIES+=	news
+CATEGORIES=	news
 MASTER_SITES=	ftp://ftp.uu.net/networking/news/nntp/inn/
 EXTRACT_SUFX=	.tar.Z
 
diff --git a/news/inn/Makefile b/news/inn/Makefile
index 7477c0f2faa3..0cbdd83d2bda 100644
--- a/news/inn/Makefile
+++ b/news/inn/Makefile
@@ -3,12 +3,12 @@
 # Date created:		20 Oct 1994
 # Whom:			torstenb
 #
-# $Id: Makefile,v 1.15 1996/06/24 21:52:17 torstenb Exp $
+# $Id: Makefile,v 1.16 1996/07/08 22:55:17 torstenb Exp $
 #
 
 DISTNAME=	inn1.4sec
 PKGNAME=	inn-1.4
-CATEGORIES+=	news
+CATEGORIES=	news
 MASTER_SITES=	ftp://ftp.uu.net/networking/news/nntp/inn/
 EXTRACT_SUFX=	.tar.Z
 
diff --git a/news/nn/Makefile b/news/nn/Makefile
index 3c4a0af6796e..b7a6a2b7c420 100644
--- a/news/nn/Makefile
+++ b/news/nn/Makefile
@@ -3,12 +3,12 @@
 # Date created:		24 September 1994
 # Whom:			adam
 #
-# $Id: Makefile,v 1.7 1995/04/15 03:11:37 ache Exp $
+# $Id: Makefile,v 1.8 1996/03/04 11:27:35 ache Exp $
 #
 
 DISTNAME=	nn-6.5.0.b3
 PKGNAME=	nn-6.5.0
-CATEGORIES+=	news
+CATEGORIES=	news
 MASTER_SITES=	ftp://uniwa.uwa.edu.au/pub/nn/beta/
 MAINTAINER=     ache@FreeBSD.ORG
 
diff --git a/news/nntp/Makefile b/news/nntp/Makefile
index 689683dab34d..6aa9463fbe9d 100644
--- a/news/nntp/Makefile
+++ b/news/nntp/Makefile
@@ -3,12 +3,12 @@
 # Date created:		29 September 1994
 # Whom:			adam
 #
-# $Id: Makefile,v 1.8 1995/11/27 00:08:37 asami Exp $
+# $Id: Makefile,v 1.9 1996/03/20 01:48:26 adam Exp $
 #
 
 DISTNAME=	nntp-t5
 PKGNAME=	nntp-1.5.11.5
-CATEGORIES+=	news
+CATEGORIES=	news
 MASTER_SITES=	ftp://nic.sura.net/pub/news/software/nntp/
 
 MAINTAINER=	adam@veda.is
diff --git a/news/nntpbtr/Makefile b/news/nntpbtr/Makefile
index 8b7909c288c2..01e9cefc26be 100644
--- a/news/nntpbtr/Makefile
+++ b/news/nntpbtr/Makefile
@@ -3,16 +3,18 @@
 # Date created:         1 July 1996
 # Whom:                 dk
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1996/07/23 08:05:10 asami Exp $
 #
 
 DISTNAME=       nntpbtr-1.7
-CATEGORIES+=	news
+CATEGORIES=	news
 MASTER_SITES=   ftp://ftp.kiae.su/unix/news/
 EXTRACT_SUFX=   .tar.Z
 
 MAINTAINER=	dk@farm.org
 
+MAN1=		nntpbtr.1
+
 # "patch" complains otherwise
 post-extract:
 	rm -rf ${WRKSRC}/RCS
@@ -21,9 +23,4 @@ pre-build:
 	cd ${FILESDIR} ; pax -rw -l -u dbz ${WRKDIR} || true
 	cd ${WRKDIR}/dbz ; ${CC} ${CFLAGS} -c -I. dbz.c
 
-post-install:
-.if !defined(NOMANCOMPRESS)
-	gzip -9nf ${PREFIX}/man/man1/nntpbtr.1
-.endif
-
 .include <bsd.port.mk>
diff --git a/news/slnr/Makefile b/news/slnr/Makefile
index 942cf9982a84..2d803d4af648 100644
--- a/news/slnr/Makefile
+++ b/news/slnr/Makefile
@@ -3,12 +3,12 @@
 # Date created:		21 July 1996
 # Whom:			Tim Vanderhoek <ac199@freenet.hamilton.on.ca>
 #
-# $Id: Makefile,v 1.1.1.1 1996/11/01 08:08:54 asami Exp $
+# $Id: Makefile,v 1.2 1996/11/13 12:41:30 asami Exp $
 #
 
 DISTNAME=	slnr
 PKGNAME=	slnr-2.13
-CATEGORIES+=	news
+CATEGORIES=	news
 MASTER_SITES=	ftp://ftp.uu.net/networking/news/readers/off-line/slnr/ \
 		ftp://ftp.adelaide.edu.au/pub/news/readers/off-line/slnr/
 DISTFILES=	part1.Z part2.Z part3.Z
diff --git a/news/slurp/Makefile b/news/slurp/Makefile
index d27b55e64584..a50b074c5143 100644
--- a/news/slurp/Makefile
+++ b/news/slurp/Makefile
@@ -3,11 +3,11 @@
 # Date created:		30 Jun 1996
 # Whom:			jraynard
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1996/07/27 21:54:11 asami Exp $
 #
 
 DISTNAME=	slurp-1.10
-CATEGORIES+=	news
+CATEGORIES=	news
 MASTER_SITES=	ftp://ftp.demon.co.uk/pub/news/slurp/
 EXTRACT_SUFX=	.tar.Z
 
@@ -16,6 +16,7 @@ MAINTAINER=	jraynard@FreeBSD.ORG
 #RUN_DEPENDS=	${PREFIX}/etc/innd:${PORTSDIR}/news/inn
 
 NO_WRKSUBDIR=	yes
+MAN1=		slurp.1
 
 pre-build:
 	@(cd ${WRKSRC}; cp conf.h conf.h.orig; \
@@ -24,12 +25,9 @@ pre-build:
 	@cp ${FILESDIR}/dbz.* ${WRKSRC}
 
 do-install:
-	mkdir -p ${PREFIX}/news/bin ${PREFIX}/news/lib
+	${MKDIR} ${PREFIX}/news/bin ${PREFIX}/news/lib
 	install -c -o news -g news -m 0555 -s ${WRKSRC}/slurp ${PREFIX}/news/bin/
-	install -c -o man -g man -m 0444 ${WRKSRC}/slurp.1 ${PREFIX}/man/man1
-.if !defined(NOMANCOMPRESS)
-	gzip -9nf ${PREFIX}/man/man1/slurp.1
-.endif
+	${INSTALL_MAN} ${WRKSRC}/slurp.1 ${PREFIX}/man/man1
 	install -c -o news -g news -m 0644 ${WRKSRC}/slurp.sys ${PREFIX}/news/lib/	
 
 .include <bsd.port.mk>
diff --git a/news/suck/Makefile b/news/suck/Makefile
index 6f67c1289a86..2e66f62dc1e5 100644
--- a/news/suck/Makefile
+++ b/news/suck/Makefile
@@ -3,27 +3,23 @@
 # Date created:		30 Mar 1996
 # Whom:			graphite@taurus.bekkoame.or.jp
 #
-# $Id: Makefile,v 1.1.1.1 1996/03/31 23:19:18 asami Exp $
+# $Id: Makefile,v 1.2 1996/04/07 08:15:23 asami Exp $
 #
 
 DISTNAME=	suck-2.6.2
-CATEGORIES+=	news
+CATEGORIES=	news
 MASTER_SITES=	ftp://tsx-11.mit.edu/pub/linux/sources/sbin/ \
 		ftp://ftp.iis.u-tokyo.ac.jp/pub2/Linux/sources/sbin/
 
 MAINTAINER=	graphite@taurus.bekkoame.or.jp
 
 USE_GMAKE=	yes
+MAN1=		suck.1 rpost.1 testhost.1
 
 post-install:
-	install -c -o bin -g bin -m 755 ${WRKSRC}/sample/get.news.innxmit ${PREFIX}/sbin
-	install -c -o bin -g bin -m 755 ${WRKSRC}/sample/get.news.rnews ${PREFIX}/sbin
-	install -c -o bin -g bin -m 755 ${WRKSRC}/sample/put.news ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/sample/get.news.innxmit ${PREFIX}/sbin
+	${INSTALL_SCRIPT} ${WRKSRC}/sample/get.news.rnews ${PREFIX}/sbin
+	${INSTALL_SCRIPT} ${WRKSRC}/sample/put.news ${PREFIX}/bin
 	install -c -o bin -g bin -m 640 ${WRKSRC}/sample/*.sample ${PREFIX}/etc
-.if !defined(NOMANCOMPRESS)
-	gzip -9nf ${PREFIX}/man/man1/suck.1
-	gzip -9nf ${PREFIX}/man/man1/rpost.1
-	gzip -9nf ${PREFIX}/man/man1/testhost.1
-.endif
 
 .include <bsd.port.mk>
diff --git a/news/tin/Makefile b/news/tin/Makefile
index b610c75085df..334611f28ee7 100644
--- a/news/tin/Makefile
+++ b/news/tin/Makefile
@@ -4,12 +4,12 @@
 # Date created:		25 July 1996
 # Whom:			obrien@cs.ucdavis.edu
 #
-# $Id: Makefile,v 1.12 1996/11/12 20:44:59 ache Exp $
+# $Id: Makefile,v 1.13 1996/11/17 01:25:16 ache Exp $
 #
 
 DISTNAME=       tin1.3-unoff-BETA-961115
 PKGNAME=        tin-1.3.961115
-CATEGORIES+=	news
+CATEGORIES=	news
 MASTER_SITES=	ftp://ftp.akk.uni-karlsruhe.de/pub/tin/  \
 		ftp://nuxi.cs.ucdavis.edu/pub/tin/
 EXTRACT_SUFX=	.tgz
@@ -28,6 +28,7 @@ CONFIGURE_ARGS+= --with-nntp-default-server=news  \
 		 --with-metamail=${PREFIX}/bin/metamail
 MAKEFILE=	makefile
 ALL_TARGET=     build
+MAN1=		tin.1
 
 .if defined(NNTP_ONLY)
 CONFIGURE_ARGS+=	--enable-nntp-only
@@ -37,9 +38,4 @@ post-configure:
 	echo '#define NNTP_SERVER_FILE "${PREFIX}/etc/nntpserver"' >>${WRKSRC}/include/autoconf.h
 	echo '#define SMTP_SERVER_FILE "${PREFIX}/etc/smtpserver"' >>${WRKSRC}/include/autoconf.h
 
-post-install:
-.if !defined(NOMANCOMPRESS)
-	gzip -9nf ${PREFIX}/man/man1/tin.1
-.endif
-
 .include <bsd.port.mk>
diff --git a/news/trn/Makefile b/news/trn/Makefile
index a96aef8a3a4a..ed9e198486a1 100644
--- a/news/trn/Makefile
+++ b/news/trn/Makefile
@@ -7,7 +7,7 @@
 #
 
 DISTNAME=	trn-3.6
-CATEGORIES+=	news
+CATEGORIES=	news
 MASTER_SITES=	ftp://ftp.uu.net/networking/news/readers/trn/
 
 IS_INTERACTIVE=	yes
diff --git a/news/trn4/Makefile b/news/trn4/Makefile
index a96aef8a3a4a..ed9e198486a1 100644
--- a/news/trn4/Makefile
+++ b/news/trn4/Makefile
@@ -7,7 +7,7 @@
 #
 
 DISTNAME=	trn-3.6
-CATEGORIES+=	news
+CATEGORIES=	news
 MASTER_SITES=	ftp://ftp.uu.net/networking/news/readers/trn/
 
 IS_INTERACTIVE=	yes
diff --git a/print/mp-letter/Makefile b/print/mp-letter/Makefile
index c3d1ca4e452d..54db12a0d2f9 100644
--- a/print/mp-letter/Makefile
+++ b/print/mp-letter/Makefile
@@ -3,7 +3,7 @@
 # Date created:         11 July 1996
 # Whom:                 David O'Brien <obrien@cs.ucdavis.edu>
 #
-# $Id: Makefile,v 1.1.1.1 1996/08/16 07:08:39 asami Exp $
+# $Id: Makefile,v 1.2 1996/11/17 08:44:57 obrien Exp $
 #
 
 DISTNAME=	mp-3.0.1
@@ -16,6 +16,7 @@ MAINTAINER=	obrien@cs.ucdavis.edu
 
 WRKSRC=		${WRKDIR}/mp
 USE_GMAKE=	yes
+MAN1=		mp.1
 
 .if !defined(PAPERSIZE)
 PAPERSIZE=letter
@@ -29,7 +30,6 @@ pre-patch:
 MP_UTILS=   digestp filep filofaxp franklinp mailp newsp timemanp timesysp
 post-install:
 .if !defined(NOMANCOMPRESS)
-	gzip -9nf ${PREFIX}/man/man1/mp.1
 	-(cd ${PREFIX}/man/man1 ; \
 	for mpu in $(MP_UTILS) ; do \
 		ln -sf mp.1.gz $$mpu.1.gz ; done)
diff --git a/russian/X.language/Makefile b/russian/X.language/Makefile
index f035a00b0881..129b11cbceff 100644
--- a/russian/X.language/Makefile
+++ b/russian/X.language/Makefile
@@ -3,12 +3,12 @@
 # Date created:         31 Aug 1995
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.9 1996/10/07 14:34:58 ache Exp $
+# $Id: Makefile,v 1.10 1996/11/15 12:56:57 ache Exp $
 #
 
 DISTNAME=       xrus-2.0-bin
 PKGNAME=        ru-X11-3.2
-CATEGORIES+=    russian x11
+CATEGORIES=     russian x11
 MASTER_SITES=   ftp://ftp.relcom.ru/misc/fonts/cyrillic/xwindows/
 EXTRACT_SUFX=   .tgz
 
diff --git a/russian/d1489/Makefile b/russian/d1489/Makefile
index 4f8ab9f1b0ed..938b0c18b6dc 100644
--- a/russian/d1489/Makefile
+++ b/russian/d1489/Makefile
@@ -3,12 +3,12 @@
 # Date created:         1 May 1995
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.4 1995/11/26 10:51:51 asami Exp $
+# $Id: Makefile,v 1.5 1996/01/16 05:08:36 asami Exp $
 #
 
 DISTNAME=       d1489-1.2
 PKGNAME=        ru-d1489-1.2
-CATEGORIES+=    russian
+CATEGORIES=     russian
 MASTER_SITES=   ftp://ftp.kiae.su/unix/convert/char/
 EXTRACT_SUFX=   .tgz
 
diff --git a/russian/elm.language/Makefile b/russian/elm.language/Makefile
index 6a8f8d213993..2bfd048b9ae8 100644
--- a/russian/elm.language/Makefile
+++ b/russian/elm.language/Makefile
@@ -2,11 +2,11 @@
 # Date created:         2 Dec 1995
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.7 1996/04/09 01:49:51 asami Exp $
+# $Id: Makefile,v 1.8 1996/05/04 03:18:29 asami Exp $
 #
 
 PKGNAME=        ru-elm-2.4ME
-CATEGORIES+=    russian mail
+CATEGORIES=     russian mail
 
 RUN_DEPENDS+=   elm:${PORTSDIR}/mail/elm
 
diff --git a/russian/netscape4.language/Makefile b/russian/netscape4.language/Makefile
index 0ba716b4ce09..176d9dad41e2 100644
--- a/russian/netscape4.language/Makefile
+++ b/russian/netscape4.language/Makefile
@@ -3,11 +3,11 @@
 # Date created:         8 Apr 1996
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.2 1996/11/01 22:13:43 ache Exp $
+# $Id: Makefile,v 1.10 1996/11/07 00:11:45 ache Exp $
 #
 
 PKGNAME=        ru-netscape-3.01
-CATEGORIES+=    russian www x11
+CATEGORIES=     russian www
 
 MAINTAINER=	ache@FreeBSD.ORG
 
diff --git a/russian/pgp.language/Makefile b/russian/pgp.language/Makefile
index d53bddb50ee0..38d1f09c3259 100644
--- a/russian/pgp.language/Makefile
+++ b/russian/pgp.language/Makefile
@@ -3,12 +3,12 @@
 # Date created:         4 May 1995
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.12 1996/01/05 18:17:29 ache Exp $
+# $Id: Makefile,v 1.13 1996/05/27 01:44:48 ache Exp $
 #
 
 DISTNAME=       pgp26ru
 PKGNAME=        ru-pgp-2.6.3ia
-CATEGORIES+=    russian
+CATEGORIES=     russian
 MASTER_SITES=   ftp://ftp.relcom.ru/unix/crypto/pgp/
 EXTRACT_SUFX=   .zip
 
diff --git a/security/fwtk/Makefile b/security/fwtk/Makefile
index 48f2dc50b802..227338a6f2e4 100644
--- a/security/fwtk/Makefile
+++ b/security/fwtk/Makefile
@@ -3,7 +3,7 @@
 # Date created:                         15th June 1996
 # Whom:                                 gpalmer
 #
-# $Id: Makefile,v 1.4 1996/09/19 09:58:47 gpalmer Exp $
+# $Id: Makefile,v 1.5 1996/11/13 18:15:02 markm Exp $
 #
 
 DISTNAME=	fwtk-1.3
@@ -47,11 +47,6 @@ post-install:
 	( cd ${WRKSRC}/doc/man ; ${INSTMAN} ${MAN3} ${PREFIX}/man/man3 )
 	( cd ${WRKSRC}/doc/man ; ${INSTMAN} ${MAN5} ${PREFIX}/man/man5 )
 	( cd ${WRKSRC}/doc/man ; ${INSTMAN} ${MAN8} ${PREFIX}/man/man8 )
-.if !defined(NOMANCOMPRESS)
-	( cd ${PREFIX}/man/man3; gzip -9nfv ${MAN3} )
-	( cd ${PREFIX}/man/man5; gzip -9nfv ${MAN5} )
-	( cd ${PREFIX}/man/man8; gzip -9nfv ${MAN8} )
-.endif
 .if !defined(NOPORTDOCS)
 	( cd ${WRKSRC}/doc ; cp ${DOCS} ${PREFIX}/share/doc/fwtk )
 .endif
diff --git a/security/ssh/Makefile b/security/ssh/Makefile
index cee948601bbe..16ea37b9c5de 100644
--- a/security/ssh/Makefile
+++ b/security/ssh/Makefile
@@ -3,7 +3,7 @@
 # Date created:		30 Jul 1995
 # Whom:			torstenb@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.33 1996/08/19 10:31:04 asami Exp $
+# $Id: Makefile,v 1.34 1996/10/16 04:55:58 ache Exp $
 #
 # Maximal ssh package requires YES values for
 # USE_PERL, USE_TCPWRAP
@@ -52,6 +52,11 @@ CONFIGURE_ARGS+= --with-secureid
 CONFIGURE_ARGS+= --without-idea
 .endif
 
+MAN1=		scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh.1 \
+		make-ssh-known-hosts.1
+MAN8=		sshd.8
+
+
 pre-patch:
 	@mv -f ${WRKSRC}/make-ssh-known-hosts.pl \
 	    ${WRKSRC}/make-ssh-known-hosts.pl.in
@@ -80,10 +85,6 @@ post-install:
 		${PREFIX}/bin/ssh-keygen -f ${PREFIX}/etc/ssh_host_key -N ""; \
 	fi
 .if !defined(NOMANCOMPRESS)
-	gzip -9nf ${PREFIX}/man/man1/scp.1 ${PREFIX}/man/man1/ssh-add.1 \
-		${PREFIX}/man/man1/ssh-agent.1 ${PREFIX}/man/man1/ssh-keygen.1 \
-		${PREFIX}/man/man1/ssh.1 ${PREFIX}/man/man8/sshd.8 \
-		${PREFIX}/man/man1/make-ssh-known-hosts.1
 	rm -f ${PREFIX}/man/man1/slogin.1
 	ln -sf ssh.1.gz ${PREFIX}/man/man1/slogin.1.gz
 .endif
diff --git a/security/ssh2/Makefile b/security/ssh2/Makefile
index cee948601bbe..16ea37b9c5de 100644
--- a/security/ssh2/Makefile
+++ b/security/ssh2/Makefile
@@ -3,7 +3,7 @@
 # Date created:		30 Jul 1995
 # Whom:			torstenb@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.33 1996/08/19 10:31:04 asami Exp $
+# $Id: Makefile,v 1.34 1996/10/16 04:55:58 ache Exp $
 #
 # Maximal ssh package requires YES values for
 # USE_PERL, USE_TCPWRAP
@@ -52,6 +52,11 @@ CONFIGURE_ARGS+= --with-secureid
 CONFIGURE_ARGS+= --without-idea
 .endif
 
+MAN1=		scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh.1 \
+		make-ssh-known-hosts.1
+MAN8=		sshd.8
+
+
 pre-patch:
 	@mv -f ${WRKSRC}/make-ssh-known-hosts.pl \
 	    ${WRKSRC}/make-ssh-known-hosts.pl.in
@@ -80,10 +85,6 @@ post-install:
 		${PREFIX}/bin/ssh-keygen -f ${PREFIX}/etc/ssh_host_key -N ""; \
 	fi
 .if !defined(NOMANCOMPRESS)
-	gzip -9nf ${PREFIX}/man/man1/scp.1 ${PREFIX}/man/man1/ssh-add.1 \
-		${PREFIX}/man/man1/ssh-agent.1 ${PREFIX}/man/man1/ssh-keygen.1 \
-		${PREFIX}/man/man1/ssh.1 ${PREFIX}/man/man8/sshd.8 \
-		${PREFIX}/man/man1/make-ssh-known-hosts.1
 	rm -f ${PREFIX}/man/man1/slogin.1
 	ln -sf ssh.1.gz ${PREFIX}/man/man1/slogin.1.gz
 .endif
diff --git a/shells/bash/Makefile b/shells/bash/Makefile
index 220891c0745c..6bd552aea9fe 100644
--- a/shells/bash/Makefile
+++ b/shells/bash/Makefile
@@ -3,12 +3,12 @@
 # Date created:		21 August 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.15 1996/02/09 07:20:37 adam Exp $
+# $Id: Makefile,v 1.16 1996/08/28 15:21:00 ache Exp $
 #
 
 DISTNAME=       bash-1.14.7
 WRKSRC=         ${WRKDIR}/bash-1.14.7
-CATEGORIES+=	shells
+CATEGORIES=	shells
 MASTER_SITES=   ftp://slc2.ins.cwru.edu/pub/dist/
 
 MAINTAINER=     ache@FreeBSD.ORG
diff --git a/shells/bash1/Makefile b/shells/bash1/Makefile
index 220891c0745c..6bd552aea9fe 100644
--- a/shells/bash1/Makefile
+++ b/shells/bash1/Makefile
@@ -3,12 +3,12 @@
 # Date created:		21 August 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.15 1996/02/09 07:20:37 adam Exp $
+# $Id: Makefile,v 1.16 1996/08/28 15:21:00 ache Exp $
 #
 
 DISTNAME=       bash-1.14.7
 WRKSRC=         ${WRKDIR}/bash-1.14.7
-CATEGORIES+=	shells
+CATEGORIES=	shells
 MASTER_SITES=   ftp://slc2.ins.cwru.edu/pub/dist/
 
 MAINTAINER=     ache@FreeBSD.ORG
diff --git a/shells/bash2/Makefile b/shells/bash2/Makefile
index 220891c0745c..6bd552aea9fe 100644
--- a/shells/bash2/Makefile
+++ b/shells/bash2/Makefile
@@ -3,12 +3,12 @@
 # Date created:		21 August 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.15 1996/02/09 07:20:37 adam Exp $
+# $Id: Makefile,v 1.16 1996/08/28 15:21:00 ache Exp $
 #
 
 DISTNAME=       bash-1.14.7
 WRKSRC=         ${WRKDIR}/bash-1.14.7
-CATEGORIES+=	shells
+CATEGORIES=	shells
 MASTER_SITES=   ftp://slc2.ins.cwru.edu/pub/dist/
 
 MAINTAINER=     ache@FreeBSD.ORG
diff --git a/shells/bash3/Makefile b/shells/bash3/Makefile
index 220891c0745c..6bd552aea9fe 100644
--- a/shells/bash3/Makefile
+++ b/shells/bash3/Makefile
@@ -3,12 +3,12 @@
 # Date created:		21 August 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.15 1996/02/09 07:20:37 adam Exp $
+# $Id: Makefile,v 1.16 1996/08/28 15:21:00 ache Exp $
 #
 
 DISTNAME=       bash-1.14.7
 WRKSRC=         ${WRKDIR}/bash-1.14.7
-CATEGORIES+=	shells
+CATEGORIES=	shells
 MASTER_SITES=   ftp://slc2.ins.cwru.edu/pub/dist/
 
 MAINTAINER=     ache@FreeBSD.ORG
diff --git a/shells/es/Makefile b/shells/es/Makefile
index 15c45c84380d..9ba10337aadb 100644
--- a/shells/es/Makefile
+++ b/shells/es/Makefile
@@ -3,12 +3,12 @@
 # Date created:         Sun Aug 13 12:36:14 CDT 1995
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.2 1995/10/28 20:32:00 erich Exp $
+# $Id: Makefile,v 1.3 1996/07/30 04:17:03 asami Exp $
 #
 
 DISTNAME=       es-0.9-alpha1
 PKGNAME=	es-0.9a1
-CATEGORIES+=	shells
+CATEGORIES=	shells
 MASTER_SITES=   ftp://ftp.sys.toronto.edu/pub/es/
 
 MAINTAINER=	erich@FreeBSD.org
diff --git a/shells/pdksh/Makefile b/shells/pdksh/Makefile
index 3e36587692bf..adfe60b8dbe1 100644
--- a/shells/pdksh/Makefile
+++ b/shells/pdksh/Makefile
@@ -3,20 +3,16 @@
 # Date created:		23 May 1995
 # Whom:			thomas@ghpc8.ihf.rwth-aachen.de
 #
-# $Id: Makefile,v 1.14 1996/10/16 06:34:33 tg Exp $
+# $Id: Makefile,v 1.15 1996/11/05 08:11:34 tg Exp $
 #
 
 DISTNAME=	pdksh-5.2.12
-CATEGORIES+=	shells
+CATEGORIES=	shells
 MASTER_SITES=	ftp://ftp.cs.mun.ca/pub/pdksh/
 
 MAINTAINER=	tg@freebsd.org
 
 GNU_CONFIGURE=  yes
-
-post-install:
-.if !defined(NOMANCOMPRESS)
-	gzip -9nf ${PREFIX}/man/man1/ksh.1
-.endif
+MAN1=		ksh.1
 
 .include <bsd.port.mk>
diff --git a/shells/tcsh/Makefile b/shells/tcsh/Makefile
index e71f959714e6..4ca4f4bbc1d9 100644
--- a/shells/tcsh/Makefile
+++ b/shells/tcsh/Makefile
@@ -3,13 +3,15 @@
 # Date created:		22 August 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.12 1995/10/11 10:28:59 jkh Exp $
+# $Id: Makefile,v 1.13 1996/05/01 01:33:55 ache Exp $
 #
 
 DISTNAME=       tcsh-6.06
-CATEGORIES+=	shells
+CATEGORIES=	shells
 MASTER_SITES=   ftp://ee.cornell.edu/pub/tcsh/
 
+MAINTAINER=     ache@FreeBSD.ORG
+
 ALL_TARGET=     all catalogs
 INSTALL_TARGET= install install.man
 
@@ -25,6 +27,4 @@ post-install:
 	ln -sf ${PREFIX}/share/nls/de_DE.ISO_8859-1/tcsh.cat ${PREFIX}/share/nls/de_AT.ISO_8859-1/tcsh.cat
 	ln -sf ${PREFIX}/share/nls/de_DE.ISO_8859-1/tcsh.cat ${PREFIX}/share/nls/de_CH.ISO_8859-1/tcsh.cat
 
-MAINTAINER=     ache@FreeBSD.ORG
-
 .include <bsd.port.mk>
diff --git a/shells/zsh-devel/Makefile b/shells/zsh-devel/Makefile
index 168cca147301..133f60ea548b 100644
--- a/shells/zsh-devel/Makefile
+++ b/shells/zsh-devel/Makefile
@@ -3,12 +3,12 @@
 # Date created:			11 Feb. 1995
 # Whom:				torstenb
 #
-# $Id: Makefile,v 1.20 1996/09/14 22:54:58 torstenb Exp $
+# $Id: Makefile,v 1.21 1996/11/15 12:51:59 torstenb Exp $
 #
 
 DISTNAME=       zsh-3.0.1
 PKGNAME=	zsh-3.0.1
-CATEGORIES+=	shells
+CATEGORIES=	shells
 MASTER_SITES=   ftp://ftp.math.gatech.edu/pub/zsh/ \
 		ftp://ftp.sterling.com/zsh/ \
 		ftp://ftp.rge.com/pub/zsh/ \
@@ -21,13 +21,7 @@ MASTER_SITES=   ftp://ftp.math.gatech.edu/pub/zsh/ \
 MAINTAINER=	torstenb@FreeBSD.ORG
 
 GNU_CONFIGURE=	yes
-
-post-install:
-.if !defined(NOMANCOMPRESS)
-.for man in zsh zshbuiltins zshcompctl zshexpn zshmisc zshoptions zshall \
-	zshparam zshzle 
-	gzip -9nf ${PREFIX}/man/man1/${man}.1
-.endfor
-.endif
+MAN1=		zsh.1 zshbuiltins.1 zshcompctl.1 zshexpn.1 zshmisc.1 \
+		zshoptions.1 zshall.1 zshparam.1 zshzle.1
 
 .include <bsd.port.mk>
diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile
index 168cca147301..133f60ea548b 100644
--- a/shells/zsh/Makefile
+++ b/shells/zsh/Makefile
@@ -3,12 +3,12 @@
 # Date created:			11 Feb. 1995
 # Whom:				torstenb
 #
-# $Id: Makefile,v 1.20 1996/09/14 22:54:58 torstenb Exp $
+# $Id: Makefile,v 1.21 1996/11/15 12:51:59 torstenb Exp $
 #
 
 DISTNAME=       zsh-3.0.1
 PKGNAME=	zsh-3.0.1
-CATEGORIES+=	shells
+CATEGORIES=	shells
 MASTER_SITES=   ftp://ftp.math.gatech.edu/pub/zsh/ \
 		ftp://ftp.sterling.com/zsh/ \
 		ftp://ftp.rge.com/pub/zsh/ \
@@ -21,13 +21,7 @@ MASTER_SITES=   ftp://ftp.math.gatech.edu/pub/zsh/ \
 MAINTAINER=	torstenb@FreeBSD.ORG
 
 GNU_CONFIGURE=	yes
-
-post-install:
-.if !defined(NOMANCOMPRESS)
-.for man in zsh zshbuiltins zshcompctl zshexpn zshmisc zshoptions zshall \
-	zshparam zshzle 
-	gzip -9nf ${PREFIX}/man/man1/${man}.1
-.endfor
-.endif
+MAN1=		zsh.1 zshbuiltins.1 zshcompctl.1 zshexpn.1 zshmisc.1 \
+		zshoptions.1 zshall.1 zshparam.1 zshzle.1
 
 .include <bsd.port.mk>
diff --git a/sysutils/lsof/Makefile b/sysutils/lsof/Makefile
index 2886e4be8e5d..fa4fcdc7e948 100644
--- a/sysutils/lsof/Makefile
+++ b/sysutils/lsof/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Sat July 20, 1996
 # Whom:                 David O'Brien (obrien@cs.ucdavis.edu)
 #
-# $Id: Makefile,v 1.1.1.1 1996/11/11 19:42:44 obrien Exp $
+# $Id: Makefile,v 1.2 1996/11/17 02:41:03 obrien Exp $
 #
 
 DISTNAME=	lsof_3.81_W
@@ -21,10 +21,10 @@ WRKSRC=		${WRKDIR}/${SRCBALL_NAME}
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	Configure
 CONFIGURE_ARGS=	-n freebsd
+MAN1=		lsof.1
 
 SRCBALL_NAME=	${DISTNAME:S/_W$//}
 
-
 post-extract:
 	@( cd ${WRKDIR} ; \
 	EXPMD5=`/usr/bin/grep MD5 README.${SRCBALL_NAME} | sed 's/^[ ]*//'` ; \
@@ -43,10 +43,4 @@ do-install:
 	${INSTALL} ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m 2755 -g kmem ${WRKSRC}/lsof ${PREFIX}/sbin
 	${INSTALL_MAN} ${WRKSRC}/lsof.man ${PREFIX}/man/man1/lsof.1
 
-
-post-install:
-.if !defined(NOMANCOMPRESS)
-	gzip -9nf ${PREFIX}/man/man1/lsof.1
-.endif
-
 .include <bsd.port.mk>
diff --git a/www/analog/Makefile b/www/analog/Makefile
index 236b6dc8a584..8f1368a66ac9 100644
--- a/www/analog/Makefile
+++ b/www/analog/Makefile
@@ -3,12 +3,12 @@
 # Date created:		October 21st 1996
 # Whom:			jfitz
 #
-# $Id: Makefile,v 1.3 1996/08/06 21:18:00 jfitz Exp $
+# $Id: Makefile,v 1.4 1996/10/22 00:48:59 jfitz Exp $
 #
 
 DISTNAME=	analog.1.92.1
 PKGNAME=	analog-1.92.1
-CATEGORIES+=	www
+CATEGORIES=	www
 MASTER_SITES=	http://www.statslab.cam.ac.uk/~sret1/ \
 		http://www.lightside.net/analog/ \
 		http://www.gamesdomain.com/analog/ \
diff --git a/www/apache13-ssl/Makefile b/www/apache13-ssl/Makefile
index 8e41837a4172..a2f1deda54b7 100644
--- a/www/apache13-ssl/Makefile
+++ b/www/apache13-ssl/Makefile
@@ -3,12 +3,12 @@
 # Date created:         Fri Aug 25 16:42:36 CDT 1995
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.20 1996/11/07 01:49:46 ache Exp $
+# $Id: Makefile,v 1.21 1996/11/07 01:53:14 ache Exp $
 #
 
 DISTNAME=       apache_1.1.1
 PKGNAME=        apache-1.1.1
-CATEGORIES+=	www
+CATEGORIES=	www
 MASTER_SITES=   ftp://www.apache.org/apache/dist/
 
 MAINTAINER=	ache@freebsd.org
diff --git a/www/apache13/Makefile b/www/apache13/Makefile
index 8e41837a4172..a2f1deda54b7 100644
--- a/www/apache13/Makefile
+++ b/www/apache13/Makefile
@@ -3,12 +3,12 @@
 # Date created:         Fri Aug 25 16:42:36 CDT 1995
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.20 1996/11/07 01:49:46 ache Exp $
+# $Id: Makefile,v 1.21 1996/11/07 01:53:14 ache Exp $
 #
 
 DISTNAME=       apache_1.1.1
 PKGNAME=        apache-1.1.1
-CATEGORIES+=	www
+CATEGORIES=	www
 MASTER_SITES=   ftp://www.apache.org/apache/dist/
 
 MAINTAINER=	ache@freebsd.org
diff --git a/www/apache2/Makefile b/www/apache2/Makefile
index 8e41837a4172..a2f1deda54b7 100644
--- a/www/apache2/Makefile
+++ b/www/apache2/Makefile
@@ -3,12 +3,12 @@
 # Date created:         Fri Aug 25 16:42:36 CDT 1995
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.20 1996/11/07 01:49:46 ache Exp $
+# $Id: Makefile,v 1.21 1996/11/07 01:53:14 ache Exp $
 #
 
 DISTNAME=       apache_1.1.1
 PKGNAME=        apache-1.1.1
-CATEGORIES+=	www
+CATEGORIES=	www
 MASTER_SITES=   ftp://www.apache.org/apache/dist/
 
 MAINTAINER=	ache@freebsd.org
diff --git a/www/apache20/Makefile b/www/apache20/Makefile
index 8e41837a4172..a2f1deda54b7 100644
--- a/www/apache20/Makefile
+++ b/www/apache20/Makefile
@@ -3,12 +3,12 @@
 # Date created:         Fri Aug 25 16:42:36 CDT 1995
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.20 1996/11/07 01:49:46 ache Exp $
+# $Id: Makefile,v 1.21 1996/11/07 01:53:14 ache Exp $
 #
 
 DISTNAME=       apache_1.1.1
 PKGNAME=        apache-1.1.1
-CATEGORIES+=	www
+CATEGORIES=	www
 MASTER_SITES=   ftp://www.apache.org/apache/dist/
 
 MAINTAINER=	ache@freebsd.org
diff --git a/www/apache21/Makefile b/www/apache21/Makefile
index 8e41837a4172..a2f1deda54b7 100644
--- a/www/apache21/Makefile
+++ b/www/apache21/Makefile
@@ -3,12 +3,12 @@
 # Date created:         Fri Aug 25 16:42:36 CDT 1995
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.20 1996/11/07 01:49:46 ache Exp $
+# $Id: Makefile,v 1.21 1996/11/07 01:53:14 ache Exp $
 #
 
 DISTNAME=       apache_1.1.1
 PKGNAME=        apache-1.1.1
-CATEGORIES+=	www
+CATEGORIES=	www
 MASTER_SITES=   ftp://www.apache.org/apache/dist/
 
 MAINTAINER=	ache@freebsd.org
diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index 8e41837a4172..a2f1deda54b7 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -3,12 +3,12 @@
 # Date created:         Fri Aug 25 16:42:36 CDT 1995
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.20 1996/11/07 01:49:46 ache Exp $
+# $Id: Makefile,v 1.21 1996/11/07 01:53:14 ache Exp $
 #
 
 DISTNAME=       apache_1.1.1
 PKGNAME=        apache-1.1.1
-CATEGORIES+=	www
+CATEGORIES=	www
 MASTER_SITES=   ftp://www.apache.org/apache/dist/
 
 MAINTAINER=	ache@freebsd.org
diff --git a/www/ashe/Makefile b/www/ashe/Makefile
index 878300c9157e..8597f2ab963d 100644
--- a/www/ashe/Makefile
+++ b/www/ashe/Makefile
@@ -5,11 +5,11 @@
 #
 # WARNING WARNING: Requires Motif to compile & link
 #
-# $Id: Makefile,v 1.2 1995/11/27 04:10:12 asami Exp $
+# $Id: Makefile,v 1.3 1996/04/11 08:59:26 asami Exp $
 #
 
 DISTNAME=	ashe-1.1.2
-CATEGORIES+=	www
+CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.cs.rpi.edu/pub/puninj/ASHE/ASHE-1.1.2/src/ \
 		ftp://ftp.cs.rpi.edu/pub/puninj/ASHE/ASHE-1.1.2/libcci/ \
 		ftp://ftp.cs.rpi.edu/pub/puninj/ASHE/ASHE-1.1.2/libhtmlw/
diff --git a/www/chimera/Makefile b/www/chimera/Makefile
index 49980dac4219..854576428987 100644
--- a/www/chimera/Makefile
+++ b/www/chimera/Makefile
@@ -3,11 +3,11 @@
 # Date created:		26 December 1994
 # Whom:			asami
 #
-# $Id: Makefile,v 1.9 1995/05/27 04:48:30 asami Exp $
+# $Id: Makefile,v 1.10 1995/11/27 04:10:19 asami Exp $
 #
 
 DISTNAME=	chimera-1.65
-CATEGORIES+=	www
+CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.cs.unlv.edu/pub/chimera/
 
 MAINTAINER=	asami@FreeBSD.ORG
diff --git a/www/chimera2/Makefile b/www/chimera2/Makefile
index 49980dac4219..854576428987 100644
--- a/www/chimera2/Makefile
+++ b/www/chimera2/Makefile
@@ -3,11 +3,11 @@
 # Date created:		26 December 1994
 # Whom:			asami
 #
-# $Id: Makefile,v 1.9 1995/05/27 04:48:30 asami Exp $
+# $Id: Makefile,v 1.10 1995/11/27 04:10:19 asami Exp $
 #
 
 DISTNAME=	chimera-1.65
-CATEGORIES+=	www
+CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.cs.unlv.edu/pub/chimera/
 
 MAINTAINER=	asami@FreeBSD.ORG
diff --git a/www/comline/Makefile b/www/comline/Makefile
index 963c96f6f6ac..d8bd05f32188 100644
--- a/www/comline/Makefile
+++ b/www/comline/Makefile
@@ -3,12 +3,12 @@
 # Date created:         9 Dec 1995
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.4 1996/01/11 01:20:17 ache Exp $
+# $Id: Makefile,v 1.5 1996/02/19 23:38:33 ache Exp $
 #
 
 DISTNAME=	WWW
 PKGNAME=        comline-4.0D
-CATEGORIES+=	www
+CATEGORIES=	www
 MASTER_SITES=   ftp://ftp.w3.org/pub/comline/ \
 		ftp://ftp.w3.org/pub/libwww/
 DISTFILES=      libwww_4.0D_src.tar.gz \
diff --git a/www/gn/Makefile b/www/gn/Makefile
index 1ced1a568658..7d4a45360141 100644
--- a/www/gn/Makefile
+++ b/www/gn/Makefile
@@ -3,20 +3,20 @@
 # Date created:         20 Sep 1994
 # Whom:                 adam
 #
-# $Id: Makefile,v 1.15 1996/03/25 23:48:44 adam Exp $
+# $Id: Makefile,v 1.16 1996/11/13 11:49:04 adam Exp $
 #
 
 DISTNAME=       gn-2.24
-CATEGORIES+=	www net
+CATEGORIES=	www net
 MASTER_SITES=	ftp://ftp.acns.nwu.edu/pub/gn/
 
 MAINTAINER=	adam@veda.is
 
-WAISDIR=	${PORTSDIR}/net/wais/work/freeWAIS-0.5
 BUILD_DEPENDS=	${WAISDIR}/bin/waisindex:${PORTSDIR}/net/wais
 
 IS_INTERACTIVE=	yes
 NO_PACKAGE=	# compiled in hostnames
+WAISDIR=	${PORTSDIR}/net/wais/work/freeWAIS-0.5
 
 INETD_CONF=	/etc/inetd.conf
 CONF=	'	stream	tcp	nowait	nobody	/usr/local/libexec/gn	gn'
diff --git a/www/harvest/Makefile b/www/harvest/Makefile
index c8144ab5d1c3..cd41d135675f 100644
--- a/www/harvest/Makefile
+++ b/www/harvest/Makefile
@@ -3,12 +3,12 @@
 # Date created:		Fri Mar  1 19:43:52 MET 1996
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.2 1996/09/19 03:01:09 andreas Exp $
+# $Id: Makefile,v 1.3 1996/10/19 09:14:30 andreas Exp $
 #
 
 DISTNAME=	harvest-1.4.pl2
 PKGNAME=	harvest-1.4.2
-CATEGORIES+=	www
+CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.town.hall.org/pub/harvest/ \
 		ftp://ftp.cs.colorado.edu/pub/distribs/harvest/ \
 		ftp://ftp.ask.uni-karlsruhe.de/pub/infosystems/harvest/ \
diff --git a/www/libwww/Makefile b/www/libwww/Makefile
index c59213491f4e..5e1dca7380ad 100644
--- a/www/libwww/Makefile
+++ b/www/libwww/Makefile
@@ -3,12 +3,12 @@
 # Date created:		18 Feb 1996
 # Whom:			torstenb
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1996/03/06 18:50:26 torstenb Exp $
 #
 
 DISTNAME=	libwww_4.0D_src
 PKGNAME=	libwww-4.0D
-CATEGORIES+=	www devel
+CATEGORIES=	www devel
 MASTER_SITES=	ftp://ftp.w3.org/pub/libwww/
 
 WRKSRC=		${WRKDIR}/WWW
diff --git a/www/linemode/Makefile b/www/linemode/Makefile
index 84938a64706b..9544171ac55f 100644
--- a/www/linemode/Makefile
+++ b/www/linemode/Makefile
@@ -3,12 +3,12 @@
 # Date created:		17 April 1995
 # Whom:			NIIMI Satoshi <sa2c@and.or.jp>
 #
-# $Id: Makefile,v 1.10 1996/02/19 23:39:14 ache Exp $
+# $Id: Makefile,v 1.11 1996/03/09 06:42:02 peter Exp $
 #
 
 DISTNAME=	WWW
 PKGNAME=        linemode-4.0D
-CATEGORIES+=	www
+CATEGORIES=	www
 MASTER_SITES=   ftp://ftp.w3.org/pub/linemode/ \
 		ftp://ftp.w3.org/pub/libwww/
 DISTFILES=      libwww_4.0D_src.tar.gz \
diff --git a/www/lynx-current/Makefile b/www/lynx-current/Makefile
index f81bc8e07cea..53f9762e4041 100644
--- a/www/lynx-current/Makefile
+++ b/www/lynx-current/Makefile
@@ -5,12 +5,12 @@
 # Date created:         15 Dec 1994
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.29 1996/11/02 00:55:08 ache Exp $
+# $Id: Makefile,v 1.30 1996/11/11 05:30:54 ache Exp $
 #
 
 DISTNAME=       lynx2-6
 PKGNAME=        lynx-2.6
-CATEGORIES+=	www
+CATEGORIES=	www
 MASTER_SITES=   ftp://ftp2.cc.ukans.edu/pub/lynx/lynx2-6/ \
 		ftp://ftp.more.net/pub/mirrors/lynx/ \
 		http://www.mtsu.edu/~ripa0003/
diff --git a/www/lynx/Makefile b/www/lynx/Makefile
index f81bc8e07cea..53f9762e4041 100644
--- a/www/lynx/Makefile
+++ b/www/lynx/Makefile
@@ -5,12 +5,12 @@
 # Date created:         15 Dec 1994
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.29 1996/11/02 00:55:08 ache Exp $
+# $Id: Makefile,v 1.30 1996/11/11 05:30:54 ache Exp $
 #
 
 DISTNAME=       lynx2-6
 PKGNAME=        lynx-2.6
-CATEGORIES+=	www
+CATEGORIES=	www
 MASTER_SITES=   ftp://ftp2.cc.ukans.edu/pub/lynx/lynx2-6/ \
 		ftp://ftp.more.net/pub/mirrors/lynx/ \
 		http://www.mtsu.edu/~ripa0003/
diff --git a/www/mapedit/Makefile b/www/mapedit/Makefile
index 2faa5693a27a..41d7372c291e 100644
--- a/www/mapedit/Makefile
+++ b/www/mapedit/Makefile
@@ -3,12 +3,12 @@
 # Date created:         Sun Mar 17 17:59:48 MET 1996
 # Whom:                 Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.2 1996/09/19 03:01:17 andreas Exp $
+# $Id: Makefile,v 1.3 1996/10/19 09:15:56 andreas Exp $
 #
 
 DISTNAME=       mapedit1.5
 PKGNAME=        mapedit-1.5
-CATEGORIES+=	www
+CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.boutell.com/pub/boutell/mapedit/
 EXTRACT_SUFX=	.tar.Z
 
diff --git a/www/mod_php3/Makefile b/www/mod_php3/Makefile
index 8e41837a4172..a2f1deda54b7 100644
--- a/www/mod_php3/Makefile
+++ b/www/mod_php3/Makefile
@@ -3,12 +3,12 @@
 # Date created:         Fri Aug 25 16:42:36 CDT 1995
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.20 1996/11/07 01:49:46 ache Exp $
+# $Id: Makefile,v 1.21 1996/11/07 01:53:14 ache Exp $
 #
 
 DISTNAME=       apache_1.1.1
 PKGNAME=        apache-1.1.1
-CATEGORIES+=	www
+CATEGORIES=	www
 MASTER_SITES=   ftp://www.apache.org/apache/dist/
 
 MAINTAINER=	ache@freebsd.org
diff --git a/www/mod_php4/Makefile b/www/mod_php4/Makefile
index 8e41837a4172..a2f1deda54b7 100644
--- a/www/mod_php4/Makefile
+++ b/www/mod_php4/Makefile
@@ -3,12 +3,12 @@
 # Date created:         Fri Aug 25 16:42:36 CDT 1995
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.20 1996/11/07 01:49:46 ache Exp $
+# $Id: Makefile,v 1.21 1996/11/07 01:53:14 ache Exp $
 #
 
 DISTNAME=       apache_1.1.1
 PKGNAME=        apache-1.1.1
-CATEGORIES+=	www
+CATEGORIES=	www
 MASTER_SITES=   ftp://www.apache.org/apache/dist/
 
 MAINTAINER=	ache@freebsd.org
diff --git a/www/mod_php5/Makefile b/www/mod_php5/Makefile
index 8e41837a4172..a2f1deda54b7 100644
--- a/www/mod_php5/Makefile
+++ b/www/mod_php5/Makefile
@@ -3,12 +3,12 @@
 # Date created:         Fri Aug 25 16:42:36 CDT 1995
 # Whom:                 erich@rrnet.com
 #
-# $Id: Makefile,v 1.20 1996/11/07 01:49:46 ache Exp $
+# $Id: Makefile,v 1.21 1996/11/07 01:53:14 ache Exp $
 #
 
 DISTNAME=       apache_1.1.1
 PKGNAME=        apache-1.1.1
-CATEGORIES+=	www
+CATEGORIES=	www
 MASTER_SITES=   ftp://www.apache.org/apache/dist/
 
 MAINTAINER=	ache@freebsd.org
diff --git a/www/netscape3/Makefile b/www/netscape3/Makefile
index 5ffb0d9f56bf..411502d5827a 100644
--- a/www/netscape3/Makefile
+++ b/www/netscape3/Makefile
@@ -3,11 +3,11 @@
 # Date created:		21 August 1995
 # Whom:			asami
 #
-# $Id: Makefile,v 1.12 1996/11/07 00:03:04 ache Exp $
+# $Id: Makefile,v 1.13 1996/11/11 22:25:26 ache Exp $
 #
 
 DISTNAME=       netscape-3.01
-CATEGORIES+=	www
+CATEGORIES=	www
 .if defined(GOLD)
 MASTER_SITES=   ftp://ftp.netscape.com/pub/navigator/gold/3.01/unix/
 MD5_FILE=       ${FILESDIR}/md5.gold
@@ -22,6 +22,13 @@ MAINTAINER=     ache@FreeBSD.ORG
 RESTRICTED=	"Commercial software."
 NO_WRKSUBDIR=	yes
 
+pre-fetch:
+.if !defined(GOLD)
+	@${ECHO_MSG} "Note you can make the \"gold\" version by typing \"make GOLD=yes\"."
+.else
+	@${ECHO_MSG} "Making the \"gold\" version."
+.endif
+
 post-install:
 	@cat ${PKGDIR}/DESCR
 
diff --git a/www/squid/Makefile b/www/squid/Makefile
index 1877deaf360c..f72b25308657 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -3,12 +3,12 @@
 # Date created:		Thu Nov  7 00:53:18 WST 1996
 # Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.6 1996/11/12 08:38:31 peter Exp $
+# $Id: Makefile,v 1.7 1996/11/15 12:41:53 peter Exp $
 #
 
 DISTNAME=	squid-1.1.beta19
 PKGNAME=	squid-1.1b19
-CATEGORIES+=	www
+CATEGORIES=	www
 MASTER_SITES=  \
 	ftp://squid.nlanr.net/pub/squid-1.1.beta/ \
 	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-1.1.beta/ \
diff --git a/www/squid22/Makefile b/www/squid22/Makefile
index 1877deaf360c..f72b25308657 100644
--- a/www/squid22/Makefile
+++ b/www/squid22/Makefile
@@ -3,12 +3,12 @@
 # Date created:		Thu Nov  7 00:53:18 WST 1996
 # Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.6 1996/11/12 08:38:31 peter Exp $
+# $Id: Makefile,v 1.7 1996/11/15 12:41:53 peter Exp $
 #
 
 DISTNAME=	squid-1.1.beta19
 PKGNAME=	squid-1.1b19
-CATEGORIES+=	www
+CATEGORIES=	www
 MASTER_SITES=  \
 	ftp://squid.nlanr.net/pub/squid-1.1.beta/ \
 	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-1.1.beta/ \
diff --git a/www/squid23/Makefile b/www/squid23/Makefile
index 1877deaf360c..f72b25308657 100644
--- a/www/squid23/Makefile
+++ b/www/squid23/Makefile
@@ -3,12 +3,12 @@
 # Date created:		Thu Nov  7 00:53:18 WST 1996
 # Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.6 1996/11/12 08:38:31 peter Exp $
+# $Id: Makefile,v 1.7 1996/11/15 12:41:53 peter Exp $
 #
 
 DISTNAME=	squid-1.1.beta19
 PKGNAME=	squid-1.1b19
-CATEGORIES+=	www
+CATEGORIES=	www
 MASTER_SITES=  \
 	ftp://squid.nlanr.net/pub/squid-1.1.beta/ \
 	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-1.1.beta/ \
diff --git a/www/squid24/Makefile b/www/squid24/Makefile
index 1877deaf360c..f72b25308657 100644
--- a/www/squid24/Makefile
+++ b/www/squid24/Makefile
@@ -3,12 +3,12 @@
 # Date created:		Thu Nov  7 00:53:18 WST 1996
 # Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.6 1996/11/12 08:38:31 peter Exp $
+# $Id: Makefile,v 1.7 1996/11/15 12:41:53 peter Exp $
 #
 
 DISTNAME=	squid-1.1.beta19
 PKGNAME=	squid-1.1b19
-CATEGORIES+=	www
+CATEGORIES=	www
 MASTER_SITES=  \
 	ftp://squid.nlanr.net/pub/squid-1.1.beta/ \
 	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-1.1.beta/ \
diff --git a/www/squid25/Makefile b/www/squid25/Makefile
index 1877deaf360c..f72b25308657 100644
--- a/www/squid25/Makefile
+++ b/www/squid25/Makefile
@@ -3,12 +3,12 @@
 # Date created:		Thu Nov  7 00:53:18 WST 1996
 # Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.6 1996/11/12 08:38:31 peter Exp $
+# $Id: Makefile,v 1.7 1996/11/15 12:41:53 peter Exp $
 #
 
 DISTNAME=	squid-1.1.beta19
 PKGNAME=	squid-1.1b19
-CATEGORIES+=	www
+CATEGORIES=	www
 MASTER_SITES=  \
 	ftp://squid.nlanr.net/pub/squid-1.1.beta/ \
 	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-1.1.beta/ \
diff --git a/www/squid26/Makefile b/www/squid26/Makefile
index 1877deaf360c..f72b25308657 100644
--- a/www/squid26/Makefile
+++ b/www/squid26/Makefile
@@ -3,12 +3,12 @@
 # Date created:		Thu Nov  7 00:53:18 WST 1996
 # Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.6 1996/11/12 08:38:31 peter Exp $
+# $Id: Makefile,v 1.7 1996/11/15 12:41:53 peter Exp $
 #
 
 DISTNAME=	squid-1.1.beta19
 PKGNAME=	squid-1.1b19
-CATEGORIES+=	www
+CATEGORIES=	www
 MASTER_SITES=  \
 	ftp://squid.nlanr.net/pub/squid-1.1.beta/ \
 	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-1.1.beta/ \
diff --git a/www/squid27/Makefile b/www/squid27/Makefile
index 1877deaf360c..f72b25308657 100644
--- a/www/squid27/Makefile
+++ b/www/squid27/Makefile
@@ -3,12 +3,12 @@
 # Date created:		Thu Nov  7 00:53:18 WST 1996
 # Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.6 1996/11/12 08:38:31 peter Exp $
+# $Id: Makefile,v 1.7 1996/11/15 12:41:53 peter Exp $
 #
 
 DISTNAME=	squid-1.1.beta19
 PKGNAME=	squid-1.1b19
-CATEGORIES+=	www
+CATEGORIES=	www
 MASTER_SITES=  \
 	ftp://squid.nlanr.net/pub/squid-1.1.beta/ \
 	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-1.1.beta/ \
diff --git a/www/squid30/Makefile b/www/squid30/Makefile
index 1877deaf360c..f72b25308657 100644
--- a/www/squid30/Makefile
+++ b/www/squid30/Makefile
@@ -3,12 +3,12 @@
 # Date created:		Thu Nov  7 00:53:18 WST 1996
 # Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.6 1996/11/12 08:38:31 peter Exp $
+# $Id: Makefile,v 1.7 1996/11/15 12:41:53 peter Exp $
 #
 
 DISTNAME=	squid-1.1.beta19
 PKGNAME=	squid-1.1b19
-CATEGORIES+=	www
+CATEGORIES=	www
 MASTER_SITES=  \
 	ftp://squid.nlanr.net/pub/squid-1.1.beta/ \
 	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-1.1.beta/ \
diff --git a/www/squid31/Makefile b/www/squid31/Makefile
index 1877deaf360c..f72b25308657 100644
--- a/www/squid31/Makefile
+++ b/www/squid31/Makefile
@@ -3,12 +3,12 @@
 # Date created:		Thu Nov  7 00:53:18 WST 1996
 # Whom:			Peter Wemm <peter@freebsd.org>
 #
-# $Id: Makefile,v 1.6 1996/11/12 08:38:31 peter Exp $
+# $Id: Makefile,v 1.7 1996/11/15 12:41:53 peter Exp $
 #
 
 DISTNAME=	squid-1.1.beta19
 PKGNAME=	squid-1.1b19
-CATEGORIES+=	www
+CATEGORIES=	www
 MASTER_SITES=  \
 	ftp://squid.nlanr.net/pub/squid-1.1.beta/ \
 	ftp://www.unimelb.edu.au/pub/cwis/servers/unix/squid/squid-1.1.beta/ \
diff --git a/www/w3c-httpd/Makefile b/www/w3c-httpd/Makefile
index 2987c67e93de..d3c47b2fbc47 100644
--- a/www/w3c-httpd/Makefile
+++ b/www/w3c-httpd/Makefile
@@ -3,12 +3,12 @@
 # Date created:		29 October 1994
 # Whom:			pst
 #
-# $Id: Makefile,v 1.10 1995/12/10 18:51:56 ache Exp $
+# $Id: Makefile,v 1.11 1996/03/09 06:35:38 peter Exp $
 #
 
 DISTNAME=	WWW
 PKGNAME=	w3c_httpd-3.0
-CATEGORIES+=	www
+CATEGORIES=	www
 MASTER_SITES=   ftp://ftp.w3.org/pub/httpd/ \
 		ftp://ftp.w3.org/pub/libwww/
 DISTFILES=      libwww_2.17_src.tar.Z \
diff --git a/www/webcopy/Makefile b/www/webcopy/Makefile
index b4fdde003a95..bd4869f3576d 100644
--- a/www/webcopy/Makefile
+++ b/www/webcopy/Makefile
@@ -3,13 +3,13 @@
 # Date created:         14 Sep 1996
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.3 1996/09/15 16:41:28 ache Exp $
+# $Id: Makefile,v 1.4 1996/11/06 13:12:38 asami Exp $
 #
 
 # WWW site: http://www.inf.utfsm.cl/~vparada/webcopy.html
 
 DISTNAME=       webcopy-0.98b7
-CATEGORIES+=    www
+CATEGORIES=     www
 MASTER_SITES=   ftp://ftp.inf.utfsm.cl/pub/utfsm/perl/
 DISTFILES=      webcopy.tgz
 
diff --git a/www/weblint/Makefile b/www/weblint/Makefile
index 35f2011ca23a..41606091a8cc 100644
--- a/www/weblint/Makefile
+++ b/www/weblint/Makefile
@@ -3,11 +3,11 @@
 # Date created:		Oct 14, 1995
 # Whom:			pst
 #
-# $Id: Makefile,v 1.4 1995/11/27 04:10:33 asami Exp $
+# $Id: Makefile,v 1.5 1996/07/20 22:30:35 pst Exp $
 #
 
 DISTNAME=	weblint-1.017
-CATEGORIES+=	www
+CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.khoral.com/pub/weblint/
 
 MAINTAINER=	pst@FreeBSD.ORG
diff --git a/www/wn/Makefile b/www/wn/Makefile
index 7ec5d3c46450..d15084ab7aba 100644
--- a/www/wn/Makefile
+++ b/www/wn/Makefile
@@ -3,11 +3,11 @@
 # Date created:         4 May 1995
 # Whom:                 adam
 #
-# $Id: Makefile,v 1.14 1996/08/29 04:17:11 adam Exp $
+# $Id: Makefile,v 1.15 1996/11/01 15:04:58 adam Exp $
 #
 
 DISTNAME=       wn-1.16.1
-CATEGORIES+=	www
+CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.acns.nwu.edu/pub/wn/
 
 IS_INTERACTIVE=
diff --git a/www/wwwcount/Makefile b/www/wwwcount/Makefile
index abd82eb37210..92918d381c17 100644
--- a/www/wwwcount/Makefile
+++ b/www/wwwcount/Makefile
@@ -3,7 +3,7 @@
 # Date created:         16 May 1996
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.6 1996/09/11 04:44:19 asami Exp $
+# $Id: Makefile,v 1.7 1996/11/13 12:41:34 asami Exp $
 #
 
 # WWW site: http://www.fccc.edu/users/muquit/Count.html
@@ -12,7 +12,7 @@
 
 DISTNAME=       wwwcount2.3
 PKGNAME=        wwwcount-2.3
-CATEGORIES+=    www
+CATEGORIES=     www
 MASTER_SITES=   http://www.fccc.edu/users/muquit/src/wwwcount2.3/
 
 MAINTAINER=     ache@FreeBSD.ORG
diff --git a/x11-clocks/dclock/Makefile b/x11-clocks/dclock/Makefile
index 0706335f8b90..8b3b35334514 100644
--- a/x11-clocks/dclock/Makefile
+++ b/x11-clocks/dclock/Makefile
@@ -3,12 +3,12 @@
 # Date created:		15 Aug 1996
 # Whom:			David Leonard <leonard@dstc.edu.au>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1996/08/16 07:39:56 asami Exp $
 #
 
 DISTNAME=	dclock
 PKGNAME=	dclock-pl4
-CATEGORIES+=	x11
+CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.ucs.ubc.ca/pub/old/X11/contrib/ \
 		ftp://pdq.coe.montana.edu/pub/mirrors/X11-contrib/ \
 		ftp://ftp.pasteur.fr/pub/computing/unix/X11/R5contrib/
diff --git a/x11-clocks/emiclock/Makefile b/x11-clocks/emiclock/Makefile
index 8a3307cdc264..1d06b6ecfe72 100644
--- a/x11-clocks/emiclock/Makefile
+++ b/x11-clocks/emiclock/Makefile
@@ -3,12 +3,12 @@
 # Date created:		15 March 1995
 # Whom:			Nobuhiro Yasutomi
 #
-# $Id: Makefile,v 1.4 1995/04/12 20:31:01 asami Exp $
+# $Id: Makefile,v 1.5 1995/05/13 11:08:07 asami Exp $
 #
 
 DISTNAME=	EmiClock-1.0.2
 PKGNAME=	emiclock-1.0.2
-CATEGORIES+=	x11
+CATEGORIES=	x11
 MASTER_SITES=	ftp://theta.iis.u-tokyo.ac.jp/pub1/X/contrib/applications/ \
 		ftp://sunsite.unc.edu/pub/X11/contrib/applications/
 
diff --git a/x11-clocks/swisswatch/Makefile b/x11-clocks/swisswatch/Makefile
index 0467e8ffb2e7..a3fca6d46cc2 100644
--- a/x11-clocks/swisswatch/Makefile
+++ b/x11-clocks/swisswatch/Makefile
@@ -3,11 +3,11 @@
 # Date created:         16 December 1995
 # Whom:                 Yoshiro MIHIRA <sanpei@yy.cs.keio.ac.jp>
 #
-# $Id: Makefile,v 1.1.1.1 1996/06/20 18:54:07 jkh Exp $
+# $Id: Makefile,v 1.2 1996/08/01 04:36:52 asami Exp $
 #
 
 DISTNAME=	swisswatch-0.06
-CATEGORIES+=	x11
+CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.iij.ad.jp/pub/X/R5contrib/
 EXTRACT_SUFX=	.tar.Z
 
diff --git a/x11-fonts/freefonts/Makefile b/x11-fonts/freefonts/Makefile
index 9ccbf1dac6fa..bca4e23647ec 100644
--- a/x11-fonts/freefonts/Makefile
+++ b/x11-fonts/freefonts/Makefile
@@ -3,11 +3,11 @@
 # Date created:         Thu Aug  1 21:32:14 CDT 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.1.1.1 1996/08/16 13:38:33 erich Exp $
+# $Id: Makefile,v 1.2 1996/08/17 10:59:08 asami Exp $
 #
 
 DISTNAME=	freefonts-0.10
-CATEGORIES+=	x11
+CATEGORIES=	x11
 MASTER_SITES=	ftp://scam.xcf.berkeley.edu/pub/gimp/
 
 MAINTAINER=	erich@FreeBSD.org
diff --git a/x11-fonts/getbdf/Makefile b/x11-fonts/getbdf/Makefile
index 263213ba9cb9..e4c2a9413a3e 100644
--- a/x11-fonts/getbdf/Makefile
+++ b/x11-fonts/getbdf/Makefile
@@ -3,12 +3,12 @@
 # Date created:         30 August 1996
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.2 1996/08/30 22:26:49 ache Exp $
+# $Id: Makefile,v 1.3 1996/08/31 05:11:40 asami Exp $
 #
 
 DISTNAME=       getbdf
 PKGNAME=        getbdf-1.0
-CATEGORIES+=	x11
+CATEGORIES=	x11
 MASTER_SITES=   ftp://ftp.ipa.fhg.de/pub/X/
 EXTRACT_SUFX=   .tar.Z
 
diff --git a/x11-fonts/xfed/Makefile b/x11-fonts/xfed/Makefile
index ce1c794daa89..82332917ead8 100644
--- a/x11-fonts/xfed/Makefile
+++ b/x11-fonts/xfed/Makefile
@@ -3,12 +3,12 @@
 # Date created:         7 December 1994
 # Whom:                 asami
 #
-# $Id: Makefile,v 1.10 1996/03/07 01:57:29 asami Exp $
+# $Id: Makefile,v 1.11 1996/06/26 23:06:49 gpalmer Exp $
 #
 
 DISTNAME=	xfed
 PKGNAME=	xfed-1.0
-CATEGORIES+=	x11
+CATEGORIES=	x11
 
 MAINTAINER=	asami@FreeBSD.ORG
 
diff --git a/x11-toolkits/FWF/Makefile b/x11-toolkits/FWF/Makefile
index 74e6aee78c13..4ff9d4f5726b 100644
--- a/x11-toolkits/FWF/Makefile
+++ b/x11-toolkits/FWF/Makefile
@@ -3,11 +3,11 @@
 # Date created:		14 July 1995
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.6 1996/05/15 23:30:26 asami Exp $
+# $Id: Makefile,v 1.7 1996/09/26 09:02:51 asami Exp $
 #
 
 DISTNAME=	fwf-3.8
-CATEGORIES+=	x11
+CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.let.rug.nl/pub/FWF/
 
 MAINTAINER=	jkh@FreeBSD.ORG
diff --git a/x11-toolkits/blt/Makefile b/x11-toolkits/blt/Makefile
index d1aca853e329..8e783f0736b4 100644
--- a/x11-toolkits/blt/Makefile
+++ b/x11-toolkits/blt/Makefile
@@ -3,17 +3,17 @@
 # Date created:		3 August 1996
 # Whom:			lukin <lukin@okbmei.msk.su>
 #
-# $Id: Makefile,v 1.9 1996/10/16 08:32:05 asami Exp $
+# $Id: Makefile,v 1.10 1996/11/13 12:41:36 asami Exp $
 #
 
 DISTNAME=	blt-2.1
-CATEGORIES+=	x11
+CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.neosoft.com/pub/tcl/NEW/
 DISTFILES=	BLT2.1.tar.gz
 
 MAINTAINER=	lukin@okbmei.msk.su
 
-LIB_DEPENDS=	tk41\\.:${PORTSDIR}/x11/tk41
+LIB_DEPENDS=	tk41\\.1:${PORTSDIR}/x11/tk41
 
 WRKSRC=		${WRKDIR}/blt2.1
 GNU_CONFIGURE=	yes
diff --git a/x11-toolkits/qt145/Makefile b/x11-toolkits/qt145/Makefile
index 4dc3eea7e52d..1ea65f0a99bb 100644
--- a/x11-toolkits/qt145/Makefile
+++ b/x11-toolkits/qt145/Makefile
@@ -3,11 +3,11 @@
 # Date created:		30 Jul 1996
 # Whom:			searle@longacre.demon.co.uk
 #
-# $Id: Makefile,v 1.5 1996/10/11 22:10:23 chuckr Exp $
+# $Id: Makefile,v 1.6 1996/11/13 12:41:39 asami Exp $
 #
 
 DISTNAME=	qt-1.0
-CATEGORIES+=	x11
+CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.troll.no/qt/source/
 
 MAINTAINER=	searle@longacre.demon.co.uk
diff --git a/x11-toolkits/qt22/Makefile b/x11-toolkits/qt22/Makefile
index 4dc3eea7e52d..1ea65f0a99bb 100644
--- a/x11-toolkits/qt22/Makefile
+++ b/x11-toolkits/qt22/Makefile
@@ -3,11 +3,11 @@
 # Date created:		30 Jul 1996
 # Whom:			searle@longacre.demon.co.uk
 #
-# $Id: Makefile,v 1.5 1996/10/11 22:10:23 chuckr Exp $
+# $Id: Makefile,v 1.6 1996/11/13 12:41:39 asami Exp $
 #
 
 DISTNAME=	qt-1.0
-CATEGORIES+=	x11
+CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.troll.no/qt/source/
 
 MAINTAINER=	searle@longacre.demon.co.uk
diff --git a/x11-toolkits/qt23/Makefile b/x11-toolkits/qt23/Makefile
index 4dc3eea7e52d..1ea65f0a99bb 100644
--- a/x11-toolkits/qt23/Makefile
+++ b/x11-toolkits/qt23/Makefile
@@ -3,11 +3,11 @@
 # Date created:		30 Jul 1996
 # Whom:			searle@longacre.demon.co.uk
 #
-# $Id: Makefile,v 1.5 1996/10/11 22:10:23 chuckr Exp $
+# $Id: Makefile,v 1.6 1996/11/13 12:41:39 asami Exp $
 #
 
 DISTNAME=	qt-1.0
-CATEGORIES+=	x11
+CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.troll.no/qt/source/
 
 MAINTAINER=	searle@longacre.demon.co.uk
diff --git a/x11-toolkits/qt30/Makefile b/x11-toolkits/qt30/Makefile
index 4dc3eea7e52d..1ea65f0a99bb 100644
--- a/x11-toolkits/qt30/Makefile
+++ b/x11-toolkits/qt30/Makefile
@@ -3,11 +3,11 @@
 # Date created:		30 Jul 1996
 # Whom:			searle@longacre.demon.co.uk
 #
-# $Id: Makefile,v 1.5 1996/10/11 22:10:23 chuckr Exp $
+# $Id: Makefile,v 1.6 1996/11/13 12:41:39 asami Exp $
 #
 
 DISTNAME=	qt-1.0
-CATEGORIES+=	x11
+CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.troll.no/qt/source/
 
 MAINTAINER=	searle@longacre.demon.co.uk
diff --git a/x11-toolkits/qt31/Makefile b/x11-toolkits/qt31/Makefile
index 4dc3eea7e52d..1ea65f0a99bb 100644
--- a/x11-toolkits/qt31/Makefile
+++ b/x11-toolkits/qt31/Makefile
@@ -3,11 +3,11 @@
 # Date created:		30 Jul 1996
 # Whom:			searle@longacre.demon.co.uk
 #
-# $Id: Makefile,v 1.5 1996/10/11 22:10:23 chuckr Exp $
+# $Id: Makefile,v 1.6 1996/11/13 12:41:39 asami Exp $
 #
 
 DISTNAME=	qt-1.0
-CATEGORIES+=	x11
+CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.troll.no/qt/source/
 
 MAINTAINER=	searle@longacre.demon.co.uk
diff --git a/x11-toolkits/qt32/Makefile b/x11-toolkits/qt32/Makefile
index 4dc3eea7e52d..1ea65f0a99bb 100644
--- a/x11-toolkits/qt32/Makefile
+++ b/x11-toolkits/qt32/Makefile
@@ -3,11 +3,11 @@
 # Date created:		30 Jul 1996
 # Whom:			searle@longacre.demon.co.uk
 #
-# $Id: Makefile,v 1.5 1996/10/11 22:10:23 chuckr Exp $
+# $Id: Makefile,v 1.6 1996/11/13 12:41:39 asami Exp $
 #
 
 DISTNAME=	qt-1.0
-CATEGORIES+=	x11
+CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.troll.no/qt/source/
 
 MAINTAINER=	searle@longacre.demon.co.uk
diff --git a/x11-toolkits/qt33/Makefile b/x11-toolkits/qt33/Makefile
index 4dc3eea7e52d..1ea65f0a99bb 100644
--- a/x11-toolkits/qt33/Makefile
+++ b/x11-toolkits/qt33/Makefile
@@ -3,11 +3,11 @@
 # Date created:		30 Jul 1996
 # Whom:			searle@longacre.demon.co.uk
 #
-# $Id: Makefile,v 1.5 1996/10/11 22:10:23 chuckr Exp $
+# $Id: Makefile,v 1.6 1996/11/13 12:41:39 asami Exp $
 #
 
 DISTNAME=	qt-1.0
-CATEGORIES+=	x11
+CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.troll.no/qt/source/
 
 MAINTAINER=	searle@longacre.demon.co.uk
diff --git a/x11-toolkits/xforms/Makefile b/x11-toolkits/xforms/Makefile
index b5dfa7b177b1..5a9d93be9695 100644
--- a/x11-toolkits/xforms/Makefile
+++ b/x11-toolkits/xforms/Makefile
@@ -3,12 +3,12 @@
 # Date created:		29 June 1996
 # Whom:			gena
 #
-# $Id: Makefile,v 1.4 1996/05/08 06:11:12 jkh Exp $
+# $Id: Makefile,v 1.5 1996/07/12 11:38:14 asami Exp $
 #
 
 DISTNAME=	bxform-081
 PKGNAME=	xforms-0.81
-CATEGORIES+=	graphics x11
+CATEGORIES=	graphics x11
 MASTER_SITES=	ftp://laue.phys.uwm.edu/pub/xforms/freeBSD/
 EXTRACT_SUFX=	.tgz
 
diff --git a/x11-wm/afterstep-stable/Makefile b/x11-wm/afterstep-stable/Makefile
index f71d34bf5b84..bef67c3be828 100644
--- a/x11-wm/afterstep-stable/Makefile
+++ b/x11-wm/afterstep-stable/Makefile
@@ -3,12 +3,12 @@
 # Date created:		October 29th 1996
 # Whom:			jfitz@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.11 1996/10/09 04:53:23 jfitz Exp $
+# $Id: Makefile,v 1.12 1996/10/29 19:50:11 jfitz Exp $
 #
 
 DISTNAME=	as-10pre1
 PKGNAME=	afterstep-1.0pr1
-CATEGORIES+=	x11
+CATEGORIES=	x11
 MASTER_SITES=	ftp://oak.sfasu.edu/pub/AfterStep/
 
 MAINTAINER=	jfitz@FreeBSD.ORG
diff --git a/x11-wm/afterstep/Makefile b/x11-wm/afterstep/Makefile
index f71d34bf5b84..bef67c3be828 100644
--- a/x11-wm/afterstep/Makefile
+++ b/x11-wm/afterstep/Makefile
@@ -3,12 +3,12 @@
 # Date created:		October 29th 1996
 # Whom:			jfitz@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.11 1996/10/09 04:53:23 jfitz Exp $
+# $Id: Makefile,v 1.12 1996/10/29 19:50:11 jfitz Exp $
 #
 
 DISTNAME=	as-10pre1
 PKGNAME=	afterstep-1.0pr1
-CATEGORIES+=	x11
+CATEGORIES=	x11
 MASTER_SITES=	ftp://oak.sfasu.edu/pub/AfterStep/
 
 MAINTAINER=	jfitz@FreeBSD.ORG
diff --git a/x11-wm/fvwm2-beta/Makefile b/x11-wm/fvwm2-beta/Makefile
index 9298302b8486..8ea286c7b4e7 100644
--- a/x11-wm/fvwm2-beta/Makefile
+++ b/x11-wm/fvwm2-beta/Makefile
@@ -3,11 +3,11 @@
 # Date created:		20 Jan 1996
 # Whom:			peter
 #
-# $Id: Makefile,v 1.2 1996/03/11 14:17:57 peter Exp $
+# $Id: Makefile,v 1.3 1996/07/22 04:52:15 pst Exp $
 #
 
 DISTNAME=	fvwm-2.0.43
-CATEGORIES+=	x11
+CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.hpc.uh.edu/pub/fvwm/version-2/
 
 MAINTAINER=	peter@FreeBSD.org
diff --git a/x11-wm/fvwm2-devel/Makefile b/x11-wm/fvwm2-devel/Makefile
index 9298302b8486..8ea286c7b4e7 100644
--- a/x11-wm/fvwm2-devel/Makefile
+++ b/x11-wm/fvwm2-devel/Makefile
@@ -3,11 +3,11 @@
 # Date created:		20 Jan 1996
 # Whom:			peter
 #
-# $Id: Makefile,v 1.2 1996/03/11 14:17:57 peter Exp $
+# $Id: Makefile,v 1.3 1996/07/22 04:52:15 pst Exp $
 #
 
 DISTNAME=	fvwm-2.0.43
-CATEGORIES+=	x11
+CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.hpc.uh.edu/pub/fvwm/version-2/
 
 MAINTAINER=	peter@FreeBSD.org
diff --git a/x11-wm/fvwm2-i18n/Makefile b/x11-wm/fvwm2-i18n/Makefile
index 9298302b8486..8ea286c7b4e7 100644
--- a/x11-wm/fvwm2-i18n/Makefile
+++ b/x11-wm/fvwm2-i18n/Makefile
@@ -3,11 +3,11 @@
 # Date created:		20 Jan 1996
 # Whom:			peter
 #
-# $Id: Makefile,v 1.2 1996/03/11 14:17:57 peter Exp $
+# $Id: Makefile,v 1.3 1996/07/22 04:52:15 pst Exp $
 #
 
 DISTNAME=	fvwm-2.0.43
-CATEGORIES+=	x11
+CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.hpc.uh.edu/pub/fvwm/version-2/
 
 MAINTAINER=	peter@FreeBSD.org
diff --git a/x11-wm/fvwm2/Makefile b/x11-wm/fvwm2/Makefile
index 9298302b8486..8ea286c7b4e7 100644
--- a/x11-wm/fvwm2/Makefile
+++ b/x11-wm/fvwm2/Makefile
@@ -3,11 +3,11 @@
 # Date created:		20 Jan 1996
 # Whom:			peter
 #
-# $Id: Makefile,v 1.2 1996/03/11 14:17:57 peter Exp $
+# $Id: Makefile,v 1.3 1996/07/22 04:52:15 pst Exp $
 #
 
 DISTNAME=	fvwm-2.0.43
-CATEGORIES+=	x11
+CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.hpc.uh.edu/pub/fvwm/version-2/
 
 MAINTAINER=	peter@FreeBSD.org
diff --git a/x11-wm/fvwm24/Makefile b/x11-wm/fvwm24/Makefile
index 9298302b8486..8ea286c7b4e7 100644
--- a/x11-wm/fvwm24/Makefile
+++ b/x11-wm/fvwm24/Makefile
@@ -3,11 +3,11 @@
 # Date created:		20 Jan 1996
 # Whom:			peter
 #
-# $Id: Makefile,v 1.2 1996/03/11 14:17:57 peter Exp $
+# $Id: Makefile,v 1.3 1996/07/22 04:52:15 pst Exp $
 #
 
 DISTNAME=	fvwm-2.0.43
-CATEGORIES+=	x11
+CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.hpc.uh.edu/pub/fvwm/version-2/
 
 MAINTAINER=	peter@FreeBSD.org
diff --git a/x11-wm/fvwm95-i18n/Makefile b/x11-wm/fvwm95-i18n/Makefile
index 29eed26c5b1f..a53857d48f37 100644
--- a/x11-wm/fvwm95-i18n/Makefile
+++ b/x11-wm/fvwm95-i18n/Makefile
@@ -3,11 +3,11 @@
 # Date created:		Wed Apr 10 21:57:17 MET DST 1996
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.4 1996/09/19 03:00:59 andreas Exp $
+# $Id: Makefile,v 1.5 1996/10/19 09:13:13 andreas Exp $
 #
 
 DISTNAME=	fvwm95-2.0.41f
-CATEGORIES+=	x11
+CATEGORIES=	x11
 MASTER_SITES=	ftp://mitac11.uia.ac.be/pub/
 EXTRACT_SUFX=	.tgz
 
diff --git a/x11-wm/fvwm95/Makefile b/x11-wm/fvwm95/Makefile
index 29eed26c5b1f..a53857d48f37 100644
--- a/x11-wm/fvwm95/Makefile
+++ b/x11-wm/fvwm95/Makefile
@@ -3,11 +3,11 @@
 # Date created:		Wed Apr 10 21:57:17 MET DST 1996
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.4 1996/09/19 03:00:59 andreas Exp $
+# $Id: Makefile,v 1.5 1996/10/19 09:13:13 andreas Exp $
 #
 
 DISTNAME=	fvwm95-2.0.41f
-CATEGORIES+=	x11
+CATEGORIES=	x11
 MASTER_SITES=	ftp://mitac11.uia.ac.be/pub/
 EXTRACT_SUFX=	.tgz
 
diff --git a/x11-wm/olvwm/Makefile b/x11-wm/olvwm/Makefile
index 6c4980b28814..7b29da65ffda 100644
--- a/x11-wm/olvwm/Makefile
+++ b/x11-wm/olvwm/Makefile
@@ -8,7 +8,7 @@
 
 DISTNAME=	olvwm4
 PKGNAME=	olvwm-4.1
-CATEGORIES+=	x11
+CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.x.org/R5contrib/
 DISTFILES=	olvwm4.tar.Z
 
diff --git a/x11-wm/piewm/Makefile b/x11-wm/piewm/Makefile
index a40df0b68684..3b650c7ee673 100644
--- a/x11-wm/piewm/Makefile
+++ b/x11-wm/piewm/Makefile
@@ -3,12 +3,12 @@
 # Date created:		24 November 1994
 # Whom:			asami
 #
-# $Id: Makefile,v 1.8 1995/04/01 12:51:03 jkh Exp $
+# $Id: Makefile,v 1.9 1995/04/12 20:31:20 asami Exp $
 #
 
 DISTNAME=	piewm
 PKGNAME=	piewm-1.0
-CATEGORIES+=	x11
+CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.x.org/R5contrib/
 EXTRACT_SUFX=	.tar.Z
 
diff --git a/x11/blast/Makefile b/x11/blast/Makefile
index 6f6d4c982299..275112ac6664 100644
--- a/x11/blast/Makefile
+++ b/x11/blast/Makefile
@@ -3,12 +3,12 @@
 # Date created:         9 Jul 1996
 # Whom:            searle
 #
-# $Id: Makefile,v 1.2 1996/08/03 22:39:17 chuckr Exp $
+# $Id: Makefile,v 1.3 1996/11/13 12:41:35 asami Exp $
 #
 
 DISTNAME=	blast-1.0-ss-9.03
 PKGNAME=	blast-1.0
-CATEGORIES+=	x11
+CATEGORIES=	x11
 MASTER_SITES=	ftp://hpux.csc.liv.ac.uk/hpux/X11/Demos/blast-1.0/ \
 		ftp://ftp.ask.uni-karlsruhe.de/pub/hpux/X11/Demos/blast-1.0/ \
 		ftp://ftp.univie.ac.at/systems/hpux/hpux/X11/Demos/blast-1.0/ \
diff --git a/x11/rxvt-devel/Makefile b/x11/rxvt-devel/Makefile
index f818154687a9..c18efda1492f 100644
--- a/x11/rxvt-devel/Makefile
+++ b/x11/rxvt-devel/Makefile
@@ -3,11 +3,11 @@
 # Date created:		5th December 1994
 # Whom:			gpalmer@FreeBSD.org
 #
-# $Id: Makefile,v 1.7 1995/04/12 20:31:23 asami Exp $
+# $Id: Makefile,v 1.8 1996/10/15 19:24:55 asami Exp $
 #
 
 DISTNAME=	rxvt-2.09
-CATEGORIES+=	x11
+CATEGORIES=	x11
 MASTER_SITES=	ftp://iraun1.ira.uka.de/pub/x11/misc/
 
 MAINTAINER=	gpalmer@FreeBSD.ORG
diff --git a/x11/rxvt-unicode/Makefile b/x11/rxvt-unicode/Makefile
index f818154687a9..c18efda1492f 100644
--- a/x11/rxvt-unicode/Makefile
+++ b/x11/rxvt-unicode/Makefile
@@ -3,11 +3,11 @@
 # Date created:		5th December 1994
 # Whom:			gpalmer@FreeBSD.org
 #
-# $Id: Makefile,v 1.7 1995/04/12 20:31:23 asami Exp $
+# $Id: Makefile,v 1.8 1996/10/15 19:24:55 asami Exp $
 #
 
 DISTNAME=	rxvt-2.09
-CATEGORIES+=	x11
+CATEGORIES=	x11
 MASTER_SITES=	ftp://iraun1.ira.uka.de/pub/x11/misc/
 
 MAINTAINER=	gpalmer@FreeBSD.ORG
diff --git a/x11/rxvt/Makefile b/x11/rxvt/Makefile
index f818154687a9..c18efda1492f 100644
--- a/x11/rxvt/Makefile
+++ b/x11/rxvt/Makefile
@@ -3,11 +3,11 @@
 # Date created:		5th December 1994
 # Whom:			gpalmer@FreeBSD.org
 #
-# $Id: Makefile,v 1.7 1995/04/12 20:31:23 asami Exp $
+# $Id: Makefile,v 1.8 1996/10/15 19:24:55 asami Exp $
 #
 
 DISTNAME=	rxvt-2.09
-CATEGORIES+=	x11
+CATEGORIES=	x11
 MASTER_SITES=	ftp://iraun1.ira.uka.de/pub/x11/misc/
 
 MAINTAINER=	gpalmer@FreeBSD.ORG
diff --git a/x11/sxpc/Makefile b/x11/sxpc/Makefile
index 7da5c7d4fe86..a7639840fd22 100644
--- a/x11/sxpc/Makefile
+++ b/x11/sxpc/Makefile
@@ -3,11 +3,11 @@
 # Date created:		22nd March 1995
 # Whom:			jkh@FreeBSD.org
 #
-# $Id: Makefile,v 1.2 1995/04/01 12:51:06 jkh Exp $
+# $Id: Makefile,v 1.3 1995/04/12 20:31:27 asami Exp $
 #
 
 DISTNAME=	sxpc-1.4
-CATEGORIES+=	x11
+CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.x.org/R5contrib/
 EXTRACT_SUFX=	.shar.Z
 
diff --git a/x11/tkgoodstuff/Makefile b/x11/tkgoodstuff/Makefile
index d3d8eef6df1c..9386240e1d10 100644
--- a/x11/tkgoodstuff/Makefile
+++ b/x11/tkgoodstuff/Makefile
@@ -3,12 +3,12 @@
 # Date created:		7 Oct 1996
 # Whom:			pst
 #
-# $Id: Makefile,v 1.2 1996/10/10 05:50:17 pst Exp $
+# $Id: Makefile,v 1.3 1996/10/16 01:36:33 asami Exp $
 #
 
 DISTNAME=	tkgoodstuff4.1
 PKGNAME=	tkgoodstuff-4.1
-CATEGORIES+=	x11
+CATEGORIES=	x11
 MASTER_SITES=	ftp://merv.philosophy.lsa.umich.edu/pub/
 EXTRACT_SUFX=	.tgz
 
diff --git a/x11/xcolors/Makefile b/x11/xcolors/Makefile
index 7c04d0c26060..e5834595eb21 100644
--- a/x11/xcolors/Makefile
+++ b/x11/xcolors/Makefile
@@ -3,12 +3,12 @@
 # Date created:		10 May 1995
 # Whom:			asami
 #
-# $Id: Makefile,v 1.3 1996/03/07 01:52:45 asami Exp $
+# $Id: Makefile,v 1.4 1996/11/01 05:03:47 asami Exp $
 #
 
 DISTNAME=	xcolors
 PKGNAME=	xcolors-1.3
-CATEGORIES+=	x11
+CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.x.org/pub/R6untarred/contrib/programs/
 
 # Note: do NOT create an md5 checksum for xcolors.tar.gz, it may
diff --git a/x11/xfedor/Makefile b/x11/xfedor/Makefile
index 9d4614ab539b..7d48b9c24f13 100644
--- a/x11/xfedor/Makefile
+++ b/x11/xfedor/Makefile
@@ -6,12 +6,12 @@
 # ATTENTION: It not work in > 256 colors modes, please fix it
 # if you can.
 #
-# $Id: Makefile,v 1.1.1.1 1996/09/03 01:33:07 ache Exp $
+# $Id: Makefile,v 1.2 1996/09/11 04:54:11 asami Exp $
 #
 
 DISTNAME=       xfedor
 PKGNAME=        xfedor-1.0
-CATEGORIES+=	x11
+CATEGORIES=	x11
 MASTER_SITES=   ftp://ftp.uni-trier.de/pub/unix/X11/R6/contrib/programs/
 
 LIB_DEPENDS=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
diff --git a/x11/xloadimage/Makefile b/x11/xloadimage/Makefile
index a688737c150f..502c691e0266 100644
--- a/x11/xloadimage/Makefile
+++ b/x11/xloadimage/Makefile
@@ -3,12 +3,12 @@
 # Date created:         9 January 1994
 # Whom:                 jmz
 #
-# $Id$
+# $Id: Makefile,v 1.6 1995/04/12 20:32:08 asami Exp $
 #
 
 DISTNAME=	xloadimage
 PKGNAME=	xloadimage-3.03
-CATEGORIES+=	x11
+CATEGORIES=	x11
 MASTER_SITES=	ftp://gatekeeper.dec.com/pub/X11-contrib/
 DISTFILES=	xloadimage.3.03.tar.Z
author	Satoshi Asami <asami@FreeBSD.org>	1996-11-18 11:44:27 +0000
committer	Satoshi Asami <asami@FreeBSD.org>	1996-11-18 11:44:27 +0000
commit	300c45cf2e488b0b4bef726272d1259f14ae8ed9 (patch)
tree	842a2dc4580fa0370f28faca34d61ab06c735859
parent	Remove spurious ^M at end of lines. (diff)