CVS commit: pkgsrc/mk/extract

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Sat Mar 14 00:14:35 UTC 2020

Modified Files:
        pkgsrc/mk/extract: bsd.extract-vars.mk extract.mk

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/mk/extract/bsd.extract-vars.mk
cvs rdiff -u -r1.39 -r1.40 pkgsrc/mk/extract/extract.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/extract/bsd.extract-vars.mk
diff -u pkgsrc/mk/extract/bsd.extract-vars.mk:1.18 pkgsrc/mk/extract/bsd.extract-vars.mk:1.19
--- pkgsrc/mk/extract/bsd.extract-vars.mk:1.18  Fri Aug  2 11:48:17 2019
+++ pkgsrc/mk/extract/bsd.extract-vars.mk       Sat Mar 14 00:14:35 2020
@@ -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 @@ _LISTED_VARS.extract= EXTRACT_CMD EXTRAC
 EXTRACT_ONLY?=         ${DISTFILES}
 EXTRACT_SUFX?=         .tar.gz
 
+EXTRACT_USING?=                nbtar
+
 ###
 ### Discover which tools we need based on the file extensions of the
 ### distfiles.

Index: pkgsrc/mk/extract/extract.mk
diff -u pkgsrc/mk/extract/extract.mk:1.39 pkgsrc/mk/extract/extract.mk:1.40
--- pkgsrc/mk/extract/extract.mk:1.39   Thu Mar 12 16:55:31 2020
+++ pkgsrc/mk/extract/extract.mk        Sat Mar 14 00:14:35 2020
@@ -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 @@ extract-cookie:
 ###
 .PHONY: pre-extract do-extract post-extract
 
-EXTRACT_USING?=                nbtar
 EXTRACT_ELEMENTS?=     # empty
 
 ###