[pkgsrc/trunk]: pkgsrc/mk/tools We want to check if we're in gzip-base to avo...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/23bdcbb10d26
branches:  trunk
changeset: 493857:23bdcbb10d26
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sun May 15 22:33:08 2005 +0000

description:
We want to check if we're in gzip-base to avoid circular dependencies on
gzip.

diffstat:

 mk/tools/replace.mk |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 167409083dec -r 23bdcbb10d26 mk/tools/replace.mk
--- a/mk/tools/replace.mk       Sun May 15 22:31:50 2005 +0000
+++ b/mk/tools/replace.mk       Sun May 15 22:33:08 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.75 2005/05/15 03:27:20 jlam Exp $
+# $NetBSD: replace.mk,v 1.76 2005/05/15 22:33:08 jlam Exp $
 #
 # This Makefile fragment handles "replacements" of system-supplied
 # tools with pkgsrc versions.
@@ -460,7 +460,7 @@
 .endif
 
 .if !defined(TOOLS_IGNORE.gunzip) && !empty(_USE_TOOLS:Mgunzip)
-.  if !empty(PKGPATH:Marchivers/gzip)
+.  if !empty(PKGPATH:Marchivers/gzip-base)
 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
@@ -473,7 +473,7 @@
 .endif
 
 .if !defined(TOOLS_IGNORE.gzcat) && !empty(_USE_TOOLS:Mgzcat)
-.  if !empty(PKGPATH:Marchivers/gzip)
+.  if !empty(PKGPATH:Marchivers/gzip-base)
 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
@@ -485,7 +485,7 @@
 .endif
 
 .if !defined(TOOLS_IGNORE.gzip) && !empty(_USE_TOOLS:Mgzip)
-.  if !empty(PKGPATH:Marchivers/gzip)
+.  if !empty(PKGPATH:Marchivers/gzip-base)
 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