Update from version 6.48nb1 to 6.48nb2.

Pkgsrc changes:
 o Based on private feedback in PR#40292, drop the dependency on
   p5-UNIVERSAL-isa.
 o Add some comments to some of the patch files.

4 files changed, 15 insertions, 19 deletions

diff --git a/devel/p5-ExtUtils-MakeMaker/Makefile b/devel/p5-ExtUtils-MakeMaker/Makefile
index 5978d0a703f..293d91cae1c 100644
--- a/devel/p5-ExtUtils-MakeMaker/Makefile
+++ b/devel/p5-ExtUtils-MakeMaker/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2008/12/30 15:03:03 he Exp $
+# $NetBSD: Makefile,v 1.10 2009/01/05 12:15:16 he Exp $
 #
 
 DISTNAME=	ExtUtils-MakeMaker-6.48
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=ExtUtils/}
 
@@ -11,8 +11,6 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://search.cpan.org/dist/ExtUtils-MakeMaker/
 COMMENT=	Write a Makefile for an extension module from a Makefile.PL
 
-DEPENDS+=	p5-UNIVERSAL-isa>=0:../../devel/p5-UNIVERSAL-isa
-
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
 
diff --git a/devel/p5-ExtUtils-MakeMaker/distinfo b/devel/p5-ExtUtils-MakeMaker/distinfo
index 186bb500a5d..d33fcac4dd4 100644
--- a/devel/p5-ExtUtils-MakeMaker/distinfo
+++ b/devel/p5-ExtUtils-MakeMaker/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.5 2008/12/30 15:03:03 he Exp $
+$NetBSD: distinfo,v 1.6 2009/01/05 12:15:17 he Exp $
 
 SHA1 (ExtUtils-MakeMaker-6.48.tar.gz) = 5e030b73e1d4a0542d1454969e6371909b67b963
 RMD160 (ExtUtils-MakeMaker-6.48.tar.gz) = f44ac9ab923615a1877d45e8d330f0761d837785
 Size (ExtUtils-MakeMaker-6.48.tar.gz) = 254397 bytes
-SHA1 (patch-ab) = 269b92cf309651f3ad6702b8ab3de0b8c13813df
-SHA1 (patch-ac) = aa067d8ddb4ed4660df9d0010f7d57b4253c3855
+SHA1 (patch-ab) = d4d4d44518643c1649a6f6fa845615e24d0d8732
+SHA1 (patch-ac) = c6755b2f0ecfe12987c662d2ce384f5a190e4a37
 SHA1 (patch-ad) = fc99d0b8d16409a21e8f6bd61508d919f3243699
 SHA1 (patch-ae) = 7942bbc3fbbbc21fbea9258bab53492ea4d825a5
 SHA1 (patch-af) = 55829d46d4ec826e6388e063016585d326c8652a
diff --git a/devel/p5-ExtUtils-MakeMaker/patches/patch-ab b/devel/p5-ExtUtils-MakeMaker/patches/patch-ab
index 9602465d729..539a81b3af1 100644
--- a/devel/p5-ExtUtils-MakeMaker/patches/patch-ab
+++ b/devel/p5-ExtUtils-MakeMaker/patches/patch-ab
@@ -1,4 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2008/07/26 19:11:54 he Exp $
+$NetBSD: patch-ab,v 1.3 2009/01/05 12:15:17 he Exp $
+
+Changes:
+ o More general adaptation for BSDs
+ o Install scripts in DESTINSTALLSITESCRIPT instead of DESTINSTALLSCRIPT
 
 --- lib/ExtUtils/MM_Unix.pm.orig	2008-02-29 01:06:28.000000000 +0100
 +++ lib/ExtUtils/MM_Unix.pm
diff --git a/devel/p5-ExtUtils-MakeMaker/patches/patch-ac b/devel/p5-ExtUtils-MakeMaker/patches/patch-ac
index 6449d6db42b..00b10fcd292 100644
--- a/devel/p5-ExtUtils-MakeMaker/patches/patch-ac
+++ b/devel/p5-ExtUtils-MakeMaker/patches/patch-ac
@@ -1,19 +1,13 @@
-$NetBSD: patch-ac,v 1.3 2008/12/30 15:03:03 he Exp $
+$NetBSD: patch-ac,v 1.4 2009/01/05 12:15:17 he Exp $
 
 This corresponds to http://rt.cpan.org/Public/Bug/Display.html?id=41060
 Can't call method "isa" without a package or object reference.
 
+Also correct a grammar error (duplication).
+
 --- lib/ExtUtils/MakeMaker.pm.orig	2008-10-20 20:18:35.000000000 +0200
 +++ lib/ExtUtils/MakeMaker.pm
-@@ -9,6 +9,7 @@ require Exporter;
- use ExtUtils::MakeMaker::Config;
- use Carp ();
- use File::Path;
-+use UNIVERSAL::isa;
- 
- our $Verbose = 0;       # exported
- our @Parent;            # needs to be localized
-@@ -122,7 +123,7 @@ sub _verify_att {
+@@ -122,7 +122,7 @@ sub _verify_att {
  
          my @sigs   = ref $sig ? @$sig : $sig;
          my $given  = ref $val;
@@ -22,7 +16,7 @@ Can't call method "isa" without a package or object reference.
              my $takes = join " or ", map { _format_att($_) } @sigs;
  
              my $has = _format_att($given);
-@@ -1708,7 +1709,7 @@ If set to 'none', no man pages will be i
+@@ -1708,7 +1708,7 @@ If set to 'none', no man pages will be i
  =item INSTALLVENDORSCRIPT
  
  Used by 'make install' which copies files from INST_SCRIPT to this