From owner-freebsd-perl@FreeBSD.ORG Wed Oct 26 06:30:16 2011 Return-Path: Delivered-To: perl@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 668581065670 for ; Wed, 26 Oct 2011 06:30:16 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 564FE8FC13 for ; Wed, 26 Oct 2011 06:30:16 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p9Q6UG1L085396 for ; Wed, 26 Oct 2011 06:30:16 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p9Q6UFVx085393; Wed, 26 Oct 2011 06:30:16 GMT (envelope-from gnats) Date: Wed, 26 Oct 2011 06:30:16 GMT Message-Id: <201110260630.p9Q6UFVx085393@freefall.freebsd.org> To: perl@FreeBSD.org From: Jase Thew Cc: Subject: Re: ports/160759: [PATCH] devel/p5-ExtUtils-MakeMaker: update to 6.59 X-BeenThere: freebsd-perl@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Jase Thew List-Id: maintainer of a number of perl-related ports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Oct 2011 06:30:16 -0000 The following reply was made to PR ports/160759; it has been noted by GNATS. From: Jase Thew To: bug-followup@FreeBSD.org, freebsd@beardz.net, Michael G Schwern Cc: Subject: Re: ports/160759: [PATCH] devel/p5-ExtUtils-MakeMaker: update to 6.59 Date: Wed, 26 Oct 2011 07:25:54 +0100 This is a multi-part message in MIME format. --------------080702080803040300020409 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Hi, Please find attached an updated patch for devel/p5-ExtUtils-MakeMaker to update it to v6.62. As per the feedback from MSCHWERN, a more elegant approach has been taken in this updated patch to disabling the installation of the bundled dists. The p5-ExtUtils-Install-1.54_1.patch in an earlier post in the PR is still relevant and needs also to be applied/committed. Regards, Jase Thew. --------------080702080803040300020409 Content-Type: text/plain; name="p5-ExtUtils-MakeMaker-6.62.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="p5-ExtUtils-MakeMaker-6.62.patch" 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-10-26 07:04:08.137496924 +0100 @@ -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,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,26 @@ 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 + @${REINPLACE_CMD} -e '/my::bundles::copy_bundles/d' ${WRKSRC}/Makefile.PL + @${REINPLACE_CMD} -e '/^bundled\//d' ${WRKSRC}/MANIFEST + @${RM} -rf ${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 +.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-10-26 07:04:08.136488976 +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.62.tar.gz) = 63cd6538e4fa1e2425ec24e9b46c1a446e1ddc91f2a54fea7fbdbbf705f35378 +SIZE (ExtUtils-MakeMaker-6.62.tar.gz) = 415020 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/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-10-26 07:04:08.136488976 +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 --------------080702080803040300020409--