Attachment #118509 for bug #160759




#

PORTNAME=	ExtUtils-MakeMaker
PORTVERSION=	6.59
PORTREVISION=	1
CATEGORIES=	devel perl5
MASTER_SITES=	CPAN
PKGNAMEPREFIX=	p5-

MAINTAINER=	perl@FreeBSD.org
COMMENT=	Designed to write a Makefile for an extension module

RUN_DEPENDS=	p5-CPAN-Meta>=2.112150:${PORTSDIR}/devel/p5-CPAN-Meta

PERL_CONFIGURE=	yes

MAN3=		ExtUtils::Command::MM.3 ExtUtils::Liblist.3 ExtUtils::MM.3 \
		ExtUtils::Installed.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 \

		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::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.post.mk>
.include <bsd.port.mk>

Lines 1-2 Link Here

(-)/usr/ports/devel/p5-ExtUtils-MakeMaker/distinfo (-2 / +2 lines)
1	SHA256 (ExtUtils-MakeMaker-6.56.tar.gz) = 8bb4a911e06204e5f6fb54f55b121bf97150844039238542b66291cda7a444c4	1	SHA256 (ExtUtils-MakeMaker-6.59.tar.gz) = 7e29c8211df46c5fb0223878b87f05cefa4884b9c6d0cafb41fef4e29858903b
2	SIZE (ExtUtils-MakeMaker-6.56.tar.gz) = 269788	2	SIZE (ExtUtils-MakeMaker-6.59.tar.gz) = 413907

Lines 1-11 Link Here

(-)/usr/ports/devel/p5-ExtUtils-MakeMaker/files/patch-Makefile.PL (-11 lines)
1	--- Makefile.PL.orig 2009-01-19 15:12:43.000000000 +0000
2	+++ Makefile.PL 2009-01-19 15:13:44.000000000 +0000
3	@@ -133,6 +133,8 @@
4
5	$self->SUPER::init_PM;
6
7	+ return;
8	+
9	# Only override older versions of modules with ours in inc/
10	for my $inc (grep /^inc/, keys %{$self->{PM}}) {
11	next unless $inc =~ /\.pm$/;




--- 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 => {




%%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/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

Return to bug 160759

Lines 6-13 Link Here

(-)/usr/ports/devel/p5-ExtUtils-MakeMaker/Makefile (-11 / +16 lines)
6	#	6	#
7		7
8	PORTNAME= ExtUtils-MakeMaker	8	PORTNAME= ExtUtils-MakeMaker
9	PORTVERSION= 6.56	9	PORTVERSION= 6.59
10	PORTREVISION= 1
11	CATEGORIES= devel perl5	10	CATEGORIES= devel perl5
12	MASTER_SITES= CPAN	11	MASTER_SITES= CPAN
13	PKGNAMEPREFIX= p5-	12	PKGNAMEPREFIX= p5-
Lines 15-26 Link Here
15	MAINTAINER= perl@FreeBSD.org	14	MAINTAINER= perl@FreeBSD.org
16	COMMENT= Designed to write a Makefile for an extension module	15	COMMENT= Designed to write a Makefile for an extension module
17		16
18	CONFLICTS= p5-ExtUtils-Install-[0-9]*	17	RUN_DEPENDS= p5-CPAN-Meta>=2.112150:${PORTSDIR}/devel/p5-CPAN-Meta
19		18
20	PERL_CONFIGURE= yes	19	PERL_CONFIGURE= yes
21		20
22	MAN3= ExtUtils::Command.3 ExtUtils::Command::MM.3 ExtUtils::Install.3 \	21	MAN3= ExtUtils::Command::MM.3 ExtUtils::Liblist.3 ExtUtils::MM.3 \
23	ExtUtils::Installed.3 ExtUtils::Liblist.3 ExtUtils::MM.3 \
24	ExtUtils::MM_AIX.3 ExtUtils::MM_Any.3 ExtUtils::MM_BeOS.3 \	22	ExtUtils::MM_AIX.3 ExtUtils::MM_Any.3 ExtUtils::MM_BeOS.3 \
25	ExtUtils::MM_Cygwin.3 ExtUtils::MM_DOS.3 ExtUtils::MM_Darwin.3 \	23	ExtUtils::MM_Cygwin.3 ExtUtils::MM_DOS.3 ExtUtils::MM_Darwin.3 \
26	ExtUtils::MM_MacOS.3 ExtUtils::MM_NW5.3 ExtUtils::MM_OS2.3 \	24	ExtUtils::MM_MacOS.3 ExtUtils::MM_NW5.3 ExtUtils::MM_OS2.3 \
Lines 28-40 Link Here
28	ExtUtils::MM_VMS.3 ExtUtils::MM_VOS.3 ExtUtils::MM_Win32.3 \	26	ExtUtils::MM_VMS.3 ExtUtils::MM_VOS.3 ExtUtils::MM_Win32.3 \
29	ExtUtils::MM_Win95.3 ExtUtils::MY.3 ExtUtils::MakeMaker.3 \	27	ExtUtils::MM_Win95.3 ExtUtils::MY.3 ExtUtils::MakeMaker.3 \
30	ExtUtils::MakeMaker::Config.3 ExtUtils::MakeMaker::FAQ.3 \	28	ExtUtils::MakeMaker::Config.3 ExtUtils::MakeMaker::FAQ.3 \
31	ExtUtils::MakeMaker::Tutorial.3 ExtUtils::Manifest.3 \	29	ExtUtils::MakeMaker::Tutorial.3 ExtUtils::Mkbootstrap.3 \
32	ExtUtils::Mkbootstrap.3 ExtUtils::Mksymlists.3 \	30	ExtUtils::Mksymlists.3 ExtUtils::testlib.3
33	ExtUtils::Packlist.3 ExtUtils::testlib.3	31
		32	.include <bsd.port.pre.mk>
		33	.if ${PERL_LEVEL} < 501001
		34	RUN_DEPENDS+= p5-ExtUtils-Command>=1.16:${PORTSDIR}/devel/p5-ExtUtils-Command \
		35	p5-ExtUtils-Install>=1.52:${PORTSDIR}/devel/p5-ExtUtils-Install
		36	.endif
		37	.if ${PERL_LEVEL} < 501400
		38	RUN_DEPENDS+= p5-ExtUtils-Manifest>=1.58:${PORTSDIR}/devel/p5-ExtUtils-Manifest \
		39	p5-version>=0.88:${PORTSDIR}/devel/p5-version
		40	.endif
34		41
35	post-patch:	42	post-patch:
36	@${REINPLACE_CMD} -e '/EXE_FILES/d' ${WRKSRC}/Makefile.PL
37	@[ -e ${LOCALBASE}/lib/perl5/${PERL_VERSION}/mach/CORE/cc_runtime.h ] \|\| \	43	@[ -e ${LOCALBASE}/lib/perl5/${PERL_VERSION}/mach/CORE/cc_runtime.h ] \|\| \
38	${SED} -i '' -e '/cc_runtime.h/d' ${WRKSRC}/lib/ExtUtils/MM_Unix.pm	44	${SED} -i '' -e '/cc_runtime.h/d' ${WRKSRC}/lib/ExtUtils/MM_Unix.pm
39		45	.include <bsd.port.post.mk>
40	.include <bsd.port.mk>

Line 0 Link Here

(-)/usr/ports/devel/p5-ExtUtils-MakeMaker/files/patch-Makefile_PL (+47 lines)
	1	--- Makefile.PL.orig 2011-09-15 18:48:12.106387216 +0100
	2	+++ Makefile.PL 2011-09-15 18:55:42.593935670 +0100
	3	@@ -11,7 +11,6 @@
	4	use strict;
	5
	6	use lib ".";
	7	-use my::bundles; # Must be used before anything else to set up bundled dependencies
	8
	9	use lib qw(lib); # build ourself with ourself
	10
	11	@@ -51,8 +50,6 @@
	12
	13	check_environment();
	14
	15	-my::bundles::copy_bundles("bundled", "inc");
	16	-
	17	my $MM = WriteMakefile(
	18	NAME => $PACKAGE,
	19	VERSION_FROM => "lib/$PACKAGE_FILE.pm", # finds $VERSION
	20	@@ -66,14 +63,12 @@
	21	},
	22
	23	MIN_PERL_VERSION => '5.006',
	24	- PMLIBDIRS => [qw(lib inc)],
	25	- PMLIBPARENTDIRS => [qw(lib inc)], # PMLIBPARENTDIRS is an experimental feature
	26	- EXE_FILES => [qw(bin/instmodsh)],
	27	+ PMLIBDIRS => [qw(lib)],
	28	+ PMLIBPARENTDIRS => [qw(lib)], # PMLIBPARENTDIRS is an experimental feature
	29
	30	META_MERGE => {
	31	no_index => {
	32	package => [ 'DynaLoader', 'in' ], # "in" is a PAUSE misparse.
	33	- directory => [ 'bundled', 'my' ],
	34	},
	35	resources => {
	36	license => 'http://dev.perl.org/licenses/',
	37	@@ -91,10 +86,6 @@
	38	ABSTRACT_FROM => "lib/$PACKAGE_FILE.pm",
	39	AUTHOR => 'Michael G Schwern <schwern@pobox.com>',
	40
	41	- realclean => {
	42	- FILES => "inc"
	43	- },
	44	-
	45	$^O =~ /win/i
	46	? (
	47	dist => {

Lines 1-9 Link Here

(-)/usr/ports/devel/p5-ExtUtils-MakeMaker/pkg-plist (-6 lines)
1	%%SITE_PERL%%/ExtUtils/Command/MM.pm	1	%%SITE_PERL%%/ExtUtils/Command/MM.pm
2	%%SITE_PERL%%/ExtUtils/Install.pm
3	%%SITE_PERL%%/ExtUtils/Installed.pm
4	%%SITE_PERL%%/ExtUtils/Liblist.pm	2	%%SITE_PERL%%/ExtUtils/Liblist.pm
5	%%SITE_PERL%%/ExtUtils/Liblist/Kid.pm	3	%%SITE_PERL%%/ExtUtils/Liblist/Kid.pm
6	%%SITE_PERL%%/ExtUtils/MANIFEST.SKIP
7	%%SITE_PERL%%/ExtUtils/MM.pm	4	%%SITE_PERL%%/ExtUtils/MM.pm
8	%%SITE_PERL%%/ExtUtils/MM_AIX.pm	5	%%SITE_PERL%%/ExtUtils/MM_AIX.pm
9	%%SITE_PERL%%/ExtUtils/MM_Any.pm	6	%%SITE_PERL%%/ExtUtils/MM_Any.pm
Lines 26-36 Link Here
26	%%SITE_PERL%%/ExtUtils/MakeMaker/Config.pm	23	%%SITE_PERL%%/ExtUtils/MakeMaker/Config.pm
27	%%SITE_PERL%%/ExtUtils/MakeMaker/FAQ.pod	24	%%SITE_PERL%%/ExtUtils/MakeMaker/FAQ.pod
28	%%SITE_PERL%%/ExtUtils/MakeMaker/Tutorial.pod	25	%%SITE_PERL%%/ExtUtils/MakeMaker/Tutorial.pod
29	%%SITE_PERL%%/ExtUtils/Manifest.pm
30	%%SITE_PERL%%/ExtUtils/Mkbootstrap.pm	26	%%SITE_PERL%%/ExtUtils/Mkbootstrap.pm
31	%%SITE_PERL%%/ExtUtils/Mksymlists.pm	27	%%SITE_PERL%%/ExtUtils/Mksymlists.pm
32	%%SITE_PERL%%/ExtUtils/Packlist.pm
33	%%SITE_PERL%%/ExtUtils/Command.pm
34	%%SITE_PERL%%/ExtUtils/testlib.pm	28	%%SITE_PERL%%/ExtUtils/testlib.pm
35	%%SITE_PERL%%/%%PERL_ARCH%%/auto//ExtUtils/MakeMaker/.packlist	29	%%SITE_PERL%%/%%PERL_ARCH%%/auto//ExtUtils/MakeMaker/.packlist
36	@dirrm %%SITE_PERL%%/ExtUtils/MakeMaker	30	@dirrm %%SITE_PERL%%/ExtUtils/MakeMaker