Upgrade to File::Spec 0.810_01 from CPAN by Barrie Slaymaker.

p4raw-id: //depot/cfgperl@6230

diff --git a/lib/File/Spec.pm b/lib/File/Spec.pm
index ed26d76..4cfab05 100644 (file)
--- a/lib/File/Spec.pm
+++ b/lib/File/Spec.pm
@@ -3,7 +3,7 @@ package File::Spec;
 use strict;
 use vars qw(@ISA $VERSION);
 
-$VERSION = '0.81';
+$VERSION = '0.810_01';
 
 my %module = (MacOS   => 'Mac',
              MSWin32 => 'Win32',

diff --git a/lib/File/Spec/Functions.pm b/lib/File/Spec/Functions.pm
index 0036ac1..140738f 100644 (file)
--- a/lib/File/Spec/Functions.pm
+++ b/lib/File/Spec/Functions.pm
@@ -3,9 +3,7 @@ package File::Spec::Functions;
 use File::Spec;
 use strict;
 
-use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
-
-$VERSION = '1.1';
+use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
 
 require Exporter;
 

diff --git a/lib/File/Spec/Mac.pm b/lib/File/Spec/Mac.pm
index 5315d92..2b0f5c8 100644 (file)
--- a/lib/File/Spec/Mac.pm
+++ b/lib/File/Spec/Mac.pm
@@ -1,11 +1,8 @@
 package File::Spec::Mac;
 
 use strict;
-use vars qw(@ISA $VERSION);
+use vars qw(@ISA);
 require File::Spec::Unix;
-
-$VERSION = '1.1';
-
 @ISA = qw(File::Spec::Unix);
 
 =head1 NAME

diff --git a/lib/File/Spec/OS2.pm b/lib/File/Spec/OS2.pm
index 20bf8c9..33370f0 100644 (file)
--- a/lib/File/Spec/OS2.pm
+++ b/lib/File/Spec/OS2.pm
@@ -1,11 +1,8 @@
 package File::Spec::OS2;
 
 use strict;
-use vars qw(@ISA $VERSION);
+use vars qw(@ISA);
 require File::Spec::Unix;
-
-$VERSION = '1.1';
-
 @ISA = qw(File::Spec::Unix);
 
 sub devnull {

diff --git a/lib/File/Spec/Unix.pm b/lib/File/Spec/Unix.pm
index 6ca26d7..c921eb0 100644 (file)
--- a/lib/File/Spec/Unix.pm
+++ b/lib/File/Spec/Unix.pm
@@ -1,9 +1,6 @@
 package File::Spec::Unix;
 
 use strict;
-use vars qw($VERSION);
-
-$VERSION = '1.1';
 
 use Cwd;
 

diff --git a/lib/File/Spec/VMS.pm b/lib/File/Spec/VMS.pm
index cc06ca6..e59aa21 100644 (file)
--- a/lib/File/Spec/VMS.pm
+++ b/lib/File/Spec/VMS.pm
@@ -1,11 +1,8 @@
 package File::Spec::VMS;
 
 use strict;
-use vars qw(@ISA $VERSION);
+use vars qw(@ISA);
 require File::Spec::Unix;
-
-$VERSION = '1.1';
-
 @ISA = qw(File::Spec::Unix);
 
 use Cwd;
@@ -40,11 +37,6 @@ sub eliminate_macros {
     my($self,$path) = @_;
     return '' unless $path;
     $self = {} unless ref $self;
-
-    if ($path =~ /\s/) {
-      return join ' ', map { $self->eliminate_macros($_) } split /\s+/, $path;
-    }
-
     my($npath) = unixify($path);
     my($complex) = 0;
     my($head,$macro,$tail);
@@ -94,12 +86,6 @@ sub fixpath {
     $self = bless {} unless ref $self;
     my($fixedpath,$prefix,$name);
 
-    if ($path =~ /\s/) {
-      return join ' ',
-             map { $self->fixpath($_,$force_path) }
-            split /\s+/, $path;
-    }
-
     if ($path =~ m#^\$\([^\)]+\)\Z(?!\n)#s || $path =~ m#[/:>\]]#) { 
         if ($force_path or $path =~ /(?:DIR\)|\])\Z(?!\n)/) {
             $fixedpath = vmspath($self->eliminate_macros($path));

diff --git a/lib/File/Spec/Win32.pm b/lib/File/Spec/Win32.pm
index b8fe37b..505e578 100644 (file)
--- a/lib/File/Spec/Win32.pm
+++ b/lib/File/Spec/Win32.pm
@@ -2,11 +2,8 @@ package File::Spec::Win32;
 
 use strict;
 use Cwd;
-use vars qw(@ISA $VERSION);
+use vars qw(@ISA);
 require File::Spec::Unix;
-
-$VERSION = '1.1';
-
 @ISA = qw(File::Spec::Unix);
 
 =head1 NAME

diff --git a/t/lib/filefunc.t b/t/lib/filefunc.t
index 46a1e35..6e70a49 100755 (executable)
--- a/t/lib/filefunc.t
+++ b/t/lib/filefunc.t
@@ -2,8 +2,8 @@
 
 BEGIN {
     $^O = '';
-    chdir 't' if -d 't';
-    unshift @INC, '../lib';
+#chdir 't' if -d 't';
+#unshift @INC, '../lib';
 }
 
 print "1..1\n";

diff --git a/t/lib/filespec.t b/t/lib/filespec.t
index da52ec5..da19290 100755 (executable)
--- a/t/lib/filespec.t
+++ b/t/lib/filespec.t
@@ -2,8 +2,8 @@
 
 BEGIN {
     $^O = '';
-    chdir 't' if -d 't';
-    unshift @INC, '../lib';
+#chdir 't' if -d 't';
+#unshift @INC, '../lib';
 }
 
 # Each element in this array is a single test. Storing them this way makes