[pkgsrc/trunk]: pkgsrc/mk/extract mk/extract: move EXTRACT_USING earlier

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/162893ebda9d
branches:  trunk
changeset: 412961:162893ebda9d
user:      gdt <gdt%pkgsrc.org@localhost>
date:      Sat Mar 14 00:14:35 2020 +0000

description:
mk/extract: move EXTRACT_USING earlier

In an attempt to resolve problems on SunOS, move EXTRACT_USING to the
early variables file, in the hopes that it will be defined before code
that checks it is executed.

diffstat:

 mk/extract/bsd.extract-vars.mk |  11 ++++++++++-
 mk/extract/extract.mk          |  10 +---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diffs (63 lines):

diff -r 76b3496ced3a -r 162893ebda9d mk/extract/bsd.extract-vars.mk
--- a/mk/extract/bsd.extract-vars.mk    Sat Mar 14 00:03:19 2020 +0000
+++ b/mk/extract/bsd.extract-vars.mk    Sat Mar 14 00:14:35 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.extract-vars.mk,v 1.18 2019/08/02 11:48:17 nia Exp $
+# $NetBSD: bsd.extract-vars.mk,v 1.19 2020/03/14 00:14:35 gdt Exp $
 #
 # This Makefile fragment is included separately by bsd.pkg.mk and
 # defines some variables which must be defined earlier than where
@@ -13,6 +13,13 @@
 #    EXTRACT_SUFX is the suffix for the default distfile to be
 #       extracted.  The default suffix is ".tar.gz".
 #
+#    EXTRACT_USING specifies the tool used to extract tar/ustar-format
+#      archives when using EXTRACT_CMD_DEFAULT.  The possible values are
+#      "bsdtar", "gtar", "nbtar", and "pax".
+#      By default, we use the "nbtar", which means the value of
+#      ${TOOL_PLATFORM.tar}, which is typically an arbitrary
+#      implementation already found on the platform.
+#    \todo: Decide if this is package-settable or user-settable or both.
 
 _VARGROUPS+=           extract
 _PKG_VARS.extract=     EXTRACT_DIR EXTRACT_ONLY EXTRACT_SUFX EXTRACT_CMD \
@@ -23,6 +30,8 @@
 EXTRACT_ONLY?=         ${DISTFILES}
 EXTRACT_SUFX?=         .tar.gz
 
+EXTRACT_USING?=                nbtar
+
 ###
 ### Discover which tools we need based on the file extensions of the
 ### distfiles.
diff -r 76b3496ced3a -r 162893ebda9d mk/extract/extract.mk
--- a/mk/extract/extract.mk     Sat Mar 14 00:03:19 2020 +0000
+++ b/mk/extract/extract.mk     Sat Mar 14 00:14:35 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: extract.mk,v 1.39 2020/03/12 16:55:31 gdt Exp $
+# $NetBSD: extract.mk,v 1.40 2020/03/14 00:14:35 gdt Exp $
 #
 # The following variables may be set by the package Makefile and
 # specify how extraction happens:
@@ -28,13 +28,6 @@
 #      the "extract" script for a definitive list of the available
 #      options.  The default list is empty.
 #
-#    EXTRACT_USING specifies the tool used to extract tar/ustar-format
-#      archives when using EXTRACT_CMD_DEFAULT.  The possible values are
-#      "bsdtar", "gtar", "nbtar", and "pax".
-#      By default, we use the "nbtar", which means the value of
-#      ${TOOL_PLATFORM.tar}, which is typically an arbitrary
-#      implementation already found on the platform.
-#
 #    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.
@@ -161,7 +154,6 @@
 ###
 .PHONY: pre-extract do-extract post-extract
 
-EXTRACT_USING?=                nbtar
 EXTRACT_ELEMENTS?=     # empty
 
 ###