Import perl-5.18.2

OK espie@ sthen@ deraadt@

3 files changed, 32 insertions, 3 deletions

diff --git a/gnu/usr.bin/perl/cpan/Module-Build/t/install.t b/gnu/usr.bin/perl/cpan/Module-Build/t/install.t
index ffe8afca017..2d487f679be 100755
--- a/gnu/usr.bin/perl/cpan/Module-Build/t/install.t
+++ b/gnu/usr.bin/perl/cpan/Module-Build/t/install.t
@@ -2,7 +2,7 @@
 
 use strict;
 use lib 't/lib';
-use MBTest tests => 34;
+use MBTest tests => 35;
 
 blib_load('Module::Build');
 
@@ -166,6 +166,10 @@ is $@, '';
 					      '--install_base', $basedir])};
   is $@, '';
 
+  eval {$mb->run_perl_script($cmd, [], ['install', '--destdir', $destdir,
+					      '--install_base', $basedir, '--install_base', $basedir])};
+  is $@, '';
+
   $install_to = File::Spec->catfile($destdir, $libdir, $dist->name ) . '.pm';
   is -e $install_to, 1, "Look for file at $install_to";
 
diff --git a/gnu/usr.bin/perl/cpan/Module-Build/t/pod_parser.t b/gnu/usr.bin/perl/cpan/Module-Build/t/pod_parser.t
index c47d7381661..8c75e7d7fac 100755
--- a/gnu/usr.bin/perl/cpan/Module-Build/t/pod_parser.t
+++ b/gnu/usr.bin/perl/cpan/Module-Build/t/pod_parser.t
@@ -2,7 +2,7 @@
 
 use strict;
 use lib 't/lib';
-use MBTest tests => 9;
+use MBTest tests => 12;
 
 blib_load('Module::Build::PodParser');
 
@@ -88,3 +88,28 @@ EOF
   is $pp->get_author->[0], 'C<Foo::Bar> was written by Engelbert Humperdinck I<E<lt>eh@example.comE<gt>> in 2004.', 'author';
   is $pp->get_abstract, 'Perl extension for blah blah blah', 'abstract';
 }
+
+
+{
+    # Now with C<Module::Name>
+  untie *FH;
+  tie *FH, 'IO::StringBased', <<'EOF';
+=head1 Name
+
+C<Foo::Bar> - Perl extension for blah blah blah
+
+=head1 Author
+
+C<Foo::Bar> was written by Engelbert Humperdinck I<E<lt>eh@example.comE<gt>> in 2004.
+
+Home page: http://example.com/~eh/
+
+=cut
+EOF
+
+  my $pp = Module::Build::PodParser->new(fh => \*FH);
+  ok $pp, 'object created';
+
+  is $pp->get_author->[0], 'C<Foo::Bar> was written by Engelbert Humperdinck I<E<lt>eh@example.comE<gt>> in 2004.', 'author';
+  is $pp->get_abstract, 'Perl extension for blah blah blah', 'abstract';
+}
diff --git a/gnu/usr.bin/perl/cpan/Module-Build/t/use_tap_harness.t b/gnu/usr.bin/perl/cpan/Module-Build/t/use_tap_harness.t
index f6e7e5073a0..bfce5069aa7 100755
--- a/gnu/usr.bin/perl/cpan/Module-Build/t/use_tap_harness.t
+++ b/gnu/usr.bin/perl/cpan/Module-Build/t/use_tap_harness.t
@@ -3,7 +3,7 @@
 use strict;
 use Test::More;
 use lib 't/lib';
-if (eval { require TAP::Harness } && TAP::Harness->VERSION >= 3) {
+if (eval { require TAP::Harness && TAP::Harness->VERSION(3) }) {
     plan tests => 9;
 } else {
     plan skip_all => 'TAP::Harness 3+ not installed'