Commit graph

21 commits

Author SHA1 Message Date
rillig
bc677ecae9 gzcat needs the full command, not only the pathname, in case it is
${GZIP} -cd.
2006-01-23 14:43:50 +00:00
rillig
f6609e47f8 The ../../mk/scripts/extract shell program does not work with Solaris'
/bin/sh. Fixed by invoking it via ${SH}.
2006-01-23 14:19:08 +00:00
jlam
6a485fcc01 Don't write ${FOO:Mbar} == "bar", when !empty(FOO:Mbar) will suffice.
In this case, "FOO" is "INTERACTIVE_STAGE".
2006-01-21 21:32:51 +00:00
jlam
b9431606d0 Set EXTRACT_CMD_DEFAULT to the default extraction command that invokes
the "extract" script.  This allows custom EXTRACT_CMD settings to still
invoke ${EXTRACT_CMD_DEFAULT}.
2006-01-21 19:39:22 +00:00
jlam
d9e6b299d6 Use /usr/pkgsrc/mk/scripts/extract to do extraction instead of using all
that Makefile code to determine the right extraction command to use.
This change removes EXTRACT_CMD.<suffix>.
2006-01-21 18:55:10 +00:00
jlam
338850bba1 Rename EXTRACT_ENV.bin to EXTRACT_ENV in preparation for a reimplementation
of how distfiles are extracted.  EXTRACT_ENV is a more generic name
and will be applicable for all extraction commands.
2006-01-20 23:55:02 +00:00
jlam
81db182ecc Rename the following variables to reduce the number that we need to track:
EXTRACT_CMD_OPTS.bin		->  EXTRACT_OPTS_BIN
	EXTRACT_CMD_OPTS.lha		->  EXTRACT_OPTS_LHA
	EXTRACT_CMD_OPTS.rar		->  EXTRACT_OPTS_RAR
	EXTRACT_CMD_OPTS.tar		->  EXTRACT_OPTS_TAR
	EXTRACT_CMD_OPTS.tar.Z		->  EXTRACT_OPTS_TAR
	EXTRACT_CMD_OPTS.tar.bz2	->  EXTRACT_OPTS_TAR
	EXTRACT_CMD_OPTS.tar.gz		->  EXTRACT_OPTS_TAR
	EXTRACT_CMD_OPTS.tbz		->  EXTRACT_OPTS_TAR
	EXTRACT_CMD_OPTS.tbz2		->  EXTRACT_OPTS_TAR
	EXTRACT_CMD_OPTS.tgz		->  EXTRACT_OPTS_TAR
	EXTRACT_CMD_OPTS.zip		->  EXTRACT_OPTS_ZIP
	EXTRACT_CMD_OPTS.zoo		->  EXTRACT_OPTS_ZOO
	EXTRACT_CMD_OPTS_tar.gz		->  EXTRACT_OPTS_TAR
2006-01-20 23:41:29 +00:00
jlam
4a3e4a25bc Move more of the "extract"-related variables and targets out of bsd.pkg.mk
and into bsd.pkg.extract.mk.
2006-01-19 19:35:25 +00:00
rillig
5504acc8f3 Added .tbz2 to the list of known suffixes. Fixes PR #31564.
Patch contributed by Geert Hendrickx.
2005-10-12 15:18:59 +00:00
rillig
9c2ed58976 Cleaned up the code that checks which tools are needed for extraction. 2005-08-21 07:29:48 +00:00
rillig
6f9f44642c Reordered the conditions of checking for .tar files in DISTFILES to improve
readability.
2005-08-15 12:57:07 +00:00
jlam
bf9129c41e Drop distinction between PKGSRC_USE_TOOLS and USE_TOOLS by making
PKGSRC_USE_TOOLS go away.  There is now only a single USE_TOOLS variable
that specifies all of the tools we need to build/run the package.
2005-07-15 18:27:48 +00:00
jlam
9f94b112f0 Remove the old tools framework and references to _USE_NEW_TOOLS. 2005-05-22 19:11:12 +00:00
jlam
26e97aafd5 _tar.gz is a recognized suffix, so recognize that we need the right tool
to untar the archive.
2005-05-17 22:11:14 +00:00
jlam
0f437f77f6 Allow tweaking of options to pax/tar via EXTRACT_CMD_OPTS.*. 2005-05-17 21:34:29 +00:00
jlam
482689cdaa NetBSD's (and bootstrap's) pax-as-tar is GNUish enough to extract most
GNU tar archives.  Create a new EXTRACT_USING value "nbtar" that causes
tar/ustar archives to be extracted using pax-as-tar, which understands
most GNU tar extensions.  Default to EXTRACT_USING=nbtar, as quite a
few packages are distributed in GNU tar archives.
2005-05-16 18:43:20 +00:00
jlam
ed2ba77faa Document EXTRACT_USING in bsd.pkg.extract.mk where it is used. 2005-05-16 04:22:40 +00:00
jlam
2338cbae27 Change the EXTRACT_USING_PAX defined/undefined option into a EXTRACT_USING
which can take multiple values -- "pax" or "gtar".  The default value
of EXTRACT_USING is "pax", which more closely matches reality since
before, we were using bootstrap "tar" for ${GTAR} and it was actually
pax-as-tar.  Also, stop pretending pax-as-tar from the bootstrap kit
or on NetBSD is GNU tar.  Lastly, in bsd.pkg.extract.mk, note whether
we need "pax" or "gtar" depending on what we need to extract the
distfiles.
2005-05-16 03:04:44 +00:00
jlam
e0fd563afe distfiles that end in .Z require gzcat as part of the extraction process. 2005-05-15 03:57:21 +00:00
jlam
ec7c68e97c Teach the new tools framework about lha, unrar, unzip, and unzoo and
modify bsd.pkg.extract.mk to use them.  As a side-effect, we stop
hardcoding ${LOCALBASE} as the install prefix for these tools so this
becomes more pkgviews-friendly.
2005-05-13 22:08:20 +00:00
jlam
0e589ad8af Separate out the variables and targets for the "extract" phase into a
separate file pkgsrc/mk/bsd.pkg.extract.mk.  Also, include this file
ahead of the inclusion of bsd.tools.mk so that tools required to
extract are created by the tools framework.
2005-05-11 04:01:49 +00:00