make ${PAX} usage consistent:

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

7 files changed, 16 insertions, 16 deletions

diff --git a/net/coda5_client/Makefile b/net/coda5_client/Makefile
index 4cc837cab12..0bcdac6a835 100644
--- a/net/coda5_client/Makefile
+++ b/net/coda5_client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2003/01/28 22:03:49 jlam Exp $
+# $NetBSD: Makefile,v 1.37 2003/04/10 01:28:20 grant Exp $
 
 PKGNAME=	coda-client-${DIST_VERS}
 COMMENT=	client programs for a replicated high-performance network file system
@@ -13,7 +13,7 @@ CONF_FILES+=	${EGDIR}/sidekick.intr.ex ${PKG_SYSCONFDIR}/sidekick.intr
 CONF_FILES+=	${EGDIR}/venus.conf.ex ${PKG_SYSCONFDIR}/venus.conf
 
 post-install:
-	cd ${PREFIX}; ${PAX} -zr					\
+	cd ${PREFIX} && ${PAX} -zr					\
 		-s "/usr\/\(man\/man.\/\)au.8/\1venus-au.8/"		\
 		-s "/usr\/\(man\/man.\/\)replay.8/\1coda_replay.8/"	\
 		-s "/usr\///"						\
diff --git a/net/coda5_server/Makefile b/net/coda5_server/Makefile
index 9c1ade83e60..b984c5be19a 100644
--- a/net/coda5_server/Makefile
+++ b/net/coda5_server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2003/01/28 22:03:50 jlam Exp $
+# $NetBSD: Makefile,v 1.36 2003/04/10 01:28:21 grant Exp $
 
 PKGNAME=	coda-server-${DIST_VERS}
 COMMENT=	server programs for a replicated high-performance network file system
@@ -12,7 +12,7 @@ USE_PKGINSTALL=	yes
 CONF_FILES+=	${EGDIR}/server.conf.ex ${PKG_SYSCONFDIR}/server.conf
 
 post-install:
-	cd ${PREFIX}; ${PAX} -zr					\
+	cd ${PREFIX} && ${PAX} -zr					\
 		-s "/usr\/\(man\/man.\/\)au.8/\1vice-au.8/"		\
 		-s "/usr\///"						\
 		-f ${_DISTDIR}/${CODADOC_DISTFILE}			\
diff --git a/net/coda_doc/Makefile b/net/coda_doc/Makefile
index 78a11fac584..7644a3fdd72 100644
--- a/net/coda_doc/Makefile
+++ b/net/coda_doc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/02/17 18:18:43 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2003/04/10 01:28:21 grant Exp $
 #
 
 DISTNAME=	coda-doc-4.6.5-3
@@ -20,7 +20,7 @@ do-build:
 	@${ECHO} "available.  It should appear in a release or two."
 
 do-install:
-	cd ${WRKSRC}; ${PAX} -r -w man ${PREFIX}
-	cd ${WRKSRC}; ${PAX} -r -w doc ${PREFIX}/share
+	cd ${WRKSRC} && ${PAX} -rw man ${PREFIX}
+	cd ${WRKSRC} && ${PAX} -rw doc ${PREFIX}/share
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/coda_intro/Makefile b/net/coda_intro/Makefile
index f0c6d4b4d7d..8601bf0b922 100644
--- a/net/coda_intro/Makefile
+++ b/net/coda_intro/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/02/17 18:18:43 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2003/04/10 01:28:21 grant Exp $
 #
 
 DISTNAME=	coda-intro-4.6.6
@@ -15,7 +15,7 @@ do-build:
 	@${TRUE}
 
 do-install:
-	cd ${WRKSRC}; ${PAX} -r -w -s '|.*CVS||' -s '|.*\.FreeBSD||' \
+	cd ${WRKSRC} && ${PAX} -rw -s '|.*CVS||' -s '|.*\.FreeBSD||' \
 		doc ${PREFIX}/share
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/docsis/Makefile b/net/docsis/Makefile
index 3c14d11cce0..35c03ddf125 100644
--- a/net/docsis/Makefile
+++ b/net/docsis/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/10/05 03:58:58 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2003/04/10 01:28:21 grant Exp $
 #
 
 DISTNAME=	docsis-0.7.5-RELEASE
@@ -22,7 +22,7 @@ do-install:
 		${INSTALL_DATA} ${WRKSRC}/CHANGES ${PREFIX}/share/doc/docsis
 		${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/docsis
 		${INSTALL_DATA_DIR} ${PREFIX}/share/examples/docsis
-		cd ${WRKSRC}/examples; ${PAX} -rw . ${PREFIX}/share/examples/docsis
+		cd ${WRKSRC}/examples && ${PAX} -rw . ${PREFIX}/share/examples/docsis
 
 .include "../../security/openssl/buildlink2.mk"
 .include "../../net/ucd-snmp/buildlink2.mk"
diff --git a/net/gated/Makefile b/net/gated/Makefile
index a2f8839fc4b..a29b1b665d0 100644
--- a/net/gated/Makefile
+++ b/net/gated/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/10/25 20:16:53 agc Exp $
+# $NetBSD: Makefile,v 1.11 2003/04/10 01:28:22 grant Exp $
 # FreeBSD Id: Makefile,v 1.17 1998/04/26 18:47:12 peter Exp 
 #
 
@@ -34,7 +34,7 @@ do-configure:
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gated
-	cd ${WRKSRC}/doc; ${PAX} -rwpe . ${PREFIX}/share/doc/gated
+	cd ${WRKSRC}/doc && ${PAX} -rw -pe . ${PREFIX}/share/doc/gated
 	${CHOWN} -R ${SHAREOWN} ${PREFIX}/share/doc/gated
 	${CHGRP} -R ${SHAREGRP} ${PREFIX}/share/doc/gated
 	${INSTALL_SCRIPT} ${WRKDIR}/gated ${PREFIX}/etc/rc.d
diff --git a/net/ntp4/Makefile b/net/ntp4/Makefile
index ab2ca0991cb..06376d7ac5f 100644
--- a/net/ntp4/Makefile
+++ b/net/ntp4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2002/07/16 14:57:08 fredb Exp $
+# $NetBSD: Makefile,v 1.22 2003/04/10 01:28:22 grant Exp $
 #
 
 DISTNAME=	ntp-4.1.1a
@@ -29,8 +29,8 @@ post-install:
 	cd ${WRKSRC} &&						\
 	    ${RM} conf/.cvsignore* 2> /dev/null || ${TRUE};	\
 	    ${RM} html/.cvsignore* 2> /dev/null || ${TRUE};	\
-	    ${PAX} -r -w -s "/html/ntp4/" html ${DOCDIR};	\
-	    ${PAX} -r -w -s "/conf/ntp4/" conf ${EXAMPLESDIR}
+	    ${PAX} -rw -s "/html/ntp4/" html ${DOCDIR};	\
+	    ${PAX} -rw -s "/conf/ntp4/" conf ${EXAMPLESDIR}
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DOCDIR}/ntp4 ${EXAMPLESDIR}/ntp4
 	${CHMOD} -R ${SHAREMODE} ${DOCDIR}/ntp4 ${EXAMPLESDIR}/ntp4
 	${CHMOD} a+x ${DOCDIR}/ntp4 ${DOCDIR}/ntp4/hints ${DOCDIR}/ntp4/pic