Integrate from mainperl.

p4raw-id: //depot/cfgperl@2779

6 files changed, 35 insertions, 5 deletions

diff --git a/lib/ExtUtils/MM_Unix.pm b/lib/ExtUtils/MM_Unix.pm
index 1197cd639a..60f03d8ddd 100644
--- a/lib/ExtUtils/MM_Unix.pm
+++ b/lib/ExtUtils/MM_Unix.pm
@@ -377,7 +377,7 @@ sub cflags {
 
     if ($self->{CAPI} && $Is_PERL_OBJECT) {
         $self->{CCFLAGS} =~ s/-DPERL_OBJECT(\s|$)//;
-        $self->{CCFLAGS} .= '-DPERL_CAPI';
+        $self->{CCFLAGS} .= ' -DPERL_CAPI ';
         if ($Is_Win32 && $Config{'cc'} =~ /^cl.exe/i) {
             # Turn off C++ mode of the MSC compiler
             $self->{CCFLAGS} =~ s/-TP(\s|$)//;
@@ -2763,9 +2763,11 @@ sub ppd {
     foreach $prereq (sort keys %{$self->{PREREQ_PM}}) {
         my $pre_req = $prereq;
         $pre_req =~ s/::/-/g;
-        push(@m, ". qq{\\t\\t<DEPENDENCY NAME=\\\"$pre_req\\\" />\\n}");
+        my ($dep_ver) = join ",", (split (/\./, $self->{PREREQ_PM}{$prereq}), (0) x 4) [0 .. 3];
+        push(@m, ". qq{\\t\\t<DEPENDENCY NAME=\\\"$pre_req\\\" VERSION=\\\"$dep_ver\\\" />\\n}");
     }
     push(@m, ". qq{\\t\\t<OS NAME=\\\"\$(OSNAME)\\\" />\\n}");
+    push(@m, ". qq{\\t\\t<ARCHITECTURE NAME=\\\"$Config{'archname'}\\\" />\\n}");
     my ($bin_location) = $self->{BINARY_LOCATION};
     $bin_location =~ s/\\/\\\\/g;
     if ($self->{PPM_INSTALL_SCRIPT}) {
diff --git a/lib/File/Spec/OS2.pm b/lib/File/Spec/OS2.pm
index d602617702..ee7b3316fb 100644
--- a/lib/File/Spec/OS2.pm
+++ b/lib/File/Spec/OS2.pm
@@ -31,6 +31,10 @@ sub path {
     @path;
 }
 
+sub devnull {
+    return "/dev/nul";
+}
+
 1;
 __END__
 
diff --git a/lib/File/Spec/Unix.pm b/lib/File/Spec/Unix.pm
index 77de73a216..ae3546eb68 100644
--- a/lib/File/Spec/Unix.pm
+++ b/lib/File/Spec/Unix.pm
@@ -105,6 +105,16 @@ sub curdir {
     return "." ;
 }
 
+=item devnull
+
+Returns the name of the null device (bit bucket). "/dev/null" on UNIX.
+
+=cut
+
+sub devnull {
+    return "/dev/null";
+}
+
 =item rootdir
 
 Returns a string representing of the root directory.  "/" on UNIX.
diff --git a/lib/File/Spec/VMS.pm b/lib/File/Spec/VMS.pm
index c5269fd10c..208450589e 100644
--- a/lib/File/Spec/VMS.pm
+++ b/lib/File/Spec/VMS.pm
@@ -97,6 +97,16 @@ sub curdir {
     return '[]';
 }
 
+=item devnull (override)
+
+Returns a string representing the null device.
+
+=cut
+
+sub devnull {
+    return 'NL:';
+}
+
 =item rootdir (override)
 
 Returns a string representing of the root directory.
diff --git a/lib/File/Spec/Win32.pm b/lib/File/Spec/Win32.pm
index 034a0cbc2e..3af8bcf38a 100644
--- a/lib/File/Spec/Win32.pm
+++ b/lib/File/Spec/Win32.pm
@@ -66,6 +66,10 @@ sub catfile {
     return $dir.$file;
 }
 
+sub devnull {
+    return "nul";
+}
+
 sub path {
     local $^W = 1;
     my($self) = @_;
diff --git a/lib/Pod/Text.pm b/lib/Pod/Text.pm
index f45c0ea7c9..549bab5a8e 100644
--- a/lib/Pod/Text.pm
+++ b/lib/Pod/Text.pm
@@ -275,14 +275,14 @@ sub prepare_for_output {
 		    my $paratag = $_;
 		    $_ = <IN>;
 		    if (/^=/) {  # tricked!
-			local($indent) = $indent[$#index - 1] || $DEF_INDENT;
+			local($indent) = $indent[$#indent - 1] || $DEF_INDENT;
 			output($paratag);
 			redo POD_DIRECTIVE;
 		    }
 		    &prepare_for_output;
 		    IP_output($paratag, $_);
 		} else {
-		    local($indent) = $indent[$#index - 1] || $DEF_INDENT;
+		    local($indent) = $indent[$#indent - 1] || $DEF_INDENT;
 		    output($_, 0);
 		}
 	    }
@@ -370,7 +370,7 @@ sub fill {
 
 sub IP_output {
     local($tag, $_) = @_;
-    local($tag_indent) = $indent[$#index - 1] || $DEF_INDENT;
+    local($tag_indent) = $indent[$#indent - 1] || $DEF_INDENT;
     $tag_cols = $SCREEN - $tag_indent;
     $cols = $SCREEN - $indent;
     $tag =~ s/\s*$//;