chmod -> ${CHMOD}

chown -> ${CHOWN}

15 files changed, 37 insertions, 48 deletions

diff --git a/security/cops/Makefile b/security/cops/Makefile
index a2e7f93facd..9a7991330f5 100644
--- a/security/cops/Makefile
+++ b/security/cops/Makefile
@@ -3,7 +3,7 @@
 # Date created:				29 August 1996
 # Whom:					oly
 #
-# $Id: Makefile,v 1.3 1996/11/18 07:31:46 obrien Exp $
+# $Id: Makefile,v 1.4 1998/06/04 04:11:55 vanilla Exp $
 #
 
 DISTNAME=	cops.1.04
@@ -24,7 +24,7 @@ pre-build:
 	(cd ${WRKSRC} ; ./reconfig)
 	(cd ${WRKSRC} ; \
 	${SED} 's,^SECURE=/usr/foo/bar,SECURE=${PREFIX}/cops,g' < cops | ${SED} '/^$$SECURE\/passwd\.chk.*/d' | ${SED} 's,SECURE_USERS="foo@bar\.edu",SECURE_USERS="root@localhost",g' | ${SED} 's/passwd\.chk pass.chk //g' > cops.out ; \
-	${MV} cops.out cops ; chmod u+x cops)
+	${MV} cops.out cops ; ${CHMOD} u+x cops)
 
 do-build:
 	(cd ${WRKSRC} ; make EXECUTABLE="${EXECUTABLE}" C_SRC="${C_SRC}")
@@ -32,7 +32,7 @@ do-build:
 do-install:
 	(cd ${WRKSRC} ; ${RM} -rf ${PREFIX}/cops ; ${MKDIR} ${PREFIX}/cops ; \
 	${CP} -R * ${PREFIX}/cops ; \
-	chmod -R go-rwx ${PREFIX}/cops ; \
+	${CHMOD} -R go-rwx ${PREFIX}/cops ; \
 	${RM} -rf ${PREFIX}/cops/*.old ${PREFIX}/cops/src)
 
 .include <bsd.port.mk>
diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index 1325498fcca..9cc6edd3266 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Sep 30, 1998
 # Whom:			kuriyama@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.13 1999/07/26 15:59:32 kuriyama Exp $
+# $Id: Makefile,v 1.14 1999/08/12 15:10:08 kuriyama Exp $
 #
 
 DISTNAME=	gnupg-0.9.10
@@ -38,7 +38,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/doc/gnupg
 .endfor
 .endif
-#	chmod u+s ${PREFIX}/bin/gpg
+#	${CHMOD} u+s ${PREFIX}/bin/gpg
 
 check:
 	(cd ${WRKSRC}; ${MAKE} check)
diff --git a/security/gnupg1/Makefile b/security/gnupg1/Makefile
index 1325498fcca..9cc6edd3266 100644
--- a/security/gnupg1/Makefile
+++ b/security/gnupg1/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Sep 30, 1998
 # Whom:			kuriyama@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.13 1999/07/26 15:59:32 kuriyama Exp $
+# $Id: Makefile,v 1.14 1999/08/12 15:10:08 kuriyama Exp $
 #
 
 DISTNAME=	gnupg-0.9.10
@@ -38,7 +38,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/doc/gnupg
 .endfor
 .endif
-#	chmod u+s ${PREFIX}/bin/gpg
+#	${CHMOD} u+s ${PREFIX}/bin/gpg
 
 check:
 	(cd ${WRKSRC}; ${MAKE} check)
diff --git a/security/krb5-16/Makefile b/security/krb5-16/Makefile
index c6a442bee79..fda684c0128 100644
--- a/security/krb5-16/Makefile
+++ b/security/krb5-16/Makefile
@@ -3,7 +3,7 @@
 # Date created:				6/5/1998
 # Whom:					nectar@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.9 1999/05/27 02:08:13 nectar Exp $
+# $Id: Makefile,v 1.10 1999/06/05 22:31:36 mharo Exp $
 #
 
 DISTNAME=		krb5-1.0.6
@@ -107,7 +107,6 @@ HTML_DOCS=		admin.html install_foot.html user-guide.html          \
 			install.html krb425_toc.html
 SETUID_EXE=		bin/ksu bin/v4rcp
 
-CHOWN?=		chown
 SUPERUSER?=	root
 
 .include <bsd.port.pre.mk>
diff --git a/security/krb5-17/Makefile b/security/krb5-17/Makefile
index c6a442bee79..fda684c0128 100644
--- a/security/krb5-17/Makefile
+++ b/security/krb5-17/Makefile
@@ -3,7 +3,7 @@
 # Date created:				6/5/1998
 # Whom:					nectar@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.9 1999/05/27 02:08:13 nectar Exp $
+# $Id: Makefile,v 1.10 1999/06/05 22:31:36 mharo Exp $
 #
 
 DISTNAME=		krb5-1.0.6
@@ -107,7 +107,6 @@ HTML_DOCS=		admin.html install_foot.html user-guide.html          \
 			install.html krb425_toc.html
 SETUID_EXE=		bin/ksu bin/v4rcp
 
-CHOWN?=		chown
 SUPERUSER?=	root
 
 .include <bsd.port.pre.mk>
diff --git a/security/krb5-appl/Makefile b/security/krb5-appl/Makefile
index c6a442bee79..fda684c0128 100644
--- a/security/krb5-appl/Makefile
+++ b/security/krb5-appl/Makefile
@@ -3,7 +3,7 @@
 # Date created:				6/5/1998
 # Whom:					nectar@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.9 1999/05/27 02:08:13 nectar Exp $
+# $Id: Makefile,v 1.10 1999/06/05 22:31:36 mharo Exp $
 #
 
 DISTNAME=		krb5-1.0.6
@@ -107,7 +107,6 @@ HTML_DOCS=		admin.html install_foot.html user-guide.html          \
 			install.html krb425_toc.html
 SETUID_EXE=		bin/ksu bin/v4rcp
 
-CHOWN?=		chown
 SUPERUSER?=	root
 
 .include <bsd.port.pre.mk>
diff --git a/security/krb5/Makefile b/security/krb5/Makefile
index c6a442bee79..fda684c0128 100644
--- a/security/krb5/Makefile
+++ b/security/krb5/Makefile
@@ -3,7 +3,7 @@
 # Date created:				6/5/1998
 # Whom:					nectar@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.9 1999/05/27 02:08:13 nectar Exp $
+# $Id: Makefile,v 1.10 1999/06/05 22:31:36 mharo Exp $
 #
 
 DISTNAME=		krb5-1.0.6
@@ -107,7 +107,6 @@ HTML_DOCS=		admin.html install_foot.html user-guide.html          \
 			install.html krb425_toc.html
 SETUID_EXE=		bin/ksu bin/v4rcp
 
-CHOWN?=		chown
 SUPERUSER?=	root
 
 .include <bsd.port.pre.mk>
diff --git a/security/pgp/Makefile b/security/pgp/Makefile
index 7c31e92604b..afb269646c3 100644
--- a/security/pgp/Makefile
+++ b/security/pgp/Makefile
@@ -5,7 +5,7 @@
 # Date created:         8 Jul 1995
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.23 1999/02/07 06:29:53 ache Exp $
+# $Id: Makefile,v 1.24 1999/05/07 03:26:25 jseger Exp $
 #
 
 # Pick an initial default, else it doesn't get set in the INDEX.
@@ -27,8 +27,7 @@ do-install:
 	cd ${WRKSRC}/../doc; \
 		  install -c -o bin -g bin -m 444 pgp.1 ${PREFIX}/man/man1
 	-mkdir -p ${PGPLIB}
-	chown bin.bin ${PGPLIB}
-	chmod 555 ${PGPLIB}
+	${CHMOD} 555 ${PGPLIB}
 	cd ${WRKSRC}/..; \
 	    install -c -o bin -g bin -m 444 pgp.hlp \
 			      doc/pgpdoc1.txt doc/pgpdoc2.txt ${PGPLIB}; \
diff --git a/security/ssh/Makefile b/security/ssh/Makefile
index 27a349d2851..282ddf542ec 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.77 1999/07/16 06:09:42 mharo Exp $
+# $Id: Makefile,v 1.78 1999/08/09 17:12:44 markm Exp $
 #
 # Maximal ssh package requires YES values for
 # USE_PERL, USE_TCPWRAP
@@ -108,7 +108,7 @@ post-install:
 		${ECHO} "Installing ${PREFIX}/etc/rc.d/sshd.sh startup file."; \
 		${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/sshd.sh; \
 		${ECHO} "[ -x ${PREFIX}/sbin/sshd ] && ${PREFIX}/sbin/sshd && ${ECHO} -n ' sshd'" >> ${PREFIX}/etc/rc.d/sshd.sh; \
-		/bin/chmod 751 ${PREFIX}/etc/rc.d/sshd.sh; \
+		${CHMOD} 751 ${PREFIX}/etc/rc.d/sshd.sh; \
 	fi
 
 .include <bsd.port.pre.mk>
diff --git a/security/ssh2/Makefile b/security/ssh2/Makefile
index 1726cf7a2d8..94705c5fc4b 100644
--- a/security/ssh2/Makefile
+++ b/security/ssh2/Makefile
@@ -3,7 +3,7 @@
 # Date created:		5 Oct 1998
 # Whom:			Issei Suzuki <issei@jp.FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.81 1999/06/18 20:02:11 ache Exp $
+# $Id: Makefile,v 1.82 1999/06/24 19:29:50 obrien Exp $
 #
 # Maximal ssh2 package requires YES values for
 # USE_SSH1, USE_TCPWRAP
@@ -58,15 +58,18 @@ MAN1=	ssh2.1 ssh-keygen2.1 ssh-add2.1 ssh-agent2.1 \
 	scp2.1 sftp2.1
 MAN8=	sshd2.8
 
+MLINKS=	ssh2.1 ssh.1 \
+	ssh-keygen2.1 ssh-keygen.1 \
+	ssh-add2.1 ssh-add.1 \
+	ssh-agent2.1 ssh-agent.1 \
+	scp2.1 scp.1 \
+	sftp2.1 sftp.1 \
+	sshd2.8 sshd.8
+
 PORTDOCS=	CHANGES LICENSING README
 .if !defined(USE_SSH1) || (defined(USE_SSH1) && ${USE_SSH1} != YES)
 PLIST=		${PKGDIR}/PLIST.ssh2_only
 .endif
-.if defined(NOMANCOMPRESS)
-MAN_SUFX=	""
-.else
-MAN_SUFX=	.gz
-.endif
 
 post-install:
 .if defined(USE_SSH1) && ${USE_SSH1} == YES
@@ -76,15 +79,6 @@ post-install:
 	${MV} -f ${PREFIX}/man/man8/sshd.8${MAN_SUFX} ${PREFIX}/man/man8/sshd.old.8${MAN_SUFX}
 .endif
 #
-.if !defined(NOMANCOMPRESS)
-.for i in ssh ssh-keygen ssh-add ssh-agent scp sftp
-	${RM} -f ${PREFIX}/man/man1/${i}.1
-	${LN} -sf ${i}2.1.gz ${PREFIX}/man/man1/${i}.1.gz
-.endfor
-	${RM} -f ${PREFIX}/man/man8/sshd.8
-	${LN} -sf sshd2.8.gz ${PREFIX}/man/man8/sshd.8.gz
-.endif
-#
 .if !defined(NOPORTDOCS)
 	-${MKDIR} ${PREFIX}/share/doc/ssh2
 .for i in ${PORTDOCS}
@@ -96,7 +90,7 @@ post-install:
 		${ECHO} "Installing ${PREFIX}/etc/rc.d/sshd.sh startup file."; \
 		${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/sshd.sh; \
 		${ECHO} "[ -x ${PREFIX}/sbin/sshd ] && ${PREFIX}/sbin/sshd && ${ECHO} -n ' sshd'" >> ${PREFIX}/etc/rc.d/sshd.sh; \
-		chmod 751 ${PREFIX}/etc/rc.d/sshd.sh; \
+		${CHMOD} 751 ${PREFIX}/etc/rc.d/sshd.sh; \
 	fi
 
 .include <bsd.port.mk>
diff --git a/security/tripwire-131/Makefile b/security/tripwire-131/Makefile
index e0a5e03b344..b8a2e9ebe99 100644
--- a/security/tripwire-131/Makefile
+++ b/security/tripwire-131/Makefile
@@ -3,7 +3,7 @@
 # Date created:		31 Mar 1997
 # Whom:			Joe Greco <jgreco@ns.sol.net>
 #
-# $Id: Makefile,v 1.3 1998/04/07 17:42:21 jgreco Exp $
+# $Id: Makefile,v 1.4 1998/12/01 08:33:29 asami Exp $
 #
 
 DISTNAME=       tripwire-1.2
@@ -41,7 +41,7 @@ post-install:
 		> /mnt/tw.db_`hostname`.gz
 	@ ${CP} -p ${FILESDIR}/twcheck /mnt/twcheck
 	@ ${GZIP_CMD} < /usr/bin/gunzip > /mnt/gunzip
-	@ chmod 555 /mnt/tripwire /mnt/gunzip /mnt/twcheck
+	@ ${CHMOD} 555 /mnt/tripwire /mnt/gunzip /mnt/twcheck
 	@ umount /mnt
 	@ ${ECHO} Do not forget to remove and write-protect the floppy.
 .endif
diff --git a/security/tripwire/Makefile b/security/tripwire/Makefile
index e0a5e03b344..b8a2e9ebe99 100644
--- a/security/tripwire/Makefile
+++ b/security/tripwire/Makefile
@@ -3,7 +3,7 @@
 # Date created:		31 Mar 1997
 # Whom:			Joe Greco <jgreco@ns.sol.net>
 #
-# $Id: Makefile,v 1.3 1998/04/07 17:42:21 jgreco Exp $
+# $Id: Makefile,v 1.4 1998/12/01 08:33:29 asami Exp $
 #
 
 DISTNAME=       tripwire-1.2
@@ -41,7 +41,7 @@ post-install:
 		> /mnt/tw.db_`hostname`.gz
 	@ ${CP} -p ${FILESDIR}/twcheck /mnt/twcheck
 	@ ${GZIP_CMD} < /usr/bin/gunzip > /mnt/gunzip
-	@ chmod 555 /mnt/tripwire /mnt/gunzip /mnt/twcheck
+	@ ${CHMOD} 555 /mnt/tripwire /mnt/gunzip /mnt/twcheck
 	@ umount /mnt
 	@ ${ECHO} Do not forget to remove and write-protect the floppy.
 .endif
diff --git a/security/tripwire12/Makefile b/security/tripwire12/Makefile
index e0a5e03b344..b8a2e9ebe99 100644
--- a/security/tripwire12/Makefile
+++ b/security/tripwire12/Makefile
@@ -3,7 +3,7 @@
 # Date created:		31 Mar 1997
 # Whom:			Joe Greco <jgreco@ns.sol.net>
 #
-# $Id: Makefile,v 1.3 1998/04/07 17:42:21 jgreco Exp $
+# $Id: Makefile,v 1.4 1998/12/01 08:33:29 asami Exp $
 #
 
 DISTNAME=       tripwire-1.2
@@ -41,7 +41,7 @@ post-install:
 		> /mnt/tw.db_`hostname`.gz
 	@ ${CP} -p ${FILESDIR}/twcheck /mnt/twcheck
 	@ ${GZIP_CMD} < /usr/bin/gunzip > /mnt/gunzip
-	@ chmod 555 /mnt/tripwire /mnt/gunzip /mnt/twcheck
+	@ ${CHMOD} 555 /mnt/tripwire /mnt/gunzip /mnt/twcheck
 	@ umount /mnt
 	@ ${ECHO} Do not forget to remove and write-protect the floppy.
 .endif
diff --git a/security/vscan/Makefile b/security/vscan/Makefile
index b9a031b2877..6f334503859 100644
--- a/security/vscan/Makefile
+++ b/security/vscan/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Thur Sept 25, 1996
 # Whom:                 David O'Brien (obrien@cs.ucdavis.edu)
 #
-# $Id: Makefile,v 1.7 1998/12/10 00:40:24 steve Exp $
+# $Id: Makefile,v 1.8 1999/03/30 01:55:28 obrien Exp $
 #
 
 DISTNAME=	nlxb318e
@@ -40,9 +40,9 @@ do-install:
 	(cd ${WRKSRC}; ./install-vscan)
 
 post-install:
-	@/usr/sbin/chown ${BINOWN}.${BINGRP} ${PREFIX}/bin/uvscan
-	@/usr/sbin/chown -R ${SHAREOWN}.${SHAREGRP} ${LIBDIR}
-	@/usr/sbin/chown ${MANOWN}.${MANGRP} ${PREFIX}/man/man1/uvscan.1
+	@${CHOWN} ${BINOWN}.${BINGRP} ${PREFIX}/bin/uvscan
+	@${CHOWN} -R ${SHAREOWN}.${SHAREGRP} ${LIBDIR}
+	@${CHOWN} ${MANOWN}.${MANGRP} ${PREFIX}/man/man1/uvscan.1
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/vscan
 	${INSTALL_DATA} ${WRKSRC}/Whatsnew.txt ${PREFIX}/share/doc/vscan
diff --git a/security/xinetd/Makefile b/security/xinetd/Makefile
index 7aa03bf3986..5cef34aa961 100644
--- a/security/xinetd/Makefile
+++ b/security/xinetd/Makefile
@@ -3,7 +3,7 @@
 # Date created:				28 June 1996
 # Whom:					markm
 #
-# $Id: Makefile,v 1.7 1999/05/10 17:14:56 vanilla Exp $
+# $Id: Makefile,v 1.8 1999/08/14 08:41:15 vanilla Exp $
 #
 
 DISTNAME=	xinetd-2.1.8.6b6
@@ -25,7 +25,7 @@ post-install:
 		${ECHO} "Install ${PREFIX}/etc/rc.d/xinetd.sh startup file."; \
 		${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/xinetd.sh; \
 		${ECHO} "[ -x ${PREFIX}/sbin/xinetd ] && ${PREFIX}/sbin/xinetd && echo -n ' xinetd'" >> ${PREFIX}/etc/rc.d/xinetd.sh; \
-		chmod 751 ${PREFIX}/etc/rc.d/xinetd.sh; \
+		${CHMOD} 751 ${PREFIX}/etc/rc.d/xinetd.sh; \
 	fi
 	strip ${PREFIX}/sbin/xinetd