CPAN version 0.60

System 'grep' unavailable on most Windows.  Replace use of system call to
'grep'.  AppVeyor's Strawberry Perl had no problem with this, but these
CPANtesters did:

http://www.cpantesters.org/cpan/report/cd74e16a-4005-1015-a880-00c65f496936
http://www.cpantesters.org/cpan/report/269463bc-6c6d-1014-9cd3-92b18038f308

Correct incorrect 'Case' number in note.

Quote "0.60" throughout so that it's treated as a string in the Usage message.

Eliminate remaining instances of 'use vars' in favor of 'our'.  Eliminate
version control ID lines.

16 files changed, 46 insertions, 61 deletions

diff --git a/.version_info.pl b/.version_info.pl
index e19638f..22d65ce 100644
--- a/.version_info.pl
+++ b/.version_info.pl
@@ -1,6 +1,6 @@
 %trans = (
-    version => { old => '0.58', new => '0.59' },
-    date    => { old => 'May 05 2018', new => 'May 06 2018' },
+    version => { old => '0.59', new => '0.60' },
+    date    => { old => 'May 06 2018', new => 'May 07 2018' },
     copyright => { old => '2018', new => '2018' },
 );
 
diff --git a/Changes b/Changes
index 04e6398..f2e4702 100644
--- a/Changes
+++ b/Changes
@@ -1,5 +1,10 @@
 Revision history for Perl extension ExtUtils::ModuleMaker.
 
+0.60    May 07, 2018
+
+No functional changes.  Correct syntax in two test files for better results on
+Windows.
+
 0.59    May 06, 2018
 
 Address RTC 125281 (Replace Getopt::Std::getopts() with
diff --git a/README b/README
index ea84aff..46158b2 100644
--- a/README
+++ b/README
@@ -1,14 +1,14 @@
 ExtUtils::ModuleMaker - Better than h2xs for creating modules
 
-This document refers to version 0.59 of ExtUtils::ModuleMaker.
-This version was released May 06 2018.
+This document refers to version 0.60 of ExtUtils::ModuleMaker.
+This version was released May 07 2018.
 
 To install this module on your system, place the tarball archive file in a
 temporary directory and call the following:
 
-% gunzip ExtUtils-ModuleMaker-0.59.tar.gz
-% tar xf ExtUtils-ModuleMaker-0.59.tar
-% cd ExtUtils-ModuleMaker-0.59
+% gunzip ExtUtils-ModuleMaker-0.60.tar.gz
+% tar xf ExtUtils-ModuleMaker-0.60.tar
+% cd ExtUtils-ModuleMaker-0.60
 % perl Makefile.PL
 % make
 % make test
diff --git a/lib/ExtUtils/ModuleMaker.pm b/lib/ExtUtils/ModuleMaker.pm
index 64f0dea..5438cea 100644
--- a/lib/ExtUtils/ModuleMaker.pm
+++ b/lib/ExtUtils/ModuleMaker.pm
@@ -2,7 +2,7 @@ package ExtUtils::ModuleMaker;
 use strict;
 use warnings;
 our (@ISA);
-our $VERSION = 0.59;
+our $VERSION = "0.60";
 use base qw(
     ExtUtils::ModuleMaker::Defaults
     ExtUtils::ModuleMaker::Initializers
@@ -452,8 +452,8 @@ Inside a Perl program:
 
 =head1 VERSION
 
-This document references version 0.59 of ExtUtils::ModuleMaker, released
-to CPAN on May 06 2018.
+This document references version 0.60 of ExtUtils::ModuleMaker, released
+to CPAN on May 07 2018.
 
 =head1 DESCRIPTION
 
diff --git a/lib/ExtUtils/ModuleMaker/Auxiliary.pm b/lib/ExtUtils/ModuleMaker/Auxiliary.pm
index a372ecc..da67f7f 100644
--- a/lib/ExtUtils/ModuleMaker/Auxiliary.pm
+++ b/lib/ExtUtils/ModuleMaker/Auxiliary.pm
@@ -2,8 +2,8 @@ package ExtUtils::ModuleMaker::Auxiliary;
 use strict;
 # Contains test subroutines for distribution with ExtUtils::ModuleMaker
 use warnings;
-use vars qw( $VERSION @ISA @EXPORT_OK );
-$VERSION = 0.59;
+our ( $VERSION, @ISA, @EXPORT_OK );
+$VERSION = "0.60";
 require Exporter;
 @ISA         = qw(Exporter);
 @EXPORT_OK   = qw(
diff --git a/lib/ExtUtils/ModuleMaker/Defaults.pm b/lib/ExtUtils/ModuleMaker/Defaults.pm
index 3a27a21..0d39215 100644
--- a/lib/ExtUtils/ModuleMaker/Defaults.pm
+++ b/lib/ExtUtils/ModuleMaker/Defaults.pm
@@ -1,7 +1,6 @@
 package ExtUtils::ModuleMaker::Defaults;
 use strict;
-use vars qw( $VERSION );
-$VERSION = 0.59;
+our $VERSION = "0.60";
 
 my $usage = <<ENDOFUSAGE;
 
diff --git a/lib/ExtUtils/ModuleMaker/Initializers.pm b/lib/ExtUtils/ModuleMaker/Initializers.pm
index c549346..97f9ed0 100644
--- a/lib/ExtUtils/ModuleMaker/Initializers.pm
+++ b/lib/ExtUtils/ModuleMaker/Initializers.pm
@@ -1,8 +1,7 @@
 package ExtUtils::ModuleMaker::Initializers;
 use strict;
 use warnings;
-use vars qw( $VERSION );
-$VERSION = 0.59;
+our $VERSION = "0.60";
 use ExtUtils::ModuleMaker::Licenses::Standard qw(
     Get_Standard_License
     Verify_Standard_License
diff --git a/lib/ExtUtils/ModuleMaker/Interactive.pm b/lib/ExtUtils/ModuleMaker/Interactive.pm
index a218626..2b4965a 100644
--- a/lib/ExtUtils/ModuleMaker/Interactive.pm
+++ b/lib/ExtUtils/ModuleMaker/Interactive.pm
@@ -1,11 +1,9 @@
 package ExtUtils::ModuleMaker::Interactive;
-#$Id$
 use strict;
 use warnings;
 BEGIN {
     use base qw( ExtUtils::ModuleMaker );
-    use vars qw ( $VERSION ); 
-    $VERSION = 0.59;
+    our $VERSION = "0.60";
 }
 use Carp;
 use Data::Dumper;
diff --git a/lib/ExtUtils/ModuleMaker/Licenses/Local.pm b/lib/ExtUtils/ModuleMaker/Licenses/Local.pm
index 81d901d..5bf3643 100644
--- a/lib/ExtUtils/ModuleMaker/Licenses/Local.pm
+++ b/lib/ExtUtils/ModuleMaker/Licenses/Local.pm
@@ -4,9 +4,8 @@ use warnings;
 
 BEGIN {
     use base qw(Exporter);
-    use vars qw( @EXPORT_OK $VERSION );
-    $VERSION = 0.59;
-    @EXPORT_OK   = qw(Get_Local_License Verify_Local_License);
+    our $VERSION = "0.60";
+    our @EXPORT_OK   = qw(Get_Local_License Verify_Local_License);
 }
 
 my %licenses = (
diff --git a/lib/ExtUtils/ModuleMaker/Licenses/Standard.pm b/lib/ExtUtils/ModuleMaker/Licenses/Standard.pm
index ac5505f..17b4b90 100644
--- a/lib/ExtUtils/ModuleMaker/Licenses/Standard.pm
+++ b/lib/ExtUtils/ModuleMaker/Licenses/Standard.pm
@@ -1,14 +1,11 @@
 package ExtUtils::ModuleMaker::Licenses::Standard;
-#$Id$
 use strict;
 use warnings;
 
 BEGIN {
     use base qw(Exporter);
-    use vars qw( @EXPORT_OK $VERSION );
-    $VERSION = 0.59;
-    @EXPORT_OK   = qw(Get_Standard_License Verify_Standard_License);
-#    $VERSION     : taken from lib/ExtUtils/ModuleMaker.pm
+    our $VERSION = "0.60";
+    our @EXPORT_OK   = qw(Get_Standard_License Verify_Standard_License);
 }
 
 #################### DOCUMENTATION ####################
diff --git a/lib/ExtUtils/ModuleMaker/Opts.pm b/lib/ExtUtils/ModuleMaker/Opts.pm
index c4ccd27..a232c35 100644
--- a/lib/ExtUtils/ModuleMaker/Opts.pm
+++ b/lib/ExtUtils/ModuleMaker/Opts.pm
@@ -1,7 +1,7 @@
 package ExtUtils::ModuleMaker::Opts;
 use strict;
 use warnings;
-our $VERSION = 0.59;
+our $VERSION = "0.60";
 use Getopt::Long;
 use Carp;
 
diff --git a/lib/ExtUtils/ModuleMaker/StandardText.pm b/lib/ExtUtils/ModuleMaker/StandardText.pm
index 364a49b..13b1fe5 100644
--- a/lib/ExtUtils/ModuleMaker/StandardText.pm
+++ b/lib/ExtUtils/ModuleMaker/StandardText.pm
@@ -1,9 +1,7 @@
 package ExtUtils::ModuleMaker::StandardText;
-#$Id$
 use strict;
 use warnings;
-use vars qw ( $VERSION );
-$VERSION = 0.59;
+our $VERSION = "0.60";
 use ExtUtils::ModuleMaker::Licenses::Standard qw(
     Get_Standard_License
     Verify_Standard_License
diff --git a/scripts/modulemaker b/scripts/modulemaker
index 9ad73f4..1c9115d 100644
--- a/scripts/modulemaker
+++ b/scripts/modulemaker
@@ -1,5 +1,4 @@
 #!/usr/local/bin/perl
-#$Id$
 # modulemaker:  command-line utility implementing ExtUtils::ModuleMaker
 eval 'exec /usr/local/bin/perl  -S $0 ${1+"$@"}'
   if 0;    # not running under some shell
@@ -7,7 +6,7 @@ use strict;
 use warnings;
 use ExtUtils::ModuleMaker::Interactive;
 use ExtUtils::ModuleMaker::Opts;
-our $VERSION = 0.59;
+our $VERSION = 0.60;
 
 my $opt = ExtUtils::ModuleMaker::Opts->new(
     q{ExtUtils::ModuleMaker},
@@ -33,8 +32,8 @@ modulemaker - interactive interface to ExtUtils::ModuleMaker; replaces C<h2xs -A
 
 =head1 VERSION
 
-This document references version 0.59 of modulemaker, released
-to CPAN on May 06 2018.
+This document references version 0.60 of modulemaker, released
+to CPAN on May 07 2018.
 
 =head1 USAGE::Simple
 
diff --git a/t/81_opts.t b/t/81_opts.t
index e98afed..22bcaab 100644
--- a/t/81_opts.t
+++ b/t/81_opts.t
@@ -335,7 +335,7 @@ note("Long options");
 }
 
 {
-    note("Case 1066:  test absence of switch: '--name'");
+    note("Case 106:  test absence of switch: '--name'");
 
     local @ARGV = ( '--compact', '--no-interactive' );
 
diff --git a/t/82_modulemaker.t b/t/82_modulemaker.t
index e56990e..bd4a4bb 100644
--- a/t/82_modulemaker.t
+++ b/t/82_modulemaker.t
@@ -469,18 +469,14 @@ my %reg_def = (
     }
     license_text_test($dist_name, qr/Apache Software License.*Version 1\.1/s);
 
-    my $fmf = File::Spec->catfile($dist_name, $mf);
-
-    my $HISTORY_section = `grep -A4 '^=head1 HISTORY' $fmf`;
-	ok($HISTORY_section, "HISTORY section placed in POD");
-	like($HISTORY_section, qr/original version; created by ExtUtils::ModuleMaker/s,
-		"Got expected text in HISTORY");
-
-    my $AUTHOR_section = `grep -A6 '^=head1 AUTHOR' $fmf`;
-    like($AUTHOR_section, qr/\Q$organization\E/s,
-        "Got expected ORGANIZATION");
-    like($AUTHOR_section, qr/\Q$website\E/s,
-        "Got expected WEBSITE");
+    my $filetext = read_file_string(File::Spec->catfile($dist_name, $mf));
+    ok($filetext, "Able to read $mf");
+    like($filetext, qr/=head1 HISTORY/s, "HISTORY section placed in POD");
+    like($filetext, qr/original version; created by ExtUtils::ModuleMaker/s,
+        "Got expected text in HISTORY");
+    like($filetext, qr/=head1 AUTHOR/s, "AUTHOR section placed in POD");
+    like($filetext, qr/\Q$organization\E/s, "Got expected ORGANIZATION");
+    like($filetext, qr/\Q$website\E/s, "Got expected WEBSITE");
 
     ok(chdir $cwd, "Able to change back to starting directory");
 }
diff --git a/t/83_modulemaker-long.t b/t/83_modulemaker-long.t
index 6ac2f29..dc2ce98 100644
--- a/t/83_modulemaker-long.t
+++ b/t/83_modulemaker-long.t
@@ -468,19 +468,14 @@ my %reg_def = (
     }
     license_text_test($dist_name, qr/Apache Software License.*Version 1\.1/s);
 
-    my $fmf = File::Spec->catfile($dist_name, $mf);
-
-    my $HISTORY_section = `grep -A4 '^=head1 HISTORY' $fmf`;
-	ok($HISTORY_section, "HISTORY section placed in POD");
-	like($HISTORY_section, qr/original version; created by ExtUtils::ModuleMaker/s,
-		"Got expected text in HISTORY");
-
-    my $AUTHOR_section = `grep -A6 '^=head1 AUTHOR' $fmf`;
-    like($AUTHOR_section, qr/\Q$organization\E/s,
-        "Got expected ORGANIZATION");
-    like($AUTHOR_section, qr/\Q$website\E/s,
-        "Got expected WEBSITE");
-
+    my $filetext = read_file_string(File::Spec->catfile($dist_name, $mf));
+    ok($filetext, "Able to read $mf");
+    like($filetext, qr/=head1 HISTORY/s, "HISTORY section placed in POD");
+    like($filetext, qr/original version; created by ExtUtils::ModuleMaker/s,
+        "Got expected text in HISTORY");
+    like($filetext, qr/=head1 AUTHOR/s, "AUTHOR section placed in POD");
+    like($filetext, qr/\Q$organization\E/s, "Got expected ORGANIZATION");
+    like($filetext, qr/\Q$website\E/s, "Got expected WEBSITE");
     ok(chdir $cwd, "Able to change back to starting directory");
 }