VERSION Patch

6 files changed, 27 insertions, 15 deletions

diff --git a/ext/DynaLoader/DynaLoader.pm b/ext/DynaLoader/DynaLoader.pm
index d809b82eaf..0e639f91bf 100644
--- a/ext/DynaLoader/DynaLoader.pm
+++ b/ext/DynaLoader/DynaLoader.pm
@@ -12,13 +12,15 @@ package DynaLoader;
 #
 # Tim.Bunce@ig.co.uk, August 1994
 
+use vars qw($VERSION @ISA) ;
+
 require Carp;
 require Config;
 require AutoLoader;
 
 @ISA=qw(AutoLoader);
 
-$VERSION = $VERSION = "1.00" ;
+$VERSION = "1.00" ;
 
 sub import { }		# override import inherited from AutoLoader
 
diff --git a/ext/Fcntl/Fcntl.pm b/ext/Fcntl/Fcntl.pm
index aef7ad3d00..32a3194326 100644
--- a/ext/Fcntl/Fcntl.pm
+++ b/ext/Fcntl/Fcntl.pm
@@ -23,11 +23,13 @@ pack up your own arguments to pass as args for locking functions, etc.
 
 =cut
 
+use vars qw($VERSION @ISA @EXPORT @EXPORT_OK $AUTOLOAD);
+
 require Exporter;
 use AutoLoader;
 require DynaLoader;
 @ISA = qw(Exporter DynaLoader);
-$VERSION = $VERSION = "1.00";
+$VERSION = "1.00";
 # Items to export into callers namespace by default
 # (move infrequently used names to @EXPORT_OK below)
 @EXPORT =
@@ -44,16 +46,16 @@ $VERSION = $VERSION = "1.00";
 );
 
 sub AUTOLOAD {
-    local($constname);
+    my($constname);
     ($constname = $AUTOLOAD) =~ s/.*:://;
-    $val = constant($constname, @_ ? $_[0] : 0);
+    my $val = constant($constname, @_ ? $_[0] : 0);
     if ($! != 0) {
 	if ($! =~ /Invalid/) {
 	    $AutoLoader::AUTOLOAD = $AUTOLOAD;
 	    goto &AutoLoader::AUTOLOAD;
 	}
 	else {
-	    ($pack,$file,$line) = caller;
+	    my ($pack,$file,$line) = caller;
 	    die "Your vendor has not defined Fcntl macro $constname, used at $file line $line.
 ";
 	}
@@ -62,7 +64,7 @@ sub AUTOLOAD {
     goto &$AUTOLOAD;
 }
 
-bootstrap Fcntl;
+bootstrap Fcntl $VERSION;
 
 # Preloaded methods go here.  Autoload methods go after __END__, and are
 # processed by the autosplit program.
diff --git a/ext/FileHandle/Makefile.PL b/ext/FileHandle/Makefile.PL
index 8424f4d985..0ce222082c 100644
--- a/ext/FileHandle/Makefile.PL
+++ b/ext/FileHandle/Makefile.PL
@@ -2,4 +2,5 @@ use ExtUtils::MakeMaker;
 WriteMakefile(
     MAN3PODS   => ' ',			# Pods will be built by installman.
     XSPROTOARG => '-noprototypes', 	# XXX remove later?
+    VERSION_FROM => 'FileHandle.pm',
 );
diff --git a/ext/POSIX/POSIX.pm b/ext/POSIX/POSIX.pm
index ab309cc609..66b55c1565 100644
--- a/ext/POSIX/POSIX.pm
+++ b/ext/POSIX/POSIX.pm
@@ -1,5 +1,7 @@
 package POSIX;
 
+use vars qw($VERSION @ISA %EXPORT_TAGS @EXPORT_OK $AUTOLOAD); 
+
 use Carp;
 use AutoLoader;
 require Config;
@@ -9,7 +11,7 @@ require Exporter;
 require DynaLoader;
 @ISA = qw(Exporter DynaLoader);
 
-$VERSION = $VERSION = "1.00" ;
+$VERSION = "1.00" ;
 
 %EXPORT_TAGS = (
 
@@ -179,7 +181,7 @@ sub import {
 }
 
 
-bootstrap POSIX;
+bootstrap POSIX $VERSION;
 
 my $EINVAL = constant("EINVAL", 0);
 my $EAGAIN = constant("EAGAIN", 0);
diff --git a/ext/Safe/Safe.pm b/ext/Safe/Safe.pm
index 5f24d1928a..0fafcbe741 100644
--- a/ext/Safe/Safe.pm
+++ b/ext/Safe/Safe.pm
@@ -1,8 +1,11 @@
 package Safe;
+
+use vars qw($VERSION @ISA @EXPORT_OK);
+
 require Exporter;
 require DynaLoader;
 use Carp;
-$VERSION = $VERSION = "1.00";
+$VERSION = "1.00";
 @ISA = qw(Exporter DynaLoader);
 @EXPORT_OK = qw(op_mask ops_to_mask mask_to_ops opcode opname opdesc
 		MAXO emptymask fullmask);
@@ -384,7 +387,7 @@ EOT
     return safe_call_sv($root, $mask, $evalsub);
 }
 
-bootstrap Safe;
+bootstrap Safe $VERSION;
 
 $default_mask = fullmask;
 my $name;
diff --git a/ext/Socket/Socket.pm b/ext/Socket/Socket.pm
index 9cc7585cb3..43c3c404bc 100644
--- a/ext/Socket/Socket.pm
+++ b/ext/Socket/Socket.pm
@@ -1,5 +1,7 @@
 package Socket;
-$VERSION = $VERSION = "1.5";
+
+use vars qw($VERSION @ISA @EXPORT);
+$VERSION = "1.5";
 
 =head1 NAME
 
@@ -250,16 +252,16 @@ sub sockaddr_un {
 
 
 sub AUTOLOAD {
-    local($constname);
+    my($constname);
     ($constname = $AUTOLOAD) =~ s/.*:://;
-    $val = constant($constname, @_ ? $_[0] : 0);
+    my $val = constant($constname, @_ ? $_[0] : 0);
     if ($! != 0) {
 	if ($! =~ /Invalid/) {
 	    $AutoLoader::AUTOLOAD = $AUTOLOAD;
 	    goto &AutoLoader::AUTOLOAD;
 	}
 	else {
-	    ($pack,$file,$line) = caller;
+	    my ($pack,$file,$line) = caller;
 	    croak "Your vendor has not defined Socket macro $constname, used";
 	}
     }
@@ -267,7 +269,7 @@ sub AUTOLOAD {
     goto &$AUTOLOAD;
 }
 
-bootstrap Socket;
+bootstrap Socket $VERSION;
 
 # Preloaded methods go here.  Autoload methods go after __END__, and are
 # processed by the autosplit program.