Sorry was in a rush, still not really free.
I was going to do the update, just it's not one update as you spotted,
and still have to go back through my old things on ports@ not ok'd yet,
put on hold while ports locked.
p5-Module-Install-ExtraTests
I have that update to go with this, along with updates and other new
p5-Module-Install-xxxx packages.
This goes with a modification to perl.bsd.mk
$ cvs -R -q diff -uNp perl.port.mk
Index: perl.port.mk
===================================================================
RCS file: /home/cvs/ports/infrastructure/mk/perl.port.mk,v
retrieving revision 1.29
diff -u -p -r1.29 perl.port.mk
--- perl.port.mk 26 Apr 2016 10:56:59 -0000 1.29
+++ perl.port.mk 26 Apr 2016 13:20:04 -0000
@@ -66,7 +66,7 @@ MODPERL_configure = ${_MODPERL_preconfig
. 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
Then that needs going back over ports and adding in missing
p5-Module-Install-xxxxx to replace old untested bundled versions in the
dist files. Have all the updates to go with that.
The other thing to note, is the smaller set of ports runtime/buildtime
required. Because they are only recommendations and not used.
I check over things, and I did mine months ago, and based on an update
to 1.16 long before that. Might have missed some things, and need will
recheck. But I have been running all my dpb runs with the changes in
place, what I have works with dpb, also works with last build tests I
did - for each perl package with just build packages installed, and
ensure it builds.
On 11/03/17 16:05, Alexander Bluhm wrote:
> On Fri, Nov 03, 2017 at 03:08:11PM +0000, Nigel Taylor wrote:
>> Can't respond quickly to this, this is my version, and has been run
>> through earlier version 1.16 etc,
>
> Does that mean that you want to take care of the update?
>
>> the full update requires complex
>> p5-Module-Install-xxxx updates
>
> I have not seen any fallout with the existing p5-Module-Install-xxxx
> modules. Do you have anything that got broken? Can we update
> p5-Module-Install and fix everything afterwards?
>
>> +TEST_DEPENDS += devel/p5-Module-Install-AuthorTests \
>
> I have added p5-Module-Install-AuthorTests so that the test is not
> skipped.
>
>> + devel/p5-Module-Install-ExtraTests
>
> This port p5-Module-Install-ExtraTests does not exist yet. I ignore
> the dependency, it just means that a test is skipped.
>
>> -# for the CPAN regression test
>> -pre-test:
>> - mkdir -p ${WRKDIR}/home
>> -PORTHOME= ${WRKDIR}/home
>
> I did not find why this is needed so I removed it.
>
>> +# No autoinstall from CPAN...
>> +CONFIGURE_ARGS= --skipdeps
>
> I see that lib/Module/AutoInstall.pm checks it, so I put it back.
>
>> MAKE_ENV= TEST_POD=Yes
>
> I do not see why this is needed, so I removed it.
>
>> +post-patch:
>> + find ${WRKSRC} -type f -name "*.orig" -exec rm {} +
>
> This prevents make update-patches, so I do not include it.
>
> New diff, ok?
>
> bluhm
>
> Index: devel/p5-Module-Install/Makefile
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/ports/devel/p5-Module-Install/Makefile,v
> retrieving revision 1.25
> diff -u -p -r1.25 Makefile
> --- devel/p5-Module-Install/Makefile 9 Jan 2017 11:06:45 -0000 1.25
> +++ devel/p5-Module-Install/Makefile 3 Nov 2017 15:54:58 -0000
> @@ -4,29 +4,29 @@ COMMENT= standalone extensible Perl modu
>
> MODULES= cpan
> PKG_ARCH= *
> -DISTNAME= Module-Install-1.08
> -REVISION= 3
> +DISTNAME = Module-Install-1.18
> CATEGORIES= devel
>
> +MAINTAINER = Alexander Bluhm <bl...@openbsd.org>
> +
> # perl
> PERMIT_PACKAGE_CDROM= Yes
>
> -RUN_DEPENDS+= devel/p5-Module-ScanDeps>=1.13 \
> - devel/p5-File-Remove \
> - devel/p5-PAR-Dist \
> - devel/p5-YAML-Tiny>=1.38 \
> - converters/p5-JSON
> +BUILD_DEPENDS = devel/p5-YAML-Tiny>=1.33
> +RUN_DEPENDS = archivers/p5-Archive-Zip>=1.37 \
> + converters/p5-JSON>=2.9 \
> + devel/p5-File-HomeDir>=1 \
> + devel/p5-File-Remove>=1.42 \
> + devel/p5-Module-Build>=0.29 \
> + devel/p5-Module-ScanDeps>=1.09 \
> + devel/p5-PAR-Dist>=0.29 \
> + devel/p5-YAML-Tiny>=1.38 \
> + www/p5-libwww>=6.05
> +TEST_DEPENDS = devel/p5-Module-Install-AuthorTests
>
> # special case; this is *not* a CONFIGURE_STYLE=modbuild port
> -RUN_DEPENDS+= devel/p5-Module-Build
>
> +# no autoinstall from CPAN
> CONFIGURE_ARGS= --skipdeps
> -
> -# for the CPAN regression test
> -pre-test:
> - mkdir -p ${WRKDIR}/home
> -
> -PORTHOME= ${WRKDIR}/home
> -MAKE_ENV= TEST_POD=Yes
>
> .include <bsd.port.mk>
> Index: devel/p5-Module-Install/distinfo
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/ports/devel/p5-Module-Install/distinfo,v
> retrieving revision 1.7
> diff -u -p -r1.7 distinfo
> --- devel/p5-Module-Install/distinfo 19 Mar 2014 09:07:26 -0000 1.7
> +++ devel/p5-Module-Install/distinfo 3 Nov 2017 14:24:49 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (Module-Install-1.08.tar.gz) =
> 7YZ4KSkgjmOjVwmtb1Pt054QX8G8t9z8P7c2KvZ7tRQ=
> -SIZE (Module-Install-1.08.tar.gz) = 126800
> +SHA256 (Module-Install-1.18.tar.gz) =
> KQaKwzUCzslZhEwgZRbAnMSoR8tXMn1BAV9gUVPKZF4=
> +SIZE (Module-Install-1.18.tar.gz) = 114751
> Index:
> devel/p5-Module-Install/patches/patch-lib_Module_Install_Admin_Include_pm
> ===================================================================
> RCS file:
> /data/mirror/openbsd/cvs/ports/devel/p5-Module-Install/patches/patch-lib_Module_Install_Admin_Include_pm,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-lib_Module_Install_Admin_Include_pm
> --- devel/p5-Module-Install/patches/patch-lib_Module_Install_Admin_Include_pm
> 9 Jan 2017 11:06:45 -0000 1.3
> +++ devel/p5-Module-Install/patches/patch-lib_Module_Install_Admin_Include_pm
> 3 Nov 2017 14:32:14 -0000
> @@ -1,10 +1,11 @@
> $OpenBSD: patch-lib_Module_Install_Admin_Include_pm,v 1.3 2017/01/09
> 11:06:45 zhuk Exp $
> Fix whatis information.
> ---- lib/Module/Install/Admin/Include.pm.orig Mon Jan 9 13:52:24 2017
> -+++ lib/Module/Install/Admin/Include.pm Mon Jan 9 13:52:44 2017
> +Index: lib/Module/Install/Admin/Include.pm
> +--- lib/Module/Install/Admin/Include.pm.orig
> ++++ lib/Module/Install/Admin/Include.pm
> @@ -61,6 +61,8 @@ sub auto_include_deps {
>
> - Module::Install::Admin::Include
> + Module::Install::Admin::Include - include methods for Module::Install
>
> +=head1 DESCRIPTION
> +
> Index: devel/p5-Module-Install/pkg/DESCR
> ===================================================================
> RCS file: /data/mirror/openbsd/cvs/ports/devel/p5-Module-Install/pkg/DESCR,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 DESCR
> --- devel/p5-Module-Install/pkg/DESCR 4 Nov 2006 23:50:21 -0000 1.1.1.1
> +++ devel/p5-Module-Install/pkg/DESCR 3 Nov 2017 14:19:51 -0000
> @@ -1,4 +1,16 @@
> Module::Install is a package for writing installers for CPAN (or
> -CPAN-like) distributions that are clean, simple, minimalist, act in a
> -strictly correct manner with both the ExtUtils::MakeMaker and
> +CPAN-like) distributions that are clean, simple, minimalist, act
> +in a strictly correct manner with both the ExtUtils::MakeMaker and
> Module::Build build systems.
> +
> +Please note that while Module::Install pioneered many great ideas
> +in its time, its primary benefits have been better achieved by the
> +authoring tool Dist::Zilla, and its spinoffs Dist::Milla and Minilla.
> +These tools allow the author to build and maintain distributions
> +with DWIM convenience, while the distribution is installed directly
> +by ExtUtils::MakeMaker or similar installation tools, avoiding the
> +complexity of bundling the installer. Dist::Zilla additionally has
> +a more robust plugin system which makes it easier to keep up with
> +changes to the CPAN::Meta::Spec and add other new functionality.
> +Use of Module::Install for new distributions is therefore discouraged
> +by the maintainers.
>
