pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mk/tools Allow both gzip and gzip-base to provide gzip.
details: https://anonhg.NetBSD.org/pkgsrc/rev/991386c11981
branches: trunk
changeset: 535147:991386c11981
user: joerg <joerg%pkgsrc.org@localhost>
date: Thu Nov 08 19:31:40 2007 +0000
description:
Allow both gzip and gzip-base to provide gzip.
diffstat:
mk/tools/replace.mk | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diffs (54 lines):
diff -r 1d0386f7a8b1 -r 991386c11981 mk/tools/replace.mk
--- a/mk/tools/replace.mk Thu Nov 08 19:31:05 2007 +0000
+++ b/mk/tools/replace.mk Thu Nov 08 19:31:40 2007 +0000
@@ -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 @@
.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
Home |
Main Index |
Thread Index |
Old Index