Update from version 6.30 to 6.44.

Update discussed in general terms with jlam@.

Pkgsrc changes:
 o Some of our changes appear to have been adopted upstream,
   so patch-aa is gone and other diffs are reduced in size.
 o We don't install or tweak perllocal.pod, so comment out
   the testing of it being installed in the selftests.

Upstream changes:
6.44  Thu Feb 28 16:06:04 PST 2008
    Bug Fixes
    * Updated bundled ExtUtils::Install to 1.45 which should fix some
      Cygwin issues. [rt.cpan.org 33291]


6.43_01  Tue Jan  1 16:06:47 PST 2008
    Bug Fixes
    * Change the "is this really a Perl core library directory" checks to
      look for strict instead of Exporter.  Now that Exporter is on CPAN
      it can wind up in site_perl.
    * split_command() will now set aside a little more space for macro
      expansion.  This should help on systems with cramped command line
      lengths.  Specifically, Pugs on Win32.  [rt.cpan.org 20145]

    Installation
    * MakeMaker would not install if the installed MakeMaker was too old,
      like on 5.6.1.  The installation process was still using the
      installed MakeMaker in a few places.  This has been fixed.
      [rt.cpan.org 24746]

    OS X
    * "make dist" will no longer bundle up resource fork files (._foo).
      [rt.cpan.org 29525]

    Docs
    * The documentation of VERSION_FROM was recommending vstrings (1.2.3)
      which have never worked right.
    * The documentation for the accepted values of LICENSE moved to
      Module::Build::API. [rt.cpan.org 32020]

    Tests
    * The compilation test was testing the installed modules, not the
      about-to-be-installed.
    * xs.t would fail if ExtUtils::CBuilder was not installed.

    Misc
    * Cleanups brought to you by no more 5.5 compatibility!
    * MakeMaker is now perlcritic clean at severity level 5... except
      the really silly ones.
    * DIE use vars DIE!
    * Added some resources to the META.yml

6.42  Fri Dec  7 17:00:14 PST 2007
    Bug Fixes
    - 6.33 moved PREREQ_FATAL to happen after CONFIGURE.  This meant if
      your CONFIGURE use a prereq it would fail and no PREREQ_FATAL
      message would be displayed.
    - Put the "nicetext" functionality back, VMS needs it to deal with
      other people's custom make.  But rename it to the more
      accurate maketext_filter(), test it and fix a bug where it would
      stop processing if it saw a macro declaration.

6.40  Thu Dec  6 03:00:47 PST 2007
    Bug Fixes
    - Remove the dubious nicetext() Makefile formatting hack to account for
      a lack of space between the target and colon needed on VMS.  This
      interfered with META.yml creation on VMS and possibly other output.
    - Fix the remaining targets which don't have a space between the target
      and the colon.

6.38  Wed Nov 28 16:01:12 PST 2007
    Releasing 6.37_03 as 6.38.

6.37_03  Mon Nov 26 14:15:34 PST 2007
    Tests
    - parse_version.t had wrong test count when version.pm isn't installed.
    - Fixed some warnings in the XS module we're using for testing.
    - "our $VERSION" test in parse_version.t was never running
    - Quoting uses of 1.2.3 style versions in parse_version.t to protect
      older perls.

    Portability
    - Moved the minimum required version up to 5.6.0.

6.37_02  Sun Nov 25 23:33:14 PST 2007
    Test Improvements
    - Added a test for a basic XS build.

    Bug Fixes
    - A refactoring in 6.37_01 broke XS compilation.

6.37_01  Sun Nov 25 17:05:53 PST 2007
    Improvements
    - Upgraded the META.yml to version 1.3 of the spec (which really
      doesn't change anything).  Thanks bdfoy.
    - MakeMaker now always includes the required 'author' field in
      the META.yml even if it's undef to comply with the META.yml spec.
    - Updated ExtUtils-Install to latest version (1.44)
    - Unified the version numbers of all modules.

    Test Fixes
    - cd() test on VMS used non-native paths. [bleadperl 31534]
    - Removed uses of "no_plan" in tests to remain compatible with
      old versions of Test::Harness.
    - writemakefile_args.t had the wrong test count if version.pm isn't
      installed.

    Bug Fixes
    - $VERSION detection code would be confused by "sub version"
      [rt.cpan.org 30747]
    - LINKTYPE=static will now be propagated to child builds.
      [bleadperl 31761]

    Portability Fixes
    - Add "dragonfly" to the list of BSDish operating systems
    - BSD detection code would not pick up bsdos or internix
    - Fix detection of shared libperl on NetBSD [bleadperl 31526]


6.36  Tue Jul  3 01:06:40 PDT 2007
    Test Fixes
    - version.pm prior to 0.7203 caused Foo->VERSION to reformat
      $Foo::VERSION.  This caused prereq.t to fail.

6.35  Sun Jul  1 20:53:38 PDT 2007
    New Features
    * MakeMaker will now try to "use version" before parsing $VERSION.
      This allows "$VERSION = qv(1.2.3)" to work.

    Test Fixes
    - writemakefile_args.t now works with older versions of version.pm

6.34  Sat Jun 30 11:06:54 CDT 2007
    Test Fixes
    - Accidentally hard coded the version of strict.pm [rt.cpan.org 27838]

6 files changed, 52 insertions, 145 deletions

diff --git a/devel/p5-ExtUtils-MakeMaker/Makefile b/devel/p5-ExtUtils-MakeMaker/Makefile
index de4f0416f4a..0926076772d 100644
--- a/devel/p5-ExtUtils-MakeMaker/Makefile
+++ b/devel/p5-ExtUtils-MakeMaker/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.5 2008/06/20 01:09:15 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2008/07/26 19:11:53 he Exp $
 #
 
-DISTNAME=	ExtUtils-MakeMaker-6.30
+DISTNAME=	ExtUtils-MakeMaker-6.44
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	1
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=../by-authors/id/M/MS/MSCHWERN/}
 
 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
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
diff --git a/devel/p5-ExtUtils-MakeMaker/distinfo b/devel/p5-ExtUtils-MakeMaker/distinfo
index 4d2c62c78ee..01586958a0a 100644
--- a/devel/p5-ExtUtils-MakeMaker/distinfo
+++ b/devel/p5-ExtUtils-MakeMaker/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2006/04/10 18:24:34 jlam Exp $
+$NetBSD: distinfo,v 1.3 2008/07/26 19:11:53 he Exp $
 
-SHA1 (ExtUtils-MakeMaker-6.30.tar.gz) = 6845b52970a35ef7cfddce8b2a9fc23b0a2b3812
-RMD160 (ExtUtils-MakeMaker-6.30.tar.gz) = 3cf6d412e1fb10bd7a432216a860df4e5d1d862d
-Size (ExtUtils-MakeMaker-6.30.tar.gz) = 219796 bytes
-SHA1 (patch-aa) = 0fc10ce8e19cb0e8e717cbd23d756c42c77ed1b7
-SHA1 (patch-ab) = 44ece83764cdbb06a8d3e1f4725ebf2a51050f67
-SHA1 (patch-ac) = a53b5fb16fb196b8d2b0bcbcc7bb177ae68b0f72
+SHA1 (ExtUtils-MakeMaker-6.44.tar.gz) = f39d691d041a56b57cb5c25a67392896b36ee6d6
+RMD160 (ExtUtils-MakeMaker-6.44.tar.gz) = 049723924027dfe32ddf9d34d1022020a7b642b6
+Size (ExtUtils-MakeMaker-6.44.tar.gz) = 244065 bytes
+SHA1 (patch-ab) = 269b92cf309651f3ad6702b8ab3de0b8c13813df
+SHA1 (patch-ac) = 90bdd7186c4243458fa1b6c2dae239646848ac37
+SHA1 (patch-ad) = 3544c7d0b22475372d27dfcdc87bd9fd7cecd052
diff --git a/devel/p5-ExtUtils-MakeMaker/patches/patch-aa b/devel/p5-ExtUtils-MakeMaker/patches/patch-aa
deleted file mode 100644
index fafc18f8481..00000000000
--- a/devel/p5-ExtUtils-MakeMaker/patches/patch-aa
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2006/04/10 18:24:34 jlam Exp $
-
---- lib/ExtUtils/MM_Any.pm.orig	2005-04-27 16:09:47.000000000 -0400
-+++ lib/ExtUtils/MM_Any.pm
-@@ -1052,6 +1052,15 @@ sub init_INSTALL_from_PREFIX {
-                                     : '';
-     }
- 
-+    $self->{INSTALLSITESCRIPT} ||= '$(INSTALLSCRIPT)'
-+      unless $Config{installsitescript};
-+
-+    unless( $Config{installvendorscript} ) {
-+        $self->{INSTALLVENDORSCRIPT} ||= $Config{usevendorprefix}
-+                                      ? $Config{installscript}
-+                                      : '';
-+    }
-+
- 
-     my $iprefix = $Config{installprefixexp} || $Config{installprefix} || 
-                   $Config{prefixexp}        || $Config{prefix} || '';
-@@ -1111,6 +1120,12 @@ sub init_INSTALL_from_PREFIX {
-         script      => { s => $iprefix,
-                          t => 'perl',
-                          d => 'bin' },
-+        vendorscript => { s => $vprefix,
-+                          t => 'vendor',
-+                          d => 'bin' },
-+        sitescript   => { s => $sprefix,
-+                          t => 'site',
-+                          d => 'bin' },
-     );
-     
-     my %man_layouts =
-@@ -1253,7 +1268,6 @@ sub init_INSTALL_from_INSTALLBASE {
-     # Adjust for variable quirks.
-     $install{INSTALLARCHLIB} ||= delete $install{INSTALLARCH};
-     $install{INSTALLPRIVLIB} ||= delete $install{INSTALLLIB};
--    delete @install{qw(INSTALLVENDORSCRIPT INSTALLSITESCRIPT)};
- 
-     foreach my $key (keys %install) {
-         $self->{$key} ||= $install{$key};
-@@ -1627,7 +1641,7 @@ sub installvars {
-     return qw(PRIVLIB SITELIB  VENDORLIB
-               ARCHLIB SITEARCH VENDORARCH
-               BIN     SITEBIN  VENDORBIN
--              SCRIPT
-+              SCRIPT  SITESCRIPT  VENDORSCRIPT
-               MAN1DIR SITEMAN1DIR VENDORMAN1DIR
-               MAN3DIR SITEMAN3DIR VENDORMAN3DIR
-              );
diff --git a/devel/p5-ExtUtils-MakeMaker/patches/patch-ab b/devel/p5-ExtUtils-MakeMaker/patches/patch-ab
index c845db803c9..9602465d729 100644
--- a/devel/p5-ExtUtils-MakeMaker/patches/patch-ab
+++ b/devel/p5-ExtUtils-MakeMaker/patches/patch-ab
@@ -1,57 +1,22 @@
-$NetBSD: patch-ab,v 1.1 2006/04/10 18:24:34 jlam Exp $
+$NetBSD: patch-ab,v 1.2 2008/07/26 19:11:54 he Exp $
 
---- lib/ExtUtils/MM_Unix.pm.orig	2005-05-20 19:05:33.000000000 -0400
+--- lib/ExtUtils/MM_Unix.pm.orig	2008-02-29 01:06:28.000000000 +0100
 +++ lib/ExtUtils/MM_Unix.pm
-@@ -12,8 +12,8 @@ use DirHandle;
- 
- use vars qw($VERSION @ISA
-             $Is_OS2 $Is_VMS $Is_Win32 $Is_Dos
--            $Is_OSF $Is_IRIX  $Is_NetBSD $Is_BSD
--            $Is_SunOS4 $Is_Solaris $Is_SunOS $Is_Interix
-+            $Is_OSF $Is_IRIX $Is_BSD
-+            $Is_SunOS4 $Is_Solaris $Is_SunOS
-             $Verbose %pm
-             %Config_Override
-            );
-@@ -32,13 +32,11 @@ BEGIN { 
-     $Is_VMS     = $^O eq 'VMS';
-     $Is_OSF     = $^O eq 'dec_osf';
-     $Is_IRIX    = $^O eq 'irix';
--    $Is_NetBSD  = $^O eq 'netbsd';
--    $Is_Interix = $^O eq 'interix';
-     $Is_SunOS4  = $^O eq 'sunos';
-     $Is_Solaris = $^O eq 'solaris';
-     $Is_SunOS   = $Is_SunOS4 || $Is_Solaris;
-     $Is_BSD     = $^O =~ /^(?:free|net|open)bsd$/ or
--                  $^O eq 'bsdos' or $^O eq 'interix';
-+                  $^O eq 'bsdos' or $^O eq 'dragonfly' or $^O eq 'interix';
- }
- 
- BEGIN {
-@@ -928,7 +926,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $
+@@ -931,7 +931,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $
  
      my $libs = '$(LDLOADLIBS)';
  
--    if (($Is_NetBSD || $Is_Interix) && $Config{'useshrplib'}) {
-+    if ($Is_BSD && $Config{'useshrplib'}) {
+-    if (($Is{NetBSD} || $Is{Interix}) && $Config{'useshrplib'} eq 'true') {
++    if ($Is{BSD} && $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
-@@ -2074,7 +2072,7 @@ pure_site_install ::
- 		$(INST_LIB) $(DESTINSTALLSITELIB) \
- 		$(INST_ARCHLIB) $(DESTINSTALLSITEARCH) \
- 		$(INST_BIN) $(DESTINSTALLSITEBIN) \
+@@ -2119,7 +2119,7 @@ pure_perl_install ::
+ 		$(INST_LIB) $(DESTINSTALLPRIVLIB) \
+ 		$(INST_ARCHLIB) $(DESTINSTALLARCHLIB) \
+ 		$(INST_BIN) $(DESTINSTALLBIN) \
 -		$(INST_SCRIPT) $(DESTINSTALLSCRIPT) \
 +		$(INST_SCRIPT) $(DESTINSTALLSITESCRIPT) \
- 		$(INST_MAN1DIR) $(DESTINSTALLSITEMAN1DIR) \
- 		$(INST_MAN3DIR) $(DESTINSTALLSITEMAN3DIR)
+ 		$(INST_MAN1DIR) $(DESTINSTALLMAN1DIR) \
+ 		$(INST_MAN3DIR) $(DESTINSTALLMAN3DIR)
  	$(NOECHO) $(WARN_IF_OLD_PACKLIST) \
-@@ -2087,7 +2085,7 @@ pure_vendor_install ::
- 		$(INST_LIB) $(DESTINSTALLVENDORLIB) \
- 		$(INST_ARCHLIB) $(DESTINSTALLVENDORARCH) \
- 		$(INST_BIN) $(DESTINSTALLVENDORBIN) \
--		$(INST_SCRIPT) $(DESTINSTALLSCRIPT) \
-+		$(INST_SCRIPT) $(DESTINSTALLVENDORSCRIPT) \
- 		$(INST_MAN1DIR) $(DESTINSTALLVENDORMAN1DIR) \
- 		$(INST_MAN3DIR) $(DESTINSTALLVENDORMAN3DIR)
- 
diff --git a/devel/p5-ExtUtils-MakeMaker/patches/patch-ac b/devel/p5-ExtUtils-MakeMaker/patches/patch-ac
index 90e707c5f0a..fb67d289db9 100644
--- a/devel/p5-ExtUtils-MakeMaker/patches/patch-ac
+++ b/devel/p5-ExtUtils-MakeMaker/patches/patch-ac
@@ -1,46 +1,13 @@
-$NetBSD: patch-ac,v 1.1 2006/04/10 18:24:34 jlam Exp $
+$NetBSD: patch-ac,v 1.2 2008/07/26 19:11:54 he Exp $
 
---- lib/ExtUtils/MakeMaker.pm.orig	2005-05-20 19:08:36.000000000 -0400
+--- lib/ExtUtils/MakeMaker.pm.orig	2008-02-29 01:06:55.000000000 +0100
 +++ lib/ExtUtils/MakeMaker.pm
-@@ -222,7 +222,7 @@ sub full_setup {
-     INSTALLMAN1DIR          INSTALLMAN3DIR
-     INSTALLSITEMAN1DIR      INSTALLSITEMAN3DIR
-     INSTALLVENDORMAN1DIR    INSTALLVENDORMAN3DIR
--    INSTALLSCRIPT 
-+    INSTALLSCRIPT   INSTALLSITESCRIPT  INSTALLVENDORSCRIPT
-     PERL_LIB        PERL_ARCHLIB 
-     SITELIBEXP      SITEARCHEXP 
- 
-@@ -1545,7 +1545,7 @@ Defaults to $Config{installprivlib}.
- =item INSTALLSCRIPT
+@@ -1660,7 +1660,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
--directory.
-+directory if INSTALLDIRS is set to perl.
- 
- =item INSTALLSITEARCH
- 
-@@ -1572,6 +1572,11 @@ $(SITEPREFIX)/man/man$(MAN*EXT).
- 
- If set to 'none', no man pages will be installed.
- 
-+=item INSTALLSITESCRIPT
-+
-+Used by 'make install' which copies files from INST_SCRIPT to this
-+directory if INSTALLDIRS is set to site (default).
-+
- =item INSTALLVENDORARCH
- 
- Used by 'make install', which copies files from INST_ARCHLIB to this
-@@ -1596,6 +1601,11 @@ INSTALLDIRS=vendor.  Defaults to $(VENDO
- 
- If set to 'none', no man pages will be installed.
- 
-+=item INSTALLVENDORSCRIPT
-+
-+Used by 'make install' which copies files from INST_SCRIPT to this
+-directory if INSTALLDIRS is set to is set to vendor.
 +directory if INSTALLDIRS is set to vendor.
-+
+ 
  =item INST_ARCHLIB
  
- Same as INST_LIB for architecture dependent files.
diff --git a/devel/p5-ExtUtils-MakeMaker/patches/patch-ad b/devel/p5-ExtUtils-MakeMaker/patches/patch-ad
new file mode 100644
index 00000000000..fe5e1ce425e
--- /dev/null
+++ b/devel/p5-ExtUtils-MakeMaker/patches/patch-ad
@@ -0,0 +1,25 @@
+$NetBSD: patch-ad,v 1.1 2008/07/26 19:11:54 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
++++ t/INSTALL_BASE.t
+@@ -16,7 +16,7 @@ use strict;
+ use File::Path;
+ use Config;
+ 
+-use Test::More tests => 21;
++use Test::More tests => 19;
+ use MakeMaker::Test::Utils;
+ use MakeMaker::Test::Setup::BFD;
+ 
+@@ -59,7 +59,7 @@ my @installed_files = 
+   ('../dummy-install/lib/perl5/Big/Dummy.pm',
+    '../dummy-install/lib/perl5/Big/Liar.pm',
+    '../dummy-install/bin/program',
+-   "../dummy-install/lib/perl5/$Config{archname}/perllocal.pod",
++#  "../dummy-install/lib/perl5/$Config{archname}/perllocal.pod",
+    "../dummy-install/lib/perl5/$Config{archname}/auto/Big/Dummy/.packlist"
+   );
+