diff options
| author | rillig <rillig@pkgsrc.org> | 2005-10-12 15:18:59 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2005-10-12 15:18:59 +0000 |
| commit | 5504acc8f38e90a60d201ea6b587d4b76c8910de (patch) | |
| tree | ce9a158b6c0d6790ad135e58e5db4a250e1b659f /mk | |
| parent | ecab34f23d7c83cf6faa0fd1778d8cd74f40c766 (diff) | |
| download | pkgsrc-5504acc8f38e90a60d201ea6b587d4b76c8910de.tar.gz | |
Added .tbz2 to the list of known suffixes. Fixes PR #31564.
Patch contributed by Geert Hendrickx.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.extract.mk | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/mk/bsd.pkg.extract.mk b/mk/bsd.pkg.extract.mk index 85556dd3824..8854f124ff7 100644 --- a/mk/bsd.pkg.extract.mk +++ b/mk/bsd.pkg.extract.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.extract.mk,v 1.12 2005/08/21 07:29:48 rillig Exp $ +# $NetBSD: bsd.pkg.extract.mk,v 1.13 2005/10/12 15:18:59 rillig Exp $ # # This Makefile fragment is included to bsd.pkg.mk and defines the # relevant variables and targets for the "extract" phase. @@ -40,7 +40,7 @@ EXTRACT_ONLY?= ${DISTFILES} EXTRACT_SUFX?= .tar.gz EXTRACT_USING?= nbtar -_EXTRACT_SUFFIXES= .tar.gz .tgz .tar.bz2 .tbz .tar.Z .tar _tar.gz +_EXTRACT_SUFFIXES= .tar.gz .tgz .tar.bz2 .tbz .tbz2 .tar.Z .tar _tar.gz _EXTRACT_SUFFIXES+= .shar.gz .shar.bz2 .shar.Z .shar _EXTRACT_SUFFIXES+= .zip _EXTRACT_SUFFIXES+= .lha .lzh @@ -54,6 +54,7 @@ _EXTRACT_PATTERNS= ${EXTRACT_ONLY} ${EXTRACT_SUFX} .if !empty(_EXTRACT_PATTERNS:M*.tar) || \ !empty(_EXTRACT_PATTERNS:M*.tar.*) || \ !empty(_EXTRACT_PATTERNS:M*.tbz) || \ + !empty(_EXTRACT_PATTERNS:M*.tbz2) || \ !empty(_EXTRACT_PATTERNS:M*.tgz) || \ !empty(_EXTRACT_PATTERNS:M*_tar.gz) @@ -66,7 +67,8 @@ USE_TOOLS+= pax . endif .endif .if !empty(_EXTRACT_PATTERNS:M*.bz2) || \ - !empty(_EXTRACT_PATTERNS:M*.tbz) + !empty(_EXTRACT_PATTERNS:M*.tbz) || \ + !empty(_EXTRACT_PATTERNS:M*.tbz2) USE_TOOLS+= bzcat .endif .if !empty(_EXTRACT_PATTERNS:M*.zip) @@ -92,6 +94,7 @@ DECOMPRESS_CMD.tar.gz?= ${GZCAT} DECOMPRESS_CMD.tgz?= ${DECOMPRESS_CMD.tar.gz} DECOMPRESS_CMD.tar.bz2?= ${BZCAT} DECOMPRESS_CMD.tbz?= ${DECOMPRESS_CMD.tar.bz2} +DECOMPRESS_CMD.tbz2?= ${DECOMPRESS_CMD.tar.bz2} DECOMPRESS_CMD.tar.Z?= ${GZCAT} DECOMPRESS_CMD.tar?= ${CAT} |