make usage of pax more consistent, use -O to bomb on broken archives

(suggested by lukem), group z, r and f flags.

some whitespace cleanup.

5 files changed, 14 insertions, 13 deletions

diff --git a/games/angband-tty/Makefile b/games/angband-tty/Makefile
index 0c55f1519b6..c6771d38c31 100644
--- a/games/angband-tty/Makefile
+++ b/games/angband-tty/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2003/03/29 12:41:00 jmmv Exp $
+# $NetBSD: Makefile,v 1.14 2003/04/10 20:10:16 grant Exp $
 #
 
 DISTNAME=		angband-283
@@ -30,10 +30,10 @@ do-install:
 	${INSTALL} -d -o bin -g games -m 0775 ${PREFIX}/share/angband
 	${CP} -R ${WRKDIR}/${DISTNAME}/lib/* ${PREFIX}/share/angband
 	cd ${PREFIX}/share/angband/help && \
-		${PAX} -rOzf ${DISTDIR}/${SPOILERFILE}
+		${PAX} -O -zrf ${DISTDIR}/${SPOILERFILE}
 	${CHOWN} -R bin:games ${PREFIX}/share/angband
 	${CHMOD} -R 0664 ${PREFIX}/share/angband/*
-	(cd ${PREFIX}/share/angband && ${CHMOD} 0775 apex bone data edit file help info save user xtra)
+	cd ${PREFIX}/share/angband && ${CHMOD} 0775 apex bone data edit file help info save user xtra
 	${INSTALL} -c -s -o bin -g games -m 2755 ${WRKSRC}/angband ${PREFIX}/bin
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/angband-x11/Makefile b/games/angband-x11/Makefile
index d981d60a907..a419560be37 100644
--- a/games/angband-x11/Makefile
+++ b/games/angband-x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2003/04/10 19:43:19 grant Exp $
+# $NetBSD: Makefile,v 1.19 2003/04/10 20:10:17 grant Exp $
 #
 
 DISTNAME=	angband-3.0.1
@@ -31,7 +31,8 @@ CONFIGURE_ARGS=	--with-setgid=games --prefix=${PREFIX}
 # add spoiler files and clean up a bit
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/games/angband/lib/info
-	cd ${PREFIX}/share/games/angband/lib/info/ && ${PAX} -rOzf ${DISTDIR}/${SPOILERFILE}
+	cd ${PREFIX}/share/games/angband/lib/info/ && \
+		 ${PAX} -O -zrf ${DISTDIR}/${SPOILERFILE}
 	${CHOWN} -R bin:games ${PREFIX}/share/games/angband
 	${FIND} ${PREFIX}/share/games/angband -name delete.me -exec ${RM} {} \;
 
diff --git a/games/imaze/Makefile b/games/imaze/Makefile
index 7b163d2e4ad..51162bd87bb 100644
--- a/games/imaze/Makefile
+++ b/games/imaze/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2003/03/29 12:41:05 jmmv Exp $
+# $NetBSD: Makefile,v 1.16 2003/04/10 20:10:17 grant Exp $
 
 DISTNAME=		imaze1.3
 PKGNAME=		imaze-1.3
@@ -17,7 +17,7 @@ USE_BUILDLINK2=		yes
 USE_X11BASE=		yes
 
 post-build:
-	cd ${WRKSRC} && ${PAX} -rf ${DISTDIR}/imaze-sounds.tar
+	cd ${WRKSRC} && ${PAX} -O -rf ${DISTDIR}/imaze-sounds.tar
 
 .include "../../mk/motif.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/maelstrom-x11/Makefile b/games/maelstrom-x11/Makefile
index 24a323c7be3..ce1f623529c 100644
--- a/games/maelstrom-x11/Makefile
+++ b/games/maelstrom-x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/04/10 01:28:17 grant Exp $
+# $NetBSD: Makefile,v 1.5 2003/04/10 20:10: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} -zrf ${DISTDIR}/${ESOUND} -pm && \
-		${PAX} -zrf ${DISTDIR}/${STREK} -pm && \
-		${PAX} -zrf ${DISTDIR}/${SWARS} -pm
+		${PAX} -O -pm -zrf ${DISTDIR}/${ESOUND} && \
+		${PAX} -O -pm -zrf ${DISTDIR}/${STREK} && \
+		${PAX} -O -pm -zrf ${DISTDIR}/${SWARS}
 	${CHOWN} ${BINOWN}:games ${PREFIX}/bin/Maelstrom
 	${CHMOD} 2755 ${PREFIX}/bin/Maelstrom
 	${CHOWN} ${BINOWN}:games /var/games/Maelstrom-Scores
diff --git a/games/rocksndiamonds-levels/Makefile b/games/rocksndiamonds-levels/Makefile
index b4b72139739..eb72fe4ee3a 100644
--- a/games/rocksndiamonds-levels/Makefile
+++ b/games/rocksndiamonds-levels/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2003/03/28 21:14:21 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2003/04/10 20:10:17 grant Exp $
 
 DISTNAME=	rocksndiamonds-levels-1.0
 CATEGORIES=	games x11
@@ -67,7 +67,7 @@ do-install:
 		&& ${CHMOD} 775 ${SCORE_PATH}/scores/${directory}
 .endfor
 .for levels in ${DISTFILES}
-	cd ${PREFIX}/share/rocksndiamonds && ${PAX} -rzf ${DISTDIR}/${levels}
+	cd ${PREFIX}/share/rocksndiamonds && ${PAX} -O -zrf ${DISTDIR}/${levels}
 .endfor
 	${RM} -f ${WRKDIR}/PLIST
 .for levdir in DX_Boulderdash Emerald_Mine_Club Supaplex