make ${PAX} usage consistent:

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

32 files changed, 64 insertions, 64 deletions

diff --git a/audio/esound/Makefile b/audio/esound/Makefile
index b6050dfc371..d7b7a1e1bf5 100644
--- a/audio/esound/Makefile
+++ b/audio/esound/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2003/03/15 08:58:43 jmmv Exp $
+# $NetBSD: Makefile,v 1.41 2003/04/10 01:28:03 grant Exp $
 
 DISTNAME=		esound-0.2.29
 PKGREVISION=		1
@@ -25,7 +25,7 @@ CONF_FILES=		${EGDIR}/esd.conf ${PKG_SYSCONFDIR}/esd.conf
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/esound
 	cd ${WRKSRC}/docs/html && \
-		${PAX} -rwpppm . ${PREFIX}/share/doc/html/esound
+		${PAX} -rw -pp -pm . ${PREFIX}/share/doc/html/esound
 
 .include "../../audio/libaudiofile/buildlink2.mk"
 .include "../../mk/ossaudio.buildlink2.mk"
diff --git a/audio/festival/Makefile b/audio/festival/Makefile
index b3c113015ca..d78379a77a9 100644
--- a/audio/festival/Makefile
+++ b/audio/festival/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2002/12/13 04:16:45 gson Exp $
+# $NetBSD: Makefile,v 1.23 2003/04/10 01:28:03 grant Exp $
 
 DISTNAME=	festival-1.4.1
 PKGREVISION=	1
@@ -63,7 +63,7 @@ do-install:
 	${INSTALL_DATA_DIR} ${FHOME}
 	${CHMOD} -R u+w,a+r,og-w ${FESTIVAL}/lib
 	${FIND} ${FESTIVAL}/lib -type d -print | ${XARGS} ${CHMOD} 755
-	cd ${FESTIVAL} && ${PAX} -r -w lib examples ${FHOME}
+	cd ${FESTIVAL} && ${PAX} -rw lib examples ${FHOME}
 	${RM} -f ${FHOME}/lib/etc/NetBSD/audsp
 	${INSTALL_PROGRAM} ${FESTIVAL}/lib/etc/NetBSD/audsp ${PREFIX}/libexec
 	${INSTALL_PROGRAM} ${FESTIVAL}/src/main/festival ${PREFIX}/libexec/festival.naked
diff --git a/audio/festlex-cmu/Makefile b/audio/festlex-cmu/Makefile
index 9fecfd925cb..8afea1f61d9 100644
--- a/audio/festlex-cmu/Makefile
+++ b/audio/festlex-cmu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/07/18 15:19:37 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2003/04/10 01:28:04 grant Exp $
 
 DISTNAME=	festlex_CMU
 PKGNAME=	festlex-cmu-1.4.0
@@ -23,6 +23,6 @@ post-extract:
 
 do-install:
 	${INSTALL_DATA_DIR} ${FHOME}
-	cd ${WRKSRC} && ${PAX} -r -w * ${FHOME}
+	cd ${WRKSRC} && ${PAX} -rw * ${FHOME}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/festlex-oald/Makefile b/audio/festlex-oald/Makefile
index c265d49416a..bd6fe3d1b9c 100644
--- a/audio/festlex-oald/Makefile
+++ b/audio/festlex-oald/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/07/18 15:19:37 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2003/04/10 01:28:04 grant Exp $
 
 DISTNAME=	festlex_OALD
 PKGNAME=	festlex-oald-1.4.0
@@ -25,6 +25,6 @@ post-extract:
 
 do-install:
 	${INSTALL_DATA_DIR} ${FHOME}
-	cd ${WRKSRC} && ${PAX} -r -w * ${FHOME}
+	cd ${WRKSRC} && ${PAX} -rw * ${FHOME}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/festlex-ogi/Makefile b/audio/festlex-ogi/Makefile
index 39d11de3500..942b095ec42 100644
--- a/audio/festlex-ogi/Makefile
+++ b/audio/festlex-ogi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2001/07/18 15:19:38 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2003/04/10 01:28:04 grant Exp $
 
 DISTNAME=	OGIlexicon-2.0
 PKGNAME=	festlex-ogi-2.0
@@ -25,6 +25,6 @@ post-extract:
 
 do-install:
 	${INSTALL_DATA_DIR} ${FHOME}
-	cd ${WRKSRC} && ${PAX} -r -w * ${FHOME}
+	cd ${WRKSRC} && ${PAX} -rw * ${FHOME}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/festlex-poslex/Makefile b/audio/festlex-poslex/Makefile
index 4f1e8bec45c..7f81aea5f4c 100644
--- a/audio/festlex-poslex/Makefile
+++ b/audio/festlex-poslex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/07/18 15:19:38 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2003/04/10 01:28:04 grant Exp $
 
 DISTNAME=	festlex_POSLEX
 PKGNAME=	festlex-poslex-1.4.0
@@ -23,6 +23,6 @@ post-extract:
 
 do-install:
 	${INSTALL_DATA_DIR} ${FHOME}
-	cd ${WRKSRC} && ${PAX} -r -w * ${FHOME}
+	cd ${WRKSRC} && ${PAX} -rw * ${FHOME}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/festogi-spanish/Makefile b/audio/festogi-spanish/Makefile
index 37ddfe44810..da1088990ab 100644
--- a/audio/festogi-spanish/Makefile
+++ b/audio/festogi-spanish/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/07/18 15:19:39 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2003/04/10 01:28:04 grant Exp $
 
 DISTNAME=	OGIspanish-2.0.1
 PKGNAME=	festogi-spanish-2.0.1
@@ -25,6 +25,6 @@ post-extract:
 
 do-install:
 	${INSTALL_DATA_DIR} ${FHOME}
-	cd ${WRKSRC} && ${PAX} -r -w * ${FHOME}
+	cd ${WRKSRC} && ${PAX} -rw * ${FHOME}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/festvox-abc/Makefile b/audio/festvox-abc/Makefile
index d3d49acaf00..6723d1c969e 100644
--- a/audio/festvox-abc/Makefile
+++ b/audio/festvox-abc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/07/18 15:19:39 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2003/04/10 01:28:05 grant Exp $
 
 DISTNAME=	voice_abc_di-2.0
 PKGNAME=	festvox-abc-2.0
@@ -28,6 +28,6 @@ post-extract:
 
 do-install:
 	${INSTALL_DATA_DIR} ${FHOME}
-	cd ${WRKSRC} && ${PAX} -r -w * ${FHOME}
+	cd ${WRKSRC} && ${PAX} -rw * ${FHOME}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/festvox-aec/Makefile b/audio/festvox-aec/Makefile
index 8d7cdcbcf09..631ddb06b05 100644
--- a/audio/festvox-aec/Makefile
+++ b/audio/festvox-aec/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2002/08/06 15:17:27 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2003/04/10 01:28:05 grant Exp $
 
 DISTNAME=	voice_aec_di-2.0
 PKGNAME=	festvox-aec-2.0
@@ -29,6 +29,6 @@ post-extract:
 
 do-install:
 	${INSTALL_DATA_DIR} ${FHOME}
-	cd ${WRKSRC} && ${PAX} -r -w * ${FHOME}
+	cd ${WRKSRC} && ${PAX} -rw * ${FHOME}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/festvox-don/Makefile b/audio/festvox-don/Makefile
index a06016e1779..da3f24b118e 100644
--- a/audio/festvox-don/Makefile
+++ b/audio/festvox-don/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/07/18 15:19:40 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2003/04/10 01:28:05 grant Exp $
 
 DISTNAME=	festvox_don
 PKGNAME=	festvox-don-1.4.0
@@ -25,6 +25,6 @@ post-extract:
 
 do-install:
 	${INSTALL_DATA_DIR} ${FHOME}
-	cd ${WRKSRC} && ${PAX} -r -w * ${FHOME}
+	cd ${WRKSRC} && ${PAX} -rw * ${FHOME}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/festvox-el11/Makefile b/audio/festvox-el11/Makefile
index 367d700fb9d..4bd6678876f 100644
--- a/audio/festvox-el11/Makefile
+++ b/audio/festvox-el11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/07/18 15:19:41 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2003/04/10 01:28:05 grant Exp $
 
 DISTNAME=	festvox_ellpc11k
 PKGNAME=	festvox-el11-1.4.0
@@ -25,6 +25,6 @@ post-extract:
 
 do-install:
 	${INSTALL_DATA_DIR} ${FHOME}
-	cd ${WRKSRC} && ${PAX} -r -w * ${FHOME}
+	cd ${WRKSRC} && ${PAX} -rw * ${FHOME}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/festvox-en1/Makefile b/audio/festvox-en1/Makefile
index 694f6ef00ae..abcd267cb0a 100644
--- a/audio/festvox-en1/Makefile
+++ b/audio/festvox-en1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/07/18 15:19:41 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2003/04/10 01:28:06 grant Exp $
 
 DISTNAME=	festvox_en1
 PKGNAME=	festvox-en1-1.4.0
@@ -29,7 +29,7 @@ post-extract:
 	@ ${FIND} ${WRKSRC} -type d -print | ${XARGS} ${CHMOD} 755
 
 do-install:
-	cd ${WRKSRC} && ${PAX} -r -w * ${FHOME}
+	cd ${WRKSRC} && ${PAX} -rw * ${FHOME}
 #ugh
 	${LN} -fs ../../../../../mbrola/voices/en1 ${MBROLA}
 	${LN} -fs ../../../../../mbrola/voices/en1/en1mrpa ${MBROLA}
diff --git a/audio/festvox-hvs/Makefile b/audio/festvox-hvs/Makefile
index 34817a27118..4af430efb9a 100644
--- a/audio/festvox-hvs/Makefile
+++ b/audio/festvox-hvs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/07/18 15:19:41 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2003/04/10 01:28:06 grant Exp $
 
 DISTNAME=	voice_hvs_di-2.0
 PKGNAME=	festvox-hvs-2.0
@@ -27,6 +27,6 @@ post-extract:
 
 do-install:
 	${INSTALL_DATA_DIR} ${FHOME}
-	cd ${WRKSRC} && ${PAX} -r -w * ${FHOME}
+	cd ${WRKSRC} && ${PAX} -rw * ${FHOME}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/festvox-jph/Makefile b/audio/festvox-jph/Makefile
index 68b66ea5ea2..31d83eb3572 100644
--- a/audio/festvox-jph/Makefile
+++ b/audio/festvox-jph/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/07/18 15:19:42 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2003/04/10 01:28:06 grant Exp $
 
 DISTNAME=	voice_jph_di-2.0
 PKGNAME=	festvox-jph-2.0
@@ -26,6 +26,6 @@ post-extract:
 
 do-install:
 	${INSTALL_DATA_DIR} ${FHOME}
-	cd ${WRKSRC} && ${PAX} -r -w * ${FHOME}
+	cd ${WRKSRC} && ${PAX} -rw * ${FHOME}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/festvox-kal16/Makefile b/audio/festvox-kal16/Makefile
index 5899fb2ed48..25f30f78abb 100644
--- a/audio/festvox-kal16/Makefile
+++ b/audio/festvox-kal16/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/09/27 23:17:42 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2003/04/10 01:28:07 grant Exp $
 
 DISTNAME=	festvox_kallpc16k
 PKGNAME=	festvox-kal16-1.4.0
@@ -27,6 +27,6 @@ post-extract:
 
 do-install:
 	${INSTALL_DATA_DIR} ${FHOME}
-	cd ${WRKSRC} && ${PAX} -r -w * ${FHOME}
+	cd ${WRKSRC} && ${PAX} -rw * ${FHOME}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/festvox-kal8/Makefile b/audio/festvox-kal8/Makefile
index aceed2ebaa8..b9ede16fb4e 100644
--- a/audio/festvox-kal8/Makefile
+++ b/audio/festvox-kal8/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2001/09/27 23:17:43 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2003/04/10 01:28:07 grant Exp $
 
 DISTNAME=	festvox_kallpc8k
 PKGNAME=	festvox-kal8-1.4.0
@@ -27,6 +27,6 @@ post-extract:
 
 do-install:
 	${INSTALL_DATA_DIR} ${FHOME}
-	cd ${WRKSRC} && ${PAX} -r -w * ${FHOME}
+	cd ${WRKSRC} && ${PAX} -rw * ${FHOME}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/festvox-ked16/Makefile b/audio/festvox-ked16/Makefile
index 2bd943bb6ce..987022659c7 100644
--- a/audio/festvox-ked16/Makefile
+++ b/audio/festvox-ked16/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/09/27 23:17:43 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2003/04/10 01:28:07 grant Exp $
 
 DISTNAME=	festvox_kedlpc16k
 PKGNAME=	festvox-ked16-1.4.0
@@ -27,6 +27,6 @@ post-extract:
 
 do-install:
 	${INSTALL_DATA_DIR} ${FHOME}
-	cd ${WRKSRC} && ${PAX} -r -w * ${FHOME}
+	cd ${WRKSRC} && ${PAX} -rw * ${FHOME}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/festvox-ked8/Makefile b/audio/festvox-ked8/Makefile
index 7d83c4e99c3..562eae1fd88 100644
--- a/audio/festvox-ked8/Makefile
+++ b/audio/festvox-ked8/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2001/09/27 23:17:43 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2003/04/10 01:28:09 grant Exp $
 
 DISTNAME=	festvox_kedlpc8k
 PKGNAME=	festvox-ked8-1.4.0
@@ -27,6 +27,6 @@ post-extract:
 
 do-install:
 	${INSTALL_DATA_DIR} ${FHOME}
-	cd ${WRKSRC} && ${PAX} -r -w * ${FHOME}
+	cd ${WRKSRC} && ${PAX} -rw * ${FHOME}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/festvox-mwm/Makefile b/audio/festvox-mwm/Makefile
index f86ad4d87d2..e61340ad630 100644
--- a/audio/festvox-mwm/Makefile
+++ b/audio/festvox-mwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/07/18 15:19:43 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2003/04/10 01:28:09 grant Exp $
 
 DISTNAME=	voice_mwm_di-2.0
 PKGNAME=	festvox-mwm-2.0
@@ -26,6 +26,6 @@ post-extract:
 
 do-install:
 	${INSTALL_DATA_DIR} ${FHOME}
-	cd ${WRKSRC} && ${PAX} -r -w * ${FHOME}
+	cd ${WRKSRC} && ${PAX} -rw * ${FHOME}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/festvox-ogirab/Makefile b/audio/festvox-ogirab/Makefile
index 911b4ba9038..97da8dd1776 100644
--- a/audio/festvox-ogirab/Makefile
+++ b/audio/festvox-ogirab/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/07/18 15:19:44 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2003/04/10 01:28:09 grant Exp $
 
 DISTNAME=	voice_ogirab_di-2.0
 PKGNAME=	festvox-ogirab-2.0
@@ -26,6 +26,6 @@ post-extract:
 
 do-install:
 	${INSTALL_DATA_DIR} ${FHOME}
-	cd ${WRKSRC} && ${PAX} -r -w * ${FHOME}
+	cd ${WRKSRC} && ${PAX} -rw * ${FHOME}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/festvox-rab16/Makefile b/audio/festvox-rab16/Makefile
index f81edf489bf..4f0ed4086cf 100644
--- a/audio/festvox-rab16/Makefile
+++ b/audio/festvox-rab16/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/09/27 23:17:43 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2003/04/10 01:28:10 grant Exp $
 
 DISTNAME=	festvox_rablpc16k
 PKGNAME=	festvox-rab16-1.4.0
@@ -27,6 +27,6 @@ post-extract:
 
 do-install:
 	${INSTALL_DATA_DIR} ${FHOME}
-	cd ${WRKSRC} && ${PAX} -r -w * ${FHOME}
+	cd ${WRKSRC} && ${PAX} -rw * ${FHOME}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/festvox-rab8/Makefile b/audio/festvox-rab8/Makefile
index 53d63ac880b..0f3f203f429 100644
--- a/audio/festvox-rab8/Makefile
+++ b/audio/festvox-rab8/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2001/09/27 23:17:43 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2003/04/10 01:28:10 grant Exp $
 
 DISTNAME=	festvox_rablpc8k
 PKGNAME=	festvox-rab8-1.4.0
@@ -27,6 +27,6 @@ post-extract:
 
 do-install:
 	${INSTALL_DATA_DIR} ${FHOME}
-	cd ${WRKSRC} && ${PAX} -r -w * ${FHOME}
+	cd ${WRKSRC} && ${PAX} -rw * ${FHOME}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/festvox-tll/Makefile b/audio/festvox-tll/Makefile
index 1380baf01ab..fed00c709ed 100644
--- a/audio/festvox-tll/Makefile
+++ b/audio/festvox-tll/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2001/07/18 15:19:45 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2003/04/10 01:28:10 grant Exp $
 
 DISTNAME=	voice_tll_di-2.0
 PKGNAME=	festvox-tll-2.0
@@ -26,6 +26,6 @@ post-extract:
 
 do-install:
 	${INSTALL_DATA_DIR} ${FHOME}
-	cd ${WRKSRC} && ${PAX} -r -w * ${FHOME}
+	cd ${WRKSRC} && ${PAX} -rw * ${FHOME}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/festvox-us1/Makefile b/audio/festvox-us1/Makefile
index bf699598f9b..8e8bf38b1da 100644
--- a/audio/festvox-us1/Makefile
+++ b/audio/festvox-us1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/07/18 15:19:45 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2003/04/10 01:28:10 grant Exp $
 
 DISTNAME=	festvox_us1
 PKGNAME=	festvox-us1-1.4.0
@@ -29,7 +29,7 @@ post-extract:
 	@ ${FIND} ${WRKSRC} -type d -print | ${XARGS} ${CHMOD} 755
 
 do-install:
-	cd ${WRKSRC} && ${PAX} -r -w * ${FHOME}
+	cd ${WRKSRC} && ${PAX} -rw * ${FHOME}
 #ugh
 	${LN} -fs ../../../../../mbrola/voices/us1 ${MBROLA}
 	${LN} -fs ../../../../../mbrola/voices/us1/us1mrpa ${MBROLA}
diff --git a/audio/festvox-us2/Makefile b/audio/festvox-us2/Makefile
index b180d2682b2..f12263c36d2 100644
--- a/audio/festvox-us2/Makefile
+++ b/audio/festvox-us2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/07/18 15:19:45 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2003/04/10 01:28:11 grant Exp $
 
 DISTNAME=	festvox_us2
 PKGNAME=	festvox-us2-1.4.0
@@ -29,7 +29,7 @@ post-extract:
 	@ ${FIND} ${WRKSRC} -type d -print | ${XARGS} ${CHMOD} 755
 
 do-install:
-	cd ${WRKSRC} && ${PAX} -r -w * ${FHOME}
+	cd ${WRKSRC} && ${PAX} -rw * ${FHOME}
 #ugh
 	${LN} -fs ../../../../../mbrola/voices/us2 ${MBROLA}
 	${LN} -fs ../../../../../mbrola/voices/us2/us2mrpa ${MBROLA}
diff --git a/audio/festvox-us3/Makefile b/audio/festvox-us3/Makefile
index 03d4598e906..93bd4a80b6f 100644
--- a/audio/festvox-us3/Makefile
+++ b/audio/festvox-us3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/07/18 15:19:45 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2003/04/10 01:28:11 grant Exp $
 
 DISTNAME=	festvox_us3
 PKGNAME=	festvox-us3-1.4.0
@@ -29,7 +29,7 @@ post-extract:
 	@ ${FIND} ${WRKSRC} -type d -print | ${XARGS} ${CHMOD} 755
 
 do-install:
-	cd ${WRKSRC} && ${PAX} -r -w * ${FHOME}
+	cd ${WRKSRC} && ${PAX} -rw * ${FHOME}
 #ugh
 	${LN} -fs ../../../../../mbrola/voices/us3 ${MBROLA}
 	${LN} -fs ../../../../../mbrola/voices/us3/us3mrpa ${MBROLA}
diff --git a/audio/mbrolavox-en1/Makefile b/audio/mbrolavox-en1/Makefile
index c68febe25f6..2219624e2d8 100644
--- a/audio/mbrolavox-en1/Makefile
+++ b/audio/mbrolavox-en1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/07/18 15:19:47 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2003/04/10 01:28:11 grant Exp $
 
 DISTNAME=	en1-980910
 PKGNAME=	mbrolavox-en1-980910
@@ -26,6 +26,6 @@ post-extract:
 
 do-install:
 	${INSTALL_DATA_DIR} ${MHOME}
-	cd ${WRKSRC} && ${PAX} -r -w en1 ${MHOME}
+	cd ${WRKSRC} && ${PAX} -rw en1 ${MHOME}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/mbrolavox-us1/Makefile b/audio/mbrolavox-us1/Makefile
index 50e514f276c..f20691fed28 100644
--- a/audio/mbrolavox-us1/Makefile
+++ b/audio/mbrolavox-us1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/07/18 15:19:47 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2003/04/10 01:28:12 grant Exp $
 
 DISTNAME=	us1-980512
 PKGNAME=	mbrolavox-us1-980512
@@ -26,6 +26,6 @@ post-extract:
 
 do-install:
 	${INSTALL_DATA_DIR} ${MHOME}
-	cd ${WRKSRC} && ${PAX} -r -w us1 ${MHOME}
+	cd ${WRKSRC} && ${PAX} -rw us1 ${MHOME}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/mbrolavox-us2/Makefile b/audio/mbrolavox-us2/Makefile
index c30a3308509..65aceea9c5a 100644
--- a/audio/mbrolavox-us2/Makefile
+++ b/audio/mbrolavox-us2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/07/18 15:19:48 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2003/04/10 01:28:12 grant Exp $
 
 DISTNAME=	us2-980812
 PKGNAME=	mbrolavox-${DISTNAME}
@@ -26,6 +26,6 @@ post-extract:
 
 do-install:
 	${INSTALL_DATA_DIR} ${MHOME}
-	cd ${WRKSRC} && ${PAX} -r -w us2 ${MHOME}
+	cd ${WRKSRC} && ${PAX} -rw us2 ${MHOME}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/mbrolavox-us3/Makefile b/audio/mbrolavox-us3/Makefile
index aa56ea71210..c1c3562b76a 100644
--- a/audio/mbrolavox-us3/Makefile
+++ b/audio/mbrolavox-us3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/07/18 15:19:48 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2003/04/10 01:28:12 grant Exp $
 
 DISTNAME=	us3-990208
 PKGNAME=	mbrolavox-${DISTNAME}
@@ -26,6 +26,6 @@ post-extract:
 
 do-install:
 	${INSTALL_DATA_DIR} ${MHOME}
-	cd ${WRKSRC} && ${PAX} -r -w us3 ${MHOME}
+	cd ${WRKSRC} && ${PAX} -rw us3 ${MHOME}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/oss/Makefile b/audio/oss/Makefile
index 2696d3a1b80..8f5cf08f8ef 100644
--- a/audio/oss/Makefile
+++ b/audio/oss/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2003/03/29 12:40:08 jmmv Exp $
+# $NetBSD: Makefile,v 1.18 2003/04/10 01:28:13 grant Exp $
 
 DISTNAME=	oss-${OSS_VERSION}	# Overridden below
 PKGNAME=	oss-${OSS_VERSION}
@@ -86,7 +86,7 @@ chroot:
 	${RM} ${WRKSRC}/usr/lib/oss/*.log
 
 do-install: chroot
-	cd ${WRKSRC}/usr; ${PAX} -rwpe lib/oss ${PREFIX}
+	cd ${WRKSRC}/usr && ${PAX} -rw -pe lib/oss ${PREFIX}
 	${INSTALL_DATA} ${FILESDIR}/MAKEDEV.oss ${OSSLIBDIR}
 	${LN} -sf ../lib/oss/mixer ${PREFIX}/bin/ossmixer
 	${LN} -sf ../lib/oss/mplay ${PREFIX}/bin/ossmplay
diff --git a/audio/realplayer/Makefile b/audio/realplayer/Makefile
index f3c1ed48a5b..b7ae118f964 100644
--- a/audio/realplayer/Makefile
+++ b/audio/realplayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2003/03/26 04:05:52 jschauma Exp $
+# $NetBSD: Makefile,v 1.18 2003/04/10 01:28:13 grant Exp $
 
 PKGNAME=		realplayer-8.0.1
 WRKSRC=			${WRKDIR}/RealPlayer8
@@ -87,7 +87,7 @@ pre-install:
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/realplay.sh ${PREFIX}/bin/realplay
-	cd ${WRKDIR}; ${PAX} -rw RealPlayer8 ${PREFIX}/lib
+	cd ${WRKDIR} && ${PAX} -rw RealPlayer8 ${PREFIX}/lib
 
 post-install:
 	${INSTALL_DATA_DIR} ${NS_PLUGINS_DIR}