General Makefile cleanup

   Add MAINATERS
   mkdir -p ==> ${MKDIR}
   cp ==> ${CP}
   install ==> ${INSTALL}/${INSTALL_*}
   etc...

15 files changed, 67 insertions, 57 deletions

diff --git a/net/ascend-radius/Makefile b/net/ascend-radius/Makefile
index def133ccb756..221a6815ea24 100644
--- a/net/ascend-radius/Makefile
+++ b/net/ascend-radius/Makefile
@@ -3,7 +3,7 @@
 # Date created:				August 28th 96
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-#   $Id: Makefile,v 1.4 1996/10/18 11:50:13 jfitz Exp $
+#   $Id: Makefile,v 1.5 1996/11/18 11:34:23 asami Exp $
 #
 
 DISTNAME=	radius-961015
@@ -18,24 +18,16 @@ WRKPREFIX=	radius-961015/radius-1.16-ascend
 WRKSRC=		${WRKDIR}/${WRKPREFIX}/ascendd
 
 ALL_TARGET=	all dbm
+MAN1=		builddbm.1 users-file-syntax.1
 
 do-install:
 		${INSTALL_PROGRAM} ${WRKSRC}/radiusd ${PREFIX}/sbin
 		${INSTALL_PROGRAM} ${WRKSRC}/radiusd.dbm ${PREFIX}/sbin
 		${INSTALL_PROGRAM} ${WRKSRC}/builddbm ${PREFIX}/sbin
-.ifdef NOMANCOMPRESS
 		${INSTALL_MAN} ${WRKDIR}/${WRKPREFIX}/man1/users-file-syntax.1 ${PREFIX}/man/man1
 		${INSTALL_MAN} ${WRKDIR}/${WRKPREFIX}/man1/builddbm.1 ${PREFIX}/man/man1
-.else
-		@ ${CP} ${WRKDIR}/${WRKPREFIX}/man1/users-file-syntax.1 ${WRKSRC}
-		@ ${CP} ${WRKDIR}/${WRKPREFIX}/man1/builddbm.1 ${WRKSRC}
-		@ gzip -9nf ${WRKSRC}/users-file-syntax.1
-		@ gzip -9nf ${WRKSRC}/builddbm.1
-		${INSTALL_MAN} ${WRKSRC}/users-file-syntax.1.gz ${PREFIX}/man/man1
-		${INSTALL_MAN} ${WRKSRC}/builddbm.1.gz ${PREFIX}/man/man1
-.endif
 .ifndef NOPORTDOCS
-		@ mkdir -p ${PREFIX}/share/doc/ascend-radius
+		@ ${MKDIR} ${PREFIX}/share/doc/ascend-radius
 		for file in ascend.doc draft-ietf-radius-accounting-01.txt draft-ietf-radius-radius-03.txt draft-ietf-radius-radius-04.txt; do \
 			${INSTALL_DATA} ${WRKDIR}/${WRKPREFIX}/doc/$$file ${PREFIX}/share/doc/ascend-radius; \
 		done
@@ -43,13 +35,13 @@ do-install:
 			${INSTALL_DATA} ${WRKDIR}/${WRKPREFIX}/$$file ${PREFIX}/share/doc/ascend-radius; \
 		done
 .endif
-		@ mkdir -p ${PREFIX}/etc/raddb
+		@ ${MKDIR} ${PREFIX}/etc/raddb
 		@ chown root.wheel ${PREFIX}/etc/raddb
 		@ chmod 700 ${PREFIX}/etc/raddb
 		for file in clients.example dictionary users.example; do \
 			${INSTALL} -c -o root -g wheel -m 0400 ${WRKDIR}/${WRKPREFIX}/raddb/$$file ${PREFIX}/etc/raddb; \
 		done
-		@ mkdir -p /var/log/radacct
+		@ ${MKDIR} /var/log/radacct
 		@ chown root.wheel /var/log/radacct
 		@ chmod 700 /var/log/radacct
 
diff --git a/net/bb/Makefile b/net/bb/Makefile
index 3e00b6506753..86a60f81b8c4 100644
--- a/net/bb/Makefile
+++ b/net/bb/Makefile
@@ -3,7 +3,7 @@
 # Date created:         So  17 Nov 1996 16:59:23 MET
 # Whom:                 Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.2 1996/11/18 05:35:30 asami Exp $
+# $Id: Makefile,v 1.3 1996/11/26 09:15:36 asami Exp $
 #
 
 DISTNAME=	bb
@@ -19,7 +19,7 @@ RUN_DEPENDS=	lyx:${PORTSDIR}/print/lyx
 
 post-configure:
 	( cd ${WRKSRC}/doc; /bin/sh bbconfig freebsd )
-	@cp ${FILESDIR}/Makefile ${WRKSRC}
+	@${CP} ${FILESDIR}/Makefile ${WRKSRC}
 
 do-install:
 	@${MKDIR} ${PREFIX}/${DISTNAME}/bin
@@ -119,7 +119,7 @@ do-install:
 				${PREFIX}/${DISTNAME}/www/gifs/yellow.gif
 	${INSTALL_DATA} ${WRKSRC}/www/logs/later \
 				${PREFIX}/${DISTNAME}/www/logs/later
-	@rm -f ${PREFIX}/www/data/bb
+	@${RM} -f ${PREFIX}/www/data/bb
 	@ln -s ../../${DISTNAME}/www ${PREFIX}/www/data/bb
 	@echo ""
 	@echo "================================================================"
diff --git a/net/gnu-finger/Makefile b/net/gnu-finger/Makefile
index d767fc1f9e38..82e6aee24249 100644
--- a/net/gnu-finger/Makefile
+++ b/net/gnu-finger/Makefile
@@ -3,7 +3,7 @@
 # Date created:         20 June 1996
 # Whom:                 Yoshiro MIHIRA <sanpei@yy.cs.keio.ac.jp>
 #
-# $Id: Makefile,v 1.3 1996/07/12 11:01:27 asami Exp $
+# $Id: Makefile,v 1.4 1996/11/18 10:25:27 asami Exp $
 #
 
 DISTNAME=       finger-1.37
@@ -17,11 +17,11 @@ HAS_CONFIGURE=	yes
 INSTALL_TARGET= server
 
 post-install:
-	mkdir -p ${PREFIX}/etc/fingerdir
-	mkdir -p ${PREFIX}/etc/rc.d
-	@cp ${WRKSRC}/support/ttylocs ${PREFIX}/etc/fingerdir/ttylocs.sample
-	@cp ${FILESDIR}/clients.sample ${PREFIX}/etc/fingerdir/clients.sample
-	@install -c -m 744 -o root ${FILESDIR}/start.fingerd.sh.sample ${PREFIX}/etc/rc.d/start.fingerd.sh.sample
+	${MKDIR} ${PREFIX}/etc/fingerdir
+	${MKDIR} ${PREFIX}/etc/rc.d
+	@${CP} ${WRKSRC}/support/ttylocs ${PREFIX}/etc/fingerdir/ttylocs.sample
+	@${CP} ${FILESDIR}/clients.sample ${PREFIX}/etc/fingerdir/clients.sample
+	@${INSTALL} ${COPY} -m 744 -o root ${FILESDIR}/start.fingerd.sh.sample ${PREFIX}/etc/rc.d/start.fingerd.sh.sample
 	@echo "GNU.finger.server.hotname" > ${PREFIX}/etc/fingerdir/serverhost.sample
 	@echo "mail.spool.server.hostname" > ${PREFIX}/etc/fingerdir/mailhost.sample
 
diff --git a/net/pcnfsd/Makefile b/net/pcnfsd/Makefile
index d06117ca641c..fd9785cb3e25 100644
--- a/net/pcnfsd/Makefile
+++ b/net/pcnfsd/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Oct 6, 1994
 # Whom:			pst
 #
-# $Id: Makefile,v 1.5 1996/04/21 19:26:10 asami Exp $
+# $Id: Makefile,v 1.6 1996/11/18 11:35:40 asami Exp $
 #
 
 DISTNAME=	pcnfsd.93.02.16
@@ -12,6 +12,8 @@ CATEGORIES=	net
 MASTER_SITES=	ftp://bcm.tmc.edu/pcnfs/
 EXTRACT_SUFX=	.tar.Z
 
+MAINTAINER=	pst@FreeBSD.org
+
 NO_WRKSUBDIR=
 
 .include <bsd.port.mk>
diff --git a/net/pmf/Makefile b/net/pmf/Makefile
index 5040b6a18bdc..a90d5e18d6e1 100644
--- a/net/pmf/Makefile
+++ b/net/pmf/Makefile
@@ -3,7 +3,7 @@
 # Date created:         24 Sep 1994
 # Whom:                 adam
 #
-# $Id: Makefile,v 1.6 1995/11/27 04:05:24 asami Exp $
+# $Id: Makefile,v 1.7 1996/11/18 11:35:44 asami Exp $
 #
 
 DISTNAME=       pmf-1.13.1
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.lysator.liu.se/pub/lpmud/clients/
 WRKSRC=		${WRKDIR}/pmfdir/src
 
 pre-install:
-	@mkdir -p /usr/local/lib/pmf
+	@${MKDIR} /usr/local/lib/pmf
 	@find ${WRKSRC}/../system_dir -name '*.orig' -exec rm {} \;
 	@-mv ${WRKSRC}/../doc/pmf.doc ${WRKSRC}/../system_dir
 	@tar -C ${WRKSRC}/../system_dir -cf - . \
diff --git a/net/radius/Makefile b/net/radius/Makefile
index 78a815419308..810e82ef2d71 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.4 1996/11/18 11:35:48 asami Exp $
+# $Id: Makefile,v 1.5 1996/11/20 21:21:51 markm Exp $
 #
 
 DISTNAME=	radius.2.4.23
@@ -12,12 +12,14 @@ CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.merit.edu/radius/releases/
 DISTFILES=	radius.23c.basic.tar.gz
 
+MAINTAINER=	torstenb@FreeBSD.ORG
+
 NO_WRKSUBDIR=	yes
 INSTALL_TARGET=	install-all
 MAN5=		dictionary.5 users.5 radius.fsm.5 authfile.5 clients.5
 MAN8=		builddbm.8 radcheck.8 radiusd.8 radpwtst.8
 
 pre-install:
-	${MKDIR} ${PREFIX}/lib/radius/db ${PREFIX}/lib/radius/acct
+	@${MKDIR} ${PREFIX}/lib/radius/db ${PREFIX}/lib/radius/acct
 
 .include <bsd.port.mk>
diff --git a/net/rdist6/Makefile b/net/rdist6/Makefile
index 69a974e43cde..aa7cc24f9f60 100644
--- a/net/rdist6/Makefile
+++ b/net/rdist6/Makefile
@@ -3,7 +3,7 @@
 # Date created:		19 August 1995
 # Whom:			peter
 #
-# $Id: Makefile,v 1.9 1996/11/13 12:41:24 asami Exp $
+# $Id: Makefile,v 1.10 1996/11/18 11:35:54 asami Exp $
 #
 
 DISTNAME=	rdist-6.1.3
@@ -22,7 +22,7 @@ MAN1=		${RDIST_NAME}.1
 MAN8=		rdistd.8
 
 post-install:
-	strip ${PREFIX}/bin/${RDIST_NAME}
-	strip ${PREFIX}/bin/rdistd
+	@strip ${PREFIX}/bin/${RDIST_NAME}
+	@strip ${PREFIX}/bin/rdistd
 
 .include <bsd.port.mk>
diff --git a/net/rmsg/Makefile b/net/rmsg/Makefile
index c0f03c966993..259201be3aec 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.4 1996/11/18 11:36:01 asami Exp $
+# $Id: Makefile,v 1.5 1996/11/26 07:51:51 asami Exp $
 #
 
 DISTNAME=	rmsg-1.64
@@ -11,6 +11,8 @@ CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.funet.fi/pub/networking/tcpip/ \
 		ftp://proton.elka.pw.edu.pl/pub/unix/network/
 
+MAINTAINER=	torstenb@FreeBSD.org
+
 WRKSRC=		${WRKDIR}/rmsg
 MAN1=		rmsg.1
 MAN8=		rmsgd.8
diff --git a/net/rsync/Makefile b/net/rsync/Makefile
index 119210307e4d..e23b884e23a3 100644
--- a/net/rsync/Makefile
+++ b/net/rsync/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Sat Aug 3, 1996
 # Whom:                 David O'Brien (obrien@cs.ucdavis.edu)
 #
-# $Id: Makefile,v 1.3 1996/11/18 11:36:09 asami Exp $
+# $Id: Makefile,v 1.4 1996/12/01 00:22:48 obrien Exp $
 #
 
 DISTNAME=	rsync-1.6.2
@@ -17,9 +17,9 @@ GNU_CONFIGURE=	yes
 MAN1=		rsync.1
 
 post-install:
-	strip ${PREFIX}/bin/rsync
+	@strip ${PREFIX}/bin/rsync
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/rsync
+	@${MKDIR} ${PREFIX}/share/doc/rsync
 	${INSTALL_DATA} ${WRKSRC}/tech_report.ps ${PREFIX}/share/doc/rsync
 .endif
 
diff --git a/net/scotty/Makefile b/net/scotty/Makefile
index 3496328fd9d0..4a6c120eaa93 100644
--- a/net/scotty/Makefile
+++ b/net/scotty/Makefile
@@ -3,13 +3,15 @@
 # Date created:		18 Februar 1995
 # Whom:			Gennady Sorokopud <gena@netvision.net.il>
 #
-# $Id: Makefile,v 1.12 1996/10/10 14:54:36 erich Exp $
+# $Id: Makefile,v 1.13 1996/11/18 11:36:20 asami Exp $
 #
 
 DISTNAME=	scotty-2.1.3
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.ibr.cs.tu-bs.de/pub/local/tkined/
 
+MAINTAINER=	gena@netvision.net.il
+
 LIB_DEPENDS=	tk41\\.1\\.:${PORTSDIR}/x11/tk41
 
 GNU_CONFIGURE=  yes
@@ -25,16 +27,16 @@ MANN=		Tnm.n cmip.n dns.n gdmo.n http.n icmp.n ined.n job.n \
 
 pre-install:
 	@cd ${WRKSRC};make sinstall
-	@cp ${WRKSRC}/../tnm/ntping/ntping.8 ${WRKSRC}/../doc
+	@${CP} ${WRKSRC}/../tnm/ntping/ntping.8 ${WRKSRC}/../doc
 	@sed "s,@FREEBSD_VERSION@,$$(uname -m)-$$(uname)-$$(uname -r)," pkg/PLIST.in >/tmp/PLIST
 .if defined(NOMANCOMPRESS)
 	@sed "s,@GZIP@,," /tmp/PLIST >pkg/PLIST
 .else
 	@sed "s,@GZIP@,.gz," /tmp/PLIST >pkg/PLIST
 .endif
-	@rm /tmp/PLIST
+	@{RM} /tmp/PLIST
 
 pre-clean:
-	@rm -f pkg/PLIST
+	@{RM} -f pkg/PLIST
 
 .include <bsd.port.mk>
diff --git a/net/scotty3/Makefile b/net/scotty3/Makefile
index 3496328fd9d0..4a6c120eaa93 100644
--- a/net/scotty3/Makefile
+++ b/net/scotty3/Makefile
@@ -3,13 +3,15 @@
 # Date created:		18 Februar 1995
 # Whom:			Gennady Sorokopud <gena@netvision.net.il>
 #
-# $Id: Makefile,v 1.12 1996/10/10 14:54:36 erich Exp $
+# $Id: Makefile,v 1.13 1996/11/18 11:36:20 asami Exp $
 #
 
 DISTNAME=	scotty-2.1.3
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.ibr.cs.tu-bs.de/pub/local/tkined/
 
+MAINTAINER=	gena@netvision.net.il
+
 LIB_DEPENDS=	tk41\\.1\\.:${PORTSDIR}/x11/tk41
 
 GNU_CONFIGURE=  yes
@@ -25,16 +27,16 @@ MANN=		Tnm.n cmip.n dns.n gdmo.n http.n icmp.n ined.n job.n \
 
 pre-install:
 	@cd ${WRKSRC};make sinstall
-	@cp ${WRKSRC}/../tnm/ntping/ntping.8 ${WRKSRC}/../doc
+	@${CP} ${WRKSRC}/../tnm/ntping/ntping.8 ${WRKSRC}/../doc
 	@sed "s,@FREEBSD_VERSION@,$$(uname -m)-$$(uname)-$$(uname -r)," pkg/PLIST.in >/tmp/PLIST
 .if defined(NOMANCOMPRESS)
 	@sed "s,@GZIP@,," /tmp/PLIST >pkg/PLIST
 .else
 	@sed "s,@GZIP@,.gz," /tmp/PLIST >pkg/PLIST
 .endif
-	@rm /tmp/PLIST
+	@{RM} /tmp/PLIST
 
 pre-clean:
-	@rm -f pkg/PLIST
+	@{RM} -f pkg/PLIST
 
 .include <bsd.port.mk>
diff --git a/net/wais/Makefile b/net/wais/Makefile
index cf602082937d..629036fb44c5 100644
--- a/net/wais/Makefile
+++ b/net/wais/Makefile
@@ -3,13 +3,15 @@
 # Date created:         20 Sep 1994
 # Whom:                 adam
 #
-# $Id: Makefile,v 1.9 1996/11/13 10:55:46 adam Exp $
+# $Id: Makefile,v 1.10 1996/11/18 11:36:57 asami Exp $
 #
 
 DISTNAME=       freeWAIS-0.5
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.cnidr.org/pub/NIDR.tools/freewais/
 
+MAINTAINER=	ports@FreeBSD.org
+
 NO_PACKAGE=	not yet
 NO_INSTALL=	almost
 ALL_TARGET=	freebsd
diff --git a/net/wide-dhcp/Makefile b/net/wide-dhcp/Makefile
index 88225bbdfdca..9e5d627b66b0 100644
--- a/net/wide-dhcp/Makefile
+++ b/net/wide-dhcp/Makefile
@@ -3,7 +3,7 @@
 # Date created:         21 November 1995
 # Whom:                 Yoshiro MIHIRA <sanpei@yy.cs.keio.ac.jp>
 #
-# $Id: Makefile,v 1.3 1996/05/30 08:54:17 asami Exp $
+# $Id: Makefile,v 1.4 1996/11/18 11:37:02 asami Exp $
 #
 
 DISTNAME=       dhcp-1.3beta
@@ -20,19 +20,19 @@ MAKE_ENV=	OSTYPE=`uname`
 
 post-patch:
 	if [ ! -f ${WRKSRC}/server/tzfile.h ]; then \
-		cp ${DISTDIR}/tzfile.h ${WRKSRC}/server/; \
+		${CP} ${DISTDIR}/tzfile.h ${WRKSRC}/server/; \
 	fi
 
 post-install:
 	@if [ ! -d ${PREFIX}/share/dhcp ]; then \
-		mkdir -p ${PREFIX}/share/dhcp; \
+		${MKDIR} ${PREFIX}/share/dhcp; \
 	fi
-	@cp ${WRKSRC}/README ${PREFIX}/share/dhcp/
-	@cp ${WRKSRC}/README.jis ${PREFIX}/share/dhcp/
-	@cp ${WRKSRC}/db_sample/dhcpdb.pool ${PREFIX}/share/dhcp/dhcpdb.pool.sample
-	@cp ${WRKSRC}/db_sample/dhcpdb.relay ${PREFIX}/share/dhcp/dhcpdb.relay.sample
-	@cp ${WRKSRC}/db_sample/dhcpdb.server ${PREFIX}/share/dhcp/dhcpdb.server.sample
-	@cp ${WRKSRC}/db_sample/intro.dhcp ${PREFIX}/share/dhcp/
+	@{CP} ${WRKSRC}/README ${PREFIX}/share/dhcp/
+	@{CP} ${WRKSRC}/README.jis ${PREFIX}/share/dhcp/
+	@{CP} ${WRKSRC}/db_sample/dhcpdb.pool ${PREFIX}/share/dhcp/dhcpdb.pool.sample
+	@{CP} ${WRKSRC}/db_sample/dhcpdb.relay ${PREFIX}/share/dhcp/dhcpdb.relay.sample
+	@{CP} ${WRKSRC}/db_sample/dhcpdb.server ${PREFIX}/share/dhcp/dhcpdb.server.sample
+	@{CP} ${WRKSRC}/db_sample/intro.dhcp ${PREFIX}/share/dhcp/
 	@if [ ! -c /dev/bpf1 ]; then \
 	    echo "**********************************************************";\
 	    echo "*                      W a r n i n g                     *";\
diff --git a/net/xarchie/Makefile b/net/xarchie/Makefile
index 63fe99d9baab..cda1eaaea531 100644
--- a/net/xarchie/Makefile
+++ b/net/xarchie/Makefile
@@ -3,7 +3,7 @@
 # Date created:		24 September 1994
 # Whom:			jkh
 #
-# $Id: Makefile,v 1.10 1995/12/02 12:27:27 asami Exp $
+# $Id: Makefile,v 1.11 1996/11/18 09:54:39 asami Exp $
 #
 
 DISTNAME=	xarchie-2.0.10
@@ -11,6 +11,8 @@ CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	applications
 
+MAINTAINER=	ports@FreeBSD.org
+
 USE_IMAKE=	yes
 
 .include <bsd.port.mk>
diff --git a/net/zephyr/Makefile b/net/zephyr/Makefile
index 94a021a8eb97..88ef28784611 100644
--- a/net/zephyr/Makefile
+++ b/net/zephyr/Makefile
@@ -3,13 +3,15 @@
 # Date created:		1-Aug-1995
 # Whom:			pst
 #
-# $Id: Makefile,v 1.4 1996/11/18 11:37:23 asami Exp $
+# $Id: Makefile,v 1.5 1996/11/18 14:09:56 asami Exp $
 #
 
 DISTNAME=	zephyr-2.0.4
 CATEGORIES=	net
 MASTER_SITES=	ftp://athena-dist.mit.edu/pub/ATHENA/zephyr/dist/
 
+MAINTAINER=	pst@FreeBSD.org
+
 .if exists(/usr/lib/libkrb.a) && defined(MAKE_EBONES)
 CONFIGURE_ARGS="--with-krb4"
 .endif
@@ -25,11 +27,13 @@ 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}
+	${MKDIR} ${ZEPHYR_RCDIR}
+	${INSTALL_SCRIPT} ${FILESDIR}/zhm.sh ${ZEPHYR_RCDIR}
+.if !defined(NOPORTDOCS)
 	${MKDIR} ${ZEPHYR_DOCDIR}
 	for file in ${ZEPHYR_DOCS} ; do \
-	    ${INSTALL} -c ${WRKSRC}/$$file ${ZEPHYR_DOCDIR} ; \
+	    ${INSTALL_DATA} ${WRKSRC}/$$file ${ZEPHYR_DOCDIR} ; \
 	    done
-	${MKDIR} ${ZEPHYR_RCDIR}
+.endif
 
 .include <bsd.port.mk>