make ${PAX} usage consistent:

- group 'zrw' and 'p' args, -s last
- use the && operator consistently
- strip unneeded parens
- some whitespace cleanup

3 files changed, 7 insertions, 7 deletions

diff --git a/security/fortify/Makefile b/security/fortify/Makefile
index fdb4f6bc2aa..b9fb15d9aea 100644
--- a/security/fortify/Makefile
+++ b/security/fortify/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/02/17 17:49:44 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/04/10 01:28:23 grant Exp $
 #
 
 DISTNAME=	Fortify-1.4.6-unix-src
@@ -66,7 +66,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/cmdline/fortify ${PREFIX}/libexec
 	${INSTALL_DATA_DIR} ${PREFIX}/share/fortify
 .for DIR in ${FORTIFY_DIRS}
-	cd ${WRKSRC}; ${PAX} -rw ${DIR} ${PREFIX}/share/fortify
+	cd ${WRKSRC} && ${PAX} -rw ${DIR} ${PREFIX}/share/fortify
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/Index ${PREFIX}/share/fortify
 	${LN} -sf languages/English ${PREFIX}/share/fortify/Messages
@@ -74,7 +74,7 @@ do-install:
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/fortify
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/fortify
 	${INSTALL_DATA} ${WRKSRC}/README.html ${PREFIX}/share/doc/fortify
-	cd ${WRKSRC}; ${PAX} -rw images ${PREFIX}/share/doc/fortify
+	cd ${WRKSRC} && ${PAX} -rw images ${PREFIX}/share/doc/fortify
 	${CHMOD} -R go-w ${PREFIX}/share/doc/fortify
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/doc/fortify
 
diff --git a/security/rc5des/Makefile b/security/rc5des/Makefile
index 5ea9dd57197..3218058efd7 100644
--- a/security/rc5des/Makefile
+++ b/security/rc5des/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/03/29 12:42:24 jmmv Exp $
+# $NetBSD: Makefile,v 1.12 2003/04/10 01:28:24 grant Exp $
 #
 
 DISTNAME=		rc5-mlg-004
@@ -47,6 +47,6 @@ do-build:
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/RC5
-	cd ${WRKSRC}; ${PAX} -r -w . ${PREFIX}/RC5
+	cd ${WRKSRC} && ${PAX} -rw . ${PREFIX}/RC5
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/tripwire/Makefile b/security/tripwire/Makefile
index 6e1a1aad628..75f7ef0942c 100644
--- a/security/tripwire/Makefile
+++ b/security/tripwire/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/01/06 07:44:11 cjep Exp $
+# $NetBSD: Makefile,v 1.8 2003/04/10 01:28:24 grant Exp $
 #
 
 DISTNAME=       tripwire-1.2
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.cerias.purdue.edu/coast/coast-library.html
 COMMENT=	File and directory integrity checker
 
 post-extract:
-	(cd ${WRKDIR}; ${PAX} -r < T1.2.tar)
+	cd ${WRKDIR} && ${PAX} -rf T1.2.tar
 	${CP} ${FILESDIR}/conf-${LOWER_OPSYS}.h ${WRKSRC}/configs
 
 post-patch: