From freebsd@beardz.net  Fri Sep 16 04:28:54 2011
Return-Path: <freebsd@beardz.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1B7461065673;
	Fri, 16 Sep 2011 04:28:54 +0000 (UTC)
	(envelope-from freebsd@beardz.net)
Received: from beardz.net (beardz.net [IPv6:2a01:4f8:121:2403:1::])
	by mx1.freebsd.org (Postfix) with ESMTP id A760B8FC16;
	Fri, 16 Sep 2011 04:28:53 +0000 (UTC)
Received: from beardz.net (localhost [127.0.1.7])
	by beardz.net (8.14.4/8.14.4) with ESMTP id p8G4SpZb000389;
	Fri, 16 Sep 2011 05:28:51 +0100 (BST)
	(envelope-from freebsd@beardz.net)
Received: (from root@localhost)
	by beardz.net (8.14.4/8.14.4/Submit) id p8G4Soxa000378;
	Fri, 16 Sep 2011 05:28:50 +0100 (BST)
	(envelope-from freebsd@beardz.net)
Message-Id: <201109160428.p8G4Soxa000378@beardz.net>
Date: Fri, 16 Sep 2011 05:28:50 +0100 (BST)
From: Jase Thew <freebsd@beardz.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc: perl@freebsd.org
Subject: [PATCH] devel/p5-ExtUtils-MakeMaker: update to 6.59
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         160759
>Category:       ports
>Synopsis:       [PATCH] devel/p5-ExtUtils-MakeMaker: update to 6.59
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    sunpoet
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Sep 16 04:30:13 UTC 2011
>Closed-Date:    Mon Dec 12 16:43:08 UTC 2011
>Last-Modified:  Mon Dec 12 16:43:08 UTC 2011
>Originator:     Jase Thew
>Release:        FreeBSD 8.2-STABLE amd64
>Organization:
>Environment:
System: FreeBSD jail-ports.localdomain 8.2-STABLE FreeBSD 8.2-STABLE #0: Sat Apr  2 19:17:15 BST
>Description:
For devel/p5-ExtUtils-MakeMaker:
- Update to 6.59
- Remove unnecessary CONFLICTS with devel/p5-ExtUtils-Install
- Do not install any bundled dependancy modules. Instead, satisfy run-time dependancies
  using p5- ports. This alleviates the problem of having conflicting files
  with devel/p5-ExtUtils-Install.
  Recommended practice as per author's SPECIAL NOTE TO PACKAGERS at
  http://cpansearch.perl.org/src/MSTROUT/ExtUtils-MakeMaker-6.59/INSTALL

Added file(s):
- files/patch-Makefile_PL

Removed file(s):
- files/patch-Makefile.PL


For devel/p5-ExtUtils-Install:
- Remove unnecessary CONFLICTS with devel/p5-ExtUtils-MakeMaker

Port maintainer (perl@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->perl 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Fri Sep 16 04:30:31 UTC 2011 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=160759 

From: Jase Thew <freebsd@beardz.net>
To: bug-followup@FreeBSD.org, freebsd@beardz.net
Cc:  
Subject: Re: ports/160759: [PATCH] devel/p5-ExtUtils-MakeMaker: update to
 6.59
Date: Fri, 16 Sep 2011 06:19:44 +0100

 This is a multi-part message in MIME format.
 --------------080601010701000507080401
 Content-Type: text/plain; charset=ISO-8859-1; format=flowed
 Content-Transfer-Encoding: 7bit
 
 Sorry, the patches seem to have gone awol in the original PR submission. 
 Please find them attached now.
 
 --------------080601010701000507080401
 Content-Type: text/plain;
  name="p5-ExtUtils-MakeMaker-6.59.patch"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="p5-ExtUtils-MakeMaker-6.59.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-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 <bsd.port.pre.mk>
 +.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 <bsd.port.mk>
 +.include <bsd.port.post.mk>
 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 <schwern@pobox.com>',
 + 
 +-    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
 
 --------------080601010701000507080401
 Content-Type: text/plain;
  name="p5-ExtUtils-Install-1.54_1.patch"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="p5-ExtUtils-Install-1.54_1.patch"
 
 diff -ruN --exclude=CVS /usr/ports/devel/p5-ExtUtils-Install.orig/Makefile /usr/ports/devel/p5-ExtUtils-Install/Makefile
 --- /usr/ports/devel/p5-ExtUtils-Install.orig/Makefile	2011-06-28 19:31:34.000000000 +0100
 +++ /usr/ports/devel/p5-ExtUtils-Install/Makefile	2011-09-16 05:05:28.239241345 +0100
 @@ -15,8 +15,6 @@
  MAINTAINER=	kuriyama@FreeBSD.org
  COMMENT=	Perl extension to install files from here to there
  
 -CONFLICTS=	p5-ExtUtils-MakeMaker-[0-9]*
 -
  PERL_CONFIGURE=	yes
  
  MAN3=	ExtUtils::Install.3 \
 
 --------------080601010701000507080401--

From: Michael G Schwern <schwern@pobox.com>
To: bug-followup@FreeBSD.org, freebsd@beardz.net
Cc:  
Subject: Re: ports/160759: [PATCH] devel/p5-ExtUtils-MakeMaker: update to
 6.59
Date: Tue, 25 Oct 2011 12:33:14 -0700

 Hi,
 
 I maintain ExtUtils::MakeMaker.  This patch is a correct solution to the
 conflict between ExtUtils::MakeMaker and ExtUtils::Install.  MakeMaker is
 supposed to depend on ExtUtils::Install, but to do so normally would introduce
 a dependency loop.
 
 A less invasive solution would be to delete the contents of bundled.  Make
 sure the bundled dependencies are marked as package dependencies.
 
 PS  If there is some sort of environment variable FreeBSD sets while creating
 a package, I could have MakeMaker watch for that.  It would not use the
 bundled versions and instead declare them as dependencies.
 
 Thanks,
 Schwern

From: Jase Thew <freebsd@beardz.net>
To: bug-followup@FreeBSD.org, freebsd@beardz.net, 
 Michael G Schwern <schwern@pobox.com>
Cc:  
Subject: Re: ports/160759: [PATCH] devel/p5-ExtUtils-MakeMaker: update to
 6.59
Date: Tue, 25 Oct 2011 23:21:13 +0100

 This is a multi-part message in MIME format.
 --------------020206010404070208010001
 Content-Type: text/plain; charset=ISO-8859-1; format=flowed
 Content-Transfer-Encoding: 7bit
 
 Hi Schwern,
 
 When I started on this patch, I initially took the less invasive route 
 you mentioned (deleting contents of bundled/). However, this resulted in 
 lots of unnecessary warnings in the "Checking if your kit is 
 complete..." stage (please see attached log).
 
 As these warnings would be displayed every time the port is built, I 
 elected for the more radical approach of patching out support for the 
 bundled dists completely.
 
 With regards to your question regarding identifying FreeBSD, the ports 
 make framework defines OPSYS as "FreeBSD" (minus the quotes) and should 
 be available as an envvar in Makefile.PL
 
 Regards,
 
 jaset.
 
 
 --------------020206010404070208010001
 Content-Type: text/plain;
  name="p5-ExtUtils-MakeMaker-6.59-warnings.txt"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="p5-ExtUtils-MakeMaker-6.59-warnings.txt"
 
 ===>   p5-ExtUtils-MakeMaker-6.59 depends on file: /usr/local/bin/perl5.14.1 - found
 ===>  Configuring for p5-ExtUtils-MakeMaker-6.59
 Checking if your kit is complete...
 Warning: the following files are missing in your kit:
         bundled/CPAN-Meta-YAML/CPAN/Meta/YAML.pm
         bundled/CPAN-Meta/CPAN/Meta.pm
         bundled/CPAN-Meta/CPAN/Meta/Converter.pm
         bundled/CPAN-Meta/CPAN/Meta/Feature.pm
         bundled/CPAN-Meta/CPAN/Meta/History.pm
         bundled/CPAN-Meta/CPAN/Meta/Prereqs.pm
         bundled/CPAN-Meta/CPAN/Meta/Spec.pm
         bundled/CPAN-Meta/CPAN/Meta/Validator.pm
         bundled/ExtUtils-Command/ExtUtils/Command.pm
         bundled/ExtUtils-Install/ExtUtils/Install.pm
         bundled/ExtUtils-Install/ExtUtils/Installed.pm
         bundled/ExtUtils-Install/ExtUtils/Packlist.pm
         bundled/ExtUtils-Manifest/ExtUtils/Manifest.pm
         bundled/ExtUtils-Manifest/ExtUtils/MANIFEST.SKIP
         bundled/File-Copy-Recursive/File/Copy/Recursive.pm
         bundled/File-Temp/File/Temp.pm
         bundled/JSON-PP-Compat5006/JSON/PP/Compat5006.pm
         bundled/JSON-PP/JSON/PP.pm
         bundled/JSON-PP/JSON/PP/Boolean.pm
         bundled/Parse-CPAN-Meta/Parse/CPAN/Meta.pm
         bundled/Scalar-List-Utils/List/Util.pm
         bundled/Scalar-List-Utils/List/Util/PP.pm
         bundled/Scalar-List-Utils/Scalar/Util.pm
         bundled/Scalar-List-Utils/Scalar/Util/PP.pm
         bundled/Version-Requirements/Version/Requirements.pm
         bundled/version/version.pm
         bundled/version/version.pod
         bundled/version/version/Internals.pod
         bundled/version/version/vpp.pm
 Please inform the author.
 Writing Makefile for ExtUtils::MakeMaker
 Writing MYMETA.yml and MYMETA.json
 ===>  Building for p5-ExtUtils-MakeMaker-6.59
 [SNIP]
 
 --------------020206010404070208010001--

From: Michael G Schwern <schwern@pobox.com>
To: Jase Thew <freebsd@beardz.net>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/160759: [PATCH] devel/p5-ExtUtils-MakeMaker: update to
 6.59
Date: Tue, 25 Oct 2011 15:55:55 -0700

 On 2011.10.25 3:21 PM, Jase Thew wrote:
 > When I started on this patch, I initially took the less invasive route you
 > mentioned (deleting contents of bundled/). However, this resulted in lots of
 > unnecessary warnings in the "Checking if your kit is complete..." stage
 > (please see attached log).
 
 Remove all the bundled/* lines from the MANIFEST.  That should do it and it's
 safe.
 
 
 > With regards to your question regarding identifying FreeBSD, the ports make
 > framework defines OPSYS as "FreeBSD" (minus the quotes) and should be
 > available as an envvar in Makefile.PL
 
 Ok, thanks.  I'll see about adding that in.
 
 
 -- 
 52. Not allowed to yell "Take that Cobra" at the rifle range.
     -- The 213 Things Skippy Is No Longer Allowed To Do In The U.S. Army
            http://skippyslist.com/list/
 

From: Jase Thew <freebsd@beardz.net>
To: bug-followup@FreeBSD.org, freebsd@beardz.net, 
 Michael G Schwern <schwern@pobox.com>
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 <bsd.port.pre.mk>
 +
 +.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 <bsd.port.mk>
 +.include <bsd.port.post.mk>
 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--
Responsible-Changed-From-To: perl->sunpoet 
Responsible-Changed-By: sunpoet 
Responsible-Changed-When: Thu Dec 8 15:26:36 UTC 2011 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=160759 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/160759: commit references a PR
Date: Mon, 12 Dec 2011 16:25:52 +0000 (UTC)

 sunpoet     2011-12-12 16:25:42 UTC
 
   FreeBSD ports repository
 
   Modified files:
     devel/p5-ExtUtils-MakeMaker Makefile distinfo pkg-plist 
   Removed files:
     devel/p5-ExtUtils-MakeMaker/files patch-Makefile.PL 
   Log:
   - 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>
   
   Revision  Changes    Path
   1.24      +26 -10    ports/devel/p5-ExtUtils-MakeMaker/Makefile
   1.18      +2 -2      ports/devel/p5-ExtUtils-MakeMaker/distinfo
   1.2       +0 -11     ports/devel/p5-ExtUtils-MakeMaker/files/patch-Makefile.PL (dead)
   1.11      +4 -10     ports/devel/p5-ExtUtils-MakeMaker/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: sunpoet 
State-Changed-When: Mon Dec 12 16:43:07 UTC 2011 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=160759 
>Unformatted:
