make ${PAX} usage consistent:

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

5 files changed, 18 insertions, 19 deletions

diff --git a/lang/gcc-ssp/Makefile b/lang/gcc-ssp/Makefile
index 45a79031a86..f2659441069 100644
--- a/lang/gcc-ssp/Makefile
+++ b/lang/gcc-ssp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2003/03/29 12:41:25 jmmv Exp $
+# $NetBSD: Makefile,v 1.20 2003/04/10 01:28:19 grant Exp $
 
 DISTNAME=		gcc-2.95.3
 GCC_VERSION=		2.95.3
@@ -59,7 +59,6 @@ ALL_TARGET=		bootstrap
 GCC_PREFIX=		${LOCALBASE}
 PLIST_SRC=		${PKGDIR}/PLIST.SunOS
 PLIST_SUBST+=		GCC_VERSION=${GCC_VERSION}
-MESSAGE=		${PKGDIR}/MESSAGE.SunOS
 CONFLICTS+=		gcc-[0-9]* pgcc-[0-9]*
 .endif
 
diff --git a/lang/py-html-docs/Makefile b/lang/py-html-docs/Makefile
index dcbc2a93720..29fbc6d516d 100644
--- a/lang/py-html-docs/Makefile
+++ b/lang/py-html-docs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/03/29 12:41:30 jmmv Exp $
+# $NetBSD: Makefile,v 1.13 2003/04/10 01:28:19 grant Exp $
 #
 
 DISTNAME=	html-2.0
@@ -23,9 +23,9 @@ PLIST_SRC=	${WRKDIR}/.PLIST_SRC
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/${HTMLDIR}
 	${CAT} ${PKGDIR}/PLIST.pre >${PLIST_SRC}
-	(cd ${WRKSRC}; ${PAX} -r -w -v -p e [a-z]* ${PREFIX}/${HTMLDIR})
-	(cd ${PREFIX}; ${FIND} ${HTMLDIR} -type f -print >>${PLIST_SRC})
-	(cd ${PREFIX}; ${FIND} -d ${HTMLDIR} -type d -print | \
-	${SED} -e "s/^/@dirrm /" >>${PLIST_SRC})
+	cd ${WRKSRC} && ${PAX} -rw -pe [a-z]* ${PREFIX}/${HTMLDIR}
+	cd ${PREFIX} && ${FIND} ${HTMLDIR} -type f -print >>${PLIST_SRC}
+	cd ${PREFIX} && ${FIND} -d ${HTMLDIR} -type d -print | \
+	${SED} -e "s/^/@dirrm /" >>${PLIST_SRC}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/py21-html-docs/Makefile b/lang/py21-html-docs/Makefile
index c22d9b5e9f4..a3e9b9817bf 100644
--- a/lang/py21-html-docs/Makefile
+++ b/lang/py21-html-docs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:41:30 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/04/10 01:28:19 grant Exp $
 #
 
 DISTNAME=	html-2.1.3
@@ -23,9 +23,9 @@ PLIST_SRC=	${WRKDIR}/.PLIST_SRC
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/${HTMLDIR}
 	${CAT} ${PKGDIR}/PLIST.pre >${PLIST_SRC}
-	(cd ${WRKSRC}; ${PAX} -r -w -v -p e [a-z]* ${PREFIX}/${HTMLDIR})
-	(cd ${PREFIX}; ${FIND} ${HTMLDIR} -type f -print >>${PLIST_SRC})
-	(cd ${PREFIX}; ${FIND} -d ${HTMLDIR} -type d -print | \
-	${SED} -e "s/^/@dirrm /" >>${PLIST_SRC})
+	cd ${WRKSRC} && ${PAX} -rw -pe [a-z]* ${PREFIX}/${HTMLDIR}
+	cd ${PREFIX} && ${FIND} ${HTMLDIR} -type f -print >>${PLIST_SRC}
+	cd ${PREFIX} && ${FIND} -d ${HTMLDIR} -type d -print | \
+	${SED} -e "s/^/@dirrm /" >>${PLIST_SRC}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/py22-html-docs/Makefile b/lang/py22-html-docs/Makefile
index ff2e985fa25..b3bae48c6b0 100644
--- a/lang/py22-html-docs/Makefile
+++ b/lang/py22-html-docs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/03/29 12:41:30 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2003/04/10 01:28:20 grant Exp $
 #
 
 DISTNAME=	html-2.2.2
@@ -23,9 +23,9 @@ PLIST_SRC=	${WRKDIR}/.PLIST_SRC
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/${HTMLDIR}
 	${CAT} ${PKGDIR}/PLIST.pre >${PLIST_SRC}
-	(cd ${WRKSRC}; ${PAX} -r -w -v -p e [a-z]* ${PREFIX}/${HTMLDIR})
-	(cd ${PREFIX}; ${FIND} ${HTMLDIR} -type f -print >>${PLIST_SRC})
-	(cd ${PREFIX}; ${FIND} -d ${HTMLDIR} -type d -print | \
-	${SED} -e "s/^/@dirrm /" >>${PLIST_SRC})
+	cd ${WRKSRC} && ${PAX} -rw -pe [a-z]* ${PREFIX}/${HTMLDIR}
+	cd ${PREFIX} && ${FIND} ${HTMLDIR} -type f -print >>${PLIST_SRC}
+	cd ${PREFIX} && ${FIND} -d ${HTMLDIR} -type d -print | \
+	${SED} -e "s/^/@dirrm /" >>${PLIST_SRC}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/tcl/Makefile b/lang/tcl/Makefile
index 64404914741..f748d81dcc1 100644
--- a/lang/tcl/Makefile
+++ b/lang/tcl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2003/03/29 12:41:33 jmmv Exp $
+# $NetBSD: Makefile,v 1.19 2003/04/10 01:28:20 grant Exp $
 #
 
 DISTNAME=		tcl8.3.4
@@ -64,7 +64,7 @@ pre-install:
 
 post-install:
 	${CHMOD} -R ugo-w ${WRKDIR}/man
-	cd ${WRKDIR}; ${PAX} -rw man ${PREFIX}
+	cd ${WRKDIR} && ${PAX} -rw man ${PREFIX}
 	${CHMOD} -R ug+rw ${WRKDIR}/man
 	cd ${PREFIX}/bin && ${LN} -s tclsh8.3 tclsh
 	${INSTALL_DATA_DIR} ${PREFIX}/include/tcl