Update to 6.84:

4 files changed, 21 insertions, 44 deletions

diff --git a/devel/p5-ExtUtils-MakeMaker/Makefile b/devel/p5-ExtUtils-MakeMaker/Makefile
index f28a344690b..0ce99f6e295 100644
--- a/devel/p5-ExtUtils-MakeMaker/Makefile
+++ b/devel/p5-ExtUtils-MakeMaker/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2013/05/31 12:40:18 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2013/12/01 09:05:03 wiz Exp $
 
-DISTNAME=	ExtUtils-MakeMaker-6.62
+DISTNAME=	ExtUtils-MakeMaker-6.84
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=ExtUtils/}
 
diff --git a/devel/p5-ExtUtils-MakeMaker/distinfo b/devel/p5-ExtUtils-MakeMaker/distinfo
index fd561ab79fc..8ea1514654b 100644
--- a/devel/p5-ExtUtils-MakeMaker/distinfo
+++ b/devel/p5-ExtUtils-MakeMaker/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.13 2012/03/22 13:37:34 sno Exp $
+$NetBSD: distinfo,v 1.14 2013/12/01 09:05:03 wiz Exp $
 
-SHA1 (ExtUtils-MakeMaker-6.62.tar.gz) = a32a31854f787bf0410436bfa04ab542925dadeb
-RMD160 (ExtUtils-MakeMaker-6.62.tar.gz) = c0fe174fa9301ddd8cb096d19d4ba69310147754
-Size (ExtUtils-MakeMaker-6.62.tar.gz) = 415020 bytes
-SHA1 (patch-ab) = 40a76f3ab194722e35d47ebc72dc656868079e2e
-SHA1 (patch-ad) = f0c1e23d3342b37805f29f2853de2f24b194d0a0
+SHA1 (ExtUtils-MakeMaker-6.84.tar.gz) = fb7f1b44aa124c59c66e702820fa43b0ea3e8ab9
+RMD160 (ExtUtils-MakeMaker-6.84.tar.gz) = db05cd7e9f1a8870826c4dafbbeab8b42c1daf34
+Size (ExtUtils-MakeMaker-6.84.tar.gz) = 434571 bytes
+SHA1 (patch-ab) = 6831fcc704b840751bc4249d804ce887a18261d5
+SHA1 (patch-ad) = c64b576f49bb821fb4b40bccfe39ca4ae77877bd
diff --git a/devel/p5-ExtUtils-MakeMaker/patches/patch-ab b/devel/p5-ExtUtils-MakeMaker/patches/patch-ab
index debe799c040..d2367d860dd 100644
--- a/devel/p5-ExtUtils-MakeMaker/patches/patch-ab
+++ b/devel/p5-ExtUtils-MakeMaker/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.5 2011/12/08 22:44:24 hiramatsu Exp $
+$NetBSD: patch-ab,v 1.6 2013/12/01 09:05:03 wiz Exp $
 
 Changes:
  o More general adaptation for BSDs
  o Install scripts in DESTINSTALLSITESCRIPT instead of DESTINSTALLSCRIPT
  o Ignore installed packlist when creating new packlist.
 
---- lib/ExtUtils/MM_Unix.pm.orig	2011-08-05 11:13:10.000000000 +0000
+--- lib/ExtUtils/MM_Unix.pm.orig	2013-11-30 15:23:42.000000000 +0000
 +++ lib/ExtUtils/MM_Unix.pm
-@@ -932,7 +932,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $
+@@ -933,7 +933,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $
  
      my $libs = '$(LDLOADLIBS)';
  
@@ -16,8 +16,8 @@ Changes:
  	# Use nothing on static perl platforms, and to the flags needed
  	# to link against the shared libperl library on shared perl
  	# platforms.  We peek at lddlflags to see if we need -Wl,-R
-@@ -2060,7 +2060,7 @@ pure_perl_install :: all
- 		$(INST_LIB) $(DESTINSTALLPRIVLIB) \
+@@ -2080,7 +2080,7 @@ q{		read }.$self->catfile('$(PERL_ARCHLI
+ q{		$(INST_LIB) $(DESTINSTALLPRIVLIB) \
  		$(INST_ARCHLIB) $(DESTINSTALLARCHLIB) \
  		$(INST_BIN) $(DESTINSTALLBIN) \
 -		$(INST_SCRIPT) $(DESTINSTALLSCRIPT) \
@@ -25,12 +25,12 @@ Changes:
  		$(INST_MAN1DIR) $(DESTINSTALLMAN1DIR) \
  		$(INST_MAN3DIR) $(DESTINSTALLMAN3DIR)
  	$(NOECHO) $(WARN_IF_OLD_PACKLIST) \
-@@ -2082,7 +2082,7 @@ pure_site_install :: all
- 
- pure_vendor_install :: all
+@@ -2109,7 +2109,7 @@ pure_vendor_install :: all
  	$(NOECHO) $(MOD_INSTALL) \
--		read }.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{ \
-+		read "" \
+ };
+     push @m,
+-q{		read }.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{ \
++q{		read "" \
  		write }.$self->catfile('$(DESTINSTALLVENDORARCH)','auto','$(FULLEXT)','.packlist').q{ \
- 		$(INST_LIB) $(DESTINSTALLVENDORLIB) \
- 		$(INST_ARCHLIB) $(DESTINSTALLVENDORARCH) \
+ } unless $self->{NO_PACKLIST};
+ 
diff --git a/devel/p5-ExtUtils-MakeMaker/patches/patch-ad b/devel/p5-ExtUtils-MakeMaker/patches/patch-ad
index e353f999c50..a0b4be42746 100644
--- a/devel/p5-ExtUtils-MakeMaker/patches/patch-ad
+++ b/devel/p5-ExtUtils-MakeMaker/patches/patch-ad
@@ -1,32 +1,10 @@
-$NetBSD: patch-ad,v 1.4 2011/08/10 12:01:13 adam Exp $
+$NetBSD: patch-ad,v 1.5 2013/12/01 09:05:03 wiz Exp $
 
 Perl in pkgsrc doesn't install or tweak perllocal.pod, so comment
 out that test.
 
-Also apply fix to test culled by following references from
-http://rt.cpan.org/Public/Bug/Display.html?id=40698
-Expected output is now only present when VERBINST=1.
-
 --- t/INSTALL_BASE.t.orig	2009-02-20 00:30:32.000000000 +0000
 +++ t/INSTALL_BASE.t	2009-04-12 00:49:30.000000000 +0000
-@@ -10,7 +10,7 @@
- use File::Path;
- use Config;
- 
--use Test::More tests => 20;
-+use Test::More tests => 18;
- use MakeMaker::Test::Utils;
- use MakeMaker::Test::Setup::BFD;
- 
-@@ -42,7 +42,7 @@
- 
- my $make = make_run();
- run("$make");   # this is necessary due to a dmake bug.
--my $install_out = run("$make install");
-+my $install_out = run("$make install VERBINST=1");
- is( $?, 0, '  make install exited normally' ) || diag $install_out;
- like( $install_out, qr/^Installing /m );
- 
 @@ -52,7 +52,7 @@
    ('../dummy-install/lib/perl5/Big/Dummy.pm',
     '../dummy-install/lib/perl5/Big/Liar.pm',