Move perl handling into replace.mk. We now can specify USE_TOOLS+=perl

to note that we need the perl binary and the associated PERL5 and
TOOLS_PERL5 variable definitions.

4 files changed, 27 insertions, 16 deletions

diff --git a/mk/tools/bsd.tools.mk b/mk/tools/bsd.tools.mk
index fe8d33652e1..7b3807b921b 100644
--- a/mk/tools/bsd.tools.mk
+++ b/mk/tools/bsd.tools.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.tools.mk,v 1.23 2005/05/15 22:53:57 jlam Exp $
+# $NetBSD: bsd.tools.mk,v 1.24 2005/05/17 18:34:45 jlam Exp $
 #
 # This Makefile fragment creates tools under ${TOOLS_DIR} that are
 # found before similarly-named tools in the system path.
@@ -79,7 +79,6 @@ USE_TOOLS?=		# empty
 .include "../../mk/tools/rpcgen.mk"
 .include "../../mk/tools/strip.mk"
 .include "../../mk/tools/replace.mk"
-.include "../../mk/tools/perl.mk"
 .include "../../mk/tools/make.mk"
 
 ######################################################################
diff --git a/mk/tools/defaults.mk b/mk/tools/defaults.mk
index 661e904e4be..2efa8438286 100644
--- a/mk/tools/defaults.mk
+++ b/mk/tools/defaults.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defaults.mk,v 1.15 2005/05/15 23:20:38 jlam Exp $
+# $NetBSD: defaults.mk,v 1.16 2005/05/17 18:34:45 jlam Exp $
 
 .if !defined(TOOLS_DEFAULTS_MK)
 TOOLS_DEFAULTS_MK=	defined
@@ -62,6 +62,7 @@ _TOOLS_VARNAME.mv=		MV
 _TOOLS_VARNAME.nice=		NICE
 _TOOLS_VARNAME.patch=		PATCH
 _TOOLS_VARNAME.pax=		PAX
+_TOOLS_VARNAME.perl=		PERL5
 _TOOLS_VARNAME.pwd=		PWD_CMD
 _TOOLS_VARNAME.rm=		RM
 _TOOLS_VARNAME.rmdir=		RMDIR
diff --git a/mk/tools/perl.mk b/mk/tools/perl.mk
index e9bdd6bdad5..f803ee0c49c 100644
--- a/mk/tools/perl.mk
+++ b/mk/tools/perl.mk
@@ -1,27 +1,37 @@
-# $NetBSD: perl.mk,v 1.9 2005/05/14 21:38:18 jlam Exp $
+# $NetBSD: perl.mk,v 1.10 2005/05/17 18:34:45 jlam Exp $
 
 # Create a symlink from ${TOOLS_DIR}/bin/perl to ${PERL5} when USE_PERL5
 # is defined.  This ensures that when "perl" is invoked, the pkgsrc perl
 # is executed on systems that also provide a perl binary.
 #
-.if defined(USE_PERL5) && !defined(TOOLS_IGNORE.perl)
+.if defined(USE_PERL5)
+USE_TOOLS+=	perl
+.endif
+
+# Skip the processing at the end of replace.mk.  If we need to use
+# perl, then we always want the clause below to trigger.
+#
+_TOOLS_USE_PKGSRC.perl=	yes
+
+.if !defined(TOOLS_IGNORE.perl) && !empty(USE_TOOLS:Mperl)
 .  if !empty(PKGPATH:Mlang/perl58)
-MAKEFLAGS+=		TOOLS_IGNORE.perl=
+MAKEFLAGS+=			TOOLS_IGNORE.perl=
 .  else
 .    include "../../lang/perl5/buildlink3.mk"
-TOOLS_DEPMETHOD.perl?=	BUILD_DEPENDS
-_TOOLS_DEPENDS.perl=	# empty
+TOOLS_DEPMETHOD.perl?=		BUILD_DEPENDS
+_TOOLS_DEPENDS.perl=		# empty
 .    for _dep_ in ${BUILDLINK_DEPENDS.perl}
-_TOOLS_DEPENDS.perl+=	${_dep_}:${BUILDLINK_PKGSRCDIR.perl}
+_TOOLS_DEPENDS.perl+=		${_dep_}:${BUILDLINK_PKGSRCDIR.perl}
 .    endfor
 .    undef _dep_
-TOOLS_DEPENDS.perl?=	${_TOOLS_DEPENDS.perl}
-TOOLS_CREATE+=		perl
-FIND_PREFIX:=		TOOLS_PREFIX.perl=perl
+TOOLS_DEPENDS.perl?=		${_TOOLS_DEPENDS.perl}
+TOOLS_CREATE+=			perl
+FIND_PREFIX:=			TOOLS_PREFIX.perl=perl
 .    include "../../mk/find-prefix.mk"
-TOOLS_REAL_CMD.perl=	${TOOLS_PREFIX.perl}/bin/perl
-PERL5=			${TOOLS_REAL_CMD.perl}
-CONFIGURE_ENV+=		PERL=${PERL5:Q}
+TOOLS_REAL_CMD.perl=		${TOOLS_PREFIX.perl}/bin/perl
+TOOLS_${_TOOLS_VARNAME.perl}=	${TOOLS_REAL_CMD.perl}
+${_TOOLS_VARNAME.perl}?=	${TOOLS_${_TOOLS_VARNAME.perl}}
+CONFIGURE_ENV+=			PERL=${TOOLS_${_TOOLS_VARNAME.perl}:Q}
 .  endif
 .  if defined(TOOLS_DEPMETHOD.perl) && defined(TOOLS_DEPENDS.perl)
 .    if empty(${TOOLS_DEPMETHOD.perl}:M${TOOLS_DEPENDS.perl})
diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk
index 1823aa6eca2..77c7ef48b3d 100644
--- a/mk/tools/replace.mk
+++ b/mk/tools/replace.mk
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.81 2005/05/16 18:35:30 jlam Exp $
+# $NetBSD: replace.mk,v 1.82 2005/05/17 18:34:45 jlam Exp $
 #
 # This Makefile fragment handles "replacements" of system-supplied
 # tools with pkgsrc versions.
@@ -59,6 +59,7 @@ USE_TOOLS+=	bison-yacc
 .endif
 
 .include "../../mk/tools/imake.mk"
+.include "../../mk/tools/perl.mk"
 
 ######################################################################