diff options
| author | tron <tron> | 2010-12-22 09:33:30 +0000 |
|---|---|---|
| committer | tron <tron> | 2010-12-22 09:33:30 +0000 |
| commit | 887594adabd85cd7ed281879320b8b828b0f35b0 (patch) | |
| tree | 2908f46518221bdb61124c6a9678a4a578eed2f3 /mk | |
| parent | c36484940528a1a7cf5ed643e857c3caf04823e0 (diff) | |
| download | pkgsrc-887594adabd85cd7ed281879320b8b828b0f35b0.tar.gz | |
Use "xzcat" instead of "lzcat" to handle ".lzma" files as the former is
bundled with NetBSD-current.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/extract/bsd.extract-vars.mk | 4 | ||||
| -rwxr-xr-x | mk/extract/extract | 4 | ||||
| -rw-r--r-- | mk/extract/extract.mk | 3 |
3 files changed, 5 insertions, 6 deletions
diff --git a/mk/extract/bsd.extract-vars.mk b/mk/extract/bsd.extract-vars.mk index e077cfd41d9..d024e05ddad 100644 --- a/mk/extract/bsd.extract-vars.mk +++ b/mk/extract/bsd.extract-vars.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.extract-vars.mk,v 1.12 2009/07/08 13:27:52 minskim Exp $ +# $NetBSD: bsd.extract-vars.mk,v 1.13 2010/12/22 09:33:30 tron Exp $ # # This Makefile fragment is included separately by bsd.pkg.mk and # defines some variables which must be defined earlier than where @@ -54,7 +54,7 @@ USE_TOOLS+= pax USE_TOOLS+= bzcat .endif .if !empty(EXTRACT_ONLY:M*.lzma) -USE_TOOLS+= lzcat +USE_TOOLS+= xzcat .endif .if !empty(EXTRACT_ONLY:M*.xz) USE_TOOLS+= xzcat diff --git a/mk/extract/extract b/mk/extract/extract index 6e45a9d92aa..79d048e52d9 100755 --- a/mk/extract/extract +++ b/mk/extract/extract @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: extract,v 1.11 2010/01/16 17:08:34 wiz Exp $ +# $NetBSD: extract,v 1.12 2010/12/22 09:33:30 tron Exp $ # # Copyright (c) 2006 The NetBSD Foundation, Inc. # All rights reserved. @@ -194,7 +194,7 @@ ${TEST} -n "$cformat" || cformat="$_cformat" case "$cformat" in gzip|compress) decompress_cat="${GZCAT}" ;; bzip) decompress_cat="${BZCAT}" ;; -lzma) decompress_cat="${LZCAT} --memory=64Mi" ;; +lzma) decompress_cat="${XZCAT}" ;; xz) decompress_cat="${XZCAT}" ;; none) decompress_cat="${CAT}" ;; *) decompress_cat="${CAT}" ;; diff --git a/mk/extract/extract.mk b/mk/extract/extract.mk index c8400f21261..83867d61900 100644 --- a/mk/extract/extract.mk +++ b/mk/extract/extract.mk @@ -1,4 +1,4 @@ -# $NetBSD: extract.mk,v 1.32 2010/10/15 20:22:27 joerg Exp $ +# $NetBSD: extract.mk,v 1.33 2010/12/22 09:33:30 tron Exp $ # # The following variables may be set by the package Makefile and # specify how extraction happens: @@ -176,7 +176,6 @@ _EXTRACT_ENV+= ${TOOLS_CP:D CP=${TOOLS_CP:Q}} _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}} |