On Jul 1, 2013, at 9:59 PM, Ryan Schmidt <[email protected]> wrote:
> > On Jul 1, 2013, at 22:45, [email protected] wrote: > >> Revision: 107528 >> https://trac.macports.org/changeset/107528 >> Author: [email protected] >> Date: 2013-07-01 20:45:35 -0700 (Mon, 01 Jul 2013) >> Log Message: >> ----------- >> intltool: Work better with non-default versions of perl >> >> Modified Paths: >> -------------- >> trunk/dports/textproc/intltool/Portfile >> >> Modified: trunk/dports/textproc/intltool/Portfile >> =================================================================== >> --- trunk/dports/textproc/intltool/Portfile 2013-07-02 03:41:21 UTC (rev >> 107527) >> +++ trunk/dports/textproc/intltool/Portfile 2013-07-02 03:45:35 UTC (rev >> 107528) >> @@ -5,6 +5,7 @@ >> >> name intltool >> version 0.50.2 >> +revision 1 >> maintainers nomaintainer >> categories textproc gnome >> license GPL-2+ >> @@ -30,15 +31,37 @@ >> sha256 >> 67f25c5c6fb71d095793a7f895b245e65e829e8bde68c6c8b4c912144ff34406 >> >> depends_build port:gnome-common >> -depends_lib port:expat \ >> - port:perl5.12 \ >> - port:p5.12-xml-parser \ >> - port:p5.12-getopt-long \ >> - port:p5.12-pathtools \ >> - port:p5.12-scalar-list-utils >> +depends_lib port:expat >> >> -configure.perl ${prefix}/bin/perl5.12 >> +# TODO: This perlver cruft should be done in the perl5 PortGroup >> +if {[variant_isset perl5_8]} { >> + set perlver 5.8 >> +} elseif {[variant_isset perl5_10]} { >> + set perlver 5.10 >> +} elseif {[variant_isset perl5_14]} { >> + set perlver 5.14 >> +} elseif {[variant_isset perl5_16]} { >> + set perlver 5.16 >> +} else { >> + set perlver 5.12 >> + default_variants +perl5_12 >> +} >> >> +variant perl5_8 conflicts perl5_10 perl5_12 perl5_14 perl5_16 description >> {use perl 5.8} {} >> +variant perl5_10 conflicts perl5_8 perl5_12 perl5_14 perl5_16 description >> {use perl 5.10} {} >> +variant perl5_12 conflicts perl5_8 perl5_10 perl5_14 perl5_16 description >> {use perl 5.12} {} >> +variant perl5_14 conflicts perl5_8 perl5_10 perl5_12 perl5_16 description >> {use perl 5.14} {} >> +variant perl5_16 conflicts perl5_8 perl5_10 perl5_12 perl5_14 description >> {use perl 5.16} {} >> + >> +depends_lib-append \ >> + port:perl${perlver} \ >> + port:p${perlver}-xml-parser \ >> + port:p${perlver}-getopt-long \ >> + port:p${perlver}-pathtools \ >> + port:p${perlver}-scalar-list-utils >> + >> +configure.perl ${prefix}/bin/perl${perlver} >> + >> test.run yes >> test.target check > > I am not sure that we want to do this. Without doing this, it's nearly impossible to build ports if you have any non-default perl selected. With this change, everything in my default set (which includes 2249 ports) built with +perl5_16. > Doesn't this now necessitate that all ports using intltool immediately > acquire the same variants, Why? This port provides intltool, not perl modules. > and also ensure using the active_variants portgroup that the variant selected > in each port is the same as the variant used in the intltool port? Again, why would that be? > It was much more straightforward when the intltool port (and any other port > that uses perl or perl modules) simply used perl 5.12. Yes, straight forward so long as you used +perl5_12. If you used a non-default perl, you were out of luck.
smime.p7s
Description: S/MIME cryptographic signature
_______________________________________________ macports-dev mailing list [email protected] https://lists.macosforge.org/mailman/listinfo/macports-dev
