make ${PAX} usage consistent:

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

10 files changed, 37 insertions, 38 deletions

diff --git a/textproc/crimson/Makefile b/textproc/crimson/Makefile
index 33d49ac747e..d994cf6bae1 100644
--- a/textproc/crimson/Makefile
+++ b/textproc/crimson/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/03/29 12:42:36 jmmv Exp $
+# $NetBSD: Makefile,v 1.10 2003/04/10 01:28:24 grant Exp $
 #
 # We use the binary distribution of crimson because otherwise we
 # have a bootstrap-loop between jakarta-ant and crimson, each of which
@@ -23,9 +23,9 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/java
 	${INSTALL_DATA} ${WRKSRC}/crimson.jar ${PREFIX}/lib/java
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/java/crimson
-	cd ${WRKSRC}/docs && ${PAX} -rwpp * ${PREFIX}/share/doc/java/crimson
+	cd ${WRKSRC}/docs && ${PAX} -rw -pp * ${PREFIX}/share/doc/java/crimson
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/java/crimson
-	cd ${WRKSRC}/examples && ${PAX} -rwpp * ${PREFIX}/share/examples/java/crimson
+	cd ${WRKSRC}/examples && ${PAX} -rw -pp * ${PREFIX}/share/examples/java/crimson
 
 .include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/docbook-website/Makefile b/textproc/docbook-website/Makefile
index ffdd69b4dba..7b53aef4ff1 100644
--- a/textproc/docbook-website/Makefile
+++ b/textproc/docbook-website/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/01/29 21:31:17 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2003/04/10 01:28:25 grant Exp $
 #
 
 DISTNAME=	website-2.3
@@ -27,10 +27,10 @@ do-install:
 	${INSTALL_DATA_DIR} ${DOCDIR}
 	${INSTALL_DATA_DIR} ${DTDDIR}
 	${INSTALL_DATA_DIR} ${EGDIR}
-	@cd ${WRKSRC}; ${PAX} -rw ChangeLog README VERSION WhatsNew	\
+	cd ${WRKSRC} && ${PAX} -rw ChangeLog README VERSION WhatsNew	\
 		${DOCDIR}
-	@cd ${WRKSRC}/example; ${PAX} -rw . ${EGDIR}
-	@cd ${WRKSRC}; ${PAX} -rw VERSION extensions xsl *.dtd *.mod	\
+	cd ${WRKSRC}/example && ${PAX} -rw . ${EGDIR}
+	cd ${WRKSRC} && ${PAX} -rw VERSION extensions xsl *.dtd *.mod	\
 		${DTDDIR}
 	${INSTALL_DATA} ${FILESDIR}/catalog ${DTDDIR}/catalog
 
diff --git a/textproc/docbook-xsl/Makefile b/textproc/docbook-xsl/Makefile
index 315b9d3687e..7473791f15c 100644
--- a/textproc/docbook-xsl/Makefile
+++ b/textproc/docbook-xsl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/03/28 21:14:36 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2003/04/10 01:28:25 grant Exp $
 #
 
 DISTNAME=	docbook-xsl-1.60.1
@@ -26,15 +26,15 @@ XML_CATALOGS=	${XSLDIR}/catalog
 
 do-install:
 	${INSTALL_DATA_DIR} ${DOCDIR}
-	cd ${WRKSRC}/doc && ${PAX} -rwpppm . ${DOCDIR}
+	cd ${WRKSRC}/doc && ${PAX} -rw -pp -pm . ${DOCDIR}
 	${INSTALL_DATA_DIR} ${EGDIR}
-	cd ${WRKSRC}/template && ${PAX} -rwpppm . ${EGDIR}
+	cd ${WRKSRC}/template && ${PAX} -rw -pp -pm . ${EGDIR}
 	${INSTALL_DATA_DIR} ${XSLDIR}
 	${INSTALL_DATA} ${WRKSRC}/VERSION ${XSLDIR}
 	@for d in ${XSLMODS}; do \
 	    ${ECHO} "${INSTALL_DATA_DIR} ${XSLDIR}/$$d"; \
-	    ${ECHO} "cd ${WRKSRC} && ${PAX} -rwpppm $$d ${XSLDIR}/"; \
-	    cd ${WRKSRC} && ${PAX} -rwpppm $$d ${XSLDIR}/; \
+	    ${ECHO} "cd ${WRKSRC} && ${PAX} -rw -pp -pm $$d ${XSLDIR}/"; \
+	    cd ${WRKSRC} && ${PAX} -rw -pp -pm $$d ${XSLDIR}/; \
 	done
 	${INSTALL_DATA} ${FILESDIR}/catalog ${XSLDIR}/catalog
 
diff --git a/textproc/fop/Makefile b/textproc/fop/Makefile
index 6264d667fe8..ba34877bcc5 100644
--- a/textproc/fop/Makefile
+++ b/textproc/fop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2003/03/28 21:14:36 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2003/04/10 01:28:26 grant Exp $
 #
 # Note: we currently use the pre-built (-bin) distribution of FOP,
 # because although FOP runs fine under JDK 1.1, JDK 1.2 or greater is
@@ -34,7 +34,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/build/fop.jar ${PREFIX}/lib/java/fop.jar
 	${INSTALL_DATA} ${WRKSRC}/lib/w3c.jar ${PREFIX}/lib/java/fop-w3c.jar
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/java/fop
-	cd ${WRKSRC}/docs && ${PAX} -rwpp . ${PREFIX}/share/doc/java/fop
+	cd ${WRKSRC}/docs && ${PAX} -rw -pp . ${PREFIX}/share/doc/java/fop
 
 .include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/py-dtml/Makefile b/textproc/py-dtml/Makefile
index b409b803b1d..ebd58e1d388 100644
--- a/textproc/py-dtml/Makefile
+++ b/textproc/py-dtml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/03/29 12:42:40 jmmv Exp $
+# $NetBSD: Makefile,v 1.11 2003/04/10 01:28:26 grant Exp $
 #
 
 DISTNAME=	Zope-2.2.2-src
@@ -20,26 +20,25 @@ EXTRACT_ELEMENTS=	${DISTNAME}/lib/python/DocumentTemplate \
 			${DISTNAME}/lib/python/ts_regex.py
 
 do-configure:
-	( cd ${WRKSRC} ;\
-	  ${CP} ${PY_CONFIGDIR}/Makefile.pre.in . ;\
+	(cd ${WRKSRC} && \
+	  ${CP} ${PY_CONFIGDIR}/Makefile.pre.in . &&\
 	  ${MAKE} -f Makefile.pre.in boot)
 
 post-build:
-	(cd ${WRKSRC}; make clean; ${RM} Makefile* sedscript release.* *.c)
-	(cd ${WRKSRC}/..; ${PY_PROG} ${PY_LIBDIR}/compileall.py .)
-	(cd ${WRKSRC}/..; ${PY_PROG} -O ${PY_LIBDIR}/compileall.py .)
+	cd ${WRKSRC} && make clean && ${RM} Makefile* sedscript release.* *.c
+	cd ${WRKSRC}/.. && ${PY_PROG} ${PY_LIBDIR}/compileall.py .
+	cd ${WRKSRC}/.. && ${PY_PROG} -O ${PY_LIBDIR}/compileall.py .
 
 do-install:
 	${INSTALL_SCRIPT_DIR} ${PY_SITEPKG}
 	${CAT} ${PKGDIR}/PLIST.pre >${PLIST_SRC}
-	(cd ${WRKSRC}/..; ${PAX} -r -w -v -p p . ${PY_SITEPKG})
-	(cd ${PREFIX}; ${FIND} ${PY_SITEPATH}/DocumentTemplate \
+	cd ${WRKSRC}/.. && ${PAX} -rw -pp . ${PY_SITEPKG}
+	cd ${PREFIX} && ${FIND} ${PY_SITEPATH}/DocumentTemplate \
 		${PY_SITEPATH}/StructuredText \
 		-type f -print >>${PLIST_SRC})
-	(cd ${PREFIX}; ${FIND} -d ${PY_SITEPATH}/DocumentTemplate \
+	cd ${PREFIX} && ${FIND} -d ${PY_SITEPATH}/DocumentTemplate \
 		${PY_SITEPATH}/StructuredText \
-		-type d -print | ${SED} -e "s/^/@dirrm /" >>${PLIST_SRC})
+		-type d -print | ${SED} -e "s/^/@dirrm /" >>${PLIST_SRC}
 
 .include "../../lang/python20/Makefile.inc"
 .include "../../mk/bsd.pkg.mk"
-
diff --git a/textproc/saxon/Makefile b/textproc/saxon/Makefile
index 4baa71ad85f..6a5dddd6f9e 100644
--- a/textproc/saxon/Makefile
+++ b/textproc/saxon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/03/29 12:42:42 jmmv Exp $
+# $NetBSD: Makefile,v 1.9 2003/04/10 01:28:26 grant Exp $
 #
 
 DISTNAME=	saxon
@@ -22,9 +22,9 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/java
 	${INSTALL_DATA} ${WRKSRC}/saxon.jar ${PREFIX}/lib/java
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/java
-	(cd ${WRKSRC} && ${PAX} -r -w -s '/^doc/saxon/' doc ${PREFIX}/share/doc/java)
+	cd ${WRKSRC} && ${PAX} -rw -s '/^doc/saxon/' doc ${PREFIX}/share/doc/java
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/java/saxon
-	(cd ${WRKSRC} && ${PAX} -r -w -s '/^samples/saxon/' samples ${PREFIX}/share/examples/java)
+	cd ${WRKSRC} && ${PAX} -rw -s '/^samples/saxon/' samples ${PREFIX}/share/examples/java
 
 .include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/xalan-j/Makefile b/textproc/xalan-j/Makefile
index 8c110bdeb02..4b0065e61ff 100644
--- a/textproc/xalan-j/Makefile
+++ b/textproc/xalan-j/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2003/03/29 12:42:42 jmmv Exp $
+# $NetBSD: Makefile,v 1.15 2003/04/10 01:28:26 grant Exp $
 #
 # Note: we currently use the pre-built (-bin) distribution of Xalan-J,
 # because although Xalan runs fine under JDK 1.1, JDK 1.2 or greater is
@@ -25,9 +25,9 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/xalan.jar ${PREFIX}/lib/java
 	${INSTALL_DATA} ${WRKSRC}/bsf.jar ${PREFIX}/lib/java
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/java/xalan
-	cd ${WRKSRC}/docs && ${PAX} -rwpp . ${PREFIX}/share/doc/java/xalan
+	cd ${WRKSRC}/docs && ${PAX} -rw -pp . ${PREFIX}/share/doc/java/xalan
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/java/xalan
-	cd ${WRKSRC}/samples && ${PAX} -rwpp . ${PREFIX}/share/examples/java/xalan
+	cd ${WRKSRC}/samples && ${PAX} -rw -pp . ${PREFIX}/share/examples/java/xalan
 
 .include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/xerces-j/Makefile b/textproc/xerces-j/Makefile
index e362add348b..43b61c45be4 100644
--- a/textproc/xerces-j/Makefile
+++ b/textproc/xerces-j/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2003/03/29 12:42:43 jmmv Exp $
+# $NetBSD: Makefile,v 1.18 2003/04/10 01:28:27 grant Exp $
 #
 # Note: we currently use the pre-built (-bin) distribution of Xerces-J,
 # because although Xerces runs fine under JDK 1.1, JDK 1.2 or greater is
@@ -23,10 +23,10 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/java
 	${INSTALL_DATA} ${WRKSRC}/xerces.jar ${PREFIX}/lib/java
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/java/xerces
-	cd ${WRKSRC}/docs && ${PAX} -rwpp . ${PREFIX}/share/doc/java/xerces
+	cd ${WRKSRC}/docs && ${PAX} -rw -pp . ${PREFIX}/share/doc/java/xerces
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/java/xerces
 	${INSTALL_DATA} ${WRKSRC}/xercesSamples.jar ${PREFIX}/share/examples/java/xerces
-	cd ${WRKSRC}/data && ${PAX} -rwpp . ${PREFIX}/share/examples/java/xerces
+	cd ${WRKSRC}/data && ${PAX} -rw -pp . ${PREFIX}/share/examples/java/xerces
 
 .include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/xp/Makefile b/textproc/xp/Makefile
index d31f4429bba..15a00794932 100644
--- a/textproc/xp/Makefile
+++ b/textproc/xp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/03/28 21:14:37 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2003/04/10 01:28:27 grant Exp $
 #
 
 DISTNAME=	xp
@@ -25,7 +25,7 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/java
 	${INSTALL_DATA} ${WRKDIR}/xp.jar ${PREFIX}/lib/java
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/java/xp
-	cd ${WRKDIR}/docs && ${PAX} -rwpp . ${PREFIX}/share/doc/java/xp
+	cd ${WRKDIR}/docs && ${PAX} -rw -pp . ${PREFIX}/share/doc/java/xp
 
 .include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/xt/Makefile b/textproc/xt/Makefile
index 33dc1fff358..bb5da8475a4 100644
--- a/textproc/xt/Makefile
+++ b/textproc/xt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/03/28 21:14:37 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2003/04/10 01:28:27 grant Exp $
 #
 
 DISTNAME=	xt
@@ -30,7 +30,7 @@ do-install:
 	${INSTALL_DATA} -c ${WRKDIR}/copying.txt ${PREFIX}/share/doc/java/xt
 	${INSTALL_DATA} -c ${WRKDIR}/xt.htm ${PREFIX}/share/doc/java/xt
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/java/xt
-	cd ${WRKDIR}/demo && ${PAX} -rwpp . ${PREFIX}/share/examples/java/xt
+	cd ${WRKDIR}/demo && ${PAX} -rw -pp . ${PREFIX}/share/examples/java/xt
 
 .include "../../mk/java-vm.mk"
 .include "../../mk/bsd.pkg.mk"