[pkgsrc/trunk]: pkgsrc/mk/tools Fix conditions on grep and gzip so that if an...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5b084cdc2bcd
branches:  trunk
changeset: 493076:5b084cdc2bcd
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue Apr 26 21:56:13 2005 +0000

description:
Fix conditions on grep and gzip so that if any of the TOOLS_IGNORE.* are
defined for their respective utilities, then we skip the processing to
avoid dependency loops.

diffstat:

 mk/tools/replace.mk |  20 +++++++++++++-------
 1 files changed, 13 insertions(+), 7 deletions(-)

diffs (41 lines):

diff -r c6458443abf0 -r 5b084cdc2bcd mk/tools/replace.mk
--- a/mk/tools/replace.mk       Tue Apr 26 21:27:33 2005 +0000
+++ b/mk/tools/replace.mk       Tue Apr 26 21:56:13 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.21 2005/04/26 19:15:38 jlam Exp $
+# $NetBSD: replace.mk,v 1.22 2005/04/26 21:56:13 jlam Exp $
 #
 # This Makefile fragment handles "replacements" of system-supplied
 # tools with pkgsrc versions.  The replacements are placed under
@@ -163,9 +163,12 @@
 TOOLS_CMD.bison=               ${TOOLS_DIR}/bin/yacc
 .endif
 
-.if (!defined(TOOLS_IGNORE.egrep) && !empty(USE_TOOLS:Megrep)) || \
-    (!defined(TOOLS_IGNORE.fgrep) && !empty(USE_TOOLS:Mfgrep)) || \
-    (!defined(TOOLS_IGNORE.grep) && !empty(USE_TOOLS:Mgrep))
+.if (!defined(TOOLS_IGNORE.egrep) && \
+     !defined(TOOLS_IGNORE.fgrep) && \
+     !defined(TOOLS_IGNORE.grep)) && \
+    (!empty(USE_TOOLS:Megrep) || \
+     !empty(USE_TOOLS:Mfgrep) || \
+     !empty(USE_TOOLS:Mgrep))
 .  if !empty(PKGPATH:Mtextproc/grep)
 MAKEFLAGS+=                    TOOLS_IGNORE.egrep=
 MAKEFLAGS+=                    TOOLS_IGNORE.fgrep=
@@ -264,9 +267,12 @@
 TOOLS_CMD.gsed=                        ${TOOLS_DIR}/bin/sed
 .endif
 
-.if (!defined(TOOLS_IGNORE.gunzip) && !empty(USE_TOOLS:Mgunzip)) || \
-    (!defined(TOOLS_IGNORE.gzcat) && !empty(USE_TOOLS:Mgzcat)) || \
-    (!defined(TOOLS_IGNORE.gzip) && !empty(USE_TOOLS:Mgzip))
+.if (!defined(TOOLS_IGNORE.gunzip) && \
+     !defined(TOOLS_IGNORE.gzcat) && \
+     !defined(TOOLS_IGNORE.gzip)) && \
+    (!empty(USE_TOOLS:Mgunzip) || \
+     !empty(USE_TOOLS:Mgzcat) || \
+     !empty(USE_TOOLS:Mgzip))
 .  if !empty(PKGPATH:Marchiver/gzip-base)
 MAKEFLAGS+=                    TOOLS_IGNORE.gunzip=
 MAKEFLAGS+=                    TOOLS_IGNORE.gzcat=