diff options
| author | joerg <joerg> | 2007-11-08 19:31:40 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2007-11-08 19:31:40 +0000 |
| commit | 309a1dd92c2fbe6532a712b8ce57a8ab512d9a7f (patch) | |
| tree | 89ca2ac445158f8bd7c9be30a3ae5d83bd16eb47 /mk | |
| parent | 33c059be274e26d70ba9ac57ce762869846e164c (diff) | |
| download | pkgsrc-309a1dd92c2fbe6532a712b8ce57a8ab512d9a7f.tar.gz | |
Allow both gzip and gzip-base to provide gzip.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/tools/replace.mk | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk index 67bbce3e98d..e2388f64037 100644 --- a/mk/tools/replace.mk +++ b/mk/tools/replace.mk @@ -1,4 +1,4 @@ -# $NetBSD: replace.mk,v 1.200 2007/09/30 12:22:44 rillig Exp $ +# $NetBSD: replace.mk,v 1.201 2007/11/08 19:31:40 joerg Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -403,35 +403,35 @@ TOOLS_PATH.gtar= ${TOOLS_PREFIX.gtar}/bin/${GNU_PROGRAM_PREFIX}tar .endif .if !defined(TOOLS_IGNORE.gunzip) && !empty(_USE_TOOLS:Mgunzip) -. if !empty(PKGPATH:Marchivers/gzip-base) +. if !empty(PKGPATH:Marchivers/gzip) MAKEFLAGS+= TOOLS_IGNORE.gunzip= . elif !empty(_TOOLS_USE_PKGSRC.gunzip:M[yY][eE][sS]) -TOOLS_DEPENDS.gunzip?= gzip-base>=1.2.4b:../../archivers/gzip-base +TOOLS_DEPENDS.gunzip?= {gzip>=1.2.4b,gzip-base>=1.2.4b}:../../archivers/gzip TOOLS_CREATE+= gunzip -TOOLS_FIND_PREFIX+= TOOLS_PREFIX.gunzip=gzip-base +TOOLS_FIND_PREFIX+= TOOLS_PREFIX.gunzip=gzip TOOLS_PATH.gunzip= ${TOOLS_PREFIX.gunzip}/bin/gunzip TOOLS_ARGS.gunzip= -f . endif .endif .if !defined(TOOLS_IGNORE.gzcat) && !empty(_USE_TOOLS:Mgzcat) -. if !empty(PKGPATH:Marchivers/gzip-base) +. if !empty(PKGPATH:Marchivers/gzip) MAKEFLAGS+= TOOLS_IGNORE.gzcat= . elif !empty(_TOOLS_USE_PKGSRC.gzcat:M[yY][eE][sS]) -TOOLS_DEPENDS.gzcat?= gzip-base>=1.2.4b:../../archivers/gzip-base +TOOLS_DEPENDS.gzcat?= {gzip>=1.2.4b,gzip-base>=1.2.4b}:../../archivers/gzip TOOLS_CREATE+= gzcat -TOOLS_FIND_PREFIX+= TOOLS_PREFIX.gzcat=gzip-base +TOOLS_FIND_PREFIX+= TOOLS_PREFIX.gzcat=gzip TOOLS_PATH.gzcat= ${TOOLS_PREFIX.gzcat}/bin/zcat . endif .endif .if !defined(TOOLS_IGNORE.gzip) && !empty(_USE_TOOLS:Mgzip) -. if !empty(PKGPATH:Marchivers/gzip-base) +. if !empty(PKGPATH:Marchivers/gzip) MAKEFLAGS+= TOOLS_IGNORE.gzip= . elif !empty(_TOOLS_USE_PKGSRC.gzip:M[yY][eE][sS]) -TOOLS_DEPENDS.gzip?= gzip-base>=1.2.4b:../../archivers/gzip-base +TOOLS_DEPENDS.gzip?= {gzip>=1.2.4b,gzip-base>=1.2.4b}:../../archivers/gzip TOOLS_CREATE+= gzip -TOOLS_FIND_PREFIX+= TOOLS_PREFIX.gzip=gzip-base +TOOLS_FIND_PREFIX+= TOOLS_PREFIX.gzip=gzip TOOLS_PATH.gzip= ${TOOLS_PREFIX.gzip}/bin/gzip TOOLS_ARGS.gzip= -nf ${GZIP} . endif |