Update from version 6.48 to 6.48nb1.

Pkgsrc changes:
 o Use UNIVERSAL::isa($val,...) instead of $val->isa, fixes a problem
   which strikes seldom but ends up writing a garbled Makefile
   Corresponds to http://rt.cpan.org/Ticket/Display.html?id=41060
   This adds a dependency on p5-UNIVERSAL-isa.
 o Improve library detection for AIX and possibly others, by not
   insisting on the presence of a *.a archive file.
   Corresponds to http://rt.cpan.org/Public/Bug/Display.html?id=41360
 o Fix the self-tests so that they pass again by borrowing some
   ideas by following pointers from
   http://rt.cpan.org/Public/Bug/Display.html?id=40698
   Expected output now only present with VERBINST=1.

6 files changed, 120 insertions, 9 deletions

diff --git a/devel/p5-ExtUtils-MakeMaker/Makefile b/devel/p5-ExtUtils-MakeMaker/Makefile
index c62fc3a9e99..5978d0a703f 100644
--- a/devel/p5-ExtUtils-MakeMaker/Makefile
+++ b/devel/p5-ExtUtils-MakeMaker/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2008/11/05 23:54:48 he Exp $
+# $NetBSD: Makefile,v 1.9 2008/12/30 15:03:03 he Exp $
 #
 
 DISTNAME=	ExtUtils-MakeMaker-6.48
 PKGNAME=	p5-${DISTNAME}
+PKGREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=ExtUtils/}
 
@@ -10,6 +11,8 @@ 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 cadda03bf0c..186bb500a5d 100644
--- a/devel/p5-ExtUtils-MakeMaker/distinfo
+++ b/devel/p5-ExtUtils-MakeMaker/distinfo
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.4 2008/11/05 23:54:48 he Exp $
+$NetBSD: distinfo,v 1.5 2008/12/30 15:03:03 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) = 90bdd7186c4243458fa1b6c2dae239646848ac37
-SHA1 (patch-ad) = 3544c7d0b22475372d27dfcdc87bd9fd7cecd052
+SHA1 (patch-ac) = aa067d8ddb4ed4660df9d0010f7d57b4253c3855
+SHA1 (patch-ad) = fc99d0b8d16409a21e8f6bd61508d919f3243699
+SHA1 (patch-ae) = 7942bbc3fbbbc21fbea9258bab53492ea4d825a5
+SHA1 (patch-af) = 55829d46d4ec826e6388e063016585d326c8652a
diff --git a/devel/p5-ExtUtils-MakeMaker/patches/patch-ac b/devel/p5-ExtUtils-MakeMaker/patches/patch-ac
index fb67d289db9..6449d6db42b 100644
--- a/devel/p5-ExtUtils-MakeMaker/patches/patch-ac
+++ b/devel/p5-ExtUtils-MakeMaker/patches/patch-ac
@@ -1,8 +1,28 @@
-$NetBSD: patch-ac,v 1.2 2008/07/26 19:11:54 he Exp $
+$NetBSD: patch-ac,v 1.3 2008/12/30 15:03:03 he Exp $
 
---- lib/ExtUtils/MakeMaker.pm.orig	2008-02-29 01:06:55.000000000 +0100
+This corresponds to http://rt.cpan.org/Public/Bug/Display.html?id=41060
+Can't call method "isa" without a package or object reference.
+
+--- lib/ExtUtils/MakeMaker.pm.orig	2008-10-20 20:18:35.000000000 +0200
 +++ lib/ExtUtils/MakeMaker.pm
-@@ -1660,7 +1660,7 @@ If set to 'none', no man pages will be i
+@@ -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 {
+ 
+         my @sigs   = ref $sig ? @$sig : $sig;
+         my $given  = ref $val;
+-        unless( grep { $given eq $_ || ($_ && eval{$val->isa($_)}) } @sigs ) {
++        unless( grep { $given eq $_ || ($_ && eval{UNIVERSAL::isa($val,$_)}) } @sigs ) {
+             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
  =item INSTALLVENDORSCRIPT
  
  Used by 'make install' which copies files from INST_SCRIPT to this
diff --git a/devel/p5-ExtUtils-MakeMaker/patches/patch-ad b/devel/p5-ExtUtils-MakeMaker/patches/patch-ad
index fe5e1ce425e..b3e500e5aec 100644
--- a/devel/p5-ExtUtils-MakeMaker/patches/patch-ad
+++ b/devel/p5-ExtUtils-MakeMaker/patches/patch-ad
@@ -1,9 +1,13 @@
-$NetBSD: patch-ad,v 1.1 2008/07/26 19:11:54 he Exp $
+$NetBSD: patch-ad,v 1.2 2008/12/30 15:03:03 he Exp $
 
 Perl in pkgsrc doesn't install or tweak perllocal.pod, so comment
 out that test.
 
---- t/INSTALL_BASE.t.orig	2008-07-24 09:05:26.000000000 +0200
+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	2008-10-10 04:28:25.000000000 +0200
 +++ t/INSTALL_BASE.t
 @@ -16,7 +16,7 @@ use strict;
  use File::Path;
@@ -14,6 +18,15 @@ out that test.
  use MakeMaker::Test::Utils;
  use MakeMaker::Test::Setup::BFD;
  
+@@ -48,7 +48,7 @@ ok( grep(/^Writing $makefile for Big::Du
+ 
+ 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 );
+ like( $install_out, qr/^Writing /m );
 @@ -59,7 +59,7 @@ my @installed_files = 
    ('../dummy-install/lib/perl5/Big/Dummy.pm',
     '../dummy-install/lib/perl5/Big/Liar.pm',
diff --git a/devel/p5-ExtUtils-MakeMaker/patches/patch-ae b/devel/p5-ExtUtils-MakeMaker/patches/patch-ae
new file mode 100644
index 00000000000..0b858a0a5f3
--- /dev/null
+++ b/devel/p5-ExtUtils-MakeMaker/patches/patch-ae
@@ -0,0 +1,29 @@
+$NetBSD: patch-ae,v 1.1 2008/12/30 15:03:03 he Exp $
+
+Fix for AIX (and possibly others), so that shared libraries will
+be found even if there is no corresponding archive library file
+present, as is the case with the SAP AG libraries.  Ref.
+http://rt.cpan.org/Public/Bug/Display.html?id=41360
+
+--- lib/ExtUtils/Liblist/Kid.pm.orig	2008-10-20 20:18:35.000000000 +0200
++++ lib/ExtUtils/Liblist/Kid.pm	2008-12-01 20:56:29.000000000 +0100
+@@ -39,6 +39,7 @@
+     my($so)   = $Config{so};
+     my($libs) = defined $Config{perllibs} ? $Config{perllibs} : $Config{libs};
+     my $Config_libext = $Config{lib_ext} || ".a";
++    my $Config_dlext = $Config{dlext};
+ 
+ 
+     # compute $extralibs, $bsloadlibs and $ldloadlibs from
+@@ -130,8 +131,10 @@
+                  && ($Config{'archname'} !~ /RM\d\d\d-svr4/)
+ 		 && ($thislib .= "_s") ){ # we must explicitly use _s version
+ 	    } elsif (-f ($fullname="$thispth/lib$thislib$Config_libext")){
++	    } elsif (defined($Config_dlext)
++                 && -f ($fullname="$thispth/lib$thislib.$Config_dlext")){
+ 	    } elsif (-f ($fullname="$thispth/$thislib$Config_libext")){
+-            } elsif (-f ($fullname="$thispth/lib$thislib.dll$Config_libext")){
++	    } elsif (-f ($fullname="$thispth/lib$thislib.dll$Config_libext")){
+ 	    } elsif (-f ($fullname="$thispth/Slib$thislib$Config_libext")){
+ 	    } elsif ($^O eq 'dgux'
+ 		 && -l ($fullname="$thispth/lib$thislib$Config_libext")
diff --git a/devel/p5-ExtUtils-MakeMaker/patches/patch-af b/devel/p5-ExtUtils-MakeMaker/patches/patch-af
new file mode 100644
index 00000000000..d1aa87e61d5
--- /dev/null
+++ b/devel/p5-ExtUtils-MakeMaker/patches/patch-af
@@ -0,0 +1,44 @@
+$NetBSD: patch-af,v 1.1 2008/12/30 15:03:03 he Exp $
+
+Fix culled from following references in
+http://rt.cpan.org/Public/Bug/Display.html?id=40698
+Expected output is now only present when VERBINST=1.
+
+--- t/basic.t.orig	2008-10-10 04:28:25.000000000 +0200
++++ t/basic.t
+@@ -130,7 +130,7 @@ is( $?, 0,                              
+     diag $test_out;
+ 
+ 
+-my $install_out = run("$make install");
++my $install_out = run("$make install VERBINST=1");
+ is( $?, 0, 'install' ) || diag $install_out;
+ like( $install_out, qr/^Installing /m );
+ like( $install_out, qr/^Writing /m );
+@@ -156,7 +156,7 @@ ok( $files{'perllocal.pod'},'  perllocal
+ SKIP: {
+     skip 'VMS install targets do not preserve $(PREFIX)', 9 if $Is_VMS;
+ 
+-    $install_out = run("$make install PREFIX=elsewhere");
++    $install_out = run("$make install VERBINST=1 PREFIX=elsewhere");
+     is( $?, 0, 'install with PREFIX override' ) || diag $install_out;
+     like( $install_out, qr/^Installing /m );
+     like( $install_out, qr/^Writing /m );
+@@ -176,7 +176,7 @@ SKIP: {
+ SKIP: {
+     skip 'VMS install targets do not preserve $(DESTDIR)', 11 if $Is_VMS;
+ 
+-    $install_out = run("$make install PREFIX= DESTDIR=other");
++    $install_out = run("$make install VERBINST=1 PREFIX= DESTDIR=other");
+     is( $?, 0, 'install with DESTDIR' ) || 
+         diag $install_out;
+     like( $install_out, qr/^Installing /m );
+@@ -217,7 +217,7 @@ SKIP: {
+ SKIP: {
+     skip 'VMS install targets do not preserve $(PREFIX)', 10 if $Is_VMS;
+ 
+-    $install_out = run("$make install PREFIX=elsewhere DESTDIR=other/");
++    $install_out = run("$make install VERBINST=1 PREFIX=elsewhere DESTDIR=other/");
+     is( $?, 0, 'install with PREFIX override and DESTDIR' ) || 
+         diag $install_out;
+     like( $install_out, qr/^Installing /m );