On Wed, Mar 9, 2016 at 9:26 AM, Nigel Taylor
<njtaylor0...@btinternet.com> wrote:
> On 03/09/16 09:28, Stuart Henderson wrote:
>> On 2016/03/09 01:34, Nigel Taylor wrote:
>>> This is for later.... there is no p5-Module-Build yet in the tree, I
>>> have one locally in my openbsd-wip.
>>
>> Me too. We could do with getting that committed actually, I'd like to
>> do a test build with 5.22 and it's much easier not to have diffs stacked
>> in the ports tree.
>>
> I need to clear my diffs, various updates.
>
> for modinst have extensions required to switch ports which should use
> modinst, plus additional ports to support.
>
> Then there are fixes for ports when Module Build is removed /
> p5-Module-Build is available. I do this to ensure not used core versions.
>
> doas rm -r /usr/libdata/perl5/CGI /usr/libdata/perl5/Module/Build
> doas rm /usr/libdata/perl5/CGI.pm /usr/libdata/perl5/Module/Build.pm
>
>
>>>> If ::Tiny diverges further in future we could do something different
>>>> but this seems a cleaner approach for now.
>>> Agree it's cleaner for now. Ok with me.
>>
>> Aww, so close... p5-GD fails with this.
>>
> Attached revised perl.port.mk diff
>
> (couple white space end of line removals as well)
>
> p5-GD does build now with perl.port.mk attached, I reverted modbuild to
> old form without --, only added -- to args if tiny during configure. The
> fake can use -- for both.
>
> perl.port.mk.diff_p522 - extras diffs I am using.
>
>
> also attached diff with ports changed to use modbuild tiny (incomplete
> few ports to do they build as is)
>
>>> Changed perl.port.mk to modbuild tiny, and ports.
>>>
>>> Of coarse start my dpb build with changes and see perl port fall over
>>> straight away...
>>>
>>> converters/p5-JSON-XS - needs BDEP on devel/p5-Canary-Stability wasn't
>>> required for 3.01 new in 3.02
>>
>> Thanks, fixed (sorry to steal your commit I didn't page down that
>> far in the mail until after committing ;)
>>
> as long as fixed.
>
>
> A little extra ... stop duplicate perl in CONFIGURE_STYLE, MODULES
> causing configure to run twice.... Noticed on p5-GD,
> if CONFIGURE_STYLE = modbuild is used adds extra perl. Each perl found
> in CONFIGURE_STYLE runs MODPERL_configure. Might be a better way to stop
> this. bsd.port.mk adds perl for modbuild to CONFIGURE_STYLE, which then
> adds to MODULES, then cpan.port.mk adds another of each.
>
I did reproduced this.
> Can see duplicates with make show="MODULES CONFIGURE_STYLE"
>
> $ cvs -R -q diff -uNp cpan.port.mk
> Index: cpan.port.mk
> ===================================================================
> RCS file: /home/cvs/ports/infrastructure/mk/cpan.port.mk,v
> retrieving revision 1.18
> diff -u -p -r1.18 cpan.port.mk
> --- cpan.port.mk 11 Mar 2013 11:50:17 -0000 1.18
> +++ cpan.port.mk 9 Mar 2016 12:17:21 -0000
> @@ -10,8 +10,12 @@ MASTER_SITES ?= ${MASTER_SITE_PERL_CPAN:
> HOMEPAGE ?= http://search.cpan.org/dist/${DISTNAME:C/-[^-]*$//}/
>
> CATEGORIES += perl5
> +.if ! ${CONFIGURE_STYLE:L:Mperl}
> CONFIGURE_STYLE += perl
> +.endif
> +.if ! ${MODULES:L:Mperl}
> MODULES += perl
> +.endif
>
> TEST_DEPENDS += ${RUN_DEPENDS}
>
>
>
>
will try diffs, thanks
