[pkgsrc/trunk]: pkgsrc/mk/tools Back out previous change, and correct the sur...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/618e2ffd7b78
branches:  trunk
changeset: 495121:618e2ffd7b78
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Thu Jun 02 21:03:32 2005 +0000

description:
Back out previous change, and correct the surrounding check -- we need
to see if _USE_TOOLS contains "perl", not USE_TOOLS.

diffstat:

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

diffs (23 lines):

diff -r 1b3ae97d700f -r 618e2ffd7b78 mk/tools/replace.mk
--- a/mk/tools/replace.mk       Thu Jun 02 20:49:41 2005 +0000
+++ b/mk/tools/replace.mk       Thu Jun 02 21:03:32 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.96 2005/06/02 09:31:25 tron Exp $
+# $NetBSD: replace.mk,v 1.97 2005/06/02 21:03:32 jlam Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -809,11 +809,10 @@
 .  endif
 .endif
 
-.if !defined(TOOLS_IGNORE.perl) && !empty(USE_TOOLS:Mperl)
+.if !defined(TOOLS_IGNORE.perl) && !empty(_USE_TOOLS:Mperl)
 .  if !empty(PKGPATH:Mlang/perl58)
 MAKEFLAGS+=                    TOOLS_IGNORE.perl=
-.  elif defined(_TOOLS_USE_PKGSRC.perl) && \
-        !empty(_TOOLS_USE_PKGSRC.perl:M[yY][eE][sS])
+.  elif !empty(_TOOLS_USE_PKGSRC.perl:M[yY][eE][sS])
 .    include "../../lang/perl5/version.mk"
 TOOLS_DEPENDS.perl?=           {perl>=${PERL5_REQD},perl-thread>=${PERL5_REQD}}:../../lang/perl58
 TOOLS_CREATE+=                 perl