[pkgsrc/trunk]: pkgsrc/mk/tools Fix a recently introduced logic error. PR pkg...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3655460bee9a
branches:  trunk
changeset: 538597:3655460bee9a
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Wed Feb 13 18:33:39 2008 +0000

description:
Fix a recently introduced logic error. PR pkg/37998 from Stuart Shelton.

diffstat:

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

diffs (35 lines):

diff -r 9268e2693404 -r 3655460bee9a mk/tools/replace.mk
--- a/mk/tools/replace.mk       Wed Feb 13 15:05:02 2008 +0000
+++ b/mk/tools/replace.mk       Wed Feb 13 18:33:39 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.207 2008/02/07 17:01:02 tnn Exp $
+# $NetBSD: replace.mk,v 1.208 2008/02/13 18:33:39 tnn Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -895,20 +895,20 @@
 .  if !defined(TOOLS_IGNORE.${_t_}) && !empty(_USE_TOOLS:M${_t_})
 .    if !empty(PKGPATH:Mtextproc/groff)
 MAKEFLAGS+=            TOOLS_IGNORE.${_t_}=
-.    elif !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS]) || \
-       (defined(_TOOLS_USE_PKGSRC.groff) && \
-        !empty(_TOOLS_USE_PKGSRC.groff:M[yY][eE][sS]))
+.    else
 .      if defined(_TOOLS_USE_PKGSRC.groff) && \
         !empty(_TOOLS_USE_PKGSRC.groff:M[yY][eE][sS])
 _TOOLS_USE_PKGSRC.${_t_}= yes
 .      endif
+.      if !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS])
 TOOLS_DEPENDS.${_t_}?= groff>=1.19.2nb3:../../textproc/groff
 TOOLS_CREATE+=         ${_t_}
 TOOLS_FIND_PREFIX+=    TOOLS_PREFIX.${_t_}=groff
-.      if ${OPSYS} == "SunOS" && "${_t_}" != "groff"
+.        if ${OPSYS} == "SunOS" && "${_t_}" != "groff"
 TOOLS_PATH.${_t_}=     ${TOOLS_PREFIX.${_t_}}/bin/g${_t_}
-.      else
+.        else
 TOOLS_PATH.${_t_}=     ${TOOLS_PREFIX.${_t_}}/bin/${_t_}
+.        endif
 .      endif
 .    endif
 .  endif