diff options
| author | wiz <wiz> | 2006-05-30 23:51:38 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2006-05-30 23:51:38 +0000 |
| commit | 99985525e9f7f61a0e1751aebeac23e05832733d (patch) | |
| tree | cde78159876589b193ac84173c89ded92d6ed738 /mk | |
| parent | 71d7ad5b48ebde318098dc786d5a25f5ab319232 (diff) | |
| download | pkgsrc-99985525e9f7f61a0e1751aebeac23e05832733d.tar.gz | |
Recognize -tar.gz as tar.gz files. PR 33571 by Dieter Roelants.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.extract.mk | 3 | ||||
| -rwxr-xr-x | mk/scripts/extract | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/mk/bsd.pkg.extract.mk b/mk/bsd.pkg.extract.mk index 7ce7eb9bef1..4ae799c43e1 100644 --- a/mk/bsd.pkg.extract.mk +++ b/mk/bsd.pkg.extract.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.extract.mk,v 1.21 2006/01/23 14:43:50 rillig Exp $ +# $NetBSD: bsd.pkg.extract.mk,v 1.22 2006/05/30 23:51:38 wiz Exp $ # # This Makefile fragment is included to bsd.pkg.mk and defines the # relevant variables and targets for the "extract" phase. @@ -72,6 +72,7 @@ _EXTRACT_PATTERNS= ${EXTRACT_ONLY} ${EXTRACT_SUFX} !empty(_EXTRACT_PATTERNS:M*.tbz) || \ !empty(_EXTRACT_PATTERNS:M*.tbz2) || \ !empty(_EXTRACT_PATTERNS:M*.tgz) || \ + !empty(_EXTRACT_PATTERNS:M*-tar.gz) || \ !empty(_EXTRACT_PATTERNS:M*_tar.gz) . if !empty(EXTRACT_USING:Mgtar) USE_TOOLS+= gtar diff --git a/mk/scripts/extract b/mk/scripts/extract index ea477bae03a..544d1f2283e 100755 --- a/mk/scripts/extract +++ b/mk/scripts/extract @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: extract,v 1.20 2006/02/19 15:38:23 adrianp Exp $ +# $NetBSD: extract,v 1.21 2006/05/30 23:51:38 wiz Exp $ # # Copyright (c) 2006 The NetBSD Foundation, Inc. # All rights reserved. @@ -178,7 +178,7 @@ esac # Derive the format of the archive based on the file extension. case "$distfile" in -*.tar.gz|*.tgz|*_tar.gz|*.tar.bz2|*.tbz|*.tbz2|*.tar.Z|*.tar.z|*.tar|*.tar.bz) +*.tar.gz|*.tgz|*-tar.gz|*_tar.gz|*.tar.bz2|*.tbz|*.tbz2|*.tar.Z|*.tar.z|*.tar|*.tar.bz) _format=tar ;; *.shar.gz|*.shar.bz2|*.shar.Z|*.shar|*.shr.gz|*.shr.bz2|*.shr.Z|*.shr) _format=shar ;; |