On 03/08/16 22:29, Stuart Henderson wrote:
> On 2016/03/08 16:41, Nigel Taylor wrote:
>> modbuild shouldn't be used but maybe a modtiny style adding an extra
>> style doesn't impact existing modbuild ports.
>
> My build is still running, but no problems to report yet. If nothing
> shows up as a problem I don't see why we couldn't use the same
> "MODPERL_configure" for both. And actually we could do something
> like this, it would be quite intuitive: set CONFIGURE_STYLE to
> either just "modbuild" or to "modbuild tiny".
Happy with modbuild tiny, didn't think of that.
>
> .if ${CONFIGURE_STYLE:L:Mmodbuild}
> . if ${CONFIGURE_STYLE:L:Mtiny}
> BUILD_DEPENDS += devel/p5-Module-Build-Tiny
> . else
> BUILD_DEPENDS += devel/p5-Module-Build
This is for later.... there is no p5-Module-Build yet in the tree, I
have one locally in my openbsd-wip.
> . fi
> MODPERL_configure = \
> arch=`perl -e 'use Config; print $$Config{archname}, "\n";'`; \
> cd ${WRKSRC}; ${_SYSTRACE_CMD} ${SETENV} ${CONFIGURE_ENV} \
> perl Build.PL \
> --install_path=lib="${PREFIX}/libdata/perl5/site_perl" \
>
> --install_path=arch="${PREFIX}/libdata/perl5/site_perl/$$arch" \
> --install_path=libdoc="${PREFIX}/man/man3p" \
> --install_path=bindoc="${PREFIX}/man/man1" \
> --install_path=bin="${PREFIX}/bin" \
> --install_path=script="${PREFIX}/bin" ${CONFIGURE_ARGS}
> .else
> [...]
>
> 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.
>
>> diff -u -p -r1.12 Makefile
>> --- Makefile 12 Jun 2015 13:46:08 -0000 1.12
>> +++ Makefile 8 Mar 2016 15:12:07 -0000
>> @@ -17,9 +17,10 @@ RUN_DEPENDS = devel/p5-Carp-Clan \
>> devel/p5-Sub-Name \
>> devel/p5-namespace-autoclean
>> BUILD_DEPENDS = ${RUN_DEPENDS} \
>> - devel/p5-Module-Build-Tiny
>>
>
> this leaves a dangerous trailing \
Did say forgot to remove this, checked and had gone back and removed.
>
>> . if ${CONFIGURE_STYLE:L:Mmodinst}
>> BUILD_DEPENDS += devel/p5-Module-Install
>> CONFIGURE_ARGS += --skipdeps
>> -_MODPERL_preconfig = rm -rf ${WRKSRC}/inc/Module/*Install*
>> +_MODPERL_preconfig = rm -rf ${WRKSRC}/inc/*
>> . else
>> _MODPERL_preconfig = :
>> . endif
>
> this looks like part of a different diff
Did explain this is for modinst, it's what I'm using on my builds, it
removes all the bundled modules rather than just Module::Install, so
have to use the built and tested ports, patches included. Have all the
extras / changes to make this work not that many few extra BDEP's, a few
new ports. Then to switch some ports to modinst some extra
Module::Install extensions.
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
$ cvs -R -q diff -uNp
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/converters/p5-JSON-XS/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- Makefile 8 Mar 2016 14:20:18 -0000 1.22
+++ Makefile 9 Mar 2016 01:14:05 -0000
@@ -14,6 +14,8 @@ PERMIT_PACKAGE_CDROM = Yes
WANTLIB += c
+BUILD_DEPENDS= devel/p5-Canary-Stability
+
RUN_DEPENDS= converters/p5-Types-Serialiser \
devel/p5-common-sense
