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.

8 files changed, 38 insertions, 50 deletions

diff --git a/print/LPRng-doc/Makefile b/print/LPRng-doc/Makefile
index 24bd010784f..02e0d77f54a 100644
--- a/print/LPRng-doc/Makefile
+++ b/print/LPRng-doc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/03/28 21:14:29 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2003/04/10 20:10:18 grant Exp $
 # FreeBSD Id: Makefile,v 1.5 1998/10/21 00:57:27 steve Exp
 #
 
@@ -18,8 +18,8 @@ NO_BUILD=	yes
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/LPRng
-	${PAX}	-rOzf ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} \
-		-s "#^${DISTNAME}/#${PREFIX}/share/doc/LPRng/#" \
-		'*.dvi' '*.gif' '*.html' '*.ps' '*.txt'
+	${PAX} -O -zr -s "#^${DISTNAME}/#${PREFIX}/share/doc/LPRng/#" \
+		'*.dvi' '*.gif' '*.html' '*.ps' '*.txt' \
+		-f ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} \
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/ja-ptex-bin/Makefile b/print/ja-ptex-bin/Makefile
index bf847e60090..62aab401660 100644
--- a/print/ja-ptex-bin/Makefile
+++ b/print/ja-ptex-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/15 20:00:27 kei Exp $
+# $NetBSD: Makefile,v 1.2 2003/04/10 20:10:18 grant Exp $
 
 DISTNAME=	ptex-src-${PTEX_VERS}
 PKGNAME=	ja-ptex-bin-${PTEX_VERS}
@@ -56,29 +56,21 @@ pre-extract:
 
 post-extract:
 .if defined(EXTRACT_USING_PAX)
-	cd ${WRKDIR_}; \
-	${DECOMPRESS_CMD} ${DISTDIR}/${DIST_SUBDIR}/${DF_TETEX_BIN} | ${PAX} -r
-	cd ${WRKSRC}/texk/web2c; \
-	${DECOMPRESS_CMD} \
-		${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX} \
-		| ${PAX} -r; \
-	cd ${WRKSRC}/texk; \
-	${DECOMPRESS_CMD} ${DISTDIR}/${DIST_SUBDIR}/${DF_DVIPSK_PATCH} \
-		| ${PAX} -r; \
-	${DECOMPRESS_CMD} ${DISTDIR}/${DIST_SUBDIR}/${DF_MENDEXK} | ${PAX} -r
+	cd ${WRKDIR_} && \
+		${PAX} -O -zrf ${DISTDIR}/${DIST_SUBDIR}/${DF_TETEX_BIN}
+	cd ${WRKSRC}/texk/web2c && \
+		${PAX} -O -zrf ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX}
+	cd ${WRKSRC}/texk && \
+		${PAX} -O -zrf ${DISTDIR}/${DIST_SUBDIR}/${DF_DVIPSK_PATCH}; \
+		${PAX} -O -zrf ${DISTDIR}/${DIST_SUBDIR}/${DF_MENDEXK}
 .else
-	cd ${WRKDIR_}; \
-	${DECOMPRESS_CMD} ${DISTDIR}/${DIST_SUBDIR}/${DF_TETEX_BIN} \
-		| ${GTAR} -xpf -
-	cd ${WRKSRC}/texk/web2c; \
-	${DECOMPRESS_CMD} \
-		${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX} \
-		| ${GTAR} -xpf -; \
-	cd ${WRKSRC}/texk; \
-	${DECOMPRESS_CMD} ${DISTDIR}/${DIST_SUBDIR}/${DF_DVIPSK_PATCH} \
-		| ${GTAR} -xpf -; \
-	${DECOMPRESS_CMD} ${DISTDIR}/${DIST_SUBDIR}/${DF_MENDEXK} \
-		| ${GTAR} -xpf -
+	cd ${WRKDIR_} && \
+		${GTAR} -zxpf ${DISTDIR}/${DIST_SUBDIR}/${DF_TETEX_BIN}
+	cd ${WRKSRC}/texk/web2c && \
+		${GTAR} -zxpf ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX}
+	cd ${WRKSRC}/texk && \
+		${GTAR} -zxpf ${DISTDIR}/${DIST_SUBDIR}/${DF_DVIPSK_PATCH}; \
+		${GTAR} -zxpf ${DISTDIR}/${DIST_SUBDIR}/${DF_MENDEXK}
 .endif
 	${SED} -e "s|\$$TEXMF/ptex/plain/||" \
 	${LOCALBASE}/share/texmf.local/ptex/plain/base/ptex.tex > \
diff --git a/print/ja-ptex-share/Makefile b/print/ja-ptex-share/Makefile
index b5a75a0c4b4..15033b9e955 100644
--- a/print/ja-ptex-share/Makefile
+++ b/print/ja-ptex-share/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:42:16 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/04/10 20:10:18 grant Exp $
 
 DISTNAME=	ptex-texmf-2.1
 PKGNAME=	ja-ptex-share-2.1
@@ -28,24 +28,20 @@ TEXMFLOCAL=		${PREFIX}/share/texmf.local
 do-install:
 	${INSTALL_DATA_DIR} ${TEXMFLOCAL}
 .if defined(EXTRACT_USING_PAX)
-	cd ${TEXMFLOCAL}; \
-	${DECOMPRESS_CMD} \
-	${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX} | ${PAX} -r
-	cd ${TEXMFLOCAL}/fonts; \
+	cd ${TEXMFLOCAL} && \
+		${PAX} -O -zrf ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX}
+	cd ${TEXMFLOCAL}/fonts && \
 	for f in jis nmin-ngoth standard morisawa; do \
-		${DECOMPRESS_CMD} \
-		${DISTDIR}/${DIST_SUBDIR}/$$f${EXTRACT_SUFX} | ${PAX} -r; \
+		${PAX} -O -zrf ${DISTDIR}/${DIST_SUBDIR}/$$f${EXTRACT_SUFX}; \
 		${MV} ${TEXMFLOCAL}/fonts/$$f/tfm ${TEXMFLOCAL}/fonts/tfm/$$f;\
 		${MV} ${TEXMFLOCAL}/fonts/$$f/vf ${TEXMFLOCAL}/fonts/vf/$$f;\
 	done
 .else
-	cd ${TEXMFLOCAL}; \
-	${DECOMPRESS_CMD} \
-	${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX} | ${GTAR} -xpf -
-	cd ${TEXMFLOCAL}/fonts; \
+	cd ${TEXMFLOCAL} && \
+		${GTAR} -zxpf ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX}
+	cd ${TEXMFLOCAL}/fonts && \
 	for f in jis nmin-ngoth standard morisawa; do \
-		${DECOMPRESS_CMD} \
-		${DISTDIR}/${DIST_SUBDIR}/$$f${EXTRACT_SUFX} | ${GTAR} -xpf -;\
+		${GTAR} -zxpf ${DISTDIR}/${DIST_SUBDIR}/$$f${EXTRACT_SUFX}; \
 		${MV} ${TEXMFLOCAL}/fonts/$$f/tfm ${TEXMFLOCAL}/fonts/tfm/$$f;\
 		${MV} ${TEXMFLOCAL}/fonts/$$f/vf ${TEXMFLOCAL}/fonts/vf/$$f;\
 	done
diff --git a/print/teTeX-share/Makefile b/print/teTeX-share/Makefile
index c61ddb46c59..f380055493c 100644
--- a/print/teTeX-share/Makefile
+++ b/print/teTeX-share/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2003/03/29 12:42:17 jmmv Exp $
+# $NetBSD: Makefile,v 1.20 2003/04/10 20:10:19 grant Exp $
 #
 
 DISTNAME=	teTeX-texmf-1.0.2
@@ -25,7 +25,7 @@ EXTRA_PATCH=	${FILESDIR}/latex.ltx.diff
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/texmf
-	cd ${PREFIX}/share/texmf; ${DECOMPRESS_CMD} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} | ${PAX} -cr `${CAT} ${FILESDIR}/exclude`
+	cd ${PREFIX}/share/texmf; ${DECOMPRESS_CMD} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} | ${PAX} -O -cr `${CAT} ${FILESDIR}/exclude`
 
 post-install:
 	@cd ${PREFIX}/share/texmf/tex/latex/base && \
diff --git a/print/teTeX-sharesrc/Makefile b/print/teTeX-sharesrc/Makefile
index a28896eeb74..977d32d62a6 100644
--- a/print/teTeX-sharesrc/Makefile
+++ b/print/teTeX-sharesrc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2003/03/29 12:42:17 jmmv Exp $
+# $NetBSD: Makefile,v 1.18 2003/04/10 20:10:19 grant Exp $
 # FreeBSD Id: Makefile,v 1.20 1997/08/05 06:56:41 tg Exp
 #
 
@@ -27,7 +27,7 @@ EXTRA_PATCH=	${FILESDIR}/latex.ltx.diff
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/texmf
-	cd ${PREFIX}/share/texmf; ${DECOMPRESS_CMD} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} | ${PAX} -r
+	cd ${PREFIX}/share/texmf; ${DECOMPRESS_CMD} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} | ${PAX} -O -r
 
 post-install:
 	@cd ${PREFIX}/share/texmf/source/latex/base && \
diff --git a/print/teTeX2-share/Makefile b/print/teTeX2-share/Makefile
index a66ce3561d6..d9f92a57e93 100644
--- a/print/teTeX2-share/Makefile
+++ b/print/teTeX2-share/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/03/29 12:42:17 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2003/04/10 20:10:19 grant Exp $
 
 DISTNAME=	tetex-texmf-2.0.2
 PKGNAME=	teTeX2-share-2.0.2
@@ -23,7 +23,7 @@ NO_MTREE=	yes
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/texmf
 .if defined(EXTRACT_USING_PAX)
-	cd ${PREFIX}/share/texmf; ${DECOMPRESS_CMD} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} | ${PAX} -cr `${CAT} ${FILESDIR}/exclude`
+	cd ${PREFIX}/share/texmf; ${DECOMPRESS_CMD} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} | ${PAX} -O -cr `${CAT} ${FILESDIR}/exclude`
 .else
 	cd ${PREFIX}/share/texmf; ${DECOMPRESS_CMD} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} | ${GTAR} -X ${FILESDIR}/exclude -xpf -
 .endif
diff --git a/print/teTeX2-sharesrc/Makefile b/print/teTeX2-sharesrc/Makefile
index 4c2636ee3b0..06b7b8e0de6 100644
--- a/print/teTeX2-sharesrc/Makefile
+++ b/print/teTeX2-sharesrc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/03/29 12:42:18 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2003/04/10 20:10:19 grant Exp $
 # FreeBSD Id: Makefile,v 1.20 1997/08/05 06:56:41 tg Exp
 
 DISTNAME=	tetex-texmfsrc-2.0.2
@@ -24,7 +24,7 @@ NO_MTREE=	yes
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/texmf
 .if defined(EXTRACT_USING_PAX)
-	cd ${PREFIX}/share/texmf; ${DECOMPRESS_CMD} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} | ${PAX} -r
+	cd ${PREFIX}/share/texmf; ${DECOMPRESS_CMD} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} | ${PAX} -O -r
 .else
 	cd ${PREFIX}/share/texmf; ${DECOMPRESS_CMD} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} | ${GTAR} -xpf -
 .endif
diff --git a/print/texfamily-share/Makefile b/print/texfamily-share/Makefile
index 63f268703fc..d85180ce13f 100644
--- a/print/texfamily-share/Makefile
+++ b/print/texfamily-share/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/03/29 12:42:19 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2003/04/10 20:10:19 grant Exp $
 
 DISTNAME=	TeXfamily-share-1.2.1
 PKGREVISION=	4
@@ -36,7 +36,7 @@ do-install:
     texfam-texmf-j1.9.1 texfam-texmf-m0.8 \
     mulfonts-vf mulfonts-subtfm jis nmin-ngoth standard morisawa
 	@cd ${PREFIX}/share/texmf.local; \
-		${PAX} -rz -pe -s /ls-R// \
+		${PAX} -O -rz -pe -s /ls-R// \
 			-f ${DISTDIR}/${DIST_SUBDIR}/${f}${EXTRACT_SUFX}
 .endfor
 	@${INSTALL_DATA_DIR} ${PREFIX}/share/texmf.local/doc/fonts