diff options
| author | grant <grant@pkgsrc.org> | 2003-04-10 01:28:03 +0000 |
|---|---|---|
| committer | grant <grant@pkgsrc.org> | 2003-04-10 01:28:03 +0000 |
| commit | afdebcf9a40e045d6fa993260a803c2cb44c4693 (patch) | |
| tree | c67db081e20351feb52d2ca5fbde4b2c17aa2887 | |
| parent | 7cbde19ad7ca49e9571c24ddc71983707c8bc89a (diff) | |
| download | pkgsrc-afdebcf9a40e045d6fa993260a803c2cb44c4693.tar.gz | |
make ${PAX} usage consistent:
- group 'zrw' and 'p' args, -s last
- use the && operator consistently
- strip unneeded parens
- some whitespace cleanup
93 files changed, 254 insertions, 256 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} diff --git a/chat/pircbot/Makefile b/chat/pircbot/Makefile index d0435ac98e7..8acc40078ee 100644 --- a/chat/pircbot/Makefile +++ b/chat/pircbot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2003/03/28 21:14:14 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2003/04/10 01:28:14 grant Exp $ # DISTNAME= pircbot-0.9.11 @@ -24,7 +24,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/pircbot.jar ${PREFIX}/lib/java ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/java/pircbot cd ${WRKSRC}/javadocs && \ - ${PAX} -rwpppm . ${PREFIX}/share/doc/java/pircbot + ${PAX} -rw -pp -pm . ${PREFIX}/share/doc/java/pircbot .include "../../mk/java-vm.mk" .include "../../mk/bsd.pkg.mk" diff --git a/chat/tik/Makefile b/chat/tik/Makefile index 21cc4bde07e..8a44ee4afac 100644 --- a/chat/tik/Makefile +++ b/chat/tik/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2003/03/29 12:40:18 jmmv Exp $ +# $NetBSD: Makefile,v 1.4 2003/04/10 01:28:14 grant Exp $ # DISTNAME= tik-0.90 @@ -45,13 +45,13 @@ do-install: ${WRKSRC}/example.awayrc \ ${WRKSRC}/example.pkgrc \ ${TIKDIR} - cd ${WRKSRC}; \ - ${PAX} -rw components ${TIKDIR}; \ - ${PAX} -rw media ${TIKDIR}; \ - ${PAX} -rw packages ${TIKDIR}; \ + cd ${WRKSRC} && \ + ${PAX} -rw components ${TIKDIR} && \ + ${PAX} -rw media ${TIKDIR} && \ + ${PAX} -rw packages ${TIKDIR} && \ ${PAX} -rw strs ${TIKDIR} ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tik - cd ${WRKSRC}/doc; ${PAX} -rw . ${PREFIX}/share/doc/tik + cd ${WRKSRC}/doc && ${PAX} -rw . ${PREFIX}/share/doc/tik ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/tik ${INSTALL_DATA} \ ${WRKSRC}/example.awayrc \ diff --git a/databases/zope-mysql/Makefile b/databases/zope-mysql/Makefile index afc916ed873..d1663238f0c 100644 --- a/databases/zope-mysql/Makefile +++ b/databases/zope-mysql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2003/03/29 12:40:28 jmmv Exp $ +# $NetBSD: Makefile,v 1.17 2003/04/10 01:28:14 grant Exp $ # DISTNAME= ZMySQLDA-1.1.3-nonbin @@ -33,7 +33,7 @@ do-build: do-install: ${CAT} ${PKGDIR}/PLIST.pre >${PLIST_SRC} - (cd ${WRKDIR}; ${PAX} -r -w lib ${ZOPEDIR}) + cd ${WRKDIR} && ${PAX} -rw lib ${ZOPEDIR} ${CHMOD} -R a+rX ${ZOPEDIR}/${DAPATH} (cd ${PREFIX}; ${FIND} lib/zope/${DAPATH} -type f -print >>${PLIST_SRC}) ${ECHO} "@dirrm lib/zope/${DAPATH}" >> ${PLIST_SRC} diff --git a/devel/jakarta-ant/Makefile b/devel/jakarta-ant/Makefile index 3d4d59047d9..e4ef2df5a43 100644 --- a/devel/jakarta-ant/Makefile +++ b/devel/jakarta-ant/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2003/03/29 12:40:33 jmmv Exp $ +# $NetBSD: Makefile,v 1.19 2003/04/10 01:28:15 grant Exp $ # # NOTE: if you are depending on ant from another package, please be aware that # the ant team has CHANGED the version numbering scheme. A previous version @@ -39,7 +39,7 @@ do-install: ${INSTALL_DATA_DIR} ${PREFIX}/lib/java ${INSTALL_DATA} ${WRKSRC}/build/lib/ant.jar ${PREFIX}/lib/java ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/java/ant - cd ${WRKSRC}/docs && ${PAX} -rwpp * ${PREFIX}/share/doc/java/ant + cd ${WRKSRC}/docs && ${PAX} -rw -pp * ${PREFIX}/share/doc/java/ant ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/java/ant ${INSTALL_DATA} ${WRKSRC}/WHATSNEW ${PREFIX}/share/doc/java/ant diff --git a/devel/javadeps/Makefile b/devel/javadeps/Makefile index b28e79ca516..5759fcdce8d 100644 --- a/devel/javadeps/Makefile +++ b/devel/javadeps/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2003/03/29 12:40:33 jmmv Exp $ +# $NetBSD: Makefile,v 1.6 2003/04/10 01:28:15 grant Exp $ # DISTNAME= javadeps-1.1 @@ -27,7 +27,7 @@ do-install: ${INSTALL_PROGRAM_DIR} ${PREFIX}/share/jdeps ${CP} ${WRKSRC}/jdeps.jar ${PREFIX}/share/jdeps/jdeps.jar ${INSTALL_PROGRAM_DIR} ${PREFIX}/share/doc/jdeps - cd ${WRKSRC}/doc; ${PAX} -rwpe . ${PREFIX}/share/doc/jdeps + cd ${WRKSRC}/doc && ${PAX} -rw -pe . ${PREFIX}/share/doc/jdeps ${CHOWN} -R ${BINOWN}:${BINGRP} ${PREFIX}/share/jdeps ${PREFIX}/share/doc/jdeps .include "../../mk/java-vm.mk" diff --git a/devel/sfio/Makefile b/devel/sfio/Makefile index b59853f47c0..fed896a6a2d 100644 --- a/devel/sfio/Makefile +++ b/devel/sfio/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2003/03/29 12:40:40 jmmv Exp $ +# $NetBSD: Makefile,v 1.8 2003/04/10 01:28:15 grant Exp $ # # pkgsrc/mail/sendmail (as of 8.11.0) specifically wants 1999, not 2000. @@ -21,7 +21,7 @@ COMMENT= Safe and Fast IO library do-extract: @${MKDIR} ${WRKDIR} - cd ${WRKDIR} ; ${PAX} -r < ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} + cd ${WRKDIR} && ${PAX} -rf ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} post-patch: ${MV} ${WRKSRC}/man/man3/sfio.3 ${WRKSRC}/man/man3/sfio.3.in diff --git a/games/civctp-demo/Makefile b/games/civctp-demo/Makefile index 30184996f7a..9dae3ce63d9 100644 --- a/games/civctp-demo/Makefile +++ b/games/civctp-demo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2003/03/29 12:41:00 jmmv Exp $ +# $NetBSD: Makefile,v 1.9 2003/04/10 01:28:15 grant Exp $ DISTNAME= civctp-demo-10251999 PKGNAME= civctp-demo-19991025 @@ -50,7 +50,7 @@ do-install: ${INSTALL_SCRIPT} ${WRKDIR}/${BINNAME}.sh ${PREFIX}/bin/${BINNAME} ${INSTALL_PROGRAM} ${WRKSRC}/bin/${BINTYPE}/${DISTBINNAME} ${LIBDIR}/${BINNAME} ${INSTALL_DATA} ${WRKSRC}/README ${SHAREDIR}/${BINNAME}-README - cd ${WRKSRC} ; ${PAX} -rw appstr.txt civpaths.txt ctp_data ${LIBDIR} + cd ${WRKSRC} && ${PAX} -rw appstr.txt civpaths.txt ctp_data ${LIBDIR} .include "../../emulators/suse_linux/Makefile.application" .include "../../mk/bsd.pkg.mk" diff --git a/games/eus-demo/Makefile b/games/eus-demo/Makefile index 28aeecdf574..616a34f1ca6 100644 --- a/games/eus-demo/Makefile +++ b/games/eus-demo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2003/03/29 12:41:02 jmmv Exp $ +# $NetBSD: Makefile,v 1.9 2003/04/10 01:28:16 grant Exp $ DISTNAME= eus-demo PKGNAME= eus-demo-1.0 @@ -50,7 +50,7 @@ do-install: ${INSTALL_SCRIPT} ${WRKDIR}/${BINNAME}.sh ${PREFIX}/bin/${BINNAME} ${INSTALL_PROGRAM} ${WRKSRC}/bin/${BINTYPE}/${DISTBINNAME} ${LIBDIR}/${BINNAME} ${INSTALL_DATA} ${WRKSRC}/README ${SHAREDIR}/${BINNAME}-README - cd ${WRKSRC} ; ${PAX} -rw [Eai-p]* sounds ${LIBDIR} + cd ${WRKSRC} && ${PAX} -rw [Eai-p]* sounds ${LIBDIR} .include "../../emulators/suse_linux/Makefile.application" .include "../../mk/bsd.pkg.mk" diff --git a/games/fortunes-de/Makefile b/games/fortunes-de/Makefile index 3f26c3b0bab..e62c977e333 100644 --- a/games/fortunes-de/Makefile +++ b/games/fortunes-de/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2003/03/29 12:41:03 jmmv Exp $ +# $NetBSD: Makefile,v 1.3 2003/04/10 01:28:16 grant Exp $ # DISTNAME= fortunes-de_0.6.orig @@ -19,6 +19,6 @@ do-build: do-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/games/fortune/de - (cd ${WRKSRC}/data; ${PAX} -rw . ${PREFIX}/share/games/fortune/de) + cd ${WRKSRC}/data && ${PAX} -rw . ${PREFIX}/share/games/fortune/de .include "../../mk/bsd.pkg.mk" diff --git a/games/heretic2-demo/Makefile b/games/heretic2-demo/Makefile index d634d0314d6..c0f9f671f9c 100644 --- a/games/heretic2-demo/Makefile +++ b/games/heretic2-demo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2003/03/29 12:41:05 jmmv Exp $ +# $NetBSD: Makefile,v 1.9 2003/04/10 01:28:16 grant Exp $ # DISTNAME= heretic2-demo-x86 @@ -41,6 +41,6 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${DISTBINNAME} ${LIBDIR}/${BINNAME} ${INSTALL_DATA} ${WRKSRC}/README ${SHAREDIR}/${BINNAME}-QuickStart.txt ${INSTALL_DATA} ${WRKSRC}/README ${SHAREDIR}/${BINNAME}-README - cd ${WRKSRC} ; ${PAX} -rw base gl_drivers icon.xpm ref_glx.so ${LIBDIR} + cd ${WRKSRC} && ${PAX} -rw base gl_drivers icon.xpm ref_glx.so ${LIBDIR} .include "../../mk/bsd.pkg.mk" diff --git a/games/maelstrom-x11/Makefile b/games/maelstrom-x11/Makefile index eb893669c5d..24a323c7be3 100644 --- a/games/maelstrom-x11/Makefile +++ b/games/maelstrom-x11/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2003/03/29 12:41:06 jmmv Exp $ +# $NetBSD: Makefile,v 1.4 2003/04/10 01:28:17 grant Exp $ DISTNAME= Maelstrom-1.4.3-L2.0.6-src.tar.gz PKGNAME= maelstrom-x11-2.0.6 @@ -27,9 +27,9 @@ MAKE_ENV+= BINOWN=${BINOWN} BINGRP=${BINGRP} XPMDIR=${BUILDLINK_PREFIX.xpm} post-install: cd ${PREFIX}/share/maelstrom && \ - ${PAX} -rzf ${DISTDIR}/${ESOUND} -p m && \ - ${PAX} -rzf ${DISTDIR}/${STREK} -p m && \ - ${PAX} -rzf ${DISTDIR}/${SWARS} -p m + ${PAX} -zrf ${DISTDIR}/${ESOUND} -pm && \ + ${PAX} -zrf ${DISTDIR}/${STREK} -pm && \ + ${PAX} -zrf ${DISTDIR}/${SWARS} -pm ${CHOWN} ${BINOWN}:games ${PREFIX}/bin/Maelstrom ${CHMOD} 2755 ${PREFIX}/bin/Maelstrom ${CHOWN} ${BINOWN}:games /var/games/Maelstrom-Scores diff --git a/games/mirrormagic-sdl/Makefile b/games/mirrormagic-sdl/Makefile index 22e82e74941..9e7800bb935 100644 --- a/games/mirrormagic-sdl/Makefile +++ b/games/mirrormagic-sdl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2003/04/03 08:25:36 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2003/04/10 01:28:17 grant Exp $ # DISTNAME= mirrormagic-2.0.1 @@ -24,7 +24,7 @@ do-install: ${INSTALL_PROGRAM} -o bin -g games -m 2755 \ ${WRKSRC}/mirrormagic ${PREFIX}/bin ${INSTALL_DATA_DIR} ${PREFIX}/share/mirrormagic - cd ${WRKSRC} && ${PAX} -r -w graphics levels music sounds \ + cd ${WRKSRC} && ${PAX} -rw graphics levels music sounds \ ${PREFIX}/share/mirrormagic/ ${CHOWN} -R games:games ${PREFIX}/share/mirrormagic ${INSTALL_DATA_DIR} ${SCORE_PATH}/scores diff --git a/games/mirrormagic/Makefile b/games/mirrormagic/Makefile index d0643ad9fac..e2a51a94006 100644 --- a/games/mirrormagic/Makefile +++ b/games/mirrormagic/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2002/09/12 00:21:35 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2003/04/10 01:28:17 grant Exp $ # DISTNAME= mirrormagic-2.0.1 @@ -21,7 +21,7 @@ do-install: ${INSTALL_PROGRAM} -o bin -g games -m 2755 \ ${WRKSRC}/mirrormagic ${PREFIX}/bin ${INSTALL_DATA_DIR} ${PREFIX}/share/mirrormagic - cd ${WRKSRC} && ${PAX} -r -w graphics levels music sounds \ + cd ${WRKSRC} && ${PAX} -rw graphics levels music sounds \ ${PREFIX}/share/mirrormagic/ ${CHOWN} -R games:games ${PREFIX}/share/mirrormagic ${INSTALL_DATA_DIR} ${SCORE_PATH}/scores diff --git a/games/nighthawk/Makefile b/games/nighthawk/Makefile index 64a4dd3b377..e5de45ede7e 100644 --- a/games/nighthawk/Makefile +++ b/games/nighthawk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2002/10/21 00:53:26 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2003/04/10 01:28:17 grant Exp $ # DISTNAME= nighthawk-2.1 @@ -20,14 +20,14 @@ USE_GMAKE= YES USE_X11= YES post-build: - cd ${WRKSRC}/src_sound ; \ - ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} nighthawk_sound + cd ${WRKSRC}/src_sound && \ + ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} nighthawk_sound do-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/nighthawk ${INSTALL_DATA_DIR} ${PREFIX}/share/nighthawk ${INSTALL_DATA_DIR} ${PREFIX}/share/nighthawk/data - cd ${WRKSRC}/data; ${PAX} -rw . ${PREFIX}/share/nighthawk/data/ + cd ${WRKSRC}/data && ${PAX} -rw . ${PREFIX}/share/nighthawk/data ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/nighthawk ${FIND} ${PREFIX}/share/nighthawk -type f -print | ${XARGS} ${CHMOD} 444 ${FIND} ${PREFIX}/share/nighthawk -type d -print | ${XARGS} ${CHMOD} 555 diff --git a/games/quake3arena-demo/Makefile b/games/quake3arena-demo/Makefile index cb037b71ee7..b12b45cbaaf 100644 --- a/games/quake3arena-demo/Makefile +++ b/games/quake3arena-demo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2003/03/29 12:41:07 jmmv Exp $ +# $NetBSD: Makefile,v 1.13 2003/04/10 01:28:18 grant Exp $ DISTNAME= linuxq3ademo-1_11-6_x86_gz PKGNAME= quake3arena-demo-1.11.6 @@ -51,8 +51,8 @@ do-install: ${LN} -s ${LIBDIR}/libMesaVoodooGL.so.3.2 \ ${LIBDIR}/libMesaVoodooGL.so ${INSTALL_DATA} ${WRKSRC}/README ${SHAREDIR}/${BINNAME}-README - cd ${WRKSRC} ; ${PAX} -rw demoq3 icon.bmp icon.xpm ${LIBDIR} - cd ${WRKSRC} ; ${PAX} -rw Help ${SHAREDIR} + cd ${WRKSRC} && ${PAX} -rw demoq3 icon.bmp icon.xpm ${LIBDIR} + cd ${WRKSRC} && ${PAX} -rw Help ${SHAREDIR} ${MV} ${SHAREDIR}/Help ${SHAREDIR}/quake3arena-Help .include "../../emulators/suse_linux/Makefile.application" diff --git a/games/quake3arena/Makefile b/games/quake3arena/Makefile index 36a15102b88..282726d842f 100644 --- a/games/quake3arena/Makefile +++ b/games/quake3arena/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2003/03/29 12:41:08 jmmv Exp $ +# $NetBSD: Makefile,v 1.12 2003/04/10 01:28:18 grant Exp $ DISTNAME= linuxq3apoint-1.17.x86 PKGNAME= quake3arena-1.17 @@ -57,8 +57,8 @@ do-install: ${LN} -s ${LIBDIR}/libMesaVoodooGL.so.3.2 \ ${LIBDIR}/libMesaVoodooGL.so ${INSTALL_DATA} ${WRKSRC}/README ${SHAREDIR}/${BINNAME}-README - cd ${WRKSRC} ; ${PAX} -rw baseq3 ${LIBDIR} - cd ${WRKSRC} ; ${PAX} -rw Help ${SHAREDIR} + cd ${WRKSRC} && ${PAX} -rw baseq3 ${LIBDIR} + cd ${WRKSRC} && ${PAX} -rw Help ${SHAREDIR} ${MV} ${SHAREDIR}/Help ${SHAREDIR}/quake3arena-Help .include "../../emulators/suse_linux/Makefile.application" diff --git a/games/rocksndiamonds/Makefile b/games/rocksndiamonds/Makefile index e3c2316ff37..d182a403950 100644 --- a/games/rocksndiamonds/Makefile +++ b/games/rocksndiamonds/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2002/10/29 19:07:53 heinz Exp $ +# $NetBSD: Makefile,v 1.11 2003/04/10 01:28:18 grant Exp $ # DISTNAME= rocksndiamonds-2.1.1 @@ -34,7 +34,7 @@ do-install: ${WRKSRC}/rocksndiamonds ${PREFIX}/bin/ ${INSTALL_MAN} ${WRKSRC}/rocksndiamonds.1 ${PREFIX}/man/man1/ ${INSTALL_DATA_DIR} ${PREFIX}/share/rocksndiamonds - cd ${WRKSRC} && ${PAX} -r -w sounds graphics levels music \ + cd ${WRKSRC} && ${PAX} -rw sounds graphics levels music \ ${PREFIX}/share/rocksndiamonds/ ${CHOWN} -R games:games ${PREFIX}/share/rocksndiamonds ${CHMOD} -R a-w ${PREFIX}/share/rocksndiamonds diff --git a/inputmethod/xcin/Makefile b/inputmethod/xcin/Makefile index bc6d58ec950..ea8142635df 100644 --- a/inputmethod/xcin/Makefile +++ b/inputmethod/xcin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2003/03/29 12:41:23 jmmv Exp $ +# $NetBSD: Makefile,v 1.7 2003/04/10 01:28:19 grant Exp $ # DISTNAME= xcin-2.5.3.pre2 @@ -27,7 +27,7 @@ post-extract: post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xcin - cd ${WRKSRC}/doc; ${PAX} -rw * ${PREFIX}/share/doc/xcin + cd ${WRKSRC}/doc && ${PAX} -rw * ${PREFIX}/share/doc/xcin .include "../../converters/libiconv/buildlink2.mk" .include "../../databases/db3/buildlink2.mk" 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 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 diff --git a/pkgtools/x11-links/Makefile b/pkgtools/x11-links/Makefile index a64c573e3f1..018a204ff73 100644 --- a/pkgtools/x11-links/Makefile +++ b/pkgtools/x11-links/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2003/03/29 12:42:13 jmmv Exp $ +# $NetBSD: Makefile,v 1.31 2003/04/10 01:28:22 grant Exp $ # # NOTE: If you update this package, then you'll likely need to also update # the x11-links dependency in mk/buildlink2/bsd.buildlink2.mk to the @@ -40,7 +40,7 @@ PKG_FAIL_REASON= "${PKGNAME} requires X headers to be installed" do-install: ${INSTALL_DATA_DIR} ${PREFIX}/${BUILDLINK_X11_SUBDIR} cd ${BUILDLINK_DIR} && { ${ECHO} include ; ${ECHO} lib ; } | \ - ${PAX} -r -w ${PREFIX}/${BUILDLINK_X11_SUBDIR} + ${PAX} -rw ${PREFIX}/${BUILDLINK_X11_SUBDIR} ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/${BUILDLINK_X11_SUBDIR} ${CAT} ${PKGDIR}/PLIST > ${PLIST_SRC} cd ${PREFIX}; ${FIND} ${BUILDLINK_X11_SUBDIR} \! -type d -print \ diff --git a/print/ja-vflib-lib/Makefile b/print/ja-vflib-lib/Makefile index ca3aba3343c..7f59962170f 100644 --- a/print/ja-vflib-lib/Makefile +++ b/print/ja-vflib-lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2002/09/11 08:54:46 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2003/04/10 01:28:23 grant Exp $ .include "Makefile.common" @@ -22,9 +22,9 @@ post-install: ${MV} ${PREFIX}/share/VFlib/${VFLIB_VERSION}/VF.h ${PREFIX}/include ${INSTALL_DATA_DIR} ${PREFIX}/share/VFlib/${VFLIB_VERSION} - cd ${WRKSRC}; ${INSTALL_DATA} COPYING COPYING.LIB README.txt.JP_EUC \ + cd ${WRKSRC} && ${INSTALL_DATA} COPYING COPYING.LIB README.txt.JP_EUC \ ${PREFIX}/share/VFlib/${VFLIB_VERSION} - cd ${WRKSRC}; ${PAX} -rw jTeX ${PREFIX}/share/VFlib/${VFLIB_VERSION} + cd ${WRKSRC} && ${PAX} -rw jTeX ${PREFIX}/share/VFlib/${VFLIB_VERSION} ${CHMOD} -R a-w ${PREFIX}/share/VFlib/${VFLIB_VERSION} .include "../../mk/bsd.pkg.mk" diff --git a/print/py-reportlab/Makefile b/print/py-reportlab/Makefile index 2b63aef642a..7849846381b 100644 --- a/print/py-reportlab/Makefile +++ b/print/py-reportlab/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2003/03/29 12:42:17 jmmv Exp $ +# $NetBSD: Makefile,v 1.10 2003/04/10 01:28:23 grant Exp $ # DISTNAME= ReportLab_1_16 @@ -17,7 +17,7 @@ PYDISTUTILSPKG= yes USE_BUILDLINK2= yes post-install: - (cd ${WRKDIR}; ${PAX} -r -w -v -p p reportlab ${PREFIX}/${PYSITELIB}) + cd ${WRKDIR} && ${PAX} -rw -pp reportlab ${PREFIX}/${PYSITELIB} ${RM} -rf ${PREFIX}/${PYSITELIB}/reportlab/lib/build .include "../../lang/python/extension.mk" 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: diff --git a/sysutils/storage-manager/Makefile b/sysutils/storage-manager/Makefile index 35a4fc4189f..cd9c789b348 100644 --- a/sysutils/storage-manager/Makefile +++ b/sysutils/storage-manager/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2003/03/26 04:05:40 jschauma Exp $ +# $NetBSD: Makefile,v 1.9 2003/04/10 01:28:24 grant Exp $ DISTNAME= sm_linux_v314_install PKGNAME= storage-manager-3.14 @@ -40,8 +40,8 @@ _FETCH_MESSAGE= \ do-extract: ${MKDIR} ${WRKSRC} - cd ${WRKSRC}; rpm2cpio ${DISTDIR}/${DISTNAME}.rpm > ${DISTNAME}.cpio - cd ${WRKSRC}; ${PAX} -rd -f ${DISTNAME}.cpio + cd ${WRKSRC} && rpm2cpio ${DISTDIR}/${DISTNAME}.rpm > ${DISTNAME}.cpio + cd ${WRKSRC} && ${PAX} -rd -f ${DISTNAME}.cpio do-patch: ${SED} -e "s,@PREFIX@,${PREFIX},g" \ 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" diff --git a/www/ap-layout/Makefile b/www/ap-layout/Makefile index 4a1bba95148..dcfe0d7737a 100644 --- a/www/ap-layout/Makefile +++ b/www/ap-layout/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2003/02/17 21:01:08 grant Exp $ +# $NetBSD: Makefile,v 1.8 2003/04/10 01:28:28 grant Exp $ # DISTNAME= mod_layout-3.2 @@ -21,7 +21,7 @@ post-install: ${INSTALL_DATA_DIR} ${LAYOUT_DIR} ${INSTALL_DATA} ${WRKSRC}/faq.html ${LAYOUT_DIR} ${INSTALL_DATA_DIR} ${LAYOUT_DIR}/directives - cd ${WRKSRC}/directives; ${PAX} -rw . ${LAYOUT_DIR}/directives + cd ${WRKSRC}/directives && ${PAX} -rw . ${LAYOUT_DIR}/directives .include "../../www/apache/module.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/ap-python/Makefile b/www/ap-python/Makefile index 7ea87cc0e01..07cab05595d 100644 --- a/www/ap-python/Makefile +++ b/www/ap-python/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2002/10/25 12:59:09 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2003/04/10 01:28:28 grant Exp $ # DISTNAME= mod_python-2.7.6 @@ -21,15 +21,15 @@ PYTHON_VERSIONS_ACCEPTED= 20 post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/ap-mod_python - ( cd ${WRKSRC}; ${PAX} -r -w -s /doc-html/ap-mod_python/ \ - -p e doc-html ${PREFIX}/share/doc/html ) + cd ${WRKSRC} && ${PAX} -rw -s /doc-html/ap-mod_python/ \ + -pe doc-html ${PREFIX}/share/doc/html ${ECHO} lib/httpd/mod_python.so >${PLIST_SRC} - (cd ${PREFIX}; ${FIND} ${PYSITELIB}/mod_python \ + cd ${PREFIX} && ${FIND} ${PYSITELIB}/mod_python \ share/doc/html/ap-mod_python \ - -type f -print >>${PLIST_SRC} ) - ( cd ${PREFIX}; ${FIND} -d ${PYSITELIB}/mod_python \ + -type f -print >>${PLIST_SRC} + cd ${PREFIX} && ${FIND} -d ${PYSITELIB}/mod_python \ share/doc/html/ap-mod_python \ - -type d -print | ${SED} -e "s/^/@dirrm /" >>${PLIST_SRC} ) + -type d -print | ${SED} -e "s/^/@dirrm /" >>${PLIST_SRC} .include "../../lang/python/extension.mk" .include "../../www/apache/buildlink2.mk" diff --git a/www/cocoon/Makefile b/www/cocoon/Makefile index 6e264b84423..b627b83cea5 100644 --- a/www/cocoon/Makefile +++ b/www/cocoon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2003/03/29 12:42:48 jmmv Exp $ +# $NetBSD: Makefile,v 1.20 2003/04/10 01:28:28 grant Exp $ DISTNAME= Cocoon-1.8.2 PKGNAME= cocoon-1.8.2 @@ -53,11 +53,11 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/lib/turbine-pool.jar ${PREFIX}/lib/java ${INSTALL_DATA} ${WRKSRC}/lib/sax-bugfix.jar ${PREFIX}/lib/java ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/java/cocoon - cd ${WRKSRC}/docs && ${PAX} -rwpp . ${PREFIX}/share/doc/java/cocoon + cd ${WRKSRC}/docs && ${PAX} -rw -pp . ${PREFIX}/share/doc/java/cocoon ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/java/cocoon/WEB-INF ${INSTALL_DATA} ${FILESDIR}/web.xml ${PREFIX}/share/examples/java/cocoon/WEB-INF ${INSTALL_DATA} ${WRKSRC}/conf/cocoon.properties ${PREFIX}/share/examples/java/cocoon/WEB-INF - cd ${WRKSRC}/samples && ${PAX} -rwpp . ${PREFIX}/share/examples/java/cocoon + cd ${WRKSRC}/samples && ${PAX} -rw -pp . ${PREFIX}/share/examples/java/cocoon .include "../../mk/java-vm.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/hiawatha/Makefile b/www/hiawatha/Makefile index 7044d93662f..3ad5684571f 100644 --- a/www/hiawatha/Makefile +++ b/www/hiawatha/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2003/03/29 12:42:48 jmmv Exp $ +# $NetBSD: Makefile,v 1.8 2003/04/10 01:28:29 grant Exp $ # DISTNAME= hiawatha @@ -44,7 +44,7 @@ do-install: ${INSTALL_DATA} ${WRKDIR}/hiawatha.cfg ${PREFIX}/etc \ ; fi ${INSTALL_DATA} ${WRKDIR}/hiawatha.cfg ${PREFIX}/share/examples/hiawatha - (cd ${WRKSRC} && ${PAX} -s '/^WEBROOT/pault.com/' -rw WEBROOT ${PREFIX}/share/examples/hiawatha) + cd ${WRKSRC} && ${PAX} -rw WEBROOT -s '/^WEBROOT/pault.com/' ${PREFIX}/share/examples/hiawatha ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/hiawatha/WEBROOT ${INSTALL_DATA} ${FILESDIR}/index.xml ${PREFIX}/share/examples/hiawatha/WEBROOT ${INSTALL_DATA} ${FILESDIR}/index.xsl ${PREFIX}/share/examples/hiawatha/WEBROOT diff --git a/www/jakarta-servletapi/Makefile b/www/jakarta-servletapi/Makefile index 85c1ccbd34e..9fff9418ac8 100644 --- a/www/jakarta-servletapi/Makefile +++ b/www/jakarta-servletapi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2003/03/29 12:42:49 jmmv Exp $ +# $NetBSD: Makefile,v 1.12 2003/04/10 01:28:29 grant Exp $ DISTNAME= jakarta-servletapi-${TOMCAT_VERSION}-src PKGNAME= ${DISTNAME:S/-src$//} @@ -35,7 +35,7 @@ do-install: ${INSTALL_DATA_DIR} ${PREFIX}/${DOCDIR} ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/${DOCDIR} ${INSTALL_DATA} ${WRKSRC}/LICENSE ${PREFIX}/${DOCDIR} - cd ${WRKDIR}/dist/servletapi/docs && ${PAX} -rwpp . ${PREFIX}/${DOCDIR} + cd ${WRKDIR}/dist/servletapi/docs && ${PAX} -rw -pp . ${PREFIX}/${DOCDIR} .include "../../mk/java-vm.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/jssi/Makefile b/www/jssi/Makefile index e020e304d39..f1c52548093 100644 --- a/www/jssi/Makefile +++ b/www/jssi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2003/03/29 12:42:50 jmmv Exp $ +# $NetBSD: Makefile,v 1.15 2003/04/10 01:28:29 grant Exp $ DISTNAME= ApacheJSSI-1.1.2 PKGNAME= jssi-1.1.2 @@ -25,7 +25,7 @@ post-build: do-install: ${INSTALL_DATA} ${WRKSRC}/ApacheJSSI.jar ${PREFIX}/lib/java/ApacheJSSI.jar ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/java/jssi - cd ${WRKSRC}/../../docs && ${PAX} -rwpp . ${PREFIX}/share/doc/java/jssi + cd ${WRKSRC}/../../docs && ${PAX} -rw -pp . ${PREFIX}/share/doc/java/jssi .include "../../mk/java-vm.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/py-zpublisher/Makefile b/www/py-zpublisher/Makefile index 93d2e5e4468..bad53bf35ed 100644 --- a/www/py-zpublisher/Makefile +++ b/www/py-zpublisher/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2003/03/29 12:42:53 jmmv Exp $ +# $NetBSD: Makefile,v 1.7 2003/04/10 01:28:30 grant Exp $ # DISTNAME= Zope-2.2.2-src @@ -18,18 +18,18 @@ PLIST_SRC= ${WRKDIR}/.PLIST_SRC EXTRACT_ELEMENTS= ${DISTNAME}/lib/python/ZPublisher do-build: - (cd ${WRKSRC}/..; ${PY_PROG} ${PY_LIBDIR}/compileall.py .) - (cd ${WRKSRC}/..; ${PY_PROG} -O ${PY_LIBDIR}/compileall.py .) + 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 e ZPublisher ${PY_SITEPKG}) + cd ${WRKSRC} && ${PAX} -rw -pe ZPublisher ${PY_SITEPKG} ${CHMOD} 755 ${PY_SITEPKG}/ZPublisher/Test.py - (cd ${PREFIX}; ${FIND} ${PY_SITEPATH}/ZPublisher \ - -type f -print >>${PLIST_SRC}) - (cd ${PREFIX}; ${FIND} -d ${PY_SITEPATH}/ZPublisher \ - -type d -print | ${SED} -e "s/^/@dirrm /" >>${PLIST_SRC}) + cd ${PREFIX} && ${FIND} ${PY_SITEPATH}/ZPublisher \ + -type f -print >>${PLIST_SRC} + cd ${PREFIX} && ${FIND} -d ${PY_SITEPATH}/ZPublisher \ + -type d -print | ${SED} -e "s/^/@dirrm /" >>${PLIST_SRC} ${LN} -sf ../${PY_SITEPATH}/ZPublisher/Test.py ${PREFIX}/bin/bobo .include "../../lang/python20/Makefile.inc" diff --git a/www/spfc/Makefile b/www/spfc/Makefile index b092807932a..d71d8f00cea 100644 --- a/www/spfc/Makefile +++ b/www/spfc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2003/03/29 12:42:54 jmmv Exp $ +# $NetBSD: Makefile,v 1.10 2003/04/10 01:28:30 grant Exp $ DISTNAME= spfc-0.2.0 WRKSRC= ${WRKDIR}/spfc-0.2.0/src/ @@ -21,7 +21,7 @@ MAKE_ENV+= CLASSPATH=${CLASSPATH}:${PREFIX}/lib/jsdk.jar do-install: ${INSTALL_DATA} ${WRKSRC}/../bin/spfc.jar ${PREFIX}/lib/java ${INSTALL_PROGRAM_DIR} ${PREFIX}/share/doc/java/spfc - cd ${WRKSRC}/../docs && ${PAX} -rwpp . ${PREFIX}/share/doc/java/spfc + cd ${WRKSRC}/../docs && ${PAX} -rw -pp . ${PREFIX}/share/doc/java/spfc .include "../../mk/java-vm.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/zope-confera/Makefile b/www/zope-confera/Makefile index d1ac1b4353e..f7b90785d19 100644 --- a/www/zope-confera/Makefile +++ b/www/zope-confera/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2003/03/29 12:42:56 jmmv Exp $ +# $NetBSD: Makefile,v 1.8 2003/04/10 01:28:30 grant Exp $ # DISTNAME= Confera-1.2.0-nonbin @@ -23,9 +23,9 @@ PRODPATH= lib/python/Products/Confera do-install: ${CAT} ${PKGDIR}/PLIST.pre >${PLIST_SRC} - (cd ${WRKDIR}; ${PAX} -r -w lib ${ZOPEDIR}) + cd ${WRKDIR} && ${PAX} -rw lib ${ZOPEDIR} ${CHMOD} -R a+rX ${ZOPEDIR}/${PRODPATH} - (cd ${PREFIX}; ${FIND} lib/zope/${PRODPATH} -type f -print >>${PLIST_SRC}) + cd ${PREFIX} && ${FIND} lib/zope/${PRODPATH} -type f -print >>${PLIST_SRC} ${ECHO} "@dirrm lib/zope/${PRODPATH}" >> ${PLIST_SRC} .include "../../mk/bsd.pkg.mk" diff --git a/www/zope/Makefile b/www/zope/Makefile index cef3635c7e9..7ef52324f44 100644 --- a/www/zope/Makefile +++ b/www/zope/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2002/09/21 23:47:00 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2003/04/10 01:28:31 grant Exp $ # DISTNAME= Zope-2.2.2-src @@ -25,21 +25,21 @@ PYTHON_VERSIONS_ACCEPTED= 20 # XXX for now do-configure: ${SED} -e "s,@PREFIX@,${PREFIX}," \ <${FILESDIR}/Makefile.in > ${WRKSRC}/Makefile - (cd ${WRKSRC}/lib; ${RM} -rf Components/zlib \ + cd ${WRKSRC}/lib && ${RM} -rf Components/zlib \ Components/ExtensionClass python/DocumentTemplate \ - python/StructuredText) - (cd ${WRKSRC}; make configure) + python/StructuredText + cd ${WRKSRC} && make configure do-install: ${CAT} ${PKGDIR}/PLIST.pre >${PLIST_SRC} ${INSTALL_DATA_DIR} ${ZOPEDIR} - (cd ${WRKSRC}; ${PAX} -r -w -s'/.*\.[cho]$$//' . ${ZOPEDIR}) + cd ${WRKSRC} && ${PAX} -rw -s'/.*\.[cho]$$//' . ${ZOPEDIR} ${PYTHONBIN} \ ${PREFIX}/lib/python2.0/compileall.py ${ZOPEDIR} ${CHMOD} -R a+rX ${ZOPEDIR} - (cd ${PREFIX}; ${FIND} lib/zope \( -type f -o -type l \) -print >>${PLIST_SRC}) - (cd ${PREFIX}; ${FIND} -d lib/zope -type d -print | \ - ${SED} -e "s/^/@dirrm /" >>${PLIST_SRC}) + cd ${PREFIX} && ${FIND} lib/zope \( -type f -o -type l \) -print >>${PLIST_SRC} + cd ${PREFIX} && ${FIND} -d lib/zope -type d -print | \ + ${SED} -e "s/^/@dirrm /" >>${PLIST_SRC} ${SED} -e "s,/usr/pkg,${PREFIX}," \ <${FILESDIR}/zope-install.py >${PREFIX}/sbin/zope-install ${SED} -e "s,/usr/pkg,${PREFIX}," \ diff --git a/www/zope25-zopebook/Makefile b/www/zope25-zopebook/Makefile index 0639f57749f..5ca615a82f7 100644 --- a/www/zope25-zopebook/Makefile +++ b/www/zope25-zopebook/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2002/12/10 18:07:38 drochner Exp $ +# $NetBSD: Makefile,v 1.5 2003/04/10 01:28:31 grant Exp $ # DISTNAME= ZopeBook @@ -18,6 +18,6 @@ ZBDIR= ${PREFIX}/share/doc/html/ZopeBook-2.5 do-install: ${INSTALL_DATA_DIR} ${ZBDIR} - (cd ${WRKSRC}; ${PAX} -rw . ${ZBDIR}) + cd ${WRKSRC} && ${PAX} -rw . ${ZBDIR} .include "../../mk/bsd.pkg.mk" diff --git a/www/zope25/Makefile b/www/zope25/Makefile index f2ee5471c63..1fd85bce4a9 100644 --- a/www/zope25/Makefile +++ b/www/zope25/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2002/10/24 22:11:05 drochner Exp $ +# $NetBSD: Makefile,v 1.4 2003/04/10 01:28:31 grant Exp $ # DISTNAME= Zope-2.5.1-src @@ -39,14 +39,14 @@ do-build: # do-install: ${INSTALL_DATA_DIR} ${ZOPEDIR} - (cd ${WRKSRC}; ${FIND} ${ZOPEPY} -type f -and \! \( -name "*.[cho]" \ + cd ${WRKSRC} && ${FIND} ${ZOPEPY} -type f -and \! \( -name "*.[cho]" \ -or -name "sedscript" -or -name "Makefile*" \ -or -name "Setup*" -or -name ".cvsignore" \) \ - -print | ${PAX} -r -w ${ZOPEDIR}) + -print | ${PAX} -rw ${ZOPEDIR} #install hotfix - (cd ${WRKDIR}; ${PAX} -r -w lib ${ZOPEDIR}) - (cd ${ZOPEDIR}; ${PYTHONBIN} ${WRKSRC}/inst/compilezpy.py) - (cd ${WRKSRC}; ${PAX} -r -w ${ZOPEDATA} ${ZOPEDIR}) + cd ${WRKDIR} && ${PAX} -rw lib ${ZOPEDIR} + cd ${ZOPEDIR} && ${PYTHONBIN} ${WRKSRC}/inst/compilezpy.py + cd ${WRKSRC} && ${PAX} -rw ${ZOPEDATA} ${ZOPEDIR} .include "../../lang/python/application.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/egtk/Makefile b/x11/egtk/Makefile index 0d506f4128c..779d2e73827 100644 --- a/x11/egtk/Makefile +++ b/x11/egtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2003/03/29 12:42:58 jmmv Exp $ +# $NetBSD: Makefile,v 1.10 2003/04/10 01:28:31 grant Exp $ # DISTNAME= eGTK_0.3.4 @@ -22,7 +22,7 @@ post-extract: ${FIND} ${WRKSRC} -type f -name "*.ace" -print | ${XARGS} ${RM} -f ${RMDIR} ${WRKSRC}/examples/toolbar ${RM} ${WRKSRC}/examples/Makefile - cd ${WRKSRC}/C/se; ${MAKE_PROGRAM} ${MAKE_FLAGS} -f Makefile.se clean + cd ${WRKSRC}/C/se && ${MAKE_PROGRAM} ${MAKE_FLAGS} -f Makefile.se clean ${MV} ${WRKSRC}/bin/egtkbuild ${WRKSRC}/bin/egtkbuild.in ${MV} ${WRKSRC}/man/egtkbuild.1 ${WRKSRC}/man/egtkbuild.1.in @@ -35,7 +35,7 @@ do-configure: ${FILESDIR}/loadpath.se.in > ${WRKDIR}/loadpath.se do-build: - cd ${WRKSRC}/C/se; ${MAKE_PROGRAM} ${MAKE_FLAGS} -f Makefile.se + cd ${WRKSRC}/C/se && ${MAKE_PROGRAM} ${MAKE_FLAGS} -f Makefile.se do-install: ${INSTALL_SCRIPT} ${WRKSRC}/bin/egtkbuild ${PREFIX}/bin @@ -43,19 +43,19 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/C/se/eif_gtk.a ${PREFIX}/lib/libegtk_se.a ${INSTALL_DATA_DIR} ${PREFIX}/share/egtk - cd ${WRKSRC}/lib; ${PAX} -rw * ${PREFIX}/share/egtk - cd ${WRKSRC}; ${PAX} -rw pixmaps ${PREFIX}/share/egtk + cd ${WRKSRC}/lib && ${PAX} -rw * ${PREFIX}/share/egtk + cd ${WRKSRC} && ${PAX} -rw pixmaps ${PREFIX}/share/egtk ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/egtk ${INSTALL_DATA_DIR} ${PREFIX}/share/egtk/se ${INSTALL_DATA} ${WRKSRC}/C/se/cecil.se ${PREFIX}/share/egtk/se ${INSTALL_DATA} ${WRKSRC}/C/se/eif_gtk_se.c ${PREFIX}/share/egtk/se ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/egtk - cd ${WRKSRC}/examples; ${PAX} -rw * ${PREFIX}/share/examples/egtk + cd ${WRKSRC}/examples && ${PAX} -rw * ${PREFIX}/share/examples/egtk ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/examples/egtk post-install: - cd ${WRKSRC}; ${INSTALL_DATA} copyright forum.txt ${PREFIX}/share/egtk + cd ${WRKSRC} && ${INSTALL_DATA} copyright forum.txt ${PREFIX}/share/egtk ${INSTALL_DATA} ${WRKDIR}/loadpath.se ${PREFIX}/share/egtk/se .include "../../mk/bsd.pkg.mk" diff --git a/x11/tk/Makefile b/x11/tk/Makefile index 8def681d0d2..7bba500297b 100644 --- a/x11/tk/Makefile +++ b/x11/tk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2003/03/29 12:43:10 jmmv Exp $ +# $NetBSD: Makefile,v 1.22 2003/04/10 01:28:32 grant Exp $ DISTNAME= tk8.3.4 PKGNAME= tk-8.3.4 @@ -50,7 +50,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 ${RM} -f ${PREFIX}/bin/wish cd ${PREFIX}/bin && ${LN} -s wish8.3 wish |