[pkgsrc/trunk]: pkgsrc/mk/extract EXTRACT_USING is always set, even when the ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f20e236eb01c
branches:  trunk
changeset: 536955:f20e236eb01c
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sun Dec 30 13:37:18 2007 +0000

description:
EXTRACT_USING is always set, even when the necessary tools are not
depended on because it is not used. Work around it for now by checking
that the target is actually non-empty explicitly. This is still simpler
than the original code. After the branch, this will be reordered so that
it only gets set to non-default values when it will be used.

diffstat:

 mk/extract/bsd.extract-vars.mk |   4 ++--
 mk/extract/extract.mk          |  14 ++++++++++----
 2 files changed, 12 insertions(+), 6 deletions(-)

diffs (48 lines):

diff -r ec859b8de1ea -r f20e236eb01c mk/extract/bsd.extract-vars.mk
--- a/mk/extract/bsd.extract-vars.mk    Sun Dec 30 13:35:44 2007 +0000
+++ b/mk/extract/bsd.extract-vars.mk    Sun Dec 30 13:37:18 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.extract-vars.mk,v 1.8 2007/11/07 09:52:58 rillig Exp $
+# $NetBSD: bsd.extract-vars.mk,v 1.9 2007/12/30 13:37:18 joerg Exp $
 #
 # This Makefile fragment is included separately by bsd.pkg.mk and
 # defines some variables which must be defined earlier than where
@@ -37,7 +37,7 @@
 USE_TOOLS+=    gtar
 .  elif !empty(EXTRACT_USING:Mnbtar)
 USE_TOOLS+=    tar
-.  else
+.  elif !empty(EXTRACT_USING:Mpax)
 USE_TOOLS+=    pax
 .  endif
 .endif
diff -r ec859b8de1ea -r f20e236eb01c mk/extract/extract.mk
--- a/mk/extract/extract.mk     Sun Dec 30 13:35:44 2007 +0000
+++ b/mk/extract/extract.mk     Sun Dec 30 13:37:18 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: extract.mk,v 1.22 2007/12/29 20:08:16 joerg Exp $
+# $NetBSD: extract.mk,v 1.23 2007/12/30 13:37:18 joerg Exp $
 #
 # The following variables may be set by the package Makefile and
 # specify how extraction happens:
@@ -176,11 +176,17 @@
 _EXTRACT_ENV+= ${EXTRACT_ENV}
 
 .if !empty(EXTRACT_USING:Mgtar)
-EXTRACT_OPTS+= -t ${TOOLS_PATH.gtar}
+_EXTRACT_TAR=  ${TOOLS_PATH.gtar}
 .elif !empty(EXTRACT_USING:Mnbtar)
-EXTRACT_OPTS+= -t ${TOOLS_TAR}
+_EXTRACT_TAR=  ${TOOLS_TAR}
+.elif !empty(EXTRACT_USING:Mpax)
+_EXTRACT_TAR=  ${TOOLS_PAX}
 .else
-EXTRACT_OPTS+= -t ${TOOLS_PAX}
+_EXTRACT_TAR=
+.endif
+
+.if !empty(_EXTRACT_TAR)
+EXTRACT_OPTS+= -t ${_EXTRACT_TAR}
 .endif
 
 EXTRACT_CMD_DEFAULT=                                                   \