[pkgsrc/trunk]: pkgsrc/mk Recognize -tar.gz as tar.gz files. PR 33571 by Diet...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e5f129f185e0
branches:  trunk
changeset: 513535:e5f129f185e0
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Tue May 30 23:51:38 2006 +0000

description:
Recognize -tar.gz as tar.gz files. PR 33571 by Dieter Roelants.

diffstat:

 mk/bsd.pkg.extract.mk |  3 ++-
 mk/scripts/extract    |  4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diffs (37 lines):

diff -r e4b19cea5a51 -r e5f129f185e0 mk/bsd.pkg.extract.mk
--- a/mk/bsd.pkg.extract.mk     Tue May 30 23:27:55 2006 +0000
+++ b/mk/bsd.pkg.extract.mk     Tue May 30 23:51:38 2006 +0000
@@ -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 @@
     !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 -r e4b19cea5a51 -r e5f129f185e0 mk/scripts/extract
--- a/mk/scripts/extract        Tue May 30 23:27:55 2006 +0000
+++ b/mk/scripts/extract        Tue May 30 23:51:38 2006 +0000
@@ -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 @@
 
 # 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 ;;