diff options
| -rw-r--r-- | Porting/Maintainers.pm | 9 | ||||
| -rw-r--r-- | Porting/pod_rules.pl | 2 | ||||
| -rwxr-xr-x | configpm | 6 | ||||
| -rw-r--r-- | installhtml | 2 | ||||
| -rwxr-xr-x | installman | 2 | ||||
| -rwxr-xr-x | installperl | 4 | ||||
| -rw-r--r-- | pod/buildtoc | 2 |
7 files changed, 13 insertions, 14 deletions
diff --git a/Porting/Maintainers.pm b/Porting/Maintainers.pm index 1c52829f32..20ed4f7055 100644 --- a/Porting/Maintainers.pm +++ b/Porting/Maintainers.pm @@ -13,16 +13,15 @@ use lib "Porting"; use 5.008; require "Maintainers.pl"; -use vars qw(%Modules %Maintainers); +our (%Modules, %Maintainers); -use vars qw(@ISA @EXPORT_OK $VERSION); -@ISA = qw(Exporter); -@EXPORT_OK = qw(%Modules %Maintainers +our @ISA = qw(Exporter); +our @EXPORT_OK = qw(%Modules %Maintainers get_module_files get_module_pat show_results process_options files_to_modules finish_tap_output reload_manifest); -$VERSION = 0.12; +our $VERSION = 0.13; require Exporter; diff --git a/Porting/pod_rules.pl b/Porting/pod_rules.pl index 7bf1380077..2ba023ba7c 100644 --- a/Porting/pod_rules.pl +++ b/Porting/pod_rules.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl -w use strict; -use vars qw(%Build %Targets $Verbose $Test); +our (%Build, %Targets, $Verbose, $Test); use Text::Tabs; use Text::Wrap; use Getopt::Long; @@ -35,7 +35,7 @@ usage: $0 [ options ] EOF use strict; -use vars qw(%Config $Config_SH_expanded); +our (%Config, $Config_SH_expanded); my $how_many_common = 22; @@ -155,7 +155,7 @@ $config_txt .= sprintf << 'EOT', $], $export_funcs; package Config; use strict; use warnings; -use vars '%%Config', '$VERSION'; +our ( %%Config, $VERSION ); $VERSION = "%s"; @@ -469,7 +469,7 @@ $heavy_txt .= sprintf <<'ENDOFBEG', $osname, $osname, $from, $osname, $env_cygwi package Config; use strict; use warnings; -use vars '%%Config'; +our %%Config; sub bincompat_options { return split ' ', (Internals::V())[0]; diff --git a/installhtml b/installhtml index 1094c6a6f0..1b724c0c41 100644 --- a/installhtml +++ b/installhtml @@ -164,7 +164,7 @@ usage("") unless @ARGV; # See vms/descrip_mms.template -> descrip.mms for invocation. if ( $^O eq 'VMS' ) { @ARGV = split(/\s+/,$ARGV[0]); } -use vars qw( %Options ); +our %Options; # parse the command-line my $result = GetOptions( \%Options, qw( diff --git a/installman b/installman index 53117ab575..0bd435ffa4 100755 --- a/installman +++ b/installman @@ -13,7 +13,7 @@ use strict; use Getopt::Long; use ExtUtils::Packlist; use Pod::Man; -use vars qw(%opts $packlist); +our ( %opts, $packlist ); require './Porting/pod_lib.pl'; my %man1 = (map {($_->[0], $_->[1])} @{get_pod_metadata()->{master}}); diff --git a/installperl b/installperl index af61203e72..3bf79d2d6f 100755 --- a/installperl +++ b/installperl @@ -11,8 +11,8 @@ BEGIN { } use strict; -use vars qw($Is_VMS $Is_W32 $Is_OS2 $Is_Cygwin $Is_Darwin $Is_NetWare $Is_AmigaOS - %opts $packlist); +our ($Is_VMS, $Is_W32, $Is_OS2, $Is_Cygwin, $Is_Darwin, $Is_NetWare, $Is_AmigaOS, + %opts, $packlist); my $versiononly; BEGIN { diff --git a/pod/buildtoc b/pod/buildtoc index 9c66e93792..004a726a0f 100644 --- a/pod/buildtoc +++ b/pod/buildtoc @@ -1,12 +1,12 @@ #!/usr/bin/perl -w use strict; -use vars qw($Quiet); use File::Spec; use FindBin; use Text::Wrap; use Getopt::Long; +our $Quiet; no locale; # Assumption is that we're either already being run from the top level (*nix, |