Change the way we fix up $rm_try to avoid a tools directory reference.

Fixes errors seen on SmartOS with PKG_DEVELOPER=yes when the fixed file was
regenerated after the fixup, and appears to have the added benefit of removing
the warnings about out of date builds during install.

3 files changed, 20 insertions, 12 deletions

diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile
index 18c535f0649..43b48cf327f 100644
--- a/lang/perl5/Makefile
+++ b/lang/perl5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.201 2013/05/31 10:55:15 adam Exp $
+# $NetBSD: Makefile,v 1.202 2013/06/06 14:20:14 jperkin Exp $
 
 .include "license.mk"
 .include "Makefile.common"
@@ -75,6 +75,12 @@ SUBST_VARS.policysh+=	PKGMANDIR
 SUBST_VARS.policysh+=	LOCALBASE
 SUBST_VARS.policysh+=	PTHREAD_LDFLAGS
 
+# Avoid the ${TOOLS_BIN} path getting written to installed files.
+SUBST_CLASSES+=		toolsbin
+SUBST_STAGE.toolsbin=	pre-configure
+SUBST_FILES.toolsbin=	Configure
+SUBST_VARS.toolsbin=	TOOLS_RM
+
 .if ${OPSYS} == "Darwin" || ${OPSYS} == "Cygwin"
 #
 # The Perl build attempts to work around case-insensitivity problems on
@@ -97,7 +103,7 @@ CONFIGURE_ARGS+=	-Duseshrplib
 # Perl embeds the full paths to the following tools in several installed
 # files, so make sure the paths to the ones in ${TOOLS_DIR} aren't used.
 #
-USE_TOOLS+=		hostname ln sed test
+USE_TOOLS+=		hostname ln rm sed test
 SUBST_VARS.policysh+=	TOOLS_HOSTNAME_CMD
 SUBST_VARS.policysh+=	TOOLS_LN
 TOOLS_ALIASES.sed+=	${TOOLS_SED:T}
@@ -155,13 +161,6 @@ SUBST_SED.mirbsd-paths=		-e 's,/usr/mpkg,${PREFIX},g'
 SUBST_MESSAGE.mirbsd-paths=	Do not use non-pkgsrc paths on MirBSD.
 .endif
 
-# Remove a spurious workdir reference
-SUBST_CLASSES+=		rm
-SUBST_STAGE.rm=		pre-install
-SUBST_FILES.rm=		lib/Config_heavy.pl
-SUBST_MESSAGE.rm=	Do not use tools version of rm.
-SUBST_SED.rm=	-e "s!^rm_try='/.*/\\.tools/bin/rm -f!rm_try='/bin/rm -f!"
-
 # Replace our perl as the interpreter
 REPLACE_PERL+=		cpan/Config-Perl-V/V.pm
 REPLACE_PERL+=		cpan/Getopt-Long/lib/Getopt/Long.pm
diff --git a/lang/perl5/distinfo b/lang/perl5/distinfo
index 57c755fd577..d39602b5a83 100644
--- a/lang/perl5/distinfo
+++ b/lang/perl5/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.99 2013/05/31 10:55:15 adam Exp $
+$NetBSD: distinfo,v 1.100 2013/06/06 14:20:14 jperkin Exp $
 
 SHA1 (perl-5.18.0.tar.gz) = f5a97a9fa4e9d0ef9c4b313c5b778a0e76291ee2
 RMD160 (perl-5.18.0.tar.gz) = 10774aa60a76b30579aedf23f4a21775301e3235
@@ -8,7 +8,7 @@ SHA1 (patch-ab) = ddddf24cfa96c3b95202c2081006e0c7216afa1d
 SHA1 (patch-ac) = cd918ae7aedddfcd3d555a1d1388c4c8719ccd12
 SHA1 (patch-ah) = f66b496ba8f7b7d3e5a1f0c6f03d051a652f426e
 SHA1 (patch-aq) = 4bf5a76f0277b0939b2ca7720f4bb045a788b5cc
-SHA1 (patch-ca) = 54b3f40e181857c197a7d384f89e4c06bbb41ce4
+SHA1 (patch-ca) = 54071603e84ee97efe2c8f8f3af0681484a345e7
 SHA1 (patch-ch) = 5b6a89c82e158bab0a5f06add48c28e600678099
 SHA1 (patch-ck) = 5c381db130cdf4c315678e2d65380eaaa3065fee
 SHA1 (patch-cn) = d1877383e213a414562b5bb4c1e8aa785926fab7
diff --git a/lang/perl5/patches/patch-ca b/lang/perl5/patches/patch-ca
index 60486dde181..0c338505969 100644
--- a/lang/perl5/patches/patch-ca
+++ b/lang/perl5/patches/patch-ca
@@ -1,4 +1,4 @@
-$NetBSD: patch-ca,v 1.14 2013/05/31 10:55:15 adam Exp $
+$NetBSD: patch-ca,v 1.15 2013/06/06 14:20:14 jperkin Exp $
 
 * Use "uname -r" to get OS version for *BSD.
 
@@ -61,6 +61,15 @@ $NetBSD: patch-ca,v 1.14 2013/05/31 10:55:15 adam Exp $
  		case " $libpth " in
  		*" $xxx "*) ;;
  		*) libpth="$libpth $xxx";;
+@@ -4819,7 +4820,7 @@ lib_ext=$_a
+ obj_ext=$_o
+ path_sep=$p_
+ 
+-rm_try="$rm -f try try$_exe a.out .out try.[cho] try.$_o core core.try* try.core*"
++rm_try="@TOOLS_RM@ -f try try$_exe a.out .out try.[cho] try.$_o core core.try* try.core*"
+ 
+ : Which makefile gets called first.  This is used by make depend.
+ case "$firstmakefile" in
 @@ -6486,7 +6487,9 @@ rp='Pathname for the site-specific libra
  . ./getfile
  prefixvar=sitelib