[pkgsrc/trunk]: pkgsrc/mk Teach the new tools framework more about perl. We ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9d2934793236
branches:  trunk
changeset: 493708:9d2934793236
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Thu May 12 21:03:46 2005 +0000

description:
Teach the new tools framework more about perl.  We include perl5/vars.mk
in mk/tools/perl.mk since many packages expect to be able to use the
variables defined in vars.mk, but those variables can only be defined
if PERL5 is correctly defined, and that is only true after it is set
here.

diffstat:

 mk/bsd.pkg.use.mk |   4 +++-
 mk/tools/perl.mk  |  13 +++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diffs (55 lines):

diff -r f2c48db65004 -r 9d2934793236 mk/bsd.pkg.use.mk
--- a/mk/bsd.pkg.use.mk Thu May 12 21:01:16 2005 +0000
+++ b/mk/bsd.pkg.use.mk Thu May 12 21:03:46 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.use.mk,v 1.9 2005/05/12 20:31:56 jlam Exp $
+#      $NetBSD: bsd.pkg.use.mk,v 1.10 2005/05/12 21:03:46 jlam Exp $
 #
 # Turn USE_* macros into proper depedency logic.  Included near the top of
 # bsd.pkg.mk, after bsd.prefs.mk.
@@ -155,10 +155,12 @@
 .  endif
 .endif
 
+.if empty(_USE_NEW_TOOLS:M[yY][eE][sS])
 .if defined(USE_PERL5) && (${USE_PERL5} == "run")
 CONFIGURE_ENV+=                PERL=${PERL5:Q}
 .  include "../../lang/perl5/vars.mk"
 .endif       # USE_PERL5 == run
+.endif
 
 .if defined(USE_PERL5)
 PLIST_SUBST+=  PERL5_SITELIB=${PERL5_SUB_INSTALLSITELIB}
diff -r f2c48db65004 -r 9d2934793236 mk/tools/perl.mk
--- a/mk/tools/perl.mk  Thu May 12 21:01:16 2005 +0000
+++ b/mk/tools/perl.mk  Thu May 12 21:03:46 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: perl.mk,v 1.7 2005/05/11 19:42:17 jlam Exp $
+# $NetBSD: perl.mk,v 1.8 2005/05/12 21:03:46 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
@@ -12,13 +12,22 @@
 TOOLS_DEPMETHOD.perl?= BUILD_DEPENDS
 TOOLS_DEPENDS.perl?=   ${BUILDLINK_DEPENDS.perl}:${BUILDLINK_PKGSRCDIR.perl}
 TOOLS_CREATE+=         perl
-EVAL_PREFIX+=          TOOLS_PREFIX.perl=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}
 .  endif
 .  if defined(TOOLS_DEPMETHOD.perl) && defined(TOOLS_DEPENDS.perl)
 .    if empty(${TOOLS_DEPMETHOD.perl}:M${TOOLS_DEPENDS.perl})
 ${TOOLS_DEPMETHOD.perl}+=      ${TOOLS_DEPENDS.perl}
 .    endif
 .  endif
+
+# Define PERL5_* variables that locate the site directories for ${PERL5}.
+# These variables depend on PERL5 being properly defined and existing
+# on the filesystem.
+#
+.  include "../../lang/perl5/vars.mk"
+
 .endif