(pkgsrc)

 - drop patch-ad, upstream fixed.
(upstream)
 - Update 7.07 to 7.10
   -------------------
7.10 Thu Sep 10 19:38:55 BST 2015

    Bug fixes:
    - Fix an issue with quoting of dist_ci target on Win32

7.08 Tue Sep  8 20:24:15 BST 2015

    This release reverts all the changes since v7.04 until such time
    as the regressions we have found in the "wild" of CPAN can be
    tamed

    ExtUtils::Command has been included in this release as it was
    reincorporated in v7.06

    The following bug fixes have also been included:
    - RT#100268 fix wrong variable being used
    - Check exit status for commands in "make ci" target
    - Fix distsignature dependencies for parallel make
    - The bundled Encode::Locale has been updated to 1.04

4 files changed, 21 insertions, 47 deletions

diff --git a/devel/p5-ExtUtils-MakeMaker/Makefile b/devel/p5-ExtUtils-MakeMaker/Makefile
index 2f2359c0399..546fdfa7f7a 100644
--- a/devel/p5-ExtUtils-MakeMaker/Makefile
+++ b/devel/p5-ExtUtils-MakeMaker/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.36 2015/09/02 12:05:44 mef Exp $
+# $NetBSD: Makefile,v 1.37 2016/01/31 06:45:16 mef Exp $
 
-DISTNAME=	ExtUtils-MakeMaker-7.06
+DISTNAME=	ExtUtils-MakeMaker-7.10
 PKGNAME=	p5-${DISTNAME}
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=../../authors/id/B/BI/BINGOS/}
diff --git a/devel/p5-ExtUtils-MakeMaker/distinfo b/devel/p5-ExtUtils-MakeMaker/distinfo
index bf16c967b57..e0dbb055632 100644
--- a/devel/p5-ExtUtils-MakeMaker/distinfo
+++ b/devel/p5-ExtUtils-MakeMaker/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.22 2015/11/03 03:28:13 agc Exp $
+$NetBSD: distinfo,v 1.23 2016/01/31 06:45:16 mef Exp $
 
-SHA1 (ExtUtils-MakeMaker-7.06.tar.gz) = ebcb64a5dd6a066c74a627b2bd077c65ae3ecf3c
-RMD160 (ExtUtils-MakeMaker-7.06.tar.gz) = 714de8ba79946cdc07defb31b9fb436b800a6973
-SHA512 (ExtUtils-MakeMaker-7.06.tar.gz) = 656b7360d6e153031666e96e4706c1a5d0f22215bb54c29a077d144cf147afe3fd487b2d15fd573eae7da13bb5c62ee7cd069ec2819d484e2aff080aeba910c3
-Size (ExtUtils-MakeMaker-7.06.tar.gz) = 463252 bytes
-SHA1 (patch-ab) = ca366fd17fcb74b11aa15e9e4c5188d29c3538da
-SHA1 (patch-ad) = 0f75388bae10c21ad7c54c36947cd7cb5d45605a
+SHA1 (ExtUtils-MakeMaker-7.10.tar.gz) = f7ca9fc7e3204ddd3989fef4f3f956326ae1ec32
+RMD160 (ExtUtils-MakeMaker-7.10.tar.gz) = 18c69485dc070a8da71a6440bf811ca04c5565e5
+SHA512 (ExtUtils-MakeMaker-7.10.tar.gz) = 217cd01507225975def824b9eb89592dc017794134fd0197253b164674d302f09bde5018e8ea37178fbad805c3551635b1ca37da102fc88d4be08d784f09d774
+Size (ExtUtils-MakeMaker-7.10.tar.gz) = 445464 bytes
+SHA1 (patch-ab) = dda54b01667e68613dea1405973b2683fde4ed23
diff --git a/devel/p5-ExtUtils-MakeMaker/patches/patch-ab b/devel/p5-ExtUtils-MakeMaker/patches/patch-ab
index 2a36185f15c..556df6deacf 100644
--- a/devel/p5-ExtUtils-MakeMaker/patches/patch-ab
+++ b/devel/p5-ExtUtils-MakeMaker/patches/patch-ab
@@ -1,22 +1,22 @@
-$NetBSD: patch-ab,v 1.11 2015/09/02 12:05:44 mef Exp $
+$NetBSD: patch-ab,v 1.12 2016/01/31 06:45:17 mef 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	2015-09-01 02:55:00.000000000 +0900
-+++ lib/ExtUtils/MM_Unix.pm	2015-09-02 20:45:34.000000000 +0900
-@@ -1016,7 +1016,7 @@ sub xs_make_dynamic_lib {
-     push(@m,"	\$(RM_F) \$\@\n");
+--- lib/ExtUtils/MM_Unix.pm.orig	2015-09-11 03:38:38.000000000 +0900
++++ lib/ExtUtils/MM_Unix.pm	2016-01-31 15:35:49.000000000 +0900
+@@ -955,7 +955,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $
  
      my $libs = '$(LDLOADLIBS)';
+ 
 -    if (($Is{NetBSD} || $Is{Interix} || $Is{Android}) && $Config{'useshrplib'} eq 'true') {
-+    if (($Is{BSD} || $Is{Interix} || $Is{Android}) && $Config{'useshrplib'} eq 'true') {
-         # 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
-@@ -2216,7 +2216,7 @@ q{		read "}.File::Spec->catfile('$(PERL_
++    if ((   $Is{BSD} || $Is{Interix} || $Is{Android}) && $Config{'useshrplib'} eq 'true') {
+ 	# 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
+@@ -2130,7 +2130,7 @@ q{		read "}.$self->catfile('$(PERL_ARCHL
  q{		"$(INST_LIB)" "$(DESTINSTALLPRIVLIB)" \
  		"$(INST_ARCHLIB)" "$(DESTINSTALLARCHLIB)" \
  		"$(INST_BIN)" "$(DESTINSTALLBIN)" \
@@ -25,12 +25,12 @@ Changes:
  		"$(INST_MAN1DIR)" "$(DESTINSTALLMAN1DIR)" \
  		"$(INST_MAN3DIR)" "$(DESTINSTALLMAN3DIR)"
  	$(NOECHO) $(WARN_IF_OLD_PACKLIST) \
-@@ -2227,7 +2227,7 @@ pure_site_install :: all
+@@ -2141,7 +2141,7 @@ pure_site_install :: all
  	$(NOECHO) $(MOD_INSTALL) \
  };
      push @m,
--q{		read "}.File::Spec->catfile('$(SITEARCHEXP)','auto','$(FULLEXT)','.packlist').q{" \
+-q{		read "}.$self->catfile('$(SITEARCHEXP)','auto','$(FULLEXT)','.packlist').q{" \
 +q{		read "" \
- 		write "}.File::Spec->catfile('$(DESTINSTALLSITEARCH)','auto','$(FULLEXT)','.packlist').q{" \
+ 		write "}.$self->catfile('$(DESTINSTALLSITEARCH)','auto','$(FULLEXT)','.packlist').q{" \
  } unless $self->{NO_PACKLIST};
  
diff --git a/devel/p5-ExtUtils-MakeMaker/patches/patch-ad b/devel/p5-ExtUtils-MakeMaker/patches/patch-ad
deleted file mode 100644
index fc536fa7cef..00000000000
--- a/devel/p5-ExtUtils-MakeMaker/patches/patch-ad
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ad,v 1.10 2015/09/02 12:05:44 mef Exp $
-
-Perl in pkgsrc doesn't install or tweak perllocal.pod, so comment
-out that test.
-
---- t/INSTALL_BASE.t.orig	2015-03-26 04:29:35.000000000 +0900
-+++ t/INSTALL_BASE.t	2015-09-02 20:50:05.000000000 +0900
-@@ -21,7 +21,7 @@ use Test::More
-     !MM->can_run(make()) && $ENV{PERL_CORE} && $Config{'usecrosscompile'}
-     ? (skip_all => "cross-compiling and make not available")
-     : ();
--plan tests => 4 + $CLEANUP + @INSTDIRS * (15 + $CLEANUP);
-+plan tests => 4 + $CLEANUP + @INSTDIRS * (15 + $CLEANUP) - 4;
- 
- my $Is_VMS = $^O eq 'VMS';
- 
-@@ -71,7 +71,7 @@ for my $instdir (@INSTDIRS) {
-     ("$instdir/lib/perl5/Big/Dummy.pm",
-      "$instdir/lib/perl5/Big/Liar.pm",
-      "$instdir/bin/program",
--     "$instdir/lib/perl5/$Config{archname}/perllocal.pod",
-+     #"$instdir/lib/perl5/$Config{archname}/perllocal.pod",
-      "$instdir/lib/perl5/$Config{archname}/auto/Big/Dummy/.packlist"
-     );
-