Change 12113 by ams@ams-lustre on 2001/09/21 17:08:24

	Subject: [PATCH] avoid v-strings with require/use
	From: Ronald J Kimball <rjk@linguist.Thayer.dartmouth.edu>
	Date: Fri, 21 Sep 2001 12:34:40 -0400
	Message-Id: <20010921123440.A148500@linguist.thayer.dartmouth.edu>

Affected files ...

... //depot/perl/ext/ByteLoader/bytecode.h#24 edit
... //depot/perl/ext/Data/Dumper/Dumper.pm#22 edit
... //depot/perl/ext/Devel/DProf/DProf.pm#8 edit
... //depot/perl/ext/IO/lib/IO/Dir.pm#7 edit
... //depot/perl/ext/IO/lib/IO/File.pm#14 edit
... //depot/perl/ext/IO/lib/IO/Handle.pm#25 edit
... //depot/perl/ext/IO/lib/IO/Pipe.pm#13 edit
... //depot/perl/ext/IO/lib/IO/Seekable.pm#17 edit
... //depot/perl/ext/Opcode/Opcode.pm#25 edit
... //depot/perl/lib/AnyDBM_File.pm#11 edit
... //depot/perl/lib/AutoLoader.pm#26 edit
... //depot/perl/lib/AutoSplit.pm#30 edit
... //depot/perl/lib/Class/Struct.pm#24 edit
... //depot/perl/lib/Cwd.pm#49 edit
... //depot/perl/lib/Dumpvalue.pm#13 edit
... //depot/perl/lib/ExtUtils/Command.pm#14 edit
... //depot/perl/lib/ExtUtils/Install.pm#30 edit
... //depot/perl/lib/ExtUtils/Installed.pm#11 edit
... //depot/perl/lib/ExtUtils/Liblist.pm#31 edit
... //depot/perl/lib/ExtUtils/Mksymlists.pm#28 edit
... //depot/perl/lib/ExtUtils/Packlist.pm#8 edit
... //depot/perl/lib/Fatal.pm#9 edit
... //depot/perl/lib/File/Basename.pm#25 edit
... //depot/perl/lib/File/CheckTree.pm#9 edit
... //depot/perl/lib/File/Compare.pm#13 edit
... //depot/perl/lib/File/Copy.pm#24 edit
... //depot/perl/lib/File/Find.pm#51 edit
... //depot/perl/lib/File/Path.pm#28 edit
... //depot/perl/lib/File/stat.pm#12 edit
... //depot/perl/lib/FileHandle.pm#14 edit
... //depot/perl/lib/Math/Trig.pm#19 edit
... //depot/perl/lib/Net/Ping.pm#20 edit
... //depot/perl/lib/Net/hostent.pm#11 edit
... //depot/perl/lib/Net/netent.pm#11 edit
... //depot/perl/lib/Net/protoent.pm#12 edit
... //depot/perl/lib/Net/servent.pm#9 edit
... //depot/perl/lib/Shell.pm#14 edit
... //depot/perl/lib/Tie/Array.pm#14 edit
... //depot/perl/lib/Tie/Handle.pm#14 edit
... //depot/perl/lib/Time/Local.pm#22 edit
... //depot/perl/lib/Time/gmtime.pm#10 edit
... //depot/perl/lib/Time/localtime.pm#10 edit
... //depot/perl/lib/User/grent.pm#10 edit
... //depot/perl/lib/base.pm#16 edit
... //depot/perl/lib/diagnostics.pm#25 edit
... //depot/perl/lib/fields.pm#19 edit
... //depot/perl/lib/vars.pm#18 edit
... //depot/perl/pod/perl56delta.pod#17 edit
... //depot/perl/pod/perlfunc.pod#263 edit
... //depot/perl/pp_ctl.c#284 edit
... //depot/perl/utils/pl2pm.PL#12 edit

Differences ...

==== //depot/perl/ext/ByteLoader/bytecode.h#24 (text) ====
Index: perl/ext/ByteLoader/bytecode.h
--- perl/ext/ByteLoader/bytecode.h.~1~	Thu Nov 22 14:36:50 2001
+++ perl/ext/ByteLoader/bytecode.h	Thu Nov 22 14:36:50 2001
@@ -205,7 +205,7 @@
 	bset_obj_store(aTHX_ bstate, obj, (I32)ix) : (bstate->bs_obj_list[ix] = obj)
 
 /* NOTE: the bytecode header only sanity-checks the bytecode. If a script cares about
- * what version of Perl it's being called under, it should do a 'require 5.6.0' or
+ * what version of Perl it's being called under, it should do a 'use 5.006_001' or
  * equivalent. However, since the header includes checks requiring an exact match in
  * ByteLoader versions (we can't guarantee forward compatibility), you don't 
  * need to specify one:

==== //depot/perl/ext/Data/Dumper/Dumper.pm#22 (text) ====
Index: perl/ext/Data/Dumper/Dumper.pm
--- perl/ext/Data/Dumper/Dumper.pm.~1~	Thu Nov 22 14:36:50 2001
+++ perl/ext/Data/Dumper/Dumper.pm	Thu Nov 22 14:36:50 2001
@@ -13,7 +13,7 @@
 
 #$| = 1;
 
-require 5.6.1;
+use 5.006_001;
 require Exporter;
 use XSLoader ();
 require overload;

==== //depot/perl/ext/Devel/DProf/DProf.pm#8 (text) ====
Index: perl/ext/Devel/DProf/DProf.pm
--- perl/ext/Devel/DProf/DProf.pm.~1~	Thu Nov 22 14:36:50 2001
+++ perl/ext/Devel/DProf/DProf.pm	Thu Nov 22 14:36:50 2001
@@ -1,4 +1,4 @@
-require 5.6.1;
+use 5.006_001;
 
 =head1 NAME
 

==== //depot/perl/ext/IO/lib/IO/Dir.pm#7 (text) ====
Index: perl/ext/IO/lib/IO/Dir.pm
--- perl/ext/IO/lib/IO/Dir.pm.~1~	Thu Nov 22 14:36:50 2001
+++ perl/ext/IO/lib/IO/Dir.pm	Thu Nov 22 14:36:50 2001
@@ -6,7 +6,7 @@
 
 package IO::Dir;
 
-use 5.6.0;
+use 5.006;
 
 use strict;
 use Carp;

==== //depot/perl/ext/IO/lib/IO/File.pm#14 (text) ====
Index: perl/ext/IO/lib/IO/File.pm
--- perl/ext/IO/lib/IO/File.pm.~1~	Thu Nov 22 14:36:50 2001
+++ perl/ext/IO/lib/IO/File.pm	Thu Nov 22 14:36:50 2001
@@ -103,7 +103,7 @@
 
 =cut
 
-require 5.6.1;
+use 5.006_001;
 use strict;
 our($VERSION, @EXPORT, @EXPORT_OK, @ISA);
 use Carp;

==== //depot/perl/ext/IO/lib/IO/Handle.pm#25 (text) ====
Index: perl/ext/IO/lib/IO/Handle.pm
--- perl/ext/IO/lib/IO/Handle.pm.~1~	Thu Nov 22 14:36:50 2001
+++ perl/ext/IO/lib/IO/Handle.pm	Thu Nov 22 14:36:50 2001
@@ -247,7 +247,7 @@
 
 =cut
 
-require 5.6.1;
+use 5.006_001;
 use strict;
 our($VERSION, @EXPORT_OK, @ISA);
 use Carp;

==== //depot/perl/ext/IO/lib/IO/Pipe.pm#13 (text) ====
Index: perl/ext/IO/lib/IO/Pipe.pm
--- perl/ext/IO/lib/IO/Pipe.pm.~1~	Thu Nov 22 14:36:50 2001
+++ perl/ext/IO/lib/IO/Pipe.pm	Thu Nov 22 14:36:50 2001
@@ -6,7 +6,7 @@
 
 package IO::Pipe;
 
-require 5.6.1;
+use 5.006_001;
 
 use IO::Handle;
 use strict;

==== //depot/perl/ext/IO/lib/IO/Seekable.pm#17 (text) ====
Index: perl/ext/IO/lib/IO/Seekable.pm
--- perl/ext/IO/lib/IO/Seekable.pm.~1~	Thu Nov 22 14:36:50 2001
+++ perl/ext/IO/lib/IO/Seekable.pm	Thu Nov 22 14:36:50 2001
@@ -94,7 +94,7 @@
 
 =cut
 
-require 5.6.1;
+use 5.006_001;
 use Carp;
 use strict;
 our($VERSION, @EXPORT, @ISA);

==== //depot/perl/ext/Opcode/Opcode.pm#25 (text) ====
Index: perl/ext/Opcode/Opcode.pm
--- perl/ext/Opcode/Opcode.pm.~1~	Thu Nov 22 14:36:50 2001
+++ perl/ext/Opcode/Opcode.pm	Thu Nov 22 14:36:50 2001
@@ -1,6 +1,6 @@
 package Opcode;
 
-require 5.6.1;
+use 5.006_001;
 
 use strict;
 

==== //depot/perl/lib/AnyDBM_File.pm#11 (text) ====
Index: perl/lib/AnyDBM_File.pm
--- perl/lib/AnyDBM_File.pm.~1~	Thu Nov 22 14:36:50 2001
+++ perl/lib/AnyDBM_File.pm	Thu Nov 22 14:36:50 2001
@@ -1,6 +1,6 @@
 package AnyDBM_File;
 
-use 5.6.1;
+use 5.006_001;
 our $VERSION = '1.00';
 our @ISA = qw(NDBM_File DB_File GDBM_File SDBM_File ODBM_File) unless @ISA;
 

==== //depot/perl/lib/AutoLoader.pm#26 (text) ====
Index: perl/lib/AutoLoader.pm
--- perl/lib/AutoLoader.pm.~1~	Thu Nov 22 14:36:50 2001
+++ perl/lib/AutoLoader.pm	Thu Nov 22 14:36:50 2001
@@ -1,6 +1,6 @@
 package AutoLoader;
 
-use 5.6.0;
+use 5.006_001;
 our(@EXPORT, @EXPORT_OK, $VERSION);
 
 my $is_dosish;

==== //depot/perl/lib/AutoSplit.pm#30 (text) ====
Index: perl/lib/AutoSplit.pm
--- perl/lib/AutoSplit.pm.~1~	Thu Nov 22 14:36:50 2001
+++ perl/lib/AutoSplit.pm	Thu Nov 22 14:36:50 2001
@@ -1,6 +1,6 @@
 package AutoSplit;
 
-use 5.6.1;
+use 5.006_001;
 use Exporter ();
 use Config qw(%Config);
 use Carp qw(carp);

==== //depot/perl/lib/Class/Struct.pm#24 (text) ====
Index: perl/lib/Class/Struct.pm
--- perl/lib/Class/Struct.pm.~1~	Thu Nov 22 14:36:50 2001
+++ perl/lib/Class/Struct.pm	Thu Nov 22 14:36:50 2001
@@ -2,7 +2,7 @@
 
 ## See POD after __END__
 
-use 5.6.1;
+use 5.006_001;
 
 use strict;
 use warnings::register;

==== //depot/perl/lib/Cwd.pm#49 (text) ====
Index: perl/lib/Cwd.pm
--- perl/lib/Cwd.pm.~1~	Thu Nov 22 14:36:50 2001
+++ perl/lib/Cwd.pm	Thu Nov 22 14:36:50 2001
@@ -1,5 +1,5 @@
 package Cwd;
-require 5.6.0;
+use 5.006;
 
 =head1 NAME
 

==== //depot/perl/lib/Dumpvalue.pm#13 (text) ====
Index: perl/lib/Dumpvalue.pm
--- perl/lib/Dumpvalue.pm.~1~	Thu Nov 22 14:36:50 2001
+++ perl/lib/Dumpvalue.pm	Thu Nov 22 14:36:50 2001
@@ -1,4 +1,4 @@
-use 5.6.1;			# for (defined ref) and $#$v and our
+use 5.006_001;			# for (defined ref) and $#$v and our
 package Dumpvalue;
 use strict;
 our $VERSION = '1.00';

==== //depot/perl/lib/ExtUtils/Command.pm#14 (text) ====
Index: perl/lib/ExtUtils/Command.pm
--- perl/lib/ExtUtils/Command.pm.~1~	Thu Nov 22 14:36:50 2001
+++ perl/lib/ExtUtils/Command.pm	Thu Nov 22 14:36:50 2001
@@ -1,6 +1,6 @@
 package ExtUtils::Command;
 
-use 5.6.1;
+use 5.006_001;
 use strict;
 # use AutoLoader;
 use Carp;

==== //depot/perl/lib/ExtUtils/Install.pm#30 (text) ====
Index: perl/lib/ExtUtils/Install.pm
--- perl/lib/ExtUtils/Install.pm.~1~	Thu Nov 22 14:36:50 2001
+++ perl/lib/ExtUtils/Install.pm	Thu Nov 22 14:36:50 2001
@@ -1,6 +1,6 @@
 package ExtUtils::Install;
 
-use 5.6.1;
+use 5.006_001;
 our(@ISA, @EXPORT, $VERSION);
 $VERSION = substr q$Revision: 1.29 $, 10;
 # $Date: 1998/01/25 07:08:24 $

==== //depot/perl/lib/ExtUtils/Installed.pm#11 (text) ====
Index: perl/lib/ExtUtils/Installed.pm
--- perl/lib/ExtUtils/Installed.pm.~1~	Thu Nov 22 14:36:50 2001
+++ perl/lib/ExtUtils/Installed.pm	Thu Nov 22 14:36:50 2001
@@ -1,6 +1,6 @@
 package ExtUtils::Installed;
 
-use 5.6.1;
+use 5.006_001;
 use strict;
 use Carp qw();
 use ExtUtils::Packlist;

==== //depot/perl/lib/ExtUtils/Liblist.pm#31 (text) ====
Index: perl/lib/ExtUtils/Liblist.pm
--- perl/lib/ExtUtils/Liblist.pm.~1~	Thu Nov 22 14:36:50 2001
+++ perl/lib/ExtUtils/Liblist.pm	Thu Nov 22 14:36:50 2001
@@ -21,7 +21,7 @@
 # This kid package is to be used by MakeMaker.  It will not work if
 # $self is not a Makemaker.
 
-use 5.6.1;
+use 5.006_001;
 # Broken out of MakeMaker from version 4.11
 
 our $VERSION = substr q$Revision: 1.27 $, 10;

==== //depot/perl/lib/ExtUtils/Mksymlists.pm#28 (text) ====
Index: perl/lib/ExtUtils/Mksymlists.pm
--- perl/lib/ExtUtils/Mksymlists.pm.~1~	Thu Nov 22 14:36:50 2001
+++ perl/lib/ExtUtils/Mksymlists.pm	Thu Nov 22 14:36:50 2001
@@ -1,6 +1,6 @@
 package ExtUtils::Mksymlists;
 
-use 5.6.1;
+use 5.006_001;
 use strict qw[ subs refs ];
 # no strict 'vars';  # until filehandles are exempted
 

==== //depot/perl/lib/ExtUtils/Packlist.pm#8 (text) ====
Index: perl/lib/ExtUtils/Packlist.pm
--- perl/lib/ExtUtils/Packlist.pm.~1~	Thu Nov 22 14:36:50 2001
+++ perl/lib/ExtUtils/Packlist.pm	Thu Nov 22 14:36:50 2001
@@ -1,6 +1,6 @@
 package ExtUtils::Packlist;
 
-use 5.6.1;
+use 5.006_001;
 use strict;
 use Carp qw();
 our $VERSION = '0.04';

==== //depot/perl/lib/Fatal.pm#9 (text) ====
Index: perl/lib/Fatal.pm
--- perl/lib/Fatal.pm.~1~	Thu Nov 22 14:36:50 2001
+++ perl/lib/Fatal.pm	Thu Nov 22 14:36:50 2001
@@ -1,6 +1,6 @@
 package Fatal;
 
-use 5.6.1;
+use 5.006_001;
 use Carp;
 use strict;
 our($AUTOLOAD, $Debug, $VERSION);

==== //depot/perl/lib/File/Basename.pm#25 (text) ====
Index: perl/lib/File/Basename.pm
--- perl/lib/File/Basename.pm.~1~	Thu Nov 22 14:36:50 2001
+++ perl/lib/File/Basename.pm	Thu Nov 22 14:36:50 2001
@@ -135,7 +135,7 @@
 
 
 
-use 5.6.0;
+use 5.006;
 use warnings;
 our(@ISA, @EXPORT, $VERSION, $Fileparse_fstype, $Fileparse_igncase);
 require Exporter;

==== //depot/perl/lib/File/CheckTree.pm#9 (text) ====
Index: perl/lib/File/CheckTree.pm
--- perl/lib/File/CheckTree.pm.~1~	Thu Nov 22 14:36:50 2001
+++ perl/lib/File/CheckTree.pm	Thu Nov 22 14:36:50 2001
@@ -2,7 +2,7 @@
 
 our $VERSION = '4.1';
 
-require 5.6.0;
+use 5.006;
 require Exporter;
 use warnings;
 

==== //depot/perl/lib/File/Compare.pm#13 (text) ====
Index: perl/lib/File/Compare.pm
--- perl/lib/File/Compare.pm.~1~	Thu Nov 22 14:36:50 2001
+++ perl/lib/File/Compare.pm	Thu Nov 22 14:36:50 2001
@@ -1,6 +1,6 @@
 package File::Compare;
 
-use 5.6.0;
+use 5.006;
 use strict;
 use warnings;
 our($VERSION, @ISA, @EXPORT, @EXPORT_OK, $Too_Big);

==== //depot/perl/lib/File/Copy.pm#24 (text) ====
Index: perl/lib/File/Copy.pm
--- perl/lib/File/Copy.pm.~1~	Thu Nov 22 14:36:50 2001
+++ perl/lib/File/Copy.pm	Thu Nov 22 14:36:50 2001
@@ -7,7 +7,7 @@
 
 package File::Copy;
 
-use 5.6.0;
+use 5.006;
 use strict;
 use warnings;
 use Carp;

==== //depot/perl/lib/File/Find.pm#51 (text) ====
Index: perl/lib/File/Find.pm
--- perl/lib/File/Find.pm.~1~	Thu Nov 22 14:36:50 2001
+++ perl/lib/File/Find.pm	Thu Nov 22 14:36:50 2001
@@ -1,7 +1,7 @@
 package File::Find;
+use 5.006;
 use strict;
 use warnings;
-use 5.6.0;
 our $VERSION = '1.02';
 require Exporter;
 require Cwd;

==== //depot/perl/lib/File/Path.pm#28 (text) ====
Index: perl/lib/File/Path.pm
--- perl/lib/File/Path.pm.~1~	Thu Nov 22 14:36:50 2001
+++ perl/lib/File/Path.pm	Thu Nov 22 14:36:50 2001
@@ -91,7 +91,7 @@
 
 =cut
 
-use 5.6.0;
+use 5.006;
 use Carp;
 use File::Basename ();
 use Exporter ();

==== //depot/perl/lib/File/stat.pm#12 (text) ====
Index: perl/lib/File/stat.pm
--- perl/lib/File/stat.pm.~1~	Thu Nov 22 14:36:50 2001
+++ perl/lib/File/stat.pm	Thu Nov 22 14:36:50 2001
@@ -1,8 +1,9 @@
 package File::stat;
+use 5.006;
+
 use strict;
 use warnings;
 
-use 5.6.0;
 our(@EXPORT, @EXPORT_OK, %EXPORT_TAGS);
 
 our $VERSION = '1.00';

==== //depot/perl/lib/FileHandle.pm#14 (text) ====
Index: perl/lib/FileHandle.pm
--- perl/lib/FileHandle.pm.~1~	Thu Nov 22 14:36:50 2001
+++ perl/lib/FileHandle.pm	Thu Nov 22 14:36:50 2001
@@ -1,6 +1,6 @@
 package FileHandle;
 
-use 5.6.1;
+use 5.006;
 use strict;
 our($VERSION, @ISA, @EXPORT, @EXPORT_OK);
 

==== //depot/perl/lib/Math/Trig.pm#19 (text) ====
Index: perl/lib/Math/Trig.pm
--- perl/lib/Math/Trig.pm.~1~	Thu Nov 22 14:36:50 2001
+++ perl/lib/Math/Trig.pm	Thu Nov 22 14:36:50 2001
@@ -7,7 +7,7 @@
 require Exporter;
 package Math::Trig;
 
-use 5.6.1;
+use 5.006;
 use strict;
 
 use Math::Complex qw(:trig);

==== //depot/perl/lib/Net/Ping.pm#20 (text) ====
Index: perl/lib/Net/Ping.pm
--- perl/lib/Net/Ping.pm.~1~	Thu Nov 22 14:36:50 2001
+++ perl/lib/Net/Ping.pm	Thu Nov 22 14:36:50 2001
@@ -12,7 +12,7 @@
 # Copyright (c) 2001, Colin McMillen.  All rights reserved.  This
 # program is free software; you may redistribute it and/or modify it
 # under the same terms as Perl itself.
-use 5.6.1;
+use 5.006_001;
 require Exporter;
 
 use strict;

==== //depot/perl/lib/Net/hostent.pm#11 (text) ====
Index: perl/lib/Net/hostent.pm
--- perl/lib/Net/hostent.pm.~1~	Thu Nov 22 14:36:50 2001
+++ perl/lib/Net/hostent.pm	Thu Nov 22 14:36:50 2001
@@ -1,7 +1,7 @@
 package Net::hostent;
 use strict;
 
-use 5.6.1;
+use 5.006_001;
 our $VERSION = '1.00';
 our(@EXPORT, @EXPORT_OK, %EXPORT_TAGS);
 BEGIN { 

==== //depot/perl/lib/Net/netent.pm#11 (text) ====
Index: perl/lib/Net/netent.pm
--- perl/lib/Net/netent.pm.~1~	Thu Nov 22 14:36:50 2001
+++ perl/lib/Net/netent.pm	Thu Nov 22 14:36:50 2001
@@ -1,7 +1,7 @@
 package Net::netent;
 use strict;
 
-use 5.6.1;
+use 5.006_001;
 our $VERSION = '1.00';
 our(@EXPORT, @EXPORT_OK, %EXPORT_TAGS);
 BEGIN { 

==== //depot/perl/lib/Net/protoent.pm#12 (text) ====
Index: perl/lib/Net/protoent.pm
--- perl/lib/Net/protoent.pm.~1~	Thu Nov 22 14:36:50 2001
+++ perl/lib/Net/protoent.pm	Thu Nov 22 14:36:50 2001
@@ -1,7 +1,7 @@
 package Net::protoent;
 use strict;
 
-use 5.6.1;
+use 5.006_001;
 our $VERSION = '1.00';
 our(@EXPORT, @EXPORT_OK, %EXPORT_TAGS);
 BEGIN { 

==== //depot/perl/lib/Net/servent.pm#9 (text) ====
Index: perl/lib/Net/servent.pm
--- perl/lib/Net/servent.pm.~1~	Thu Nov 22 14:36:50 2001
+++ perl/lib/Net/servent.pm	Thu Nov 22 14:36:50 2001
@@ -1,7 +1,7 @@
 package Net::servent;
 use strict;
 
-use 5.6.1;
+use 5.006_001;
 our $VERSION = '1.00';
 our(@EXPORT, @EXPORT_OK, %EXPORT_TAGS);
 BEGIN {

==== //depot/perl/lib/Shell.pm#14 (text) ====
Index: perl/lib/Shell.pm
--- perl/lib/Shell.pm.~1~	Thu Nov 22 14:36:50 2001
+++ perl/lib/Shell.pm	Thu Nov 22 14:36:50 2001
@@ -1,5 +1,5 @@
 package Shell;
-use 5.6.1;
+use 5.006_001;
 use strict;
 use warnings;
 our($capture_stderr, $VERSION, $AUTOLOAD);

==== //depot/perl/lib/Tie/Array.pm#14 (text) ====
Index: perl/lib/Tie/Array.pm
--- perl/lib/Tie/Array.pm.~1~	Thu Nov 22 14:36:50 2001
+++ perl/lib/Tie/Array.pm	Thu Nov 22 14:36:50 2001
@@ -1,6 +1,6 @@
 package Tie::Array;
 
-use 5.6.1;
+use 5.006_001;
 use strict;
 use Carp;
 our $VERSION = '1.02';

==== //depot/perl/lib/Tie/Handle.pm#14 (text) ====
Index: perl/lib/Tie/Handle.pm
--- perl/lib/Tie/Handle.pm.~1~	Thu Nov 22 14:36:50 2001
+++ perl/lib/Tie/Handle.pm	Thu Nov 22 14:36:50 2001
@@ -1,6 +1,6 @@
 package Tie::Handle;
 
-use 5.6.1;
+use 5.006_001;
 our $VERSION = '4.1';
 
 =head1 NAME

==== //depot/perl/lib/Time/Local.pm#22 (text) ====
Index: perl/lib/Time/Local.pm
--- perl/lib/Time/Local.pm.~1~	Thu Nov 22 14:36:50 2001
+++ perl/lib/Time/Local.pm	Thu Nov 22 14:36:50 2001
@@ -1,5 +1,5 @@
 package Time::Local;
-require 5.6.0;
+use 5.006;
 require Exporter;
 use Carp;
 use strict;

==== //depot/perl/lib/Time/gmtime.pm#10 (text) ====
Index: perl/lib/Time/gmtime.pm
--- perl/lib/Time/gmtime.pm.~1~	Thu Nov 22 14:36:50 2001
+++ perl/lib/Time/gmtime.pm	Thu Nov 22 14:36:50 2001
@@ -1,8 +1,9 @@
 package Time::gmtime;
 use strict;
+use 5.006_001;
+
 use Time::tm;
 
-use 5.6.1;
 our(@ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS, $VERSION);
 BEGIN { 
     use Exporter   ();

==== //depot/perl/lib/Time/localtime.pm#10 (text) ====
Index: perl/lib/Time/localtime.pm
--- perl/lib/Time/localtime.pm.~1~	Thu Nov 22 14:36:50 2001
+++ perl/lib/Time/localtime.pm	Thu Nov 22 14:36:50 2001
@@ -1,8 +1,9 @@
 package Time::localtime;
 use strict;
+use 5.006_001;
+
 use Time::tm;
 
-use 5.6.1;
 our(@ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS, $VERSION);
 BEGIN {
     use Exporter   ();

==== //depot/perl/lib/User/grent.pm#10 (text) ====
Index: perl/lib/User/grent.pm
--- perl/lib/User/grent.pm.~1~	Thu Nov 22 14:36:50 2001
+++ perl/lib/User/grent.pm	Thu Nov 22 14:36:50 2001
@@ -1,7 +1,7 @@
 package User::grent;
 use strict;
 
-use 5.6.1;
+use 5.006_001;
 our $VERSION = '1.00';
 our(@EXPORT, @EXPORT_OK, %EXPORT_TAGS);
 BEGIN { 

==== //depot/perl/lib/base.pm#16 (text) ====
Index: perl/lib/base.pm
--- perl/lib/base.pm.~1~	Thu Nov 22 14:36:50 2001
+++ perl/lib/base.pm	Thu Nov 22 14:36:50 2001
@@ -44,7 +44,7 @@
 
 package base;
 
-use 5.6.1;
+use 5.006_001;
 our $VERSION = "1.02";
 
 sub import {

==== //depot/perl/lib/diagnostics.pm#25 (xtext) ====
Index: perl/lib/diagnostics.pm
--- perl/lib/diagnostics.pm.~1~	Thu Nov 22 14:36:50 2001
+++ perl/lib/diagnostics.pm	Thu Nov 22 14:36:50 2001
@@ -168,7 +168,7 @@
 =cut
 
 use strict;
-use 5.6.0;
+use 5.006;
 use Carp;
 
 our $VERSION = 1.1;

==== //depot/perl/lib/fields.pm#19 (text) ====
Index: perl/lib/fields.pm
--- perl/lib/fields.pm.~1~	Thu Nov 22 14:36:50 2001
+++ perl/lib/fields.pm	Thu Nov 22 14:36:50 2001
@@ -127,7 +127,7 @@
 
 =cut
 
-use 5.6.1;
+use 5.006_001;
 use strict;
 no strict 'refs';
 use warnings::register;

==== //depot/perl/lib/vars.pm#18 (text) ====
Index: perl/lib/vars.pm
--- perl/lib/vars.pm.~1~	Thu Nov 22 14:36:50 2001
+++ perl/lib/vars.pm	Thu Nov 22 14:36:50 2001
@@ -1,6 +1,6 @@
 package vars;
 
-require 5.6.0;
+use 5.006;
 
 our $VERSION = '1.01';
 

==== //depot/perl/pod/perl56delta.pod#17 (text) ====
Index: perl/pod/perl56delta.pod
--- perl/pod/perl56delta.pod.~1~	Thu Nov 22 14:36:50 2001
+++ perl/pod/perl56delta.pod	Thu Nov 22 14:36:50 2001
@@ -112,16 +112,14 @@
         # new features supported
     }
 
-C<require> and C<use> also have some special magic to support such literals.
-They will be interpreted as a version rather than as a module name:
+C<require> and C<use> also have some special magic to support such
+literals, but this particular usage should be avoided because it leads to
+misleading error messages under versions of Perl which don't support vector
+strings.  Using a true version number will ensure correct behavior in all
+versions of Perl:
 
-    require v5.6.0;		# croak if $^V lt v5.6.0
-    use v5.6.0;			# same, but croaks at compile-time
-
-Alternatively, the C<v> may be omitted if there is more than one dot:
-
-    require 5.6.0;
-    use 5.6.0;
+    require 5.006;    # run time check for v5.6
+    use 5.006_001;    # compile time check for v5.6.1
 
 Also, C<sprintf> and C<printf> support the Perl-specific format flag C<%v>
 to print ordinals of characters in arbitrary strings:

==== //depot/perl/pod/perlfunc.pod#263 (text) ====
Index: perl/pod/perlfunc.pod
--- perl/pod/perlfunc.pod.~1~	Thu Nov 22 14:36:50 2001
+++ perl/pod/perlfunc.pod	Thu Nov 22 14:36:50 2001
@@ -3755,19 +3755,23 @@
 
 =item require
 
-Demands some semantics specified by EXPR, or by C<$_> if EXPR is not
-supplied.
+Demands a version of Perl specified by VERSION, or demands some semantics
+specified by EXPR or by C<$_> if EXPR is not supplied.
+
+VERSION may be either a numeric argument such as 5.006, which will be
+compared to C<$]>, or a literal of the form v5.6.1, which will be compared
+to C<$^V> (aka $PERL_VERSION).  A fatal error is produced at run time if
+VERSION is greater than the version of the current Perl interpreter.
+Compare with L</use>, which can do a similar check at compile time.
 
-If a VERSION is specified as a literal of the form v5.6.1,
-demands that the current version of Perl (C<$^V> or $PERL_VERSION) be
-at least as recent as that version, at run time.  (For compatibility
-with older versions of Perl, a numeric argument will also be interpreted
-as VERSION.)  Compare with L</use>, which can do a similar check at
-compile time.
+Specifying VERSION as a literal of the form v5.6.1 should generally be
+avoided, because it leads to misleading error messages under earlier
+versions of Perl which do not support this syntax.  The equivalent numeric
+version should be used instead.
 
     require v5.6.1;	# run time version check
     require 5.6.1;	# ditto
-    require 5.005_03;	# float version allowed for compatibility
+    require 5.006_001;	# ditto; preferred for backwards compatibility
 
 Otherwise, demands that a library file be included if it hasn't already
 been included.  The file is included via the do-FILE mechanism, which is
@@ -5640,18 +5644,21 @@
 
 except that Module I<must> be a bareword.
 
-VERSION, which can be specified as a literal of the form v5.6.1, demands
-that the current version of Perl (C<$^V> or $PERL_VERSION) be at least
-as recent as that version.  (For compatibility with older versions of Perl,
-a numeric literal will also be interpreted as VERSION.)  If the version
-of the running Perl interpreter is less than VERSION, then an error
-message is printed and Perl exits immediately without attempting to
-parse the rest of the file.  Compare with L</require>, which can do a
-similar check at run time.
+VERSION may be either a numeric argument such as 5.006, which will be
+compared to C<$]>, or a literal of the form v5.6.1, which will be compared
+to C<$^V> (aka $PERL_VERSION.  A fatal error is produced if VERSION is
+greater than the version of the current Perl interpreter; Perl will not
+attempt to parse the rest of the file.  Compare with L</require>, which can
+do a similar check at run time.
+
+Specifying VERSION as a literal of the form v5.6.1 should generally be
+avoided, because it leads to misleading error messages under earlier
+versions of Perl which do not support this syntax.  The equivalent numeric
+version should be used instead.
 
     use v5.6.1;		# compile time version check
     use 5.6.1;		# ditto
-    use 5.005_03;	# float version allowed for compatibility
+    use 5.006_001;	# ditto; preferred for backwards compatibility
 
 This is often useful if you need to check the current Perl version before
 C<use>ing library modules that have changed in incompatible ways from

==== //depot/perl/pp_ctl.c#284 (text) ====
Index: perl/pp_ctl.c
--- perl/pp_ctl.c.~1~	Thu Nov 22 14:36:50 2001
+++ perl/pp_ctl.c	Thu Nov 22 14:36:50 2001
@@ -3078,7 +3078,7 @@
 		if (sver == 0 && (rev > 5 || (rev == 5 && ver >= 100))) {
 		    DIE(aTHX_ "Perl v%"UVuf".%"UVuf".%"UVuf" required--"
 			"this is only v%d.%d.%d, stopped"
-			" (did you mean v%"UVuf".%"UVuf".0?)",
+			" (did you mean v%"UVuf".%03"UVuf"?)",
 			rev, ver, sver, PERL_REVISION, PERL_VERSION,
 			PERL_SUBVERSION, rev, ver/100);
 		}

==== //depot/perl/utils/pl2pm.PL#12 (text) ====
Index: perl/utils/pl2pm.PL
--- perl/utils/pl2pm.PL.~1~	Thu Nov 22 14:36:50 2001
+++ perl/utils/pl2pm.PL	Thu Nov 22 14:36:50 2001
@@ -129,7 +129,7 @@
     if ( open(PM, ">$newname") ) {
         print PM <<"END";
 package $newpack;
-require 5.6.0;
+use 5.006;
 require Exporter;
 $carp
 \@ISA = qw(Exporter);
End of Patch.
