[pkgsrc/trunk]: pkgsrc/mk Get rid of dd workaround for old paxes (last seen i...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e2058d22f22e
branches:  trunk
changeset: 471828:e2058d22f22e
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Wed Mar 31 11:19:09 2004 +0000

description:
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:

 mk/bsd.pkg.mk |  10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diffs (33 lines):

diff -r 1cb9aed9cc6b -r e2058d22f22e mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Wed Mar 31 10:50:34 2004 +0000
+++ b/mk/bsd.pkg.mk     Wed Mar 31 11:19:09 2004 +0000
@@ -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} | ${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 @@
 .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