Fix merge issues, remove excess files - match perl-5.28.1 dist

looking good sthen@, Great! bluhm@

2 files changed, 13 insertions, 7 deletions

diff --git a/gnu/usr.bin/perl/cpan/Pod-Usage/t/pod/pod2usage2.t b/gnu/usr.bin/perl/cpan/Pod-Usage/t/pod/pod2usage2.t
index c0bbfdb5745..7eb54022e90 100644
--- a/gnu/usr.bin/perl/cpan/Pod-Usage/t/pod/pod2usage2.t
+++ b/gnu/usr.bin/perl/cpan/Pod-Usage/t/pod/pod2usage2.t
@@ -8,7 +8,7 @@ BEGIN {
     plan skip_all => "Not portable on Win32 or VMS\n";
   }
   else {
-    plan tests => 34;
+    plan tests => 33;
   }
   use_ok ("Pod::Usage");
 }
@@ -217,14 +217,14 @@ ok (compare ($text, <<'EOT'), "Output test pod2usage with USAGE and verbose=99")
 # 
 EOT
 
-# test with pod_where
-use_ok('Pod::Find', qw(pod_where));
+# test with self
 
-($exit, $text) = getoutput( sub { pod2usage( -input => pod_where({-inc => 1}, 'Pod::Usage'),
+my $src = File::Spec->catfile(qw(lib Pod Usage.pm));
+($exit, $text) = getoutput( sub { pod2usage( -input => $src,
                                              -exitval => 0, -verbose => 0) } );
 $text =~ s{#Using.*/blib.*\n}{}; # older blib's emit something to STDERR
-is ($exit, 0,                 "Exit status pod2usage with Pod::Find");
-ok (compare ($text, <<'EOT'), "Output test pod2usage with Pod::Find") or diag "Got:\n$text\n";
+is ($exit, 0,                 "Exit status pod2usage with self");
+ok (compare ($text, <<'EOT'), "Output test pod2usage with self") or diag "Got:\n$text\n";
 #Usage:
 #      use Pod::Usage
 #
diff --git a/gnu/usr.bin/perl/cpan/Pod-Usage/t/pod/testp2pt.pl b/gnu/usr.bin/perl/cpan/Pod-Usage/t/pod/testp2pt.pl
index 308cd1ccd6b..cd312453273 100644
--- a/gnu/usr.bin/perl/cpan/Pod-Usage/t/pod/testp2pt.pl
+++ b/gnu/usr.bin/perl/cpan/Pod-Usage/t/pod/testp2pt.pl
@@ -1,5 +1,7 @@
 package TestPodIncPlainText;
 
+my $PARENTDIR;
+
 BEGIN {
    use File::Basename;
    use File::Spec;
@@ -9,7 +11,7 @@ BEGIN {
    unshift @INC, $THISDIR;
    require "testcmp.pl";
    import TestCompare;
-   my $PARENTDIR = dirname $THISDIR;
+   $PARENTDIR = dirname $THISDIR;
    push @INC, map { File::Spec->catfile($_, 'lib') } ($PARENTDIR, $THISDIR);
 }
 
@@ -24,6 +26,10 @@ use vars qw($MYPKG @EXPORT @ISA);
 $MYPKG = eval { (caller)[0] };
 @EXPORT = qw(&testpodplaintext);
 BEGIN {
+    # we want this for testing only
+    unshift(@INC, File::Spec->catfile($PARENTDIR, 'inc'));
+print "INC=@INC\n";
+
     require Pod::PlainText;
     @ISA = qw( Pod::PlainText );
     require VMS::Filespec if $^O eq 'VMS';