 @@ -1,367 +1,367 @@
 #!/bin/sh
+#
-# $NetBSD: extract,v 1.21 2022/01/06 10:30:50 schmonz Exp $
+# $NetBSD: extract,v 1.22 2024/04/28 18:07:33 wiz Exp $
+#
 # Copyright (c) 2006 The NetBSD Foundation, Inc.
 # All rights reserved.
+#
 # This code is derived from software contributed to The NetBSD Foundation
 # by Johnny C. Lam.
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
+#
 # THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
 # ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
 # TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 # PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
 # BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 # CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 # SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
+#
 ######################################################################
+#
 # NAME
 #	extract -- extract distfile, regardless of format
+#
 # SYNOPSIS
 #	extract [options] distfile [file ...]
+#
 # DESCRIPTION
 #	extract will unpack the contents of the named distfile into the
 #	current working directory.  If any optional files are specified then
 #	only they will be extracted from the distfile, provided that the
 #	underlying tool supports this ability.  If the distfile's file
 #	extension doesn't match any known archive format's, then the
 #	distfile is simply copied into the current working directory.  If
 #	"-" is given as the distfile, then standard input is used as the
 #	contents of the archive, provided that the underlying tool supports
 #	this ability.
+#
 # OPTIONS
 #	-c format	Force interpretation of the distfile's compression
 #			format to be the specified format.  Valid formats
 #			are: gzip, bzip, compress, and none.
+#
 #	-d dir		Extract the files into the specified dir instead
 #			of the current working directory.  If the directory
 #			doesn't exist, then it is created along with any
 #			intermediate directories using the current umask.
+#
 #	-f format	Force interpretation of the distfile's archive
 #			format to be the specified format.
+#
 #	-t tarprog	This specifies the tool to use to extract tar/ustar
 #			archives, and may be either "tar" or "pax", or the
 #			full path to the program.
+#
 #	-X excludefile	excludefile is a list of file patterns to exclude
 #			from extraction.  If the -X option is specified
 #			then any optional files listed on the command line
 #			are ignored.
+#
 #	-x		This causes the optional files listed on the
 #			command line to be excluded from extraction,
 #			provided the underlying tool supports this
 #			ability.
+#
 # ENVIRONMENT
 #	EXTRACT_OPTS_BIN
 #	EXTRACT_OPTS_LHA
 #	EXTRACT_OPTS_PAX
 #	EXTRACT_OPTS_RAR
 #	EXTRACT_OPTS_RPM
 #	EXTRACT_OPTS_TAR
 #	EXTRACT_OPTS_ZIP
 #	EXTRACT_OPTS_ZSTD
 #	EXTRACT_OPTS_ZOO
 #		These variables set additional arguments passed to the
 #		underlying extraction tool to unpack their respective
 #		archive formats.
+#
 ######################################################################
 set -e		# exit on errors
 set -u		# treat undefined variables as errors
 : ${BZCAT:=bzcat}
 : ${CAT:=cat}
 : ${CP:=cp}
 : ${ECHO:=echo}
 : ${GEM:="gem unpack"}
 : ${GZCAT:="gzip -cd"}
 : ${LHA:=lha}
 : ${LZCAT:="lzip -cd"}
 : ${MKDIR:=mkdir}
 : ${PAX:=pax}
 : ${RM:=rm}
 : ${RPM2PKG:=rpm2pkg}
 : ${SH:=sh}
 : ${TAR:=tar}
 : ${TEST:=test}
 : ${UNRAR:=unrar}
 : ${UNZIP_CMD:=unzip}
 : ${UNZOO:=unzoo}
 : ${P7ZA:="7za x"}
 : ${P7ZA_SO:="7za x -so"}
 : ${ZSTD:="zstd"}
 : ${TMPDIR:=/tmp}
 self="${0##*/}"
 usage() {
 	${ECHO} 1>&2 "usage: $self [-c format] [-d dir] [-f format] [-t tarprog] [-X excludefile | -x] distfile [file ...]"
+}
 exclude=no
 exclude_file=
 exclude_flag=
 extract_dir=.
 extract_using=tar
 format=
 cformat=
 # Process optional arguments
 while ${TEST} $# -gt 0; do
 	case "$1" in
 	-c)	cformat="$2"; shift 2 ;;
 	-d)	extract_dir="$2"; shift 2 ;;
 	-f)	format="$2"; shift 2 ;;
 	-t)	extract_using="$2"; shift 2 ;;
 	-X)	exclude_file="$2"; shift 2 ;;
 	-x)	exclude=yes; shift ;;
 	--)	shift; break ;;
 	-?*)	${ECHO} 1>&2 "$self: unknown option -- ${1#-}"
 		usage
 		exit 1
 		;;
 	*)	break ;;
 	esac
 done
 case "$extract_using" in
 /*tar|/*pax)	tarprog="$extract_using" ;;
 *tar)		tarprog="${TAR}" ;;
 *pax)		tarprog="${PAX}" ;;
 *)		tarprog="${TAR}" ;;
 esac
 if ${TEST} -n "$exclude_file" -a ! -f "$exclude_file"; then
 	${ECHO} 1>&2 "$self: exclude file missing: $exclude_file"
 	exit 1
 fi
 # Process required arguments
 ${TEST} $# -gt 0 || { usage; exit 1; }
 distfile="$1"; shift
 # Make distfile an absolute path, because we will change the current
 # directory soon.
 case "$distfile" in
 /*)	;;
 *)	distfile=`exec pwd`/"$distfile"
 	;;
 esac
 # Derive the compression format of the archive based on the file extension.
 case "$distfile" in
 *.gz|*.tgz|*.z|*.crate)		_cformat=gzip ;;
 *.7z)				_cformat=7z ;;
 *.bz2|*.tbz|*.tbz2|*.bz)	_cformat=bzip ;;
 *.lz)				_cformat=lzip ;;
 *.lzma)				_cformat=lzma ;;
 *.xz|*.txz)			_cformat=xz ;;
 *.Z)				_cformat=compress ;;
 *)				_cformat=none ;;
 esac
 ${TEST} -n "$cformat" || cformat="$_cformat"
 # Derive the command to decompress the file and write the contents to
 # stdout, based on the file extension.
+#
 case "$cformat" in
 gzip|compress)	decompress_cat="${GZCAT}" ;;
 z)		decompress_cat="${P7ZA_SO}" ;;
 bzip)		decompress_cat="${BZCAT}" ;;
 lzip)		decompress_cat="${LZCAT}" ;;
 lzma)		decompress_cat="${XZCAT}" ;;
 xz)		decompress_cat="${XZCAT}" ;;
 none)		decompress_cat="${CAT}" ;;
 *)		decompress_cat="${CAT}" ;;
 esac
 # Derive the format of the archive based on the file extension.
 case "$distfile" in
 *.tar.gz|*.tgz|*-tar.gz|*_tar.gz|*.tar.bz2|*.txz|*.tbz|*.tbz2|*.tar.lz|*.tar.lzma|*.tar.xz|*.tar.Z|*.tar.z|*.tar|*.tar.bz|*.tar.7z|*.tar.zst|*.crate)
 		_format=tar ;;
 *.cpio|*.cpio.gz|*.cpio.bz2)
 		_format=cpio ;;
 *.shar.gz|*.shar.bz2|*.shar.Z|*.shar|*.shr.gz|*.shr.bz2|*.shr.Z|*.shr)
 		_format=shar ;;
 *.zip|*.ZIP)	_format=zip ;;
 *.lha|*.lzh)	_format=lha ;;
 *.Z|*.bz2|*.gz|*.z)
 		_format=compressed ;;
 *.zoo)		_format=zoo ;;
 *.rar)		_format=rar ;;
 *.rpm)		_format=rpm ;;
 *.bin|*.sh)	_format=jre-bin ;;
 *.gem)		_format=gem ;;
 *.7z)		_format=7z ;;
 *.zst)		_format=zstd ;;
 *)		_format=none ;;
 esac
 ${TEST} -n "$format" || format="$_format"
 case "$format" in
 tar|shar)	;;
 *)		if ${TEST} "$distfile" = "-"; then
 			${ECHO} 1>&2 "$self: archive format cannot be given on standard input -- $format"
 			exit 1
 		fi
 		;;
 esac
 ${TEST} -d "$extract_dir" || ${MKDIR} -p "$extract_dir"
 cd "$extract_dir"
 # Use the correct tool and extraction procedure to perform the extraction
 # based on the archive format.
+#
 case "$format" in
 tar)
 	case "$extract_using" in
 	*pax)
 		: ${EXTRACT_OPTS_PAX=}
 		case "$extract_using" in
 		/*)	paxprog="$extract_using" ;;
 		*)	paxprog="${PAX}" ;;
 		esac
 		if ${TEST} -n "$exclude_file"; then
 			exclude=yes
 			set -- dummy `${CAT} "$exclude_file"`; shift
 		fi
 		${TEST} "$exclude" = no || exclude_flag="-c"
 		$decompress_cat "$distfile" |
 			$paxprog ${EXTRACT_OPTS_PAX} $exclude_flag -O -r ${1+"$@"}
 		;;
 	*tar)
-		: ${EXTRACT_OPTS_TAR=}
+		: ${EXTRACT_OPTS_TAR=--no-xattrs}
 		case "$extract_using" in
 		/*)	tarprog="$extract_using" ;;
 		*)	tarprog="${TAR}" ;;
 		esac
 		tmpfile=
 		if ${TEST} "$exclude" = "yes"; then
 			tmpfile="${TMPDIR}/$self.$$"
 			${RM} -f "$tmpfile"
 			trap "\${RM} -f \"\$tmpfile\"" 0
 			for i in ${1+"$@"}; do
 				${ECHO} "$i" >> "$tmpfile"
 			done
 			exclude_file="$tmpfile"
 		fi
 		if ${TEST} -n "$exclude_file"; then
 			exclude_flag="-X $exclude_file"
 			set -- dummy; shift
 		fi
 		$decompress_cat "$distfile" |
 			$tarprog ${EXTRACT_OPTS_TAR} $exclude_flag -xf - ${1+"$@"}
 		;;
 	*)
 		${ECHO} 1>&2 "$self: unknown tar program: $extract_using"
 		exit 1
 	esac
 	;;
 cpio)
 	: ${EXTRACT_OPTS_PAX=}
 	if ${TEST} -n "$exclude_file"; then
 		exclude=yes
 		set -- dummy `${CAT} "$exclude_file"`; shift
 	fi
 	${TEST} "$exclude" = no || exclude_flag="-c"
 	$decompress_cat "$distfile" |
 		${PAX} ${EXTRACT_OPTS_PAX} $exclude_flag -r ${1+"$@"}
 	;;
 shar)
 	$decompress_cat "$distfile" | ${SH}
 	;;
 zip)
 	: ${EXTRACT_OPTS_ZIP=-aqo}
 	${TEST} "$exclude" = "no" || exclude_flag="-x"
 	if ${TEST} -n "$exclude_file"; then
 		set -- dummy `${CAT} "$exclude_file"`; shift
 	fi
 	${UNZIP_CMD} ${EXTRACT_OPTS_ZIP} "$distfile" $exclude_flag ${1+"$@"}
 	;;
 lha)
 	: ${EXTRACT_OPTS_LHA=q}
 	${LHA} x${EXTRACT_OPTS_LHA} "$distfile" ${1+"$@"}
 	;;
 compressed)
 	target="${distfile##*/}"; target="${target%.*}"
 	$decompress_cat "$distfile" > "$target"
 	;;
 zoo)
 	: ${EXTRACT_OPTS_ZOO=}
 	${UNZOO} -x ${EXTRACT_OPTS_ZOO} "$distfile" ${1+"$@"}
 	;;
 rar)
 	: ${EXTRACT_OPTS_RAR=-inul}
 	${UNRAR} x ${EXTRACT_OPTS_RAR} "$distfile" ${1+"$@"}
 	;;
 rpm)
 	: ${EXTRACT_OPTS_RPM=}
 	${RPM2PKG} -d . ${EXTRACT_OPTS_RPM} "$distfile" ${1+"$@"}
 	;;
 jre-bin)
 	: ${EXTRACT_OPTS_BIN=}
 	${ECHO} yes | "$distfile" ${EXTRACT_OPTS_BIN} >/dev/null
 	;;
 gem)
 	${GEM} "$distfile"
 	;;
 z)
 	${P7ZA} "$distfile"
 	;;
 zst)
 	: ${EXTRACT_OPTS_ZSTD=}
 	${ZSTD} -d ${EXTRACT_OPTS_ZSTD} "$distfile" ${1+"$@"}
 	;;
 none)
 	# By default, copy the distfile over to the current working directory.
 	${CP} "$distfile" .
 	;;
 *)
 	${ECHO} 1>&2 "$self: archive format not recognized -- $format"
 	exit 1
 	;;
 esac
 exit 0

 @@ -1,235 +1,235 @@
-# $NetBSD: extract.mk,v 1.44 2022/11/23 13:30:38 jperkin Exp $
+# $NetBSD: extract.mk,v 1.45 2024/04/28 18:07:33 wiz Exp $
+#
 # The following variables may be set by the package Makefile and
 # specify how extraction happens:
+#
 #    EXTRACT_DIR
 #	The directory into which the files are extracted.
+#
 #	Default value: ${WRKDIR}
+#
 #    EXTRACT_DIR.${file}
 #	The directory into which the file ${file} is extracted.
+#
 #	Default: ${EXTRACT_DIR}
+#
 #    EXTRACT_ENV is the shell environment that is exported to the extract
 #	process.
+#
 #    EXTRACTOR is the the the environment and path used to execute the
 #	all-purpose extract script.
+#
 #    EXTRACT_CMD is a shell command list that extracts the contents of
 #	an archive named by the variable ${DOWNLOADED_DISTFILE} to the
 #	current working directory.  The default is ${EXTRACT_CMD_DEFAULT}.
+#
 #    EXTRACT_OPTS is a list of options to pass to the "extract" script
 #	when using EXTRACT_CMD_DEFAULT.  See the comments at the head of
 #	the "extract" script for a definitive list of the available
 #	options.  The default list is empty.
+#
 #    EXTRACT_ELEMENTS is a list of files within the distfile to extract
 #	when using EXTRACT_CMD_DEFAULT.  By default, this is empty, which
 #	causes all files within the archive to be extracted.
+#
 # The following are read-only variables that may be used within a package
 #	Makefile:
+#
 #    DOWNLOADED_DISTFILE represents the path to the distfile that is
 #	currently being extracted, and may be used in custom EXTRACT_CMD
 #	overrides, e.g.
+#
 #	    EXTRACT_CMD= ${TAIL} +25 ${DOWNLOADED_DISTFILE} > foo.pl
+#
 #    EXTRACT_CMD_DEFAULT uses the "extract" script to unpack archives.  The
 #	precise manner in which extraction occurs may be tweaked by setting
 #	EXTRACT_OPTS, EXTRACT_USING and EXTRACT_ELEMENTS.
+#
 EXTRACT_DIR?=		${WRKDIR}
 .for f in ${EXTRACT_ONLY}
 EXTRACT_DIR.${f}?=	${EXTRACT_DIR}
 .endfor
 _COOKIE.extract=	${WRKDIR}/.extract_done
 ######################################################################
 ### extract (PUBLIC)
 ######################################################################
 ### extract is a public target to perform extraction.
 ###
 _EXTRACT_TARGETS+=	check-vulnerable
 _EXTRACT_TARGETS+=	tools
 _EXTRACT_TARGETS+=	acquire-extract-lock
 _EXTRACT_TARGETS+=	${_COOKIE.extract}
 _EXTRACT_TARGETS+=	release-extract-lock
 .PHONY: extract
 .if !target(extract)
 .  if exists(${_COOKIE.extract}) && !${_CLEANING}
 extract:
 	@${DO_NADA}
 .  elif defined(_PKGSRC_BARRIER)
 extract: ${_EXTRACT_TARGETS}
 .  else
 extract: barrier
 .  endif
 .endif
 .PHONY: acquire-extract-lock release-extract-lock
 acquire-extract-lock: acquire-lock
 release-extract-lock: release-lock
 .if exists(${_COOKIE.extract}) && !${_CLEANING}
 ${_COOKIE.extract}:
 	@${DO_NADA}
 .else
 ${_COOKIE.extract}: real-extract
 .endif
 ######################################################################
 ### real-extract (PRIVATE)
 ######################################################################
 ### real-extract is a helper target onto which one can hook all of the
 ### targets that do the actual extraction work.
 ###
 _REAL_EXTRACT_TARGETS+=	extract-check-interactive
 _REAL_EXTRACT_TARGETS+=	extract-message
 _REAL_EXTRACT_TARGETS+=	extract-vars
 _REAL_EXTRACT_TARGETS+=	extract-dir
 _REAL_EXTRACT_TARGETS+=	pre-extract
 _REAL_EXTRACT_TARGETS+=	do-extract
 _REAL_EXTRACT_TARGETS+=	post-extract
 _REAL_EXTRACT_TARGETS+=	extract-cookie
 _REAL_EXTRACT_TARGETS+=	error-check
 .PHONY: real-extract
 real-extract: ${_REAL_EXTRACT_TARGETS}
 .PHONY: extract-message
 extract-message:
 	@${PHASE_MSG} "Extracting for ${PKGNAME}"
 .PHONY: extract-dir
 extract-dir:
 	@${MKDIR} ${EXTRACT_DIR}
 .for f in ${EXTRACT_ONLY}
 	@${MKDIR} ${EXTRACT_DIR.${f}}
 .endfor
 ######################################################################
 ### extract-check-interactive (PRIVATE)
 ######################################################################
 ### extract-check-interactive checks whether we must do an interactive
 ### extraction or not.
 ###
 .PHONY: extract-check-interactive
 extract-check-interactive:
 .if !empty(INTERACTIVE_STAGE:Mextract) && defined(BATCH)
 	${RUN}								\
 	${ERROR_MSG} "The extract stage of this package requires user interaction"; \
 	${ERROR_MSG} "Please extract manually with:";			\
 	${ERROR_MSG} "    \"cd ${.CURDIR} && ${MAKE} extract\"";	\
 	${FALSE}
 .else
 	@${DO_NADA}
 .endif
 ######################################################################
 ### extract-cookie (PRIVATE)
 ######################################################################
 ### extract-cookie creates the "extract" cookie file.  The contents
 ### are the name of the package.
 ###
 .PHONY: extract-cookie
 extract-cookie:
 	${RUN}								\
 	${TEST} ! -f ${_COOKIE.extract} || ${FALSE};			\
 	${TEST} -d ${_COOKIE.extract:H} || ${MKDIR} ${_COOKIE.extract:H}; \
 	${ECHO} ${PKGNAME} > ${_COOKIE.extract}
 ######################################################################
 ### pre-extract, do-extract, post-extract (PUBLIC, override)
 ######################################################################
 ### {pre,do,post}-extract are the heart of the package-customizable
 ### extract targets, and may be overridden within a package Makefile.
 ###
 .PHONY: pre-extract do-extract post-extract
 EXTRACT_ELEMENTS?=	# empty
 ###
 ### Build the default extraction command
 ###
 _EXTRACT_ENV+=	${EXTRACT_OPTS_BIN:D	EXTRACT_OPTS_BIN=${EXTRACT_OPTS_BIN:Q}}
 _EXTRACT_ENV+=	${EXTRACT_OPTS_LHA:D	EXTRACT_OPTS_LHA=${EXTRACT_OPTS_LHA:Q}}
 _EXTRACT_ENV+=	${EXTRACT_OPTS_PAX:D	EXTRACT_OPTS_PAX=${EXTRACT_OPTS_PAX:Q}}
 _EXTRACT_ENV+=	${EXTRACT_OPTS_RAR:D	EXTRACT_OPTS_RAR=${EXTRACT_OPTS_RAR:Q}}
 _EXTRACT_ENV+=	${EXTRACT_OPTS_RPM:D	EXTRACT_OPTS_LHA=${EXTRACT_OPTS_RPM:Q}}
 _EXTRACT_ENV+=	${EXTRACT_OPTS_TAR:D	EXTRACT_OPTS_TAR=${EXTRACT_OPTS_TAR:Q}}
 _EXTRACT_ENV+=	${EXTRACT_OPTS_ZIP:D	EXTRACT_OPTS_ZIP=${EXTRACT_OPTS_ZIP:Q}}
 _EXTRACT_ENV+=	${EXTRACT_OPTS_ZSTD:D	EXTRACT_OPTS_ZSTD=${EXTRACT_OPTS_ZSTD:Q}}
 _EXTRACT_ENV+=	${EXTRACT_OPTS_ZOO:D	EXTRACT_OPTS_ZOO=${EXTRACT_OPTS_ZOO:Q}}
 _EXTRACT_ENV+=	${TOOLS_CMDLINE_BZCAT:D		BZCAT=${TOOLS_CMDLINE_BZCAT:Q}}
 _EXTRACT_ENV+=	${TOOLS_CAT:D		CAT=${TOOLS_CAT:Q}}
 _EXTRACT_ENV+=	${TOOLS_CP:D		CP=${TOOLS_CP:Q}}
 _EXTRACT_ENV+=	${TOOLS_ECHO:D		ECHO=${TOOLS_ECHO:Q}}
 _EXTRACT_ENV+=	${TOOLS_CMDLINE.gzcat:D	GZCAT=${TOOLS_CMDLINE.gzcat:Q}}
 _EXTRACT_ENV+=	${TOOLS_LHA:D		LHA=${TOOLS_LHA:Q}}
 _EXTRACT_ENV+=	${TOOLS_MKDIR:D		MKDIR=${TOOLS_MKDIR:Q}}
 _EXTRACT_ENV+=	${TOOLS_RM:D		RM=${TOOLS_RM:Q}}
 _EXTRACT_ENV+=	${TOOLS_RPM2PKG:D	RPM2PKG=${TOOLS_RPM2PKG:Q}}
 _EXTRACT_ENV+=	${TOOLS_PAX:D		PAX=${TOOLS_PAX:Q}}
 _EXTRACT_ENV+=	${TOOLS_SH:D		SH=${TOOLS_SH:Q}}
 _EXTRACT_ENV+=	${TOOLS_TAR:D		TAR=${TOOLS_TAR:Q}}
 _EXTRACT_ENV+=	${TOOLS_TEST:D		TEST=${TOOLS_TEST:Q}}
 _EXTRACT_ENV+=	${TOOLS_UNRAR:D		UNRAR=${TOOLS_UNRAR:Q}}
 _EXTRACT_ENV+=	${TOOLS_UNZIP_CMD:D	UNZIP_CMD=${TOOLS_UNZIP_CMD:Q}}
 _EXTRACT_ENV+=	${TOOLS_UNZOO:D		UNZOO=${TOOLS_UNZOO:Q}}
 _EXTRACT_ENV+=	${TOOLS_XZCAT:D		XZCAT=${TOOLS_XZCAT:Q}}
 _EXTRACT_ENV+=	${TOOLS_7ZA:D		P7ZA=${TOOLS_7ZA:Q}}
 _EXTRACT_ENV+=	${TOOLS_ZSTD:D		ZSTD=${TOOLS_ZSTD:Q}}
 _EXTRACT_ENV+=	${EXTRACT_ENV}
 .if !empty(EXTRACT_USING:Mbsdtar)
 _EXTRACT_TAR=	${TOOLS_PATH.bsdtar}
 .elif !empty(EXTRACT_USING:Mgtar)
 _EXTRACT_TAR=	${TOOLS_PATH.gtar}
 .elif !empty(EXTRACT_USING:Mnbtar)
 _EXTRACT_TAR=	${TOOLS_TAR}
 .elif !empty(EXTRACT_USING:Mpax)
 _EXTRACT_TAR=	${TOOLS_PAX}
 .else
 _EXTRACT_TAR=
 .endif
 .if !empty(_EXTRACT_TAR)
 EXTRACT_OPTS+=	-t ${_EXTRACT_TAR}
 .endif
 EXTRACTOR=		\
 	${PKGSRC_SETENV} ${_EXTRACT_ENV} ${SH} ${PKGSRCDIR}/mk/extract/extract
 EXTRACT_CMD_DEFAULT=	\
 	${EXTRACTOR} ${EXTRACT_OPTS} ${DOWNLOADED_DISTFILE} ${EXTRACT_ELEMENTS}
 EXTRACT_CMD?=	${EXTRACT_CMD_DEFAULT}
 DOWNLOADED_DISTFILE=	"$${extract_file}"
 .if !target(do-extract)
 do-extract: ${WRKDIR}
 .  for f in ${EXTRACT_ONLY}
 	${RUN} extract_file=${_DISTDIR:Q}/${f:Q}; export extract_file;	\
-	EXTRACT_OPTS_TAR=${EXTRACT_OPTS_TAR.${f}}; export EXTRACT_OPTS_TAR;	\
+	if [ "" != "${EXTRACT_OPTS_TAR.${f}}" ]; then EXTRACT_OPTS_TAR=${EXTRACT_OPTS_TAR.${f}}; export EXTRACT_OPTS_TAR; fi; \
 	cd ${WRKDIR} && cd ${EXTRACT_DIR.${f}} && ${EXTRACT_CMD}
 .  endfor
 .endif
 .if !target(pre-extract)
 pre-extract:
 	@${DO_NADA}
 .endif
 .if !target(post-extract)
 post-extract:
 	@${DO_NADA}
 .endif