Import perl-5.20.1

10 files changed, 22 insertions, 58 deletions

diff --git a/gnu/usr.bin/perl/cpan/Module-Build/lib/Module/Build/Platform/Default.pm b/gnu/usr.bin/perl/cpan/Module-Build/lib/Module/Build/Platform/Default.pm
index 53bffc05940..8a9cf8b0a75 100644
--- a/gnu/usr.bin/perl/cpan/Module-Build/lib/Module/Build/Platform/Default.pm
+++ b/gnu/usr.bin/perl/cpan/Module-Build/lib/Module/Build/Platform/Default.pm
@@ -2,7 +2,7 @@ package Module::Build::Platform::Default;
 
 use strict;
 use vars qw($VERSION);
-$VERSION = '0.4003';
+$VERSION = '0.4205';
 $VERSION = eval $VERSION;
 use Module::Build::Base;
 
diff --git a/gnu/usr.bin/perl/cpan/Module-Build/lib/Module/Build/Platform/MacOS.pm b/gnu/usr.bin/perl/cpan/Module-Build/lib/Module/Build/Platform/MacOS.pm
index 8b567668529..7e12ca12fa2 100644
--- a/gnu/usr.bin/perl/cpan/Module-Build/lib/Module/Build/Platform/MacOS.pm
+++ b/gnu/usr.bin/perl/cpan/Module-Build/lib/Module/Build/Platform/MacOS.pm
@@ -2,7 +2,7 @@ package Module::Build::Platform::MacOS;
 
 use strict;
 use vars qw($VERSION);
-$VERSION = '0.4003';
+$VERSION = '0.4205';
 $VERSION = eval $VERSION;
 use Module::Build::Base;
 use vars qw(@ISA);
diff --git a/gnu/usr.bin/perl/cpan/Module-Build/lib/Module/Build/Platform/Unix.pm b/gnu/usr.bin/perl/cpan/Module-Build/lib/Module/Build/Platform/Unix.pm
index e3d7ff5b224..ec13ebea9be 100644
--- a/gnu/usr.bin/perl/cpan/Module-Build/lib/Module/Build/Platform/Unix.pm
+++ b/gnu/usr.bin/perl/cpan/Module-Build/lib/Module/Build/Platform/Unix.pm
@@ -2,7 +2,7 @@ package Module::Build::Platform::Unix;
 
 use strict;
 use vars qw($VERSION);
-$VERSION = '0.4003';
+$VERSION = '0.4205';
 $VERSION = eval $VERSION;
 use Module::Build::Base;
 
@@ -43,8 +43,8 @@ sub _detildefy {
   my ($self, $value) = @_;
   $value =~ s[^~([^/]+)?(?=/|$)]   # tilde with optional username
     [$1 ?
-     ((getpwnam $1)[7] || "~$1") :
-     ($ENV{HOME} || (getpwuid $>)[7])
+     (eval{(getpwnam $1)[7]} || "~$1") :
+     ($ENV{HOME} || eval{(getpwuid $>)[7]} || glob("~"))
     ]ex;
   return $value;
 }
diff --git a/gnu/usr.bin/perl/cpan/Module-Build/lib/Module/Build/Platform/VMS.pm b/gnu/usr.bin/perl/cpan/Module-Build/lib/Module/Build/Platform/VMS.pm
index 7ff7e056bdc..5b06baa5f87 100644
--- a/gnu/usr.bin/perl/cpan/Module-Build/lib/Module/Build/Platform/VMS.pm
+++ b/gnu/usr.bin/perl/cpan/Module-Build/lib/Module/Build/Platform/VMS.pm
@@ -2,7 +2,7 @@ package Module::Build::Platform::VMS;
 
 use strict;
 use vars qw($VERSION);
-$VERSION = '0.4003';
+$VERSION = '0.4205';
 $VERSION = eval $VERSION;
 use Module::Build::Base;
 use Config;
@@ -279,30 +279,6 @@ sub oneliner {
     return "MCR $^X $oneliner";
 }
 
-=item _infer_xs_spec
-
-Inherit the standard version but tweak the library file name to be
-something Dynaloader can find.
-
-=cut
-
-sub _infer_xs_spec {
-  my $self = shift;
-  my $file = shift;
-
-  my $spec = $self->SUPER::_infer_xs_spec($file);
-
-  # Need to create with the same name as DynaLoader will load with.
-  if (defined &DynaLoader::mod2fname) {
-    my $file = $$spec{module_name} . '.' . $self->{config}->get('dlext');
-    $file =~ tr/:/_/;
-    $file = DynaLoader::mod2fname([$file]);
-    $$spec{lib_file} = File::Spec->catfile($$spec{archdir}, $file);
-  }
-
-  return $spec;
-}
-
 =item rscan_dir
 
 Inherit the standard version but remove dots at end of name.
@@ -427,26 +403,15 @@ sub _detildefy {
         my @hdirs = File::Spec::Unix->splitdir($hdir);
         my @dirs = File::Spec::Unix->splitdir($dir);
 
-        my $newdirs;
-
-        # Two cases of tilde handling
-        if ($arg =~ m#^~/#) {
-
-            # Simple case, just merge together
-            $newdirs = File::Spec::Unix->catdir(@hdirs, @dirs);
-
-        } else {
-
-            # Complex case, need to add an updir - No delimiters
-            my @backup = File::Spec::Unix->splitdir(File::Spec::Unix->updir);
-
-            $newdirs = File::Spec::Unix->catdir(@hdirs, @backup, @dirs);
+        unless ($arg =~ m#^~/#) {
+            # There is a home directory after the tilde, but it will already
+            # be present in in @hdirs so we need to remove it by from @dirs.
 
+            shift @dirs;
         }
+        my $newdirs = File::Spec::Unix->catdir(@hdirs, @dirs);
 
-        # Now put the two cases back together
         $arg = File::Spec::Unix->catpath($hvol, $newdirs, $file);
-
     }
     return $arg;
 
diff --git a/gnu/usr.bin/perl/cpan/Module-Build/lib/Module/Build/Platform/VOS.pm b/gnu/usr.bin/perl/cpan/Module-Build/lib/Module/Build/Platform/VOS.pm
index 2578e31b3be..19dfceeaf0e 100644
--- a/gnu/usr.bin/perl/cpan/Module-Build/lib/Module/Build/Platform/VOS.pm
+++ b/gnu/usr.bin/perl/cpan/Module-Build/lib/Module/Build/Platform/VOS.pm
@@ -2,7 +2,7 @@ package Module::Build::Platform::VOS;
 
 use strict;
 use vars qw($VERSION);
-$VERSION = '0.4003';
+$VERSION = '0.4205';
 $VERSION = eval $VERSION;
 use Module::Build::Base;
 
diff --git a/gnu/usr.bin/perl/cpan/Module-Build/lib/Module/Build/Platform/Windows.pm b/gnu/usr.bin/perl/cpan/Module-Build/lib/Module/Build/Platform/Windows.pm
index e35e28f707f..77441774507 100644
--- a/gnu/usr.bin/perl/cpan/Module-Build/lib/Module/Build/Platform/Windows.pm
+++ b/gnu/usr.bin/perl/cpan/Module-Build/lib/Module/Build/Platform/Windows.pm
@@ -2,13 +2,12 @@ package Module::Build::Platform::Windows;
 
 use strict;
 use vars qw($VERSION);
-$VERSION = '0.4003';
+$VERSION = '0.4205';
 $VERSION = eval $VERSION;
 
 use Config;
 use File::Basename;
 use File::Spec;
-use IO::File;
 
 use Module::Build::Base;
 
@@ -49,7 +48,7 @@ sub ACTION_realclean {
       my $null_arg = (Win32::IsWinNT()) ? '""' : '';
       my $cmd = qq(start $null_arg /min "\%comspec\%" /c del "$full_progname");
 
-      my $fh = IO::File->new(">> $basename.bat")
+      open(my $fh, '>>', "$basename.bat")
         or die "Can't create $basename.bat: $!";
       print $fh $cmd;
       close $fh ;
@@ -137,9 +136,9 @@ EOT
   my $start = $Config{startperl};
   $start = "#!perl" unless $start =~ /^#!.*perl/;
 
-  my $in = IO::File->new("< $opts{in}") or die "Can't open $opts{in}: $!";
+  open(my $in, '<', "$opts{in}") or die "Can't open $opts{in}: $!";
   my @file = <$in>;
-  $in->close;
+  close($in);
 
   foreach my $line ( @file ) {
     $linenum++;
@@ -164,13 +163,13 @@ EOT
     }
   }
 
-  my $out = IO::File->new("> $opts{out}") or die "Can't open $opts{out}: $!";
+  open(my $out, '>', "$opts{out}") or die "Can't open $opts{out}: $!";
   print $out $head;
   print $out $start, ( $opts{usewarnings} ? " -w" : "" ),
              "\n#line ", ($headlines+1), "\n" unless $linedone;
   print $out @file[$skiplines..$#file];
   print $out $tail unless $taildone;
-  $out->close;
+  close($out);
 
   return $opts{out};
 }
diff --git a/gnu/usr.bin/perl/cpan/Module-Build/lib/Module/Build/Platform/aix.pm b/gnu/usr.bin/perl/cpan/Module-Build/lib/Module/Build/Platform/aix.pm
index 3833ceb9761..c51e1002e6b 100644
--- a/gnu/usr.bin/perl/cpan/Module-Build/lib/Module/Build/Platform/aix.pm
+++ b/gnu/usr.bin/perl/cpan/Module-Build/lib/Module/Build/Platform/aix.pm
@@ -2,7 +2,7 @@ package Module::Build::Platform::aix;
 
 use strict;
 use vars qw($VERSION);
-$VERSION = '0.4003';
+$VERSION = '0.4205';
 $VERSION = eval $VERSION;
 use Module::Build::Platform::Unix;
 
diff --git a/gnu/usr.bin/perl/cpan/Module-Build/lib/Module/Build/Platform/cygwin.pm b/gnu/usr.bin/perl/cpan/Module-Build/lib/Module/Build/Platform/cygwin.pm
index 15d3e818412..19bd50db8bf 100644
--- a/gnu/usr.bin/perl/cpan/Module-Build/lib/Module/Build/Platform/cygwin.pm
+++ b/gnu/usr.bin/perl/cpan/Module-Build/lib/Module/Build/Platform/cygwin.pm
@@ -2,7 +2,7 @@ package Module::Build::Platform::cygwin;
 
 use strict;
 use vars qw($VERSION);
-$VERSION = '0.4003';
+$VERSION = '0.4205';
 $VERSION = eval $VERSION;
 use Module::Build::Platform::Unix;
 
diff --git a/gnu/usr.bin/perl/cpan/Module-Build/lib/Module/Build/Platform/darwin.pm b/gnu/usr.bin/perl/cpan/Module-Build/lib/Module/Build/Platform/darwin.pm
index 45d68fdcd0a..c7e690241c2 100644
--- a/gnu/usr.bin/perl/cpan/Module-Build/lib/Module/Build/Platform/darwin.pm
+++ b/gnu/usr.bin/perl/cpan/Module-Build/lib/Module/Build/Platform/darwin.pm
@@ -2,7 +2,7 @@ package Module::Build::Platform::darwin;
 
 use strict;
 use vars qw($VERSION);
-$VERSION = '0.4003';
+$VERSION = '0.4205';
 $VERSION = eval $VERSION;
 use Module::Build::Platform::Unix;
 
diff --git a/gnu/usr.bin/perl/cpan/Module-Build/lib/Module/Build/Platform/os2.pm b/gnu/usr.bin/perl/cpan/Module-Build/lib/Module/Build/Platform/os2.pm
index 52d6e173d87..5f9ad187db8 100644
--- a/gnu/usr.bin/perl/cpan/Module-Build/lib/Module/Build/Platform/os2.pm
+++ b/gnu/usr.bin/perl/cpan/Module-Build/lib/Module/Build/Platform/os2.pm
@@ -2,7 +2,7 @@ package Module::Build::Platform::os2;
 
 use strict;
 use vars qw($VERSION);
-$VERSION = '0.4003';
+$VERSION = '0.4205';
 $VERSION = eval $VERSION;
 use Module::Build::Platform::Unix;