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.

25 files changed, 80 insertions, 91 deletions

diff --git a/cross/i386-netbsdpe/Makefile b/cross/i386-netbsdpe/Makefile
index 2d9b4049878..a7a2c85801a 100644
--- a/cross/i386-netbsdpe/Makefile
+++ b/cross/i386-netbsdpe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2002/10/03 14:26:44 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2003/04/10 20:10:15 grant Exp $
 # $PEACE: Makefile,v 1.21 2002/08/21 02:48:23 kent Exp $
 
 DISTVERSION=		1.3.4
@@ -45,10 +45,10 @@ DISTFILES+=		${PTHREAD_DISTFILE}
 EXTRACT_ONLY=		${GCC_WIN32_PATCHBUNDLE} ${SSP_PATCH} ${PTHREAD_DISTFILE}
 
 post-extract:
-	cd ${WRKDIR} && ${PAX} -rz -s /${GCC_DISTNAME}/toolchain/ \
+	cd ${WRKDIR} && ${PAX} -O -rz -s /${GCC_DISTNAME}/toolchain/ \
 		-f ${_DISTDIR}/${GCC_DISTNAME}.tar.gz
 	${PATCH} -d ${WRKSRC} -p1 --forward --quiet -E < ${GCC_WIN32_PATCH}
-	cd ${WRKDIR} && ${PAX} -rz -s /${BINUTILS_DISTNAME}/toolchain/ \
+	cd ${WRKDIR} && ${PAX} -O -rz -s /${BINUTILS_DISTNAME}/toolchain/ \
 		-f ${_DISTDIR}/${BINUTILS_DISTNAME}.tar.bz2
 
 post-patch:
diff --git a/databases/postgresql-client/Makefile b/databases/postgresql-client/Makefile
index 16b332cdca4..c5c830a8bc1 100644
--- a/databases/postgresql-client/Makefile
+++ b/databases/postgresql-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2003/03/25 15:13:47 cjep Exp $
+# $NetBSD: Makefile,v 1.19 2003/04/10 20:10:16 grant Exp $
 
 PKGNAME=		postgresql-client-${BASE_VERS}
 SVR4_PKGNAME=		pstgc
@@ -26,7 +26,7 @@ pre-build:
 
 post-install:
 	cd ${PREFIX}/man && 						\
-	${PAX} -crzf ${WRKSRC}/doc/man.tar.gz `${GREP} -v ^# ${FILESDIR}/exclude`
+		${PAX} -O -crzf ${WRKSRC}/doc/man.tar.gz `${GREP} -v ^# ${FILESDIR}/exclude`
 
 .include "../postgresql-lib/buildlink2.mk"
 .include "../../devel/readline/buildlink2.mk"
diff --git a/devel/sfio/Makefile b/devel/sfio/Makefile
index fed896a6a2d..8a9837858ff 100644
--- a/devel/sfio/Makefile
+++ b/devel/sfio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/04/10 01:28:15 grant Exp $
+# $NetBSD: Makefile,v 1.9 2003/04/10 20:10:16 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} -rf ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}
+	cd ${WRKDIR} && ${PAX} -O -rf ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}
 
 post-patch:
 	${MV} ${WRKSRC}/man/man3/sfio.3 ${WRKSRC}/man/man3/sfio.3.in
diff --git a/emulators/hercules-images/Makefile b/emulators/hercules-images/Makefile
index fa04e0c5d72..53b9ccf00d6 100644
--- a/emulators/hercules-images/Makefile
+++ b/emulators/hercules-images/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/03/29 12:40:49 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2003/04/10 20:10:16 grant Exp $
 
 DISTNAME=		mftr33
 PKGNAME=		hercules-images-20010222
@@ -16,7 +16,7 @@ EXTRACT_ONLY=
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/data/hercules
-	cd ${PREFIX}/share/data/hercules;				\
-	(${GZCAT} ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ; dd if=/dev/zero bs=10k count=2) | ${PAX} -r
+	cd ${PREFIX}/share/data/hercules &&				\
+		(${GZCAT} ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}; dd if=/dev/zero bs=10k count=2) | ${PAX} -O -r
 
 .include "../../mk/bsd.pkg.mk"
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
diff --git a/lang/gcc-ssp/Makefile b/lang/gcc-ssp/Makefile
index f2659441069..d2e4a2290c6 100644
--- a/lang/gcc-ssp/Makefile
+++ b/lang/gcc-ssp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2003/04/10 01:28:19 grant Exp $
+# $NetBSD: Makefile,v 1.21 2003/04/10 20:10:17 grant Exp $
 
 DISTNAME=		gcc-2.95.3
 GCC_VERSION=		2.95.3
@@ -81,7 +81,7 @@ post-extract:
 
 post-patch:
 	${ECHO} "bogus" >${WRKSRC}/../${DISTNAME}/gcc/cstamp-h.in
-	cd ${WRKDIR} && ${PAX} -rzf ${_DISTDIR}/${SSP_PATCH}
+	cd ${WRKDIR} && ${PAX} -O -zrf ${_DISTDIR}/${SSP_PATCH}
 	${CP} ${WRKDIR}/protector.c ${WRKDIR}/protector.h ${WRKDIR}/${DISTNAME}/gcc/
 	${PATCH} -p0 -d ${WRKDIR}/${DISTNAME} --forward --quiet -E < ${WRKDIR}/protector.dif
 	${PATCH} -p0 -d ${WRKDIR}/${DISTNAME} --forward --quiet -E < ${WRKDIR}/protectonly.dif
diff --git a/net/coda5_client/Makefile b/net/coda5_client/Makefile
index 0bcdac6a835..cd0fe913204 100644
--- a/net/coda5_client/Makefile
+++ b/net/coda5_client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2003/04/10 01:28:20 grant Exp $
+# $NetBSD: Makefile,v 1.38 2003/04/10 20:10:18 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} -O -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 b984c5be19a..dbcd08eb88c 100644
--- a/net/coda5_server/Makefile
+++ b/net/coda5_server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2003/04/10 01:28:21 grant Exp $
+# $NetBSD: Makefile,v 1.37 2003/04/10 20:10:18 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} -O -zr					\
 		-s "/usr\/\(man\/man.\/\)au.8/\1vice-au.8/"		\
 		-s "/usr\///"						\
 		-f ${_DISTDIR}/${CODADOC_DISTFILE}			\
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
diff --git a/security/tripwire/Makefile b/security/tripwire/Makefile
index 75f7ef0942c..17bbf983fca 100644
--- a/security/tripwire/Makefile
+++ b/security/tripwire/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/04/10 01:28:24 grant Exp $
+# $NetBSD: Makefile,v 1.9 2003/04/10 20:10:20 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} -rf T1.2.tar
+	cd ${WRKDIR} && ${PAX} -O -rf T1.2.tar
 	${CP} ${FILESDIR}/conf-${LOWER_OPSYS}.h ${WRKSRC}/configs
 
 post-patch:
diff --git a/sysutils/fsviewer/Makefile b/sysutils/fsviewer/Makefile
index 2e05c68cd50..9ad8b9a7d89 100644
--- a/sysutils/fsviewer/Makefile
+++ b/sysutils/fsviewer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2002/08/25 21:50:57 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2003/04/10 20:10:20 grant Exp $
 #
 
 DISTNAME=	FSViewer.app-0.2.3
@@ -26,7 +26,7 @@ USE_BUILDLINK2=		yes
 
 post-install:
 	cd ${PREFIX}/GNUstep/Apps/FSViewer.app && \
-		${PAX} -zrf ${_DISTDIR}${DISTSUBDIR}/icons.tar.gz *.xpm *.tif
+		${PAX} -O -zrf ${_DISTDIR}${DISTSUBDIR}/icons.tar.gz *.xpm *.tif
 
 .include "../../wm/windowmaker/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/lsof/Makefile b/sysutils/lsof/Makefile
index e2772e4555e..fe536fd7bf0 100644
--- a/sysutils/lsof/Makefile
+++ b/sysutils/lsof/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2003/03/27 14:13:26 atatat Exp $
+# $NetBSD: Makefile,v 1.60 2003/04/10 20:10:20 grant Exp $
 #
 
 DISTNAME=		lsof_4.67
@@ -50,7 +50,7 @@ post-extract:
 	if [ "X${EXTRACT_USING_PAX}" = "X" ]; then \
 		${GTAR} -xf ${SRCBALL_NAME}.tar; \
 	else \
-		${PAX} -r < ${SRCBALL_NAME}.tar; \
+		${PAX} -O -r < ${SRCBALL_NAME}.tar; \
 	fi)
 	@( cd ${WRKSRC} ; ${ECHO} "y" | ./Inventory || exit 1 )
 
diff --git a/sysutils/storage-manager/Makefile b/sysutils/storage-manager/Makefile
index cd9c789b348..7add90d300c 100644
--- a/sysutils/storage-manager/Makefile
+++ b/sysutils/storage-manager/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/04/10 01:28:24 grant Exp $
+# $NetBSD: Makefile,v 1.10 2003/04/10 20:10:20 grant Exp $
 
 DISTNAME=		sm_linux_v314_install
 PKGNAME=		storage-manager-3.14
@@ -41,7 +41,7 @@ _FETCH_MESSAGE= \
 do-extract:
 	${MKDIR} ${WRKSRC}
 	cd ${WRKSRC} && rpm2cpio ${DISTDIR}/${DISTNAME}.rpm > ${DISTNAME}.cpio
-	cd ${WRKSRC} && ${PAX} -rd -f ${DISTNAME}.cpio
+	cd ${WRKSRC} && ${PAX} -O -d -rf ${DISTNAME}.cpio
 
 do-patch:
 	${SED}	-e "s,@PREFIX@,${PREFIX},g"			\
diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile
index a095f634756..49a1ab13586 100644
--- a/x11/eterm/Makefile
+++ b/x11/eterm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2003/03/27 19:44:46 salo Exp $
+# $NetBSD: Makefile,v 1.19 2003/04/10 20:10:20 grant Exp $
 #
 
 DISTNAME=		Eterm-0.9.2
@@ -46,9 +46,9 @@ BUILD_DEFS+=		USE_MMX
 
 post-extract:
 	${LN} -sf ${WRKSRC} ${WRKDIR}/Eterm
-	cd ${WRKDIR};							\
-	for f in ${PIXMAP_FILES}; do					\
-		${GZCAT} ${DISTDIR}/$$f | ${PAX} -r;			\
+	cd ${WRKDIR} && \
+	for f in ${PIXMAP_FILES}; do \
+		${PAX} -O -zrf ${DISTDIR}/$$f; \
 	done
 
 .include "../../devel/libast/buildlink2.mk"