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

43 files changed, 168 insertions, 288 deletions

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>