diff options
| author | wiz <wiz> | 2004-03-31 11:19:09 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2004-03-31 11:19:09 +0000 |
| commit | f0e38155df24869fa8e8f4723dacf89e1dc5ec36 (patch) | |
| tree | 4abe107022d53781c844d4efd18ca410d09e6e46 /mk | |
| parent | 34ac759bc5c9f3450839c027cad48b17b4669dfb (diff) | |
| download | pkgsrc-f0e38155df24869fa8e8f4723dacf89e1dc5ec36.tar.gz | |
Get rid of dd workaround for old paxes (last seen in NetBSD before 1.5;
bootstrap pax doesn't need it either). Closes PR 18814 by Greg A. Woods.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 8ed148a28ce..a7bd645c284 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1433 2004/03/31 10:14:22 grant Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1434 2004/03/31 11:19:09 wiz Exp $ # # This file is in the public domain. # @@ -2126,12 +2126,10 @@ EXTRACT_CMD${__suffix__}?= ${DECOMPRESS_CMD${__suffix__}} $${extract_file} > `${ EXTRACT_CMD${__suffix__}?= ${DECOMPRESS_CMD${__suffix__}} $${extract_file} | ${SH} .endfor -# If EXTRACT_USING_PAX is defined, use pax in preference to (GNU) tar, -# and append 2 tar blocks of zero bytes on the end, in case the archive -# was written with a buggy version of GNU tar. +# If EXTRACT_USING_PAX is defined, use pax in preference to (GNU) tar. # .if defined(EXTRACT_USING_PAX) -_DFLT_EXTRACT_CMD?= { ${DECOMPRESS_CMD} $${extract_file} ; dd if=/dev/zero bs=10k count=2; } | ${PAX} -O -r ${EXTRACT_ELEMENTS} +_DFLT_EXTRACT_CMD?= ${DECOMPRESS_CMD} $${extract_file} | ${PAX} -O -r ${EXTRACT_ELEMENTS} .else _DFLT_EXTRACT_CMD?= ${DECOMPRESS_CMD} $${extract_file} | ${GTAR} -xf - ${EXTRACT_ELEMENTS} .endif @@ -2139,7 +2137,7 @@ _DFLT_EXTRACT_CMD?= ${DECOMPRESS_CMD} $${extract_file} | ${GTAR} -xf - ${EXTRACT .for __suffix__ in ${_EXTRACT_SUFFIXES} . if !defined(EXTRACT_CMD${__suffix__}) . if defined(EXTRACT_USING_PAX) -EXTRACT_CMD${__suffix__}?= { ${DECOMPRESS_CMD${__suffix__}} $${extract_file} ; dd if=/dev/zero bs=10k count=2; } | ${PAX} -O -r ${EXTRACT_ELEMENTS} +EXTRACT_CMD${__suffix__}?= ${DECOMPRESS_CMD${__suffix__}} $${extract_file} | ${PAX} -O -r ${EXTRACT_ELEMENTS} . else EXTRACT_CMD${__suffix__}?= ${DECOMPRESS_CMD${__suffix__}} $${extract_file} | ${GTAR} -xf - ${EXTRACT_ELEMENTS} . endif |