[129885] trunk/dports/perl/p5-module-build

devans at macports.org devans at macports.org
Mon Dec 22 05:43:46 PST 2014


Revision: 129885
          https://trac.macports.org/changeset/129885
Author:   devans at macports.org
Date:     2014-12-22 05:43:46 -0800 (Mon, 22 Dec 2014)
Log Message:
-----------
p5-module-build: resolve conflict with p5-inc-latest by applying upstream patch that removes inc::latest and makes it an optional external dependency, depend on p5-inc-latest, increment revision.

Modified Paths:
--------------
    trunk/dports/perl/p5-module-build/Portfile

Added Paths:
-----------
    trunk/dports/perl/p5-module-build/files/
    trunk/dports/perl/p5-module-build/files/patch-remove-inc-latest.diff

Modified: trunk/dports/perl/p5-module-build/Portfile
===================================================================
--- trunk/dports/perl/p5-module-build/Portfile	2014-12-22 13:29:00 UTC (rev 129884)
+++ trunk/dports/perl/p5-module-build/Portfile	2014-12-22 13:43:46 UTC (rev 129885)
@@ -7,6 +7,7 @@
 epoch               2
 perl5.branches      5.10 5.12 5.14 5.16 5.18 5.20
 perl5.setup         Module-Build 0.4210
+revision            1
 license             {Artistic-1 GPL}
 maintainers         nomaintainer
 supported_archs     noarch
@@ -28,21 +29,30 @@
                     sha256  592471e27800180044016011ae580f4be308c15635162795269b472cfe991fb5
 
 if {${perl5.major} != ""} {
-depends_build-append \
+    depends_build-append \
                     port:p${perl5.major}-parse-cpan-meta
 
-depends_lib-append  port:p${perl5.major}-yaml \
+    depends_lib-append \
+                    port:p${perl5.major}-yaml \
                     port:p${perl5.major}-cpan-meta \
                     port:p${perl5.major}-extutils-cbuilder \
+                    port:p${perl5.major}-inc-latest \
                     port:p${perl5.major}-module-metadata \
                     port:p${perl5.major}-parse-cpan-meta \
                     port:p${perl5.major}-perl-ostype \
                     port:p${perl5.major}-podlators \
                     port:p${perl5.major}-version
 
-perl5.use_module_build
+    patchfiles      patch-remove-inc-latest.diff
 
-depends_lib-delete  port:p${perl5.major}-module-build
+    post-patch {
+        delete ${worksrcpath}/lib/inc
+    }
+
+    perl5.use_module_build
+
+    depends_lib-delete \
+                    port:p${perl5.major}-module-build
 }
 
 perl5.link_binaries no

Added: trunk/dports/perl/p5-module-build/files/patch-remove-inc-latest.diff
===================================================================
--- trunk/dports/perl/p5-module-build/files/patch-remove-inc-latest.diff	                        (rev 0)
+++ trunk/dports/perl/p5-module-build/files/patch-remove-inc-latest.diff	2014-12-22 13:43:46 UTC (rev 129885)
@@ -0,0 +1,54 @@
+diff --git a/Build.PL b/Build.PL
+index f3c4b42..13bb679 100644
+--- Build.PL
++++ Build.PL
+@@ -107,6 +107,7 @@ my $build = ModuleBuildBuilder->new(
+     inc_bundling_support => {
+       description => "Bundle Module::Build in inc/",
+       requires    => {
++        'inc::latest'           => 0.500, # split out from Module::Build
+         'ExtUtils::Install'     => 1.54, # also gets us ExtUtils::Installed 1.999_001
+         'ExtUtils::Installed'   => 1.999, # technically 1.999_001 is what's available
+       },
+--- Changes.orig	2014-09-01 07:15:57.000000000 -0700
++++ Changes	2014-12-21 16:49:29.000000000 -0800
+@@ -1,5 +1,13 @@
+ Revision history for Perl extension Module::Build.
+ 
++0.4211 -
++
++  [DEPRECATIONS]
++
++  - inc::latest has been split out to a separate distribution on CPAN.
++    It is an optional prerequisite, only needed for the experimental
++    bundling feature.
++
+ 0.4210 - Mon Sep  1 13:30:29 CEST 2014
+ 
+   [BUG FIXES]
+diff --git a/MANIFEST b/MANIFEST
+index 7dd69c3..08cda4d 100644
+--- MANIFEST
++++ MANIFEST
+@@ -7,8 +7,6 @@ inc/MBVersion.pm
+ inc/Module/Metadata.pm
+ inc/Perl/OSType.pm
+ INSTALL
+-lib/inc/latest.pm
+-lib/inc/latest/private.pm
+ lib/Module/Build.pm
+ lib/Module/Build/API.pod
+ lib/Module/Build/Authoring.pod
+diff --git a/lib/Module/Build/Bundling.pod b/lib/Module/Build/Bundling.pod
+index 5e7b9f9..98f2de3 100644
+--- lib/Module/Build/Bundling.pod
++++ lib/Module/Build/Bundling.pod
+@@ -34,7 +34,7 @@ The "trick" to making this work for Module::Build is making sure the
+ highest version Module::Build is used, whether this is in C<inc/> or
+ already installed on the user's system.  This ensures that all necessary
+ features are available as well as any new bug fixes.  This is done using
+-the new L<inc::latest> module.
++the experimental L<inc::latest> module, available on CPAN.
+ 
+ A "normal" Build.PL looks like this (with only the minimum required
+ fields):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141222/689df52a/attachment.html>


More information about the macports-changes mailing list