Update ExtUtils-MakeMaker to CPAN version 6.68

  [DELTA]

6.68 Fri Jun 14 23:26:11 BST 2013
    No changes from 6.67_05

6.67_05 Thu Jun 13 21:52:46 BST 2013
    Doc fixes:
    * RT#86007 - Restore meaning for divorced sentence

6.67_04 Mon Jun 10 20:18:25 BST 2013
    Bug fixes
    * Address RT#85406, where specifying 'meta-spec' in
      META_[ADD|MERGE] would remove all prereqs (bingos)

6.67_03 Wed Jun  5 22:03:28 BST 2013
    Doc Fixes
    * Document how to specify meta-spec in META_MERGE (bingos)

6.67_02 Sun Jun  2 18:27:45 BST 2013
    Bug Fixes
    * Allow v-prefixed version strings once more (bingos)
    * Typos fixed (David Steinbrunner)
    * Resolve test failure with latest CPAN::Meta

6.67_01 Thu Apr 25 21:03:58 BST 2013
    Doc Fixes
    * Change references to makemaker.org in the docs
      (Reported as RT#83246 by dolmen)

    VOS Fixes
    * 'core' files are keep files (*.kp) on vos, adjust the
      'clean' target to account for this (Paul Green)

    Win32 Fixes
    * Increase dmake MAXLINELENGTH to 800000 (RT#77215) as
      per kmx's recommendations (kmx)

    Cygwin Fixes
    * Allow linking of Cygwin libraries (Reini Urban)

1 files changed, 23 insertions, 7 deletions

diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm
index f271ef7928..7ca7c2c4e6 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.66';
+our $VERSION = '6.68';
 $VERSION = eval $VERSION;  ## no critic [BuiltinFunctions::ProhibitStringyEval]
 
 # Emulate something resembling CVS $Revision$
@@ -978,7 +978,7 @@ sub mv_all_methods {
 
     # We have to clean out %INC also, because the current directory is
     # changed frequently and Graham Barr prefers to get his version
-    # out of a History.pl file which is "required" so woudn't get
+    # out of a History.pl file which is "required" so wouldn't get
     # loaded again in another extension requiring a History.pl
 
     # With perl5.002_01 the deletion of entries in %INC caused Tk-b11
@@ -1127,7 +1127,7 @@ sub clean_versions {
     for my $module (keys %$reqs) {
         my $version = $reqs->{$module};
 
-        if( !defined $version or $version !~ /^[\d_\.]+$/ ) {
+        if( !defined $version or $version !~ /^v?[\d_\.]+$/ ) {
             carp "Unparsable version '$version' for prerequisite $module";
             $reqs->{$module} = 0;
         }
@@ -2029,6 +2029,22 @@ 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.
 
+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.
+
+  META_MERGE        => {
+
+    "meta-spec" => { version => 2 },
+
+    repository => {
+      type => 'git',
+      url => 'git://github.com/Perl-Toolchain-Gang/ExtUtils-MakeMaker.git',
+      web => 'https://github.com/Perl-Toolchain-Gang/ExtUtils-MakeMaker',
+    },
+
+  },
+
 =item MIN_PERL_VERSION
 
 The minimum required version of Perl for this distribution.
@@ -2470,6 +2486,8 @@ but these will fail:
     local $VERSION      = '1.02';
     local $FOO::VERSION = '1.30';
 
+(Putting C<my> or C<local> on the preceding line will work o.k.)
+
 "Version strings" are incompatible and should not be used.
 
     # Bad
@@ -2484,8 +2502,6 @@ as $VERSION is declared.
     # All on one line
     use version; our $VERSION = qv(1.2.3);
 
-(Putting C<my> or C<local> on the preceding line will work o.k.)
-
 The file named in VERSION_FROM is not added as a dependency to
 Makefile. This is not really correct, but it would be a major pain
 during development to have to rewrite the Makefile for any smallish
@@ -2916,13 +2932,13 @@ Send patches and ideas to C<makemaker@perl.org>.
 Send bug reports via http://rt.cpan.org/.  Please send your
 generated Makefile along with your report.
 
-For more up-to-date information, see L<http://www.makemaker.org>.
+For more up-to-date information, see L<https://metacpan.org/release/ExtUtils-MakeMaker>.
 
 Repository available at L<https://github.com/Perl-Toolchain-Gang/ExtUtils-MakeMaker>.
 
 =head1 LICENSE
 
-This program is free software; you can redistribute it and/or 
+This program is free software; you can redistribute it and/or
 modify it under the same terms as Perl itself.
 
 See L<http://www.perl.com/perl/misc/Artistic.html>