diff -ruN --exclude=CVS /usr/ports/devel/p5-ExtUtils-MakeMaker.orig/Makefile /usr/ports/devel/p5-ExtUtils-MakeMaker/Makefile --- /usr/ports/devel/p5-ExtUtils-MakeMaker.orig/Makefile 2011-06-28 19:30:47.000000000 +0100 +++ /usr/ports/devel/p5-ExtUtils-MakeMaker/Makefile 2011-09-16 05:05:40.953801588 +0100 @@ -6,8 +6,7 @@ # PORTNAME= ExtUtils-MakeMaker -PORTVERSION= 6.56 -PORTREVISION= 1 +PORTVERSION= 6.59 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -15,12 +14,11 @@ MAINTAINER= perl@FreeBSD.org COMMENT= Designed to write a Makefile for an extension module -CONFLICTS= p5-ExtUtils-Install-[0-9]* +RUN_DEPENDS= p5-CPAN-Meta>=2.112150:${PORTSDIR}/devel/p5-CPAN-Meta PERL_CONFIGURE= yes -MAN3= ExtUtils::Command.3 ExtUtils::Command::MM.3 ExtUtils::Install.3 \ - ExtUtils::Installed.3 ExtUtils::Liblist.3 ExtUtils::MM.3 \ +MAN3= ExtUtils::Command::MM.3 ExtUtils::Liblist.3 ExtUtils::MM.3 \ ExtUtils::MM_AIX.3 ExtUtils::MM_Any.3 ExtUtils::MM_BeOS.3 \ ExtUtils::MM_Cygwin.3 ExtUtils::MM_DOS.3 ExtUtils::MM_Darwin.3 \ ExtUtils::MM_MacOS.3 ExtUtils::MM_NW5.3 ExtUtils::MM_OS2.3 \ @@ -28,13 +26,20 @@ ExtUtils::MM_VMS.3 ExtUtils::MM_VOS.3 ExtUtils::MM_Win32.3 \ ExtUtils::MM_Win95.3 ExtUtils::MY.3 ExtUtils::MakeMaker.3 \ ExtUtils::MakeMaker::Config.3 ExtUtils::MakeMaker::FAQ.3 \ - ExtUtils::MakeMaker::Tutorial.3 ExtUtils::Manifest.3 \ - ExtUtils::Mkbootstrap.3 ExtUtils::Mksymlists.3 \ - ExtUtils::Packlist.3 ExtUtils::testlib.3 + ExtUtils::MakeMaker::Tutorial.3 ExtUtils::Mkbootstrap.3 \ + ExtUtils::Mksymlists.3 ExtUtils::testlib.3 + +.include +.if ${PERL_LEVEL} < 501001 +RUN_DEPENDS+= p5-ExtUtils-Command>=1.16:${PORTSDIR}/devel/p5-ExtUtils-Command \ + p5-ExtUtils-Install>=1.52:${PORTSDIR}/devel/p5-ExtUtils-Install +.endif +.if ${PERL_LEVEL} < 501400 +RUN_DEPENDS+= p5-ExtUtils-Manifest>=1.58:${PORTSDIR}/devel/p5-ExtUtils-Manifest \ + p5-version>=0.88:${PORTSDIR}/devel/p5-version +.endif post-patch: - @${REINPLACE_CMD} -e '/EXE_FILES/d' ${WRKSRC}/Makefile.PL @[ -e ${LOCALBASE}/lib/perl5/${PERL_VERSION}/mach/CORE/cc_runtime.h ] || \ ${SED} -i '' -e '/cc_runtime.h/d' ${WRKSRC}/lib/ExtUtils/MM_Unix.pm - -.include +.include diff -ruN --exclude=CVS /usr/ports/devel/p5-ExtUtils-MakeMaker.orig/distinfo /usr/ports/devel/p5-ExtUtils-MakeMaker/distinfo --- /usr/ports/devel/p5-ExtUtils-MakeMaker.orig/distinfo 2011-05-17 12:04:35.000000000 +0100 +++ /usr/ports/devel/p5-ExtUtils-MakeMaker/distinfo 2011-09-16 05:05:40.961825774 +0100 @@ -1,2 +1,2 @@ -SHA256 (ExtUtils-MakeMaker-6.56.tar.gz) = 8bb4a911e06204e5f6fb54f55b121bf97150844039238542b66291cda7a444c4 -SIZE (ExtUtils-MakeMaker-6.56.tar.gz) = 269788 +SHA256 (ExtUtils-MakeMaker-6.59.tar.gz) = 7e29c8211df46c5fb0223878b87f05cefa4884b9c6d0cafb41fef4e29858903b +SIZE (ExtUtils-MakeMaker-6.59.tar.gz) = 413907 diff -ruN --exclude=CVS /usr/ports/devel/p5-ExtUtils-MakeMaker.orig/files/patch-Makefile.PL /usr/ports/devel/p5-ExtUtils-MakeMaker/files/patch-Makefile.PL --- /usr/ports/devel/p5-ExtUtils-MakeMaker.orig/files/patch-Makefile.PL 2009-01-19 15:20:30.000000000 +0000 +++ /usr/ports/devel/p5-ExtUtils-MakeMaker/files/patch-Makefile.PL 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ ---- Makefile.PL.orig 2009-01-19 15:12:43.000000000 +0000 -+++ Makefile.PL 2009-01-19 15:13:44.000000000 +0000 -@@ -133,6 +133,8 @@ - - $self->SUPER::init_PM; - -+ return; -+ - # Only override older versions of modules with ours in inc/ - for my $inc (grep /^inc/, keys %{$self->{PM}}) { - next unless $inc =~ /\.pm$/; diff -ruN --exclude=CVS /usr/ports/devel/p5-ExtUtils-MakeMaker.orig/files/patch-Makefile_PL /usr/ports/devel/p5-ExtUtils-MakeMaker/files/patch-Makefile_PL --- /usr/ports/devel/p5-ExtUtils-MakeMaker.orig/files/patch-Makefile_PL 1970-01-01 01:00:00.000000000 +0100 +++ /usr/ports/devel/p5-ExtUtils-MakeMaker/files/patch-Makefile_PL 2011-09-16 05:05:41.414773932 +0100 @@ -0,0 +1,47 @@ +--- Makefile.PL.orig 2011-09-15 18:48:12.106387216 +0100 ++++ Makefile.PL 2011-09-15 18:55:42.593935670 +0100 +@@ -11,7 +11,6 @@ + use strict; + + use lib "."; +-use my::bundles; # Must be used before anything else to set up bundled dependencies + + use lib qw(lib); # build ourself with ourself + +@@ -51,8 +50,6 @@ + + check_environment(); + +-my::bundles::copy_bundles("bundled", "inc"); +- + my $MM = WriteMakefile( + NAME => $PACKAGE, + VERSION_FROM => "lib/$PACKAGE_FILE.pm", # finds $VERSION +@@ -66,14 +63,12 @@ + }, + + MIN_PERL_VERSION => '5.006', +- PMLIBDIRS => [qw(lib inc)], +- PMLIBPARENTDIRS => [qw(lib inc)], # PMLIBPARENTDIRS is an experimental feature +- EXE_FILES => [qw(bin/instmodsh)], ++ PMLIBDIRS => [qw(lib)], ++ PMLIBPARENTDIRS => [qw(lib)], # PMLIBPARENTDIRS is an experimental feature + + META_MERGE => { + no_index => { + package => [ 'DynaLoader', 'in' ], # "in" is a PAUSE misparse. +- directory => [ 'bundled', 'my' ], + }, + resources => { + license => 'http://dev.perl.org/licenses/', +@@ -91,10 +86,6 @@ + ABSTRACT_FROM => "lib/$PACKAGE_FILE.pm", + AUTHOR => 'Michael G Schwern ', + +- realclean => { +- FILES => "inc" +- }, +- + $^O =~ /win/i + ? ( + dist => { diff -ruN --exclude=CVS /usr/ports/devel/p5-ExtUtils-MakeMaker.orig/pkg-plist /usr/ports/devel/p5-ExtUtils-MakeMaker/pkg-plist --- /usr/ports/devel/p5-ExtUtils-MakeMaker.orig/pkg-plist 2010-01-04 07:04:30.000000000 +0000 +++ /usr/ports/devel/p5-ExtUtils-MakeMaker/pkg-plist 2011-09-16 05:05:40.896733571 +0100 @@ -1,9 +1,6 @@ %%SITE_PERL%%/ExtUtils/Command/MM.pm -%%SITE_PERL%%/ExtUtils/Install.pm -%%SITE_PERL%%/ExtUtils/Installed.pm %%SITE_PERL%%/ExtUtils/Liblist.pm %%SITE_PERL%%/ExtUtils/Liblist/Kid.pm -%%SITE_PERL%%/ExtUtils/MANIFEST.SKIP %%SITE_PERL%%/ExtUtils/MM.pm %%SITE_PERL%%/ExtUtils/MM_AIX.pm %%SITE_PERL%%/ExtUtils/MM_Any.pm @@ -26,11 +23,8 @@ %%SITE_PERL%%/ExtUtils/MakeMaker/Config.pm %%SITE_PERL%%/ExtUtils/MakeMaker/FAQ.pod %%SITE_PERL%%/ExtUtils/MakeMaker/Tutorial.pod -%%SITE_PERL%%/ExtUtils/Manifest.pm %%SITE_PERL%%/ExtUtils/Mkbootstrap.pm %%SITE_PERL%%/ExtUtils/Mksymlists.pm -%%SITE_PERL%%/ExtUtils/Packlist.pm -%%SITE_PERL%%/ExtUtils/Command.pm %%SITE_PERL%%/ExtUtils/testlib.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto//ExtUtils/MakeMaker/.packlist @dirrm %%SITE_PERL%%/ExtUtils/MakeMaker