pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk/extract Decompress .lzma files with lzcat.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/cf547084abf5
branches:  trunk
changeset: 550143:cf547084abf5
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Sat Nov 15 20:25:34 2008 +0000

description:
Decompress .lzma files with lzcat.

diffstat:

 mk/extract/bsd.extract-vars.mk |  5 ++++-
 mk/extract/extract             |  6 ++++--
 mk/extract/extract.mk          |  3 ++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diffs (71 lines):

diff -r 41c6ece2a692 -r cf547084abf5 mk/extract/bsd.extract-vars.mk
--- a/mk/extract/bsd.extract-vars.mk    Sat Nov 15 20:20:44 2008 +0000
+++ b/mk/extract/bsd.extract-vars.mk    Sat Nov 15 20:25:34 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.extract-vars.mk,v 1.10 2008/05/25 20:02:02 joerg Exp $
+# $NetBSD: bsd.extract-vars.mk,v 1.11 2008/11/15 20:25:34 minskim Exp $
 #
 # This Makefile fragment is included separately by bsd.pkg.mk and
 # defines some variables which must be defined earlier than where
@@ -53,6 +53,9 @@
     !empty(EXTRACT_ONLY:M*.tbz2)
 USE_TOOLS+=    bzcat
 .endif
+.if !empty(EXTRACT_ONLY:M*.lzma)
+USE_TOOLS+=    lzcat
+.endif
 .if !empty(EXTRACT_ONLY:M*.zip)
 USE_TOOLS+=    unzip
 .endif
diff -r 41c6ece2a692 -r cf547084abf5 mk/extract/extract
--- a/mk/extract/extract        Sat Nov 15 20:20:44 2008 +0000
+++ b/mk/extract/extract        Sat Nov 15 20:25:34 2008 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: extract,v 1.7 2007/07/31 17:42:40 jlam Exp $
+# $NetBSD: extract,v 1.8 2008/11/15 20:25:34 minskim Exp $
 #
 # Copyright (c) 2006 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -181,6 +181,7 @@
 case "$distfile" in
 *.gz|*.tgz|*.z)                        _cformat=gzip ;;
 *.bz2|*.tbz|*.tbz2|*.bz)       _cformat=bzip ;;
+*.lzma)                                _cformat=lzma ;;
 *.Z)                           _cformat=compress ;;
 *)                             _cformat=none ;;
 esac
@@ -192,13 +193,14 @@
 case "$cformat" in
 gzip|compress) decompress_cat="${GZCAT}" ;;
 bzip)          decompress_cat="${BZCAT}" ;;
+lzma)          decompress_cat="${LZCAT}" ;;
 none)          decompress_cat="${CAT}" ;;
 *)             decompress_cat="${CAT}" ;;
 esac
 
 # Derive the format of the archive based on the file extension.
 case "$distfile" in
-*.tar.gz|*.tgz|*-tar.gz|*_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.lzma|*.tar.Z|*.tar.z|*.tar|*.tar.bz)
                _format=tar ;;
 *.cpio|*.cpio.gz|*.cpio.bz2)
                _format=cpio ;;
diff -r 41c6ece2a692 -r cf547084abf5 mk/extract/extract.mk
--- a/mk/extract/extract.mk     Sat Nov 15 20:20:44 2008 +0000
+++ b/mk/extract/extract.mk     Sat Nov 15 20:25:34 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: extract.mk,v 1.28 2008/05/26 13:39:08 joerg Exp $
+# $NetBSD: extract.mk,v 1.29 2008/11/15 20:25:34 minskim Exp $
 #
 # The following variables may be set by the package Makefile and
 # specify how extraction happens:
@@ -165,6 +165,7 @@
 _EXTRACT_ENV+= ${TOOLS_ECHO:D          ECHO=${TOOLS_ECHO:Q}}
 _EXTRACT_ENV+= ${TOOLS_CMDLINE.gzcat:D GZCAT=${TOOLS_CMDLINE.gzcat:Q}}
 _EXTRACT_ENV+= ${TOOLS_LHA:D           LHA=${TOOLS_LHA:Q}}
+_EXTRACT_ENV+= ${TOOLS_LZCAT:D         LZCAT=${TOOLS_LZCAT:Q}}
 _EXTRACT_ENV+= ${TOOLS_MKDIR:D         MKDIR=${TOOLS_MKDIR:Q}}
 _EXTRACT_ENV+= ${TOOLS_RM:D            RM=${TOOLS_RM:Q}}
 _EXTRACT_ENV+= ${TOOLS_RPM2PKG:D       RPM2PKG=${TOOLS_RPM2PKG:Q}}



Home | Main Index | Thread Index | Old Index