s/use vars/our/g modules that aren't independently maintained on CPAN

p4raw-id: //depot/perl@4860

6 files changed, 18 insertions, 10 deletions

diff --git a/lib/File/Basename.pm b/lib/File/Basename.pm
index d1c8666bbb..da2caee849 100644
--- a/lib/File/Basename.pm
+++ b/lib/File/Basename.pm
@@ -135,11 +135,11 @@ BEGIN {
 
 
 
-
+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);
-use vars qw($VERSION $Fileparse_fstype $Fileparse_igncase);
 $VERSION = "2.6";
 
 
diff --git a/lib/File/Compare.pm b/lib/File/Compare.pm
index dce78e28ab..8a8afac05f 100644
--- a/lib/File/Compare.pm
+++ b/lib/File/Compare.pm
@@ -1,7 +1,8 @@
 package File::Compare;
 
+use 5.005_64;
 use strict;
-use vars qw($VERSION @ISA @EXPORT @EXPORT_OK $Too_Big *FROM *TO);
+our($VERSION, @ISA, @EXPORT, @EXPORT_OK, $Too_Big);
 
 require Exporter;
 use Carp;
@@ -115,6 +116,7 @@ sub compare {
     return -1;
 }
 
+sub cmp;
 *cmp = \&compare;
 
 sub compare_text {
diff --git a/lib/File/Copy.pm b/lib/File/Copy.pm
index 8df54e55a8..8638bee210 100644
--- a/lib/File/Copy.pm
+++ b/lib/File/Copy.pm
@@ -7,10 +7,14 @@
 
 package File::Copy;
 
+use 5.005_64;
 use strict;
 use Carp;
-use vars qw(@ISA @EXPORT @EXPORT_OK $VERSION $Too_Big
-	    &copy &syscopy &cp &mv $Syscopy_is_copy);
+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
diff --git a/lib/File/Find.pm b/lib/File/Find.pm
index c674b2c5f6..0485bce8ed 100644
--- a/lib/File/Find.pm
+++ b/lib/File/Find.pm
@@ -1,5 +1,5 @@
 package File::Find;
-require 5.005;
+use 5.005_64;
 require Exporter;
 require Cwd;
 
@@ -270,7 +270,7 @@ sub Follow_SymLink($) {
     return $AbsName;
 }
 
-use vars qw/ $dir $name $fullname $prune /;
+our($dir, $name, $fullname, $prune);
 sub _find_dir_symlnk($$$);
 sub _find_dir($$$);
 
diff --git a/lib/File/Path.pm b/lib/File/Path.pm
index 634b2cd108..bac48a1981 100644
--- a/lib/File/Path.pm
+++ b/lib/File/Path.pm
@@ -91,13 +91,14 @@ Charles Bailey <F<bailey@newman.upenn.edu>>
 
 =cut
 
+use 5.005_64;
 use Carp;
 use File::Basename ();
 use DirHandle ();
 use Exporter ();
 use strict;
 
-use vars qw( $VERSION @ISA @EXPORT );
+our($VERSION, @ISA, @EXPORT);
 $VERSION = "1.0402";
 @ISA = qw( Exporter );
 @EXPORT = qw( mkpath rmtree );
diff --git a/lib/File/stat.pm b/lib/File/stat.pm
index f5d17f7da4..f86bfe579b 100644
--- a/lib/File/stat.pm
+++ b/lib/File/stat.pm
@@ -1,9 +1,11 @@
 package File::stat;
 use strict;
 
+use 5.005_64;
+our(@EXPORT, @EXPORT_OK, %EXPORT_TAGS);
+
 BEGIN { 
     use Exporter   ();
-    use vars       qw(@EXPORT @EXPORT_OK %EXPORT_TAGS);
     @EXPORT      = qw(stat lstat);
     @EXPORT_OK   = qw( $st_dev	   $st_ino    $st_mode 
 		       $st_nlink   $st_uid    $st_gid 
@@ -13,7 +15,6 @@ BEGIN {
 		    );
     %EXPORT_TAGS = ( FIELDS => [ @EXPORT_OK, @EXPORT ] );
 }
-use vars      @EXPORT_OK;
 
 # Class::Struct forbids use of @ISA
 sub import { goto &Exporter::import }