diff options
| author | jlam <jlam> | 2005-07-15 18:27:48 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2005-07-15 18:27:48 +0000 |
| commit | d2eea181f0c5ef51db2ef63ecadc8d3add70bd6b (patch) | |
| tree | 91f275af994eade5936cfd1677c803fdc48b0f89 /mk/bsd.pkg.extract.mk | |
| parent | 6b7892b7405d77307d3b0c21dd5229fd6fa9d116 (diff) | |
| download | pkgsrc-d2eea181f0c5ef51db2ef63ecadc8d3add70bd6b.tar.gz | |
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.
Diffstat (limited to 'mk/bsd.pkg.extract.mk')
| -rw-r--r-- | mk/bsd.pkg.extract.mk | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/mk/bsd.pkg.extract.mk b/mk/bsd.pkg.extract.mk index d9f82ee4d67..d226d0f318e 100644 --- a/mk/bsd.pkg.extract.mk +++ b/mk/bsd.pkg.extract.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.extract.mk,v 1.9 2005/05/22 19:11:12 jlam Exp $ +# $NetBSD: bsd.pkg.extract.mk,v 1.10 2005/07/15 18:27:54 jlam Exp $ # # This Makefile fragment is included to bsd.pkg.mk and defines the # relevant variables and targets for the "extract" phase. @@ -55,34 +55,34 @@ _EXTRACT_SUFFIXES+= .rar !empty(EXTRACT_SUFX:M*.tbz) || !empty(EXTRACT_SUFX:M*.tgz) || \ !empty(EXTRACT_ONLY:M*_tar.gz) || !empty(EXTRACT_SUFX:M*_tar.gz) . if !empty(EXTRACT_USING:Mgtar) -PKGSRC_USE_TOOLS+= gtar +USE_TOOLS+= gtar . elif !empty(EXTRACT_USING:Mnbtar) -PKGSRC_USE_TOOLS+= tar +USE_TOOLS+= tar . else -PKGSRC_USE_TOOLS+= pax +USE_TOOLS+= pax . endif .endif .if !empty(EXTRACT_ONLY:M*.bz2) || !empty(EXTRACT_ONLY:M*.tbz) || \ !empty(EXTRACT_SUFX:M*.bz2) || !empty(EXTRACT_SUFX:M*.tbz) -PKGSRC_USE_TOOLS+= bzcat +USE_TOOLS+= bzcat .endif .if !empty(EXTRACT_ONLY:M*.zip) || !empty(EXTRACT_SUFX:M*.zip) -PKGSRC_USE_TOOLS+= unzip +USE_TOOLS+= unzip .endif .if !empty(EXTRACT_ONLY:M*.lzh) || !empty(EXTRACT_ONLY:M*.lha) || \ !empty(EXTRACT_SUFX:M*.lzh) || !empty(EXTRACT_SUFX:M*.lha) -PKGSRC_USE_TOOLS+= lha +USE_TOOLS+= lha .endif .if !empty(EXTRACT_ONLY:M*.gz) || !empty(EXTRACT_ONLY:M*.tgz) || \ !empty(EXTRACT_SUFX:M*.gz) || !empty(EXTRACT_SUFX:M*.tgz) || \ !empty(EXTRACT_ONLY:M*.Z) || !empty(EXTRACT_SUFX:M*.Z) -PKGSRC_USE_TOOLS+= gzcat +USE_TOOLS+= gzcat .endif .if !empty(EXTRACT_ONLY:M*.zoo) || !empty(EXTRACT_SUFX:M*.zoo) -PKGSRC_USE_TOOLS+= unzoo +USE_TOOLS+= unzoo .endif .if !empty(EXTRACT_ONLY:M*.rar) || !empty(EXTRACT_SUFX:M*.rar) -PKGSRC_USE_TOOLS+= unrar +USE_TOOLS+= unrar .endif DECOMPRESS_CMD.tar.gz?= ${GZCAT} |