Here's an updated Module::Build port based on both of ours, plus the
other diffs. I've done it all as an inline diff because the directory
was present previously so it's easier to just cvs add it than import
and fix conflicts.
We have to keep 4 digits or set EPOCH from the start (the port was
previously 0.2808).
> Currently this shouldn't be needed, as it's for when Module::Build is
> removed from core perl with 5.22 and want modbuild to add the dependency.
We want the dependency anyway, to make sure ports are built using a
consistent version of Module::Build.
(Also from my earlier notes I see we should be setting install_path=sbin
in perl.port.mk, but that's a separate diff).
OK?
Index: devel/Makefile
===================================================================
RCS file: /cvs/ports/devel/Makefile,v
retrieving revision 1.1470
diff -u -p -r1.1470 Makefile
--- devel/Makefile 7 Mar 2016 20:45:41 -0000 1.1470
+++ devel/Makefile 11 Mar 2016 21:00:48 -0000
@@ -823,6 +823,7 @@
SUBDIR += p5-Math-Base-Convert
SUBDIR += p5-Memoize-ExpireLRU
SUBDIR += p5-Modern-Perl
+ SUBDIR += p5-Module-Build
SUBDIR += p5-Module-Build-Tiny
SUBDIR += p5-Module-Build-XSUtil
SUBDIR += p5-Module-Find
Index: infrastructure/mk/perl.port.mk
===================================================================
RCS file: /cvs/ports/infrastructure/mk/perl.port.mk,v
retrieving revision 1.25
diff -u -p -r1.25 perl.port.mk
--- infrastructure/mk/perl.port.mk 11 Mar 2016 13:06:22 -0000 1.25
+++ infrastructure/mk/perl.port.mk 11 Mar 2016 21:00:48 -0000
@@ -79,6 +79,10 @@ MODPERL_pre-fake = \
.if ${CONFIGURE_STYLE:L:Mmodbuild}
. if ${CONFIGURE_STYLE:L:Mtiny}
BUILD_DEPENDS += devel/p5-Module-Build-Tiny
+. elif ${CONFIGURE_STYLE:L:Mnone}
+# for building Module::Build
+. else
+BUILD_DEPENDS += devel/p5-Module-Build
. endif
MODPERL_BUILD_TARGET = \
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} perl \
Index: devel/p5-Module-Build/Makefile
===================================================================
RCS file: devel/p5-Module-Build/Makefile
diff -N devel/p5-Module-Build/Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ devel/p5-Module-Build/Makefile 11 Mar 2016 21:00:48 -0000
@@ -0,0 +1,17 @@
+# $OpenBSD$
+
+COMMENT = build and install Perl modules
+
+# XXX newer versions require CPAN::Meta 2.142060; revisit after perl updates
+DISTNAME = Module-Build-0.4208
+CATEGORIES = devel
+
+# Perl
+PERMIT_PACKAGE_CDROM = Yes
+
+MODULES = cpan
+
+TEST_DEPENDS += devel/p5-PAR-Dist>=0.17
+CONFIGURE_STYLE = modbuild none
+
+.include <bsd.port.mk>
Index: devel/p5-Module-Build/distinfo
===================================================================
RCS file: devel/p5-Module-Build/distinfo
diff -N devel/p5-Module-Build/distinfo
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ devel/p5-Module-Build/distinfo 11 Mar 2016 21:00:48 -0000
@@ -0,0 +1,2 @@
+SHA256 (Module-Build-0.4208.tar.gz) =
MuykfElKXSqCbDBhYnCw/HRDFbc2MiO1T96i3O9jU3g=
+SIZE (Module-Build-0.4208.tar.gz) = 308883
Index: devel/p5-Module-Build/pkg/DESCR
===================================================================
RCS file: devel/p5-Module-Build/pkg/DESCR
diff -N devel/p5-Module-Build/pkg/DESCR
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ devel/p5-Module-Build/pkg/DESCR 11 Mar 2016 21:00:48 -0000
@@ -0,0 +1,6 @@
+"Module::Build" is a system for building, testing, and installing Perl
+modules. It is meant to be an alternative to "ExtUtils::MakeMaker".
+Developers may alter the behavior of the module through subclassing in a
+much more straightforward way than with "MakeMaker". It also does not
+require a "make" on your system - most of the "Module::Build" code is
+pure-perl and written in a very cross-platform way.
Index: devel/p5-Module-Build/pkg/PLIST
===================================================================
RCS file: devel/p5-Module-Build/pkg/PLIST
diff -N devel/p5-Module-Build/pkg/PLIST
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ devel/p5-Module-Build/pkg/PLIST 11 Mar 2016 21:00:48 -0000
@@ -0,0 +1,54 @@
+@comment $OpenBSD$
+bin/config_data
+${P5SITE}/Module/
+${P5SITE}/Module/Build/
+${P5SITE}/Module/Build.pm
+${P5SITE}/Module/Build/API.pod
+${P5SITE}/Module/Build/Authoring.pod
+${P5SITE}/Module/Build/Base.pm
+${P5SITE}/Module/Build/Bundling.pod
+${P5SITE}/Module/Build/Compat.pm
+${P5SITE}/Module/Build/Config.pm
+${P5SITE}/Module/Build/ConfigData.pm
+${P5SITE}/Module/Build/Cookbook.pm
+${P5SITE}/Module/Build/Dumper.pm
+${P5SITE}/Module/Build/Notes.pm
+${P5SITE}/Module/Build/PPMMaker.pm
+${P5SITE}/Module/Build/Platform/
+${P5SITE}/Module/Build/Platform/Default.pm
+${P5SITE}/Module/Build/Platform/MacOS.pm
+${P5SITE}/Module/Build/Platform/Unix.pm
+${P5SITE}/Module/Build/Platform/VMS.pm
+${P5SITE}/Module/Build/Platform/VOS.pm
+${P5SITE}/Module/Build/Platform/Windows.pm
+${P5SITE}/Module/Build/Platform/aix.pm
+${P5SITE}/Module/Build/Platform/cygwin.pm
+${P5SITE}/Module/Build/Platform/darwin.pm
+${P5SITE}/Module/Build/Platform/os2.pm
+${P5SITE}/Module/Build/PodParser.pm
+${P5SITE}/inc/
+${P5SITE}/inc/latest/
+${P5SITE}/inc/latest.pm
+${P5SITE}/inc/latest/private.pm
+@man man/man1/config_data.1
+@man man/man3p/Module::Build.3p
+@man man/man3p/Module::Build::API.3p
+@man man/man3p/Module::Build::Authoring.3p
+@man man/man3p/Module::Build::Base.3p
+@man man/man3p/Module::Build::Bundling.3p
+@man man/man3p/Module::Build::Compat.3p
+@man man/man3p/Module::Build::ConfigData.3p
+@man man/man3p/Module::Build::Cookbook.3p
+@man man/man3p/Module::Build::Notes.3p
+@man man/man3p/Module::Build::PPMMaker.3p
+@man man/man3p/Module::Build::Platform::Default.3p
+@man man/man3p/Module::Build::Platform::MacOS.3p
+@man man/man3p/Module::Build::Platform::Unix.3p
+@man man/man3p/Module::Build::Platform::VMS.3p
+@man man/man3p/Module::Build::Platform::VOS.3p
+@man man/man3p/Module::Build::Platform::Windows.3p
+@man man/man3p/Module::Build::Platform::aix.3p
+@man man/man3p/Module::Build::Platform::cygwin.3p
+@man man/man3p/Module::Build::Platform::darwin.3p
+@man man/man3p/Module::Build::Platform::os2.3p
+@man man/man3p/inc::latest.3p
Index: devel/quirks/Makefile
===================================================================
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.358
diff -u -p -r1.358 Makefile
--- devel/quirks/Makefile 9 Mar 2016 21:32:53 -0000 1.358
+++ devel/quirks/Makefile 11 Mar 2016 21:00:48 -0000
@@ -5,7 +5,7 @@ CATEGORIES = devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-2.203
+PKGNAME = quirks-2.204
PKG_ARCH = *
MAINTAINER = Marc Espie <es...@openbsd.org>
Index: devel/quirks/files/Quirks.pm
===================================================================
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.368
diff -u -p -r1.368 Quirks.pm
--- devel/quirks/files/Quirks.pm 9 Mar 2016 21:32:53 -0000 1.368
+++ devel/quirks/files/Quirks.pm 11 Mar 2016 21:00:48 -0000
@@ -73,7 +73,6 @@ my $base_exceptions = {
'p5-ExtUtils-CBuilder' => "$p5/ExtUtils/CBuilder.pm",
'p5-ExtUtils-ParseXS' => "$p5/ExtUtils/ParseXS.pm",
'p5-Locale-Maketext-Simple' => "$p5/Locale/Maketext/Simple.pm",
- 'p5-Module-Build' => "$p5/Module/Build.pm",
'p5-Module-CoreList' => "$p5/Module/CoreList.pm",
'p5-Module-Load' => "$p5/Module/Load.pm",
'p5-Module-Loaded' => "$p5/Module/Loaded.pm",
