From 3658cb69164d87994099b24340f06a30f37dd521 Mon Sep 17 00:00:00 2001 From: grant Date: Thu, 10 Apr 2003 01:28:03 +0000 Subject: make ${PAX} usage consistent: - group 'zrw' and 'p' args, -s last - use the && operator consistently - strip unneeded parens - some whitespace cleanup --- games/civctp-demo/Makefile | 4 ++-- games/eus-demo/Makefile | 4 ++-- games/fortunes-de/Makefile | 4 ++-- games/heretic2-demo/Makefile | 4 ++-- games/maelstrom-x11/Makefile | 8 ++++---- games/mirrormagic-sdl/Makefile | 4 ++-- games/mirrormagic/Makefile | 4 ++-- games/nighthawk/Makefile | 8 ++++---- games/quake3arena-demo/Makefile | 6 +++--- games/quake3arena/Makefile | 6 +++--- games/rocksndiamonds/Makefile | 4 ++-- 11 files changed, 28 insertions(+), 28 deletions(-) (limited to 'games') 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 -- cgit v1.2.3