In perl.git, the branch blead has been updated

<http://perl5.git.perl.org/perl.git/commitdiff/b37c54af8999d4b762bc5532a5ded18c28f61270?hp=eb9e3b14fd77e43b36846b86f8780d23fda50258>

- Log -----------------------------------------------------------------
commit b37c54af8999d4b762bc5532a5ded18c28f61270
Author: Father Chrysostomos <[email protected]>
Date:   Fri Oct 24 14:03:55 2014 -0700

    Revert "Update ExtUtils-MakeMaker to CPAN version 7.00"
    
    This reverts commit 7b01e4b183c6629065260ae2befad5e5d4ab6b94.
    
    The newest ExtUtils::MakeMaker uses the :utf8 layers, which is not
    available under miniperl on Windows.  So the build fails.
    
    Revert this for now until a fixed version is released.
-----------------------------------------------------------------------

Summary of changes:
 MANIFEST                                           |    7 -
 Makefile.SH                                        |    5 +-
 Porting/Maintainers.pl                             |    8 +-
 cpan/ExtUtils-MakeMaker/lib/ExtUtils/Command/MM.pm |   10 +-
 cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm    |    2 +-
 .../ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm |   28 +-
 cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm         |    2 +-
 cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_AIX.pm     |    2 +-
 cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm     |  178 +---
 cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_BeOS.pm    |    3 +-
 cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Cygwin.pm  |    3 +-
 cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_DOS.pm     |    2 +-
 cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Darwin.pm  |    2 +-
 cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_MacOS.pm   |    2 +-
 cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_NW5.pm     |    2 +-
 cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_OS2.pm     |    3 +-
 cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_QNX.pm     |    2 +-
 cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_UWIN.pm    |    2 +-
 cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm    |  278 +++---
 cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VMS.pm     |    7 +-
 cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VOS.pm     |    2 +-
 cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win32.pm   |   52 +-
 cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win95.pm   |    2 +-
 cpan/ExtUtils-MakeMaker/lib/ExtUtils/MY.pm         |    2 +-
 cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm  |  165 +---
 .../lib/ExtUtils/MakeMaker/Config.pm               |    2 +-
 .../lib/ExtUtils/MakeMaker/FAQ.pod                 |    2 +-
 .../lib/ExtUtils/MakeMaker/Locale.pm               |  348 -------
 .../lib/ExtUtils/MakeMaker/Tutorial.pod            |    2 +-
 .../lib/ExtUtils/MakeMaker/version.pm              |   55 --
 .../lib/ExtUtils/MakeMaker/version/regex.pm        |  123 ---
 .../lib/ExtUtils/MakeMaker/version/vpp.pm          | 1028 --------------------
 .../ExtUtils-MakeMaker/lib/ExtUtils/Mkbootstrap.pm |    2 +-
 cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mksymlists.pm |    2 +-
 cpan/ExtUtils-MakeMaker/lib/ExtUtils/testlib.pm    |    2 +-
 cpan/ExtUtils-MakeMaker/t/FIRST_MAKEFILE.t         |    2 +-
 cpan/ExtUtils-MakeMaker/t/INSTALL_BASE.t           |   91 +-
 cpan/ExtUtils-MakeMaker/t/MM_Unix.t                |    2 +-
 cpan/ExtUtils-MakeMaker/t/MakeMaker_Parameters.t   |   86 +-
 cpan/ExtUtils-MakeMaker/t/PL_FILES.t               |   11 +-
 cpan/ExtUtils-MakeMaker/t/basic.t                  |  101 +-
 cpan/ExtUtils-MakeMaker/t/cd.t                     |    8 +-
 cpan/ExtUtils-MakeMaker/t/echo.t                   |    7 +-
 .../t/lib/MakeMaker/Test/Setup/Unicode.pm          |   90 --
 .../t/lib/MakeMaker/Test/Setup/XS.pm               |   11 +-
 .../t/lib/MakeMaker/Test/Utils.pm                  |    8 +-
 cpan/ExtUtils-MakeMaker/t/meta_convert.t           |    2 +-
 cpan/ExtUtils-MakeMaker/t/min_perl_version.t       |   11 +-
 cpan/ExtUtils-MakeMaker/t/miniperl.t               |   19 +-
 cpan/ExtUtils-MakeMaker/t/oneliner.t               |    3 +-
 cpan/ExtUtils-MakeMaker/t/parse_version.t          |    1 -
 cpan/ExtUtils-MakeMaker/t/pm_to_blib.t             |   12 +-
 cpan/ExtUtils-MakeMaker/t/postamble.t              |    6 -
 cpan/ExtUtils-MakeMaker/t/prereq.t                 |    6 -
 cpan/ExtUtils-MakeMaker/t/recurs.t                 |   10 +-
 cpan/ExtUtils-MakeMaker/t/several_authors.t        |   15 +-
 cpan/ExtUtils-MakeMaker/t/unicode.t                |   87 --
 cpan/ExtUtils-MakeMaker/t/vstrings.t               |   73 --
 cpan/ExtUtils-MakeMaker/t/writemakefile_args.t     |   10 +-
 cpan/ExtUtils-MakeMaker/t/xs.t                     |   40 +-
 t/porting/customized.dat                           |    2 +
 61 files changed, 449 insertions(+), 2602 deletions(-)
 delete mode 100644 cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Locale.pm
 delete mode 100644 cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/version.pm
 delete mode 100644 
cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/version/regex.pm
 delete mode 100644 
cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/version/vpp.pm
 delete mode 100644 
cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/Unicode.pm
 delete mode 100644 cpan/ExtUtils-MakeMaker/t/unicode.t
 delete mode 100644 cpan/ExtUtils-MakeMaker/t/vstrings.t

diff --git a/MANIFEST b/MANIFEST
index 4f28c5f..8fb37a6 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -970,12 +970,8 @@ cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm        
        Does the real work of the a
 cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm                        Locates 
libraries
 cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Config.pm       MakeMaker 
wrapper for Config
 cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/FAQ.pod         MakeMaker FAQ
-cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Locale.pm
 cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm              Write Makefiles 
for extensions
 cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Tutorial.pod    Writing a 
module with MakeMaker
-cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/version.pm
-cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/version/regex.pm
-cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/version/vpp.pm
 cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mkbootstrap.pm            Writes a 
bootstrap file (see MakeMaker)
 cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mksymlists.pm             Writes a linker 
options file for extensions
 cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_AIX.pm                 MakeMaker 
methods for AIX
@@ -1024,7 +1020,6 @@ 
cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/PL_FILES.pm    MakeMaker 
test ut
 cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/Problem.pm  MakeMaker test 
utilities
 cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/Recurs.pm   MakeMaker test 
utilities
 cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/SAS.pm      MakeMaker test 
utilities
-cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/Unicode.pm
 cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Setup/XS.pm       MakeMaker test 
utilities
 cpan/ExtUtils-MakeMaker/t/lib/MakeMaker/Test/Utils.pm          MakeMaker test 
utilities
 cpan/ExtUtils-MakeMaker/t/lib/TieIn.pm                         Testing library 
for dummy input handles
@@ -1070,9 +1065,7 @@ cpan/ExtUtils-MakeMaker/t/test_boilerplate.t              
        MakeMaker test
 cpan/ExtUtils-MakeMaker/t/testdata/reallylongdirectoryname/arch1/Config.pm     
test data for MakeMaker
 cpan/ExtUtils-MakeMaker/t/testdata/reallylongdirectoryname/arch2/Config.pm     
test data for MakeMaker
 cpan/ExtUtils-MakeMaker/t/testlib.t                            See if 
ExtUtils::testlib works
-cpan/ExtUtils-MakeMaker/t/unicode.t
 cpan/ExtUtils-MakeMaker/t/VERSION_FROM.t                       See if 
MakeMaker's VERSION_FROM works
-cpan/ExtUtils-MakeMaker/t/vstrings.t
 cpan/ExtUtils-MakeMaker/t/WriteEmptyMakefile.t                 See if 
WriteEmptyMakefile works
 cpan/ExtUtils-MakeMaker/t/writemakefile_args.t                 See if 
WriteMakefile works
 cpan/ExtUtils-MakeMaker/t/xs.t                                 Part of 
MakeMaker's test suite
diff --git a/Makefile.SH b/Makefile.SH
index ede18d6..db66aeb 100755
--- a/Makefile.SH
+++ b/Makefile.SH
@@ -1315,9 +1315,8 @@ _cleaner2:
        -rmdir lib/IO/Compress/Adapter lib/IO/Compress lib/IO
        -rmdir lib/I18N/LangTags lib/I18N lib/Hash/Util lib/Hash lib/HTTP
        -rmdir lib/Filter/Util lib/Filter lib/File/Spec lib/ExtUtils/Typemaps
-       -rmdir lib/ExtUtils/ParseXS lib/ExtUtils/MakeMaker/version
-       -rmdir lib/ExtUtils/MakeMaker lib/ExtUtils/Liblist
-       -rmdir lib/ExtUtils/Constant lib/ExtUtils/Command
+       -rmdir lib/ExtUtils/ParseXS lib/ExtUtils/MakeMaker
+       -rmdir lib/ExtUtils/Liblist lib/ExtUtils/Constant lib/ExtUtils/Command
        -rmdir lib/ExtUtils/CBuilder/Platform/Windows
        -rmdir lib/ExtUtils/CBuilder/Platform lib/ExtUtils/CBuilder
        -rmdir lib/Exporter lib/Encode/Unicode lib/Encode/MIME/Header
diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 9a15aab..3a30842 100755
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -476,7 +476,7 @@ use File::Glob qw(:case);
     },
 
     'ExtUtils::MakeMaker' => {
-        'DISTRIBUTION' => 'BINGOS/ExtUtils-MakeMaker-7.00.tar.gz',
+        'DISTRIBUTION' => 'BINGOS/ExtUtils-MakeMaker-6.98.tar.gz',
         'FILES'        => q[cpan/ExtUtils-MakeMaker],
         'EXCLUDED'     => [
             qr{^t/lib/Test/},
@@ -488,6 +488,12 @@ use File::Glob qw(:case);
             'README.packaging',
         ],
         'CUSTOMIZED'   => [
+            # Already merged upstream in GitHub 0116aaf4e, just awaiting
+            # a new stable CPAN release
+            qw(        t/pm_to_blib.t ),
+            # Already merged upstream in GitHub 46586b12c, just awaiting
+            # a new stable CPAN release
+            qw( lib/ExtUtils/Liblist/Kid.pm ),
         ],
     },
 
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Command/MM.pm 
b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Command/MM.pm
index 69b7b01..f45d41d 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 test_s cp_nonempty);
-our $VERSION = '7.00';
+our $VERSION = '6.98';
 
 my $Is_VMS = $^O eq 'VMS';
 
@@ -116,9 +116,8 @@ sub pod2man {
                 'section|s=s', 'release|r=s', 'center|c=s',
                 'date|d=s', 'fixed=s', 'fixedbold=s', 'fixeditalic=s',
                 'fixedbolditalic=s', 'official|o', 'quotes|q=s', 'lax|l',
-                'name|n=s', 'perm_rw=i', 'utf8|u'
+                'name|n=s', 'perm_rw=i'
     );
-    delete $options{utf8} unless $Pod::Man::VERSION >= 2.17;
 
     # If there's no files, don't bother going further.
     return 0 unless @ARGV;
@@ -131,9 +130,6 @@ sub pod2man {
     # This isn't a valid Pod::Man option and is only accepted for backwards
     # compatibility.
     delete $options{lax};
-    my $count = scalar @ARGV / 2;
-    my $plural = $count == 1 ? 'document' : 'documents';
-    print "Manifying $count pod $plural\n";
 
     do {{  # so 'next' works
         my ($pod, $man) = splice(@ARGV, 0, 2);
@@ -142,6 +138,8 @@ sub pod2man {
                  (mtime($man) > mtime($pod)) &&
                  (mtime($man) > mtime("Makefile")));
 
+        print "Manifying $man\n";
+
         my $parser = Pod::Man->new(%options);
         $parser->parse_from_file($pod, $man)
           or do { warn("Could not install $man\n");  next };
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm 
b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm
index 41a0ccb..2d21e12 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 = '7.00';
+our $VERSION = '6.98';
 
 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 5288c86..7ef793f 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
@@ -11,7 +11,7 @@ use 5.006;
 
 use strict;
 use warnings;
-our $VERSION = '7.00';
+our $VERSION = '6.98_01';
 
 use ExtUtils::MakeMaker::Config;
 use Cwd 'cwd';
@@ -49,7 +49,7 @@ sub _unix_os2_ext {
     # this is a rewrite of Andy Dougherty's extliblist in perl
 
     my ( @searchpath );    # from "-L/path" entries in $potential_libs
-    my ( @libpath ) = split " ", $Config{'libpth'} || '';
+    my ( @libpath ) = split " ", $Config{'libpth'};
     my ( @ldloadlibs, @bsloadlibs, @extralibs, @ld_run_path, %ld_run_path_seen 
);
     my ( @libs,       %libs_seen );
     my ( $fullname,   @fullname );
@@ -57,7 +57,6 @@ sub _unix_os2_ext {
     my ( $found ) = 0;
 
     foreach my $thislib ( split ' ', $potential_libs ) {
-        my ( $custom_name ) = '';
 
         # Handle possible linker path arguments.
         if ( $thislib =~ s/^(-[LR]|-Wl,-R|-Wl,-rpath,)// ) {    # save path 
flag type
@@ -93,14 +92,7 @@ sub _unix_os2_ext {
         }
 
         # Handle possible library arguments.
-        if ( $thislib =~ s/^-l(:)?// ) {
-            # Handle -l:foo.so, which means that the library will
-            # actually be called foo.so, not libfoo.so.  This
-            # is used in Android by ExtUtils::Depends to allow one XS
-            # module to link to another.
-            $custom_name = $1 || '';
-        }
-        else {
+        unless ( $thislib =~ s/^-l// ) {
             warn "Unrecognized argument in LIBS ignored: '$thislib'\n";
             next;
         }
@@ -186,8 +178,6 @@ sub _unix_os2_ext {
                 #
                 # , the compilation tools expand the environment variables.)
             }
-            elsif ( $custom_name && -f ( $fullname = "$thispth/$thislib" ) ) {
-            }
             else {
                 warn "$thislib not found in $thispth\n" if $verbose;
                 next;
@@ -201,7 +191,7 @@ sub _unix_os2_ext {
 
             # what do we know about this library...
             my $is_dyna = ( $fullname !~ /\Q$Config_libext\E\z/ );
-            my $in_perl = ( $libs =~ /\B-l:?\Q${thislib}\E\b/s );
+            my $in_perl = ( $libs =~ /\B-l\Q${thislib}\E\b/s );
 
             # include the path to the lib once in the dynamic linker path
             # but only if it is a dynamic lib and not in Perl itself
@@ -221,7 +211,7 @@ sub _unix_os2_ext {
                     && ( $thislib eq 'm' || $thislib eq 'ndbm' ) )
               )
             {
-                push( @extralibs, "-l$custom_name$thislib" );
+                push( @extralibs, "-l$thislib" );
             }
 
             # We might be able to load this archive file dynamically
@@ -243,11 +233,11 @@ sub _unix_os2_ext {
 
                     # For SunOS4, do not add in this shared library if
                     # it is already linked in the main perl executable
-                    push( @ldloadlibs, "-l$custom_name$thislib" )
+                    push( @ldloadlibs, "-l$thislib" )
                       unless ( $in_perl and $^O eq 'sunos' );
                 }
                 else {
-                    push( @ldloadlibs, "-l$custom_name$thislib" );
+                    push( @ldloadlibs, "-l$thislib" );
                 }
             }
             last;    # found one here so don't bother looking further
@@ -342,8 +332,8 @@ sub _win32_ext {
     return ( '', '', '', '', ( $give_libs ? \@libs : () ) ) unless @extralibs;
 
     # make sure paths with spaces are properly quoted
-    @extralibs = map { qq["$_"] } @extralibs;
-    @libs      = map { qq["$_"] } @libs;
+    @extralibs = map { /\s/ ? qq["$_"] : $_ } @extralibs;
+    @libs      = map { /\s/ ? qq["$_"] : $_ } @libs;
 
     my $lib = join( ' ', @extralibs );
 
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm 
b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm
index 5cfef9c..a34015f 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 = '7.00';
+our $VERSION = '6.98';
 
 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 b493d11..7c600a6 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 = '7.00';
+our $VERSION = '6.98';
 
 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 bf5cb38..2066311 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 = '7.00';
+our $VERSION = '6.98';
 
 use Carp;
 use File::Spec;
@@ -125,142 +125,6 @@ sub can_load_xs {
 }
 
 
-=head3 can_run
-
-  use ExtUtils::MM;
-  my $runnable = MM->can_run($Config{make});
-
-If called in a scalar context it will return the full path to the binary
-you asked for if it was found, or C<undef> if it was not.
-
-If called in a list context, it will return a list of the full paths to 
instances
-of the binary where found in C<PATH>, or an empty list if it was not found.
-
-Copied from L<IPC::Cmd|IPC::Cmd/"$path = can_run( PROGRAM );">, but modified 
into
-a method (and removed C<$INSTANCES> capability).
-
-=cut
-
-sub can_run {
-    my ($self, $command) = @_;
-
-    # a lot of VMS executables have a symbol defined
-    # check those first
-    if ( $^O eq 'VMS' ) {
-        require VMS::DCLsym;
-        my $syms = VMS::DCLsym->new;
-        return $command if scalar $syms->getsym( uc $command );
-    }
-
-    my @possibles;
-
-    if( File::Spec->file_name_is_absolute($command) ) {
-        return $self->maybe_command($command);
-
-    } else {
-        for my $dir (
-            File::Spec->path,
-            File::Spec->curdir
-        ) {
-            next if ! $dir || ! -d $dir;
-            my $abs = File::Spec->catfile($self->os_flavor_is('Win32') ? 
Win32::GetShortPathName( $dir ) : $dir, $command);
-            push @possibles, $abs if $abs = $self->maybe_command($abs);
-        }
-    }
-    return @possibles if wantarray;
-    return shift @possibles;
-}
-
-
-=head3 can_redirect_error
-
-  $useredirect = MM->can_redirect_error;
-
-True if on an OS where qx operator (or backticks) can redirect C<STDERR>
-onto C<STDOUT>.
-
-=cut
-
-sub can_redirect_error {
-  my $self = shift;
-  $self->os_flavor_is('Unix')
-      or ($self->os_flavor_is('Win32') and !$self->os_flavor_is('Win9x'))
-      or $self->os_flavor_is('OS/2')
-}
-
-
-=head3 is_make_type
-
-    my $is_dmake = $self->is_make_type('dmake');
-
-Returns true if C<<$self->make>> is the given type; possibilities are:
-
-  gmake    GNU make
-  dmake
-  nmake
-  bsdmake  BSD pmake-derived
-
-=cut
-
-sub is_make_type {
-    my($self, $type) = @_;
-    (undef, undef, my $make_basename) = $self->splitpath($self->make);
-    return 1 if $make_basename =~ /\b$type\b/; # executable's filename
-    # now have to run with "-v" and guess
-    my $redirect = $self->can_redirect_error ? '2>&1' : '';
-    my $make = $self->make || $self->{MAKE};
-    my $minus_v = `"$make" -v $redirect`;
-    return 1 if $type eq 'gmake' and $minus_v =~ /GNU make/i;
-    return 1 if $type eq 'bsdmake'
-      and $minus_v =~ /^usage: make \[-BeikNnqrstWwX\]/im;
-    0; # it wasn't whatever you asked
-}
-
-
-=head3 can_dep_space
-
-    my $can_dep_space = $self->can_dep_space;
-
-Returns true if C<make> can handle (probably by quoting)
-dependencies that contain a space. Currently known true for GNU make,
-false for BSD pmake derivative.
-
-=cut
-
-my $cached_dep_space;
-sub can_dep_space {
-    my $self = shift;
-    return $cached_dep_space if defined $cached_dep_space;
-    return $cached_dep_space = 1 if $self->is_make_type('gmake');
-    return $cached_dep_space = 0 if $self->is_make_type('dmake'); # only on W32
-    return $cached_dep_space = 0 if $self->is_make_type('bsdmake');
-    return $cached_dep_space = 0; # assume no
-}
-
-
-=head3 quote_dep
-
-  $text = $mm->quote_dep($text);
-
-Method that protects Makefile single-value constants (mainly filenames),
-so that make will still treat them as single values even if they
-inconveniently have spaces in. If the make program being used cannot
-achieve such protection and the given text would need it, throws an
-exception.
-
-=cut
-
-sub quote_dep {
-    my ($self, $arg) = @_;
-    die <<EOF if $arg =~ / / and not $self->can_dep_space;
-Tried to use make dependency with space for make that can't:
-  '$arg'
-EOF
-    $arg =~ s/( )/\\$1/g; # how GNU make does it
-    return $arg;
-}
-
-
 =head3 split_command
 
     my @cmds = $MM->split_command($cmd, @args);
@@ -917,10 +781,9 @@ END
     my @man_cmds;
     foreach my $section (qw(1 3)) {
         my $pods = $self->{"MAN${section}PODS"};
-        my $p2m = sprintf <<CMD, $] > 5.008 ? " -u" : "";
-       \$(NOECHO) \$(POD2MAN) --section=$section --perm_rw=\$(PERM_RW)%s
+        push @man_cmds, $self->split_command(<<CMD, map {($_,$pods->{$_})} 
sort keys %$pods);
+       \$(NOECHO) \$(POD2MAN) --section=$section --perm_rw=\$(PERM_RW)
 CMD
-        push @man_cmds, $self->split_command($p2m, map {($_,$pods->{$_})} sort 
keys %$pods);
     }
 
     $manify .= "\t\$(NOECHO) \$(NOOP)\n" unless @man_cmds;
@@ -1174,7 +1037,8 @@ sub _add_requirements_to_meta_v1_4 {
     # Check the original args so we can tell between the user setting it
     # to an empty hash and it just being initialized.
     if( $self->{ARGS}{CONFIGURE_REQUIRES} ) {
-        $meta{configure_requires} = $self->{CONFIGURE_REQUIRES};
+        $meta{configure_requires}
+            = _normalize_prereqs($self->{CONFIGURE_REQUIRES});
     } else {
         $meta{configure_requires} = {
             'ExtUtils::MakeMaker'       => 0,
@@ -1182,7 +1046,7 @@ sub _add_requirements_to_meta_v1_4 {
     }
 
     if( $self->{ARGS}{BUILD_REQUIRES} ) {
-        $meta{build_requires} = $self->{BUILD_REQUIRES};
+        $meta{build_requires} = _normalize_prereqs($self->{BUILD_REQUIRES});
     } else {
         $meta{build_requires} = {
             'ExtUtils::MakeMaker'       => 0,
@@ -1192,11 +1056,11 @@ sub _add_requirements_to_meta_v1_4 {
     if( $self->{ARGS}{TEST_REQUIRES} ) {
         $meta{build_requires} = {
           %{ $meta{build_requires} },
-          %{ $self->{TEST_REQUIRES} },
+          %{ _normalize_prereqs($self->{TEST_REQUIRES}) },
         };
     }
 
-    $meta{requires} = $self->{PREREQ_PM}
+    $meta{requires} = _normalize_prereqs($self->{PREREQ_PM})
         if defined $self->{PREREQ_PM};
     $meta{requires}{perl} = _normalize_version($self->{MIN_PERL_VERSION})
         if $self->{MIN_PERL_VERSION};
@@ -1210,7 +1074,8 @@ sub _add_requirements_to_meta_v2 {
     # Check the original args so we can tell between the user setting it
     # to an empty hash and it just being initialized.
     if( $self->{ARGS}{CONFIGURE_REQUIRES} ) {
-        $meta{prereqs}{configure}{requires} = $self->{CONFIGURE_REQUIRES};
+        $meta{prereqs}{configure}{requires}
+            = _normalize_prereqs($self->{CONFIGURE_REQUIRES});
     } else {
         $meta{prereqs}{configure}{requires} = {
             'ExtUtils::MakeMaker'       => 0,
@@ -1218,7 +1083,7 @@ sub _add_requirements_to_meta_v2 {
     }
 
     if( $self->{ARGS}{BUILD_REQUIRES} ) {
-        $meta{prereqs}{build}{requires} = $self->{BUILD_REQUIRES};
+        $meta{prereqs}{build}{requires} = 
_normalize_prereqs($self->{BUILD_REQUIRES});
     } else {
         $meta{prereqs}{build}{requires} = {
             'ExtUtils::MakeMaker'       => 0,
@@ -1226,10 +1091,10 @@ sub _add_requirements_to_meta_v2 {
     }
 
     if( $self->{ARGS}{TEST_REQUIRES} ) {
-        $meta{prereqs}{test}{requires} = $self->{TEST_REQUIRES};
+        $meta{prereqs}{test}{requires} = 
_normalize_prereqs($self->{TEST_REQUIRES});
     }
 
-    $meta{prereqs}{runtime}{requires} = $self->{PREREQ_PM}
+    $meta{prereqs}{runtime}{requires} = _normalize_prereqs($self->{PREREQ_PM})
         if $self->{ARGS}{PREREQ_PM};
     $meta{prereqs}{runtime}{requires}{perl} = 
_normalize_version($self->{MIN_PERL_VERSION})
         if $self->{MIN_PERL_VERSION};
@@ -1237,6 +1102,15 @@ sub _add_requirements_to_meta_v2 {
     return %meta;
 }
 
+sub _normalize_prereqs {
+  my ($hash) = @_;
+  my %prereqs;
+  while ( my ($k,$v) = each %$hash ) {
+    $prereqs{$k} = _normalize_version($v);
+  }
+  return \%prereqs;
+}
+
 # Adapted from Module::Build::Base
 sub _normalize_version {
   my ($version) = @_;
@@ -2119,7 +1993,7 @@ sub init_VERSION {
     if (defined $self->{VERSION}) {
         if ( $self->{VERSION} !~ /^\s*v?[\d_\.]+\s*$/ ) {
           require version;
-          my $normal = eval { version->new( $self->{VERSION} ) };
+          my $normal = eval { version->parse( $self->{VERSION} ) };
           $self->{VERSION} = $normal if defined $normal;
         }
         $self->{VERSION} =~ s/^\s+//;
@@ -2186,7 +2060,7 @@ Defines at least these macros.
 sub init_tools {
     my $self = shift;
 
-    $self->{ECHO}     ||= $self->oneliner('binmode STDOUT, qq{:raw}; print 
qq{@ARGV}', ['-l']);
+    $self->{ECHO}     ||= $self->oneliner('print qq{@ARGV}', ['-l']);
     $self->{ECHO_N}   ||= $self->oneliner('print qq{@ARGV}');
 
     $self->{TOUCH}    ||= $self->oneliner('touch', ["-MExtUtils::Command"]);
@@ -2848,7 +2722,7 @@ Used by perldepend() in MM_Unix and MM_VMS via 
_perl_header_files_fragment()
 sub _perl_header_files {
     my $self = shift;
 
-    my $header_dir = $self->{PERL_SRC} || $ENV{PERL_SRC} || 
$self->catdir($Config{archlibexp}, 'CORE');
+    my $header_dir = $self->{PERL_SRC} || $self->catdir($Config{archlibexp}, 
'CORE');
     opendir my $dh, $header_dir
         or die "Failed to opendir '$header_dir' to find header files: $!";
 
@@ -2885,7 +2759,7 @@ sub _perl_header_files_fragment {
     return join("\\\n",
                 "PERL_HDRS = ",
                 map {
-                    sprintf( "        \$(PERL_INCDEP)%s%s            ", 
$separator, $_ )
+                    sprintf( "        \$(PERL_INC)%s%s            ", 
$separator, $_ )
                 } $self->_perl_header_files()
            ) . "\n\n"
            . "\$(OBJECT) : \$(PERL_HDRS)\n";
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_BeOS.pm 
b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_BeOS.pm
index 0b1ad0d..060ce36 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 = '7.00';
+our $VERSION = '6.98';
 
 
 =item os_flavor
@@ -50,7 +50,6 @@ sub init_linker {
 
     $self->{PERL_ARCHIVE} ||=
       File::Spec->catdir('$(PERL_INC)',$Config{libperl});
-    $self->{PERL_ARCHIVEDEP} ||= '';
     $self->{PERL_ARCHIVE_AFTER} ||= '';
     $self->{EXPORT_LIST}  ||= '';
 }
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Cygwin.pm 
b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Cygwin.pm
index 0843e5a..d8f3e3a 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 = '7.00';
+our $VERSION = '6.98';
 
 
 =head1 NAME
@@ -94,7 +94,6 @@ sub init_linker {
           '$(PERL_INC)' .'/'. ("$Config{libperl}" or "libperl.a");
     }
 
-    $self->{PERL_ARCHIVEDEP} ||= '';
     $self->{PERL_ARCHIVE_AFTER} ||= '';
     $self->{EXPORT_LIST}  ||= '';
 }
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_DOS.pm 
b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_DOS.pm
index 839c20f..4f52a98 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 = '7.00';
+our $VERSION = '6.98';
 
 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 c537721..861a544 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 = '7.00';
+our $VERSION = '6.98';
 
 
 =head1 NAME
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_MacOS.pm 
b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_MacOS.pm
index 7107d24..cd3a12a 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 = '7.00';
+our $VERSION = '6.98';
 
 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 585d607..f6b0b5b 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 = '7.00';
+our $VERSION = '6.98';
 
 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 23c17de..52bc4d1 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 = '7.00';
+our $VERSION = '6.98';
 
 require ExtUtils::MM_Any;
 require ExtUtils::MM_Unix;
@@ -129,7 +129,6 @@ sub init_linker {
 
     $self->{PERL_ARCHIVE} = "\$(PERL_INC)/libperl\$(LIB_EXT)";
 
-    $self->{PERL_ARCHIVEDEP} ||= '';
     $self->{PERL_ARCHIVE_AFTER} = $OS2::is_aout
       ? ''
       : '$(PERL_INC)/libperl_override$(LIB_EXT)';
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_QNX.pm 
b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_QNX.pm
index 379a677..7b74bf4 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 = '7.00';
+our $VERSION = '6.98';
 
 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 5c87daf..5b97300 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 = '7.00';
+our $VERSION = '6.98';
 
 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 9fa6704..4140432 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 = '7.00';
+$VERSION = '6.98';
 $VERSION = eval $VERSION;  ## no critic [BuiltinFunctions::ProhibitStringyEval]
 
 require ExtUtils::MM_Any;
@@ -190,19 +190,6 @@ sub cflags {
 
     @cflags{qw(cc ccflags optimize shellflags)}
        = @Config{qw(cc ccflags optimize shellflags)};
-
-    # Perl 5.21.4 adds the (gcc) warning (-Wall ...) and std (-std=c89)
-    # flags to the %Config, and the modules in the core can be built
-    # with those.
-    my @ccextraflags = qw(ccwarnflags ccstdflags);
-    if ($ENV{PERL_CORE}) {
-      for my $x (@ccextraflags) {
-        if (exists $Config{$x}) {
-          $cflags{$x} = $Config{$x};
-        }
-      }
-    }
-
     my($optdebug) = "";
 
     $cflags{shellflags} ||= '';
@@ -271,10 +258,6 @@ sub cflags {
        $self->{CCFLAGS} .= ' -DPERL_POLLUTE ';
     }
 
-    for my $x (@ccextraflags) {
-      $self->{CCFLAGS} .= $cflags{$x} if exists $cflags{$x};
-    }
-
     my $pollute = '';
     if ($Config{usemymalloc} and not $Config{bincompat5005}
        and not $Config{ccflags} =~ /-DPERL_POLLUTE_MALLOC\b/
@@ -404,10 +387,10 @@ sub constants {
                         } $self->installvars),
                    qw(
               PERL_LIB
-              PERL_ARCHLIB PERL_ARCHLIBDEP
+              PERL_ARCHLIB
               LIBPERL_A MYEXTLIB
               FIRST_MAKEFILE MAKEFILE_OLD MAKE_APERL_FILE
-              PERLMAINCC PERL_SRC PERL_INC PERL_INCDEP
+              PERLMAINCC PERL_SRC PERL_INC
               PERL            FULLPERL          ABSPERL
               PERLRUN         FULLPERLRUN       ABSPERLRUN
               PERLRUNINST     FULLPERLRUNINST   ABSPERLRUNINST
@@ -421,8 +404,6 @@ sub constants {
         # pathnames can have sharp signs in them; escape them so
         # make doesn't think it is a comment-start character.
         $self->{$macro} =~ s/#/\\#/g;
-       $self->{$macro} = $self->quote_dep($self->{$macro})
-         if $ExtUtils::MakeMaker::macro_dep{$macro};
        push @m, "$macro = $self->{$macro}\n";
     }
 
@@ -462,7 +443,7 @@ MAN3PODS = ".$self->wraplist(sort keys 
%{$self->{MAN3PODS}})."
 
     push @m, q{
 # Where is the Config information that we are using/depend on
-CONFIGDEP = $(PERL_ARCHLIBDEP)$(DFSEP)Config.pm $(PERL_INCDEP)$(DFSEP)config.h
+CONFIGDEP = $(PERL_ARCHLIB)$(DFSEP)Config.pm $(PERL_INC)$(DFSEP)config.h
 } if -e File::Spec->catfile( $self->{PERL_INC}, 'config.h' );
 
 
@@ -479,11 +460,11 @@ INST_DYNAMIC     = $self->{INST_DYNAMIC}
 INST_BOOT        = $self->{INST_BOOT}
 };
 
+
     push @m, qq{
 # Extra linker info
 EXPORT_LIST        = $self->{EXPORT_LIST}
 PERL_ARCHIVE       = $self->{PERL_ARCHIVE}
-PERL_ARCHIVEDEP    = $self->{PERL_ARCHIVEDEP}
 PERL_ARCHIVE_AFTER = $self->{PERL_ARCHIVE_AFTER}
 };
 
@@ -897,8 +878,8 @@ $(BOOTSTRAP) : $(FIRST_MAKEFILE) $(BOOTDEP) 
$(INST_ARCHAUTODIR)$(DFSEP).exists
        $(NOECHO) $(PERLRUN) \
                "-MExtUtils::Mkbootstrap" \
                -e "Mkbootstrap('$(BASEEXT)','$(BSLOADLIBS)');"
-       $(NOECHO) $(TOUCH) "%s"
-       $(CHMOD) $(PERM_RW) "%s"
+       $(NOECHO) $(TOUCH) %s
+       $(CHMOD) $(PERM_RW) %s
 MAKE_FRAG
 }
 
@@ -930,7 +911,7 @@ OTHERLDFLAGS = '.$ld_opt.$otherldflags.'
 INST_DYNAMIC_DEP = '.$inst_dynamic_dep.'
 INST_DYNAMIC_FIX = '.$ld_fix.'
 
-$(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(INST_ARCHAUTODIR)$(DFSEP).exists 
$(EXPORT_LIST) $(PERL_ARCHIVEDEP) $(PERL_ARCHIVE_AFTER) $(INST_DYNAMIC_DEP)
+$(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(INST_ARCHAUTODIR)$(DFSEP).exists 
$(EXPORT_LIST) $(PERL_ARCHIVE) $(PERL_ARCHIVE_AFTER) $(INST_DYNAMIC_DEP)
 ');
     if ($armaybe ne ':'){
        $ldfrom = 'tmp$(LIB_EXT)';
@@ -959,13 +940,13 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) 
$(INST_ARCHAUTODIR)$(DFSEP).exists $(EXPO
        # platforms.  We peek at lddlflags to see if we need -Wl,-R
        # or -R to add paths to the run-time library search path.
         if ($Config{'lddlflags'} =~ /-Wl,-R/) {
-            $libs .= ' "-L$(PERL_INC)" "-Wl,-R$(INSTALLARCHLIB)/CORE" 
"-Wl,-R$(PERL_ARCHLIB)/CORE" -lperl';
+            $libs .= ' -L$(PERL_INC) -Wl,-R$(INSTALLARCHLIB)/CORE 
-Wl,-R$(PERL_ARCHLIB)/CORE -lperl';
         } elsif ($Config{'lddlflags'} =~ /-R/) {
-            $libs .= ' "-L$(PERL_INC)" "-R$(INSTALLARCHLIB)/CORE" 
"-R$(PERL_ARCHLIB)/CORE" -lperl';
+            $libs .= ' -L$(PERL_INC) -R$(INSTALLARCHLIB)/CORE 
-R$(PERL_ARCHLIB)/CORE -lperl';
         } elsif ( $Is{Android} ) {
             # The Android linker will not recognize symbols from
             # libperl unless the module explicitly depends on it.
-            $libs .= ' "-L$(PERL_INC)" -lperl';
+            $libs .= ' -L$(PERL_INC) -lperl';
         }
     }
 
@@ -1062,7 +1043,7 @@ WARNING
             next unless $self->maybe_command($abs);
             print "Executing $abs\n" if ($trace >= 2);
 
-            my $version_check = qq{"$abs" -le "require $ver; print 
qq{VER_OK}"};
+            my $version_check = qq{$abs -le "require $ver; print qq{VER_OK}"};
 
             # To avoid using the unportable 2>&1 to suppress STDERR,
             # we close it before running the command.
@@ -1210,6 +1191,10 @@ sub _fixin_replace_shebang {
             $shb .= ' ' . $arg if defined $arg;
             $shb .= "\n";
         }
+        $shb .= qq{
+eval 'exec $interpreter $arg -S \$0 \${1+"\$\@"}'
+    if 0; # not running under some shell
+} unless $Is{Win32};    # this won't work on win32, so don't
     }
     else {
         warn "Can't find $cmd in PATH, $file unchanged"
@@ -1727,8 +1712,6 @@ EOP
        $self->{PERL_LIB} = File::Spec->rel2abs($self->{PERL_LIB});
        $self->{PERL_ARCHLIB} = File::Spec->rel2abs($self->{PERL_ARCHLIB});
     }
-    $self->{PERL_INCDEP} = $self->{PERL_INC};
-    $self->{PERL_ARCHLIBDEP} = $self->{PERL_ARCHLIB};
 
     # We get SITELIBEXP and SITEARCHEXP directly via
     # Get_from_Config. When we are running standard modules, these
@@ -1822,7 +1805,6 @@ Unix has no need of special linker flags.
 sub init_linker {
     my($self) = shift;
     $self->{PERL_ARCHIVE} ||= '';
-    $self->{PERL_ARCHIVEDEP} ||= '';
     $self->{PERL_ARCHIVE_AFTER} ||= '';
     $self->{EXPORT_LIST}  ||= '';
 }
@@ -1927,18 +1909,8 @@ sub init_PERL {
 
     $self->{PERL} ||=
         $self->find_perl(5.0, \@perls, \@defpath, $Verbose );
-
-    my $perl = $self->{PERL};
-    $perl =~ s/^"//;
-    my $perlflags = '';
-    my $stripped_perl;
-    while ($perl) {
-       ($stripped_perl = $perl) =~ s/"$//;
-       last if -x $stripped_perl;
-       last unless $perl =~ s/(\s+\S+)$//;
-       $perlflags = $1.$perlflags;
-    }
-    $self->{PERL} = $stripped_perl;
+    # don't check if perl is executable, maybe they have decided to
+    # supply switches with perl
 
     # When built for debugging, VMS doesn't create perl.exe but ndbgperl.exe.
     my $perl_name = 'perl';
@@ -1948,15 +1920,13 @@ sub init_PERL {
     # XXX This logic is flawed.  If "miniperl" is anywhere in the path
     # it will get confused.  It should be fixed to work only on the filename.
     # Define 'FULLPERL' to be a non-miniperl (used in test: target)
-    unless ($self->{FULLPERL}) {
-      ($self->{FULLPERL} = $self->{PERL}) =~ 
s/\Q$miniperl\E$/$perl_name$Config{exe_ext}/i;
-      $self->{FULLPERL} = qq{"$self->{FULLPERL}"}.$perlflags;
-    }
-    # Can't have an image name with quotes, and findperl will have
-    # already escaped spaces.
-    $self->{FULLPERL} =~ tr/"//d if $Is{VMS};
+    ($self->{FULLPERL} = $self->{PERL}) =~ 
s/\Q$miniperl\E$/$perl_name$Config{exe_ext}/i
+       unless $self->{FULLPERL};
 
+    # Little hack to get around VMS's find_perl putting "MCR" in front
+    # sometimes.
     $self->{ABSPERL} = $self->{PERL};
+    my $has_mcr = $self->{ABSPERL} =~ s/^MCR\s*//;
     if( $self->file_name_is_absolute($self->{ABSPERL}) ) {
         $self->{ABSPERL} = '$(PERL)';
     }
@@ -1966,12 +1936,9 @@ sub init_PERL {
         # Quote the perl command if it contains whitespace
         $self->{ABSPERL} = $self->quote_literal($self->{ABSPERL})
           if $self->{ABSPERL} =~ /\s/;
-    }
-    $self->{PERL} = qq{"$self->{PERL}"}.$perlflags;
 
-    # Can't have an image name with quotes, and findperl will have
-    # already escaped spaces.
-    $self->{PERL} =~ tr/"//d if $Is{VMS};
+        $self->{ABSPERL} = 'MCR '.$self->{ABSPERL} if $has_mcr;
+    }
 
     # Are we building the core?
     $self->{PERL_CORE} = $ENV{PERL_CORE} unless exists $self->{PERL_CORE};
@@ -1981,16 +1948,14 @@ sub init_PERL {
     foreach my $perl (qw(PERL FULLPERL ABSPERL)) {
         my $run  = $perl.'RUN';
 
-        $self->{$run}  = qq{\$($perl)};
-        $self->{$run}  = 'MCR ' . $self->{$run} if $Is{VMS};
+        $self->{$run}  = "\$($perl)";
 
         # Make sure perl can find itself before it's installed.
         $self->{$run} .= q{ "-I$(PERL_LIB)" "-I$(PERL_ARCHLIB)"}
           if $self->{UNINSTALLED_PERL} || $self->{PERL_CORE};
 
         $self->{$perl.'RUNINST'} =
-          sprintf q{$(%sRUN)%s "-I$(INST_ARCHLIB)" "-I$(INST_LIB)"},
-           $perl, $perlflags;
+          sprintf q{$(%sRUN) "-I$(INST_ARCHLIB)" "-I$(INST_LIB)"}, $perl;
     }
 
     return 1;
@@ -2114,54 +2079,54 @@ pure_perl_install :: all
 };
 
     push @m,
-q{             read 
"}.$self->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').q{" \
-               write 
"}.$self->catfile('$(DESTINSTALLARCHLIB)','auto','$(FULLEXT)','.packlist').q{" \
+q{             read 
}.$self->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').q{ \
+               write 
}.$self->catfile('$(DESTINSTALLARCHLIB)','auto','$(FULLEXT)','.packlist').q{ \
 } unless $self->{NO_PACKLIST};
 
     push @m,
-q{             "$(INST_LIB)" "$(DESTINSTALLPRIVLIB)" \
-               "$(INST_ARCHLIB)" "$(DESTINSTALLARCHLIB)" \
-               "$(INST_BIN)" "$(DESTINSTALLBIN)" \
-               "$(INST_SCRIPT)" "$(DESTINSTALLSCRIPT)" \
-               "$(INST_MAN1DIR)" "$(DESTINSTALLMAN1DIR)" \
-               "$(INST_MAN3DIR)" "$(DESTINSTALLMAN3DIR)"
+q{             $(INST_LIB) $(DESTINSTALLPRIVLIB) \
+               $(INST_ARCHLIB) $(DESTINSTALLARCHLIB) \
+               $(INST_BIN) $(DESTINSTALLBIN) \
+               $(INST_SCRIPT) $(DESTINSTALLSCRIPT) \
+               $(INST_MAN1DIR) $(DESTINSTALLMAN1DIR) \
+               $(INST_MAN3DIR) $(DESTINSTALLMAN3DIR)
        $(NOECHO) $(WARN_IF_OLD_PACKLIST) \
-               "}.$self->catdir('$(SITEARCHEXP)','auto','$(FULLEXT)').q{"
+               }.$self->catdir('$(SITEARCHEXP)','auto','$(FULLEXT)').q{
 
 
 pure_site_install :: all
        $(NOECHO) $(MOD_INSTALL) \
 };
     push @m,
-q{             read 
"}.$self->catfile('$(SITEARCHEXP)','auto','$(FULLEXT)','.packlist').q{" \
-               write 
"}.$self->catfile('$(DESTINSTALLSITEARCH)','auto','$(FULLEXT)','.packlist').q{" 
\
+q{             read 
}.$self->catfile('$(SITEARCHEXP)','auto','$(FULLEXT)','.packlist').q{ \
+               write 
}.$self->catfile('$(DESTINSTALLSITEARCH)','auto','$(FULLEXT)','.packlist').q{ \
 } unless $self->{NO_PACKLIST};
 
     push @m,
-q{             "$(INST_LIB)" "$(DESTINSTALLSITELIB)" \
-               "$(INST_ARCHLIB)" "$(DESTINSTALLSITEARCH)" \
-               "$(INST_BIN)" "$(DESTINSTALLSITEBIN)" \
-               "$(INST_SCRIPT)" "$(DESTINSTALLSITESCRIPT)" \
-               "$(INST_MAN1DIR)" "$(DESTINSTALLSITEMAN1DIR)" \
-               "$(INST_MAN3DIR)" "$(DESTINSTALLSITEMAN3DIR)"
+q{             $(INST_LIB) $(DESTINSTALLSITELIB) \
+               $(INST_ARCHLIB) $(DESTINSTALLSITEARCH) \
+               $(INST_BIN) $(DESTINSTALLSITEBIN) \
+               $(INST_SCRIPT) $(DESTINSTALLSITESCRIPT) \
+               $(INST_MAN1DIR) $(DESTINSTALLSITEMAN1DIR) \
+               $(INST_MAN3DIR) $(DESTINSTALLSITEMAN3DIR)
        $(NOECHO) $(WARN_IF_OLD_PACKLIST) \
-               "}.$self->catdir('$(PERL_ARCHLIB)','auto','$(FULLEXT)').q{"
+               }.$self->catdir('$(PERL_ARCHLIB)','auto','$(FULLEXT)').q{
 
 pure_vendor_install :: all
        $(NOECHO) $(MOD_INSTALL) \
 };
     push @m,
-q{             read 
"}.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{" \
-               write 
"}.$self->catfile('$(DESTINSTALLVENDORARCH)','auto','$(FULLEXT)','.packlist').q{"
 \
+q{             read 
}.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{ \
+               write 
}.$self->catfile('$(DESTINSTALLVENDORARCH)','auto','$(FULLEXT)','.packlist').q{ 
\
 } unless $self->{NO_PACKLIST};
 
     push @m,
-q{             "$(INST_LIB)" "$(DESTINSTALLVENDORLIB)" \
-               "$(INST_ARCHLIB)" "$(DESTINSTALLVENDORARCH)" \
-               "$(INST_BIN)" "$(DESTINSTALLVENDORBIN)" \
-               "$(INST_SCRIPT)" "$(DESTINSTALLVENDORSCRIPT)" \
-               "$(INST_MAN1DIR)" "$(DESTINSTALLVENDORMAN1DIR)" \
-               "$(INST_MAN3DIR)" "$(DESTINSTALLVENDORMAN3DIR)"
+q{             $(INST_LIB) $(DESTINSTALLVENDORLIB) \
+               $(INST_ARCHLIB) $(DESTINSTALLVENDORARCH) \
+               $(INST_BIN) $(DESTINSTALLVENDORBIN) \
+               $(INST_SCRIPT) $(DESTINSTALLVENDORSCRIPT) \
+               $(INST_MAN1DIR) $(DESTINSTALLVENDORMAN1DIR) \
+               $(INST_MAN3DIR) $(DESTINSTALLVENDORMAN3DIR)
 
 };
 
@@ -2179,37 +2144,37 @@ doc_vendor_install :: all
 
     push @m, q{
 doc_perl_install :: all
-       $(NOECHO) $(ECHO) Appending installation info to 
"$(DESTINSTALLARCHLIB)/perllocal.pod"
-       -$(NOECHO) $(MKPATH) "$(DESTINSTALLARCHLIB)"
+       $(NOECHO) $(ECHO) Appending installation info to 
$(DESTINSTALLARCHLIB)/perllocal.pod
+       -$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB)
        -$(NOECHO) $(DOC_INSTALL) \
                "Module" "$(NAME)" \
-               "installed into" $(INSTALLPRIVLIB) \
+               "installed into" "$(INSTALLPRIVLIB)" \
                LINKTYPE "$(LINKTYPE)" \
                VERSION "$(VERSION)" \
                EXE_FILES "$(EXE_FILES)" \
-               >> 
"}.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{"
+               >> }.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{
 
 doc_site_install :: all
-       $(NOECHO) $(ECHO) Appending installation info to 
"$(DESTINSTALLARCHLIB)/perllocal.pod"
-       -$(NOECHO) $(MKPATH) "$(DESTINSTALLARCHLIB)"
+       $(NOECHO) $(ECHO) Appending installation info to 
$(DESTINSTALLARCHLIB)/perllocal.pod
+       -$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB)
        -$(NOECHO) $(DOC_INSTALL) \
                "Module" "$(NAME)" \
-               "installed into" $(INSTALLSITELIB) \
+               "installed into" "$(INSTALLSITELIB)" \
                LINKTYPE "$(LINKTYPE)" \
                VERSION "$(VERSION)" \
                EXE_FILES "$(EXE_FILES)" \
-               >> 
"}.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{"
+               >> }.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{
 
 doc_vendor_install :: all
-       $(NOECHO) $(ECHO) Appending installation info to 
"$(DESTINSTALLARCHLIB)/perllocal.pod"
-       -$(NOECHO) $(MKPATH) "$(DESTINSTALLARCHLIB)"
+       $(NOECHO) $(ECHO) Appending installation info to 
$(DESTINSTALLARCHLIB)/perllocal.pod
+       -$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB)
        -$(NOECHO) $(DOC_INSTALL) \
                "Module" "$(NAME)" \
-               "installed into" $(INSTALLVENDORLIB) \
+               "installed into" "$(INSTALLVENDORLIB)" \
                LINKTYPE "$(LINKTYPE)" \
                VERSION "$(VERSION)" \
                EXE_FILES "$(EXE_FILES)" \
-               >> 
"}.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{"
+               >> }.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{
 
 } unless $self->{NO_PERLLOCAL};
 
@@ -2218,13 +2183,13 @@ uninstall :: uninstall_from_$(INSTALLDIRS)dirs
        $(NOECHO) $(NOOP)
 
 uninstall_from_perldirs ::
-       $(NOECHO) $(UNINSTALL) 
"}.$self->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').q{"
+       $(NOECHO) $(UNINSTALL) 
}.$self->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').q{
 
 uninstall_from_sitedirs ::
-       $(NOECHO) $(UNINSTALL) 
"}.$self->catfile('$(SITEARCHEXP)','auto','$(FULLEXT)','.packlist').q{"
+       $(NOECHO) $(UNINSTALL) 
}.$self->catfile('$(SITEARCHEXP)','auto','$(FULLEXT)','.packlist').q{
 
 uninstall_from_vendordirs ::
-       $(NOECHO) $(UNINSTALL) 
"}.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{"
+       $(NOECHO) $(UNINSTALL) 
}.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{
 };
 
     join("",@m);
@@ -2378,7 +2343,7 @@ $(MAP_TARGET) :: static $(MAKE_APERL_FILE)
 $(MAKE_APERL_FILE) : $(FIRST_MAKEFILE) pm_to_blib
        $(NOECHO) $(ECHO) Writing \"$(MAKE_APERL_FILE)\" for this $(MAP_TARGET)
        $(NOECHO) $(PERLRUNINST) \
-               Makefile.PL DIR="}, $dir, q{" \
+               Makefile.PL DIR=}, $dir, q{ \
                MAKEFILE=$(MAKE_APERL_FILE) LINKTYPE=static \
                MAKEAPERL=1 NORECURS=1 CCCDLFLAGS=};
 
@@ -2556,20 +2521,20 @@ $tmp/perlmain.c: $makefilename}, q{
                -e "writemain(grep s#.*/auto/##s, split(q| |, 
q|$(MAP_STATIC)|))" > $@t && $(MV) $@t $@
 
 };
-    push @m, "\t", q{$(NOECHO) $(PERL) "$(INSTALLSCRIPT)/fixpmain"
+    push @m, "\t", q{$(NOECHO) $(PERL) $(INSTALLSCRIPT)/fixpmain
 } if (defined (&Dos::UseLFN) && Dos::UseLFN()==0);
 
 
     push @m, q{
 doc_inst_perl :
-       $(NOECHO) $(ECHO) Appending installation info to 
"$(DESTINSTALLARCHLIB)/perllocal.pod"
-       -$(NOECHO) $(MKPATH) "$(DESTINSTALLARCHLIB)"
+       $(NOECHO) $(ECHO) Appending installation info to 
$(DESTINSTALLARCHLIB)/perllocal.pod
+       -$(NOECHO) $(MKPATH) $(DESTINSTALLARCHLIB)
        -$(NOECHO) $(DOC_INSTALL) \
                "Perl binary" "$(MAP_TARGET)" \
                MAP_STATIC "$(MAP_STATIC)" \
                MAP_EXTRA "`cat $(INST_ARCHAUTODIR)/extralibs.all`" \
                MAP_LIBPERL "$(MAP_LIBPERL)" \
-               >> 
"}.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{"
+               >> }.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{
 
 };
 
@@ -2577,7 +2542,7 @@ doc_inst_perl :
 inst_perl : pure_inst_perl doc_inst_perl
 
 pure_inst_perl : $(MAP_TARGET)
-       }.$self->{CP}.q{ $(MAP_TARGET) 
"}.$self->catfile('$(DESTINSTALLBIN)','$(MAP_TARGET)').q{"
+       }.$self->{CP}.q{ $(MAP_TARGET) 
}.$self->catfile('$(DESTINSTALLBIN)','$(MAP_TARGET)').q{
 
 clean :: map_clean
 
@@ -2686,24 +2651,17 @@ sub parse_abstract {
     local $/ = "\n";
     open(my $fh, '<', $parsefile) or die "Could not open '$parsefile': $!";
     my $inpod = 0;
-    my $pod_encoding;
     my $package = $self->{DISTNAME};
     $package =~ s/-/::/g;
     while (<$fh>) {
         $inpod = /^=(?!cut)/ ? 1 : /^=cut/ ? 0 : $inpod;
         next if !$inpod;
         chop;
-
-        if ( /^=encoding\s*(.*)$/i ) {
-            $pod_encoding = $1;
-        }
-
         if ( /^($package(?:\.pm)? \s+ -+ \s+)(.*)/x ) {
           $result = $2;
           next;
         }
         next unless $result;
-
         if ( $result && ( /^\s*$/ || /^\=/ ) ) {
           last;
         }
@@ -2711,11 +2669,6 @@ sub parse_abstract {
     }
     close $fh;
 
-    if ( $pod_encoding and !( $] < 5.008 or !$Config{useperlio} ) ) {
-        require Encode;
-        $result = Encode::decode($pod_encoding, $result);
-    }
-
     return $result;
 }
 
@@ -2768,32 +2721,43 @@ sub parse_version {
 
     if ( defined $result && $result !~ /^v?[\d_\.]+$/ ) {
       require version;
-      my $normal = eval { version->new( $result ) };
+      my $normal = eval { version->parse( $result ) };
       $result = $normal if defined $normal;
     }
     $result = "undef" unless defined $result;
     return $result;
 }
 
-sub get_version {
-    my ($self, $parsefile, $sigil, $name) = @_;
-    my $line = $_; # from the while() loop in parse_version
-    {
-        package ExtUtils::MakeMaker::_version;
-        undef *version; # in case of unexpected version() sub
-        eval {
-            require version;
-            version::->import;
-        };
-        no strict;
-        local *{$name};
-        local $^W = 0;
-        $line = $1 if $line =~ m{^(.+)}s;
-        eval($line); ## no critic
-        return ${$name};
-    }
+sub get_version
+{
+       my ($self, $parsefile, $sigil, $name) = @_;
+       my $eval = qq{
+               package ExtUtils::MakeMaker::_version;
+               no strict;
+               BEGIN { eval {
+                       # Ensure any version() routine which might have leaked
+                       # into this package has been deleted.  Interferes with
+                       # version->import()
+                       undef *version;
+                       require version;
+                       "version"->import;
+               } }
+
+               local $sigil$name;
+               \$$name=undef;
+               do {
+                       $_
+               };
+               \$$name;
+       };
+  $eval = $1 if $eval =~ m{^(.+)}s;
+       local $^W = 0;
+       my $result = eval($eval);  ## no critic
+       warn "Could not eval '$eval' in $parsefile: $@" if $@;
+       $result;
 }
 
+
 =item pasthru (o)
 
 Defines the string that is passed to recursive make calls in
@@ -2857,7 +2821,7 @@ sub perldepend {
 # Check for unpropogated config.sh changes. Should never happen.
 # We do NOT just update config.h because that is not sufficient.
 # An out of date config.h is not fatal but complains loudly!
-$(PERL_INCDEP)/config.h: $(PERL_SRC)/config.sh
+$(PERL_INC)/config.h: $(PERL_SRC)/config.sh
        -$(NOECHO) $(ECHO) "Warning: $(PERL_INC)/config.h out of date with 
$(PERL_SRC)/config.sh"; $(FALSE)
 
 $(PERL_ARCHLIB)/Config.pm: $(PERL_SRC)/config.sh
@@ -2873,7 +2837,7 @@ MAKE_FRAG
         push @m, $self->_perl_header_files_fragment("/"); # Directory 
separator between $(PERL_INC)/header.h
     }
 
-    push @m, join(" ", sort values %{$self->{XS}})." : \$(XSUBPPDEPS)\n"  if 
%{$self->{XS}};
+    push @m, join(" ", values %{$self->{XS}})." : \$(XSUBPPDEPS)\n"  if 
%{$self->{XS}};
 
     return join "\n", @m;
 }
@@ -2996,11 +2960,11 @@ PPD_PERLVERS
     foreach my $prereq (sort keys %prereqs) {
         my $name = $prereq;
         $name .= '::' unless $name =~ /::/;
-        my $version = $prereqs{$prereq};
+        my $version = $prereqs{$prereq}+0;  # force numification
 
         my %attrs = ( NAME => $name );
         $attrs{VERSION} = $version if $version;
-        my $attrs = join " ", map { qq[$_="$attrs{$_}"] } sort keys %attrs;
+        my $attrs = join " ", map { qq[$_="$attrs{$_}"] } keys %attrs;
         $ppd_xml .= qq(        <REQUIRE $attrs />\n);
     }
 
@@ -3234,17 +3198,6 @@ sub oneliner {
 
 =item quote_literal
 
-Quotes macro literal value suitable for being used on a command line so
-that when expanded by make, will be received by command as given to
-this method:
-
-  my $quoted = $mm->quote_literal(q{it isn't});
-  # returns:
-  #   'it isn'\''t'
-  print MAKEFILE "target:\n\techo $quoted\n";
-  # when run "make target", will output:
-  #   it isn't
-
 =cut
 
 sub quote_literal {
@@ -3334,7 +3287,7 @@ END
     # If this extension has its own library (eg SDBM_File)
     # then copy that to $(INST_STATIC) and add $(OBJECT) into it.
     push(@m, <<'MAKE_FRAG') if $self->{MYEXTLIB};
-       $(CP) $(MYEXTLIB) "$@"
+       $(CP) $(MYEXTLIB) $@
 MAKE_FRAG
 
     my $ar;
@@ -3348,12 +3301,12 @@ MAKE_FRAG
     push @m, sprintf <<'MAKE_FRAG', $ar;
        $(%s) $(AR_STATIC_ARGS) $@ $(OBJECT) && $(RANLIB) $@
        $(CHMOD) $(PERM_RWX) $@
-       $(NOECHO) $(ECHO) "$(EXTRALIBS)" > "$(INST_ARCHAUTODIR)/extralibs.ld"
+       $(NOECHO) $(ECHO) "$(EXTRALIBS)" > $(INST_ARCHAUTODIR)/extralibs.ld
 MAKE_FRAG
 
     # Old mechanism - still available:
     push @m, <<'MAKE_FRAG' if $self->{PERL_SRC} && $self->{EXTRALIBS};
-       $(NOECHO) $(ECHO) "$(EXTRALIBS)" >> "$(PERL_SRC)/ext.libs"
+       $(NOECHO) $(ECHO) "$(EXTRALIBS)" >> $(PERL_SRC)/ext.libs
 MAKE_FRAG
 
     join('', @m);
@@ -3592,8 +3545,7 @@ sub tool_xsubpp {
         }
     }
     push(@tmdeps, "typemap") if -f "typemap";
-    my @tmargs = map(qq{-typemap "$_"}, @tmdeps);
-    $_ = $self->quote_dep($_) for @tmdeps;
+    my(@tmargs) = map("-typemap $_", @tmdeps);
     if( exists $self->{XSOPT} ){
         unshift( @tmargs, $self->{XSOPT} );
     }
@@ -3609,19 +3561,17 @@ sub tool_xsubpp {
 
 
     $self->{XSPROTOARG} = "" unless defined $self->{XSPROTOARG};
-    my $xsdirdep = $self->quote_dep($xsdir);
-    # -dep for use when dependency not command
 
     return qq{
 XSUBPPDIR = $xsdir
-XSUBPP = "\$(XSUBPPDIR)\$(DFSEP)xsubpp"
+XSUBPP = \$(XSUBPPDIR)\$(DFSEP)xsubpp
 XSUBPPRUN = \$(PERLRUN) \$(XSUBPP)
 XSPROTOARG = $self->{XSPROTOARG}
-XSUBPPDEPS = @tmdeps $xsdirdep\$(DFSEP)xsubpp
+XSUBPPDEPS = @tmdeps \$(XSUBPP)
 XSUBPPARGS = @tmargs
 XSUBPP_EXTRA_ARGS =
 };
-}
+};
 
 
 =item all_target
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VMS.pm 
b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VMS.pm
index 51d801e..331cbcd 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 = '7.00';
+our $VERSION = '6.98';
 
 require ExtUtils::MM_Any;
 require ExtUtils::MM_Unix;
@@ -240,8 +240,8 @@ sub find_perl {
         $rslt = `\@temp_mmvms.com`;
         unlink('temp_mmvms.com');
         if ($rslt =~ /VER_OK/) {
-            print "Using PERL=$vmsfile\n" if $trace;
-            return $vmsfile;
+            print "Using PERL=MCR $vmsfile\n" if $trace;
+            return "MCR $vmsfile";
         }
     }
     print "Unable to find a perl $ver (by these names: @$names, in these dirs: 
@$dirs)\n";
@@ -1893,7 +1893,6 @@ sub init_linker {
           $ENV{$shr} ? $ENV{$shr} : "Sys\$Share:$shr.$Config{'dlext'}";
     }
 
-    $self->{PERL_ARCHIVEDEP} ||= '';
     $self->{PERL_ARCHIVE_AFTER} ||= '';
 }
 
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VOS.pm 
b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VOS.pm
index c9cf997..648ba54 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 = '7.00';
+our $VERSION = '6.98';
 
 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 c64b49f..e056d2e 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 = '7.00';
+our $VERSION = '6.98';
 
 $ENV{EMXSHELL} = 'sh'; # to run `commands`
 
@@ -128,7 +128,7 @@ sub maybe_command {
 
 =item B<init_DIRFILESEP>
 
-Using \ for Windows, except for "gmake" where it is /.
+Using \ for Windows.
 
 =cut
 
@@ -137,8 +137,7 @@ sub init_DIRFILESEP {
 
     # The ^ makes sure its not interpreted as an escape in nmake
     $self->{DIRFILESEP} = $self->is_make_type('nmake') ? '^\\' :
-                          $self->is_make_type('dmake') ? '\\\\' :
-                          $self->is_make_type('gmake') ? '/'
+                          $self->is_make_type('dmake') ? '\\\\'
                                                        : '\\';
 }
 
@@ -347,27 +346,27 @@ sub dynamic_lib {
 OTHERLDFLAGS = '.$otherldflags.'
 INST_DYNAMIC_DEP = '.$inst_dynamic_dep.'
 
-$(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(BOOTSTRAP) 
$(INST_ARCHAUTODIR)$(DFSEP).exists $(EXPORT_LIST) $(PERL_ARCHIVEDEP) 
$(INST_DYNAMIC_DEP)
+$(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $(BOOTSTRAP) 
$(INST_ARCHAUTODIR)$(DFSEP).exists $(EXPORT_LIST) $(PERL_ARCHIVE) 
$(INST_DYNAMIC_DEP)
 ');
     if ($GCC) {
       push(@m,
        q{      }.$DLLTOOL.q{ --def $(EXPORT_LIST) --output-exp dll.exp
-       $(LD) -o $@ -Wl,--base-file -Wl,dll.base $(LDDLFLAGS) }.$ldfrom.q{ 
$(OTHERLDFLAGS) $(MYEXTLIB) "$(PERL_ARCHIVE)" $(LDLOADLIBS) dll.exp
+       $(LD) -o $@ -Wl,--base-file -Wl,dll.base $(LDDLFLAGS) }.$ldfrom.q{ 
$(OTHERLDFLAGS) $(MYEXTLIB) $(PERL_ARCHIVE) $(LDLOADLIBS) dll.exp
        }.$DLLTOOL.q{ --def $(EXPORT_LIST) --base-file dll.base --output-exp 
dll.exp
-       $(LD) -o $@ $(LDDLFLAGS) }.$ldfrom.q{ $(OTHERLDFLAGS) $(MYEXTLIB) 
"$(PERL_ARCHIVE)" $(LDLOADLIBS) dll.exp });
+       $(LD) -o $@ $(LDDLFLAGS) }.$ldfrom.q{ $(OTHERLDFLAGS) $(MYEXTLIB) 
$(PERL_ARCHIVE) $(LDLOADLIBS) dll.exp });
     } elsif ($BORLAND) {
       push(@m,
        q{      $(LD) $(LDDLFLAGS) $(OTHERLDFLAGS) }.$ldfrom.q{,$@,,}
        .($self->is_make_type('dmake')
-                ? q{"$(PERL_ARCHIVE:s,/,\,)" $(LDLOADLIBS:s,/,\,) }
+                ? q{$(PERL_ARCHIVE:s,/,\,) $(LDLOADLIBS:s,/,\,) }
                 .q{$(MYEXTLIB:s,/,\,),$(EXPORT_LIST:s,/,\,)}
-               : q{"$(subst /,\,$(PERL_ARCHIVE))" $(subst /,\,$(LDLOADLIBS)) }
+               : q{$(subst /,\,$(PERL_ARCHIVE)) $(subst /,\,$(LDLOADLIBS)) }
                 .q{$(subst /,\,$(MYEXTLIB)),$(subst /,\,$(EXPORT_LIST))})
        .q{,$(RESFILES)});
     } else {   # VC
       push(@m,
        q{      $(LD) -out:$@ $(LDDLFLAGS) }.$ldfrom.q{ $(OTHERLDFLAGS) }
-      .q{$(MYEXTLIB) "$(PERL_ARCHIVE)" $(LDLOADLIBS) -def:$(EXPORT_LIST)});
+      .q{$(MYEXTLIB) $(PERL_ARCHIVE) $(LDLOADLIBS) -def:$(EXPORT_LIST)});
 
       # Embed the manifest file if it exists
       push(@m, q{
@@ -402,7 +401,6 @@ sub init_linker {
     my $self = shift;
 
     $self->{PERL_ARCHIVE}       = "\$(PERL_INC)\\$Config{libperl}";
-    $self->{PERL_ARCHIVEDEP}    = "\$(PERL_INCDEP)\\$Config{libperl}";
     $self->{PERL_ARCHIVE_AFTER} = '';
     $self->{EXPORT_LIST}        = '$(BASEEXT).def';
 }
@@ -423,29 +421,6 @@ sub perl_script {
     return;
 }
 
-sub can_dep_space {
-    my $self = shift;
-    1; # with Win32::GetShortPathName
-}
-
-=item quote_dep
-
-=cut
-
-sub quote_dep {
-    my ($self, $arg) = @_;
-    if ($arg =~ / / and not $self->is_make_type('gmake')) {
-        require Win32;
-        $arg = Win32::GetShortPathName($arg);
-        die <<EOF if not defined $arg or $arg =~ / /;
-Tried to use make dependency with space for non-GNU make:
-  '$arg'
-Fallback to short pathname failed.
-EOF
-        return $arg;
-    }
-    return $self->SUPER::quote_dep($arg);
-}
 
 =item xs_o
 
@@ -647,7 +622,16 @@ PERLTYPE = $self->{PERLTYPE}
 
 }
 
+sub is_make_type {
+    my($self, $type) = @_;
+    return !! ($self->make =~ /\b$type(?:\.exe)?$/);
+}
+
 1;
 __END__
 
 =back
+
+=cut
+
+
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win95.pm 
b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win95.pm
index 9a8e7d7..9c79580 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 = '7.00';
+our $VERSION = '6.98';
 
 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 83c5215..37f0e9e 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 = '7.00';
+our $VERSION = '6.98';
 our @ISA = qw(ExtUtils::MM);
 
 {
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm 
b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm
index b585b99..d2fabf6 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm
@@ -7,12 +7,8 @@ BEGIN {require 5.006;}
 
 require Exporter;
 use ExtUtils::MakeMaker::Config;
-use ExtUtils::MakeMaker::version; # ensure we always have or fake version.pm
 use Carp;
 use File::Path;
-my $CAN_DECODE = eval { require ExtUtils::MakeMaker::Locale; }; # 2 birds, 1 
stone
-eval { ExtUtils::MakeMaker::Locale::reinit('UTF-8') }
-  if $CAN_DECODE and $ExtUtils::MakeMaker::Locale::ENCODING_LOCALE eq 
'US-ASCII';
 
 our $Verbose = 0;       # exported
 our @Parent;            # needs to be localized
@@ -21,10 +17,8 @@ our @MM_Sections;
 our @Overridable;
 my @Prepend_parent;
 my %Recognized_Att_Keys;
-our %macro_fsentity; # whether a macro is a filesystem name
-our %macro_dep; # whether a macro is a dependency
 
-our $VERSION = '7.00';
+our $VERSION = '6.98';
 $VERSION = eval $VERSION;  ## no critic [BuiltinFunctions::ProhibitStringyEval]
 
 # Emulate something resembling CVS $Revision$
@@ -42,7 +36,6 @@ our @EXPORT_OK = qw($VERSION &neatvalue &mkbootstrap 
&mksymlists
 # purged.
 my $Is_VMS     = $^O eq 'VMS';
 my $Is_Win32   = $^O eq 'MSWin32';
-my $UNDER_CORE = $ENV{PERL_CORE};
 
 full_setup();
 
@@ -257,12 +250,14 @@ my $PACKNAME = 'PACK000';
 sub full_setup {
     $Verbose ||= 0;
 
-    my @dep_macros = qw/
-    PERL_INCDEP        PERL_ARCHLIBDEP     PERL_ARCHIVEDEP
-    /;
+    my @attrib_help = qw/
 
-    my @fs_macros = qw/
-    FULLPERL XSUBPPDIR
+    AUTHOR ABSTRACT ABSTRACT_FROM BINARY_LOCATION
+    C CAPI CCFLAGS CONFIG CONFIGURE DEFINE DIR DISTNAME DISTVNAME
+    DL_FUNCS DL_VARS
+    EXCLUDE_EXT EXE_FILES FIRST_MAKEFILE
+    FULLPERL FULLPERLRUN FULLPERLRUNINST
+    FUNCLIST H IMPORTS
 
     INST_ARCHLIB INST_SCRIPT INST_BIN INST_LIB INST_MAN1DIR INST_MAN3DIR
     INSTALLDIRS
@@ -278,41 +273,22 @@ sub full_setup {
     PERL_LIB        PERL_ARCHLIB
     SITELIBEXP      SITEARCHEXP
 
-    MAKE LIBPERL_A LIB PERL_SRC PERL_INC
-    PPM_INSTALL_EXEC PPM_UNINSTALL_EXEC
-    PPM_INSTALL_SCRIPT PPM_UNINSTALL_SCRIPT
-    /;
-
-    my @attrib_help = qw/
-
-    AUTHOR ABSTRACT ABSTRACT_FROM BINARY_LOCATION
-    C CAPI CCFLAGS CONFIG CONFIGURE DEFINE DIR DISTNAME DISTVNAME
-    DL_FUNCS DL_VARS
-    EXCLUDE_EXT EXE_FILES FIRST_MAKEFILE
-    FULLPERLRUN FULLPERLRUNINST
-    FUNCLIST H IMPORTS
-
-    INC INCLUDE_EXT LDFROM LIBS LICENSE
-    LINKTYPE MAKEAPERL MAKEFILE MAKEFILE_OLD MAN1PODS MAN3PODS MAP_TARGET
+    INC INCLUDE_EXT LDFROM LIB LIBPERL_A LIBS LICENSE
+    LINKTYPE MAKE MAKEAPERL MAKEFILE MAKEFILE_OLD MAN1PODS MAN3PODS MAP_TARGET
     META_ADD META_MERGE MIN_PERL_VERSION BUILD_REQUIRES CONFIGURE_REQUIRES
     MYEXTLIB NAME NEEDS_LINKING NOECHO NO_META NO_MYMETA NO_PACKLIST 
NO_PERLLOCAL
     NORECURS NO_VC OBJECT OPTIMIZE PERL_MALLOC_OK PERL PERLMAINCC PERLRUN
     PERLRUNINST PERL_CORE
-    PERM_DIR PERM_RW PERM_RWX MAGICXS
-    PL_FILES PM PM_FILTER PMLIBDIRS PMLIBPARENTDIRS POLLUTE
-    PREREQ_FATAL PREREQ_PM PREREQ_PRINT PRINT_PREREQ
+    PERL_SRC PERM_DIR PERM_RW PERM_RWX MAGICXS
+    PL_FILES PM PM_FILTER PMLIBDIRS PMLIBPARENTDIRS POLLUTE PPM_INSTALL_EXEC 
PPM_UNINSTALL_EXEC
+    PPM_INSTALL_SCRIPT PPM_UNINSTALL_SCRIPT PREREQ_FATAL PREREQ_PM 
PREREQ_PRINT PRINT_PREREQ
     SIGN SKIP TEST_REQUIRES TYPEMAPS UNINST VERSION VERSION_FROM XS XSOPT 
XSPROTOARG
     XS_VERSION clean depend dist dynamic_lib linkext macro realclean
     tool_autosplit
 
-    MAN1EXT MAN3EXT
-
     MACPERL_SRC MACPERL_LIB MACLIBS_68K MACLIBS_PPC MACLIBS_SC MACLIBS_MRC
     MACLIBS_ALL_68K MACLIBS_ALL_PPC MACLIBS_SHARED
         /;
-    push @attrib_help, @fs_macros;
-    @macro_fsentity{@fs_macros, @dep_macros} = (1) x (@fs_macros+@dep_macros);
-    @macro_dep{@dep_macros} = (1) x @dep_macros;
 
     # IMPORTS is used under OS/2 and Win32
 
@@ -473,7 +449,7 @@ sub new {
             # simulate "use warnings FATAL => 'all'" for vintage perls
             die @_;
         };
-        version->new( $self->{MIN_PERL_VERSION} )
+        version->parse( $self->{MIN_PERL_VERSION} )
       };
       $self->{MIN_PERL_VERSION} = $normal if defined $normal && !$@;
     }
@@ -526,7 +502,7 @@ END
           if ( defined $required_version && $required_version =~ /^v?[\d_\.]+$/
                || $required_version !~ /^v?[\d_\.]+$/ ) {
             require version;
-            my $normal = eval { version->new( $required_version ) };
+            my $normal = eval { version->parse( $required_version ) };
             $required_version = $normal if defined $normal;
           }
           $installed_file = $prereq;
@@ -609,7 +585,10 @@ END
 
             $self->{$key} = $self->{PARENT}{$key};
 
-            if ($Is_VMS && $key =~ /PERL$/) {
+            unless ($Is_VMS && $key =~ /PERL$/) {
+                $self->{$key} = $self->catdir("..",$self->{$key})
+                  unless $self->file_name_is_absolute($self->{$key});
+            } else {
                 # PERL or FULLPERL will be a command verb or even a
                 # command with an argument instead of a full file
                 # specification under VMS.  So, don't turn the command
@@ -619,14 +598,6 @@ END
                 $cmd[1] = $self->catfile('[-]',$cmd[1])
                   unless (@cmd < 2) || $self->file_name_is_absolute($cmd[1]);
                 $self->{$key} = join(' ', @cmd);
-            } else {
-                my $value = $self->{$key};
-                # not going to test in FS so only stripping start
-                $value =~ s/^"// if $key =~ /PERL$/;
-                $value = $self->catdir("..", $value)
-                  unless $self->file_name_is_absolute($value);
-                $value = qq{"$value} if $key =~ /PERL$/;
-                $self->{$key} = $value;
             }
         }
         if ($self->{PARENT}) {
@@ -850,7 +821,7 @@ END
 
     foreach my $key (sort keys %$att){
         next if $key eq 'ARGS';
-        my $v;
+        my ($v) = neatvalue($att->{$key});
         if ($key eq 'PREREQ_PM') {
             # CPAN.pm takes prereqs from this field in 'Makefile'
             # and does not know about BUILD_REQUIRES
@@ -967,7 +938,6 @@ sub check_manifest {
 
 sub parse_args{
     my($self, @args) = @_;
-    @args = map { Encode::decode(locale => $_) } @args if $CAN_DECODE;
     foreach (@args) {
         unless (m/(.*?)=(.*)/) {
             ++$Verbose if m/^verb/;
@@ -1192,10 +1162,6 @@ sub flush {
     unlink($finalname, "MakeMaker.tmp", $Is_VMS ? 'Descrip.MMS' : ());
     open(my $fh,">", "MakeMaker.tmp")
         or die "Unable to open MakeMaker.tmp: $!";
-    if ($] > 5.008 and $Config{useperlio}) {
-        binmode $fh, ':utf8';
-        binmode $fh, ':encoding(locale)' if $CAN_DECODE;
-    }
 
     for my $chunk (@{$self->{RESULT}}) {
         print $fh "$chunk\n"
@@ -1276,62 +1242,28 @@ sub neatvalue {
         push @m, "]";
         return join "", @m;
     }
-    return $v unless $t eq 'HASH';
+    return "$v" unless $t eq 'HASH';
     my(@m, $key, $val);
-    for my $key (sort keys %$v) {
+    while (($key,$val) = each %$v){
         last unless defined $key; # cautious programming in case (undef,undef) 
is true
-        push @m,"$key=>".neatvalue($v->{$key});
+        push(@m,"$key=>".neatvalue($val)) ;
     }
     return "{ ".join(', ',@m)." }";
 }
 
-sub _find_magic_vstring {
-    my $value = shift;
-    return $value if $UNDER_CORE;
-    my $tvalue = '';
-    require B;
-    my $sv = B::svref_2object(\$value);
-    my $magic = ref($sv) eq 'B::PVMG' ? $sv->MAGIC : undef;
-    while ( $magic ) {
-        if ( $magic->TYPE eq 'V' ) {
-            $tvalue = $magic->PTR;
-            $tvalue =~ s/^v?(.+)$/v$1/;
-            last;
-        }
-        else {
-            $magic = $magic->MOREMAGIC;
-        }
-    }
-    return $tvalue;
-}
-
-
 # Look for weird version numbers, warn about them and set them to 0
 # before CPAN::Meta chokes.
 sub clean_versions {
     my($self, $key) = @_;
+
     my $reqs = $self->{$key};
     for my $module (keys %$reqs) {
-        my $v = $reqs->{$module};
-        my $printable = _find_magic_vstring($v);
-        $v = $printable if length $printable;
-        my $version = eval {
-            local $SIG{__WARN__} = sub {
-              # simulate "use warnings FATAL => 'all'" for vintage perls
-              die @_;
-            };
-            version->new($v)->stringify;
-        };
-        if( $@ || $reqs->{$module} eq '' ) {
-            if ( $] < 5.008 && $v !~ /^v?[\d_\.]+$/ ) {
-               $v = sprintf "v%vd", $v unless $v eq '';
-            }
-            carp "Unparsable version '$v' for prerequisite $module";
+        my $version = $reqs->{$module};
+
+        if( !defined $version or $version !~ /^v?[\d_\.]+$/ ) {
+            carp "Unparsable version '$version' for prerequisite $module";
             $reqs->{$module} = 0;
         }
-        else {
-            $reqs->{$module} = $version;
-        }
     }
 }
 
@@ -1386,19 +1318,15 @@ won't have to face the possibly bewildering errors 
resulting from
 using the wrong one.
 
 On POSIX systems, that program will likely be GNU Make; on Microsoft
-Windows, it will be either Microsoft NMake, DMake or GNU Make.
+Windows, it will be either Microsoft NMake or DMake. Note that this
+module does not support generating Makefiles for GNU Make on Windows.
 See the section on the L</"MAKE"> parameter for details.
 
-ExtUtils::MakeMaker (EUMM) is object oriented. Each directory below the current
+MakeMaker is object oriented. Each directory below the current
 directory that contains a Makefile.PL is treated as a separate
 object. This makes it possible to write an unlimited number of
 Makefiles with a single invocation of WriteMakefile().
 
-All inputs to WriteMakefile are Unicode characters, not just octets. EUMM
-seeks to handle all of these correctly. It is currently still not possible
-to portably use Unicode characters in module names, because this requires
-Perl to handle Unicode filenames, which is not yet the case on Windows.
-
 =head2 How To Write A Makefile.PL
 
 See L<ExtUtils::MakeMaker::Tutorial>.
@@ -2267,20 +2195,6 @@ own.  META_MERGE will merge its value with the default.
 Unless you want to override the defaults, prefer META_MERGE so as to
 get the advantage of any future defaults.
 
-Where prereqs are concerned, if META_MERGE is used, prerequisites are merged
-with their counterpart C<WriteMakefile()> argument
-(PREREQ_PM is merged into {prereqs}{runtime}{requires},
-BUILD_REQUIRES into C<{prereqs}{build}{requires}>,
-CONFIGURE_REQUIRES into C<{prereqs}{configure}{requires}>,
-and TEST_REQUIRES into C<{prereqs}{test}{requires})>.
-When prereqs are specified with META_ADD, the only prerequisites added to the
-file come from the metadata, not C<WriteMakefile()> arguments.
-
-Note that these configuration options are only used for generating F<META.yml>
-and F<META.json> -- they are NOT used for F<MYMETA.yml> and F<MYMETA.json>.
-Therefore data in these fields should NOT be used for dynamic (user-side)
-configuration.
-
 By default CPAN Meta specification C<1.4> is used. In order to use
 CPAN Meta specification C<2.0>, indicate with C<meta-spec> the version
 you want to use.
@@ -2318,9 +2232,9 @@ name of the library (see SDBM_File)
 
 The package representing the distribution. For example, C<Test::More>
 or C<ExtUtils::MakeMaker>. It will be used to derive information about
-the distribution such as the L</DISTNAME>, installation locations
+the distribution such as the L<DISTNAME>, installation locations
 within the Perl library and where XS files will be looked for by
-default (see L</XS>).
+default (see L<XS>).
 
 C<NAME> I<must> be a valid Perl package name and it I<must> have an
 associated C<.pm> file. For example, C<Foo::Bar> is a valid C<NAME>
@@ -3178,12 +3092,6 @@ If no $default is provided an empty string will be used 
instead.
 
 =back
 
-=head2 Supported versions of Perl
-
-Please note that while this module works on Perl 5.6, it is no longer
-being routinely tested on 5.6 - the earliest Perl version being routinely
-tested, and expressly supported, is 5.8.1. However, patches to repair
-any breakage on 5.6 are still being accepted.
 
 =head1 ENVIRONMENT
 
@@ -3222,13 +3130,6 @@ help you setup your distribution.
 
 L<CPAN::Meta> and L<CPAN::Meta::Spec> explain CPAN Meta files in detail.
 
-L<File::ShareDir::Install> makes it easy to install static, sometimes
-also referred to as 'shared' files. L<File::ShareDir> helps accessing
-the shared files after installation.
-
-L<Dist::Zilla> makes it easy for the module author to create MakeMaker-based
-distributions with lots of bells and whistles.
-
 =head1 AUTHORS
 
 Andy Dougherty C<[email protected]>, Andreas KE<ouml>nig
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Config.pm 
b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Config.pm
index ded9753..5c703f0 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 = '7.00';
+our $VERSION = '6.98';
 
 use Config ();
 
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/FAQ.pod 
b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/FAQ.pod
index af8df88..e5acb6a 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 = '7.00';
+our $VERSION = '6.98';
 
 1;
 __END__
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Locale.pm 
b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Locale.pm
deleted file mode 100644
index 1b8cc5e..0000000
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Locale.pm
+++ /dev/null
@@ -1,348 +0,0 @@
-package ExtUtils::MakeMaker::Locale;
-
-use strict;
-our $VERSION = "7.00";
-
-use base 'Exporter';
-our @EXPORT_OK = qw(
-    decode_argv env
-    $ENCODING_LOCALE $ENCODING_LOCALE_FS
-    $ENCODING_CONSOLE_IN $ENCODING_CONSOLE_OUT
-);
-
-use Encode ();
-use Encode::Alias ();
-
-our $ENCODING_LOCALE;
-our $ENCODING_LOCALE_FS;
-our $ENCODING_CONSOLE_IN;
-our $ENCODING_CONSOLE_OUT;
-
-sub DEBUG () { 0 }
-
-sub _init {
-    if ($^O eq "MSWin32") {
-       unless ($ENCODING_LOCALE) {
-           # Try to obtain what the Windows ANSI code page is
-           eval {
-               unless (defined &GetACP) {
-                   require Win32::API;
-                   Win32::API->Import('kernel32', 'int GetACP()');
-               };
-               if (defined &GetACP) {
-                   my $cp = GetACP();
-                   $ENCODING_LOCALE = "cp$cp" if $cp;
-               }
-           };
-       }
-
-       unless ($ENCODING_CONSOLE_IN) {
-           # If we have the Win32::Console module installed we can ask
-           # it for the code set to use
-           eval {
-               require Win32::Console;
-               my $cp = Win32::Console::InputCP();
-               $ENCODING_CONSOLE_IN = "cp$cp" if $cp;
-               $cp = Win32::Console::OutputCP();
-               $ENCODING_CONSOLE_OUT = "cp$cp" if $cp;
-           };
-           # Invoking the 'chcp' program might also work
-           if (!$ENCODING_CONSOLE_IN && (qx(chcp) || '') =~ /^Active code 
page: (\d+)/) {
-               $ENCODING_CONSOLE_IN = "cp$1";
-           }
-       }
-    }
-
-    unless ($ENCODING_LOCALE) {
-       eval {
-           require I18N::Langinfo;
-           $ENCODING_LOCALE = 
I18N::Langinfo::langinfo(I18N::Langinfo::CODESET());
-
-           # Workaround of Encode < v2.25.  The "646" encoding  alias was
-           # introduced in Encode-2.25, but we don't want to require that 
version
-           # quite yet.  Should avoid the CPAN testers failure reported from
-           # openbsd-4.7/perl-5.10.0 combo.
-           $ENCODING_LOCALE = "ascii" if $ENCODING_LOCALE eq "646";
-
-           # https://rt.cpan.org/Ticket/Display.html?id=66373
-           $ENCODING_LOCALE = "hp-roman8" if $^O eq "hpux" && $ENCODING_LOCALE 
eq "roman8";
-       };
-       $ENCODING_LOCALE ||= $ENCODING_CONSOLE_IN;
-    }
-
-    if ($^O eq "darwin") {
-       $ENCODING_LOCALE_FS ||= "UTF-8";
-    }
-
-    # final fallback
-    $ENCODING_LOCALE ||= $^O eq "MSWin32" ? "cp1252" : "UTF-8";
-    $ENCODING_LOCALE_FS ||= $ENCODING_LOCALE;
-    $ENCODING_CONSOLE_IN ||= $ENCODING_LOCALE;
-    $ENCODING_CONSOLE_OUT ||= $ENCODING_CONSOLE_IN;
-
-    unless (Encode::find_encoding($ENCODING_LOCALE)) {
-       my $foundit;
-       if (lc($ENCODING_LOCALE) eq "gb18030") {
-           eval {
-               require Encode::HanExtra;
-           };
-           if ($@) {
-               die "Need Encode::HanExtra to be installed to support locale 
codeset ($ENCODING_LOCALE), stopped";
-           }
-           $foundit++ if Encode::find_encoding($ENCODING_LOCALE);
-       }
-       die "The locale codeset ($ENCODING_LOCALE) isn't one that perl can 
decode, stopped"
-           unless $foundit;
-
-    }
-
-    # use Data::Dump; ddx $ENCODING_LOCALE, $ENCODING_LOCALE_FS, 
$ENCODING_CONSOLE_IN, $ENCODING_CONSOLE_OUT;
-}
-
-_init();
-Encode::Alias::define_alias(sub {
-    no strict 'refs';
-    no warnings 'once';
-    return ${"ENCODING_" . uc(shift)};
-}, "locale");
-
-sub _flush_aliases {
-    no strict 'refs';
-    for my $a (keys %Encode::Alias::Alias) {
-       if (defined ${"ENCODING_" . uc($a)}) {
-           delete $Encode::Alias::Alias{$a};
-           warn "Flushed alias cache for $a" if DEBUG;
-       }
-    }
-}
-
-sub reinit {
-    $ENCODING_LOCALE = shift;
-    $ENCODING_LOCALE_FS = shift;
-    $ENCODING_CONSOLE_IN = $ENCODING_LOCALE;
-    $ENCODING_CONSOLE_OUT = $ENCODING_LOCALE;
-    _init();
-    _flush_aliases();
-}
-
**** PATCH TRUNCATED AT 2000 LINES -- 2731 NOT SHOWN ****

--
Perl5 Master Repository

Reply via email to