Upgrade to MakeMaker 6.13.

p4raw-id: //depot/perl@20408

7 files changed, 24 insertions, 13 deletions

diff --git a/lib/ExtUtils/Changes b/lib/ExtUtils/Changes
index 69c148a625..f4a7c3760a 100644
--- a/lib/ExtUtils/Changes
+++ b/lib/ExtUtils/Changes
@@ -1,3 +1,9 @@
+6.13 Thu Jul 31 16:48:01 PDT 2003
+    - Generated META.yml now has the prereqs in sorted order (Andy Lester)
+    - Arguments to child Makefile.PLs were still having .. prepended.  This
+      was exposed by the earlier fix of rt.perl.org 4345.
+    - extralibs.ld (for static builds) wasn't being cleaned up.
+
 6.12 Tue Jul 29 22:19:38 PDT 2003
     - Should any of your prefixes be /, MakeMaker might lose this and
       prepend your prefix as "prefixyour/directory" rather than
diff --git a/lib/ExtUtils/META.yml b/lib/ExtUtils/META.yml
index bc6dac4ef1..afcdb13cbf 100644
--- a/lib/ExtUtils/META.yml
+++ b/lib/ExtUtils/META.yml
@@ -1,13 +1,13 @@
 #XXXXXXX This is a prototype!!!  It will change in the future!!! XXXXX#
 name:         ExtUtils-MakeMaker
-version:      6.12
+version:      6.13
 version_from: lib/ExtUtils/MakeMaker.pm
 installdirs:  perl
 requires:
+    DirHandle:                     0
     File::Basename:                0
     File::Spec:                    0.8
-    DirHandle:                     0
     Pod::Man:                      0
 
 distribution_type: module
-generated_by: ExtUtils::MakeMaker version 6.12
+generated_by: ExtUtils::MakeMaker version 6.13
diff --git a/lib/ExtUtils/MM_Any.pm b/lib/ExtUtils/MM_Any.pm
index 13e1daa317..347ae391bd 100644
--- a/lib/ExtUtils/MM_Any.pm
+++ b/lib/ExtUtils/MM_Any.pm
@@ -582,7 +582,8 @@ metafile:
 MAKE_FRAG
 
     my $prereq_pm = '';
-    while( my($mod, $ver) = each %{$self->{PREREQ_PM}} ) {
+    foreach my $mod ( sort { lc $a cmp lc $b } keys %{$self->{PREREQ_PM}} ) {
+        my $ver = $self->{PREREQ_PM}{$mod};
         $prereq_pm .= sprintf "    %-30s %s\n", "$mod:", $ver;
     }
     
diff --git a/lib/ExtUtils/MM_Unix.pm b/lib/ExtUtils/MM_Unix.pm
index 62ed883008..9638c95bb6 100644
--- a/lib/ExtUtils/MM_Unix.pm
+++ b/lib/ExtUtils/MM_Unix.pm
@@ -20,7 +20,7 @@ use vars qw($VERSION @ISA
 
 use ExtUtils::MakeMaker qw($Verbose neatvalue);
 
-$VERSION = '1.39';
+$VERSION = '1.40';
 
 require ExtUtils::MM_Any;
 @ISA = qw(ExtUtils::MM_Any);
@@ -294,6 +294,7 @@ clean :: clean_subdirs
     push(@otherfiles, $attribs{FILES}) if $attribs{FILES};
     push(@otherfiles, qw[./blib $(MAKE_APERL_FILE) 
                          $(INST_ARCHAUTODIR)/extralibs.all
+                         $(INST_ARCHAUTODIR)/extralibs.ld
 			 perlmain.c tmon.out mon.out so_locations pm_to_blib
 			 *$(OBJ_EXT) *$(LIB_EXT) perl.exe perl perl$(EXE_EXT)
 			 $(BOOTSTRAP) $(BASEEXT).bso
diff --git a/lib/ExtUtils/MM_VMS.pm b/lib/ExtUtils/MM_VMS.pm
index c8e93582d0..8ac90bfbee 100644
--- a/lib/ExtUtils/MM_VMS.pm
+++ b/lib/ExtUtils/MM_VMS.pm
@@ -20,8 +20,8 @@ BEGIN {
 
 use File::Basename;
 use vars qw($Revision @ISA $VERSION);
-($VERSION) = '5.69';
-($Revision) = q$Revision: 1.107 $ =~ /Revision:\s+(\S+)/;
+($VERSION) = '5.70';
+($Revision) = q$Revision: 1.109 $ =~ /Revision:\s+(\S+)/;
 
 require ExtUtils::MM_Any;
 require ExtUtils::MM_Unix;
@@ -1229,9 +1229,10 @@ clean :: clean_subdirs
 	    else { push(@otherfiles, $word); }
 	}
     }
-    push(@otherfiles, qw[ blib $(MAKE_APERL_FILE) extralibs.ld 
+    push(@otherfiles, qw[ blib $(MAKE_APERL_FILE) 
                           perlmain.c pm_to_blib pm_to_blib.ts ]);
     push(@otherfiles, $self->catfile('$(INST_ARCHAUTODIR)','extralibs.all'));
+    push(@otherfiles, $self->catfile('$(INST_ARCHAUTODIR)','extralibs.ld'));
 
     # Occasionally files are repeated several times from different sources
     { my(%of) = map { ($_ => 1) } @otherfiles; @otherfiles = keys %of; }
diff --git a/lib/ExtUtils/MakeMaker.pm b/lib/ExtUtils/MakeMaker.pm
index 640a074ff2..4cc0ff117e 100644
--- a/lib/ExtUtils/MakeMaker.pm
+++ b/lib/ExtUtils/MakeMaker.pm
@@ -2,8 +2,8 @@ package ExtUtils::MakeMaker;
 
 BEGIN {require 5.005_03;}
 
-$VERSION = '6.12';
-($Revision) = q$Revision: 1.124 $ =~ /Revision:\s+(\S+)/;
+$VERSION = '6.13';
+($Revision) = q$Revision: 1.127 $ =~ /Revision:\s+(\S+)/;
 
 require Exporter;
 use Config;
@@ -2038,7 +2038,7 @@ MakeMaker object. The following lines will be parsed o.k.:
 
     $VERSION = '1.00';
     *VERSION = \'1.01';
-    $VERSION = sprintf "%d.%03d", q$Revision: 1.124 $ =~ /(\d+)/g;
+    $VERSION = sprintf "%d.%03d", q$Revision: 1.127 $ =~ /(\d+)/g;
     $FOO::VERSION = '1.10';
     *FOO::VERSION = \'1.11';
     our $VERSION = 1.2.3;       # new for perl5.6.0 
diff --git a/lib/ExtUtils/t/basic.t b/lib/ExtUtils/t/basic.t
index de3827159c..0c05a5e5ec 100644
--- a/lib/ExtUtils/t/basic.t
+++ b/lib/ExtUtils/t/basic.t
@@ -105,14 +105,16 @@ END { unlink 'Big-Dummy.ppd' }
 
 my $test_out = run("$make test");
 like( $test_out, qr/All tests successful/, 'make test' );
-is( $?, 0,                                 '  exited normally' );
+is( $?, 0,                                 '  exited normally' ) || 
+    diag $test_out;
 
 # Test 'make test TEST_VERBOSE=1'
 my $make_test_verbose = make_macro($make, 'test', TEST_VERBOSE => 1);
 $test_out = run("$make_test_verbose");
 like( $test_out, qr/ok \d+ - TEST_VERBOSE/, 'TEST_VERBOSE' );
 like( $test_out, qr/All tests successful/,  '  successful' );
-is( $?, 0,                                  '  exited normally' );
+is( $?, 0,                                  '  exited normally' ) ||
+    diag $test_out;
 
 
 my $install_out = run("$make install");