- Update to 6.62

- Remove CONFLICTS with devel/p5-ExtUtils-Install

Note that this port now depends on modules from Perl releases and ports tree
instead of its bundled ones.

Changes:	http://search.cpan.org/dist/ExtUtils-MakeMaker/Changes
PR:		ports/160759
Submitted by:	Jase Thew <freebsd@beardz.net>

4 files changed, 32 insertions, 33 deletions

diff --git a/devel/p5-ExtUtils-MakeMaker/Makefile b/devel/p5-ExtUtils-MakeMaker/Makefile
index 915427cc6fcc..4d484b732ac8 100644
--- a/devel/p5-ExtUtils-MakeMaker/Makefile
+++ b/devel/p5-ExtUtils-MakeMaker/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ExtUtils-MakeMaker
-PORTVERSION=	6.56
-PORTREVISION=	1
+PORTVERSION=	6.62
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -15,12 +14,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Designed to write a Makefile for an extension module
 
-CONFLICTS=	p5-ExtUtils-Install-[0-9]*
+BUILD_DEPENDS=	p5-CPAN-Meta>=2.112150:${PORTSDIR}/devel/p5-CPAN-Meta
+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 +27,30 @@ MAN3=		ExtUtils::Command.3 ExtUtils::Command::MM.3 ExtUtils::Install.3 \
 		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 <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 501001
+BUILD_DEPENDS+=	p5-ExtUtils-Command>=1.16:${PORTSDIR}/devel/p5-ExtUtils-Command \
+		p5-ExtUtils-Install>=1.52:${PORTSDIR}/devel/p5-ExtUtils-Install
+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
+BUILD_DEPENDS+=	p5-ExtUtils-Manifest>=1.58:${PORTSDIR}/devel/p5-ExtUtils-Manifest \
+		p5-version>=0.88:${PORTSDIR}/devel/p5-version
+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
+	@${REINPLACE_CMD} -e '/EXE_FILES/d; /my::bundles/d' ${WRKSRC}/Makefile.PL
+	@${REINPLACE_CMD} -e '/^bundled\//d' ${WRKSRC}/MANIFEST
+	@${RM} -fr ${WRKSRC}/bundled
 	@[ -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 <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/devel/p5-ExtUtils-MakeMaker/distinfo b/devel/p5-ExtUtils-MakeMaker/distinfo
index 5404c14f64da..f0a63bfff02b 100644
--- a/devel/p5-ExtUtils-MakeMaker/distinfo
+++ b/devel/p5-ExtUtils-MakeMaker/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ExtUtils-MakeMaker-6.56.tar.gz) = 8bb4a911e06204e5f6fb54f55b121bf97150844039238542b66291cda7a444c4
-SIZE (ExtUtils-MakeMaker-6.56.tar.gz) = 269788
+SHA256 (ExtUtils-MakeMaker-6.62.tar.gz) = 63cd6538e4fa1e2425ec24e9b46c1a446e1ddc91f2a54fea7fbdbbf705f35378
+SIZE (ExtUtils-MakeMaker-6.62.tar.gz) = 415020
diff --git a/devel/p5-ExtUtils-MakeMaker/files/patch-Makefile.PL b/devel/p5-ExtUtils-MakeMaker/files/patch-Makefile.PL
deleted file mode 100644
index c80697d24ad7..000000000000
--- a/devel/p5-ExtUtils-MakeMaker/files/patch-Makefile.PL
+++ /dev/null
@@ -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 --git a/devel/p5-ExtUtils-MakeMaker/pkg-plist b/devel/p5-ExtUtils-MakeMaker/pkg-plist
index c12f480c5c7e..c6aa6c4a2bff 100644
--- a/devel/p5-ExtUtils-MakeMaker/pkg-plist
+++ b/devel/p5-ExtUtils-MakeMaker/pkg-plist
@@ -1,16 +1,13 @@
 %%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
 %%SITE_PERL%%/ExtUtils/MM_BeOS.pm
 %%SITE_PERL%%/ExtUtils/MM_Cygwin.pm
-%%SITE_PERL%%/ExtUtils/MM_Darwin.pm
 %%SITE_PERL%%/ExtUtils/MM_DOS.pm
+%%SITE_PERL%%/ExtUtils/MM_Darwin.pm
 %%SITE_PERL%%/ExtUtils/MM_MacOS.pm
 %%SITE_PERL%%/ExtUtils/MM_NW5.pm
 %%SITE_PERL%%/ExtUtils/MM_OS2.pm
@@ -26,16 +23,13 @@
 %%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
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils/MakeMaker
-@dirrmtry %%SITE_PERL%%/ExtUtils/Command
-@dirrmtry %%SITE_PERL%%/ExtUtils/Liblist
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/ExtUtils
+@dirrmtry %%SITE_PERL%%/ExtUtils/MakeMaker
+@dirrmtry %%SITE_PERL%%/ExtUtils/Liblist
+@dirrmtry %%SITE_PERL%%/ExtUtils/Command
 @dirrmtry %%SITE_PERL%%/ExtUtils