Upgrade to PathTools 3.30_02 (with only core reorganization fixes)

diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index db85062..2a485d5 100755 (executable)
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -1117,13 +1117,8 @@ use File::Glob qw(:case);
     'PathTools' =>
        {
        'MAINTAINER'    => 'kwilliams',
-       'DISTRIBUTION'  => 'SMUELLER/PathTools-3.30_01.tar.gz',
+       'DISTRIBUTION'  => 'SMUELLER/PathTools-3.30_02.tar.gz',
        'FILES'         => q[cpan/Cwd],
-       # XXX note that the CPAN and blead Makefile.PL are totally
-       # unrelated. The blead one is described as 'core-only'.
-       # Perhaps after the big lib/ => ext/ migration it will be possible
-       # to harmonize them?
-       
        'EXCLUDED'      => [ qr{^t/lib/Test/} ],
        'CPAN'          => 1,
        'UPSTREAM'      => "cpan",

diff --git a/cpan/Cwd/Cwd.pm b/cpan/Cwd/Cwd.pm
index 3a0fda3..03e1518 100644 (file)
--- a/cpan/Cwd/Cwd.pm
+++ b/cpan/Cwd/Cwd.pm
@@ -171,7 +171,7 @@ use strict;
 use Exporter;
 use vars qw(@ISA @EXPORT @EXPORT_OK $VERSION);
 
-$VERSION = '3.3001';
+$VERSION = '3.30_02';
 my $xs_version = $VERSION;
 $VERSION = eval $VERSION;
 

diff --git a/cpan/Cwd/Cwd.xs b/cpan/Cwd/Cwd.xs
index 949b94c..123be68 100644 (file)
--- a/cpan/Cwd/Cwd.xs
+++ b/cpan/Cwd/Cwd.xs
@@ -1,11 +1,9 @@
 #include "EXTERN.h"
 #include "perl.h"
 #include "XSUB.h"
-#ifndef NO_PPPORT_H
-#   define NEED_my_strlcpy
-#   define NEED_my_strlcat
-#   include "ppport.h"
-#endif
+#define NEED_my_strlcpy
+#define NEED_my_strlcat
+#include "ppport.h"
 
 #ifdef I_UNISTD
 #   include <unistd.h>

diff --git a/cpan/Cwd/t/cwd.t b/cpan/Cwd/t/cwd.t
index bab3dc3..256b2a1 100644 (file)
--- a/cpan/Cwd/t/cwd.t
+++ b/cpan/Cwd/t/cwd.t
@@ -216,11 +216,6 @@ SKIP: {
     1 while unlink $file;
 }
 
-if ($ENV{PERL_CORE}) {
-    chdir '../ext/Cwd/t';
-    unshift @INC, '../../../lib';
-}
-
 # Make sure we can run abs_path() on files, not just directories
 my $path = 'cwd.t';
 path_ends_with(Cwd::abs_path($path), 'cwd.t', 'abs_path() can be invoked on a file');