Sat Oct 20 10:41:46 2012 UTC ()
REPLACE_PERL one more file and add a SUBST_MESSAGE.
The rm class doesn't always work for me because miniperl regenerates
some Makefiles and then overwrites the substed file. I haven't tracked
the exact reason that triggers this down yet.


(wiz)
diff -r1.182 -r1.183 pkgsrc/lang/perl5/Makefile
cvs diff -r1.182 -r1.183 pkgsrc/lang/perl5/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/perl5/Makefile 2012/10/03 19:59:47 1.182
+++ pkgsrc/lang/perl5/Makefile 2012/10/20 10:41:46 1.183
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.182 2012/10/03 19:59:47 adam Exp $ 1# $NetBSD: Makefile,v 1.183 2012/10/20 10:41:46 wiz Exp $
2 2
3.include "license.mk" 3.include "license.mk"
4.include "Makefile.common" 4.include "Makefile.common"
5 5
6COMMENT= Practical Extraction and Report Language 6COMMENT= Practical Extraction and Report Language
7 7
8CONFLICTS= perl-base-[0-9]* perl-thread-[0-9]* \ 8CONFLICTS= perl-base-[0-9]* perl-thread-[0-9]* \
9 p5-CGI-2.66{,nb*} p5-CGI-2.75{,nb*} p5-CGI-2.75.[0-2] \ 9 p5-CGI-2.66{,nb*} p5-CGI-2.75{,nb*} p5-CGI-2.75.[0-2] \
10 p5-Tie-File-0.96{,nb*} \ 10 p5-Tie-File-0.96{,nb*} \
11 p5-Memoize-1.01{,nb*} \ 11 p5-Memoize-1.01{,nb*} \
12 p5-I18N-LangTags<0.35 \ 12 p5-I18N-LangTags<0.35 \
13 p5-Locale-Maketext-1.[0-9]*{,nb*} \ 13 p5-Locale-Maketext-1.[0-9]*{,nb*} \
14 p5-Locale-Maketext-Simple<0.21 \ 14 p5-Locale-Maketext-Simple<0.21 \
@@ -262,34 +262,36 @@ LOCLIBRPATHFLAGS+= ${COMPILER_RPATH_FLAG @@ -262,34 +262,36 @@ LOCLIBRPATHFLAGS+= ${COMPILER_RPATH_FLAG
262. endif 262. endif
263.else 263.else
264. if ${OBJECT_FMT} == "XCOFF" 264. if ${OBJECT_FMT} == "XCOFF"
265BROKEN= XCOFF targets need the path specified where libperl.a resides.\ 265BROKEN= XCOFF targets need the path specified where libperl.a resides.\
266Please choose on of 64bitint 64bitmore 64bitall or 64bitnone to allow this. 266Please choose on of 64bitint 64bitmore 64bitall or 64bitnone to allow this.
267. endif 267. endif
268.endif 268.endif
269SUBST_VARS.policysh+= LOCLIBRPATHFLAGS 269SUBST_VARS.policysh+= LOCLIBRPATHFLAGS
270 270
271# Remove a spurious workdir reference 271# Remove a spurious workdir reference
272SUBST_CLASSES+= rm 272SUBST_CLASSES+= rm
273SUBST_STAGE.rm= pre-install 273SUBST_STAGE.rm= pre-install
274SUBST_FILES.rm= lib/Config_heavy.pl 274SUBST_FILES.rm= lib/Config_heavy.pl
 275SUBST_MESSAGE.rm= Do not use tools version of rm.
275SUBST_SED.rm= -e "s!^rm_try='/.*/\\.tools/bin/rm -f!rm_try='/bin/rm -f!" 276SUBST_SED.rm= -e "s!^rm_try='/.*/\\.tools/bin/rm -f!rm_try='/bin/rm -f!"
276 277
277# Replace our perl as the interpreter 278# Replace our perl as the interpreter
278REPLACE_PERL+= lib/File/DosGlob.pm 279REPLACE_PERL+= lib/File/DosGlob.pm
279REPLACE_PERL+= lib/unicore/mktables 280REPLACE_PERL+= lib/unicore/mktables
280REPLACE_PERL+= lib/version.pm 281REPLACE_PERL+= lib/version.pm
281REPLACE_PERL+= dist/bignum/lib/Math/BigFloat/Trace.pm 282REPLACE_PERL+= dist/bignum/lib/Math/BigFloat/Trace.pm
282REPLACE_PERL+= dist/bignum/lib/Math/BigInt/Trace.pm 283REPLACE_PERL+= dist/bignum/lib/Math/BigInt/Trace.pm
 284REPLACE_PERL+= dist/ExtUtils-ParseXS/lib/ExtUtils/xsubpp
283 285
284# And replace a perl interpreter during the pre-install stage 286# And replace a perl interpreter during the pre-install stage
285# I think this may be a bootstrap script, so can't use REPLACE_PERL 287# I think this may be a bootstrap script, so can't use REPLACE_PERL
286# because that is acted upon already in the pre-configure stage 288# because that is acted upon already in the pre-configure stage
287SUBST_CLASSES+= miniperl 289SUBST_CLASSES+= miniperl
288SUBST_STAGE.miniperl= pre-install 290SUBST_STAGE.miniperl= pre-install
289SUBST_FILES.miniperl= lib/ExtUtils/xsubpp 291SUBST_FILES.miniperl= lib/ExtUtils/xsubpp
290SUBST_SED.miniperl= -e "1s:\#!./miniperl:\#!${PERL5}:" 292SUBST_SED.miniperl= -e "1s:\#!./miniperl:\#!${PERL5}:"
291 293
292.if ${PKGSRC_COMPILER} == "xlc" 294.if ${PKGSRC_COMPILER} == "xlc"
293SUBST_CLASSES+= cpprun 295SUBST_CLASSES+= cpprun
294SUBST_STAGE.cpprun= pre-install 296SUBST_STAGE.cpprun= pre-install
295SUBST_FILES.cpprun= lib/Config_heavy.pl 297SUBST_FILES.cpprun= lib/Config_heavy.pl