Perl is no longer in base. Long live the port!

17 files changed, 0 insertions, 6592 deletions

diff --git a/contrib/perl5/lib/File/Basename.pm b/contrib/perl5/lib/File/Basename.pm
deleted file mode 100644
index 94aac2d..0000000
--- a/contrib/perl5/lib/File/Basename.pm
+++ /dev/null
@@ -1,283 +0,0 @@
-package File::Basename;
-
-=head1 NAME
-
-fileparse - split a pathname into pieces
-
-basename - extract just the filename from a path
-
-dirname - extract just the directory from a path
-
-=head1 SYNOPSIS
-
-    use File::Basename;
-
-    ($name,$path,$suffix) = fileparse($fullname,@suffixlist)
-    fileparse_set_fstype($os_string);
-    $basename = basename($fullname,@suffixlist);
-    $dirname = dirname($fullname);
-
-    ($name,$path,$suffix) = fileparse("lib/File/Basename.pm","\.pm");
-    fileparse_set_fstype("VMS");
-    $basename = basename("lib/File/Basename.pm",".pm");
-    $dirname = dirname("lib/File/Basename.pm");
-
-=head1 DESCRIPTION
-
-These routines allow you to parse file specifications into useful
-pieces using the syntax of different operating systems.
-
-=over 4
-
-=item fileparse_set_fstype
-
-You select the syntax via the routine fileparse_set_fstype().
-
-If the argument passed to it contains one of the substrings
-"VMS", "MSDOS", "MacOS", "AmigaOS" or "MSWin32", the file specification 
-syntax of that operating system is used in future calls to 
-fileparse(), basename(), and dirname().  If it contains none of
-these substrings, Unix syntax is used.  This pattern matching is
-case-insensitive.  If you've selected VMS syntax, and the file
-specification you pass to one of these routines contains a "/",
-they assume you are using Unix emulation and apply the Unix syntax
-rules instead, for that function call only.
-
-If the argument passed to it contains one of the substrings "VMS",
-"MSDOS", "MacOS", "AmigaOS", "os2", "MSWin32" or "RISCOS", then the pattern
-matching for suffix removal is performed without regard for case,
-since those systems are not case-sensitive when opening existing files
-(though some of them preserve case on file creation).
-
-If you haven't called fileparse_set_fstype(), the syntax is chosen
-by examining the builtin variable C<$^O> according to these rules.
-
-=item fileparse
-
-The fileparse() routine divides a file specification into three
-parts: a leading B<path>, a file B<name>, and a B<suffix>.  The
-B<path> contains everything up to and including the last directory
-separator in the input file specification.  The remainder of the input
-file specification is then divided into B<name> and B<suffix> based on
-the optional patterns you specify in C<@suffixlist>.  Each element of
-this list is interpreted as a regular expression, and is matched
-against the end of B<name>.  If this succeeds, the matching portion of
-B<name> is removed and prepended to B<suffix>.  By proper use of
-C<@suffixlist>, you can remove file types or versions for examination.
-
-You are guaranteed that if you concatenate B<path>, B<name>, and
-B<suffix> together in that order, the result will denote the same
-file as the input file specification.
-
-=back
-
-=head1 EXAMPLES
-
-Using Unix file syntax:
-
-    ($base,$path,$type) = fileparse('/virgil/aeneid/draft.book7',
-				    '\.book\d+');
-
-would yield
-
-    $base eq 'draft'
-    $path eq '/virgil/aeneid/',
-    $type eq '.book7'
-
-Similarly, using VMS syntax:
-
-    ($name,$dir,$type) = fileparse('Doc_Root:[Help]Rhetoric.Rnh',
-				   '\..*');
-
-would yield
-
-    $name eq 'Rhetoric'
-    $dir  eq 'Doc_Root:[Help]'
-    $type eq '.Rnh'
-
-=over
-
-=item C<basename>
-
-The basename() routine returns the first element of the list produced
-by calling fileparse() with the same arguments, except that it always
-quotes metacharacters in the given suffixes.  It is provided for
-programmer compatibility with the Unix shell command basename(1).
-
-=item C<dirname>
-
-The dirname() routine returns the directory portion of the input file
-specification.  When using VMS or MacOS syntax, this is identical to the
-second element of the list produced by calling fileparse() with the same
-input file specification.  (Under VMS, if there is no directory information
-in the input file specification, then the current default device and
-directory are returned.)  When using Unix or MSDOS syntax, the return
-value conforms to the behavior of the Unix shell command dirname(1).  This
-is usually the same as the behavior of fileparse(), but differs in some
-cases.  For example, for the input file specification F<lib/>, fileparse()
-considers the directory name to be F<lib/>, while dirname() considers the
-directory name to be F<.>).
-
-=back
-
-=cut
-
-
-## use strict;
-# A bit of juggling to insure that C<use re 'taint';> always works, since
-# File::Basename is used during the Perl build, when the re extension may
-# not be available.
-BEGIN {
-  unless (eval { require re; })
-    { eval ' sub re::import { $^H |= 0x00100000; } ' }
-  import re 'taint';
-}
-
-
-
-use 5.005_64;
-our(@ISA, @EXPORT, $VERSION, $Fileparse_fstype, $Fileparse_igncase);
-require Exporter;
-@ISA = qw(Exporter);
-@EXPORT = qw(fileparse fileparse_set_fstype basename dirname);
-$VERSION = "2.6";
-
-
-#   fileparse_set_fstype() - specify OS-based rules used in future
-#                            calls to routines in this package
-#
-#   Currently recognized values: VMS, MSDOS, MacOS, AmigaOS, os2, RISCOS
-#       Any other name uses Unix-style rules and is case-sensitive
-
-sub fileparse_set_fstype {
-  my @old = ($Fileparse_fstype, $Fileparse_igncase);
-  if (@_) {
-    $Fileparse_fstype = $_[0];
-    $Fileparse_igncase = ($_[0] =~ /^(?:MacOS|VMS|AmigaOS|os2|RISCOS|MSWin32|MSDOS)/i);
-  }
-  wantarray ? @old : $old[0];
-}
-
-#   fileparse() - parse file specification
-#
-#   Version 2.4  27-Sep-1996  Charles Bailey  bailey@genetics.upenn.edu
-
-
-sub fileparse {
-  my($fullname,@suffices) = @_;
-  my($fstype,$igncase) = ($Fileparse_fstype, $Fileparse_igncase);
-  my($dirpath,$tail,$suffix,$basename);
-  my($taint) = substr($fullname,0,0);  # Is $fullname tainted?
-
-  if ($fstype =~ /^VMS/i) {
-    if ($fullname =~ m#/#) { $fstype = '' }  # We're doing Unix emulation
-    else {
-      ($dirpath,$basename) = ($fullname =~ /^(.*[:>\]])?(.*)/s);
-      $dirpath ||= '';  # should always be defined
-    }
-  }
-  if ($fstype =~ /^MS(DOS|Win32)|epoc/i) {
-    ($dirpath,$basename) = ($fullname =~ /^((?:.*[:\\\/])?)(.*)/s);
-    $dirpath .= '.\\' unless $dirpath =~ /[\\\/]\z/;
-  }
-  elsif ($fstype =~ /^MacOS/si) {
-    ($dirpath,$basename) = ($fullname =~ /^(.*:)?(.*)/s);
-  }
-  elsif ($fstype =~ /^AmigaOS/i) {
-    ($dirpath,$basename) = ($fullname =~ /(.*[:\/])?(.*)/s);
-    $dirpath = './' unless $dirpath;
-  }
-  elsif ($fstype !~ /^VMS/i) {  # default to Unix
-    ($dirpath,$basename) = ($fullname =~ m#^(.*/)?(.*)#s);
-    if ($^O eq 'VMS' and $fullname =~ m:^(/[^/]+/000000(/|$))(.*):) {
-      # dev:[000000] is top of VMS tree, similar to Unix '/'
-      # so strip it off and treat the rest as "normal"
-      my $devspec  = $1;
-      my $remainder = $3;
-      ($dirpath,$basename) = ($remainder =~ m#^(.*/)?(.*)#s);
-      $dirpath = $devspec.$dirpath;
-    }
-    $dirpath = './' unless $dirpath;
-  }
-
-  if (@suffices) {
-    $tail = '';
-    foreach $suffix (@suffices) {
-      my $pat = ($igncase ? '(?i)' : '') . "($suffix)\$";
-      if ($basename =~ s/$pat//s) {
-        $taint .= substr($suffix,0,0);
-        $tail = $1 . $tail;
-      }
-    }
-  }
-
-  $tail .= $taint if defined $tail; # avoid warning if $tail == undef
-  wantarray ? ($basename . $taint, $dirpath . $taint, $tail)
-            : $basename . $taint;
-}
-
-
-#   basename() - returns first element of list returned by fileparse()
-
-sub basename {
-  my($name) = shift;
-  (fileparse($name, map("\Q$_\E",@_)))[0];
-}
-
-
-#    dirname() - returns device and directory portion of file specification
-#        Behavior matches that of Unix dirname(1) exactly for Unix and MSDOS
-#        filespecs except for names ending with a separator, e.g., "/xx/yy/".
-#        This differs from the second element of the list returned
-#        by fileparse() in that the trailing '/' (Unix) or '\' (MSDOS) (and
-#        the last directory name if the filespec ends in a '/' or '\'), is lost.
-
-sub dirname {
-    my($basename,$dirname) = fileparse($_[0]);
-    my($fstype) = $Fileparse_fstype;
-
-    if ($fstype =~ /VMS/i) { 
-        if ($_[0] =~ m#/#) { $fstype = '' }
-        else { return $dirname || $ENV{DEFAULT} }
-    }
-    if ($fstype =~ /MacOS/i) {
-	if( !length($basename) && $dirname !~ /^[^:]+:\z/) {
-	    $dirname =~ s/([^:]):\z/$1/s;
-	    ($basename,$dirname) = fileparse $dirname;
-	}
-	$dirname .= ":" unless $dirname =~ /:\z/;
-    }
-    elsif ($fstype =~ /MSDOS/i) { 
-        $dirname =~ s/([^:])[\\\/]*\z/$1/;
-        unless( length($basename) ) {
-	    ($basename,$dirname) = fileparse $dirname;
-	    $dirname =~ s/([^:])[\\\/]*\z/$1/;
-	}
-    }
-    elsif ($fstype =~ /MSWin32/i) { 
-        $dirname =~ s/([^:])[\\\/]*\z/$1/;
-        unless( length($basename) ) {
-	    ($basename,$dirname) = fileparse $dirname;
-	    $dirname =~ s/([^:])[\\\/]*\z/$1/;
-	}
-    }
-    elsif ($fstype =~ /AmigaOS/i) {
-        if ( $dirname =~ /:\z/) { return $dirname }
-        chop $dirname;
-        $dirname =~ s#[^:/]+\z## unless length($basename);
-    }
-    else {
-        $dirname =~ s:(.)/*\z:$1:s;
-        unless( length($basename) ) {
-	    local($File::Basename::Fileparse_fstype) = $fstype;
-	    ($basename,$dirname) = fileparse $dirname;
-	    $dirname =~ s:(.)/*\z:$1:s;
-	}
-    }
-
-    $dirname;
-}
-
-fileparse_set_fstype $^O;
-
-1;
diff --git a/contrib/perl5/lib/File/CheckTree.pm b/contrib/perl5/lib/File/CheckTree.pm
deleted file mode 100644
index ae18777..0000000
--- a/contrib/perl5/lib/File/CheckTree.pm
+++ /dev/null
@@ -1,151 +0,0 @@
-package File::CheckTree;
-require 5.000;
-require Exporter;
-
-=head1 NAME
-
-validate - run many filetest checks on a tree
-
-=head1 SYNOPSIS
-
-    use File::CheckTree;
-
-    $warnings += validate( q{
-	/vmunix                 -e || die
-	/boot                   -e || die
-	/bin                    cd
-	    csh                 -ex
-	    csh                 !-ug
-	    sh                  -ex
-	    sh                  !-ug
-	/usr                    -d || warn "What happened to $file?\n"
-    });
-
-=head1 DESCRIPTION
-
-The validate() routine takes a single multiline string consisting of
-lines containing a filename plus a file test to try on it.  (The
-file test may also be a "cd", causing subsequent relative filenames
-to be interpreted relative to that directory.)  After the file test
-you may put C<|| die> to make it a fatal error if the file test fails.
-The default is C<|| warn>.  The file test may optionally have a "!' prepended
-to test for the opposite condition.  If you do a cd and then list some
-relative filenames, you may want to indent them slightly for readability.
-If you supply your own die() or warn() message, you can use $file to
-interpolate the filename.
-
-Filetests may be bunched:  "-rwx" tests for all of C<-r>, C<-w>, and C<-x>.
-Only the first failed test of the bunch will produce a warning.
-
-The routine returns the number of warnings issued.
-
-=cut
-
-@ISA = qw(Exporter);
-@EXPORT = qw(validate);
-
-# $RCSfile: validate.pl,v $$Revision: 4.1 $$Date: 92/08/07 18:24:19 $
-
-# The validate routine takes a single multiline string consisting of
-# lines containing a filename plus a file test to try on it.  (The
-# file test may also be a 'cd', causing subsequent relative filenames
-# to be interpreted relative to that directory.)  After the file test
-# you may put '|| die' to make it a fatal error if the file test fails.
-# The default is '|| warn'.  The file test may optionally have a ! prepended
-# to test for the opposite condition.  If you do a cd and then list some
-# relative filenames, you may want to indent them slightly for readability.
-# If you supply your own "die" or "warn" message, you can use $file to
-# interpolate the filename.
-
-# Filetests may be bunched:  -rwx tests for all of -r, -w and -x.
-# Only the first failed test of the bunch will produce a warning.
-
-# The routine returns the number of warnings issued.
-
-# Usage:
-#	use File::CheckTree;
-#	$warnings += validate('
-#	/vmunix			-e || die
-#	/boot			-e || die
-#	/bin			cd
-#	    csh			-ex
-#	    csh			!-ug
-#	    sh			-ex
-#	    sh			!-ug
-#	/usr			-d || warn "What happened to $file?\n"
-#	');
-
-sub validate {
-    local($file,$test,$warnings,$oldwarnings);
-    foreach $check (split(/\n/,$_[0])) {
-	next if $check =~ /^#/;
-	next if $check =~ /^$/;
-	($file,$test) = split(' ',$check,2);
-	if ($test =~ s/^(!?-)(\w{2,}\b)/$1Z/) {
-	    $testlist = $2;
-	    @testlist = split(//,$testlist);
-	}
-	else {
-	    @testlist = ('Z');
-	}
-	$oldwarnings = $warnings;
-	foreach $one (@testlist) {
-	    $this = $test;
-	    $this =~ s/(-\w\b)/$1 \$file/g;
-	    $this =~ s/-Z/-$one/;
-	    $this .= ' || warn' unless $this =~ /\|\|/;
-	    $this =~ s/^(.*\S)\s*\|\|\s*(die|warn)$/$1 || valmess('$2','$1')/;
-	    $this =~ s/\bcd\b/chdir (\$cwd = \$file)/g;
-	    eval $this;
-	    last if $warnings > $oldwarnings;
-	}
-    }
-    $warnings;
-}
-
-sub valmess {
-    local($disposition,$this) = @_;
-    $file = $cwd . '/' . $file unless $file =~ m|^/|s;
-    if ($this =~ /^(!?)-(\w)\s+\$file\s*$/) {
-	$neg = $1;
-	$tmp = $2;
-	$tmp eq 'r' && ($mess = "$file is not readable by uid $>.");
-	$tmp eq 'w' && ($mess = "$file is not writable by uid $>.");
-	$tmp eq 'x' && ($mess = "$file is not executable by uid $>.");
-	$tmp eq 'o' && ($mess = "$file is not owned by uid $>.");
-	$tmp eq 'R' && ($mess = "$file is not readable by you.");
-	$tmp eq 'W' && ($mess = "$file is not writable by you.");
-	$tmp eq 'X' && ($mess = "$file is not executable by you.");
-	$tmp eq 'O' && ($mess = "$file is not owned by you.");
-	$tmp eq 'e' && ($mess = "$file does not exist.");
-	$tmp eq 'z' && ($mess = "$file does not have zero size.");
-	$tmp eq 's' && ($mess = "$file does not have non-zero size.");
-	$tmp eq 'f' && ($mess = "$file is not a plain file.");
-	$tmp eq 'd' && ($mess = "$file is not a directory.");
-	$tmp eq 'l' && ($mess = "$file is not a symbolic link.");
-	$tmp eq 'p' && ($mess = "$file is not a named pipe (FIFO).");
-	$tmp eq 'S' && ($mess = "$file is not a socket.");
-	$tmp eq 'b' && ($mess = "$file is not a block special file.");
-	$tmp eq 'c' && ($mess = "$file is not a character special file.");
-	$tmp eq 'u' && ($mess = "$file does not have the setuid bit set.");
-	$tmp eq 'g' && ($mess = "$file does not have the setgid bit set.");
-	$tmp eq 'k' && ($mess = "$file does not have the sticky bit set.");
-	$tmp eq 'T' && ($mess = "$file is not a text file.");
-	$tmp eq 'B' && ($mess = "$file is not a binary file.");
-	if ($neg eq '!') {
-	    $mess =~ s/ is not / should not be / ||
-	    $mess =~ s/ does not / should not / ||
-	    $mess =~ s/ not / /;
-	}
-    }
-    else {
-	$this =~ s/\$file/'$file'/g;
-	$mess = "Can't do $this.\n";
-    }
-    die "$mess\n" if $disposition eq 'die';
-    warn "$mess\n";
-    ++$warnings;
-}
-
-1;
-
diff --git a/contrib/perl5/lib/File/Compare.pm b/contrib/perl5/lib/File/Compare.pm
deleted file mode 100644
index 667e7cb..0000000
--- a/contrib/perl5/lib/File/Compare.pm
+++ /dev/null
@@ -1,182 +0,0 @@
-package File::Compare;
-
-use 5.005_64;
-use strict;
-our($VERSION, @ISA, @EXPORT, @EXPORT_OK, $Too_Big);
-
-require Exporter;
-use Carp;
-
-$VERSION = '1.1002';
-@ISA = qw(Exporter);
-@EXPORT = qw(compare);
-@EXPORT_OK = qw(cmp compare_text);
-
-$Too_Big = 1024 * 1024 * 2;
-
-sub VERSION {
-    # Version of File::Compare
-    return $File::Compare::VERSION;
-}
-
-sub compare {
-    croak("Usage: compare( file1, file2 [, buffersize]) ")
-      unless(@_ == 2 || @_ == 3);
-
-    my ($from,$to,$size) = @_;
-    my $text_mode = defined($size) && (ref($size) eq 'CODE' || $size < 0);
-
-    my ($fromsize,$closefrom,$closeto);
-    local (*FROM, *TO);
-
-    croak("from undefined") unless (defined $from);
-    croak("to undefined") unless (defined $to);
-
-    if (ref($from) && 
-        (UNIVERSAL::isa($from,'GLOB') || UNIVERSAL::isa($from,'IO::Handle'))) {
-	*FROM = *$from;
-    } elsif (ref(\$from) eq 'GLOB') {
-	*FROM = $from;
-    } else {
-	open(FROM,"<$from") or goto fail_open1;
-	unless ($text_mode) {
-	    binmode FROM;
-	    $fromsize = -s FROM;
-	}
-	$closefrom = 1;
-    }
-
-    if (ref($to) &&
-        (UNIVERSAL::isa($to,'GLOB') || UNIVERSAL::isa($to,'IO::Handle'))) {
-	*TO = *$to;
-    } elsif (ref(\$to) eq 'GLOB') {
-	*TO = $to;
-    } else {
-	open(TO,"<$to") or goto fail_open2;
-	binmode TO unless $text_mode;
-	$closeto = 1;
-    }
-
-    if (!$text_mode && $closefrom && $closeto) {
-	# If both are opened files we know they differ if their size differ
-	goto fail_inner if $fromsize != -s TO;
-    }
-
-    if ($text_mode) {
-	local $/ = "\n";
-	my ($fline,$tline);
-	while (defined($fline = <FROM>)) {
-	    goto fail_inner unless defined($tline = <TO>);
-	    if (ref $size) {
-		# $size contains ref to comparison function
-		goto fail_inner if &$size($fline, $tline);
-	    } else {
-		goto fail_inner if $fline ne $tline;
-	    }
-	}
-	goto fail_inner if defined($tline = <TO>);
-    }
-    else {
-	unless (defined($size) && $size > 0) {
-	    $size = $fromsize || -s TO || 0;
-	    $size = 1024 if $size < 512;
-	    $size = $Too_Big if $size > $Too_Big;
-	}
-
-	my ($fr,$tr,$fbuf,$tbuf);
-	$fbuf = $tbuf = '';
-	while(defined($fr = read(FROM,$fbuf,$size)) && $fr > 0) {
-	    unless (defined($tr = read(TO,$tbuf,$fr)) && $tbuf eq $fbuf) {
-		goto fail_inner;
-	    }
-	}
-	goto fail_inner if defined($tr = read(TO,$tbuf,$size)) && $tr > 0;
-    }
-
-    close(TO) || goto fail_open2 if $closeto;
-    close(FROM) || goto fail_open1 if $closefrom;
-
-    return 0;
-    
-  # All of these contortions try to preserve error messages...
-  fail_inner:
-    close(TO) || goto fail_open2 if $closeto;
-    close(FROM) || goto fail_open1 if $closefrom;
-
-    return 1;
-
-  fail_open2:
-    if ($closefrom) {
-	my $status = $!;
-	$! = 0;
-	close FROM;
-	$! = $status unless $!;
-    }
-  fail_open1:
-    return -1;
-}
-
-sub cmp;
-*cmp = \&compare;
-
-sub compare_text {
-    my ($from,$to,$cmp) = @_;
-    croak("Usage: compare_text( file1, file2 [, cmp-function])")
-	unless @_ == 2 || @_ == 3;
-    croak("Third arg to compare_text() function must be a code reference")
-	if @_ == 3 && ref($cmp) ne 'CODE';
-
-    # Using a negative buffer size puts compare into text_mode too
-    $cmp = -1 unless defined $cmp;
-    compare($from, $to, $cmp);
-}
-
-1;
-
-__END__
-
-=head1 NAME
-
-File::Compare - Compare files or filehandles
-
-=head1 SYNOPSIS
-
-  	use File::Compare;
-
-	if (compare("file1","file2") == 0) {
-	    print "They're equal\n";
-	}
-
-=head1 DESCRIPTION
-
-The File::Compare::compare function compares the contents of two
-sources, each of which can be a file or a file handle.  It is exported
-from File::Compare by default.
-
-File::Compare::cmp is a synonym for File::Compare::compare.  It is
-exported from File::Compare only by request.
-
-File::Compare::compare_text does a line by line comparison of the two
-files. It stops as soon as a difference is detected. compare_text()
-accepts an optional third argument: This must be a CODE reference to
-a line comparison function, which returns 0 when both lines are considered
-equal. For example:
-
-    compare_text($file1, $file2)
-
-is basically equivalent to
-
-    compare_text($file1, $file2, sub {$_[0] ne $_[1]} )
-
-=head1 RETURN
-
-File::Compare::compare return 0 if the files are equal, 1 if the
-files are unequal, or -1 if an error was encountered.
-
-=head1 AUTHOR
-
-File::Compare was written by Nick Ing-Simmons.
-Its original documentation was written by Chip Salzenberg.
-
-=cut
-
diff --git a/contrib/perl5/lib/File/Copy.pm b/contrib/perl5/lib/File/Copy.pm
deleted file mode 100644
index 24d1ffd..0000000
--- a/contrib/perl5/lib/File/Copy.pm
+++ /dev/null
@@ -1,378 +0,0 @@
-# File/Copy.pm. Written in 1994 by Aaron Sherman <ajs@ajs.com>. This
-# source code has been placed in the public domain by the author.
-# Please be kind and preserve the documentation.
-#
-# Additions copyright 1996 by Charles Bailey.  Permission is granted
-# to distribute the revised code under the same terms as Perl itself.
-
-package File::Copy;
-
-use 5.005_64;
-use strict;
-use Carp;
-our(@ISA, @EXPORT, @EXPORT_OK, $VERSION, $Too_Big, $Syscopy_is_copy);
-sub copy;
-sub syscopy;
-sub cp;
-sub mv;
-
-# Note that this module implements only *part* of the API defined by
-# the File/Copy.pm module of the File-Tools-2.0 package.  However, that
-# package has not yet been updated to work with Perl 5.004, and so it
-# would be a Bad Thing for the CPAN module to grab it and replace this
-# module.  Therefore, we set this module's version higher than 2.0.
-$VERSION = '2.03';
-
-require Exporter;
-@ISA = qw(Exporter);
-@EXPORT = qw(copy move);
-@EXPORT_OK = qw(cp mv);
-
-$Too_Big = 1024 * 1024 * 2;
-
-sub _catname { #  Will be replaced by File::Spec when it arrives
-    my($from, $to) = @_;
-    if (not defined &basename) {
-	require File::Basename;
-	import  File::Basename 'basename';
-    }
-    if ($^O eq 'VMS')  { $to = VMS::Filespec::vmspath($to) . basename($from); }
-    elsif ($^O eq 'MacOS') { $to =~ s/^([^:]+)$/:$1/; $to .= ':' . basename($from); }
-    elsif ($to =~ m|\\|)   { $to .= '\\' . basename($from); }
-    else                   { $to .= '/' . basename($from); }
-}
-
-sub copy {
-    croak("Usage: copy(FROM, TO [, BUFFERSIZE]) ")
-      unless(@_ == 2 || @_ == 3);
-
-    my $from = shift;
-    my $to = shift;
-
-    my $from_a_handle = (ref($from)
-			 ? (ref($from) eq 'GLOB'
-			    || UNIVERSAL::isa($from, 'GLOB')
-                            || UNIVERSAL::isa($from, 'IO::Handle'))
-			 : (ref(\$from) eq 'GLOB'));
-    my $to_a_handle =   (ref($to)
-			 ? (ref($to) eq 'GLOB'
-			    || UNIVERSAL::isa($to, 'GLOB')
-                            || UNIVERSAL::isa($to, 'IO::Handle'))
-			 : (ref(\$to) eq 'GLOB'));
-
-    if (!$from_a_handle && !$to_a_handle && -d $to && ! -d $from) {
-	$to = _catname($from, $to);
-    }
-
-    if (defined &syscopy && !$Syscopy_is_copy
-	&& !$to_a_handle
-	&& !($from_a_handle && $^O eq 'os2' )	# OS/2 cannot handle handles
-	&& !($from_a_handle && $^O eq 'mpeix')	# and neither can MPE/iX.
-	&& !($from_a_handle && $^O eq 'MSWin32')
-	&& !($from_a_handle && $^O eq 'MacOS')
-       )
-    {
-	return syscopy($from, $to);
-    }
-
-    my $closefrom = 0;
-    my $closeto = 0;
-    my ($size, $status, $r, $buf);
-    local(*FROM, *TO);
-    local($\) = '';
-
-    if ($from_a_handle) {
-	*FROM = *$from{FILEHANDLE};
-    } else {
-	$from = _protect($from) if $from =~ /^\s/s;
-	open(FROM, "< $from\0") or goto fail_open1;
-	binmode FROM or die "($!,$^E)";
-	$closefrom = 1;
-    }
-
-    if ($to_a_handle) {
-	*TO = *$to{FILEHANDLE};
-    } else {
-	$to = _protect($to) if $to =~ /^\s/s;
-	open(TO,"> $to\0") or goto fail_open2;
-	binmode TO or die "($!,$^E)";
-	$closeto = 1;
-    }
-
-    if (@_) {
-	$size = shift(@_) + 0;
-	croak("Bad buffer size for copy: $size\n") unless ($size > 0);
-    } else {
-	$size = -s FROM;
-	$size = 1024 if ($size < 512);
-	$size = $Too_Big if ($size > $Too_Big);
-    }
-
-    $! = 0;
-    for (;;) {
-	my ($r, $w, $t);
-	defined($r = sysread(FROM, $buf, $size))
-	    or goto fail_inner;
-	last unless $r;
-	for ($w = 0; $w < $r; $w += $t) {
-	    $t = syswrite(TO, $buf, $r - $w, $w)
-		or goto fail_inner;
-	}
-    }
-
-    close(TO) || goto fail_open2 if $closeto;
-    close(FROM) || goto fail_open1 if $closefrom;
-
-    # Use this idiom to avoid uninitialized value warning.
-    return 1;
-
-    # All of these contortions try to preserve error messages...
-  fail_inner:
-    if ($closeto) {
-	$status = $!;
-	$! = 0;
-	close TO;
-	$! = $status unless $!;
-    }
-  fail_open2:
-    if ($closefrom) {
-	$status = $!;
-	$! = 0;
-	close FROM;
-	$! = $status unless $!;
-    }
-  fail_open1:
-    return 0;
-}
-
-sub move {
-    my($from,$to) = @_;
-    my($copied,$fromsz,$tosz1,$tomt1,$tosz2,$tomt2,$sts,$ossts);
-
-    if (-d $to && ! -d $from) {
-	$to = _catname($from, $to);
-    }
-
-    ($tosz1,$tomt1) = (stat($to))[7,9];
-    $fromsz = -s $from;
-    if ($^O eq 'os2' and defined $tosz1 and defined $fromsz) {
-      # will not rename with overwrite
-      unlink $to;
-    }
-    return 1 if rename $from, $to;
-
-    ($sts,$ossts) = ($! + 0, $^E + 0);
-    # Did rename return an error even though it succeeded, because $to
-    # is on a remote NFS file system, and NFS lost the server's ack?
-    return 1 if defined($fromsz) && !-e $from &&           # $from disappeared
-                (($tosz2,$tomt2) = (stat($to))[7,9]) &&    # $to's there
-                ($tosz1 != $tosz2 or $tomt1 != $tomt2) &&  #   and changed
-                $tosz2 == $fromsz;                         # it's all there
-
-    ($tosz1,$tomt1) = (stat($to))[7,9];  # just in case rename did something
-    return 1 if ($copied = copy($from,$to)) && unlink($from);
-
-    ($tosz2,$tomt2) = ((stat($to))[7,9],0,0) if defined $tomt1;
-    unlink($to) if !defined($tomt1) or $tomt1 != $tomt2 or $tosz1 != $tosz2;
-    ($!,$^E) = ($sts,$ossts);
-    return 0;
-}
-
-*cp = \&copy;
-*mv = \&move;
-
-
-if ($^O eq 'MacOS') {
-    *_protect = sub { MacPerl::MakeFSSpec($_[0]) };
-} else {
-    *_protect = sub { "./$_[0]" };
-}
-
-# &syscopy is an XSUB under OS/2
-unless (defined &syscopy) {
-    if ($^O eq 'VMS') {
-	*syscopy = \&rmscopy;
-    } elsif ($^O eq 'mpeix') {
-	*syscopy = sub {
-	    return 0 unless @_ == 2;
-	    # Use the MPE cp program in order to
-	    # preserve MPE file attributes.
-	    return system('/bin/cp', '-f', $_[0], $_[1]) == 0;
-	};
-    } elsif ($^O eq 'MSWin32') {
-	*syscopy = sub {
-	    return 0 unless @_ == 2;
-	    return Win32::CopyFile(@_, 1);
-	};
-    } elsif ($^O eq 'MacOS') {
-	require Mac::MoreFiles;
-	*syscopy = sub {
-	    my($from, $to) = @_;
-	    my($dir, $toname);
-
-	    return 0 unless -e $from;
-
-	    if ($to =~ /(.*:)([^:]+):?$/) {
-		($dir, $toname) = ($1, $2);
-	    } else {
-		($dir, $toname) = (":", $to);
-	    }
-
-	    unlink($to);
-	    Mac::MoreFiles::FSpFileCopy($from, $dir, $toname, 1);
-	};
-    } else {
-	$Syscopy_is_copy = 1;
-	*syscopy = \&copy;
-    }
-}
-
-1;
-
-__END__
-
-=head1 NAME
-
-File::Copy - Copy files or filehandles
-
-=head1 SYNOPSIS
-
-  	use File::Copy;
-
-	copy("file1","file2");
-  	copy("Copy.pm",\*STDOUT);'
-	move("/dev1/fileA","/dev2/fileB");
-
-  	use POSIX;
-	use File::Copy cp;
-
-	$n = FileHandle->new("/a/file","r");
-	cp($n,"x");'
-
-=head1 DESCRIPTION
-
-The File::Copy module provides two basic functions, C<copy> and
-C<move>, which are useful for getting the contents of a file from
-one place to another.
-
-=over 4
-
-=item *
-
-The C<copy> function takes two
-parameters: a file to copy from and a file to copy to. Either
-argument may be a string, a FileHandle reference or a FileHandle
-glob. Obviously, if the first argument is a filehandle of some
-sort, it will be read from, and if it is a file I<name> it will
-be opened for reading. Likewise, the second argument will be
-written to (and created if need be).
-
-B<Note that passing in
-files as handles instead of names may lead to loss of information
-on some operating systems; it is recommended that you use file
-names whenever possible.>  Files are opened in binary mode where
-applicable.  To get a consistent behaviour when copying from a
-filehandle to a file, use C<binmode> on the filehandle.
-
-An optional third parameter can be used to specify the buffer
-size used for copying. This is the number of bytes from the
-first file, that wil be held in memory at any given time, before
-being written to the second file. The default buffer size depends
-upon the file, but will generally be the whole file (up to 2Mb), or
-1k for filehandles that do not reference files (eg. sockets).
-
-You may use the syntax C<use File::Copy "cp"> to get at the
-"cp" alias for this function. The syntax is I<exactly> the same.
-
-=item *
-
-The C<move> function also takes two parameters: the current name
-and the intended name of the file to be moved.  If the destination
-already exists and is a directory, and the source is not a
-directory, then the source file will be renamed into the directory
-specified by the destination.
-
-If possible, move() will simply rename the file.  Otherwise, it copies
-the file to the new location and deletes the original.  If an error occurs
-during this copy-and-delete process, you may be left with a (possibly partial)
-copy of the file under the destination name.
-
-You may use the "mv" alias for this function in the same way that
-you may use the "cp" alias for C<copy>.
-
-=back
-
-File::Copy also provides the C<syscopy> routine, which copies the
-file specified in the first parameter to the file specified in the
-second parameter, preserving OS-specific attributes and file
-structure.  For Unix systems, this is equivalent to the simple
-C<copy> routine.  For VMS systems, this calls the C<rmscopy>
-routine (see below).  For OS/2 systems, this calls the C<syscopy>
-XSUB directly. For Win32 systems, this calls C<Win32::CopyFile>.
-
-=head2 Special behaviour if C<syscopy> is defined (OS/2, VMS and Win32)
-
-If both arguments to C<copy> are not file handles,
-then C<copy> will perform a "system copy" of
-the input file to a new output file, in order to preserve file
-attributes, indexed file structure, I<etc.>  The buffer size
-parameter is ignored.  If either argument to C<copy> is a
-handle to an opened file, then data is copied using Perl
-operators, and no effort is made to preserve file attributes
-or record structure.
-
-The system copy routine may also be called directly under VMS and OS/2
-as C<File::Copy::syscopy> (or under VMS as C<File::Copy::rmscopy>, which
-is the routine that does the actual work for syscopy).
-
-=over 4
-
-=item rmscopy($from,$to[,$date_flag])
-
-The first and second arguments may be strings, typeglobs, typeglob
-references, or objects inheriting from IO::Handle;
-they are used in all cases to obtain the
-I<filespec> of the input and output files, respectively.  The
-name and type of the input file are used as defaults for the
-output file, if necessary.
-
-A new version of the output file is always created, which
-inherits the structure and RMS attributes of the input file,
-except for owner and protections (and possibly timestamps;
-see below).  All data from the input file is copied to the
-output file; if either of the first two parameters to C<rmscopy>
-is a file handle, its position is unchanged.  (Note that this
-means a file handle pointing to the output file will be
-associated with an old version of that file after C<rmscopy>
-returns, not the newly created version.)
-
-The third parameter is an integer flag, which tells C<rmscopy>
-how to handle timestamps.  If it is E<lt> 0, none of the input file's
-timestamps are propagated to the output file.  If it is E<gt> 0, then
-it is interpreted as a bitmask: if bit 0 (the LSB) is set, then
-timestamps other than the revision date are propagated; if bit 1
-is set, the revision date is propagated.  If the third parameter
-to C<rmscopy> is 0, then it behaves much like the DCL COPY command:
-if the name or type of the output file was explicitly specified,
-then no timestamps are propagated, but if they were taken implicitly
-from the input filespec, then all timestamps other than the
-revision date are propagated.  If this parameter is not supplied,
-it defaults to 0.
-
-Like C<copy>, C<rmscopy> returns 1 on success.  If an error occurs,
-it sets C<$!>, deletes the output file, and returns 0.
-
-=back
-
-=head1 RETURN
-
-All functions return 1 on success, 0 on failure.
-$! will be set if an error was encountered.
-
-=head1 AUTHOR
-
-File::Copy was written by Aaron Sherman I<E<lt>ajs@ajs.comE<gt>> in 1995,
-and updated by Charles Bailey I<E<lt>bailey@newman.upenn.eduE<gt>> in 1996.
-
-=cut
-
diff --git a/contrib/perl5/lib/File/DosGlob.pm b/contrib/perl5/lib/File/DosGlob.pm
deleted file mode 100644
index d7dea7b..0000000
--- a/contrib/perl5/lib/File/DosGlob.pm
+++ /dev/null
@@ -1,254 +0,0 @@
-#!perl -w
-
-#
-# Documentation at the __END__
-#
-
-package File::DosGlob;
-
-sub doglob {
-    my $cond = shift;
-    my @retval = ();
-    #print "doglob: ", join('|', @_), "\n";
-  OUTER:
-    for my $arg (@_) {
-        local $_ = $arg;
-	my @matched = ();
-	my @globdirs = ();
-	my $head = '.';
-	my $sepchr = '/';
-	next OUTER unless defined $_ and $_ ne '';
-	# if arg is within quotes strip em and do no globbing
-	if (/^"(.*)"\z/s) {
-	    $_ = $1;
-	    if ($cond eq 'd') { push(@retval, $_) if -d $_ }
-	    else              { push(@retval, $_) if -e $_ }
-	    next OUTER;
-	}
-	# wildcards with a drive prefix such as h:*.pm must be changed
-	# to h:./*.pm to expand correctly
-	if (m|^([A-Za-z]:)[^/\\]|s) {
-	    substr($_,0,2) = $1 . "./";
-	}
-	if (m|^(.*)([\\/])([^\\/]*)\z|s) {
-	    my $tail;
-	    ($head, $sepchr, $tail) = ($1,$2,$3);
-	    #print "div: |$head|$sepchr|$tail|\n";
-	    push (@retval, $_), next OUTER if $tail eq '';
-	    if ($head =~ /[*?]/) {
-		@globdirs = doglob('d', $head);
-		push(@retval, doglob($cond, map {"$_$sepchr$tail"} @globdirs)),
-		    next OUTER if @globdirs;
-	    }
-	    $head .= $sepchr if $head eq '' or $head =~ /^[A-Za-z]:\z/s;
-	    $_ = $tail;
-	}
-	#
-	# If file component has no wildcards, we can avoid opendir
-	unless (/[*?]/) {
-	    $head = '' if $head eq '.';
-	    $head .= $sepchr unless $head eq '' or substr($head,-1) eq $sepchr;
-	    $head .= $_;
-	    if ($cond eq 'd') { push(@retval,$head) if -d $head }
-	    else              { push(@retval,$head) if -e $head }
-	    next OUTER;
-	}
-	opendir(D, $head) or next OUTER;
-	my @leaves = readdir D;
-	closedir D;
-	$head = '' if $head eq '.';
-	$head .= $sepchr unless $head eq '' or substr($head,-1) eq $sepchr;
-
-	# escape regex metachars but not glob chars
-	s:([].+^\-\${}[|]):\\$1:g;
-	# and convert DOS-style wildcards to regex
-	s/\*/.*/g;
-	s/\?/.?/g;
-
-	#print "regex: '$_', head: '$head'\n";
-	my $matchsub = eval 'sub { $_[0] =~ m|^' . $_ . '\\z|ios }';
-	warn($@), next OUTER if $@;
-      INNER:
-	for my $e (@leaves) {
-	    next INNER if $e eq '.' or $e eq '..';
-	    next INNER if $cond eq 'd' and ! -d "$head$e";
-	    push(@matched, "$head$e"), next INNER if &$matchsub($e);
-	    #
-	    # [DOS compatibility special case]
-	    # Failed, add a trailing dot and try again, but only
-	    # if name does not have a dot in it *and* pattern
-	    # has a dot *and* name is shorter than 9 chars.
-	    #
-	    if (index($e,'.') == -1 and length($e) < 9
-	        and index($_,'\\.') != -1) {
-		push(@matched, "$head$e"), next INNER if &$matchsub("$e.");
-	    }
-	}
-	push @retval, @matched if @matched;
-    }
-    return @retval;
-}
-
-#
-# this can be used to override CORE::glob in a specific
-# package by saying C<use File::DosGlob 'glob';> in that
-# namespace.
-#
-
-# context (keyed by second cxix arg provided by core)
-my %iter;
-my %entries;
-
-sub glob {
-    my $pat = shift;
-    my $cxix = shift;
-    my @pat;
-
-    # glob without args defaults to $_
-    $pat = $_ unless defined $pat;
-
-    # extract patterns
-    if ($pat =~ /\s/) {
-	require Text::ParseWords;
-	@pat = Text::ParseWords::parse_line('\s+',0,$pat);
-    }
-    else {
-	push @pat, $pat;
-    }
-
-    # assume global context if not provided one
-    $cxix = '_G_' unless defined $cxix;
-    $iter{$cxix} = 0 unless exists $iter{$cxix};
-
-    # if we're just beginning, do it all first
-    if ($iter{$cxix} == 0) {
-	$entries{$cxix} = [doglob(1,@pat)];
-    }
-
-    # chuck it all out, quick or slow
-    if (wantarray) {
-	delete $iter{$cxix};
-	return @{delete $entries{$cxix}};
-    }
-    else {
-	if ($iter{$cxix} = scalar @{$entries{$cxix}}) {
-	    return shift @{$entries{$cxix}};
-	}
-	else {
-	    # return undef for EOL
-	    delete $iter{$cxix};
-	    delete $entries{$cxix};
-	    return undef;
-	}
-    }
-}
-
-sub import {
-    my $pkg = shift;
-    return unless @_;
-    my $sym = shift;
-    my $callpkg = ($sym =~ s/^GLOBAL_//s ? 'CORE::GLOBAL' : caller(0));
-    *{$callpkg.'::'.$sym} = \&{$pkg.'::'.$sym} if $sym eq 'glob';
-}
-
-1;
-
-__END__
-
-=head1 NAME
-
-File::DosGlob - DOS like globbing and then some
-
-=head1 SYNOPSIS
-
-    require 5.004;
-
-    # override CORE::glob in current package
-    use File::DosGlob 'glob';
-
-    # override CORE::glob in ALL packages (use with extreme caution!)
-    use File::DosGlob 'GLOBAL_glob';
-
-    @perlfiles = glob  "..\\pe?l/*.p?";
-    print <..\\pe?l/*.p?>;
-
-    # from the command line (overrides only in main::)
-    > perl -MFile::DosGlob=glob -e "print <../pe*/*p?>"
-
-=head1 DESCRIPTION
-
-A module that implements DOS-like globbing with a few enhancements.
-It is largely compatible with perlglob.exe (the M$ setargv.obj
-version) in all but one respect--it understands wildcards in
-directory components.
-
-For example, C<<..\\l*b\\file/*glob.p?>> will work as expected (in
-that it will find something like '..\lib\File/DosGlob.pm' alright).
-Note that all path components are case-insensitive, and that
-backslashes and forward slashes are both accepted, and preserved.
-You may have to double the backslashes if you are putting them in
-literally, due to double-quotish parsing of the pattern by perl.
-
-Spaces in the argument delimit distinct patterns, so
-C<glob('*.exe *.dll')> globs all filenames that end in C<.exe>
-or C<.dll>.  If you want to put in literal spaces in the glob
-pattern, you can escape them with either double quotes, or backslashes.
-e.g. C<glob('c:/"Program Files"/*/*.dll')>, or
-C<glob('c:/Program\ Files/*/*.dll')>.  The argument is tokenized using
-C<Text::ParseWords::parse_line()>, so see L<Text::ParseWords> for details
-of the quoting rules used.
-
-Extending it to csh patterns is left as an exercise to the reader.
-
-=head1 EXPORTS (by request only)
-
-glob()
-
-=head1 BUGS
-
-Should probably be built into the core, and needs to stop
-pandering to DOS habits.  Needs a dose of optimizium too.
-
-=head1 AUTHOR
-
-Gurusamy Sarathy <gsar@activestate.com>
-
-=head1 HISTORY
-
-=over 4
-
-=item *
-
-Support for globally overriding glob() (GSAR 3-JUN-98)
-
-=item *
-
-Scalar context, independent iterator context fixes (GSAR 15-SEP-97)
-
-=item *
-
-A few dir-vs-file optimizations result in glob importation being
-10 times faster than using perlglob.exe, and using perlglob.bat is
-only twice as slow as perlglob.exe (GSAR 28-MAY-97)
-
-=item *
-
-Several cleanups prompted by lack of compatible perlglob.exe
-under Borland (GSAR 27-MAY-97)
-
-=item *
-
-Initial version (GSAR 20-FEB-97)
-
-=back
-
-=head1 SEE ALSO
-
-perl
-
-perlglob.bat
-
-Text::ParseWords
-
-=cut
-
diff --git a/contrib/perl5/lib/File/Find.pm b/contrib/perl5/lib/File/Find.pm
deleted file mode 100644
index 3a621c0..0000000
--- a/contrib/perl5/lib/File/Find.pm
+++ /dev/null
@@ -1,773 +0,0 @@
-package File::Find;
-use 5.005_64;
-require Exporter;
-require Cwd;
-
-=head1 NAME
-
-find - traverse a file tree
-
-finddepth - traverse a directory structure depth-first
-
-=head1 SYNOPSIS
-
-    use File::Find;
-    find(\&wanted, '/foo', '/bar');
-    sub wanted { ... }
-
-    use File::Find;
-    finddepth(\&wanted, '/foo', '/bar');
-    sub wanted { ... }
-
-    use File::Find;
-    find({ wanted => \&process, follow => 1 }, '.');
-
-=head1 DESCRIPTION
-
-The first argument to find() is either a hash reference describing the
-operations to be performed for each file, or a code reference.
-
-Here are the possible keys for the hash:
-
-=over 3
-
-=item C<wanted>
-
-The value should be a code reference.  This code reference is called
-I<the wanted() function> below.
-
-=item C<bydepth>
-
-Reports the name of a directory only AFTER all its entries
-have been reported.  Entry point finddepth() is a shortcut for
-specifying C<{ bydepth => 1 }> in the first argument of find().
-
-=item C<preprocess>
-
-The value should be a code reference.  This code reference is used to
-preprocess a directory; it is called after readdir() but before the loop that
-calls the wanted() function.  It is called with a list of strings and is
-expected to return a list of strings.  The code can be used to sort the
-strings alphabetically, numerically, or to filter out directory entries based
-on their name alone.
-
-=item C<postprocess>
-
-The value should be a code reference.  It is invoked just before leaving the
-current directory.  It is called in void context with no arguments.  The name
-of the current directory is in $File::Find::dir.  This hook is handy for
-summarizing a directory, such as calculating its disk usage.
-
-=item C<follow>
-
-Causes symbolic links to be followed. Since directory trees with symbolic
-links (followed) may contain files more than once and may even have
-cycles, a hash has to be built up with an entry for each file.
-This might be expensive both in space and time for a large
-directory tree. See I<follow_fast> and I<follow_skip> below.
-If either I<follow> or I<follow_fast> is in effect:
-
-=over 6
-
-=item *
-
-It is guaranteed that an I<lstat> has been called before the user's
-I<wanted()> function is called. This enables fast file checks involving S< _>.
-
-=item *
-
-There is a variable C<$File::Find::fullname> which holds the absolute
-pathname of the file with all symbolic links resolved
-
-=back
-
-=item C<follow_fast>
-
-This is similar to I<follow> except that it may report some files more
-than once.  It does detect cycles, however.  Since only symbolic links
-have to be hashed, this is much cheaper both in space and time.  If
-processing a file more than once (by the user's I<wanted()> function)
-is worse than just taking time, the option I<follow> should be used.
-
-=item C<follow_skip>
-
-C<follow_skip==1>, which is the default, causes all files which are
-neither directories nor symbolic links to be ignored if they are about
-to be processed a second time. If a directory or a symbolic link 
-are about to be processed a second time, File::Find dies.
-C<follow_skip==0> causes File::Find to die if any file is about to be
-processed a second time.
-C<follow_skip==2> causes File::Find to ignore any duplicate files and
-dirctories but to proceed normally otherwise.
-
-
-=item C<no_chdir>
-
-Does not C<chdir()> to each directory as it recurses. The wanted()
-function will need to be aware of this, of course. In this case,
-C<$_> will be the same as C<$File::Find::name>.
-
-=item C<untaint>
-
-If find is used in taint-mode (-T command line switch or if EUID != UID
-or if EGID != GID) then internally directory names have to be untainted
-before they can be cd'ed to. Therefore they are checked against a regular
-expression I<untaint_pattern>.  Note that all names passed to the
-user's I<wanted()> function are still tainted. 
-
-=item C<untaint_pattern>
-
-See above. This should be set using the C<qr> quoting operator.
-The default is set to  C<qr|^([-+@\w./]+)$|>. 
-Note that the parantheses are vital.
-
-=item C<untaint_skip>
-
-If set, directories (subtrees) which fail the I<untaint_pattern>
-are skipped. The default is to 'die' in such a case.
-
-=back
-
-The wanted() function does whatever verifications you want.
-C<$File::Find::dir> contains the current directory name, and C<$_> the
-current filename within that directory.  C<$File::Find::name> contains
-the complete pathname to the file. You are chdir()'d to
-C<$File::Find::dir> when the function is called, unless C<no_chdir>
-was specified.  When <follow> or <follow_fast> are in effect, there is
-also a C<$File::Find::fullname>.  The function may set
-C<$File::Find::prune> to prune the tree unless C<bydepth> was
-specified.  Unless C<follow> or C<follow_fast> is specified, for
-compatibility reasons (find.pl, find2perl) there are in addition the
-following globals available: C<$File::Find::topdir>,
-C<$File::Find::topdev>, C<$File::Find::topino>,
-C<$File::Find::topmode> and C<$File::Find::topnlink>.
-
-This library is useful for the C<find2perl> tool, which when fed,
-
-    find2perl / -name .nfs\* -mtime +7 \
-        -exec rm -f {} \; -o -fstype nfs -prune
-
-produces something like:
-
-    sub wanted {
-        /^\.nfs.*\z/s &&
-        (($dev, $ino, $mode, $nlink, $uid, $gid) = lstat($_)) &&
-        int(-M _) > 7 &&
-        unlink($_)
-        ||
-        ($nlink || (($dev, $ino, $mode, $nlink, $uid, $gid) = lstat($_))) &&
-        $dev < 0 &&
-        ($File::Find::prune = 1);
-    }
-
-Set the variable C<$File::Find::dont_use_nlink> if you're using AFS,
-since AFS cheats.
-
-
-Here's another interesting wanted function.  It will find all symlinks
-that don't resolve:
-
-    sub wanted {
-         -l && !-e && print "bogus link: $File::Find::name\n";
-    }
-
-See also the script C<pfind> on CPAN for a nice application of this
-module.
-
-=head1 CAVEAT
-
-Be aware that the option to follow symbolic links can be dangerous.
-Depending on the structure of the directory tree (including symbolic
-links to directories) you might traverse a given (physical) directory
-more than once (only if C<follow_fast> is in effect). 
-Furthermore, deleting or changing files in a symbolically linked directory
-might cause very unpleasant surprises, since you delete or change files
-in an unknown directory.
-
-
-=cut
-
-@ISA = qw(Exporter);
-@EXPORT = qw(find finddepth);
-
-
-use strict;
-my $Is_VMS;
-
-require File::Basename;
-
-my %SLnkSeen;
-my ($wanted_callback, $avoid_nlink, $bydepth, $no_chdir, $follow,
-    $follow_skip, $full_check, $untaint, $untaint_skip, $untaint_pat,
-    $pre_process, $post_process);
-
-sub contract_name {
-    my ($cdir,$fn) = @_;
-
-    return substr($cdir,0,rindex($cdir,'/')) if $fn eq '.';
-
-    $cdir = substr($cdir,0,rindex($cdir,'/')+1);
-
-    $fn =~ s|^\./||;
-
-    my $abs_name= $cdir . $fn;
-
-    if (substr($fn,0,3) eq '../') {
-	do 1 while ($abs_name=~ s|/(?>[^/]+)/\.\./|/|);
-    }
-
-    return $abs_name;
-}
-
-
-sub PathCombine($$) {
-    my ($Base,$Name) = @_;
-    my $AbsName;
-
-    if (substr($Name,0,1) eq '/') {
-	$AbsName= $Name;
-    }
-    else {
-	$AbsName= contract_name($Base,$Name);
-    }
-
-    # (simple) check for recursion
-    my $newlen= length($AbsName);
-    if ($newlen <= length($Base)) {
-	if (($newlen == length($Base) || substr($Base,$newlen,1) eq '/')
-	    && $AbsName eq substr($Base,0,$newlen))
-	{
-	    return undef;
-	}
-    }
-    return $AbsName;
-}
-
-sub Follow_SymLink($) {
-    my ($AbsName) = @_;
-
-    my ($NewName,$DEV, $INO);
-    ($DEV, $INO)= lstat $AbsName;
-
-    while (-l _) {
-	if ($SLnkSeen{$DEV, $INO}++) {
-	    if ($follow_skip < 2) {
-		die "$AbsName is encountered a second time";
-	    }
-	    else {
-		return undef;
-	    }
-	}
-	$NewName= PathCombine($AbsName, readlink($AbsName));
-	unless(defined $NewName) {
-	    if ($follow_skip < 2) {
-		die "$AbsName is a recursive symbolic link";
-	    }
-	    else {
-		return undef;
-	    }
-	}
-	else {
-	    $AbsName= $NewName;
-	}
-	($DEV, $INO) = lstat($AbsName);
-	return undef unless defined $DEV;  #  dangling symbolic link
-    }
-
-    if ($full_check && $SLnkSeen{$DEV, $INO}++) {
-	if ($follow_skip < 1) {
-	    die "$AbsName encountered a second time";
-	}
-	else {
-	    return undef;
-	}
-    }
-
-    return $AbsName;
-}
-
-our($dir, $name, $fullname, $prune);
-sub _find_dir_symlnk($$$);
-sub _find_dir($$$);
-
-sub _find_opt {
-    my $wanted = shift;
-    die "invalid top directory" unless defined $_[0];
-
-    my $cwd           = $wanted->{bydepth} ? Cwd::fastcwd() : Cwd::cwd();
-    my $cwd_untainted = $cwd;
-    $wanted_callback  = $wanted->{wanted};
-    $bydepth          = $wanted->{bydepth};
-    $pre_process      = $wanted->{preprocess};
-    $post_process     = $wanted->{postprocess};
-    $no_chdir         = $wanted->{no_chdir};
-    $full_check       = $wanted->{follow};
-    $follow           = $full_check || $wanted->{follow_fast};
-    $follow_skip      = $wanted->{follow_skip};
-    $untaint          = $wanted->{untaint};
-    $untaint_pat      = $wanted->{untaint_pattern};
-    $untaint_skip     = $wanted->{untaint_skip};
-
-    # for compatability reasons (find.pl, find2perl)
-    our ($topdir, $topdev, $topino, $topmode, $topnlink);
-
-    # a symbolic link to a directory doesn't increase the link count
-    $avoid_nlink      = $follow || $File::Find::dont_use_nlink;
-    
-    if ( $untaint ) {
-	$cwd_untainted= $1 if $cwd_untainted =~ m|$untaint_pat|;
-	die "insecure cwd in find(depth)"  unless defined($cwd_untainted);
-    }
-    
-    my ($abs_dir, $Is_Dir);
-
-    Proc_Top_Item:
-    foreach my $TOP (@_) {
-        my $top_item = $TOP;
-        $top_item =~ s|/\z|| unless $top_item eq '/';
-        $Is_Dir= 0;
-        
-        ($topdev,$topino,$topmode,$topnlink) = stat $top_item;
-
-        if ($follow) {
-            if (substr($top_item,0,1) eq '/') {
-                $abs_dir = $top_item;
-            }
-	    elsif ($top_item eq '.') {
-		$abs_dir = $cwd;
-	    }
-            else {  # care about any  ../
-		$abs_dir = contract_name("$cwd/",$top_item); 
-            }
-            $abs_dir= Follow_SymLink($abs_dir);
-            unless (defined $abs_dir) {
-		warn "$top_item is a dangling symbolic link\n";
-		next Proc_Top_Item;
-            }
-            if (-d _) {
-		_find_dir_symlnk($wanted, $abs_dir, $top_item);
-		$Is_Dir= 1;
-            }
-        }
-	else { # no follow
-            $topdir = $top_item;
-            unless (defined $topnlink) {
-                warn "Can't stat $top_item: $!\n";
-                next Proc_Top_Item;
-            }
-            if (-d _) {
-		$top_item =~ s/\.dir\z// if $Is_VMS;
-		_find_dir($wanted, $top_item, $topnlink);
-		$Is_Dir= 1;
-            }
-	    else {
-		$abs_dir= $top_item;
-            }
-        }
-
-        unless ($Is_Dir) {
-	    unless (($_,$dir) = File::Basename::fileparse($abs_dir)) {
-		($dir,$_) = ('./', $top_item);
-	    }
-
-            $abs_dir = $dir;
-            if ($untaint) {
-		my $abs_dir_save = $abs_dir;
-		$abs_dir = $1 if $abs_dir =~ m|$untaint_pat|;
-		unless (defined $abs_dir) {
-		    if ($untaint_skip == 0) {
-			die "directory $abs_dir_save is still tainted";
-		    }
-		    else {
-			next Proc_Top_Item;
-		    }
-		}
-            }
-
-            unless ($no_chdir or chdir $abs_dir) {
-                warn "Couldn't chdir $abs_dir: $!\n";
-                next Proc_Top_Item;
-            }
-
-            $name = $abs_dir . $_;
-
-            { &$wanted_callback }; # protect against wild "next"
-
-        }
-
-        $no_chdir or chdir $cwd_untainted;
-    }
-}
-
-# API:
-#  $wanted
-#  $p_dir :  "parent directory"
-#  $nlink :  what came back from the stat
-# preconditions:
-#  chdir (if not no_chdir) to dir
-
-sub _find_dir($$$) {
-    my ($wanted, $p_dir, $nlink) = @_;
-    my ($CdLvl,$Level) = (0,0);
-    my @Stack;
-    my @filenames;
-    my ($subcount,$sub_nlink);
-    my $SE= [];
-    my $dir_name= $p_dir;
-    my $dir_pref= ( $p_dir eq '/' ? '/' : "$p_dir/" );
-    my $dir_rel= '.';      # directory name relative to current directory
-
-    local ($dir, $name, $prune, *DIR);
-     
-    unless ($no_chdir or $p_dir eq '.') {
-	my $udir = $p_dir;
-	if ($untaint) {
-	    $udir = $1 if $p_dir =~ m|$untaint_pat|;
-	    unless (defined $udir) {
-		if ($untaint_skip == 0) {
-		    die "directory $p_dir is still tainted";
-		}
-		else {
-		    return;
-		}
-	    }
-	}
-	unless (chdir $udir) {
-	    warn "Can't cd to $udir: $!\n";
-	    return;
-	}
-    }
-    
-    push @Stack,[$CdLvl,$p_dir,$dir_rel,-1]  if  $bydepth;
-
-    while (defined $SE) {
-	unless ($bydepth) {
-            $dir= $p_dir;
-            $name= $dir_name;
-            $_= ($no_chdir ? $dir_name : $dir_rel );
-	    # prune may happen here
-            $prune= 0;
-            { &$wanted_callback }; 	# protect against wild "next"
-            next if $prune;
-	}
-      
-	# change to that directory
-	unless ($no_chdir or $dir_rel eq '.') {
-	    my $udir= $dir_rel;
-	    if ($untaint) {
-		$udir = $1 if $dir_rel =~ m|$untaint_pat|;
-		unless (defined $udir) {
-		    if ($untaint_skip == 0) {
-			die "directory ("
-			    . ($p_dir ne '/' ? $p_dir : '')
-			    . "/) $dir_rel is still tainted";
-		    }
-		}
-	    }
-	    unless (chdir $udir) {
-		warn "Can't cd to ("
-		    . ($p_dir ne '/' ? $p_dir : '')
-		    . "/) $udir : $!\n";
-		next;
-	    }
-	    $CdLvl++;
-	}
-
-	$dir= $dir_name;
-
-	# Get the list of files in the current directory.
-	unless (opendir DIR, ($no_chdir ? $dir_name : '.')) {
-	    warn "Can't opendir($dir_name): $!\n";
-	    next;
-	}
-	@filenames = readdir DIR;
-	closedir(DIR);
-	@filenames = &$pre_process(@filenames) if $pre_process;
-	push @Stack,[$CdLvl,$dir_name,"",-2]   if $post_process;
-
-	if ($nlink == 2 && !$avoid_nlink) {
-	    # This dir has no subdirectories.
-	    for my $FN (@filenames) {
-		next if $FN =~ /^\.{1,2}\z/;
-		
-		$name = $dir_pref . $FN;
-		$_ = ($no_chdir ? $name : $FN);
-		{ &$wanted_callback }; # protect against wild "next"
-	    }
-
-	}
-	else {
-	    # This dir has subdirectories.
-	    $subcount = $nlink - 2;
-
-	    for my $FN (@filenames) {
-		next if $FN =~ /^\.{1,2}\z/;
-		if ($subcount > 0 || $avoid_nlink) {
-		    # Seen all the subdirs?
-		    # check for directoriness.
-		    # stat is faster for a file in the current directory
-		    $sub_nlink = (lstat ($no_chdir ? $dir_pref . $FN : $FN))[3];
-
-		    if (-d _) {
-			--$subcount;
-			$FN =~ s/\.dir\z// if $Is_VMS;
-			push @Stack,[$CdLvl,$dir_name,$FN,$sub_nlink];
-		    }
-		    else {
-			$name = $dir_pref . $FN;
-			$_= ($no_chdir ? $name : $FN);
-			{ &$wanted_callback }; # protect against wild "next"
-		    }
-		}
-		else {
-		    $name = $dir_pref . $FN;
-		    $_= ($no_chdir ? $name : $FN);
-		    { &$wanted_callback }; # protect against wild "next"
-		}
-	    }
-	}
-    }
-    continue {
-	while ( defined ($SE = pop @Stack) ) {
-	    ($Level, $p_dir, $dir_rel, $nlink) = @$SE;
-	    if ($CdLvl > $Level && !$no_chdir) {
-                my $tmp = join('/',('..') x ($CdLvl-$Level));
-                die "Can't cd to $dir_name" . $tmp
-                    unless chdir ($tmp);
-		$CdLvl = $Level;
-	    }
-	    $dir_name = ($p_dir eq '/' ? "/$dir_rel" : "$p_dir/$dir_rel");
-	    $dir_pref = "$dir_name/";
-	    if ( $nlink == -2 ) {
-		$name = $dir = $p_dir;
-		$_ = ".";
-		&$post_process;		# End-of-directory processing
-            } elsif ( $nlink < 0 ) {  # must be finddepth, report dirname now
-                $name = $dir_name;
-                if ( substr($name,-2) eq '/.' ) {
-                  $name =~ s|/\.$||;
-                }
-                $dir = $p_dir;
-                $_ = ($no_chdir ? $dir_name : $dir_rel );
-                if ( substr($_,-2) eq '/.' ) {
-                  s|/\.$||;
-                }
-                { &$wanted_callback }; # protect against wild "next"
-            } else {
-                push @Stack,[$CdLvl,$p_dir,$dir_rel,-1]  if  $bydepth;
-                last;
-            }
-	}
-    }
-}
-
-
-# API:
-#  $wanted
-#  $dir_loc : absolute location of a dir
-#  $p_dir   : "parent directory"
-# preconditions:
-#  chdir (if not no_chdir) to dir
-
-sub _find_dir_symlnk($$$) {
-    my ($wanted, $dir_loc, $p_dir) = @_;
-    my @Stack;
-    my @filenames;
-    my $new_loc;
-    my $pdir_loc = $dir_loc;
-    my $SE = [];
-    my $dir_name = $p_dir;
-    my $dir_pref = ( $p_dir   eq '/' ? '/' : "$p_dir/" );
-    my $loc_pref = ( $dir_loc eq '/' ? '/' : "$dir_loc/" );
-    my $dir_rel = '.';		# directory name relative to current directory
-    my $byd_flag;               # flag for pending stack entry if $bydepth
-
-    local ($dir, $name, $fullname, $prune, *DIR);
-    
-    unless ($no_chdir or $p_dir eq '.') {
-	my $udir = $dir_loc;
-	if ($untaint) {
-	    $udir = $1 if $dir_loc =~ m|$untaint_pat|;
-	    unless (defined $udir) {
-		if ($untaint_skip == 0) {
-		    die "directory $dir_loc is still tainted";
-		}
-		else {
-		    return;
-		}
-	    }
-	}
-	unless (chdir $udir) {
-	    warn "Can't cd to $udir: $!\n";
-	    return;
-	}
-    }
-
-    push @Stack,[$dir_loc,$pdir_loc,$p_dir,$dir_rel,-1]  if  $bydepth;
-
-    while (defined $SE) {
-
-	unless ($bydepth) {
-	    # change to parent directory
-	    unless ($no_chdir) {
-		my $udir = $pdir_loc;
-		if ($untaint) {
-		    $udir = $1 if $pdir_loc =~ m|$untaint_pat|;
-		}
-		unless (chdir $udir) {
-		    warn "Can't cd to $udir: $!\n";
-		    next;
-		}
-	    }
-	    $dir= $p_dir;
-            $name= $dir_name;
-            $_= ($no_chdir ? $dir_name : $dir_rel );
-            $fullname= $dir_loc;
-	    # prune may happen here
-            $prune= 0;
-	    lstat($_); # make sure  file tests with '_' work
-            { &$wanted_callback }; # protect against wild "next"
-            next if  $prune;
-	}
-
-	# change to that directory
-	unless ($no_chdir or $dir_rel eq '.') {
-	    my $udir = $dir_loc;
-	    if ($untaint) {
-		$udir = $1 if $dir_loc =~ m|$untaint_pat|;
-		unless (defined $udir ) {
-		    if ($untaint_skip == 0) {
-			die "directory $dir_loc is still tainted";
-		    }
-		    else {
-			next;
-		    }
-		}
-	    }
-	    unless (chdir $udir) {
-		warn "Can't cd to $udir: $!\n";
-		next;
-	    }
-	}
-
-	$dir = $dir_name;
-
-	# Get the list of files in the current directory.
-	unless (opendir DIR, ($no_chdir ? $dir_loc : '.')) {
-	    warn "Can't opendir($dir_loc): $!\n";
-	    next;
-	}
-	@filenames = readdir DIR;
-	closedir(DIR);
-
-	for my $FN (@filenames) {
-	    next if $FN =~ /^\.{1,2}\z/;
-
-	    # follow symbolic links / do an lstat
-	    $new_loc = Follow_SymLink($loc_pref.$FN);
-
-	    # ignore if invalid symlink
-	    next unless defined $new_loc;
-     
-	    if (-d _) {
-		push @Stack,[$new_loc,$dir_loc,$dir_name,$FN,1];
-	    }
-	    else {
-		$fullname = $new_loc;
-		$name = $dir_pref . $FN;
-		$_ = ($no_chdir ? $name : $FN);
-		{ &$wanted_callback }; # protect against wild "next"
-	    }
-	}
-
-    }
-    continue {
-	while (defined($SE = pop @Stack)) {
-	    ($dir_loc, $pdir_loc, $p_dir, $dir_rel, $byd_flag) = @$SE;
-	    $dir_name = ($p_dir eq '/' ? "/$dir_rel" : "$p_dir/$dir_rel");
-	    $dir_pref = "$dir_name/";
-	    $loc_pref = "$dir_loc/";
-            if ( $byd_flag < 0 ) {  # must be finddepth, report dirname now
-	        unless ($no_chdir or $dir_rel eq '.') {
-	            my $udir = $pdir_loc;
-	            if ($untaint) {
-		        $udir = $1 if $dir_loc =~ m|$untaint_pat|;
-	            }
-	            unless (chdir $udir) {
-		        warn "Can't cd to $udir: $!\n";
-		        next;
-	            }
-	        }
-	        $fullname = $dir_loc;
-	        $name = $dir_name;
-                if ( substr($name,-2) eq '/.' ) {
-                  $name =~ s|/\.$||;
-                }
-                $dir = $p_dir;
-	        $_ = ($no_chdir ? $dir_name : $dir_rel);
-                if ( substr($_,-2) eq '/.' ) {
-                  s|/\.$||;
-                }
-
-		lstat($_); # make sure  file tests with '_' work
-	        { &$wanted_callback }; # protect against wild "next"
-            } else {
-                push @Stack,[$dir_loc, $pdir_loc, $p_dir, $dir_rel,-1]  if  $bydepth;
-                last;
-            }
-	}
-    }
-}
-
-
-sub wrap_wanted {
-    my $wanted = shift;
-    if ( ref($wanted) eq 'HASH' ) {
-	if ( $wanted->{follow} || $wanted->{follow_fast}) {
-	    $wanted->{follow_skip} = 1 unless defined $wanted->{follow_skip};
-	}
-	if ( $wanted->{untaint} ) {
-	    $wanted->{untaint_pattern} = qr|^([-+@\w./]+)$|  
-		unless defined $wanted->{untaint_pattern};
-	    $wanted->{untaint_skip} = 0 unless defined $wanted->{untaint_skip};
-	}
-	return $wanted;
-    }
-    else {
-	return { wanted => $wanted };
-    }
-}
-
-sub find {
-    my $wanted = shift;
-    _find_opt(wrap_wanted($wanted), @_);
-    %SLnkSeen= ();  # free memory
-}
-
-sub finddepth {
-    my $wanted = wrap_wanted(shift);
-    $wanted->{bydepth} = 1;
-    _find_opt($wanted, @_);
-    %SLnkSeen= ();  # free memory
-}
-
-# These are hard-coded for now, but may move to hint files.
-if ($^O eq 'VMS') {
-    $Is_VMS = 1;
-    $File::Find::dont_use_nlink = 1;
-}
-
-$File::Find::dont_use_nlink = 1
-    if $^O eq 'os2' || $^O eq 'dos' || $^O eq 'amigaos' || $^O eq 'MSWin32' ||
-       $^O eq 'cygwin' || $^O eq 'epoc';
-
-# Set dont_use_nlink in your hint file if your system's stat doesn't
-# report the number of links in a directory as an indication
-# of the number of files.
-# See, e.g. hints/machten.sh for MachTen 2.2.
-unless ($File::Find::dont_use_nlink) {
-    require Config;
-    $File::Find::dont_use_nlink = 1 if ($Config::Config{'dont_use_nlink'});
-}
-
-1;
diff --git a/contrib/perl5/lib/File/Path.pm b/contrib/perl5/lib/File/Path.pm
deleted file mode 100644
index 0eb6128..0000000
--- a/contrib/perl5/lib/File/Path.pm
+++ /dev/null
@@ -1,251 +0,0 @@
-package File::Path;
-
-=head1 NAME
-
-File::Path - create or remove directory trees
-
-=head1 SYNOPSIS
-
-    use File::Path;
-
-    mkpath(['/foo/bar/baz', 'blurfl/quux'], 1, 0711);
-    rmtree(['foo/bar/baz', 'blurfl/quux'], 1, 1);
-
-=head1 DESCRIPTION
-
-The C<mkpath> function provides a convenient way to create directories, even
-if your C<mkdir> kernel call won't create more than one level of directory at
-a time.  C<mkpath> takes three arguments:
-
-=over 4
-
-=item *
-
-the name of the path to create, or a reference
-to a list of paths to create,
-
-=item *
-
-a boolean value, which if TRUE will cause C<mkpath>
-to print the name of each directory as it is created
-(defaults to FALSE), and
-
-=item *
-
-the numeric mode to use when creating the directories
-(defaults to 0777)
-
-=back
-
-It returns a list of all directories (including intermediates, determined
-using the Unix '/' separator) created.
-
-Similarly, the C<rmtree> function provides a convenient way to delete a
-subtree from the directory structure, much like the Unix command C<rm -r>.
-C<rmtree> takes three arguments:
-
-=over 4
-
-=item *
-
-the root of the subtree to delete, or a reference to
-a list of roots.  All of the files and directories
-below each root, as well as the roots themselves,
-will be deleted.
-
-=item *
-
-a boolean value, which if TRUE will cause C<rmtree> to
-print a message each time it examines a file, giving the
-name of the file, and indicating whether it's using C<rmdir>
-or C<unlink> to remove it, or that it's skipping it.
-(defaults to FALSE)
-
-=item *
-
-a boolean value, which if TRUE will cause C<rmtree> to
-skip any files to which you do not have delete access
-(if running under VMS) or write access (if running
-under another OS).  This will change in the future when
-a criterion for 'delete permission' under OSs other
-than VMS is settled.  (defaults to FALSE)
-
-=back
-
-It returns the number of files successfully deleted.  Symlinks are
-simply deleted and not followed.
-
-B<NOTE:> If the third parameter is not TRUE, C<rmtree> is B<unsecure>
-in the face of failure or interruption.  Files and directories which
-were not deleted may be left with permissions reset to allow world
-read and write access.  Note also that the occurrence of errors in
-rmtree can be determined I<only> by trapping diagnostic messages
-using C<$SIG{__WARN__}>; it is not apparent from the return value.
-Therefore, you must be extremely careful about using C<rmtree($foo,$bar,0>
-in situations where security is an issue.
-
-=head1 AUTHORS
-
-Tim Bunce <F<Tim.Bunce@ig.co.uk>> and
-Charles Bailey <F<bailey@newman.upenn.edu>>
-
-=cut
-
-use 5.005_64;
-use Carp;
-use File::Basename ();
-use Exporter ();
-use strict;
-
-our $VERSION = "1.0404";
-our @ISA = qw( Exporter );
-our @EXPORT = qw( mkpath rmtree );
-
-my $Is_VMS = $^O eq 'VMS';
-my $Is_MacOS = $^O eq 'MacOS';
-
-# These OSes complain if you want to remove a file that you have no
-# write permission to:
-my $force_writeable = ($^O eq 'os2' || $^O eq 'dos' || $^O eq 'MSWin32' ||
-		       $^O eq 'amigaos' || $^O eq 'MacOS' || $^O eq 'epoc');
-
-sub mkpath {
-    my($paths, $verbose, $mode) = @_;
-    # $paths   -- either a path string or ref to list of paths
-    # $verbose -- optional print "mkdir $path" for each directory created
-    # $mode    -- optional permissions, defaults to 0777
-    local($")=$Is_MacOS ? ":" : "/";
-    $mode = 0777 unless defined($mode);
-    $paths = [$paths] unless ref $paths;
-    my(@created,$path);
-    foreach $path (@$paths) {
-	$path .= '/' if $^O eq 'os2' and $path =~ /^\w:\z/s; # feature of CRT 
-	# Logic wants Unix paths, so go with the flow.
-	if ($Is_VMS) {
-	    next if $path eq '/';
-	    $path = VMS::Filespec::unixify($path);
-	    if ($path =~ m:^(/[^/]+)/?\z:) {
-	        $path = $1.'/000000';
-	    }
-	}
-	next if -d $path;
-	my $parent = File::Basename::dirname($path);
-	unless (-d $parent or $path eq $parent) {
-	    push(@created,mkpath($parent, $verbose, $mode));
- 	}
-	print "mkdir $path\n" if $verbose;
-	unless (mkdir($path,$mode)) {
-	    my $e = $!;
-	    # allow for another process to have created it meanwhile
-	    croak "mkdir $path: $e" unless -d $path;
-	}
-	push(@created, $path);
-    }
-    @created;
-}
-
-sub rmtree {
-    my($roots, $verbose, $safe) = @_;
-    my(@files);
-    my($count) = 0;
-    $verbose ||= 0;
-    $safe ||= 0;
-
-    if ( defined($roots) && length($roots) ) {
-      $roots = [$roots] unless ref $roots;
-    }
-    else {
-      carp "No root path(s) specified\n";
-      return 0;
-    }
-
-    my($root);
-    foreach $root (@{$roots}) {
-    	if ($Is_MacOS) {
-	    $root = ":$root" if $root !~ /:/;
-	    $root =~ s#([^:])\z#$1:#;
-	} else {
-	    $root =~ s#/\z##;
-	}
-	(undef, undef, my $rp) = lstat $root or next;
-	$rp &= 07777;	# don't forget setuid, setgid, sticky bits
-	if ( -d _ ) {
-	    # notabene: 0777 is for making readable in the first place,
-	    # it's also intended to change it to writable in case we have
-	    # to recurse in which case we are better than rm -rf for 
-	    # subtrees with strange permissions
-	    chmod(0777, ($Is_VMS ? VMS::Filespec::fileify($root) : $root))
-	      or carp "Can't make directory $root read+writeable: $!"
-		unless $safe;
-
-	    if (opendir my $d, $root) {
-		@files = readdir $d;
-		closedir $d;
-	    }
-	    else {
-	        carp "Can't read $root: $!";
-		@files = ();
-	    }
-
-	    # Deleting large numbers of files from VMS Files-11 filesystems
-	    # is faster if done in reverse ASCIIbetical order 
-	    @files = reverse @files if $Is_VMS;
-	    ($root = VMS::Filespec::unixify($root)) =~ s#\.dir\z## if $Is_VMS;
-	    if ($Is_MacOS) {
-		@files = map("$root$_", @files);
-	    } else {
-		@files = map("$root/$_", grep $_!~/^\.{1,2}\z/s,@files);
-	    }
-	    $count += rmtree(\@files,$verbose,$safe);
-	    if ($safe &&
-		($Is_VMS ? !&VMS::Filespec::candelete($root) : !-w $root)) {
-		print "skipped $root\n" if $verbose;
-		next;
-	    }
-	    chmod 0777, $root
-	      or carp "Can't make directory $root writeable: $!"
-		if $force_writeable;
-	    print "rmdir $root\n" if $verbose;
-	    if (rmdir $root) {
-		++$count;
-	    }
-	    else {
-		carp "Can't remove directory $root: $!";
-		chmod($rp, ($Is_VMS ? VMS::Filespec::fileify($root) : $root))
-		    or carp("and can't restore permissions to "
-		            . sprintf("0%o",$rp) . "\n");
-	    }
-	}
-	else { 
-	    if ($safe &&
-		($Is_VMS ? !&VMS::Filespec::candelete($root)
-		         : !(-l $root || -w $root)))
-	    {
-		print "skipped $root\n" if $verbose;
-		next;
-	    }
-	    chmod 0666, $root
-	      or carp "Can't make file $root writeable: $!"
-		if $force_writeable;
-	    print "unlink $root\n" if $verbose;
-	    # delete all versions under VMS
-	    for (;;) {
-		unless (unlink $root) {
-		    carp "Can't unlink file $root: $!";
-		    if ($force_writeable) {
-			chmod $rp, $root
-			    or carp("and can't restore permissions to "
-			            . sprintf("0%o",$rp) . "\n");
-		    }
-		    last;
-		}
-		++$count;
-		last unless $Is_VMS && lstat $root;
-	    }
-	}
-    }
-
-    $count;
-}
-
-1;
diff --git a/contrib/perl5/lib/File/Spec.pm b/contrib/perl5/lib/File/Spec.pm
deleted file mode 100644
index 3f79d74..0000000
--- a/contrib/perl5/lib/File/Spec.pm
+++ /dev/null
@@ -1,93 +0,0 @@
-package File::Spec;
-
-use strict;
-use vars qw(@ISA $VERSION);
-
-$VERSION = 0.82 ;
-
-my %module = (MacOS   => 'Mac',
-	      MSWin32 => 'Win32',
-	      os2     => 'OS2',
-	      VMS     => 'VMS',
-	      epoc    => 'Epoc');
-
-my $module = $module{$^O} || 'Unix';
-require "File/Spec/$module.pm";
-@ISA = ("File::Spec::$module");
-
-1;
-__END__
-
-=head1 NAME
-
-File::Spec - portably perform operations on file names
-
-=head1 SYNOPSIS
-
-	use File::Spec;
-
-	$x=File::Spec->catfile('a', 'b', 'c');
-
-which returns 'a/b/c' under Unix. Or:
-
-	use File::Spec::Functions;
-
-	$x = catfile('a', 'b', 'c');
-
-=head1 DESCRIPTION
-
-This module is designed to support operations commonly performed on file
-specifications (usually called "file names", but not to be confused with the
-contents of a file, or Perl's file handles), such as concatenating several
-directory and file names into a single path, or determining whether a path
-is rooted. It is based on code directly taken from MakeMaker 5.17, code
-written by Andreas KE<ouml>nig, Andy Dougherty, Charles Bailey, Ilya
-Zakharevich, Paul Schinder, and others.
-
-Since these functions are different for most operating systems, each set of
-OS specific routines is available in a separate module, including:
-
-	File::Spec::Unix
-	File::Spec::Mac
-	File::Spec::OS2
-	File::Spec::Win32
-	File::Spec::VMS
-
-The module appropriate for the current OS is automatically loaded by
-File::Spec. Since some modules (like VMS) make use of facilities available
-only under that OS, it may not be possible to load all modules under all
-operating systems.
-
-Since File::Spec is object oriented, subroutines should not called directly,
-as in:
-
-	File::Spec::catfile('a','b');
-
-but rather as class methods:
-
-	File::Spec->catfile('a','b');
-
-For simple uses, L<File::Spec::Functions> provides convenient functional
-forms of these methods.
-
-For a list of available methods, please consult L<File::Spec::Unix>,
-which contains the entire set, and which is inherited by the modules for
-other platforms. For further information, please see L<File::Spec::Mac>,
-L<File::Spec::OS2>, L<File::Spec::Win32>, or L<File::Spec::VMS>.
-
-=head1 SEE ALSO
-
-File::Spec::Unix, File::Spec::Mac, File::Spec::OS2, File::Spec::Win32,
-File::Spec::VMS, File::Spec::Functions, ExtUtils::MakeMaker
-
-=head1 AUTHORS
-
-Kenneth Albanowski <F<kjahds@kjahds.com>>, Andy Dougherty
-<F<doughera@lafcol.lafayette.edu>>, Andreas KE<ouml>nig
-<F<A.Koenig@franz.ww.TU-Berlin.DE>>, Tim Bunce <F<Tim.Bunce@ig.co.uk>>. VMS
-support by Charles Bailey <F<bailey@newman.upenn.edu>>.  OS/2 support by
-Ilya Zakharevich <F<ilya@math.ohio-state.edu>>. Mac support by Paul Schinder
-<F<schinder@pobox.com>>.  abs2rel() and rel2abs() written by
-Shigio Yamaguchi <F<shigio@tamacom.com>>, modified by Barrie Slaymaker
-<F<barries@slaysys.com>>.  splitpath(), splitdir(), catpath() and catdir()
-by Barrie Slaymaker.
diff --git a/contrib/perl5/lib/File/Spec/Epoc.pm b/contrib/perl5/lib/File/Spec/Epoc.pm
deleted file mode 100644
index 65d5e1f..0000000
--- a/contrib/perl5/lib/File/Spec/Epoc.pm
+++ /dev/null
@@ -1,378 +0,0 @@
-package File::Spec::Epoc;
-
-use strict;
-use Cwd;
-use vars qw(@ISA);
-require File::Spec::Unix;
-@ISA = qw(File::Spec::Unix);
-
-=head1 NAME
-
-File::Spec::Epoc - methods for Epoc file specs
-
-=head1 SYNOPSIS
-
- require File::Spec::Epoc; # Done internally by File::Spec if needed
-
-=head1 DESCRIPTION
-
-See File::Spec::Unix for a documentation of the methods provided
-there. This package overrides the implementation of these methods, not
-the semantics.
-
-This package is still work in progress ;-)
-o.flebbe@gmx.de
-
-
-=over
-
-=item devnull
-
-Returns a string representation of the null device.
-
-=cut
-
-sub devnull {
-    return "nul:";
-}
-
-=item tmpdir
-
-Returns a string representation of a temporay directory:
-
-=cut
-
-my $tmpdir;
-sub tmpdir {
-    return "C:/System/temp";
-}
-
-sub case_tolerant {
-    return 1;
-}
-
-sub file_name_is_absolute {
-    my ($self,$file) = @_;
-    return scalar($file =~ m{^([a-z?]:)?[\\/]}is);
-}
-
-=item path
-
-Takes no argument, returns the environment variable PATH as an array. Since
-there is no search path supported, it returns undef, sorry.
-
-=cut
-sub path {
-    return undef;
-}
-
-=item canonpath
-
-No physical check on the filesystem, but a logical cleanup of a
-path. On UNIX eliminated successive slashes and successive "/.".
-
-=cut
-
-sub canonpath {
-    my ($self,$path) = @_;
-    $path =~ s/^([a-z]:)/\u$1/s;
-
-    $path =~ s|/+|/|g unless($^O eq 'cygwin');     # xx////xx  -> xx/xx
-    $path =~ s|(/\.)+/|/|g;                        # xx/././xx -> xx/xx
-    $path =~ s|^(\./)+||s unless $path eq "./";    # ./xx      -> xx
-    $path =~ s|^/(\.\./)+|/|s;                     # /../../xx -> xx
-    $path =~ s|/\z|| unless $path eq "/";          # xx/       -> xx
-    return $path;
-}
-
-=item splitpath
-
-    ($volume,$directories,$file) = File::Spec->splitpath( $path );
-    ($volume,$directories,$file) = File::Spec->splitpath( $path, $no_file );
-
-Splits a path in to volume, directory, and filename portions. Assumes that 
-the last file is a path unless the path ends in '\\', '\\.', '\\..'
-or $no_file is true.  On Win32 this means that $no_file true makes this return 
-( $volume, $path, undef ).
-
-Separators accepted are \ and /.
-
-The results can be passed to L</catpath> to get back a path equivalent to
-(usually identical to) the original path.
-
-=cut
-
-sub splitpath {
-    my ($self,$path, $nofile) = @_;
-    my ($volume,$directory,$file) = ('','','');
-    if ( $nofile ) {
-        $path =~ 
-            m{^( (?:[a-zA-Z?]:|(?:\\\\|//)[^\\/]+[\\/][^\\/]+)? ) 
-                 (.*)
-             }xs;
-        $volume    = $1;
-        $directory = $2;
-    }
-    else {
-        $path =~ 
-            m{^ ( (?: [a-zA-Z?]: |
-                      (?:\\\\|//)[^\\/]+[\\/][^\\/]+
-                  )?
-                )
-                ( (?:.*[\\\\/](?:\.\.?\z)?)? )
-                (.*)
-             }xs;
-        $volume    = $1;
-        $directory = $2;
-        $file      = $3;
-    }
-
-    return ($volume,$directory,$file);
-}
-
-
-=item splitdir
-
-The opposite of L</catdir()>.
-
-    @dirs = File::Spec->splitdir( $directories );
-
-$directories must be only the directory portion of the path on systems 
-that have the concept of a volume or that have path syntax that differentiates
-files from directories.
-
-Unlike just splitting the directories on the separator, leading empty and 
-trailing directory entries can be returned, because these are significant
-on some OSs. So,
-
-    File::Spec->splitdir( "/a/b/c" );
-
-Yields:
-
-    ( '', 'a', 'b', '', 'c', '' )
-
-=cut
-
-sub splitdir {
-    my ($self,$directories) = @_ ;
-    #
-    # split() likes to forget about trailing null fields, so here we
-    # check to be sure that there will not be any before handling the
-    # simple case.
-    #
-    if ( $directories !~ m|[\\/]\z| ) {
-        return split( m|[\\/]|, $directories );
-    }
-    else {
-        #
-        # since there was a trailing separator, add a file name to the end, 
-        # then do the split, then replace it with ''.
-        #
-        my( @directories )= split( m|[\\/]|, "${directories}dummy" ) ;
-        $directories[ $#directories ]= '' ;
-        return @directories ;
-    }
-}
-
-
-=item catpath
-
-Takes volume, directory and file portions and returns an entire path. Under
-Unix, $volume is ignored, and this is just like catfile(). On other OSs,
-the $volume become significant.
-
-=cut
-
-sub catpath {
-    my ($self,$volume,$directory,$file) = @_;
-
-    # If it's UNC, make sure the glue separator is there, reusing
-    # whatever separator is first in the $volume
-    $volume .= $1
-        if ( $volume =~ m@^([\\/])[\\/][^\\/]+[\\/][^\\/]+\z@s &&
-             $directory =~ m@^[^\\/]@s
-           ) ;
-
-    $volume .= $directory ;
-
-    # If the volume is not just A:, make sure the glue separator is 
-    # there, reusing whatever separator is first in the $volume if possible.
-    if ( $volume !~ m@^[a-zA-Z]:\z@s &&
-         $volume =~ m@[^\\/]\z@      &&
-         $file   =~ m@[^\\/]@
-       ) {
-        $volume =~ m@([\\/])@ ;
-        my $sep = $1 ? $1 : '\\' ;
-        $volume .= $sep ;
-    }
-
-    $volume .= $file ;
-
-    return $volume ;
-}
-
-
-=item abs2rel
-
-Takes a destination path and an optional base path returns a relative path
-from the base path to the destination path:
-
-    $rel_path = File::Spec->abs2rel( $destination ) ;
-    $rel_path = File::Spec->abs2rel( $destination, $base ) ;
-
-If $base is not present or '', then L</cwd()> is used. If $base is relative, 
-then it is converted to absolute form using L</rel2abs()>. This means that it
-is taken to be relative to L<cwd()>.
-
-On systems with the concept of a volume, this assumes that both paths 
-are on the $destination volume, and ignores the $base volume.
-
-On systems that have a grammar that indicates filenames, this ignores the 
-$base filename as well. Otherwise all path components are assumed to be
-directories.
-
-If $path is relative, it is converted to absolute form using L</rel2abs()>.
-This means that it is taken to be relative to L</cwd()>.
-
-Based on code written by Shigio Yamaguchi.
-
-No checks against the filesystem are made. 
-
-=cut
-
-sub abs2rel {
-    my($self,$path,$base) = @_;
-
-    # Clean up $path
-    if ( ! $self->file_name_is_absolute( $path ) ) {
-        $path = $self->rel2abs( $path ) ;
-    }
-    else {
-        $path = $self->canonpath( $path ) ;
-    }
-
-    # Figure out the effective $base and clean it up.
-    if ( ! $self->file_name_is_absolute( $base ) ) {
-        $base = $self->rel2abs( $base ) ;
-    }
-    elsif ( !defined( $base ) || $base eq '' ) {
-        $base = cwd() ;
-    }
-    else {
-        $base = $self->canonpath( $base ) ;
-    }
-
-    # Split up paths
-    my ( $path_volume, $path_directories, $path_file ) =
-        $self->splitpath( $path, 1 ) ;
-
-    my ( undef, $base_directories, undef ) =
-        $self->splitpath( $base, 1 ) ;
-
-    # Now, remove all leading components that are the same
-    my @pathchunks = $self->splitdir( $path_directories );
-    my @basechunks = $self->splitdir( $base_directories );
-
-    while ( @pathchunks && 
-            @basechunks && 
-            lc( $pathchunks[0] ) eq lc( $basechunks[0] ) 
-          ) {
-        shift @pathchunks ;
-        shift @basechunks ;
-    }
-
-    # No need to catdir, we know these are well formed.
-    $path_directories = CORE::join( '\\', @pathchunks );
-    $base_directories = CORE::join( '\\', @basechunks );
-
-    # $base_directories now contains the directories the resulting relative
-    # path must ascend out of before it can descend to $path_directory.  So, 
-    # replace all names with $parentDir
-
-    #FA Need to replace between backslashes...
-    $base_directories =~ s|[^\\]+|..|g ;
-
-    # Glue the two together, using a separator if necessary, and preventing an
-    # empty result.
-
-    #FA Must check that new directories are not empty.
-    if ( $path_directories ne '' && $base_directories ne '' ) {
-        $path_directories = "$base_directories\\$path_directories" ;
-    } else {
-        $path_directories = "$base_directories$path_directories" ;
-    }
-
-    # It makes no sense to add a relative path to a UNC volume
-    $path_volume = '' unless $path_volume =~ m{^[A-Z]:}is ;
-
-    return $self->canonpath( 
-        $self->catpath($path_volume, $path_directories, $path_file ) 
-    ) ;
-}
-
-=item rel2abs
-
-Converts a relative path to an absolute path. 
-
-    $abs_path = File::Spec->rel2abs( $destination ) ;
-    $abs_path = File::Spec->rel2abs( $destination, $base ) ;
-
-If $base is not present or '', then L<cwd()> is used. If $base is relative, 
-then it is converted to absolute form using L</rel2abs()>. This means that it
-is taken to be relative to L</cwd()>.
-
-Assumes that both paths are on the $base volume, and ignores the 
-$destination volume. 
-
-On systems that have a grammar that indicates filenames, this ignores the 
-$base filename as well. Otherwise all path components are assumed to be
-directories.
-
-If $path is absolute, it is cleaned up and returned using L</canonpath()>.
-
-Based on code written by Shigio Yamaguchi.
-
-No checks against the filesystem are made. 
-
-=cut
-
-sub rel2abs($;$;) {
-    my ($self,$path,$base ) = @_;
-
-    if ( ! $self->file_name_is_absolute( $path ) ) {
-
-        if ( !defined( $base ) || $base eq '' ) {
-            $base = cwd() ;
-        }
-        elsif ( ! $self->file_name_is_absolute( $base ) ) {
-            $base = $self->rel2abs( $base ) ;
-        }
-        else {
-            $base = $self->canonpath( $base ) ;
-        }
-
-        my ( undef, $path_directories, $path_file ) =
-            $self->splitpath( $path, 1 ) ;
-
-        my ( $base_volume, $base_directories, undef ) =
-            $self->splitpath( $base, 1 ) ;
-
-        $path = $self->catpath( 
-            $base_volume, 
-            $self->catdir( $base_directories, $path_directories ), 
-            $path_file
-        ) ;
-    }
-
-    return $self->canonpath( $path ) ;
-}
-
-=back
-
-=head1 SEE ALSO
-
-L<File::Spec>
-
-=cut
-
-1;
diff --git a/contrib/perl5/lib/File/Spec/Functions.pm b/contrib/perl5/lib/File/Spec/Functions.pm
deleted file mode 100644
index 0036ac1..0000000
--- a/contrib/perl5/lib/File/Spec/Functions.pm
+++ /dev/null
@@ -1,97 +0,0 @@
-package File::Spec::Functions;
-
-use File::Spec;
-use strict;
-
-use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
-
-$VERSION = '1.1';
-
-require Exporter;
-
-@ISA = qw(Exporter);
-
-@EXPORT = qw(
-	canonpath
-	catdir
-	catfile
-	curdir
-	rootdir
-	updir
-	no_upwards
-	file_name_is_absolute
-	path
-);
-
-@EXPORT_OK = qw(
-	devnull
-	tmpdir
-	splitpath
-	splitdir
-	catpath
-	abs2rel
-	rel2abs
-);
-
-%EXPORT_TAGS = ( ALL => [ @EXPORT_OK, @EXPORT ] );
-
-foreach my $meth (@EXPORT, @EXPORT_OK) {
-    my $sub = File::Spec->can($meth);
-    no strict 'refs';
-    *{$meth} = sub {&$sub('File::Spec', @_)};
-}
-
-
-1;
-__END__
-
-=head1 NAME
-
-File::Spec::Functions - portably perform operations on file names
-
-=head1 SYNOPSIS
-
-	use File::Spec::Functions;
-	$x = catfile('a','b');
-
-=head1 DESCRIPTION
-
-This module exports convenience functions for all of the class methods
-provided by File::Spec.
-
-For a reference of available functions, please consult L<File::Spec::Unix>,
-which contains the entire set, and which is inherited by the modules for
-other platforms. For further information, please see L<File::Spec::Mac>,
-L<File::Spec::OS2>, L<File::Spec::Win32>, or L<File::Spec::VMS>.
-
-=head2 Exports
-
-The following functions are exported by default.
-
-	canonpath
-	catdir
-	catfile
-	curdir
-	rootdir
-	updir
-	no_upwards
-	file_name_is_absolute
-	path
-
-
-The following functions are exported only by request.
-
-	devnull
-	tmpdir
-	splitpath
-	splitdir
-	catpath
-	abs2rel
-	rel2abs
-
-All the functions may be imported using the C<:ALL> tag.
-
-=head1 SEE ALSO
-
-File::Spec, File::Spec::Unix, File::Spec::Mac, File::Spec::OS2,
-File::Spec::Win32, File::Spec::VMS, ExtUtils::MakeMaker
diff --git a/contrib/perl5/lib/File/Spec/Mac.pm b/contrib/perl5/lib/File/Spec/Mac.pm
deleted file mode 100644
index 9ef55ec..0000000
--- a/contrib/perl5/lib/File/Spec/Mac.pm
+++ /dev/null
@@ -1,394 +0,0 @@
-package File::Spec::Mac;
-
-use strict;
-use vars qw(@ISA $VERSION);
-require File::Spec::Unix;
-
-$VERSION = '1.2';
-
-@ISA = qw(File::Spec::Unix);
-
-=head1 NAME
-
-File::Spec::Mac - File::Spec for MacOS
-
-=head1 SYNOPSIS
-
- require File::Spec::Mac; # Done internally by File::Spec if needed
-
-=head1 DESCRIPTION
-
-Methods for manipulating file specifications.
-
-=head1 METHODS
-
-=over 2
-
-=item canonpath
-
-On MacOS, there's nothing to be done.  Returns what it's given.
-
-=cut
-
-sub canonpath {
-    my ($self,$path) = @_;
-    return $path;
-}
-
-=item catdir
-
-Concatenate two or more directory names to form a complete path ending with 
-a directory.  Put a trailing : on the end of the complete path if there 
-isn't one, because that's what's done in MacPerl's environment.
-
-The fundamental requirement of this routine is that
-
-	  File::Spec->catdir(split(":",$path)) eq $path
-
-But because of the nature of Macintosh paths, some additional 
-possibilities are allowed to make using this routine give reasonable results 
-for some common situations.  Here are the rules that are used.  Each 
-argument has its trailing ":" removed.  Each argument, except the first,
-has its leading ":" removed.  They are then joined together by a ":".
-
-So
-
-	  File::Spec->catdir("a","b") = "a:b:"
-	  File::Spec->catdir("a:",":b") = "a:b:"
-	  File::Spec->catdir("a:","b") = "a:b:"
-	  File::Spec->catdir("a",":b") = "a:b"
-	  File::Spec->catdir("a","","b") = "a::b"
-
-etc.
-
-To get a relative path (one beginning with :), begin the first argument with :
-or put a "" as the first argument.
-
-If you don't want to worry about these rules, never allow a ":" on the ends 
-of any of the arguments except at the beginning of the first.
-
-Under MacPerl, there is an additional ambiguity.  Does the user intend that
-
-	  File::Spec->catfile("LWP","Protocol","http.pm")
-
-be relative or absolute?  There's no way of telling except by checking for the
-existence of LWP: or :LWP, and even there he may mean a dismounted volume or
-a relative path in a different directory (like in @INC).   So those checks
-aren't done here. This routine will treat this as absolute.
-
-=cut
-
-sub catdir {
-    shift;
-    my @args = @_;
-    my $result = shift @args;
-    $result =~ s/:\Z(?!\n)//;
-    foreach (@args) {
-	s/:\Z(?!\n)//;
-	s/^://s;
-	$result .= ":$_";
-    }
-    return "$result:";
-}
-
-=item catfile
-
-Concatenate one or more directory names and a filename to form a
-complete path ending with a filename.  Since this uses catdir, the
-same caveats apply.  Note that the leading : is removed from the filename,
-so that 
-
-	  File::Spec->catfile($ENV{HOME},"file");
-
-and
-
-	  File::Spec->catfile($ENV{HOME},":file");
-
-give the same answer, as one might expect.
-
-=cut
-
-sub catfile {
-    my $self = shift;
-    my $file = pop @_;
-    return $file unless @_;
-    my $dir = $self->catdir(@_);
-    $file =~ s/^://s;
-    return $dir.$file;
-}
-
-=item curdir
-
-Returns a string representing the current directory.
-
-=cut
-
-sub curdir {
-    return ":";
-}
-
-=item devnull
-
-Returns a string representing the null device.
-
-=cut
-
-sub devnull {
-    return "Dev:Null";
-}
-
-=item rootdir
-
-Returns a string representing the root directory.  Under MacPerl,
-returns the name of the startup volume, since that's the closest in
-concept, although other volumes aren't rooted there.
-
-=cut
-
-sub rootdir {
-#
-#  There's no real root directory on MacOS.  The name of the startup
-#  volume is returned, since that's the closest in concept.
-#
-    require Mac::Files;
-    my $system =  Mac::Files::FindFolder(&Mac::Files::kOnSystemDisk,
-					 &Mac::Files::kSystemFolderType);
-    $system =~ s/:.*\Z(?!\n)/:/s;
-    return $system;
-}
-
-=item tmpdir
-
-Returns a string representation of the first existing directory
-from the following list or '' if none exist:
-
-    $ENV{TMPDIR}
-
-=cut
-
-my $tmpdir;
-sub tmpdir {
-    return $tmpdir if defined $tmpdir;
-    $tmpdir = $ENV{TMPDIR} if -d $ENV{TMPDIR};
-    $tmpdir = '' unless defined $tmpdir;
-    return $tmpdir;
-}
-
-=item updir
-
-Returns a string representing the parent directory.
-
-=cut
-
-sub updir {
-    return "::";
-}
-
-=item file_name_is_absolute
-
-Takes as argument a path and returns true, if it is an absolute path.  In 
-the case where a name can be either relative or absolute (for example, a 
-folder named "HD" in the current working directory on a drive named "HD"), 
-relative wins.  Use ":" in the appropriate place in the path if you want to
-distinguish unambiguously.
-
-As a special case, the file name '' is always considered to be absolute.
-
-=cut
-
-sub file_name_is_absolute {
-    my ($self,$file) = @_;
-    if ($file =~ /:/) {
-	return ($file !~ m/^:/s);
-    } elsif ( $file eq '' ) {
-        return 1 ;
-    } else {
-	return (! -e ":$file");
-    }
-}
-
-=item path
-
-Returns the null list for the MacPerl application, since the concept is 
-usually meaningless under MacOS. But if you're using the MacPerl tool under 
-MPW, it gives back $ENV{Commands} suitably split, as is done in 
-:lib:ExtUtils:MM_Mac.pm.
-
-=cut
-
-sub path {
-#
-#  The concept is meaningless under the MacPerl application.
-#  Under MPW, it has a meaning.
-#
-    return unless exists $ENV{Commands};
-    return split(/,/, $ENV{Commands});
-}
-
-=item splitpath
-
-=cut
-
-sub splitpath {
-    my ($self,$path, $nofile) = @_;
-
-    my ($volume,$directory,$file) = ('','','');
-
-    if ( $nofile ) {
-        ( $volume, $directory ) = $path =~ m@((?:[^:]+(?::|\Z(?!\n)))?)(.*)@s;
-    }
-    else {
-        $path =~ 
-            m@^( (?: [^:]+: )? ) 
-                ( (?: .*: )? )
-                ( .* )
-             @xs;
-        $volume    = $1;
-        $directory = $2;
-        $file      = $3;
-    }
-
-    # Make sure non-empty volumes and directories end in ':'
-    $volume    .= ':' if $volume    =~ m@[^:]\Z(?!\n)@ ;
-    $directory .= ':' if $directory =~ m@[^:]\Z(?!\n)@ ;
-    return ($volume,$directory,$file);
-}
-
-
-=item splitdir
-
-=cut
-
-sub splitdir {
-    my ($self,$directories) = @_ ;
-    #
-    # split() likes to forget about trailing null fields, so here we
-    # check to be sure that there will not be any before handling the
-    # simple case.
-    #
-    if ( $directories !~ m@:\Z(?!\n)@ ) {
-        return split( m@:@, $directories );
-    }
-    else {
-        #
-        # since there was a trailing separator, add a file name to the end, 
-        # then do the split, then replace it with ''.
-        #
-        my( @directories )= split( m@:@, "${directories}dummy" ) ;
-        $directories[ $#directories ]= '' ;
-        return @directories ;
-    }
-}
-
-
-=item catpath
-
-=cut
-
-sub catpath {
-    my $self = shift ;
-
-    my $result = shift ;
-    $result =~ s@^([^/])@/$1@s ;
-
-    my $segment ;
-    for $segment ( @_ ) {
-        if ( $result =~ m@[^/]\Z(?!\n)@ && $segment =~ m@^[^/]@s ) {
-            $result .= "/$segment" ;
-        }
-        elsif ( $result =~ m@/\Z(?!\n)@ && $segment =~ m@^/@s ) {
-            $result  =~ s@/+\Z(?!\n)@/@;
-            $segment =~ s@^/+@@s;
-            $result  .= "$segment" ;
-        }
-        else {
-            $result  .= $segment ;
-        }
-    }
-
-    return $result ;
-}
-
-=item abs2rel
-
-See L<File::Spec::Unix/abs2rel> for general documentation.
-
-Unlike C<File::Spec::Unix->abs2rel()>, this function will make
-checks against the local filesystem if necessary.  See
-L</file_name_is_absolute> for details.
-
-=cut
-
-sub abs2rel {
-    my($self,$path,$base) = @_;
-
-    # Clean up $path
-    if ( ! $self->file_name_is_absolute( $path ) ) {
-        $path = $self->rel2abs( $path ) ;
-    }
-
-    # Figure out the effective $base and clean it up.
-    if ( !defined( $base ) || $base eq '' ) {
-        $base = cwd() ;
-    }
-    elsif ( ! $self->file_name_is_absolute( $base ) ) {
-        $base = $self->rel2abs( $base ) ;
-    }
-
-    # Now, remove all leading components that are the same
-    my @pathchunks = $self->splitdir( $path );
-    my @basechunks = $self->splitdir( $base );
-
-    while (@pathchunks && @basechunks && $pathchunks[0] eq $basechunks[0]) {
-        shift @pathchunks ;
-        shift @basechunks ;
-    }
-
-    $path = join( ':', @pathchunks );
-
-    # @basechunks now contains the number of directories to climb out of.
-    $base = ':' x @basechunks ;
-
-    return "$base:$path" ;
-}
-
-=item rel2abs
-
-See L<File::Spec::Unix/rel2abs> for general documentation.
-
-Unlike C<File::Spec::Unix->rel2abs()>, this function will make
-checks against the local filesystem if necessary.  See
-L</file_name_is_absolute> for details.
-
-=cut
-
-sub rel2abs {
-    my ($self,$path,$base ) = @_;
-
-    if ( ! $self->file_name_is_absolute( $path ) ) {
-        if ( !defined( $base ) || $base eq '' ) {
-            $base = cwd() ;
-        }
-        elsif ( ! $self->file_name_is_absolute( $base ) ) {
-            $base = $self->rel2abs( $base ) ;
-        }
-        else {
-            $base = $self->canonpath( $base ) ;
-        }
-
-        $path = $self->canonpath("$base$path") ;
-    }
-
-    return $path ;
-}
-
-
-=back
-
-=head1 SEE ALSO
-
-L<File::Spec>
-
-=cut
-
-1;
diff --git a/contrib/perl5/lib/File/Spec/OS2.pm b/contrib/perl5/lib/File/Spec/OS2.pm
deleted file mode 100644
index 20bf8c9..0000000
--- a/contrib/perl5/lib/File/Spec/OS2.pm
+++ /dev/null
@@ -1,62 +0,0 @@
-package File::Spec::OS2;
-
-use strict;
-use vars qw(@ISA $VERSION);
-require File::Spec::Unix;
-
-$VERSION = '1.1';
-
-@ISA = qw(File::Spec::Unix);
-
-sub devnull {
-    return "/dev/nul";
-}
-
-sub case_tolerant {
-    return 1;
-}
-
-sub file_name_is_absolute {
-    my ($self,$file) = @_;
-    return scalar($file =~ m{^([a-z]:)?[\\/]}is);
-}
-
-sub path {
-    my $path = $ENV{PATH};
-    $path =~ s:\\:/:g;
-    my @path = split(';',$path);
-    foreach (@path) { $_ = '.' if $_ eq '' }
-    return @path;
-}
-
-my $tmpdir;
-sub tmpdir {
-    return $tmpdir if defined $tmpdir;
-    my $self = shift;
-    foreach (@ENV{qw(TMPDIR TEMP TMP)}, qw(/tmp /)) {
-	next unless defined && -d;
-	$tmpdir = $_;
-	last;
-    }
-    $tmpdir = '' unless defined $tmpdir;
-    $tmpdir =~ s:\\:/:g;
-    $tmpdir = $self->canonpath($tmpdir);
-    return $tmpdir;
-}
-
-1;
-__END__
-
-=head1 NAME
-
-File::Spec::OS2 - methods for OS/2 file specs
-
-=head1 SYNOPSIS
-
- require File::Spec::OS2; # Done internally by File::Spec if needed
-
-=head1 DESCRIPTION
-
-See File::Spec::Unix for a documentation of the methods provided
-there. This package overrides the implementation of these methods, not
-the semantics.
diff --git a/contrib/perl5/lib/File/Spec/Unix.pm b/contrib/perl5/lib/File/Spec/Unix.pm
deleted file mode 100644
index a81c533..0000000
--- a/contrib/perl5/lib/File/Spec/Unix.pm
+++ /dev/null
@@ -1,458 +0,0 @@
-package File::Spec::Unix;
-
-use strict;
-use vars qw($VERSION);
-
-$VERSION = '1.2';
-
-use Cwd;
-
-=head1 NAME
-
-File::Spec::Unix - methods used by File::Spec
-
-=head1 SYNOPSIS
-
- require File::Spec::Unix; # Done automatically by File::Spec
-
-=head1 DESCRIPTION
-
-Methods for manipulating file specifications.
-
-=head1 METHODS
-
-=over 2
-
-=item canonpath
-
-No physical check on the filesystem, but a logical cleanup of a
-path. On UNIX eliminated successive slashes and successive "/.".
-
-    $cpath = File::Spec->canonpath( $path ) ;
-
-=cut
-
-sub canonpath {
-    my ($self,$path) = @_;
-    $path =~ s|/+|/|g unless($^O eq 'cygwin');     # xx////xx  -> xx/xx
-    $path =~ s|(/\.)+/|/|g;                        # xx/././xx -> xx/xx
-    $path =~ s|^(\./)+||s unless $path eq "./";    # ./xx      -> xx
-    $path =~ s|^/(\.\./)+|/|s;                     # /../../xx -> xx
-    $path =~ s|/\Z(?!\n)|| unless $path eq "/";          # xx/       -> xx
-    return $path;
-}
-
-=item catdir
-
-Concatenate two or more directory names to form a complete path ending
-with a directory. But remove the trailing slash from the resulting
-string, because it doesn't look good, isn't necessary and confuses
-OS2. Of course, if this is the root directory, don't cut off the
-trailing slash :-)
-
-=cut
-
-sub catdir {
-    my $self = shift;
-    my @args = @_;
-    foreach (@args) {
-	# append a slash to each argument unless it has one there
-	$_ .= "/" if $_ eq '' || substr($_,-1) ne "/";
-    }
-    return $self->canonpath(join('', @args));
-}
-
-=item catfile
-
-Concatenate one or more directory names and a filename to form a
-complete path ending with a filename
-
-=cut
-
-sub catfile {
-    my $self = shift;
-    my $file = pop @_;
-    return $file unless @_;
-    my $dir = $self->catdir(@_);
-    $dir .= "/" unless substr($dir,-1) eq "/";
-    return $dir.$file;
-}
-
-=item curdir
-
-Returns a string representation of the current directory.  "." on UNIX.
-
-=cut
-
-sub curdir {
-    return ".";
-}
-
-=item devnull
-
-Returns a string representation of the null device. "/dev/null" on UNIX.
-
-=cut
-
-sub devnull {
-    return "/dev/null";
-}
-
-=item rootdir
-
-Returns a string representation of the root directory.  "/" on UNIX.
-
-=cut
-
-sub rootdir {
-    return "/";
-}
-
-=item tmpdir
-
-Returns a string representation of the first writable directory
-from the following list or "" if none are writable:
-
-    $ENV{TMPDIR}
-    /tmp
-
-=cut
-
-my $tmpdir;
-sub tmpdir {
-    return $tmpdir if defined $tmpdir;
-    foreach ($ENV{TMPDIR}, "/tmp") {
-	next unless defined && -d && -w _;
-	$tmpdir = $_;
-	last;
-    }
-    $tmpdir = '' unless defined $tmpdir;
-    return $tmpdir;
-}
-
-=item updir
-
-Returns a string representation of the parent directory.  ".." on UNIX.
-
-=cut
-
-sub updir {
-    return "..";
-}
-
-=item no_upwards
-
-Given a list of file names, strip out those that refer to a parent
-directory. (Does not strip symlinks, only '.', '..', and equivalents.)
-
-=cut
-
-sub no_upwards {
-    my $self = shift;
-    return grep(!/^\.{1,2}\Z(?!\n)/s, @_);
-}
-
-=item case_tolerant
-
-Returns a true or false value indicating, respectively, that alphabetic
-is not or is significant when comparing file specifications.
-
-=cut
-
-sub case_tolerant {
-    return 0;
-}
-
-=item file_name_is_absolute
-
-Takes as argument a path and returns true if it is an absolute path.
-
-This does not consult the local filesystem on Unix, Win32, or OS/2.  It
-does sometimes on MacOS (see L<File::Spec::MacOS/file_name_is_absolute>).
-It does consult the working environment for VMS (see
-L<File::Spec::VMS/file_name_is_absolute>).
-
-=cut
-
-sub file_name_is_absolute {
-    my ($self,$file) = @_;
-    return scalar($file =~ m:^/:s);
-}
-
-=item path
-
-Takes no argument, returns the environment variable PATH as an array.
-
-=cut
-
-sub path {
-    my @path = split(':', $ENV{PATH});
-    foreach (@path) { $_ = '.' if $_ eq '' }
-    return @path;
-}
-
-=item join
-
-join is the same as catfile.
-
-=cut
-
-sub join {
-    my $self = shift;
-    return $self->catfile(@_);
-}
-
-=item splitpath
-
-    ($volume,$directories,$file) = File::Spec->splitpath( $path );
-    ($volume,$directories,$file) = File::Spec->splitpath( $path, $no_file );
-
-Splits a path in to volume, directory, and filename portions. On systems
-with no concept of volume, returns undef for volume. 
-
-For systems with no syntax differentiating filenames from directories, 
-assumes that the last file is a path unless $no_file is true or a 
-trailing separator or /. or /.. is present. On Unix this means that $no_file
-true makes this return ( '', $path, '' ).
-
-The directory portion may or may not be returned with a trailing '/'.
-
-The results can be passed to L</catpath()> to get back a path equivalent to
-(usually identical to) the original path.
-
-=cut
-
-sub splitpath {
-    my ($self,$path, $nofile) = @_;
-
-    my ($volume,$directory,$file) = ('','','');
-
-    if ( $nofile ) {
-        $directory = $path;
-    }
-    else {
-        $path =~ m|^ ( (?: .* / (?: \.\.?\Z(?!\n) )? )? ) ([^/]*) |xs;
-        $directory = $1;
-        $file      = $2;
-    }
-
-    return ($volume,$directory,$file);
-}
-
-
-=item splitdir
-
-The opposite of L</catdir()>.
-
-    @dirs = File::Spec->splitdir( $directories );
-
-$directories must be only the directory portion of the path on systems 
-that have the concept of a volume or that have path syntax that differentiates
-files from directories.
-
-Unlike just splitting the directories on the separator, empty
-directory names (C<''>) can be returned, because these are significant
-on some OSs (e.g. MacOS).
-
-On Unix,
-
-    File::Spec->splitdir( "/a/b//c/" );
-
-Yields:
-
-    ( '', 'a', 'b', '', 'c', '' )
-
-=cut
-
-sub splitdir {
-    my ($self,$directories) = @_ ;
-    #
-    # split() likes to forget about trailing null fields, so here we
-    # check to be sure that there will not be any before handling the
-    # simple case.
-    #
-    if ( $directories !~ m|/\Z(?!\n)| ) {
-        return split( m|/|, $directories );
-    }
-    else {
-        #
-        # since there was a trailing separator, add a file name to the end, 
-        # then do the split, then replace it with ''.
-        #
-        my( @directories )= split( m|/|, "${directories}dummy" ) ;
-        $directories[ $#directories ]= '' ;
-        return @directories ;
-    }
-}
-
-
-=item catpath
-
-Takes volume, directory and file portions and returns an entire path. Under
-Unix, $volume is ignored, and directory and file are catenated.  A '/' is
-inserted if need be.  On other OSs, $volume is significant.
-
-=cut
-
-sub catpath {
-    my ($self,$volume,$directory,$file) = @_;
-
-    if ( $directory ne ''                && 
-         $file ne ''                     && 
-         substr( $directory, -1 ) ne '/' && 
-         substr( $file, 0, 1 ) ne '/' 
-    ) {
-        $directory .= "/$file" ;
-    }
-    else {
-        $directory .= $file ;
-    }
-
-    return $directory ;
-}
-
-=item abs2rel
-
-Takes a destination path and an optional base path returns a relative path
-from the base path to the destination path:
-
-    $rel_path = File::Spec->abs2rel( $path ) ;
-    $rel_path = File::Spec->abs2rel( $path, $base ) ;
-
-If $base is not present or '', then L<cwd()> is used. If $base is relative, 
-then it is converted to absolute form using L</rel2abs()>. This means that it
-is taken to be relative to L<cwd()>.
-
-On systems with the concept of a volume, this assumes that both paths 
-are on the $destination volume, and ignores the $base volume. 
-
-On systems that have a grammar that indicates filenames, this ignores the 
-$base filename as well. Otherwise all path components are assumed to be
-directories.
-
-If $path is relative, it is converted to absolute form using L</rel2abs()>.
-This means that it is taken to be relative to L<cwd()>.
-
-No checks against the filesystem are made on most systems.  On MacOS,
-the filesystem may be consulted (see
-L<File::Spec::MacOS/file_name_is_absolute>).  On VMS, there is
-interaction with the working environment, as logicals and
-macros are expanded.
-
-Based on code written by Shigio Yamaguchi.
-
-=cut
-
-sub abs2rel {
-    my($self,$path,$base) = @_;
-
-    # Clean up $path
-    if ( ! $self->file_name_is_absolute( $path ) ) {
-        $path = $self->rel2abs( $path ) ;
-    }
-    else {
-        $path = $self->canonpath( $path ) ;
-    }
-
-    # Figure out the effective $base and clean it up.
-    if ( !defined( $base ) || $base eq '' ) {
-        $base = cwd() ;
-    }
-    elsif ( ! $self->file_name_is_absolute( $base ) ) {
-        $base = $self->rel2abs( $base ) ;
-    }
-    else {
-        $base = $self->canonpath( $base ) ;
-    }
-
-    # Now, remove all leading components that are the same
-    my @pathchunks = $self->splitdir( $path);
-    my @basechunks = $self->splitdir( $base);
-
-    while (@pathchunks && @basechunks && $pathchunks[0] eq $basechunks[0]) {
-        shift @pathchunks ;
-        shift @basechunks ;
-    }
-
-    $path = CORE::join( '/', @pathchunks );
-    $base = CORE::join( '/', @basechunks );
-
-    # $base now contains the directories the resulting relative path 
-    # must ascend out of before it can descend to $path_directory.  So, 
-    # replace all names with $parentDir
-    $base =~ s|[^/]+|..|g ;
-
-    # Glue the two together, using a separator if necessary, and preventing an
-    # empty result.
-    if ( $path ne '' && $base ne '' ) {
-        $path = "$base/$path" ;
-    } else {
-        $path = "$base$path" ;
-    }
-
-    return $self->canonpath( $path ) ;
-}
-
-=item rel2abs
-
-Converts a relative path to an absolute path. 
-
-    $abs_path = File::Spec->rel2abs( $path ) ;
-    $abs_path = File::Spec->rel2abs( $path, $base ) ;
-
-If $base is not present or '', then L<cwd()> is used. If $base is relative, 
-then it is converted to absolute form using L</rel2abs()>. This means that it
-is taken to be relative to L<cwd()>.
-
-On systems with the concept of a volume, this assumes that both paths 
-are on the $base volume, and ignores the $path volume. 
-
-On systems that have a grammar that indicates filenames, this ignores the 
-$base filename as well. Otherwise all path components are assumed to be
-directories.
-
-If $path is absolute, it is cleaned up and returned using L</canonpath()>.
-
-No checks against the filesystem are made on most systems.  On MacOS,
-the filesystem may be consulted (see
-L<File::Spec::MacOS/file_name_is_absolute>).  On VMS, there is
-interaction with the working environment, as logicals and
-macros are expanded.
-
-Based on code written by Shigio Yamaguchi.
-
-=cut
-
-sub rel2abs {
-    my ($self,$path,$base ) = @_;
-
-    # Clean up $path
-    if ( ! $self->file_name_is_absolute( $path ) ) {
-        # Figure out the effective $base and clean it up.
-        if ( !defined( $base ) || $base eq '' ) {
-            $base = cwd() ;
-        }
-        elsif ( ! $self->file_name_is_absolute( $base ) ) {
-            $base = $self->rel2abs( $base ) ;
-        }
-        else {
-            $base = $self->canonpath( $base ) ;
-        }
-
-        # Glom them together
-        $path = $self->catdir( $base, $path ) ;
-    }
-
-    return $self->canonpath( $path ) ;
-}
-
-
-=back
-
-=head1 SEE ALSO
-
-L<File::Spec>
-
-=cut
-
-1;
diff --git a/contrib/perl5/lib/File/Spec/VMS.pm b/contrib/perl5/lib/File/Spec/VMS.pm
deleted file mode 100644
index 60b0ec8..0000000
--- a/contrib/perl5/lib/File/Spec/VMS.pm
+++ /dev/null
@@ -1,505 +0,0 @@
-package File::Spec::VMS;
-
-use strict;
-use vars qw(@ISA $VERSION);
-require File::Spec::Unix;
-
-$VERSION = '1.1';
-
-@ISA = qw(File::Spec::Unix);
-
-use Cwd;
-use File::Basename;
-use VMS::Filespec;
-
-=head1 NAME
-
-File::Spec::VMS - methods for VMS file specs
-
-=head1 SYNOPSIS
-
- require File::Spec::VMS; # Done internally by File::Spec if needed
-
-=head1 DESCRIPTION
-
-See File::Spec::Unix for a documentation of the methods provided
-there. This package overrides the implementation of these methods, not
-the semantics.
-
-=over
-
-=item eliminate_macros
-
-Expands MM[KS]/Make macros in a text string, using the contents of
-identically named elements of C<%$self>, and returns the result
-as a file specification in Unix syntax.
-
-=cut
-
-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);
-
-    # perform m##g in scalar context so it acts as an iterator
-    while ($npath =~ m#(.*?)\$\((\S+?)\)(.*)#gs) { 
-        if ($self->{$2}) {
-            ($head,$macro,$tail) = ($1,$2,$3);
-            if (ref $self->{$macro}) {
-                if (ref $self->{$macro} eq 'ARRAY') {
-                    $macro = join ' ', @{$self->{$macro}};
-                }
-                else {
-                    print "Note: can't expand macro \$($macro) containing ",ref($self->{$macro}),
-                          "\n\t(using MMK-specific deferred substitutuon; MMS will break)\n";
-                    $macro = "\cB$macro\cB";
-                    $complex = 1;
-                }
-            }
-            else { ($macro = unixify($self->{$macro})) =~ s#/\Z(?!\n)##; }
-            $npath = "$head$macro$tail";
-        }
-    }
-    if ($complex) { $npath =~ s#\cB(.*?)\cB#\${$1}#gs; }
-    $npath;
-}
-
-=item fixpath
-
-Catchall routine to clean up problem MM[SK]/Make macros.  Expands macros
-in any directory specification, in order to avoid juxtaposing two
-VMS-syntax directories when MM[SK] is run.  Also expands expressions which
-are all macro, so that we can tell how long the expansion is, and avoid
-overrunning DCL's command buffer when MM[KS] is running.
-
-If optional second argument has a TRUE value, then the return string is
-a VMS-syntax directory specification, if it is FALSE, the return string
-is a VMS-syntax file specification, and if it is not specified, fixpath()
-checks to see whether it matches the name of a directory in the current
-default directory, and returns a directory or file specification accordingly.
-
-=cut
-
-sub fixpath {
-    my($self,$path,$force_path) = @_;
-    return '' unless $path;
-    $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));
-        }
-        else {
-            $fixedpath = vmsify($self->eliminate_macros($path));
-        }
-    }
-    elsif ((($prefix,$name) = ($path =~ m#^\$\(([^\)]+)\)(.+)#s)) && $self->{$prefix}) {
-        my($vmspre) = $self->eliminate_macros("\$($prefix)");
-        # is it a dir or just a name?
-        $vmspre = ($vmspre =~ m|/| or $prefix =~ /DIR\Z(?!\n)/) ? vmspath($vmspre) : '';
-        $fixedpath = ($vmspre ? $vmspre : $self->{$prefix}) . $name;
-        $fixedpath = vmspath($fixedpath) if $force_path;
-    }
-    else {
-        $fixedpath = $path;
-        $fixedpath = vmspath($fixedpath) if $force_path;
-    }
-    # No hints, so we try to guess
-    if (!defined($force_path) and $fixedpath !~ /[:>(.\]]/) {
-        $fixedpath = vmspath($fixedpath) if -d $fixedpath;
-    }
-
-    # Trim off root dirname if it's had other dirs inserted in front of it.
-    $fixedpath =~ s/\.000000([\]>])/$1/;
-    # Special case for VMS absolute directory specs: these will have had device
-    # prepended during trip through Unix syntax in eliminate_macros(), since
-    # Unix syntax has no way to express "absolute from the top of this device's
-    # directory tree".
-    if ($path =~ /^[\[>][^.\-]/) { $fixedpath =~ s/^[^\[<]+//; }
-    $fixedpath;
-}
-
-=back
-
-=head2 Methods always loaded
-
-=over
-
-=item canonpath (override)
-
-Removes redundant portions of file specifications according to VMS syntax.
-
-=cut
-
-sub canonpath {
-    my($self,$path) = @_;
-
-    if ($path =~ m|/|) { # Fake Unix
-      my $pathify = $path =~ m|/\Z(?!\n)|;
-      $path = $self->SUPER::canonpath($path);
-      if ($pathify) { return vmspath($path); }
-      else          { return vmsify($path);  }
-    }
-    else {
-      $path =~ s-\]\[--g;  $path =~ s/><//g;            # foo.][bar       ==> foo.bar
-      $path =~ s/([\[<])000000\./$1/;                   # [000000.foo     ==> foo
-      1 while $path =~ s{([\[<-])\.-}{$1-};             # [.-.-           ==> [--
-      $path =~ s/\.[^\[<\.]+\.-([\]\>])/$1/;            # bar.foo.-]      ==> bar]
-      $path =~ s/([\[<])(-+)/$1 . "\cx" x length($2)/e; # encode leading '-'s
-      $path =~ s/([\[<\.])([^\[<\.\cx]+)\.-\.?/$1/g;    # bar.-.foo       ==> foo
-      $path =~ s/([\[<])(\cx+)/$1 . '-' x length($2)/e; # then decode
-      return $path;
-    }
-}
-
-=item catdir
-
-Concatenates a list of file specifications, and returns the result as a
-VMS-syntax directory specification.  No check is made for "impossible"
-cases (e.g. elements other than the first being absolute filespecs).
-
-=cut
-
-sub catdir {
-    my ($self,@dirs) = @_;
-    my $dir = pop @dirs;
-    @dirs = grep($_,@dirs);
-    my $rslt;
-    if (@dirs) {
-	my $path = (@dirs == 1 ? $dirs[0] : $self->catdir(@dirs));
-	my ($spath,$sdir) = ($path,$dir);
-	$spath =~ s/\.dir\Z(?!\n)//; $sdir =~ s/\.dir\Z(?!\n)//; 
-	$sdir = $self->eliminate_macros($sdir) unless $sdir =~ /^[\w\-]+\Z(?!\n)/s;
-	$rslt = $self->fixpath($self->eliminate_macros($spath)."/$sdir",1);
-
-	# Special case for VMS absolute directory specs: these will have had device
-	# prepended during trip through Unix syntax in eliminate_macros(), since
-	# Unix syntax has no way to express "absolute from the top of this device's
-	# directory tree".
-	if ($spath =~ /^[\[<][^.\-]/s) { $rslt =~ s/^[^\[<]+//s; }
-    }
-    else {
-	if    (not defined $dir or not length $dir) { $rslt = ''; }
-	elsif ($dir =~ /^\$\([^\)]+\)\Z(?!\n)/s)          { $rslt = $dir; }
-	else                                        { $rslt = vmspath($dir); }
-    }
-    return $self->canonpath($rslt);
-}
-
-=item catfile
-
-Concatenates a list of file specifications, and returns the result as a
-VMS-syntax file specification.
-
-=cut
-
-sub catfile {
-    my ($self,@files) = @_;
-    my $file = pop @files;
-    @files = grep($_,@files);
-    my $rslt;
-    if (@files) {
-	my $path = (@files == 1 ? $files[0] : $self->catdir(@files));
-	my $spath = $path;
-	$spath =~ s/\.dir\Z(?!\n)//;
-	if ($spath =~ /^[^\)\]\/:>]+\)\Z(?!\n)/s && basename($file) eq $file) {
-	    $rslt = "$spath$file";
-	}
-	else {
-	    $rslt = $self->eliminate_macros($spath);
-	    $rslt = vmsify($rslt.($rslt ? '/' : '').unixify($file));
-	}
-    }
-    else { $rslt = (defined($file) && length($file)) ? vmsify($file) : ''; }
-    return $self->canonpath($rslt);
-}
-
-
-=item curdir (override)
-
-Returns a string representation of the current directory: '[]'
-
-=cut
-
-sub curdir {
-    return '[]';
-}
-
-=item devnull (override)
-
-Returns a string representation of the null device: '_NLA0:'
-
-=cut
-
-sub devnull {
-    return "_NLA0:";
-}
-
-=item rootdir (override)
-
-Returns a string representation of the root directory: 'SYS$DISK:[000000]'
-
-=cut
-
-sub rootdir {
-    return 'SYS$DISK:[000000]';
-}
-
-=item tmpdir (override)
-
-Returns a string representation of the first writable directory
-from the following list or '' if none are writable:
-
-    sys$scratch:
-    $ENV{TMPDIR}
-
-=cut
-
-my $tmpdir;
-sub tmpdir {
-    return $tmpdir if defined $tmpdir;
-    foreach ('sys$scratch:', $ENV{TMPDIR}) {
-	next unless defined && -d && -w _;
-	$tmpdir = $_;
-	last;
-    }
-    $tmpdir = '' unless defined $tmpdir;
-    return $tmpdir;
-}
-
-=item updir (override)
-
-Returns a string representation of the parent directory: '[-]'
-
-=cut
-
-sub updir {
-    return '[-]';
-}
-
-=item case_tolerant (override)
-
-VMS file specification syntax is case-tolerant.
-
-=cut
-
-sub case_tolerant {
-    return 1;
-}
-
-=item path (override)
-
-Translate logical name DCL$PATH as a searchlist, rather than trying
-to C<split> string value of C<$ENV{'PATH'}>.
-
-=cut
-
-sub path {
-    my (@dirs,$dir,$i);
-    while ($dir = $ENV{'DCL$PATH;' . $i++}) { push(@dirs,$dir); }
-    return @dirs;
-}
-
-=item file_name_is_absolute (override)
-
-Checks for VMS directory spec as well as Unix separators.
-
-=cut
-
-sub file_name_is_absolute {
-    my ($self,$file) = @_;
-    # If it's a logical name, expand it.
-    $file = $ENV{$file} while $file =~ /^[\w\$\-]+\Z(?!\n)/s && $ENV{$file};
-    return scalar($file =~ m!^/!s             ||
-		  $file =~ m![<\[][^.\-\]>]!  ||
-		  $file =~ /:[^<\[]/);
-}
-
-=item splitpath (override)
-
-Splits using VMS syntax.
-
-=cut
-
-sub splitpath {
-    my($self,$path) = @_;
-    my($dev,$dir,$file) = ('','','');
-
-    vmsify($path) =~ /(.+:)?([\[<].*[\]>])?(.*)/s;
-    return ($1 || '',$2 || '',$3);
-}
-
-=item splitdir (override)
-
-Split dirspec using VMS syntax.
-
-=cut
-
-sub splitdir {
-    my($self,$dirspec) = @_;
-    $dirspec =~ s/\]\[//g;  $dirspec =~ s/\-\-/-.-/g;
-    $dirspec = "[$dirspec]" unless $dirspec =~ /[\[<]/; # make legal
-    my(@dirs) = split('\.', vmspath($dirspec));
-    $dirs[0] =~ s/^[\[<]//s;  $dirs[-1] =~ s/[\]>]\Z(?!\n)//s;
-    @dirs;
-}
-
-
-=item catpath (override)
-
-Construct a complete filespec using VMS syntax
-
-=cut
-
-sub catpath {
-    my($self,$dev,$dir,$file) = @_;
-    if ($dev =~ m|^/+([^/]+)|) { $dev = "$1:"; }
-    else { $dev .= ':' unless $dev eq '' or $dev =~ /:\Z(?!\n)/; }
-    if (length($dev) or length($dir)) {
-      $dir = "[$dir]" unless $dir =~ /[\[<\/]/;
-      $dir = vmspath($dir);
-    }
-    "$dev$dir$file";
-}
-
-=item abs2rel (override)
-
-Use VMS syntax when converting filespecs.
-
-=cut
-
-sub abs2rel {
-    my $self = shift;
-
-    return vmspath(File::Spec::Unix::abs2rel( $self, @_ ))
-        if ( join( '', @_ ) =~ m{/} ) ;
-
-    my($path,$base) = @_;
-
-    # Note: we use '/' to glue things together here, then let canonpath()
-    # clean them up at the end.
-
-    # Clean up $path
-    if ( ! $self->file_name_is_absolute( $path ) ) {
-        $path = $self->rel2abs( $path ) ;
-    }
-    else {
-        $path = $self->canonpath( $path ) ;
-    }
-
-    # Figure out the effective $base and clean it up.
-    if ( !defined( $base ) || $base eq '' ) {
-        $base = cwd() ;
-    }
-    elsif ( ! $self->file_name_is_absolute( $base ) ) {
-        $base = $self->rel2abs( $base ) ;
-    }
-    else {
-        $base = $self->canonpath( $base ) ;
-    }
-
-    # Split up paths
-    my ( $path_directories, $path_file ) =
-        ($self->splitpath( $path, 1 ))[1,2] ;
-
-    $path_directories = $1
-        if $path_directories =~ /^\[(.*)\]\Z(?!\n)/s ;
-
-    my $base_directories = ($self->splitpath( $base, 1 ))[1] ;
-
-    $base_directories = $1
-        if $base_directories =~ /^\[(.*)\]\Z(?!\n)/s ;
-
-    # Now, remove all leading components that are the same
-    my @pathchunks = $self->splitdir( $path_directories );
-    my @basechunks = $self->splitdir( $base_directories );
-
-    while ( @pathchunks && 
-            @basechunks && 
-            lc( $pathchunks[0] ) eq lc( $basechunks[0] ) 
-          ) {
-        shift @pathchunks ;
-        shift @basechunks ;
-    }
-
-    # @basechunks now contains the directories to climb out of,
-    # @pathchunks now has the directories to descend in to.
-    $path_directories = '-.' x @basechunks . join( '.', @pathchunks ) ;
-    $path_directories =~ s{\.\Z(?!\n)}{} ;
-    return $self->canonpath( $self->catpath( '', $path_directories, $path_file ) ) ;
-}
-
-
-=item rel2abs (override)
-
-Use VMS syntax when converting filespecs.
-
-=cut
-
-sub rel2abs {
-    my $self = shift ;
-    return vmspath(File::Spec::Unix::rel2abs( $self, @_ ))
-        if ( join( '', @_ ) =~ m{/} ) ;
-
-    my ($path,$base ) = @_;
-    # Clean up and split up $path
-    if ( ! $self->file_name_is_absolute( $path ) ) {
-        # Figure out the effective $base and clean it up.
-        if ( !defined( $base ) || $base eq '' ) {
-            $base = cwd() ;
-        }
-        elsif ( ! $self->file_name_is_absolute( $base ) ) {
-            $base = $self->rel2abs( $base ) ;
-        }
-        else {
-            $base = $self->canonpath( $base ) ;
-        }
-
-        # Split up paths
-        my ( $path_directories, $path_file ) =
-            ($self->splitpath( $path ))[1,2] ;
-
-        my ( $base_volume, $base_directories ) =
-            $self->splitpath( $base ) ;
-
-        $path_directories = '' if $path_directories eq '[]' ||
-                                  $path_directories eq '<>';
-        my $sep = '' ;
-        $sep = '.'
-            if ( $base_directories =~ m{[^.\]>]\Z(?!\n)} &&
-                 $path_directories =~ m{^[^.\[<]}s
-            ) ;
-        $base_directories = "$base_directories$sep$path_directories";
-        $base_directories =~ s{\.?[\]>][\[<]\.?}{.};
-
-        $path = $self->catpath( $base_volume, $base_directories, $path_file );
-   }
-
-    return $self->canonpath( $path ) ;
-}
-
-
-=back
-
-=head1 SEE ALSO
-
-L<File::Spec>
-
-=cut
-
-1;
diff --git a/contrib/perl5/lib/File/Spec/Win32.pm b/contrib/perl5/lib/File/Spec/Win32.pm
deleted file mode 100644
index 3c01985..0000000
--- a/contrib/perl5/lib/File/Spec/Win32.pm
+++ /dev/null
@@ -1,355 +0,0 @@
-package File::Spec::Win32;
-
-use strict;
-use Cwd;
-use vars qw(@ISA $VERSION);
-require File::Spec::Unix;
-
-$VERSION = '1.2';
-
-@ISA = qw(File::Spec::Unix);
-
-=head1 NAME
-
-File::Spec::Win32 - methods for Win32 file specs
-
-=head1 SYNOPSIS
-
- require File::Spec::Win32; # Done internally by File::Spec if needed
-
-=head1 DESCRIPTION
-
-See File::Spec::Unix for a documentation of the methods provided
-there. This package overrides the implementation of these methods, not
-the semantics.
-
-=over
-
-=item devnull
-
-Returns a string representation of the null device.
-
-=cut
-
-sub devnull {
-    return "nul";
-}
-
-=item tmpdir
-
-Returns a string representation of the first existing directory
-from the following list:
-
-    $ENV{TMPDIR}
-    $ENV{TEMP}
-    $ENV{TMP}
-    C:/temp
-    /tmp
-    /
-
-=cut
-
-my $tmpdir;
-sub tmpdir {
-    return $tmpdir if defined $tmpdir;
-    my $self = shift;
-    foreach (@ENV{qw(TMPDIR TEMP TMP)}, qw(C:/temp /tmp /)) {
-	next unless defined && -d;
-	$tmpdir = $_;
-	last;
-    }
-    $tmpdir = '' unless defined $tmpdir;
-    $tmpdir = $self->canonpath($tmpdir);
-    return $tmpdir;
-}
-
-sub case_tolerant {
-    return 1;
-}
-
-sub file_name_is_absolute {
-    my ($self,$file) = @_;
-    return scalar($file =~ m{^([a-z]:)?[\\/]}is);
-}
-
-=item catfile
-
-Concatenate one or more directory names and a filename to form a
-complete path ending with a filename
-
-=cut
-
-sub catfile {
-    my $self = shift;
-    my $file = pop @_;
-    return $file unless @_;
-    my $dir = $self->catdir(@_);
-    $dir .= "\\" unless substr($dir,-1) eq "\\";
-    return $dir.$file;
-}
-
-sub path {
-    my $path = $ENV{'PATH'} || $ENV{'Path'} || $ENV{'path'};
-    my @path = split(';',$path);
-    foreach (@path) { $_ = '.' if $_ eq '' }
-    return @path;
-}
-
-=item canonpath
-
-No physical check on the filesystem, but a logical cleanup of a
-path. On UNIX eliminated successive slashes and successive "/.".
-
-=cut
-
-sub canonpath {
-    my ($self,$path) = @_;
-    $path =~ s/^([a-z]:)/\u$1/s;
-    $path =~ s|/|\\|g;
-    $path =~ s|([^\\])\\+|$1\\|g;                  # xx////xx  -> xx/xx
-    $path =~ s|(\\\.)+\\|\\|g;                     # xx/././xx -> xx/xx
-    $path =~ s|^(\.\\)+||s unless $path eq ".\\";  # ./xx      -> xx
-    $path =~ s|\\\Z(?!\n)||
-             unless $path =~ m#^([A-Z]:)?\\\Z(?!\n)#s;   # xx/       -> xx
-    return $path;
-}
-
-=item splitpath
-
-    ($volume,$directories,$file) = File::Spec->splitpath( $path );
-    ($volume,$directories,$file) = File::Spec->splitpath( $path, $no_file );
-
-Splits a path in to volume, directory, and filename portions. Assumes that 
-the last file is a path unless the path ends in '\\', '\\.', '\\..'
-or $no_file is true.  On Win32 this means that $no_file true makes this return 
-( $volume, $path, undef ).
-
-Separators accepted are \ and /.
-
-Volumes can be drive letters or UNC sharenames (\\server\share).
-
-The results can be passed to L</catpath> to get back a path equivalent to
-(usually identical to) the original path.
-
-=cut
-
-sub splitpath {
-    my ($self,$path, $nofile) = @_;
-    my ($volume,$directory,$file) = ('','','');
-    if ( $nofile ) {
-        $path =~ 
-            m{^( (?:[a-zA-Z]:|(?:\\\\|//)[^\\/]+[\\/][^\\/]+)? ) 
-                 (.*)
-             }xs;
-        $volume    = $1;
-        $directory = $2;
-    }
-    else {
-        $path =~ 
-            m{^ ( (?: [a-zA-Z]: |
-                      (?:\\\\|//)[^\\/]+[\\/][^\\/]+
-                  )?
-                )
-                ( (?:.*[\\\\/](?:\.\.?\Z(?!\n))?)? )
-                (.*)
-             }xs;
-        $volume    = $1;
-        $directory = $2;
-        $file      = $3;
-    }
-
-    return ($volume,$directory,$file);
-}
-
-
-=item splitdir
-
-The opposite of L</catdir()>.
-
-    @dirs = File::Spec->splitdir( $directories );
-
-$directories must be only the directory portion of the path on systems 
-that have the concept of a volume or that have path syntax that differentiates
-files from directories.
-
-Unlike just splitting the directories on the separator, leading empty and 
-trailing directory entries can be returned, because these are significant
-on some OSs. So,
-
-    File::Spec->splitdir( "/a/b/c" );
-
-Yields:
-
-    ( '', 'a', 'b', '', 'c', '' )
-
-=cut
-
-sub splitdir {
-    my ($self,$directories) = @_ ;
-    #
-    # split() likes to forget about trailing null fields, so here we
-    # check to be sure that there will not be any before handling the
-    # simple case.
-    #
-    if ( $directories !~ m|[\\/]\Z(?!\n)| ) {
-        return split( m|[\\/]|, $directories );
-    }
-    else {
-        #
-        # since there was a trailing separator, add a file name to the end, 
-        # then do the split, then replace it with ''.
-        #
-        my( @directories )= split( m|[\\/]|, "${directories}dummy" ) ;
-        $directories[ $#directories ]= '' ;
-        return @directories ;
-    }
-}
-
-
-=item catpath
-
-Takes volume, directory and file portions and returns an entire path. Under
-Unix, $volume is ignored, and this is just like catfile(). On other OSs,
-the $volume become significant.
-
-=cut
-
-sub catpath {
-    my ($self,$volume,$directory,$file) = @_;
-
-    # If it's UNC, make sure the glue separator is there, reusing
-    # whatever separator is first in the $volume
-    $volume .= $1
-        if ( $volume =~ m@^([\\/])[\\/][^\\/]+[\\/][^\\/]+\Z(?!\n)@s &&
-             $directory =~ m@^[^\\/]@s
-           ) ;
-
-    $volume .= $directory ;
-
-    # If the volume is not just A:, make sure the glue separator is 
-    # there, reusing whatever separator is first in the $volume if possible.
-    if ( $volume !~ m@^[a-zA-Z]:\Z(?!\n)@s &&
-         $volume =~ m@[^\\/]\Z(?!\n)@      &&
-         $file   =~ m@[^\\/]@
-       ) {
-        $volume =~ m@([\\/])@ ;
-        my $sep = $1 ? $1 : '\\' ;
-        $volume .= $sep ;
-    }
-
-    $volume .= $file ;
-
-    return $volume ;
-}
-
-
-sub abs2rel {
-    my($self,$path,$base) = @_;
-
-    # Clean up $path
-    if ( ! $self->file_name_is_absolute( $path ) ) {
-        $path = $self->rel2abs( $path ) ;
-    }
-    else {
-        $path = $self->canonpath( $path ) ;
-    }
-
-    # Figure out the effective $base and clean it up.
-    if ( ! $self->file_name_is_absolute( $base ) ) {
-        $base = $self->rel2abs( $base ) ;
-    }
-    elsif ( !defined( $base ) || $base eq '' ) {
-        $base = cwd() ;
-    }
-    else {
-        $base = $self->canonpath( $base ) ;
-    }
-
-    # Split up paths
-    my ( $path_volume, $path_directories, $path_file ) =
-        $self->splitpath( $path, 1 ) ;
-
-    my $base_directories = ($self->splitpath( $base, 1 ))[1] ;
-
-    # Now, remove all leading components that are the same
-    my @pathchunks = $self->splitdir( $path_directories );
-    my @basechunks = $self->splitdir( $base_directories );
-
-    while ( @pathchunks && 
-            @basechunks && 
-            lc( $pathchunks[0] ) eq lc( $basechunks[0] ) 
-          ) {
-        shift @pathchunks ;
-        shift @basechunks ;
-    }
-
-    # No need to catdir, we know these are well formed.
-    $path_directories = CORE::join( '\\', @pathchunks );
-    $base_directories = CORE::join( '\\', @basechunks );
-
-    # $base_directories now contains the directories the resulting relative
-    # path must ascend out of before it can descend to $path_directory.  So, 
-    # replace all names with $parentDir
-
-    #FA Need to replace between backslashes...
-    $base_directories =~ s|[^\\]+|..|g ;
-
-    # Glue the two together, using a separator if necessary, and preventing an
-    # empty result.
-
-    #FA Must check that new directories are not empty.
-    if ( $path_directories ne '' && $base_directories ne '' ) {
-        $path_directories = "$base_directories\\$path_directories" ;
-    } else {
-        $path_directories = "$base_directories$path_directories" ;
-    }
-
-    # It makes no sense to add a relative path to a UNC volume
-    $path_volume = '' unless $path_volume =~ m{^[A-Z]:}is ;
-
-    return $self->canonpath( 
-        $self->catpath($path_volume, $path_directories, $path_file ) 
-    ) ;
-}
-
-
-sub rel2abs {
-    my ($self,$path,$base ) = @_;
-
-    if ( ! $self->file_name_is_absolute( $path ) ) {
-
-        if ( !defined( $base ) || $base eq '' ) {
-            $base = cwd() ;
-        }
-        elsif ( ! $self->file_name_is_absolute( $base ) ) {
-            $base = $self->rel2abs( $base ) ;
-        }
-        else {
-            $base = $self->canonpath( $base ) ;
-        }
-
-        my ( $path_directories, $path_file ) =
-            ($self->splitpath( $path, 1 ))[1,2] ;
-
-        my ( $base_volume, $base_directories ) =
-            $self->splitpath( $base, 1 ) ;
-
-        $path = $self->catpath( 
-            $base_volume, 
-            $self->catdir( $base_directories, $path_directories ), 
-            $path_file
-        ) ;
-    }
-
-    return $self->canonpath( $path ) ;
-}
-
-=back
-
-=head1 SEE ALSO
-
-L<File::Spec>
-
-=cut
-
-1;
diff --git a/contrib/perl5/lib/File/Temp.pm b/contrib/perl5/lib/File/Temp.pm
deleted file mode 100644
index b686682..0000000
--- a/contrib/perl5/lib/File/Temp.pm
+++ /dev/null
@@ -1,1863 +0,0 @@
-package File::Temp;
-
-=head1 NAME
-
-File::Temp - return name and handle of a temporary file safely
-
-=begin __INTERNALS
-
-=head1 PORTABILITY
-
-This module is designed to be portable across operating systems
-and it currently supports Unix, VMS, DOS, OS/2 and Windows. When
-porting to a new OS there are generally three main issues
-that have to be solved:
-
-=over 4
-
-=item *
-
-Can the OS unlink an open file? If it can not then the
-C<_can_unlink_opened_file> method should be modified.
-
-=item *
-
-Are the return values from C<stat> reliable? By default all the
-return values from C<stat> are compared when unlinking a temporary
-file using the filename and the handle. Operating systems other than
-unix do not always have valid entries in all fields. If C<unlink0> fails
-then the C<stat> comparison should be modified accordingly.
-
-=item *
-
-Security. Systems that can not support a test for the sticky bit
-on a directory can not use the MEDIUM and HIGH security tests.
-The C<_can_do_level> method should be modified accordingly.
-
-=back
-
-=end __INTERNALS
-
-=head1 SYNOPSIS
-
-  use File::Temp qw/ tempfile tempdir /; 
-
-  $dir = tempdir( CLEANUP => 1 );
-  ($fh, $filename) = tempfile( DIR => $dir );
-
-  ($fh, $filename) = tempfile( $template, DIR => $dir);
-  ($fh, $filename) = tempfile( $template, SUFFIX => '.dat');
-
-  $fh = tempfile();
-
-MkTemp family:
-
-  use File::Temp qw/ :mktemp  /;
-
-  ($fh, $file) = mkstemp( "tmpfileXXXXX" );
-  ($fh, $file) = mkstemps( "tmpfileXXXXXX", $suffix);
-
-  $tmpdir = mkdtemp( $template );
-
-  $unopened_file = mktemp( $template );
-
-POSIX functions:
-
-  use File::Temp qw/ :POSIX /;
-
-  $file = tmpnam();
-  $fh = tmpfile();
-
-  ($fh, $file) = tmpnam();
-  ($fh, $file) = tmpfile();
-
-
-Compatibility functions:
-
-  $unopened_file = File::Temp::tempnam( $dir, $pfx );
-
-=begin later
-
-Objects (NOT YET IMPLEMENTED):
-
-  require File::Temp;
-
-  $fh = new File::Temp($template);
-  $fname = $fh->filename;
-
-=end later
-
-=head1 DESCRIPTION
-
-C<File::Temp> can be used to create and open temporary files in a safe way.
-The tempfile() function can be used to return the name and the open
-filehandle of a temporary file.  The tempdir() function can 
-be used to create a temporary directory.
-
-The security aspect of temporary file creation is emphasized such that
-a filehandle and filename are returned together.  This helps guarantee
-that a race condition can not occur where the temporary file is
-created by another process between checking for the existence of the
-file and its opening.  Additional security levels are provided to
-check, for example, that the sticky bit is set on world writable
-directories.  See L<"safe_level"> for more information.
-
-For compatibility with popular C library functions, Perl implementations of
-the mkstemp() family of functions are provided. These are, mkstemp(),
-mkstemps(), mkdtemp() and mktemp().
-
-Additionally, implementations of the standard L<POSIX|POSIX>
-tmpnam() and tmpfile() functions are provided if required.
-
-Implementations of mktemp(), tmpnam(), and tempnam() are provided,
-but should be used with caution since they return only a filename
-that was valid when function was called, so cannot guarantee
-that the file will not exist by the time the caller opens the filename.
-
-=cut
-
-# 5.6.0 gives us S_IWOTH, S_IWGRP, our and auto-vivifying filehandls
-# People would like a version on 5.005 so give them what they want :-)
-use 5.005;
-use strict;
-use Carp;
-use File::Spec 0.8;
-use File::Path qw/ rmtree /;
-use Fcntl 1.03;
-use Errno;
-require VMS::Stdio if $^O eq 'VMS';
-
-# Need the Symbol package if we are running older perl
-require Symbol if $] < 5.006;
-
-
-# use 'our' on v5.6.0
-use vars qw($VERSION @EXPORT_OK %EXPORT_TAGS $DEBUG);
-
-$DEBUG = 0;
-
-# We are exporting functions
-
-use base qw/Exporter/;
-
-# Export list - to allow fine tuning of export table
-
-@EXPORT_OK = qw{
-	      tempfile
-	      tempdir
-	      tmpnam
-	      tmpfile
-	      mktemp
-	      mkstemp
-	      mkstemps
-	      mkdtemp
-	      unlink0
-		};
-
-# Groups of functions for export
-
-%EXPORT_TAGS = (
-		'POSIX' => [qw/ tmpnam tmpfile /],
-		'mktemp' => [qw/ mktemp mkstemp mkstemps mkdtemp/],
-	       );
-
-# add contents of these tags to @EXPORT
-Exporter::export_tags('POSIX','mktemp');
-
-# Version number 
-
-$VERSION = '0.12';
-
-# This is a list of characters that can be used in random filenames
-
-my @CHARS = (qw/ A B C D E F G H I J K L M N O P Q R S T U V W X Y Z
-	         a b c d e f g h i j k l m n o p q r s t u v w x y z
-	         0 1 2 3 4 5 6 7 8 9 _
-	     /);
-
-# Maximum number of tries to make a temp file before failing
-
-use constant MAX_TRIES => 10;
-
-# Minimum number of X characters that should be in a template
-use constant MINX => 4;
-
-# Default template when no template supplied
-
-use constant TEMPXXX => 'X' x 10;
-
-# Constants for the security level
-
-use constant STANDARD => 0;
-use constant MEDIUM   => 1;
-use constant HIGH     => 2;
-
-# OPENFLAGS. If we defined the flag to use with Sysopen here this gives
-# us an optimisation when many temporary files are requested
-
-my $OPENFLAGS = O_CREAT | O_EXCL | O_RDWR;
-
-for my $oflag (qw/ FOLLOW BINARY LARGEFILE EXLOCK NOINHERIT /) {
-  my ($bit, $func) = (0, "Fcntl::O_" . $oflag);
-  no strict 'refs';
-  $OPENFLAGS |= $bit if eval {
-    # Make sure that redefined die handlers do not cause problems
-    # eg CGI::Carp
-    local $SIG{__DIE__} = sub {};
-    local $SIG{__WARN__} = sub {};
-    $bit = &$func();
-    1;
-  };
-}
-
-# On some systems the O_TEMPORARY flag can be used to tell the OS
-# to automatically remove the file when it is closed. This is fine
-# in most cases but not if tempfile is called with UNLINK=>0 and
-# the filename is requested -- in the case where the filename is to
-# be passed to another routine. This happens on windows. We overcome
-# this by using a second open flags variable
-
-my $OPENTEMPFLAGS = $OPENFLAGS;
-for my $oflag (qw/ TEMPORARY /) {
-  my ($bit, $func) = (0, "Fcntl::O_" . $oflag);
-  no strict 'refs';
-  $OPENTEMPFLAGS |= $bit if eval {
-    # Make sure that redefined die handlers do not cause problems
-    # eg CGI::Carp
-    local $SIG{__DIE__} = sub {};
-    local $SIG{__WARN__} = sub {};
-    $bit = &$func();
-    1;
-  };
-}
-
-# INTERNAL ROUTINES - not to be used outside of package
-
-# Generic routine for getting a temporary filename
-# modelled on OpenBSD _gettemp() in mktemp.c
-
-# The template must contain X's that are to be replaced
-# with the random values
-
-#  Arguments:
-
-#  TEMPLATE   - string containing the XXXXX's that is converted
-#           to a random filename and opened if required
-
-# Optionally, a hash can also be supplied containing specific options
-#   "open" => if true open the temp file, else just return the name
-#             default is 0
-#   "mkdir"=> if true, we are creating a temp directory rather than tempfile
-#             default is 0
-#   "suffixlen" => number of characters at end of PATH to be ignored.
-#                  default is 0.
-#   "unlink_on_close" => indicates that, if possible,  the OS should remove
-#                        the file as soon as it is closed. Usually indicates
-#                        use of the O_TEMPORARY flag to sysopen. 
-#                        Usually irrelevant on unix
-
-# Optionally a reference to a scalar can be passed into the function
-# On error this will be used to store the reason for the error
-#   "ErrStr"  => \$errstr
-
-# "open" and "mkdir" can not both be true
-# "unlink_on_close" is not used when "mkdir" is true.
-
-# The default options are equivalent to mktemp().
-
-# Returns:
-#   filehandle - open file handle (if called with doopen=1, else undef)
-#   temp name  - name of the temp file or directory
-
-# For example:
-#   ($fh, $name) = _gettemp($template, "open" => 1);
-
-# for the current version, failures are associated with
-# stored in an error string and returned to give the reason whilst debugging
-# This routine is not called by any external function
-sub _gettemp {
-
-  croak 'Usage: ($fh, $name) = _gettemp($template, OPTIONS);'
-    unless scalar(@_) >= 1;
-
-  # the internal error string - expect it to be overridden
-  # Need this in case the caller decides not to supply us a value
-  # need an anonymous scalar
-  my $tempErrStr;
-
-  # Default options
-  my %options = (
-		 "open" => 0,
-		 "mkdir" => 0,
-		 "suffixlen" => 0,
-		 "unlink_on_close" => 0,
-		 "ErrStr" => \$tempErrStr,
-		);
-
-  # Read the template
-  my $template = shift;
-  if (ref($template)) {
-    # Use a warning here since we have not yet merged ErrStr
-    carp "File::Temp::_gettemp: template must not be a reference";
-    return ();
-  }
-
-  # Check that the number of entries on stack are even
-  if (scalar(@_) % 2 != 0) {
-    # Use a warning here since we have not yet merged ErrStr
-    carp "File::Temp::_gettemp: Must have even number of options";
-    return ();
-  }
-
-  # Read the options and merge with defaults
-  %options = (%options, @_)  if @_;
-
-  # Make sure the error string is set to undef
-  ${$options{ErrStr}} = undef;
-
-  # Can not open the file and make a directory in a single call
-  if ($options{"open"} && $options{"mkdir"}) {
-    ${$options{ErrStr}} = "doopen and domkdir can not both be true\n";
-    return ();
-  }
-
-  # Find the start of the end of the  Xs (position of last X)
-  # Substr starts from 0
-  my $start = length($template) - 1 - $options{"suffixlen"};
-
-  # Check that we have at least MINX x X (eg 'XXXX") at the end of the string
-  # (taking suffixlen into account). Any fewer is insecure.
-
-  # Do it using substr - no reason to use a pattern match since
-  # we know where we are looking and what we are looking for
-
-  if (substr($template, $start - MINX + 1, MINX) ne 'X' x MINX) {
-    ${$options{ErrStr}} = "The template must contain at least ".
-      MINX . " 'X' characters\n";
-    return ();
-  }
-
-  # Replace all the X at the end of the substring with a
-  # random character or just all the XX at the end of a full string.
-  # Do it as an if, since the suffix adjusts which section to replace
-  # and suffixlen=0 returns nothing if used in the substr directly
-  # and generate a full path from the template
-
-  my $path = _replace_XX($template, $options{"suffixlen"});
-
-
-  # Split the path into constituent parts - eventually we need to check
-  # whether the directory exists
-  # We need to know whether we are making a temp directory
-  # or a tempfile
-
-  my ($volume, $directories, $file);
-  my $parent; # parent directory
-  if ($options{"mkdir"}) {
-    # There is no filename at the end
-    ($volume, $directories, $file) = File::Spec->splitpath( $path, 1);
-
-    # The parent is then $directories without the last directory
-    # Split the directory and put it back together again
-    my @dirs = File::Spec->splitdir($directories);
-
-    # If @dirs only has one entry that means we are in the current
-    # directory
-    if ($#dirs == 0) {
-      $parent = File::Spec->curdir;
-    } else {
-
-      if ($^O eq 'VMS') {  # need volume to avoid relative dir spec
-        $parent = File::Spec->catdir($volume, @dirs[0..$#dirs-1]);
-        $parent = 'sys$disk:[]' if $parent eq '';
-      } else {
-
-	# Put it back together without the last one
-	$parent = File::Spec->catdir(@dirs[0..$#dirs-1]);
-
-	# ...and attach the volume (no filename)
-	$parent = File::Spec->catpath($volume, $parent, '');
-      }
-
-    }
-
-  } else {
-
-    # Get rid of the last filename (use File::Basename for this?)
-    ($volume, $directories, $file) = File::Spec->splitpath( $path );
-
-    # Join up without the file part
-    $parent = File::Spec->catpath($volume,$directories,'');
-
-    # If $parent is empty replace with curdir
-    $parent = File::Spec->curdir
-      unless $directories ne '';
-
-  }
-
-  # Check that the parent directories exist 
-  # Do this even for the case where we are simply returning a name
-  # not a file -- no point returning a name that includes a directory
-  # that does not exist or is not writable
-
-  unless (-d $parent) {
-    ${$options{ErrStr}} = "Parent directory ($parent) is not a directory";
-    return ();
-  }
-  unless (-w _) {
-    ${$options{ErrStr}} = "Parent directory ($parent) is not writable\n";
-      return ();
-  }
-
-
-  # Check the stickiness of the directory and chown giveaway if required
-  # If the directory is world writable the sticky bit
-  # must be set
-
-  if (File::Temp->safe_level == MEDIUM) {
-    my $safeerr;
-    unless (_is_safe($parent,\$safeerr)) {
-      ${$options{ErrStr}} = "Parent directory ($parent) is not safe ($safeerr)";
-      return ();
-    }
-  } elsif (File::Temp->safe_level == HIGH) {
-    my $safeerr;
-    unless (_is_verysafe($parent, \$safeerr)) {
-      ${$options{ErrStr}} = "Parent directory ($parent) is not safe ($safeerr)";
-      return ();
-    }
-  }
-
-
-  # Now try MAX_TRIES time to open the file
-  for (my $i = 0; $i < MAX_TRIES; $i++) {
-
-    # Try to open the file if requested
-    if ($options{"open"}) {
-      my $fh;
-
-      # If we are running before perl5.6.0 we can not auto-vivify
-      if ($] < 5.006) {
-	$fh = &Symbol::gensym;
-      }
-
-      # Try to make sure this will be marked close-on-exec
-      # XXX: Win32 doesn't respect this, nor the proper fcntl,
-      #      but may have O_NOINHERIT. This may or may not be in Fcntl.
-      local $^F = 2;
-
-      # Store callers umask
-      my $umask = umask();
-
-      # Set a known umask
-      umask(066);
-
-      # Attempt to open the file
-      my $open_success = undef;
-      if ( $^O eq 'VMS' and $options{"unlink_on_close"} ) {
-        # make it auto delete on close by setting FAB$V_DLT bit
-	$fh = VMS::Stdio::vmssysopen($path, $OPENFLAGS, 0600, 'fop=dlt');
-	$open_success = $fh;
-      } else {
-	my $flags = ( $options{"unlink_on_close"} ?
-		      $OPENTEMPFLAGS :
-		      $OPENFLAGS );
-	$open_success = sysopen($fh, $path, $flags, 0600);
-      }
-      if ( $open_success ) {
-
-	# Reset umask
-	umask($umask);
-	
-	# Opened successfully - return file handle and name
-	return ($fh, $path);
-
-      } else {
-	# Reset umask
-	umask($umask);
-
-	# Error opening file - abort with error
-	# if the reason was anything but EEXIST
-	unless ($!{EEXIST}) {
-	  ${$options{ErrStr}} = "Could not create temp file $path: $!";
-	  return ();
-	}
-
-	# Loop round for another try
-	
-      }
-    } elsif ($options{"mkdir"}) {
-
-      # Store callers umask
-      my $umask = umask();
-
-      # Set a known umask
-      umask(066);
-
-      # Open the temp directory
-      if (mkdir( $path, 0700)) {
-	# created okay
-	# Reset umask
-	umask($umask);
-
-	return undef, $path;
-      } else {
-
-	# Reset umask
-	umask($umask);
-
-	# Abort with error if the reason for failure was anything
-	# except EEXIST
-	unless ($!{EEXIST}) {
-	  ${$options{ErrStr}} = "Could not create directory $path: $!";
-	  return ();
-	}
-
-	# Loop round for another try
-
-      }
-
-    } else {
-
-      # Return true if the file can not be found
-      # Directory has been checked previously
-
-      return (undef, $path) unless -e $path;
-
-      # Try again until MAX_TRIES
-
-    }
-
-    # Did not successfully open the tempfile/dir
-    # so try again with a different set of random letters
-    # No point in trying to increment unless we have only
-    # 1 X say and the randomness could come up with the same
-    # file MAX_TRIES in a row.
-
-    # Store current attempt - in principal this implies that the
-    # 3rd time around the open attempt that the first temp file
-    # name could be generated again. Probably should store each
-    # attempt and make sure that none are repeated
-
-    my $original = $path;
-    my $counter = 0;  # Stop infinite loop
-    my $MAX_GUESS = 50;
-
-    do {
-
-      # Generate new name from original template
-      $path = _replace_XX($template, $options{"suffixlen"});
-
-      $counter++;
-
-    } until ($path ne $original || $counter > $MAX_GUESS);
-
-    # Check for out of control looping
-    if ($counter > $MAX_GUESS) {
-      ${$options{ErrStr}} = "Tried to get a new temp name different to the previous value $MAX_GUESS times.\nSomething wrong with template?? ($template)";
-      return ();
-    }
-
-  }
-
-  # If we get here, we have run out of tries
-  ${ $options{ErrStr} } = "Have exceeded the maximum number of attempts ("
-    . MAX_TRIES . ") to open temp file/dir";
-
-  return ();
-
-}
-
-# Internal routine to return a random character from the
-# character list. Does not do an srand() since rand()
-# will do one automatically
-
-# No arguments. Return value is the random character
-
-# No longer called since _replace_XX runs a few percent faster if
-# I inline the code. This is important if we are creating thousands of
-# temporary files.
-
-sub _randchar {
-
-  $CHARS[ int( rand( $#CHARS ) ) ];
-
-}
-
-# Internal routine to replace the XXXX... with random characters
-# This has to be done by _gettemp() every time it fails to 
-# open a temp file/dir
-
-# Arguments:  $template (the template with XXX), 
-#             $ignore   (number of characters at end to ignore)
-
-# Returns:    modified template
-
-sub _replace_XX {
-
-  croak 'Usage: _replace_XX($template, $ignore)'
-    unless scalar(@_) == 2;
-
-  my ($path, $ignore) = @_;
-
-  # Do it as an if, since the suffix adjusts which section to replace
-  # and suffixlen=0 returns nothing if used in the substr directly
-  # Alternatively, could simply set $ignore to length($path)-1
-  # Don't want to always use substr when not required though.
-
-  if ($ignore) {
-    substr($path, 0, - $ignore) =~ s/X(?=X*\z)/$CHARS[ int( rand( $#CHARS ) ) ]/ge;
-  } else {
-    $path =~ s/X(?=X*\z)/$CHARS[ int( rand( $#CHARS ) ) ]/ge;
-  }
-
-  return $path;
-}
-
-# internal routine to check to see if the directory is safe
-# First checks to see if the directory is not owned by the
-# current user or root. Then checks to see if anyone else
-# can write to the directory and if so, checks to see if
-# it has the sticky bit set
-
-# Will not work on systems that do not support sticky bit
-
-#Args:  directory path to check
-#       Optionally: reference to scalar to contain error message
-# Returns true if the path is safe and false otherwise.
-# Returns undef if can not even run stat() on the path
-
-# This routine based on version written by Tom Christiansen
-
-# Presumably, by the time we actually attempt to create the
-# file or directory in this directory, it may not be safe
-# anymore... Have to run _is_safe directly after the open.
-
-sub _is_safe {
-
-  my $path = shift;
-  my $err_ref = shift;
-
-  # Stat path
-  my @info = stat($path);
-  unless (scalar(@info)) {
-    $$err_ref = "stat(path) returned no values";
-    return 0;
-  };
-  return 1 if $^O eq 'VMS';  # owner delete control at file level
-
-  # Check to see whether owner is neither superuser (or a system uid) nor me
-  # Use the real uid from the $< variable
-  # UID is in [4]
-  if ($info[4] > File::Temp->top_system_uid() && $info[4] != $<) {
-
-    Carp::cluck(sprintf "uid=$info[4] topuid=%s \$<=$< path='$path'",
-		File::Temp->top_system_uid());
-
-    $$err_ref = "Directory owned neither by root nor the current user"
-      if ref($err_ref);
-    return 0;
-  }
-
-  # check whether group or other can write file
-  # use 066 to detect either reading or writing
-  # use 022 to check writability
-  # Do it with S_IWOTH and S_IWGRP for portability (maybe)
-  # mode is in info[2]
-  if (($info[2] & &Fcntl::S_IWGRP) ||   # Is group writable?
-      ($info[2] & &Fcntl::S_IWOTH) ) {  # Is world writable?
-    # Must be a directory
-    unless (-d _) {
-      $$err_ref = "Path ($path) is not a directory"
-      if ref($err_ref);
-      return 0;
-    }
-    # Must have sticky bit set
-    unless (-k _) {
-      $$err_ref = "Sticky bit not set on $path when dir is group|world writable"
-	if ref($err_ref);
-      return 0;
-    }
-  }
-
-  return 1;
-}
-
-# Internal routine to check whether a directory is safe
-# for temp files. Safer than _is_safe since it checks for 
-# the possibility of chown giveaway and if that is a possibility
-# checks each directory in the path to see if it is safe (with _is_safe)
-
-# If _PC_CHOWN_RESTRICTED is not set, does the full test of each
-# directory anyway.
-
-# Takes optional second arg as scalar ref to error reason
-
-sub _is_verysafe {
-
-  # Need POSIX - but only want to bother if really necessary due to overhead
-  require POSIX;
-
-  my $path = shift;
-  print "_is_verysafe testing $path\n" if $DEBUG;
-  return 1 if $^O eq 'VMS';  # owner delete control at file level
-
-  my $err_ref = shift;
-
-  # Should Get the value of _PC_CHOWN_RESTRICTED if it is defined
-  # and If it is not there do the extensive test
-  my $chown_restricted;
-  $chown_restricted = &POSIX::_PC_CHOWN_RESTRICTED()
-    if eval { &POSIX::_PC_CHOWN_RESTRICTED(); 1};
-
-  # If chown_resticted is set to some value we should test it
-  if (defined $chown_restricted) {
-
-    # Return if the current directory is safe
-    return _is_safe($path,$err_ref) if POSIX::sysconf( $chown_restricted );
-
-  }
-
-  # To reach this point either, the _PC_CHOWN_RESTRICTED symbol
-  # was not avialable or the symbol was there but chown giveaway
-  # is allowed. Either way, we now have to test the entire tree for
-  # safety.
-
-  # Convert path to an absolute directory if required
-  unless (File::Spec->file_name_is_absolute($path)) {
-    $path = File::Spec->rel2abs($path);
-  }
-
-  # Split directory into components - assume no file
-  my ($volume, $directories, undef) = File::Spec->splitpath( $path, 1);
-
-  # Slightly less efficient than having a a function in File::Spec
-  # to chop off the end of a directory or even a function that
-  # can handle ../ in a directory tree
-  # Sometimes splitdir() returns a blank at the end
-  # so we will probably check the bottom directory twice in some cases
-  my @dirs = File::Spec->splitdir($directories);
-
-  # Concatenate one less directory each time around
-  foreach my $pos (0.. $#dirs) {
-    # Get a directory name
-    my $dir = File::Spec->catpath($volume,
-				  File::Spec->catdir(@dirs[0.. $#dirs - $pos]),
-				  ''
-				  );
-
-    print "TESTING DIR $dir\n" if $DEBUG;
-
-    # Check the directory
-    return 0 unless _is_safe($dir,$err_ref);
-
-  }
-
-  return 1;
-}
-
-
-
-# internal routine to determine whether unlink works on this
-# platform for files that are currently open.
-# Returns true if we can, false otherwise.
-
-# Currently WinNT, OS/2 and VMS can not unlink an opened file
-# On VMS this is because the O_EXCL flag is used to open the
-# temporary file. Currently I do not know enough about the issues
-# on VMS to decide whether O_EXCL is a requirement.
-
-sub _can_unlink_opened_file {
-
-  if ($^O eq 'MSWin32' || $^O eq 'os2' || $^O eq 'VMS' || $^O eq 'dos') {
-    return 0;
-  } else {
-    return 1;
-  }
-
-}
-
-# internal routine to decide which security levels are allowed
-# see safe_level() for more information on this
-
-# Controls whether the supplied security level is allowed
-
-#   $cando = _can_do_level( $level )
-
-sub _can_do_level {
-
-  # Get security level
-  my $level = shift;
-
-  # Always have to be able to do STANDARD
-  return 1 if $level == STANDARD;
-
-  # Currently, the systems that can do HIGH or MEDIUM are identical
-  if ( $^O eq 'MSWin32' || $^O eq 'os2' || $^O eq 'cygwin' || $^O eq 'dos') {
-    return 0;
-  } else {
-    return 1;
-  }
-
-}
-
-# This routine sets up a deferred unlinking of a specified
-# filename and filehandle. It is used in the following cases:
-#  - Called by unlink0 if an opened file can not be unlinked
-#  - Called by tempfile() if files are to be removed on shutdown
-#  - Called by tempdir() if directories are to be removed on shutdown
-
-# Arguments:
-#   _deferred_unlink( $fh, $fname, $isdir );
-#
-#   - filehandle (so that it can be expclicitly closed if open
-#   - filename   (the thing we want to remove)
-#   - isdir      (flag to indicate that we are being given a directory)
-#                 [and hence no filehandle]
-
-# Status is not referred to since all the magic is done with an END block
-
-{
-  # Will set up two lexical variables to contain all the files to be
-  # removed. One array for files, another for directories
-  # They will only exist in this block
-  # This means we only have to set up a single END block to remove all files
-  # @files_to_unlink contains an array ref with the filehandle and filename
-  my (@files_to_unlink, @dirs_to_unlink);
-
-  # Set up an end block to use these arrays
-  END {
-    # Files
-    foreach my $file (@files_to_unlink) {
-      # close the filehandle without checking its state
-      # in order to make real sure that this is closed
-      # if its already closed then I dont care about the answer
-      # probably a better way to do this
-      close($file->[0]);  # file handle is [0]
-
-      if (-f $file->[1]) {  # file name is [1]
-	unlink $file->[1] or warn "Error removing ".$file->[1];
-      }
-    }
-    # Dirs
-    foreach my $dir (@dirs_to_unlink) {
-      if (-d $dir) {
-	rmtree($dir, $DEBUG, 1);
-      }
-    }
-
-  }
-
-  # This is the sub called to register a file for deferred unlinking
-  # This could simply store the input parameters and defer everything
-  # until the END block. For now we do a bit of checking at this
-  # point in order to make sure that (1) we have a file/dir to delete
-  # and (2) we have been called with the correct arguments.
-  sub _deferred_unlink {
-
-    croak 'Usage:  _deferred_unlink($fh, $fname, $isdir)'
-      unless scalar(@_) == 3;
-
-    my ($fh, $fname, $isdir) = @_;
-
-    warn "Setting up deferred removal of $fname\n"
-      if $DEBUG;
-
-    # If we have a directory, check that it is a directory
-    if ($isdir) {
-
-      if (-d $fname) {
-
-	# Directory exists so store it
-	# first on VMS turn []foo into [.foo] for rmtree
-	$fname = VMS::Filespec::vmspath($fname) if $^O eq 'VMS';
-	push (@dirs_to_unlink, $fname);
-
-      } else {
-	carp "Request to remove directory $fname could not be completed since it does not exist!\n" if $^W;
-      }
-
-    } else {
-
-      if (-f $fname) {
-
-	# file exists so store handle and name for later removal
-	push(@files_to_unlink, [$fh, $fname]);
-
-      } else {
-	carp "Request to remove file $fname could not be completed since it is not there!\n" if $^W;
-      }
-
-    }
-
-  }
-
-
-}
-
-=head1 FUNCTIONS
-
-This section describes the recommended interface for generating
-temporary files and directories.
-
-=over 4
-
-=item B<tempfile>
-
-This is the basic function to generate temporary files.
-The behaviour of the file can be changed using various options:
-
-  ($fh, $filename) = tempfile();
-
-Create a temporary file in  the directory specified for temporary
-files, as specified by the tmpdir() function in L<File::Spec>.
-
-  ($fh, $filename) = tempfile($template);
-
-Create a temporary file in the current directory using the supplied
-template.  Trailing `X' characters are replaced with random letters to
-generate the filename.  At least four `X' characters must be present
-in the template.
-
-  ($fh, $filename) = tempfile($template, SUFFIX => $suffix)
-
-Same as previously, except that a suffix is added to the template
-after the `X' translation.  Useful for ensuring that a temporary
-filename has a particular extension when needed by other applications.
-But see the WARNING at the end.
-
-  ($fh, $filename) = tempfile($template, DIR => $dir);
-
-Translates the template as before except that a directory name
-is specified.
-
-  ($fh, $filename) = tempfile($template, UNLINK => 1);
-
-Return the filename and filehandle as before except that the file is
-automatically removed when the program exits. Default is for the file
-to be removed if a file handle is requested and to be kept if the
-filename is requested. In a scalar context (where no filename is 
-returned) the file is always deleted either on exit or when it is closed.
-
-If the template is not specified, a template is always
-automatically generated. This temporary file is placed in tmpdir()
-(L<File::Spec>) unless a directory is specified explicitly with the 
-DIR option.
-
-  $fh = tempfile( $template, DIR => $dir );
-
-If called in scalar context, only the filehandle is returned
-and the file will automatically be deleted when closed (see 
-the description of tmpfile() elsewhere in this document).
-This is the preferred mode of operation, as if you only 
-have a filehandle, you can never create a race condition
-by fumbling with the filename. On systems that can not unlink
-an open file or can not mark a file as temporary when it is opened
-(for example, Windows NT uses the C<O_TEMPORARY> flag))
-the file is marked for deletion when the program ends (equivalent
-to setting UNLINK to 1). The C<UNLINK> flag is ignored if present.
-
-  (undef, $filename) = tempfile($template, OPEN => 0);
-
-This will return the filename based on the template but
-will not open this file.  Cannot be used in conjunction with
-UNLINK set to true. Default is to always open the file 
-to protect from possible race conditions. A warning is issued
-if warnings are turned on. Consider using the tmpnam()
-and mktemp() functions described elsewhere in this document
-if opening the file is not required.
-
-Options can be combined as required.
-
-=cut
-
-sub tempfile {
-
-  # Can not check for argument count since we can have any
-  # number of args
-
-  # Default options
-  my %options = (
-		 "DIR"    => undef,  # Directory prefix
-                "SUFFIX" => '',     # Template suffix
-                "UNLINK" => 0,      # Do not unlink file on exit
-                "OPEN"   => 1,      # Open file
-		);
-
-  # Check to see whether we have an odd or even number of arguments
-  my $template = (scalar(@_) % 2 == 1 ? shift(@_) : undef);
-
-  # Read the options and merge with defaults
-  %options = (%options, @_)  if @_;
-
-  # First decision is whether or not to open the file
-  if (! $options{"OPEN"}) {
-
-    warn "tempfile(): temporary filename requested but not opened.\nPossibly unsafe, consider using tempfile() with OPEN set to true\n"
-      if $^W;
-
-  }
-
-  if ($options{"DIR"} and $^O eq 'VMS') {
-
-      # on VMS turn []foo into [.foo] for concatenation
-      $options{"DIR"} = VMS::Filespec::vmspath($options{"DIR"});
-  }
-
-  # Construct the template
-
-  # Have a choice of trying to work around the mkstemp/mktemp/tmpnam etc
-  # functions or simply constructing a template and using _gettemp()
-  # explicitly. Go for the latter
-
-  # First generate a template if not defined and prefix the directory
-  # If no template must prefix the temp directory
-  if (defined $template) {
-    if ($options{"DIR"}) {
-
-      $template = File::Spec->catfile($options{"DIR"}, $template);
-
-    }
-
-  } else {
-
-    if ($options{"DIR"}) {
-
-      $template = File::Spec->catfile($options{"DIR"}, TEMPXXX);
-
-    } else {
-
-      $template = File::Spec->catfile(File::Spec->tmpdir, TEMPXXX);
-
-    }
-
-  }
-
-  # Now add a suffix
-  $template .= $options{"SUFFIX"};
-
-  # Determine whether we should tell _gettemp to unlink the file
-  # On unix this is irrelevant and can be worked out after the file is
-  # opened (simply by unlinking the open filehandle). On Windows or VMS
-  # we have to indicate temporary-ness when we open the file. In general
-  # we only want a true temporary file if we are returning just the 
-  # filehandle - if the user wants the filename they probably do not
-  # want the file to disappear as soon as they close it.
-  # For this reason, tie unlink_on_close to the return context regardless
-  # of OS.
-  my $unlink_on_close = ( wantarray ? 0 : 1);
-
-  # Create the file
-  my ($fh, $path, $errstr);
-  croak "Error in tempfile() using $template: $errstr"
-    unless (($fh, $path) = _gettemp($template,
-				    "open" => $options{'OPEN'},
-				    "mkdir"=> 0 ,
-                                    "unlink_on_close" => $unlink_on_close,
-				    "suffixlen" => length($options{'SUFFIX'}),
-				    "ErrStr" => \$errstr,
-				   ) );
-
-  # Set up an exit handler that can do whatever is right for the
-  # system. This removes files at exit when requested explicitly or when
-  # system is asked to unlink_on_close but is unable to do so because
-  # of OS limitations.
-  # The latter should be achieved by using a tied filehandle.
-  # Do not check return status since this is all done with END blocks.
-  _deferred_unlink($fh, $path, 0) if $options{"UNLINK"};
-
-  # Return
-  if (wantarray()) {
-
-    if ($options{'OPEN'}) {
-      return ($fh, $path);
-    } else {
-      return (undef, $path);
-    }
-
-  } else {
-
-    # Unlink the file. It is up to unlink0 to decide what to do with
-    # this (whether to unlink now or to defer until later)
-    unlink0($fh, $path) or croak "Error unlinking file $path using unlink0";
-
-    # Return just the filehandle.
-    return $fh;
-  }
-
-
-}
-
-=item B<tempdir>
-
-This is the recommended interface for creation of temporary directories.
-The behaviour of the function depends on the arguments:
-
-  $tempdir = tempdir();
-
-Create a directory in tmpdir() (see L<File::Spec|File::Spec>).
-
-  $tempdir = tempdir( $template );
-
-Create a directory from the supplied template. This template is
-similar to that described for tempfile(). `X' characters at the end
-of the template are replaced with random letters to construct the
-directory name. At least four `X' characters must be in the template.
-
-  $tempdir = tempdir ( DIR => $dir );
-
-Specifies the directory to use for the temporary directory.
-The temporary directory name is derived from an internal template.
-
-  $tempdir = tempdir ( $template, DIR => $dir );
-
-Prepend the supplied directory name to the template. The template
-should not include parent directory specifications itself. Any parent
-directory specifications are removed from the template before
-prepending the supplied directory.
-
-  $tempdir = tempdir ( $template, TMPDIR => 1 );
-
-Using the supplied template, creat the temporary directory in 
-a standard location for temporary files. Equivalent to doing
-
-  $tempdir = tempdir ( $template, DIR => File::Spec->tmpdir);
-
-but shorter. Parent directory specifications are stripped from the
-template itself. The C<TMPDIR> option is ignored if C<DIR> is set
-explicitly.  Additionally, C<TMPDIR> is implied if neither a template
-nor a directory are supplied.
-
-  $tempdir = tempdir( $template, CLEANUP => 1);
-
-Create a temporary directory using the supplied template, but 
-attempt to remove it (and all files inside it) when the program
-exits. Note that an attempt will be made to remove all files from
-the directory even if they were not created by this module (otherwise
-why ask to clean it up?). The directory removal is made with
-the rmtree() function from the L<File::Path|File::Path> module.
-Of course, if the template is not specified, the temporary directory
-will be created in tmpdir() and will also be removed at program exit.
-
-=cut
-
-# '
-
-sub tempdir  {
-
-  # Can not check for argument count since we can have any
-  # number of args
-
-  # Default options
-  my %options = (
-		 "CLEANUP"    => 0,  # Remove directory on exit
-		 "DIR"        => '', # Root directory
-		 "TMPDIR"     => 0,  # Use tempdir with template
-		);
-
-  # Check to see whether we have an odd or even number of arguments
-  my $template = (scalar(@_) % 2 == 1 ? shift(@_) : undef );
-
-  # Read the options and merge with defaults
-  %options = (%options, @_)  if @_;
-
-  # Modify or generate the template
-
-  # Deal with the DIR and TMPDIR options
-  if (defined $template) {
-
-    # Need to strip directory path if using DIR or TMPDIR
-    if ($options{'TMPDIR'} || $options{'DIR'}) {
-
-      # Strip parent directory from the filename
-      #
-      # There is no filename at the end
-      $template = VMS::Filespec::vmspath($template) if $^O eq 'VMS';
-      my ($volume, $directories, undef) = File::Spec->splitpath( $template, 1);
-
-      # Last directory is then our template
-      $template = (File::Spec->splitdir($directories))[-1];
-
-      # Prepend the supplied directory or temp dir
-      if ($options{"DIR"}) {
-
-        $template = File::Spec->catdir($options{"DIR"}, $template);
-
-      } elsif ($options{TMPDIR}) {
-
-	# Prepend tmpdir
-	$template = File::Spec->catdir(File::Spec->tmpdir, $template);
-
-      }
-
-    }
-
-  } else {
-
-    if ($options{"DIR"}) {
-
-      $template = File::Spec->catdir($options{"DIR"}, TEMPXXX);
-
-    } else {
-
-      $template = File::Spec->catdir(File::Spec->tmpdir, TEMPXXX);
-
-    }
-
-  }
-
-  # Create the directory
-  my $tempdir;
-  my $suffixlen = 0;
-  if ($^O eq 'VMS') {  # dir names can end in delimiters
-    $template =~ m/([\.\]:>]+)$/;
-    $suffixlen = length($1);
-  }
-
-  my $errstr;
-  croak "Error in tempdir() using $template: $errstr"
-    unless ((undef, $tempdir) = _gettemp($template,
-				    "open" => 0,
-				    "mkdir"=> 1 ,
-				    "suffixlen" => $suffixlen,
-				    "ErrStr" => \$errstr,
-				   ) );
-
-  # Install exit handler; must be dynamic to get lexical
-  if ( $options{'CLEANUP'} && -d $tempdir) {
-    _deferred_unlink(undef, $tempdir, 1);
-  }
-
-  # Return the dir name
-  return $tempdir;
-
-}
-
-=back
-
-=head1 MKTEMP FUNCTIONS
-
-The following functions are Perl implementations of the 
-mktemp() family of temp file generation system calls.
-
-=over 4
-
-=item B<mkstemp>
-
-Given a template, returns a filehandle to the temporary file and the name
-of the file.
-
-  ($fh, $name) = mkstemp( $template );
-
-In scalar context, just the filehandle is returned.
-
-The template may be any filename with some number of X's appended
-to it, for example F</tmp/temp.XXXX>. The trailing X's are replaced
-with unique alphanumeric combinations.
-
-=cut
-
-
-
-sub mkstemp {
-
-  croak "Usage: mkstemp(template)"
-    if scalar(@_) != 1;
-
-  my $template = shift;
-
-  my ($fh, $path, $errstr);
-  croak "Error in mkstemp using $template: $errstr"
-    unless (($fh, $path) = _gettemp($template,
-				    "open" => 1,
-				    "mkdir"=> 0 ,
-				    "suffixlen" => 0,
-				    "ErrStr" => \$errstr,
-				   ) );
-
-  if (wantarray()) {
-    return ($fh, $path);
-  } else {
-    return $fh;
-  }
-
-}
-
-
-=item B<mkstemps>
-
-Similar to mkstemp(), except that an extra argument can be supplied
-with a suffix to be appended to the template.
-
-  ($fh, $name) = mkstemps( $template, $suffix );
-
-For example a template of C<testXXXXXX> and suffix of C<.dat>
-would generate a file similar to F<testhGji_w.dat>.
-
-Returns just the filehandle alone when called in scalar context.
-
-=cut
-
-sub mkstemps {
-
-  croak "Usage: mkstemps(template, suffix)"
-    if scalar(@_) != 2;
-
-
-  my $template = shift;
-  my $suffix   = shift;
-
-  $template .= $suffix;
-
-  my ($fh, $path, $errstr);
-  croak "Error in mkstemps using $template: $errstr"
-    unless (($fh, $path) = _gettemp($template,
-				    "open" => 1,
-				    "mkdir"=> 0 ,
-				    "suffixlen" => length($suffix),
-				    "ErrStr" => \$errstr,
-				   ) );
-
-  if (wantarray()) {
-    return ($fh, $path);
-  } else {
-    return $fh;
-  }
-
-}
-
-=item B<mkdtemp>
-
-Create a directory from a template. The template must end in
-X's that are replaced by the routine.
-
-  $tmpdir_name = mkdtemp($template);
-
-Returns the name of the temporary directory created.
-Returns undef on failure.
-
-Directory must be removed by the caller.
-
-=cut
-
-#' # for emacs
-
-sub mkdtemp {
-
-  croak "Usage: mkdtemp(template)"
-    if scalar(@_) != 1;
-
-  my $template = shift;
-  my $suffixlen = 0;
-  if ($^O eq 'VMS') {  # dir names can end in delimiters
-    $template =~ m/([\.\]:>]+)$/;
-    $suffixlen = length($1);
-  }
-  my ($junk, $tmpdir, $errstr);
-  croak "Error creating temp directory from template $template\: $errstr"
-    unless (($junk, $tmpdir) = _gettemp($template,
-					"open" => 0,
-					"mkdir"=> 1 ,
-					"suffixlen" => $suffixlen,
-					"ErrStr" => \$errstr,
-				       ) );
-
-  return $tmpdir;
-
-}
-
-=item B<mktemp>
-
-Returns a valid temporary filename but does not guarantee
-that the file will not be opened by someone else.
-
-  $unopened_file = mktemp($template);
-
-Template is the same as that required by mkstemp().
-
-=cut
-
-sub mktemp {
-
-  croak "Usage: mktemp(template)"
-    if scalar(@_) != 1;
-
-  my $template = shift;
-
-  my ($tmpname, $junk, $errstr);
-  croak "Error getting name to temp file from template $template: $errstr"
-    unless (($junk, $tmpname) = _gettemp($template,
-					 "open" => 0,
-					 "mkdir"=> 0 ,
-					 "suffixlen" => 0,
-					 "ErrStr" => \$errstr,
-					 ) );
-
-  return $tmpname;
-}
-
-=back
-
-=head1 POSIX FUNCTIONS
-
-This section describes the re-implementation of the tmpnam()
-and tmpfile() functions described in L<POSIX> 
-using the mkstemp() from this module.
-
-Unlike the L<POSIX|POSIX> implementations, the directory used
-for the temporary file is not specified in a system include
-file (C<P_tmpdir>) but simply depends on the choice of tmpdir()
-returned by L<File::Spec|File::Spec>. On some implementations this
-location can be set using the C<TMPDIR> environment variable, which
-may not be secure.
-If this is a problem, simply use mkstemp() and specify a template.
-
-=over 4
-
-=item B<tmpnam>
-
-When called in scalar context, returns the full name (including path)
-of a temporary file (uses mktemp()). The only check is that the file does
-not already exist, but there is no guarantee that that condition will
-continue to apply.
-
-  $file = tmpnam();
-
-When called in list context, a filehandle to the open file and
-a filename are returned. This is achieved by calling mkstemp()
-after constructing a suitable template.
-
-  ($fh, $file) = tmpnam();
-
-If possible, this form should be used to prevent possible
-race conditions.
-
-See L<File::Spec/tmpdir> for information on the choice of temporary
-directory for a particular operating system.
-
-=cut
-
-sub tmpnam {
-
-   # Retrieve the temporary directory name
-   my $tmpdir = File::Spec->tmpdir;
-
-   croak "Error temporary directory is not writable"
-     if $tmpdir eq '';
-
-   # Use a ten character template and append to tmpdir
-   my $template = File::Spec->catfile($tmpdir, TEMPXXX);
-
-   if (wantarray() ) {
-       return mkstemp($template);
-   } else {
-       return mktemp($template);
-   }
-
-}
-
-=item B<tmpfile>
-
-In scalar context, returns the filehandle of a temporary file.
-
-  $fh = tmpfile();
-
-The file is removed when the filehandle is closed or when the program
-exits. No access to the filename is provided.
-
-If the temporary file can not be created undef is returned.
-Currently this command will probably not work when the temporary
-directory is on an NFS file system.
-
-=cut
-
-sub tmpfile {
-
-  # Simply call tmpnam() in a list context
-  my ($fh, $file) = tmpnam();
-
-  # Make sure file is removed when filehandle is closed
-  # This will fail on NFS
-  unlink0($fh, $file)
-    or return undef;
-
-  return $fh;
-
-}
-
-=back
-
-=head1 ADDITIONAL FUNCTIONS
-
-These functions are provided for backwards compatibility
-with common tempfile generation C library functions.
-
-They are not exported and must be addressed using the full package
-name. 
-
-=over 4
-
-=item B<tempnam>
-
-Return the name of a temporary file in the specified directory
-using a prefix. The file is guaranteed not to exist at the time
-the function was called, but such guarantees are good for one 
-clock tick only.  Always use the proper form of C<sysopen>
-with C<O_CREAT | O_EXCL> if you must open such a filename.
-
-  $filename = File::Temp::tempnam( $dir, $prefix );
-
-Equivalent to running mktemp() with $dir/$prefixXXXXXXXX
-(using unix file convention as an example) 
-
-Because this function uses mktemp(), it can suffer from race conditions.
-
-=cut
-
-sub tempnam {
-
-  croak 'Usage tempnam($dir, $prefix)' unless scalar(@_) == 2;
-
-  my ($dir, $prefix) = @_;
-
-  # Add a string to the prefix
-  $prefix .= 'XXXXXXXX';
-
-  # Concatenate the directory to the file
-  my $template = File::Spec->catfile($dir, $prefix);
-
-  return mktemp($template);
-
-}
-
-=back
-
-=head1 UTILITY FUNCTIONS
-
-Useful functions for dealing with the filehandle and filename.
-
-=over 4
-
-=item B<unlink0>
-
-Given an open filehandle and the associated filename, make a safe
-unlink. This is achieved by first checking that the filename and
-filehandle initially point to the same file and that the number of
-links to the file is 1 (all fields returned by stat() are compared).
-Then the filename is unlinked and the filehandle checked once again to
-verify that the number of links on that file is now 0.  This is the
-closest you can come to making sure that the filename unlinked was the
-same as the file whose descriptor you hold.
-
-  unlink0($fh, $path) or die "Error unlinking file $path safely";
-
-Returns false on error. The filehandle is not closed since on some
-occasions this is not required.
-
-On some platforms, for example Windows NT, it is not possible to
-unlink an open file (the file must be closed first). On those
-platforms, the actual unlinking is deferred until the program ends and
-good status is returned. A check is still performed to make sure that
-the filehandle and filename are pointing to the same thing (but not at
-the time the end block is executed since the deferred removal may not
-have access to the filehandle).
-
-Additionally, on Windows NT not all the fields returned by stat() can
-be compared. For example, the C<dev> and C<rdev> fields seem to be
-different.  Also, it seems that the size of the file returned by stat()
-does not always agree, with C<stat(FH)> being more accurate than
-C<stat(filename)>, presumably because of caching issues even when
-using autoflush (this is usually overcome by waiting a while after
-writing to the tempfile before attempting to C<unlink0> it).
-
-Finally, on NFS file systems the link count of the file handle does
-not always go to zero immediately after unlinking. Currently, this
-command is expected to fail on NFS disks.
-
-=cut
-
-sub unlink0 {
-
-  croak 'Usage: unlink0(filehandle, filename)'
-    unless scalar(@_) == 2;
-
-  # Read args
-  my ($fh, $path) = @_;
-
-  warn "Unlinking $path using unlink0\n"
-    if $DEBUG;
-
-  # Stat the filehandle
-  my @fh = stat $fh;
-
-  if ($fh[3] > 1 && $^W) {
-    carp "unlink0: fstat found too many links; SB=@fh" if $^W;
-  }
-
-  # Stat the path
-  my @path = stat $path;
-
-  unless (@path) {
-    carp "unlink0: $path is gone already" if $^W;
-    return;
-  }
-
-  # this is no longer a file, but may be a directory, or worse
-  unless (-f _) {
-    confess "panic: $path is no longer a file: SB=@fh";
-  }
-
-  # Do comparison of each member of the array
-  # On WinNT dev and rdev seem to be different
-  # depending on whether it is a file or a handle.
-  # Cannot simply compare all members of the stat return
-  # Select the ones we can use
-  my @okstat = (0..$#fh);  # Use all by default
-  if ($^O eq 'MSWin32') {
-    @okstat = (1,2,3,4,5,7,8,9,10);
-  } elsif ($^O eq 'os2') {
-    @okstat = (0, 2..$#fh);
-  } elsif ($^O eq 'VMS') { # device and file ID are sufficient
-    @okstat = (0, 1);
-  } elsif ($^O eq 'dos') {
-     @okstat = (0,2..7,11..$#fh);
-  }
-
-  # Now compare each entry explicitly by number
-  for (@okstat) {
-    print "Comparing: $_ : $fh[$_] and $path[$_]\n" if $DEBUG;
-    # Use eq rather than == since rdev, blksize, and blocks (6, 11,
-    # and 12) will be '' on platforms that do not support them.  This
-    # is fine since we are only comparing integers.
-    unless ($fh[$_] eq $path[$_]) {
-      warn "Did not match $_ element of stat\n" if $DEBUG;
-      return 0;
-    }
-  }
-
-  # attempt remove the file (does not work on some platforms)
-  if (_can_unlink_opened_file()) {
-    # XXX: do *not* call this on a directory; possible race
-    #      resulting in recursive removal
-    croak "unlink0: $path has become a directory!" if -d $path;
-    unlink($path) or return 0;
-
-    # Stat the filehandle
-    @fh = stat $fh;
-
-    print "Link count = $fh[3] \n" if $DEBUG;
-
-    # Make sure that the link count is zero
-    # - Cygwin provides deferred unlinking, however,
-    #   on Win9x the link count remains 1
-    # On NFS the link count may still be 1 but we cant know that
-    # we are on NFS
-    return ( $fh[3] == 0 or $^O eq 'cygwin' ? 1 : 0);
-
-  } else {
-    _deferred_unlink($fh, $path, 0);
-    return 1;
-  }
-
-}
-
-=back
-
-=head1 PACKAGE VARIABLES
-
-These functions control the global state of the package.
-
-=over 4
-
-=item B<safe_level>
-
-Controls the lengths to which the module will go to check the safety of the
-temporary file or directory before proceeding.
-Options are:
-
-=over 8
-
-=item STANDARD
-
-Do the basic security measures to ensure the directory exists and
-is writable, that the umask() is fixed before opening of the file,
-that temporary files are opened only if they do not already exist, and
-that possible race conditions are avoided.  Finally the L<unlink0|"unlink0">
-function is used to remove files safely.
-
-=item MEDIUM
-
-In addition to the STANDARD security, the output directory is checked
-to make sure that it is owned either by root or the user running the
-program. If the directory is writable by group or by other, it is then
-checked to make sure that the sticky bit is set.
-
-Will not work on platforms that do not support the C<-k> test
-for sticky bit.
-
-=item HIGH
-
-In addition to the MEDIUM security checks, also check for the
-possibility of ``chown() giveaway'' using the L<POSIX|POSIX>
-sysconf() function. If this is a possibility, each directory in the
-path is checked in turn for safeness, recursively walking back to the 
-root directory.
-
-For platforms that do not support the L<POSIX|POSIX>
-C<_PC_CHOWN_RESTRICTED> symbol (for example, Windows NT) it is 
-assumed that ``chown() giveaway'' is possible and the recursive test
-is performed.
-
-=back
-
-The level can be changed as follows:
-
-  File::Temp->safe_level( File::Temp::HIGH );
-
-The level constants are not exported by the module.
-
-Currently, you must be running at least perl v5.6.0 in order to
-run with MEDIUM or HIGH security. This is simply because the 
-safety tests use functions from L<Fcntl|Fcntl> that are not
-available in older versions of perl. The problem is that the version
-number for Fcntl is the same in perl 5.6.0 and in 5.005_03 even though
-they are different versions.
-
-On systems that do not support the HIGH or MEDIUM safety levels
-(for example Win NT or OS/2) any attempt to change the level will
-be ignored. The decision to ignore rather than raise an exception
-allows portable programs to be written with high security in mind
-for the systems that can support this without those programs failing
-on systems where the extra tests are irrelevant.
-
-If you really need to see whether the change has been accepted
-simply examine the return value of C<safe_level>.
-
-  $newlevel = File::Temp->safe_level( File::Temp::HIGH );
-  die "Could not change to high security" 
-      if $newlevel != File::Temp::HIGH;
-
-=cut
-
-{
-  # protect from using the variable itself
-  my $LEVEL = STANDARD;
-  sub safe_level {
-    my $self = shift;
-    if (@_) { 
-      my $level = shift;
-      if (($level != STANDARD) && ($level != MEDIUM) && ($level != HIGH)) {
-	carp "safe_level: Specified level ($level) not STANDARD, MEDIUM or HIGH - ignoring\n" if $^W;
-      } else {
-	# Dont allow this on perl 5.005 or earlier
-	if ($] < 5.006 && $level != STANDARD) {
-	  # Cant do MEDIUM or HIGH checks
-	  croak "Currently requires perl 5.006 or newer to do the safe checks";
-	}
-	# Check that we are allowed to change level
-	# Silently ignore if we can not.
-        $LEVEL = $level if _can_do_level($level);
-      }
-    }
-    return $LEVEL;
-  }
-}
-
-=item TopSystemUID
-
-This is the highest UID on the current system that refers to a root
-UID. This is used to make sure that the temporary directory is 
-owned by a system UID (C<root>, C<bin>, C<sys> etc) rather than 
-simply by root.
-
-This is required since on many unix systems C</tmp> is not owned
-by root.
-
-Default is to assume that any UID less than or equal to 10 is a root
-UID.
-
-  File::Temp->top_system_uid(10);
-  my $topid = File::Temp->top_system_uid;
-
-This value can be adjusted to reduce security checking if required.
-The value is only relevant when C<safe_level> is set to MEDIUM or higher.
-
-=back
-
-=cut
-
-{
-  my $TopSystemUID = 10;
-  sub top_system_uid {
-    my $self = shift;
-    if (@_) {
-      my $newuid = shift;
-      croak "top_system_uid: UIDs should be numeric"
-        unless $newuid =~ /^\d+$/s;
-      $TopSystemUID = $newuid;
-    }
-    return $TopSystemUID;
-  }
-}
-
-=head1 WARNING
-
-For maximum security, endeavour always to avoid ever looking at,
-touching, or even imputing the existence of the filename.  You do not
-know that that filename is connected to the same file as the handle
-you have, and attempts to check this can only trigger more race
-conditions.  It's far more secure to use the filehandle alone and
-dispense with the filename altogether.
-
-If you need to pass the handle to something that expects a filename
-then, on a unix system, use C<"/dev/fd/" . fileno($fh)> for arbitrary
-programs, or more generally C<< "+<=&" . fileno($fh) >> for Perl
-programs.  You will have to clear the close-on-exec bit on that file
-descriptor before passing it to another process.
-
-    use Fcntl qw/F_SETFD F_GETFD/;
-    fcntl($tmpfh, F_SETFD, 0)
-        or die "Can't clear close-on-exec flag on temp fh: $!\n";
-
-=head2 Temporary files and NFS
-
-Some problems are associated with using temporary files that reside
-on NFS file systems and it is recommended that a local filesystem
-is used whenever possible. Some of the security tests will most probably
-fail when the temp file is not local. Additionally, be aware that
-the performance of I/O operations over NFS will not be as good as for
-a local disk.
-
-=head1 HISTORY
-
-Originally began life in May 1999 as an XS interface to the system
-mkstemp() function. In March 2000, the OpenBSD mkstemp() code was
-translated to Perl for total control of the code's
-security checking, to ensure the presence of the function regardless of
-operating system and to help with portability.
-
-=head1 SEE ALSO
-
-L<POSIX/tmpnam>, L<POSIX/tmpfile>, L<File::Spec>, L<File::Path>
-
-See L<IO::File> and L<File::MkTemp> for different implementations of 
-temporary file handling.
-
-=head1 AUTHOR
-
-Tim Jenness E<lt>t.jenness@jach.hawaii.eduE<gt>
-
-Copyright (C) 1999-2001 Tim Jenness and the UK Particle Physics and
-Astronomy Research Council. All Rights Reserved.  This program is free
-software; you can redistribute it and/or modify it under the same
-terms as Perl itself.
-
-Original Perl implementation loosely based on the OpenBSD C code for 
-mkstemp(). Thanks to Tom Christiansen for suggesting that this module
-should be written and providing ideas for code improvements and
-security enhancements.
-
-=cut
-
-
-1;
diff --git a/contrib/perl5/lib/File/stat.pm b/contrib/perl5/lib/File/stat.pm
deleted file mode 100644
index 0cf7a0b..0000000
--- a/contrib/perl5/lib/File/stat.pm
+++ /dev/null
@@ -1,115 +0,0 @@
-package File::stat;
-use strict;
-
-use 5.005_64;
-our(@EXPORT, @EXPORT_OK, %EXPORT_TAGS);
-
-BEGIN { 
-    use Exporter   ();
-    @EXPORT      = qw(stat lstat);
-    @EXPORT_OK   = qw( $st_dev	   $st_ino    $st_mode 
-		       $st_nlink   $st_uid    $st_gid 
-		       $st_rdev    $st_size 
-		       $st_atime   $st_mtime  $st_ctime 
-		       $st_blksize $st_blocks
-		    );
-    %EXPORT_TAGS = ( FIELDS => [ @EXPORT_OK, @EXPORT ] );
-}
-use vars @EXPORT_OK;
-
-# Class::Struct forbids use of @ISA
-sub import { goto &Exporter::import }
-
-use Class::Struct qw(struct);
-struct 'File::stat' => [
-     map { $_ => '$' } qw{
-	 dev ino mode nlink uid gid rdev size
-	 atime mtime ctime blksize blocks
-     }
-];
-
-sub populate (@) {
-    return unless @_;
-    my $stob = new();
-    @$stob = (
-	$st_dev, $st_ino, $st_mode, $st_nlink, $st_uid, $st_gid, $st_rdev,
-        $st_size, $st_atime, $st_mtime, $st_ctime, $st_blksize, $st_blocks ) 
-	    = @_;
-    return $stob;
-} 
-
-sub lstat ($)  { populate(CORE::lstat(shift)) }
-
-sub stat ($) {
-    my $arg = shift;
-    my $st = populate(CORE::stat $arg);
-    return $st if $st;
-    no strict 'refs';
-    require Symbol;
-    return populate(CORE::stat \*{Symbol::qualify($arg)});
-}
-
-1;
-__END__
-
-=head1 NAME
-
-File::stat - by-name interface to Perl's built-in stat() functions
-
-=head1 SYNOPSIS
-
- use File::stat;
- $st = stat($file) or die "No $file: $!";
- if ( ($st->mode & 0111) && $st->nlink > 1) ) {
-     print "$file is executable with lotsa links\n";
- } 
-
- use File::stat qw(:FIELDS);
- stat($file) or die "No $file: $!";
- if ( ($st_mode & 0111) && $st_nlink > 1) ) {
-     print "$file is executable with lotsa links\n";
- } 
-
-=head1 DESCRIPTION
-
-This module's default exports override the core stat() 
-and lstat() functions, replacing them with versions that return 
-"File::stat" objects.  This object has methods that
-return the similarly named structure field name from the
-stat(2) function; namely,
-dev,
-ino,
-mode,
-nlink,
-uid,
-gid,
-rdev,
-size,
-atime,
-mtime,
-ctime,
-blksize,
-and
-blocks.  
-
-You may also import all the structure fields directly into your namespace
-as regular variables using the :FIELDS import tag.  (Note that this still
-overrides your stat() and lstat() functions.)  Access these fields as
-variables named with a preceding C<st_> in front their method names.
-Thus, C<$stat_obj-E<gt>dev()> corresponds to $st_dev if you import
-the fields.
-
-To access this functionality without the core overrides,
-pass the C<use> an empty import list, and then access
-function functions with their full qualified names.
-On the other hand, the built-ins are still available
-via the C<CORE::> pseudo-package.
-
-=head1 NOTE
-
-While this class is currently implemented using the Class::Struct
-module to build a struct-like class, you shouldn't rely upon this.
-
-=head1 AUTHOR
-
-Tom Christiansen