Update ExtUtils-Install to CPAN version 2.18

[DELTA]

2.18

- Add descriptions for 3 tests lacking them
- Removed bundled Test::More from t/lib
- 'use strict' added to all files where missing
- 'use vars' replaced with 'our'
- Properly scope all variables
- Minimal supported perl version is now v5.6.0

12 files changed, 24 insertions, 23 deletions

diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 9e587a5aab..7a41a465ba 100755
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -462,7 +462,7 @@ use File::Glob qw(:case);
     },
 
     'ExtUtils::Install' => {
-        'DISTRIBUTION' => 'BINGOS/ExtUtils-Install-2.16.tar.gz',
+        'DISTRIBUTION' => 'BINGOS/ExtUtils-Install-2.18.tar.gz',
         'FILES'        => q[cpan/ExtUtils-Install],
         'EXCLUDED'     => [
             qw( t/lib/Test/Builder.pm
diff --git a/cpan/ExtUtils-Install/lib/ExtUtils/Install.pm b/cpan/ExtUtils-Install/lib/ExtUtils/Install.pm
index f59ec32380..2fb43bc8d4 100644
--- a/cpan/ExtUtils-Install/lib/ExtUtils/Install.pm
+++ b/cpan/ExtUtils-Install/lib/ExtUtils/Install.pm
@@ -32,11 +32,11 @@ ExtUtils::Install - install files from here to there
 
 =head1 VERSION
 
-2.16
+2.18
 
 =cut
 
-our $VERSION = '2.16';  # <-- do not forget to update the POD section just above this line!
+our $VERSION = '2.18';  # <-- do not forget to update the POD section just above this line!
 $VERSION = eval $VERSION;
 
 =pod
diff --git a/cpan/ExtUtils-Install/lib/ExtUtils/Installed.pm b/cpan/ExtUtils-Install/lib/ExtUtils/Installed.pm
index 57df708b94..f12ea23f19 100644
--- a/cpan/ExtUtils-Install/lib/ExtUtils/Installed.pm
+++ b/cpan/ExtUtils-Install/lib/ExtUtils/Installed.pm
@@ -1,7 +1,6 @@
+use strict;
 package ExtUtils::Installed;
 
-use 5.00503;
-use strict;
 #use warnings; # XXX requires 5.6
 use Carp qw();
 use ExtUtils::Packlist;
@@ -16,8 +15,7 @@ my $DOSISH = ($^O =~ /^(MSWin\d\d|os2|dos|mint)$/);
 
 require VMS::Filespec if $Is_VMS;
 
-use vars qw($VERSION);
-$VERSION = '2.16';
+our $VERSION = '2.18';
 $VERSION = eval $VERSION;
 
 sub _is_prefix {
diff --git a/cpan/ExtUtils-Install/lib/ExtUtils/Packlist.pm b/cpan/ExtUtils-Install/lib/ExtUtils/Packlist.pm
index ffae490d8d..f975b41b04 100644
--- a/cpan/ExtUtils-Install/lib/ExtUtils/Packlist.pm
+++ b/cpan/ExtUtils-Install/lib/ExtUtils/Packlist.pm
@@ -1,11 +1,10 @@
 package ExtUtils::Packlist;
-
-use 5.00503;
 use strict;
+
 use Carp qw();
 use Config;
-use vars qw($VERSION $Relocations);
-$VERSION = '2.16';
+our $Relocations;
+our $VERSION = '2.18';
 $VERSION = eval $VERSION;
 
 # Used for generating filehandle globs.  IO::File might not be available!
diff --git a/cpan/ExtUtils-Install/t/Install.t b/cpan/ExtUtils-Install/t/Install.t
index 0900b58cb8..6ca6df5c4b 100644
--- a/cpan/ExtUtils-Install/t/Install.t
+++ b/cpan/ExtUtils-Install/t/Install.t
@@ -1,4 +1,5 @@
 #!/usr/bin/perl -w
+use strict;
 
 # Test ExtUtils::Install.
 
@@ -6,7 +7,6 @@ BEGIN {
     unshift @INC, 't/lib';
 }
 
-use strict;
 use TieOut;
 use File::Path;
 use File::Spec;
diff --git a/cpan/ExtUtils-Install/t/InstallWithMM.t b/cpan/ExtUtils-Install/t/InstallWithMM.t
index d656d43833..6a04eb841d 100644
--- a/cpan/ExtUtils-Install/t/InstallWithMM.t
+++ b/cpan/ExtUtils-Install/t/InstallWithMM.t
@@ -1,4 +1,5 @@
 #!/usr/bin/perl -w
+use strict;
 
 # Make sure EUI works with MakeMaker
 
@@ -6,7 +7,6 @@ BEGIN {
     unshift @INC, 't/lib';
 }
 
-use strict;
 use Config;
 use ExtUtils::MakeMaker;
 
diff --git a/cpan/ExtUtils-Install/t/Installapi2.t b/cpan/ExtUtils-Install/t/Installapi2.t
index 4acfdc3559..7396ed3524 100644
--- a/cpan/ExtUtils-Install/t/Installapi2.t
+++ b/cpan/ExtUtils-Install/t/Installapi2.t
@@ -1,4 +1,5 @@
 #!/usr/bin/perl -w
+use strict;
 
 # Test ExtUtils::Install.
 
@@ -6,7 +7,6 @@ BEGIN {
     unshift @INC, 't/lib';
 }
 
-use strict;
 use TieOut;
 use File::Path;
 use File::Spec;
diff --git a/cpan/ExtUtils-Install/t/Installed.t b/cpan/ExtUtils-Install/t/Installed.t
index 949bd04cc8..5cf7b80caf 100644
--- a/cpan/ExtUtils-Install/t/Installed.t
+++ b/cpan/ExtUtils-Install/t/Installed.t
@@ -1,4 +1,5 @@
 #!/usr/bin/perl -w
+use strict;
 
 # Test ExtUtils::Installed
 
@@ -9,7 +10,6 @@ BEGIN {
 
 my $Is_VMS = $^O eq 'VMS';
 
-use strict;
 
 use Config;
 use Cwd;
@@ -92,16 +92,17 @@ END { ok(chdir $startdir, "Return to where we started"); }
     my $fakepath = File::Spec->catdir('auto', $fakedir);
     ok( mkpath($fakepath), "Able to create directory $fakepath for testing" );
 
-    ok(open(PACKLIST, '>', File::Spec->catfile($fakepath, '.packlist')));
+    ok(open(PACKLIST, '>', File::Spec->catfile($fakepath, '.packlist')),
+        "Able to open .packlist for writing");
     print PACKLIST 'list';
     close PACKLIST;
 
-    ok(open(FAKEMOD, '>', File::Spec->catfile($fakepath, 'FakeMod.pm')));
+    ok(open(FAKEMOD, '>', File::Spec->catfile($fakepath, 'FakeMod.pm')),
+        "Able to open FakeMod.pm for writing");
 
     print FAKEMOD <<'FAKE';
 package FakeMod;
-use vars qw( $VERSION );
-$VERSION = '1.1.1';
+our $VERSION = '1.1.1';
 1;
 FAKE
 
diff --git a/cpan/ExtUtils-Install/t/Packlist.t b/cpan/ExtUtils-Install/t/Packlist.t
index 3f6c05868c..5b052bdb21 100644
--- a/cpan/ExtUtils-Install/t/Packlist.t
+++ b/cpan/ExtUtils-Install/t/Packlist.t
@@ -1,4 +1,5 @@
 #!/usr/bin/perl -w
+use strict;
 
 BEGIN {
     unshift @INC, 't/lib';
@@ -162,6 +163,7 @@ is( ExtUtils::Packlist::packlist_file({ packfile => 'pl' }), 'pl',
 is( ExtUtils::Packlist::packlist_file($pl), 'eplist',
 	'packlist_file() should fetch packlist from ExtUtils::Packlist object' );
 
+my $w  = 0;
 BEGIN {
 	# Call mkfh at BEGIN time, to make sure it does not trigger "Used
 	# once" warnings.
diff --git a/cpan/ExtUtils-Install/t/lib/MakeMaker/Test/Setup/BFD.pm b/cpan/ExtUtils-Install/t/lib/MakeMaker/Test/Setup/BFD.pm
index 37ca9a3c01..d0b57a23d5 100644
--- a/cpan/ExtUtils-Install/t/lib/MakeMaker/Test/Setup/BFD.pm
+++ b/cpan/ExtUtils-Install/t/lib/MakeMaker/Test/Setup/BFD.pm
@@ -1,10 +1,10 @@
 package MakeMaker::Test::Setup::BFD;
+use strict;
 
-@ISA = qw(Exporter);
+our @ISA = qw(Exporter);
 require Exporter;
-@EXPORT = qw(setup_recurs teardown_recurs);
+our @EXPORT = qw(setup_recurs teardown_recurs);
 
-use strict;
 use File::Path;
 use File::Basename;
 use MakeMaker::Test::Utils;
diff --git a/cpan/ExtUtils-Install/t/lib/MakeMaker/Test/Utils.pm b/cpan/ExtUtils-Install/t/lib/MakeMaker/Test/Utils.pm
index 8d5ee1a030..281675106b 100644
--- a/cpan/ExtUtils-Install/t/lib/MakeMaker/Test/Utils.pm
+++ b/cpan/ExtUtils-Install/t/lib/MakeMaker/Test/Utils.pm
@@ -1,7 +1,7 @@
 package MakeMaker::Test::Utils;
+use strict;
 
 use File::Spec;
-use strict;
 use Config;
 
 require Exporter;
diff --git a/cpan/ExtUtils-Install/t/lib/TieOut.pm b/cpan/ExtUtils-Install/t/lib/TieOut.pm
index 0a0f5f9cfe..99a5beb355 100644
--- a/cpan/ExtUtils-Install/t/lib/TieOut.pm
+++ b/cpan/ExtUtils-Install/t/lib/TieOut.pm
@@ -1,4 +1,5 @@
 package TieOut;
+use strict;
 
 sub TIEHANDLE {
     my $scalar = '';