Blame SOURCES/PathTools-3.62-Upgrade-to-3.63.patch

22d2ea
diff --git a/Cwd.pm b/Cwd.pm
22d2ea
index 9b5183e..e8b9f19 100644
22d2ea
--- a/Cwd.pm
22d2ea
+++ b/Cwd.pm
22d2ea
@@ -3,7 +3,7 @@ use strict;
22d2ea
 use Exporter;
22d2ea
 use vars qw(@ISA @EXPORT @EXPORT_OK $VERSION);
22d2ea
 
22d2ea
-$VERSION = '3.62';
22d2ea
+$VERSION = '3.63';
22d2ea
 my $xs_version = $VERSION;
22d2ea
 $VERSION =~ tr/_//d;
22d2ea
 
22d2ea
diff --git a/lib/File/Spec.pm b/lib/File/Spec.pm
22d2ea
index 2709c39..32b987e 100644
22d2ea
--- a/lib/File/Spec.pm
22d2ea
+++ b/lib/File/Spec.pm
22d2ea
@@ -3,7 +3,7 @@ package File::Spec;
22d2ea
 use strict;
22d2ea
 use vars qw(@ISA $VERSION);
22d2ea
 
22d2ea
-$VERSION = '3.62';
22d2ea
+$VERSION = '3.63';
22d2ea
 $VERSION =~ tr/_//d;
22d2ea
 
22d2ea
 my %module = (MacOS   => 'Mac',
22d2ea
diff --git a/lib/File/Spec/AmigaOS.pm b/lib/File/Spec/AmigaOS.pm
22d2ea
index e6d6f5f2a..7a5889c 100644
22d2ea
--- a/lib/File/Spec/AmigaOS.pm
22d2ea
+++ b/lib/File/Spec/AmigaOS.pm
22d2ea
@@ -4,7 +4,7 @@ use strict;
22d2ea
 use vars qw(@ISA $VERSION);
22d2ea
 require File::Spec::Unix;
22d2ea
 
22d2ea
-$VERSION = '3.62';
22d2ea
+$VERSION = '3.64';
22d2ea
 $VERSION =~ tr/_//d;
22d2ea
 
22d2ea
 @ISA = qw(File::Spec::Unix);
22d2ea
@@ -15,7 +15,8 @@ File::Spec::AmigaOS - File::Spec for AmigaOS
22d2ea
 
22d2ea
 =head1 SYNOPSIS
22d2ea
 
22d2ea
- require File::Spec::AmigaOS; # Done automatically by File::Spec if needed
22d2ea
+ require File::Spec::AmigaOS; # Done automatically by File::Spec
22d2ea
+                              # if needed
22d2ea
 
22d2ea
 =head1 DESCRIPTION
22d2ea
 
22d2ea
diff --git a/lib/File/Spec/Cygwin.pm b/lib/File/Spec/Cygwin.pm
22d2ea
index 67f056f..2092eb8 100644
22d2ea
--- a/lib/File/Spec/Cygwin.pm
22d2ea
+++ b/lib/File/Spec/Cygwin.pm
22d2ea
@@ -4,7 +4,7 @@ use strict;
22d2ea
 use vars qw(@ISA $VERSION);
22d2ea
 require File::Spec::Unix;
22d2ea
 
22d2ea
-$VERSION = '3.62';
22d2ea
+$VERSION = '3.63';
22d2ea
 $VERSION =~ tr/_//d;
22d2ea
 
22d2ea
 @ISA = qw(File::Spec::Unix);
22d2ea
diff --git a/lib/File/Spec/Epoc.pm b/lib/File/Spec/Epoc.pm
22d2ea
index 17e3f54..22f0192 100644
22d2ea
--- a/lib/File/Spec/Epoc.pm
22d2ea
+++ b/lib/File/Spec/Epoc.pm
22d2ea
@@ -3,7 +3,7 @@ package File::Spec::Epoc;
22d2ea
 use strict;
22d2ea
 use vars qw($VERSION @ISA);
22d2ea
 
22d2ea
-$VERSION = '3.62';
22d2ea
+$VERSION = '3.63';
22d2ea
 $VERSION =~ tr/_//d;
22d2ea
 
22d2ea
 require File::Spec::Unix;
22d2ea
diff --git a/lib/File/Spec/Functions.pm b/lib/File/Spec/Functions.pm
22d2ea
index 470c771..af2c498 100644
22d2ea
--- a/lib/File/Spec/Functions.pm
22d2ea
+++ b/lib/File/Spec/Functions.pm
22d2ea
@@ -5,7 +5,7 @@ use strict;
22d2ea
 
22d2ea
 use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
22d2ea
 
22d2ea
-$VERSION = '3.62';
22d2ea
+$VERSION = '3.63';
22d2ea
 $VERSION =~ tr/_//d;
22d2ea
 
22d2ea
 require Exporter;
22d2ea
diff --git a/lib/File/Spec/Mac.pm b/lib/File/Spec/Mac.pm
22d2ea
index 329451f..52c3bfe 100644
22d2ea
--- a/lib/File/Spec/Mac.pm
22d2ea
+++ b/lib/File/Spec/Mac.pm
22d2ea
@@ -4,7 +4,7 @@ use strict;
22d2ea
 use vars qw(@ISA $VERSION);
22d2ea
 require File::Spec::Unix;
22d2ea
 
22d2ea
-$VERSION = '3.62';
22d2ea
+$VERSION = '3.63';
22d2ea
 $VERSION =~ tr/_//d;
22d2ea
 
22d2ea
 @ISA = qw(File::Spec::Unix);
22d2ea
diff --git a/lib/File/Spec/OS2.pm b/lib/File/Spec/OS2.pm
22d2ea
index 55e6d33..804ecdb 100644
22d2ea
--- a/lib/File/Spec/OS2.pm
22d2ea
+++ b/lib/File/Spec/OS2.pm
22d2ea
@@ -4,7 +4,7 @@ use strict;
22d2ea
 use vars qw(@ISA $VERSION);
22d2ea
 require File::Spec::Unix;
22d2ea
 
22d2ea
-$VERSION = '3.62';
22d2ea
+$VERSION = '3.63';
22d2ea
 $VERSION =~ tr/_//d;
22d2ea
 
22d2ea
 @ISA = qw(File::Spec::Unix);
22d2ea
diff --git a/lib/File/Spec/Unix.pm b/lib/File/Spec/Unix.pm
22d2ea
index 586e9b0..3916a11 100644
22d2ea
--- a/lib/File/Spec/Unix.pm
22d2ea
+++ b/lib/File/Spec/Unix.pm
22d2ea
@@ -3,7 +3,7 @@ package File::Spec::Unix;
22d2ea
 use strict;
22d2ea
 use vars qw($VERSION);
22d2ea
 
22d2ea
-$VERSION = '3.62';
22d2ea
+$VERSION = '3.63';
22d2ea
 my $xs_version = $VERSION;
22d2ea
 $VERSION =~ tr/_//d;
22d2ea
 
22d2ea
diff --git a/lib/File/Spec/VMS.pm b/lib/File/Spec/VMS.pm
22d2ea
index 600c49f..02cc0b0 100644
22d2ea
--- a/lib/File/Spec/VMS.pm
22d2ea
+++ b/lib/File/Spec/VMS.pm
22d2ea
@@ -4,7 +4,7 @@ use strict;
22d2ea
 use vars qw(@ISA $VERSION);
22d2ea
 require File::Spec::Unix;
22d2ea
 
22d2ea
-$VERSION = '3.62';
22d2ea
+$VERSION = '3.63';
22d2ea
 $VERSION =~ tr/_//d;
22d2ea
 
22d2ea
 @ISA = qw(File::Spec::Unix);
22d2ea
@@ -437,15 +437,13 @@ Attempt to convert an absolute file specification to a relative specification.
22d2ea
 
22d2ea
 sub abs2rel {
22d2ea
     my $self = shift;
22d2ea
-    return vmspath(File::Spec::Unix::abs2rel( $self, @_ ))
22d2ea
-        if ((grep m{/}, @_) && !(grep m{(?
22d2ea
-
22d2ea
     my($path,$base) = @_;
22d2ea
+
22d2ea
     $base = $self->_cwd() unless defined $base and length $base;
22d2ea
 
22d2ea
     # If there is no device or directory syntax on $base, make sure it
22d2ea
     # is treated as a directory.
22d2ea
-    $base = VMS::Filespec::vmspath($base) unless $base =~ m{(?
22d2ea
+    $base = vmspath($base) unless $base =~ m{(?
22d2ea
 
22d2ea
     for ($path, $base) { $_ = $self->rel2abs($_) }
22d2ea
 
22d2ea
@@ -461,7 +459,7 @@ sub abs2rel {
22d2ea
     
22d2ea
     my ($path_volume, $path_directories, $path_file) = $self->splitpath($path);
22d2ea
     my ($base_volume, $base_directories, $base_file) = $self->splitpath($base);
22d2ea
-    return $path unless lc($path_volume) eq lc($base_volume);
22d2ea
+    return $self->canonpath( $path ) unless lc($path_volume) eq lc($base_volume);
22d2ea
 
22d2ea
     # Now, remove all leading components that are the same
22d2ea
     my @pathchunks = $self->splitdir( $path_directories );
22d2ea
diff --git a/lib/File/Spec/Win32.pm b/lib/File/Spec/Win32.pm
22d2ea
index 6df7ee8..1105b67 100644
22d2ea
--- a/lib/File/Spec/Win32.pm
22d2ea
+++ b/lib/File/Spec/Win32.pm
22d2ea
@@ -5,7 +5,7 @@ use strict;
22d2ea
 use vars qw(@ISA $VERSION);
22d2ea
 require File::Spec::Unix;
22d2ea
 
22d2ea
-$VERSION = '3.62';
22d2ea
+$VERSION = '3.63';
22d2ea
 $VERSION =~ tr/_//d;
22d2ea
 
22d2ea
 @ISA = qw(File::Spec::Unix);
22d2ea
diff --git a/t/abs2rel.t b/t/abs2rel.t
22d2ea
index 5e33ab6..b77a1c2 100644
22d2ea
--- a/t/abs2rel.t
22d2ea
+++ b/t/abs2rel.t
22d2ea
@@ -6,7 +6,7 @@ use Test::More;
22d2ea
 use Cwd qw(cwd getcwd abs_path);
22d2ea
 use File::Spec();
22d2ea
 use File::Temp qw(tempdir);
22d2ea
-use File::Path qw(make_path);
22d2ea
+use File::Path qw(mkpath);
22d2ea
 
22d2ea
 my $startdir = cwd();
22d2ea
 my @files = ( 'anyfile', './anyfile', '../first_sub_dir/anyfile', '../second_sub_dir/second_file' );
22d2ea
@@ -25,8 +25,8 @@ sub test_rel2abs {
22d2ea
         File::Spec->catdir('first_sub_dir',  'sub_sub_dir'),
22d2ea
         'second_sub_dir'
22d2ea
     );
22d2ea
-    make_path(@subdirs, { mode => 0711 })
22d2ea
-        or die "Unable to make_path: $!";
22d2ea
+    mkpath(@subdirs, { mode => 0711 })
22d2ea
+        or die "Unable to mkpath: $!";
22d2ea
 
22d2ea
     open my $OUT2, '>',
22d2ea
         File::Spec->catfile('second_sub_dir', 'second_file')