Update ExtUtils-MakeMaker to CPAN version 6.57_01

  [DELTA]

  6.57_01  Tue Aug 24 01:36:20 PDT 2010
    Improvements
    * parse_abstract() is more robust supporting "Package.pm" and multiple
      dashes and spaces. [rt.perl.org 74438]

    Bug Fixes
    * Recognize .so files in AIX. [rt.cpan.org 41360] (Jens Rehsack)
    * Remove manual image-base generation on Win32/gcc [rt.cpan.org 47138]
      (Yasuhiro Matsumoto)
    * Use the bundled versions of our dependencies if they're not installed.
    * Eliminate use of foreach qw() which will be deprecated in 5.14.
      [rt.cpan.org 57124] (Zefram)

    Test Fixes
    * Guard against old versions of YAML::Tiny that worked differently.
      [rt.cpan.org 55500]

34 files changed, 168 insertions, 111 deletions

diff --git a/cpan/ExtUtils-MakeMaker/Changes b/cpan/ExtUtils-MakeMaker/Changes
index a517482bc8..fff588d4f6 100644
--- a/cpan/ExtUtils-MakeMaker/Changes
+++ b/cpan/ExtUtils-MakeMaker/Changes
@@ -1,3 +1,21 @@
+6.57_01  Tue Aug 24 01:36:20 PDT 2010
+    Improvements
+    * parse_abstract() is more robust supporting "Package.pm" and multiple
+      dashes and spaces. [rt.perl.org 74438]
+
+    Bug Fixes
+    * Recognize .so files in AIX. [rt.cpan.org 41360] (Jens Rehsack)
+    * Remove manual image-base generation on Win32/gcc [rt.cpan.org 47138]
+      (Yasuhiro Matsumoto)
+    * Use the bundled versions of our dependencies if they're not installed.
+    * Eliminate use of foreach qw() which will be deprecated in 5.14.
+      [rt.cpan.org 57124] (Zefram)
+
+    Test Fixes
+    * Guard against old versions of YAML::Tiny that worked differently.
+      [rt.cpan.org 55500]
+
+
 6.56  Thu Dec 17 14:02:14 PST 2009
     * Stable release of 6.55_03
 
diff --git a/cpan/ExtUtils-MakeMaker/MANIFEST b/cpan/ExtUtils-MakeMaker/MANIFEST
index b242cc55f6..93e77bcd8f 100644
--- a/cpan/ExtUtils-MakeMaker/MANIFEST
+++ b/cpan/ExtUtils-MakeMaker/MANIFEST
@@ -7,6 +7,7 @@ inc/ExtUtils/Installed.pm
 inc/ExtUtils/Manifest.pm
 inc/ExtUtils/MANIFEST.SKIP
 inc/ExtUtils/Packlist.pm
+INSTALL
 lib/ExtUtils/Command/MM.pm
 lib/ExtUtils/Liblist.pm
 lib/ExtUtils/Liblist/Kid.pm
@@ -91,6 +92,7 @@ t/MM_Unix.t
 t/MM_VMS.t
 t/MM_Win32.t
 t/oneliner.t
+t/parse_abstract.t
 t/parse_version.t
 t/PL_FILES.t
 t/pm.t
@@ -115,3 +117,4 @@ t/writemakefile_args.t
 t/xs.t
 TODO
 META.yml                                 Module meta-data (added by MakeMaker)
+SIGNATURE                                Public-key signature (added by MakeMaker)
diff --git a/cpan/ExtUtils-MakeMaker/README b/cpan/ExtUtils-MakeMaker/README
index 9586c0ba17..8629a53cbe 100644
--- a/cpan/ExtUtils-MakeMaker/README
+++ b/cpan/ExtUtils-MakeMaker/README
@@ -1,57 +1,11 @@
 This is a CPAN distribution of the venerable MakeMaker module.  It has been
-backported to work with Perl 5.005_03 and up.
+backported to work with Perl 5.6.0 and up.
 
-If you do not have a make program, several can be found...
-
-Most Unixen: The make utility which comes with your operating system
-should work fine.  If you don't have one, GNU make is recommended,
-most others (Sun, BSD, etc...) will work fine as well.
-http://www.gnu.org/software/make/make.html                GNU make
-
-Windows: nmake or dmake will work.  GNU make will *not*.
-ftp://ftp.microsoft.com/Softlib/MSLFILES/nmake15.exe      nmake
-http://search.cpan.org/dist/dmake/                        dmake
-
-VMS: MMS or the free MadGoat MaKe utility (MMK) will work.
-http://www.madgoat.com/mmk.html                           MMK
-
-If all else fails there is a pure Perl version of make available on
-CPAN which should work on most Unixen.
-http://search.cpan.org/author/NI-S/Make-1.00/             pmake
-
-
-PLEASE NOTE: This distribution does not include the xsubpp or typemap
-programs.  They are extremely specific to your version or Perl, so
-MakeMaker will simply use the one which came with your copy of Perl.
-Do not delete your old ExtUtils/ directory.  An upgraded version of xsubpp
-can be found in the ExtUtils::ParseXS module.
-
-Known Good Systems:
-
-Every stable MakeMaker release is tested at least on:
-
-MacOS X
-Linux/x86
-ActivePerl on Windows
-Cygwin
-OpenVMS
-
-Covering the major portability flavors MakeMaker has to cover.
-(I'm always on the lookout for DJGPP, Solaris, *BSD and OS/2 users)
-
-
-Known Problems:
-
-(See http://rt.cpan.org for a full list of open problems.)
-
-Windows will likely be broken if Perl is installed in C:\Program Files or 
-other prefix with a space in the name.
-
-Using the MMS utility on VMS causes lots of extra newlines.  Unknown
-why this is so, might be a bug in MMS.  Problem not seen with MMK.
-
-GNU make does not work with MakeMaker on Windows.
+See INSTALL for installation instrucitons.  Run "perldoc
+ExtUtils::MakeMaker" (while in this source directory before
+installation) for more documentation.
 
+See http://rt.cpan.org for a full list of open problems.
 
 Please report any bugs via http://rt.cpan.org.
 Send questions and discussion to makemaker@perl.org
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Command/MM.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Command/MM.pm
index f9b474de16..0d23c24edc 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Command/MM.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Command/MM.pm
@@ -10,7 +10,7 @@ our @ISA = qw(Exporter);
 
 our @EXPORT  = qw(test_harness pod2man perllocal_install uninstall 
                   warn_if_old_packlist);
-our $VERSION = '6.56';
+our $VERSION = '6.57_01';
 
 my $Is_VMS = $^O eq 'VMS';
 
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm
index ea4dac4ae7..b21fc01a59 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm
@@ -2,7 +2,7 @@ package ExtUtils::Liblist;
 
 use strict;
 
-our $VERSION = '6.56';
+our $VERSION = '6.57_01';
 
 use File::Spec;
 require ExtUtils::Liblist::Kid;
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
index b807e97cc8..a434a0f1d0 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
@@ -9,7 +9,7 @@ use 5.006;
 # Broken out of MakeMaker from version 4.11
 
 use strict;
-our $VERSION = 6.56;
+our $VERSION = 6.57_01;
 
 use Config;
 use Cwd 'cwd';
@@ -39,6 +39,7 @@ sub _unix_os2_ext {
     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 @@ sub _unix_os2_ext {
                  && ($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/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm
index eac5f48349..d39118cd59 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm
@@ -3,7 +3,7 @@ package ExtUtils::MM;
 use strict;
 use ExtUtils::MakeMaker::Config;
 
-our $VERSION = '6.56';
+our $VERSION = '6.57_01';
 
 require ExtUtils::Liblist;
 require ExtUtils::MakeMaker;
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_AIX.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_AIX.pm
index 5179be4bc2..8490f2fcf2 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_AIX.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_AIX.pm
@@ -1,7 +1,7 @@
 package ExtUtils::MM_AIX;
 
 use strict;
-our $VERSION = '6.56';
+our $VERSION = '6.57_01';
 
 require ExtUtils::MM_Unix;
 our @ISA = qw(ExtUtils::MM_Unix);
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm
index 4905aebc64..a94ab43717 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm
@@ -1,7 +1,7 @@
 package ExtUtils::MM_Any;
 
 use strict;
-our $VERSION = '6.56';
+our $VERSION = '6.57_01';
 
 use Carp;
 use File::Spec;
@@ -984,7 +984,7 @@ sub _dump_hash {
                 );
                 if (exists $customs->{$key}) {
                     my %k_custom = %{$customs->{$key}};
-                    foreach my $k qw(key_sort max_key_length customs) {
+                    foreach my $k (qw(key_sort max_key_length customs)) {
                         $k_options{$k} = $k_custom{$k} if exists $k_custom{$k};
                     }
                 }
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_BeOS.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_BeOS.pm
index 0b7c8db922..1c1eb4f2ba 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_BeOS.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_BeOS.pm
@@ -26,7 +26,7 @@ require ExtUtils::MM_Any;
 require ExtUtils::MM_Unix;
 
 our @ISA = qw( ExtUtils::MM_Any ExtUtils::MM_Unix );
-our $VERSION = '6.56';
+our $VERSION = '6.57_01';
 
 
 =item os_flavor
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Cygwin.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Cygwin.pm
index 394fbc68a7..7bee0b938d 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Cygwin.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Cygwin.pm
@@ -9,7 +9,7 @@ require ExtUtils::MM_Unix;
 require ExtUtils::MM_Win32;
 our @ISA = qw( ExtUtils::MM_Unix );
 
-our $VERSION = '6.56';
+our $VERSION = '6.57_01';
 
 
 =head1 NAME
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_DOS.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_DOS.pm
index fc0a794723..0c50626098 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_DOS.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_DOS.pm
@@ -2,7 +2,7 @@ package ExtUtils::MM_DOS;
 
 use strict;
 
-our $VERSION = 6.56;
+our $VERSION = 6.57_01;
 
 require ExtUtils::MM_Any;
 require ExtUtils::MM_Unix;
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Darwin.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Darwin.pm
index 1cb87c7881..d74cbe353d 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Darwin.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Darwin.pm
@@ -7,7 +7,7 @@ BEGIN {
     our @ISA = qw( ExtUtils::MM_Unix );
 }
 
-our $VERSION = '6.56';
+our $VERSION = '6.57_01';
 
 
 =head1 NAME
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_MacOS.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_MacOS.pm
index cfc82051e1..b19d037561 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_MacOS.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_MacOS.pm
@@ -2,7 +2,7 @@ package ExtUtils::MM_MacOS;
 
 use strict;
 
-our $VERSION = 6.56;
+our $VERSION = 6.57_01;
 
 sub new {
     die <<'UNSUPPORTED';
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_NW5.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_NW5.pm
index 0c8f6c0aff..5f06e201f7 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_NW5.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_NW5.pm
@@ -22,7 +22,7 @@ use strict;
 use ExtUtils::MakeMaker::Config;
 use File::Basename;
 
-our $VERSION = '6.56';
+our $VERSION = '6.57_01';
 
 require ExtUtils::MM_Win32;
 our @ISA = qw(ExtUtils::MM_Win32);
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_OS2.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_OS2.pm
index 680502baf2..dc0390caa0 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_OS2.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_OS2.pm
@@ -5,7 +5,7 @@ use strict;
 use ExtUtils::MakeMaker qw(neatvalue);
 use File::Spec;
 
-our $VERSION = '6.56';
+our $VERSION = '6.57_01';
 
 require ExtUtils::MM_Any;
 require ExtUtils::MM_Unix;
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_QNX.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_QNX.pm
index f78d5e8a9e..0650b3c6fb 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_QNX.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_QNX.pm
@@ -1,7 +1,7 @@
 package ExtUtils::MM_QNX;
 
 use strict;
-our $VERSION = '6.56';
+our $VERSION = '6.57_01';
 
 require ExtUtils::MM_Unix;
 our @ISA = qw(ExtUtils::MM_Unix);
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_UWIN.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_UWIN.pm
index 5adc46ea8d..62bc1e0f97 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_UWIN.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_UWIN.pm
@@ -1,7 +1,7 @@
 package ExtUtils::MM_UWIN;
 
 use strict;
-our $VERSION = 6.56;
+our $VERSION = 6.57_01;
 
 require ExtUtils::MM_Unix;
 our @ISA = qw(ExtUtils::MM_Unix);
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
index 3d059be11f..0719988ee7 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
@@ -15,7 +15,7 @@ use ExtUtils::MakeMaker qw($Verbose neatvalue);
 
 # If we make $VERSION an our variable parse_version() breaks
 use vars qw($VERSION);
-$VERSION = '6.5601';
+$VERSION = '6.57_01';
 
 require ExtUtils::MM_Any;
 our @ISA = qw(ExtUtils::MM_Any);
@@ -2593,7 +2593,7 @@ sub parse_abstract {
         $inpod = /^=(?!cut)/ ? 1 : /^=cut/ ? 0 : $inpod;
         next if !$inpod;
         chop;
-        next unless /^($package(?:\.pm)?\s+\-+\s+)(.*)/;
+        next unless /^($package(?:\.pm)? \s+ -+ \s+)(.*)/x;
         $result = $2;
         last;
     }
@@ -2634,7 +2634,7 @@ sub parse_version {
         $inpod = /^=(?!cut)/ ? 1 : /^=cut/ ? 0 : $inpod;
         next if $inpod || /^\s*#/;
         chop;
-        next if /^\s*(if|unless)/;
+        next if /^\s*(if|unless|elsif)/;
         if ( m{^ \s* package \s+ \w[\w\:\']* \s+ (v?[0-9._]+) \s* ;  }x ) {
             local $^W = 0;
             $result = $1;
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VMS.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VMS.pm
index 2066d03597..34b74d2ad3 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VMS.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VMS.pm
@@ -15,7 +15,7 @@ BEGIN {
 
 use File::Basename;
 
-our $VERSION = '6.56';
+our $VERSION = '6.57_01';
 
 require ExtUtils::MM_Any;
 require ExtUtils::MM_Unix;
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VOS.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VOS.pm
index 1814a1dae4..ad86cc8a88 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VOS.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VOS.pm
@@ -1,7 +1,7 @@
 package ExtUtils::MM_VOS;
 
 use strict;
-our $VERSION = '6.56';
+our $VERSION = '6.57_01';
 
 require ExtUtils::MM_Unix;
 our @ISA = qw(ExtUtils::MM_Unix);
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win32.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win32.pm
index 19e462de59..c41075adbb 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win32.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win32.pm
@@ -27,7 +27,7 @@ use ExtUtils::MakeMaker qw( neatvalue );
 require ExtUtils::MM_Any;
 require ExtUtils::MM_Unix;
 our @ISA = qw( ExtUtils::MM_Any ExtUtils::MM_Unix );
-our $VERSION = '6.56';
+our $VERSION = '6.57_01';
 
 $ENV{EMXSHELL} = 'sh'; # to run `commands`
 
@@ -289,17 +289,6 @@ sub dynamic_lib {
     my($ldfrom) = '$(LDFROM)';
     my(@m);
 
-# one thing for GCC/Mingw32:
-# we try to overcome non-relocateable-DLL problems by generating
-#    a (hopefully unique) image-base from the dll's name
-# -- BKS, 10-19-1999
-    if ($GCC) { 
-	my $dllname = $self->{BASEEXT} . "." . $self->{DLEXT};
-	$dllname =~ /(....)(.{0,4})/;
-	my $baseaddr = unpack("n", $1 ^ $2);
-	$otherldflags .= sprintf("-Wl,--image-base,0x%x0000 ", $baseaddr);
-    }
-
     push(@m,'
 # This section creates the dynamically loadable $(INST_DYNAMIC)
 # from $(OBJECT) and possibly $(MYEXTLIB).
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win95.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win95.pm
index c47147695e..1cc0f12ec4 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win95.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win95.pm
@@ -2,7 +2,7 @@ package ExtUtils::MM_Win95;
 
 use strict;
 
-our $VERSION = '6.56';
+our $VERSION = '6.57_01';
 
 require ExtUtils::MM_Win32;
 our @ISA = qw(ExtUtils::MM_Win32);
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MY.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MY.pm
index bed177d210..4a0b61fbb6 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MY.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MY.pm
@@ -3,7 +3,7 @@ package ExtUtils::MY;
 use strict;
 require ExtUtils::MM;
 
-our $VERSION = 6.56;
+our $VERSION = 6.57_01;
 our @ISA = qw(ExtUtils::MM);
 
 {
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm
index 95a075219a..7ab26e0b04 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm
@@ -18,7 +18,7 @@ our @Overridable;
 my @Prepend_parent;
 my %Recognized_Att_Keys;
 
-our $VERSION = '6.5601';
+our $VERSION = '6.57_01';
 
 # Emulate something resembling CVS $Revision$
 (our $Revision = $VERSION) =~ s{_}{};
@@ -1000,10 +1000,12 @@ sub flush {
         or die "Unable to open MakeMaker.tmp: $!";
 
     for my $chunk (@{$self->{RESULT}}) {
-        print $fh "$chunk\n";
+        print $fh "$chunk\n"
+            or die "Can't write to MakeMaker.tmp: $!";
     }
 
-    close $fh;
+    close $fh
+        or die "Can't write to MakeMaker.tmp: $!";
     _rename("MakeMaker.tmp", $finalname) or
       warn "rename MakeMaker.tmp => $finalname: $!";
     chmod 0644, $finalname unless $Is_VMS;
@@ -1468,7 +1470,8 @@ the first line in the "=head1 NAME" section. $2 becomes the abstract.
 =item AUTHOR
 
 String containing name (and email address) of package author(s). Is used
-in PPD (Perl Package Description) files for PPM (Perl Package Manager).
+in META.yml and PPD (Perl Package Description) files for PPM (Perl
+Package Manager).
 
 =item BINARY_LOCATION
 
@@ -1942,7 +1945,7 @@ may hold a name for that binary. Defaults to perl
 A hashrefs of items to add to the F<META.yml>.
 
 They differ in how they behave if they have the same key as the
-default metadata.  META_ADD will override the default value with it's
+default metadata.  META_ADD will override the default value with its
 own.  META_MERGE will merge its value with the default.
 
 Unless you want to override the defaults, prefer META_MERGE so as to
@@ -2227,18 +2230,17 @@ will C<die> instead of simply informing the user of the missing dependencies.
 
 It is I<extremely> rare to have to use C<PREREQ_FATAL>. Its use by module
 authors is I<strongly discouraged> and should never be used lightly.
+
 Module installation tools have ways of resolving umet dependencies but
 to do that they need a F<Makefile>.  Using C<PREREQ_FATAL> breaks this.
 That's bad.
 
-The only situation where it is appropriate is when you have
-dependencies that are indispensible to actually I<write> a
-F<Makefile>. For example, MakeMaker's F<Makefile.PL> needs L<File::Spec>.
-If its not available it cannot write the F<Makefile>.
+Assuming you have good test coverage, your tests should fail with
+missing dependencies informing the user more strongly that something
+is wrong.  You can write a F<t/00compile.t> test which will simply
+check that your code compiles and stop "make test" prematurely if it
+doesn't.  See L<Test::More/BAIL_OUT> for more details.
 
-Note: see L<Test::Harness> for a shortcut for stopping tests early
-if you are missing dependencies and are afraid that users might
-use your module with an incomplete environment.
 
 =item PREREQ_PM
 
@@ -2798,6 +2800,8 @@ generated Makefile along with your report.
 
 For more up-to-date information, see L<http://www.makemaker.org>.
 
+Repository available at L<http://github.com/schwern/extutils-makemaker>.
+
 =head1 LICENSE
 
 This program is free software; you can redistribute it and/or 
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Config.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Config.pm
index 38b60affdd..0b83432545 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Config.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Config.pm
@@ -2,7 +2,7 @@ package ExtUtils::MakeMaker::Config;
 
 use strict;
 
-our $VERSION = '6.56';
+our $VERSION = '6.57_01';
 
 use Config ();
 
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/FAQ.pod b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/FAQ.pod
index d33f82e53b..f3354231d1 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/FAQ.pod
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/FAQ.pod
@@ -1,6 +1,6 @@
 package ExtUtils::MakeMaker::FAQ;
 
-our $VERSION = '1.12';
+our $VERSION = '6.57_01';
 
 1;
 __END__
@@ -241,7 +241,7 @@ do that.  Use at your own risk.  Have fun blowing holes in your foot.
     use File::Spec;
     use File::Find;
     use ExtUtils::Manifest qw(maniread);
-    
+
     my %manifest = map  {( $_ => 1 )}
                    grep { File::Spec->canonpath($_) }
                         keys %{ maniread() };
@@ -250,14 +250,14 @@ do that.  Use at your own risk.  Have fun blowing holes in your foot.
         print "No files found in MANIFEST.  Stopping.\n";
         exit;
     }
-    
+
     find({
           wanted   => sub {
               my $path = File::Spec->canonpath($_);
-    
+
               return unless -f $path;
               return if exists $manifest{ $path };
-    
+
               print "unlink $path\n";
               unlink $path;
           },
@@ -267,6 +267,10 @@ do that.  Use at your own risk.  Have fun blowing holes in your foot.
     );
 
 
+=item Which tar should I use on Windows?
+
+We recommend ptar from Archive::Tar not older that 1.66 with '-C' option. 
+
 =item Which zip should I use on Windows for '[nd]make zipdist'?
 
 We recommend InfoZIP: L<http://www.info-zip.org/Zip.html>
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Tutorial.pod b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Tutorial.pod
index 8ad72649b1..d5ff9086c3 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Tutorial.pod
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Tutorial.pod
@@ -1,6 +1,6 @@
 package ExtUtils::MakeMaker::Tutorial;
 
-our $VERSION = 0.02;
+our $VERSION = 6.57_01;
 
 
 =head1 NAME
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mkbootstrap.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mkbootstrap.pm
index 707466a98d..aeb8b27d14 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mkbootstrap.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mkbootstrap.pm
@@ -3,7 +3,7 @@ package ExtUtils::Mkbootstrap;
 # There's just too much Dynaloader incest here to turn on strict vars.
 use strict 'refs';
 
-our $VERSION = '6.56';
+our $VERSION = '6.57_01';
 
 require Exporter;
 our @ISA = ('Exporter');
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mksymlists.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mksymlists.pm
index 962c67fd57..e7992936fa 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mksymlists.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mksymlists.pm
@@ -10,7 +10,7 @@ use Config;
 
 our @ISA = qw(Exporter);
 our @EXPORT = qw(&Mksymlists);
-our $VERSION = '6.56';
+our $VERSION = '6.57_01';
 
 sub Mksymlists {
     my(%spec) = @_;
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/testlib.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/testlib.pm
index fe01beb0e1..628dda034f 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/testlib.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/testlib.pm
@@ -3,7 +3,7 @@ package ExtUtils::testlib;
 use strict;
 use warnings;
 
-our $VERSION = 6.56;
+our $VERSION = 6.57_01;
 
 use Cwd;
 use File::Spec;
diff --git a/cpan/ExtUtils-MakeMaker/t/metafile_file.t b/cpan/ExtUtils-MakeMaker/t/metafile_file.t
index ca8a412eba..e4e98dc4a0 100644
--- a/cpan/ExtUtils-MakeMaker/t/metafile_file.t
+++ b/cpan/ExtUtils-MakeMaker/t/metafile_file.t
@@ -267,8 +267,9 @@ YAML
 
 
     SKIP: {
+        # Load() behaves diffrently in versions prior to 1.06 
         skip "Need YAML::Tiny to test if it can load META.yml", 2
-          unless eval { require YAML::Tiny };
+          unless eval { require YAML::Tiny } and $YAML::Tiny::VERSION >= 1.06;
 
         my @yaml_load = YAML::Tiny::Load($mm->metafile_file(@meta));
         is @yaml_load, 1,               "YAML::Tiny saw one document in META.yml";
diff --git a/cpan/ExtUtils-MakeMaker/t/parse_abstract.t b/cpan/ExtUtils-MakeMaker/t/parse_abstract.t
new file mode 100644
index 0000000000..03e56c932e
--- /dev/null
+++ b/cpan/ExtUtils-MakeMaker/t/parse_abstract.t
@@ -0,0 +1,77 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+
+use ExtUtils::MakeMaker;
+
+use Test::More 'no_plan';
+
+sub test_abstract {
+    my($code, $package, $want, $name) = @_;
+
+    local $Test::Builder::Level = $Test::Builder::Level + 1;
+
+    my $file = "t/abstract.tmp";
+    {
+        open my $fh, ">", $file or die "Can't open $file";
+        print $fh $code;
+        close $fh;
+    }
+
+    # Hack up a minimal MakeMaker object.
+    my $mm = bless { DISTNAME => $package }, "MM";
+    my $have = $mm->parse_abstract($file);
+
+    my $ok = is( $have, $want, $name );
+
+    # Clean up the temp file, VMS style
+    1 while unlink $file;
+
+    return $ok;
+}
+
+
+test_abstract(<<END, "Foo", "Stuff and things", "Simple abstract");
+=head1 NAME
+
+Foo - Stuff and things
+END
+
+
+test_abstract(<<END, "NEXT", "Provide a pseudo-class NEXT (et al) that allows method redispatch", "Name.pm");
+=head1 NAME
+
+NEXT.pm - Provide a pseudo-class NEXT (et al) that allows method redispatch
+END
+
+
+test_abstract(<<END, "Compress::Raw::Zlib::FAQ", "Frequently Asked Questions about Compress::Raw::Zlib", "double dash");
+=pod
+
+Compress::Raw::Zlib::FAQ -- Frequently Asked Questions about Compress::Raw::Zlib
+END
+
+
+test_abstract(<<END, "Foo", "This is", "Only in POD");
+# =pod
+
+Foo - This is not in pod
+
+=cut
+
+Foo - This isn't in pod either
+
+=pod
+
+Foo - This is
+
+Foo - So is this.
+END
+
+
+test_abstract(<<END, "Foo", "the abstract", "more spaces");
+=pod
+
+Foo   -  the abstract
+END
diff --git a/cpan/ExtUtils-MakeMaker/t/parse_version.t b/cpan/ExtUtils-MakeMaker/t/parse_version.t
index 858e294181..d7c14a884d 100644
--- a/cpan/ExtUtils-MakeMaker/t/parse_version.t
+++ b/cpan/ExtUtils-MakeMaker/t/parse_version.t
@@ -36,6 +36,7 @@ my %versions = (q[$VERSION = '1.00']            => '1.00',
 
                 '$VERSION = sprintf("%d.%03d", q$Revision: 3.74 $ =~ /(\d+)\.(\d+)/);' => '3.074',
                 '$VERSION = substr(q$Revision: 2.8 $, 10) + 2 . "";'                   => '4.8',
+                'elsif ( $Something::VERSION >= 1.99 )' => 'undef',
 
                );
 
@@ -72,12 +73,15 @@ our $VERSION = 2.34;
 END
 }
 
-plan tests => (2 * keys %versions) + 4;
+plan tests => (3 * keys %versions) + 4;
 
 for my $code ( sort keys %versions ) {
     my $expect = $versions{$code};
     (my $label = $code) =~ s/\n/\\n/g;
+    my $warnings = "";
+    local $SIG{__WARN__} = sub { $warnings .= "@_\n"; };
     is( parse_version_string($code), $expect, $label );
+    is($warnings, '', "$label does not cause warnings");
 }