 @@ -1,17 +1,19 @@
-# $NetBSD: Makefile,v 1.30 2014/06/25 22:13:47 schmonz Exp $
+# $NetBSD: Makefile,v 1.31 2014/11/09 12:35:56 wiz Exp $
-DISTNAME=	ExtUtils-MakeMaker-6.98
+DISTNAME=	ExtUtils-MakeMaker-7.02
 PKGNAME=	p5-${DISTNAME}
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=../../authors/id/B/BI/BINGOS/}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://metacpan.org/release/ExtUtils-MakeMaker
 COMMENT=	Create a module Makefile
 LICENSE=	${PERL5_LICENSE}
 DEPENDS+=	p5-ExtUtils-Manifest>=1.65:../../devel/p5-ExtUtils-Manifest
 DEPENDS+=	p5-CPAN-Meta-Requirements>=2.127:../../devel/p5-CPAN-Meta-Requirements
 PERL5_PACKLIST=	auto/ExtUtils/MakeMaker/.packlist
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.16 2014/06/25 22:13:47 schmonz Exp $
+$NetBSD: distinfo,v 1.17 2014/11/09 12:35:56 wiz Exp $
-SHA1 (ExtUtils-MakeMaker-6.98.tar.gz) = 5ea75ead31d5ec42b4a592bba6e69e6aca6db1c3
+SHA1 (ExtUtils-MakeMaker-7.02.tar.gz) = 8b8b1552520b6bb3f0ca8ffd6271fdbcb86f301e
-RMD160 (ExtUtils-MakeMaker-6.98.tar.gz) = e449bdd4eb3d58fded2205284cce04c7d83fe3af
+RMD160 (ExtUtils-MakeMaker-7.02.tar.gz) = d8e636c14096cee7267b83ca4393034d51b9dcdd
-Size (ExtUtils-MakeMaker-6.98.tar.gz) = 436258 bytes
+Size (ExtUtils-MakeMaker-7.02.tar.gz) = 439459 bytes
-SHA1 (patch-ab) = ac90541177413101821a46236786e6f05b1cb7e5
+SHA1 (patch-ab) = 8381754ccb5072b18af38dd8765b919208c38350
-SHA1 (patch-ad) = 75cadd7275ad7cc6bf31b8440a867a575f57bc00
+SHA1 (patch-ad) = 8b156ddd6297d2b184e34f4755848ccb78b8af78

 @@ -1,36 +1,36 @@
-$NetBSD: patch-ab,v 1.7 2014/02/16 18:57:17 sno Exp $
+$NetBSD: patch-ab,v 1.8 2014/11/09 12:35:56 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	2014-01-31 20:50:13.000000000 +0000
+--- lib/ExtUtils/MM_Unix.pm.orig	2014-11-08 07:14:47.000000000 +0000
 +++ lib/ExtUtils/MM_Unix.pm
-@@ -934,7 +934,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $
+@@ -953,7 +953,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
-@@ -2087,7 +2087,7 @@ q{		read }.$self->catfile('$(PERL_ARCHLI
+@@ -2128,7 +2128,7 @@ q{		read "}.$self->catfile('$(PERL_ARCHL
- q{		$(INST_LIB) $(DESTINSTALLPRIVLIB) \
+ q{		"$(INST_LIB)" "$(DESTINSTALLPRIVLIB)" \
- 		$(INST_ARCHLIB) $(DESTINSTALLARCHLIB) \
+ 		"$(INST_ARCHLIB)" "$(DESTINSTALLARCHLIB)" \
- 		$(INST_BIN) $(DESTINSTALLBIN) \
+ 		"$(INST_BIN)" "$(DESTINSTALLBIN)" \
--		$(INST_SCRIPT) $(DESTINSTALLSCRIPT) \
+-		"$(INST_SCRIPT)" "$(DESTINSTALLSCRIPT)" \
-+		$(INST_SCRIPT) $(DESTINSTALLSITESCRIPT) \
++		"$(INST_SCRIPT)" "$(DESTINSTALLSITESCRIPT)" \
- 		$(INST_MAN1DIR) $(DESTINSTALLMAN1DIR) \
+ 		"$(INST_MAN1DIR)" "$(DESTINSTALLMAN1DIR)" \
- 		$(INST_MAN3DIR) $(DESTINSTALLMAN3DIR)
+ 		"$(INST_MAN3DIR)" "$(DESTINSTALLMAN3DIR)"
  	$(NOECHO) $(WARN_IF_OLD_PACKLIST) \
-@@ -2098,7 +2098,7 @@ pure_site_install :: all
+@@ -2139,7 +2139,7 @@ pure_site_install :: all
  	$(NOECHO) $(MOD_INSTALL) \
  };
      push @m,
--q{		read }.$self->catfile('$(SITEARCHEXP)','auto','$(FULLEXT)','.packlist').q{ \
+-q{		read "}.$self->catfile('$(SITEARCHEXP)','auto','$(FULLEXT)','.packlist').q{" \
 +q{		read "" \
- 		write }.$self->catfile('$(DESTINSTALLSITEARCH)','auto','$(FULLEXT)','.packlist').q{ \
+ 		write "}.$self->catfile('$(DESTINSTALLSITEARCH)','auto','$(FULLEXT)','.packlist').q{" \
  } unless $self->{NO_PACKLIST};

 @@ -1,25 +1,25 @@
-$NetBSD: patch-ad,v 1.6 2014/02/16 18:57:17 sno Exp $
+$NetBSD: patch-ad,v 1.7 2014/11/09 12:35:56 wiz Exp $
 Perl in pkgsrc doesn't install or tweak perllocal.pod, so comment
 out that test.
---- t/INSTALL_BASE.t.orig	2013-09-12 20:16:09.000000000 +0000
+--- t/INSTALL_BASE.t.orig	2014-11-06 21:39:33.000000000 +0000
 +++ t/INSTALL_BASE.t
-@@ -13,7 +13,7 @@ use Config;
+@@ -20,7 +20,7 @@ use Config;
- use Test::More
+ use ExtUtils::MM;
-     $ENV{PERL_CORE} && $Config{'usecrosscompile'}
+ plan !MM->can_run(make()) && $ENV{PERL_CORE} && $Config{'usecrosscompile'}
-     ? (skip_all => "no toolchain installed when cross-compiling")
+     ? (skip_all => "cross-compiling and make not available")
--    : (tests => 20);
+-    : (tests => 3 + $CLEANUP + @INSTDIRS * (15 + $CLEANUP));
-+    : (tests => 18);
++    : (tests => 3 + $CLEANUP + @INSTDIRS * (15 + $CLEANUP) - 4);
  use MakeMaker::Test::Utils;
  use MakeMaker::Test::Setup::BFD;
-@@ -58,7 +58,7 @@ my @installed_files =
+ my $Is_VMS = $^O eq 'VMS';
    ('../dummy-install/lib/perl5/Big/Dummy.pm',
-    '../dummy-install/lib/perl5/Big/Liar.pm',
+@@ -64,7 +64,7 @@ for my $instdir (@INSTDIRS) {
-    '../dummy-install/bin/program',
+     ("$instdir/lib/perl5/Big/Dummy.pm",
--   "../dummy-install/lib/perl5/$Config{archname}/perllocal.pod",
+      "$instdir/lib/perl5/Big/Liar.pm",
-+#  "../dummy-install/lib/perl5/$Config{archname}/perllocal.pod",
+      "$instdir/bin/program",
-    "../dummy-install/lib/perl5/$Config{archname}/auto/Big/Dummy/.packlist"
+-     "$instdir/lib/perl5/$Config{archname}/perllocal.pod",
-   );
++     #"$instdir/lib/perl5/$Config{archname}/perllocal.pod",
       "$instdir/lib/perl5/$Config{archname}/auto/Big/Dummy/.packlist"
      );