import perl 5.16.3 from CPAN - worked on by Andrew Fresh and myself

28 files changed, 160 insertions, 322 deletions

diff --git a/gnu/usr.bin/perl/ext/POSIX/lib/POSIX.pm b/gnu/usr.bin/perl/ext/POSIX/lib/POSIX.pm
index 78ffe2f3183..457af508681 100644
--- a/gnu/usr.bin/perl/ext/POSIX/lib/POSIX.pm
+++ b/gnu/usr.bin/perl/ext/POSIX/lib/POSIX.pm
@@ -4,7 +4,7 @@ use warnings;
 
 our ($AUTOLOAD, %SIGRT);
 
-our $VERSION = '1.38_03';
+our $VERSION = '1.30';
 
 require XSLoader;
 
@@ -188,8 +188,6 @@ eval join ';', map "sub $_", keys %replacement, keys %reimpl;
 sub AUTOLOAD {
     my ($func) = ($AUTOLOAD =~ /.*::(.*)/);
 
-    die "POSIX.xs has failed to load\n" if $func eq 'constant';
-
     if (my $code = $reimpl{$func}) {
 	my ($num, $arg) = (0, '');
 	if ($code =~ s/^(.*?) *=> *//) {
@@ -243,20 +241,19 @@ our %EXPORT_TAGS = (
 
     dirent_h =>	[],
 
-    errno_h =>	[qw(E2BIG EACCES EADDRINUSE EADDRNOTAVAIL EAFNOSUPPORT EAGAIN
-		EALREADY EBADF EBADMSG EBUSY ECANCELED ECHILD ECONNABORTED
-		ECONNREFUSED ECONNRESET EDEADLK EDESTADDRREQ EDOM EDQUOT EEXIST
-		EFAULT EFBIG EHOSTDOWN EHOSTUNREACH EIDRM EILSEQ EINPROGRESS
-		EINTR EINVAL EIO EISCONN EISDIR ELOOP EMFILE EMLINK EMSGSIZE
-		ENAMETOOLONG ENETDOWN ENETRESET ENETUNREACH ENFILE ENOBUFS
-		ENODATA ENODEV ENOENT ENOEXEC ENOLCK ENOLINK ENOMEM ENOMSG
-		ENOPROTOOPT ENOSPC ENOSR ENOSTR ENOSYS ENOTBLK ENOTCONN ENOTDIR
-		ENOTEMPTY ENOTRECOVERABLE ENOTSOCK ENOTSUP ENOTTY ENXIO
-		EOPNOTSUPP EOTHER EOVERFLOW EOWNERDEAD EPERM EPFNOSUPPORT EPIPE
-		EPROCLIM EPROTO EPROTONOSUPPORT EPROTOTYPE ERANGE EREMOTE
-		ERESTART EROFS ESHUTDOWN ESOCKTNOSUPPORT ESPIPE ESRCH ESTALE
-		ETIME ETIMEDOUT ETOOMANYREFS ETXTBSY EUSERS EWOULDBLOCK EXDEV
-		errno)],
+    errno_h =>	[qw(E2BIG EACCES EADDRINUSE EADDRNOTAVAIL EAFNOSUPPORT
+		EAGAIN EALREADY EBADF EBUSY ECHILD ECONNABORTED
+		ECONNREFUSED ECONNRESET EDEADLK EDESTADDRREQ EDOM EDQUOT
+		EEXIST EFAULT EFBIG EHOSTDOWN EHOSTUNREACH EINPROGRESS
+		EINTR EINVAL EIO EISCONN EISDIR ELOOP EMFILE EMLINK
+		EMSGSIZE ENAMETOOLONG ENETDOWN ENETRESET ENETUNREACH
+		ENFILE ENOBUFS ENODEV ENOENT ENOEXEC ENOLCK ENOMEM
+		ENOPROTOOPT ENOSPC ENOSYS ENOTBLK ENOTCONN ENOTDIR
+		ENOTEMPTY ENOTSOCK ENOTTY ENXIO EOPNOTSUPP EPERM
+		EPFNOSUPPORT EPIPE EPROCLIM EPROTONOSUPPORT EPROTOTYPE
+		ERANGE EREMOTE ERESTART EROFS ESHUTDOWN ESOCKTNOSUPPORT
+		ESPIPE ESRCH ESTALE ETIMEDOUT ETOOMANYREFS ETXTBSY
+		EUSERS EWOULDBLOCK EXDEV errno)],
 
     fcntl_h =>	[qw(FD_CLOEXEC F_DUPFD F_GETFD F_GETFL F_GETLK F_RDLCK
 		F_SETFD F_SETFL F_SETLK F_SETLKW F_UNLCK F_WRLCK
diff --git a/gnu/usr.bin/perl/ext/POSIX/t/export.t b/gnu/usr.bin/perl/ext/POSIX/t/export.t
index f76c60c9ea7..07d428eb1a5 100644
--- a/gnu/usr.bin/perl/ext/POSIX/t/export.t
+++ b/gnu/usr.bin/perl/ext/POSIX/t/export.t
@@ -20,21 +20,18 @@ my %expect = (
 		  CLOCKS_PER_SEC CREAD CS5 CS6 CS7 CS8 CSIZE CSTOPB DBL_DIG
 		  DBL_EPSILON DBL_MANT_DIG DBL_MAX DBL_MAX_10_EXP DBL_MAX_EXP
 		  DBL_MIN DBL_MIN_10_EXP DBL_MIN_EXP E2BIG EACCES EADDRINUSE
-		  EADDRNOTAVAIL EAFNOSUPPORT EAGAIN EALREADY EBADF EBADMSG EBUSY
-		  ECANCELED ECHILD ECHO ECHOE ECHOK ECHONL ECONNABORTED
-		  ECONNREFUSED ECONNRESET EDEADLK EDESTADDRREQ EDOM EDQUOT
-		  EEXIST EFAULT EFBIG EHOSTDOWN EHOSTUNREACH EIDRM EILSEQ
-		  EINPROGRESS EINTR EINVAL EIO EISCONN EISDIR ELOOP EMFILE
-		  EMLINK EMSGSIZE ENAMETOOLONG ENETDOWN ENETRESET ENETUNREACH
-		  ENFILE ENOBUFS ENODATA ENODEV ENOENT ENOEXEC ENOLCK ENOLINK
-		  ENOMEM ENOMSG ENOPROTOOPT ENOSPC ENOSR ENOSTR ENOSYS ENOTBLK
-		  ENOTCONN ENOTDIR ENOTEMPTY ENOTRECOVERABLE ENOTSOCK ENOTSUP
-		  ENOTTY ENXIO EOF EOPNOTSUPP EOTHER EOVERFLOW EOWNERDEAD EPERM
-		  EPFNOSUPPORT EPIPE EPROCLIM EPROTO EPROTONOSUPPORT EPROTOTYPE
-		  ERANGE EREMOTE ERESTART EROFS ESHUTDOWN ESOCKTNOSUPPORT ESPIPE
-		  ESRCH ESTALE ETIME ETIMEDOUT ETOOMANYREFS ETXTBSY EUSERS
-		  EWOULDBLOCK EXDEV
-		  EXIT_FAILURE EXIT_SUCCESS FD_CLOEXEC FILENAME_MAX
+		  EADDRNOTAVAIL EAFNOSUPPORT EAGAIN EALREADY EBADF EBUSY ECHILD
+		  ECHO ECHOE ECHOK ECHONL ECONNABORTED ECONNREFUSED ECONNRESET
+		  EDEADLK EDESTADDRREQ EDOM EDQUOT EEXIST EFAULT EFBIG
+		  EHOSTDOWN EHOSTUNREACH EINPROGRESS EINTR EINVAL EIO EISCONN
+		  EISDIR ELOOP EMFILE EMLINK EMSGSIZE ENAMETOOLONG ENETDOWN
+		  ENETRESET ENETUNREACH ENFILE ENOBUFS ENODEV ENOENT ENOEXEC
+		  ENOLCK ENOMEM ENOPROTOOPT ENOSPC ENOSYS ENOTBLK ENOTCONN
+		  ENOTDIR ENOTEMPTY ENOTSOCK ENOTTY ENXIO EOF EOPNOTSUPP EPERM
+		  EPFNOSUPPORT EPIPE EPROCLIM EPROTONOSUPPORT EPROTOTYPE ERANGE
+		  EREMOTE ERESTART EROFS ESHUTDOWN ESOCKTNOSUPPORT ESPIPE ESRCH
+		  ESTALE ETIMEDOUT ETOOMANYREFS ETXTBSY EUSERS EWOULDBLOCK
+		  EXDEV EXIT_FAILURE EXIT_SUCCESS FD_CLOEXEC FILENAME_MAX
 		  FLT_DIG FLT_EPSILON FLT_MANT_DIG FLT_MAX FLT_MAX_10_EXP
 		  FLT_MAX_EXP FLT_MIN FLT_MIN_10_EXP FLT_MIN_EXP FLT_RADIX
 		  FLT_ROUNDS F_DUPFD F_GETFD F_GETFL F_GETLK F_OK F_RDLCK
diff --git a/gnu/usr.bin/perl/ext/POSIX/t/wrappers.t b/gnu/usr.bin/perl/ext/POSIX/t/wrappers.t
index 5b9f6d630d8..f443ed87cca 100644
--- a/gnu/usr.bin/perl/ext/POSIX/t/wrappers.t
+++ b/gnu/usr.bin/perl/ext/POSIX/t/wrappers.t
@@ -9,14 +9,9 @@ plan(skip_all => "POSIX is unavailable")
 
 require POSIX;
 require Symbol;
-require File::Temp;
 
 use constant NOT_HERE => 'this-file-should-not-exist';
 
-# Object destruction causes the file to be deleted.
-my $temp_fh = File::Temp->new();
-my $temp_file = $temp_fh->filename;
-
 # localtime and gmtime in time.t.
 # exit, fork, waitpid, sleep in waitpid.t
 # errno in posix.t
@@ -41,7 +36,7 @@ is(do {local $^W;
 
 SKIP: {
     # Win32 doesn't like me trying to fstat STDIN. Bothersome thing.
-    skip("Can't open $temp_file: $!", 1) unless open my $fh, '<', $temp_file;
+    skip("Can't open $^X: $!", 1) unless open my $fh, '<', $^X;
 
     is_deeply([POSIX::fstat(fileno $fh)], [stat $fh], 'fstat');
 }
@@ -113,7 +108,7 @@ is(POSIX::sin(0), 0, 'sin');
 is(POSIX::sleep(0), 0, 'sleep');
 is(POSIX::sprintf('%o', 42), '52', 'sprintf');
 is(POSIX::sqrt(256), 16, 'sqrt');
-is_deeply([POSIX::stat($temp_file)], [stat $temp_file], 'stat');
+is_deeply([POSIX::stat($^X)], [stat $^X], 'stat');
 {
     local $! = 2;
     my $error = "$!";
diff --git a/gnu/usr.bin/perl/ext/PerlIO-mmap/mmap.pm b/gnu/usr.bin/perl/ext/PerlIO-mmap/mmap.pm
index cf97882fa59..7db4a55137f 100644
--- a/gnu/usr.bin/perl/ext/PerlIO-mmap/mmap.pm
+++ b/gnu/usr.bin/perl/ext/PerlIO-mmap/mmap.pm
@@ -1,7 +1,7 @@
 package PerlIO::mmap;
 use strict;
 use warnings;
-our $VERSION = '0.011';
+our $VERSION = '0.010';
 
 use XSLoader;
 XSLoader::load(__PACKAGE__, __PACKAGE__->VERSION);
diff --git a/gnu/usr.bin/perl/ext/PerlIO-mmap/mmap.xs b/gnu/usr.bin/perl/ext/PerlIO-mmap/mmap.xs
index 4c96da84f78..3e87d3b3719 100644
--- a/gnu/usr.bin/perl/ext/PerlIO-mmap/mmap.xs
+++ b/gnu/usr.bin/perl/ext/PerlIO-mmap/mmap.xs
@@ -2,10 +2,10 @@
  * Local variables:
  * c-indentation-style: bsd
  * c-basic-offset: 4
- * indent-tabs-mode: nil
+ * indent-tabs-mode: t
  * End:
  *
- * ex: set ts=8 sts=4 sw=4 et:
+ * ex: set ts=8 sts=4 sw=4 noet:
  */
 
 #define PERL_NO_GET_CONTEXT
diff --git a/gnu/usr.bin/perl/ext/Pod-Functions/Functions_pm.PL b/gnu/usr.bin/perl/ext/Pod-Functions/Functions_pm.PL
index 578ec8996b0..c7bb44bec87 100644
--- a/gnu/usr.bin/perl/ext/Pod-Functions/Functions_pm.PL
+++ b/gnu/usr.bin/perl/ext/Pod-Functions/Functions_pm.PL
@@ -4,13 +4,7 @@ use Pod::Simple::SimpleTree;
 
 my ($tap, $test, %Missing);
 
-BEGIN {
-    @ARGV = grep { not($_ eq '--tap' and $tap = 1) } @ARGV;
-    if ($tap) {
-        require Test::More;
-        Test::More->import;
-    }
-}
+@ARGV = grep { not($_ eq '--tap' and $tap = 1) } @ARGV;
 
 my (%Kinds, %Flavor, @Types);
 my %Omit;
@@ -101,26 +95,34 @@ sub sort_funcs {
 
 if ($tap) {
     foreach my $func (sort_funcs(keys %Flavor)) {
-       ok ( $Type{$func}, "$func is mentioned in at least one category group");
+       ++$test;
+       my $ok = $Type{$func} ? 'ok' : 'not ok';
+       print "$ok $test - $func is mentioned in at least one category group\n";
     }
     foreach (sort keys %Missing) {
         # Ignore anything that looks like an alternative for a function we've
         # already seen;
         s!(?: [A-Z].*| \(\)|\( LIST \)| /PATTERN/.*)!!;
         next if $Flavor{$_};
+        ++$test;
         if (/^[_a-z]/) {
-            fail( "function '$_' has no summary for Pod::Functions" );
+            print "not ok $test - function '$_' has no summary for Pod::Functions\n";
         } else {
-            fail( "for Pod::Functions" );
+            print "not ok $test - section '$_' has no type for Pod::Functions\n";
         }
     }
     foreach my $kind (sort keys %Kinds) {
         my $funcs = $Kinds{$kind};
         ++$test;
         my $want = join ' ', sort_funcs(@$funcs);
-        is ("@$funcs", $want, "category $kind is correctly sorted" );
+        if ("@$funcs" eq $want) {
+            print "ok $test - category $kind is correctly sorted\n";
+        } else {
+            print "not ok $test - category $kind is correctly sorted\n";
+            print STDERR "# Have @$funcs\n# Want $want\n";
+        }
     }
-    done_testing();
+    print "1..$test\n";
     exit;
 }
 
@@ -196,7 +198,7 @@ L<perlfunc/"Perl Functions by Category"> section.
 
 =cut
 
-our $VERSION = '1.08';
+our $VERSION = '1.05';
 
 require Exporter;
 
@@ -263,7 +265,7 @@ foreach my $func (sort_funcs(keys %Flavor)) {
     my $desc = $Flavor{$func};
     die "No types listed for $func" unless $Type{$func};
     next if $Omit{$func};
-    print $fh join("\t", $func, (sort @{$Type{$func}}), $desc), "\n";
+    print $fh join("\t", $func, @{$Type{$func}}, $desc), "\n";
 }
 
 close $fh or die "Can't close '$temp': $!";
diff --git a/gnu/usr.bin/perl/ext/Pod-Html/t/crossref.t b/gnu/usr.bin/perl/ext/Pod-Html/t/crossref.t
index 30fa6d35fe6..ec178e00240 100644
--- a/gnu/usr.bin/perl/ext/Pod-Html/t/crossref.t
+++ b/gnu/usr.bin/perl/ext/Pod-Html/t/crossref.t
@@ -10,6 +10,7 @@ END {
 
 use strict;
 use Cwd;
+use File::Spec;
 use File::Spec::Functions;
 use Test::More tests => 1;
 
@@ -18,14 +19,11 @@ SKIP: {
     skip "$output", 1 if $output;
     
     my ($v, $d) = splitpath(cwd(), 1);
-    my @dirs = splitdir($d);
-    shift @dirs if $dirs[0] eq '';
-    my $relcwd = join '/', @dirs;
+    my $relcwd = substr($d, length(File::Spec->rootdir()));
         
     convert_n_test("crossref", "cross references", 
-     "--podpath=". File::Spec::Unix->catdir($relcwd, 't') . ":"
-                 . File::Spec::Unix->catdir($relcwd, 'testdir/test.lib'),
-     "--podroot=". catpath($v, '/', ''),
+     "--podpath=". catdir($relcwd, 't') . ":" . catdir($relcwd, 'testdir/test.lib'),
+     "--podroot=$v". File::Spec->rootdir,
      "--quiet",
     );
 }
@@ -40,7 +38,7 @@ __DATA__
 <link rev="made" href="mailto:[PERLADMIN]" />
 </head>
 
-<body>
+<body style="background-color: white">
 
 
 
@@ -70,13 +68,13 @@ __DATA__
 
 <p><a href="/[RELCURRENTWORKINGDIRECTORY]/testdir/test.lib/var-copy.html">var-copy</a></p>
 
-<p><a href="/[RELCURRENTWORKINGDIRECTORY]/testdir/test.lib/var-copy.html#pod">&quot;$&quot;&quot; in var-copy</a></p>
+<p><a href="/[RELCURRENTWORKINGDIRECTORY]/testdir/test.lib/var-copy.html#pod-">&quot;$&quot;&quot; in var-copy</a></p>
 
 <p><code>var-copy</code></p>
 
 <p><code>var-copy/$&quot;</code></p>
 
-<p><a href="/[RELCURRENTWORKINGDIRECTORY]/testdir/test.lib/podspec-copy.html#First">&quot;First:&quot; in podspec-copy</a></p>
+<p><a href="/[RELCURRENTWORKINGDIRECTORY]/testdir/test.lib/podspec-copy.html#First:">&quot;First:&quot; in podspec-copy</a></p>
 
 <p><code>podspec-copy/First:</code></p>
 
diff --git a/gnu/usr.bin/perl/ext/Pod-Html/t/crossref2.t b/gnu/usr.bin/perl/ext/Pod-Html/t/crossref2.t
index 536cfbb4e36..ce8fd6f804a 100644
--- a/gnu/usr.bin/perl/ext/Pod-Html/t/crossref2.t
+++ b/gnu/usr.bin/perl/ext/Pod-Html/t/crossref2.t
@@ -10,6 +10,8 @@ END {
 
 use strict;
 use Cwd;
+use File::Spec;
+use File::Spec::Functions;
 use Test::More tests => 1;
 
 SKIP: {
@@ -36,7 +38,7 @@ __DATA__
 <link rev="made" href="mailto:[PERLADMIN]" />
 </head>
 
-<body>
+<body style="background-color: white">
 
 
 
@@ -66,13 +68,13 @@ __DATA__
 
 <p><a href="../testdir/test.lib/var-copy.html">var-copy</a></p>
 
-<p><a href="../testdir/test.lib/var-copy.html#pod">&quot;$&quot;&quot; in var-copy</a></p>
+<p><a href="../testdir/test.lib/var-copy.html#pod-">&quot;$&quot;&quot; in var-copy</a></p>
 
 <p><code>var-copy</code></p>
 
 <p><code>var-copy/$&quot;</code></p>
 
-<p><a href="../testdir/test.lib/podspec-copy.html#First">&quot;First:&quot; in podspec-copy</a></p>
+<p><a href="../testdir/test.lib/podspec-copy.html#First:">&quot;First:&quot; in podspec-copy</a></p>
 
 <p><code>podspec-copy/First:</code></p>
 
diff --git a/gnu/usr.bin/perl/ext/Pod-Html/t/crossref3.t b/gnu/usr.bin/perl/ext/Pod-Html/t/crossref3.t
index ab8f055d17b..309d5ed888a 100644
--- a/gnu/usr.bin/perl/ext/Pod-Html/t/crossref3.t
+++ b/gnu/usr.bin/perl/ext/Pod-Html/t/crossref3.t
@@ -10,6 +10,8 @@ END {
 
 use strict;
 use Cwd;
+use File::Spec;
+use File::Spec::Functions;
 use Test::More tests => 1;
 
 SKIP: {
@@ -36,7 +38,7 @@ __DATA__
 <link rev="made" href="mailto:[PERLADMIN]" />
 </head>
 
-<body>
+<body style="background-color: white">
 
 
 
@@ -66,13 +68,13 @@ __DATA__
 
 <p><a href="[ABSCURRENTWORKINGDIRECTORY]/testdir/test.lib/var-copy.html">var-copy</a></p>
 
-<p><a href="[ABSCURRENTWORKINGDIRECTORY]/testdir/test.lib/var-copy.html#pod">&quot;$&quot;&quot; in var-copy</a></p>
+<p><a href="[ABSCURRENTWORKINGDIRECTORY]/testdir/test.lib/var-copy.html#pod-">&quot;$&quot;&quot; in var-copy</a></p>
 
 <p><code>var-copy</code></p>
 
 <p><code>var-copy/$&quot;</code></p>
 
-<p><a href="[ABSCURRENTWORKINGDIRECTORY]/testdir/test.lib/podspec-copy.html#First">&quot;First:&quot; in podspec-copy</a></p>
+<p><a href="[ABSCURRENTWORKINGDIRECTORY]/testdir/test.lib/podspec-copy.html#First:">&quot;First:&quot; in podspec-copy</a></p>
 
 <p><code>podspec-copy/First:</code></p>
 
diff --git a/gnu/usr.bin/perl/ext/Pod-Html/t/htmlview.t b/gnu/usr.bin/perl/ext/Pod-Html/t/htmlview.t
index 792df934047..bbfc971a145 100644
--- a/gnu/usr.bin/perl/ext/Pod-Html/t/htmlview.t
+++ b/gnu/usr.bin/perl/ext/Pod-Html/t/htmlview.t
@@ -19,7 +19,7 @@ __DATA__
 <link rev="made" href="mailto:[PERLADMIN]" />
 </head>
 
-<body>
+<body style="background-color: white">
 
 
 
@@ -29,8 +29,8 @@ __DATA__
   <li><a href="#DESCRIPTION">DESCRIPTION</a></li>
   <li><a href="#METHODS-OTHER-STUFF">METHODS =&gt; OTHER STUFF</a>
     <ul>
-      <li><a href="#new">new()</a></li>
-      <li><a href="#old">old()</a></li>
+      <li><a href="#new-">new()</a></li>
+      <li><a href="#old-">old()</a></li>
     </ul>
   </li>
   <li><a href="#TESTING-FOR-AND-BEGIN">TESTING FOR AND BEGIN</a></li>
@@ -65,7 +65,7 @@ __DATA__
 
 <p>Here is a list of methods</p>
 
-<h2 id="new">new()</h2>
+<h2 id="new-">new()</h2>
 
 <p>Constructor method. Accepts the following config options:</p>
 
@@ -178,7 +178,7 @@ __DATA__
 </li>
 </ul>
 
-<h2 id="old">old()</h2>
+<h2 id="old-">old()</h2>
 
 <p>Destructor method</p>
 
@@ -219,7 +219,7 @@ HTML
 
 <dl>
 
-<dt id="Around-line-45">Around line 45:</dt>
+<dt id="Around-line-45:">Around line 45:</dt>
 <dd>
 
 <p>You can&#39;t have =items (as at line 49) unless the first thing after the =over is an =item</p>
diff --git a/gnu/usr.bin/perl/ext/Pod-Html/t/pod2html-lib.pl b/gnu/usr.bin/perl/ext/Pod-Html/t/pod2html-lib.pl
index 42cf1c97c4f..c60cab64399 100644
--- a/gnu/usr.bin/perl/ext/Pod-Html/t/pod2html-lib.pl
+++ b/gnu/usr.bin/perl/ext/Pod-Html/t/pod2html-lib.pl
@@ -23,7 +23,6 @@ sub make_test_dir {
 }
 
 sub rem_test_dir {
-    return unless -d 'testdir/test.lib';
     remove_tree('testdir/test.lib')
         or warn "Error removing temporary directory 'testdir/test.lib'";
 }
@@ -33,9 +32,7 @@ sub convert_n_test {
 
     my $cwd = Pod::Html::_unixify( Cwd::cwd() );
     my ($vol, $dir) = splitpath($cwd, 1);
-    my @dirs = splitdir($dir);
-    shift @dirs if $dirs[0] eq '';
-    my $relcwd = join '/', @dirs;
+    my $relcwd = substr($dir, length(File::Spec->rootdir()));
 
     my $new_dir  = catdir $dir, "t";
     my $infile   = catpath $vol, $new_dir, "$podfile.pod";
@@ -51,7 +48,6 @@ sub convert_n_test {
         @p2h_args,
     );
 
-    $cwd =~ s|\/$||;
 
     my ($expect, $result);
     {
diff --git a/gnu/usr.bin/perl/ext/Pod-Html/testdir/perlpodspec-copy.pod b/gnu/usr.bin/perl/ext/Pod-Html/testdir/perlpodspec-copy.pod
index 97319c90b27..4f914ef0e47 100644
--- a/gnu/usr.bin/perl/ext/Pod-Html/testdir/perlpodspec-copy.pod
+++ b/gnu/usr.bin/perl/ext/Pod-Html/testdir/perlpodspec-copy.pod
@@ -3,11 +3,6 @@
 
 perlpodspeccopy - Plain Old Documentation: format specification and notes
 
-=head1 DISCLAIMER
-
-This is a pod file used for testing purposes by the test suite, please
-see L<perlpodspec>.
-
 =head1 DESCRIPTION
 
 This document is detailed notes on the Pod markup language.  Most
diff --git a/gnu/usr.bin/perl/ext/XS-APItest/t/call_checker.t b/gnu/usr.bin/perl/ext/XS-APItest/t/call_checker.t
index 377cb749802..51dbc939a42 100644
--- a/gnu/usr.bin/perl/ext/XS-APItest/t/call_checker.t
+++ b/gnu/usr.bin/perl/ext/XS-APItest/t/call_checker.t
@@ -1,6 +1,6 @@
 use warnings;
 use strict;
-use Test::More tests => 76;
+use Test::More tests => 64;
 
 use XS::APItest;
 
@@ -158,52 +158,4 @@ is $@, "";
 is_deeply $foo_got, undef;
 is $foo_ret, 9;
 
-sub MODIFY_CODE_ATTRIBUTES { cv_set_call_checker_lists($_[1]); () }
-BEGIN {
-  *foo2 = sub($$) :Attr { $foo_got = [ @_ ]; return "z"; };
-}
-
-$foo_got = undef;
-eval q{$foo_ret = foo2(@b, @c);};
-is $@, "";
-is_deeply $foo_got, [ qw(a b), qw(a b c) ];
-is $foo_ret, "z";
-
-cv_set_call_checker_lists(\&foo);
-undef &foo;
-$foo_got = undef;
-eval 'sub foo($@) { $foo_got = [ @_ ]; return "z"; }
-      $foo_ret = foo(@b, @c);';
-is $@, "";
-is_deeply $foo_got, [ 2, qw(a b c) ], 'undef clears call checkers';
-is $foo_ret, "z";
-
-my %got;
-
-sub g {
-    my $name = shift;
-    my $sub = sub ($\@) {
-	$got{$name} = [ @_ ];
-	return $name;
-    };
-    cv_set_call_checker_scalars($sub);
-    return $sub;
-}
-
-BEGIN {
-    *whack = g("whack");
-    *glurp = g("glurp");
-}
-
-%got = ();
-my $whack_ret = whack(@b, @c);
-is $@, "";
-is_deeply $got{whack}, [ 2, 3 ];
-is $whack_ret, "whack";
-
-my $glurp_ret = glurp(@b, @c);
-is $@, "";
-is_deeply $got{glurp}, [ 2, 3 ];
-is $glurp_ret, "glurp";
-
 1;
diff --git a/gnu/usr.bin/perl/ext/XS-APItest/t/clone-with-stack.t b/gnu/usr.bin/perl/ext/XS-APItest/t/clone-with-stack.t
index 3238e9f3c99..943a123427e 100644
--- a/gnu/usr.bin/perl/ext/XS-APItest/t/clone-with-stack.t
+++ b/gnu/usr.bin/perl/ext/XS-APItest/t/clone-with-stack.t
@@ -17,7 +17,7 @@ if (not $Config{'useithreads'}) {
     skip_all("clone_with_stack requires threads");
 }
 
-plan(5);
+plan(3);
 
 fresh_perl_is( <<'----', <<'====', undef, "minimal clone_with_stack" );
 use XS::APItest;
@@ -51,40 +51,3 @@ ok
 ====
 
 }
-
-{
-    fresh_perl_is( <<'----', <<'====', undef, "clone stack" );
-use XS::APItest;
-sub f {
-    clone_with_stack();
-    0..4;
-}
-print 'X-', 'Y-', join(':', f()), "-Z\n";
-----
-X-Y-0:1:2:3:4-Z
-====
-
-}
-
-{
-    fresh_perl_is( <<'----', <<'====', undef, "with localised stuff" );
-use XS::APItest;
-$s = "outer";
-$a[0] = "anterior";
-$h{k} = "hale";
-{
-    local $s = "inner";
-    local $a[0] = 'posterior';
-    local $h{k} = "halt";
-    clone_with_stack();
-}
-print "scl: $s\n";
-print "ary: $a[0]\n";
-print "hsh: $h{k}\n";
-----
-scl: outer
-ary: anterior
-hsh: hale
-====
-
-}
diff --git a/gnu/usr.bin/perl/ext/XS-APItest/t/customop.t b/gnu/usr.bin/perl/ext/XS-APItest/t/customop.t
index b7cc598b2c8..f2773f278b3 100644
--- a/gnu/usr.bin/perl/ext/XS-APItest/t/customop.t
+++ b/gnu/usr.bin/perl/ext/XS-APItest/t/customop.t
@@ -3,7 +3,7 @@
 use warnings;
 use strict;
 
-use Test::More tests => 24;
+use Test::More tests => 23;
 use XS::APItest;
 
 my $ppaddr = xop_ppaddr;
@@ -45,8 +45,6 @@ xop_register;
 
 is $ops->{$ppaddr}, $xop,       "XOP registered OK";
 
-is xop_from_custom_op, $xop,    "XOP lookup from OP roundtrips";
-
 $av = xop_build_optree;
 my $OA_UNOP = xop_OA_UNOP;
 my ($unop, $kid) = ("???" x 2);
diff --git a/gnu/usr.bin/perl/ext/XS-APItest/t/fetch_pad_names.t b/gnu/usr.bin/perl/ext/XS-APItest/t/fetch_pad_names.t
index 3d422809526..559bc3f79bd 100644
--- a/gnu/usr.bin/perl/ext/XS-APItest/t/fetch_pad_names.t
+++ b/gnu/usr.bin/perl/ext/XS-APItest/t/fetch_pad_names.t
@@ -311,7 +311,6 @@ sub general_tests {
     is grep( !Encode::is_utf8($_), @$names_av), $tests->{pad_size}{invariant}{cmp};
 
     for my $var (@{$tests->{vars}}) {
-        no warnings 'experimental::smartmatch';
         if ($var->{type} eq 'ok') {
             ok $var->{name} ~~ $names_av, $var->{msg};
         } else {
diff --git a/gnu/usr.bin/perl/ext/XS-APItest/t/grok.t b/gnu/usr.bin/perl/ext/XS-APItest/t/grok.t
index 99fbc5d3da4..2d2d192c7d2 100644
--- a/gnu/usr.bin/perl/ext/XS-APItest/t/grok.t
+++ b/gnu/usr.bin/perl/ext/XS-APItest/t/grok.t
@@ -5,7 +5,6 @@ use Test::More;
 use Config;
 use XS::APItest;
 use feature 'switch';
-no warnings 'experimental::smartmatch';
 use constant TRUTH => '0 but true';
 
 # Tests for grok_number. Not yet comprehensive.
diff --git a/gnu/usr.bin/perl/ext/XS-APItest/t/multicall.t b/gnu/usr.bin/perl/ext/XS-APItest/t/multicall.t
index f96f62e7436..983f5fd0163 100644
--- a/gnu/usr.bin/perl/ext/XS-APItest/t/multicall.t
+++ b/gnu/usr.bin/perl/ext/XS-APItest/t/multicall.t
@@ -7,7 +7,7 @@
 use warnings;
 use strict;
 
-use Test::More tests => 7;
+use Test::More tests => 6;
 use XS::APItest;
 
 
@@ -48,16 +48,3 @@ use XS::APItest;
     is($destroyed, 1, "f now destroyed");
 
 }
-
-# [perl #115602]
-# deep recursion realloced the CX stack, but the dMULTICALL local var
-# 'cx' still pointed to the old one.
-# Thius doesn;t actually test the failure (I couldn't think of a way to
-# get the failure to show at the perl level) but it allows valgribnd or
-# similar to spot any errors.
-
-{
-    sub rec { my $c = shift; rec($c-1) if $c > 0 };
-    my @r = XS::APItest::multicall_each { rec(90) } 1,2,3;
-    pass("recursion");
-}
diff --git a/gnu/usr.bin/perl/ext/XS-APItest/t/underscore_length.t b/gnu/usr.bin/perl/ext/XS-APItest/t/underscore_length.t
index 545b2a32408..7ca6906322a 100644
--- a/gnu/usr.bin/perl/ext/XS-APItest/t/underscore_length.t
+++ b/gnu/usr.bin/perl/ext/XS-APItest/t/underscore_length.t
@@ -1,4 +1,4 @@
-use warnings; no warnings 'experimental::lexical_topic';
+use warnings;
 use strict;
 
 use Test::More tests => 4;
diff --git a/gnu/usr.bin/perl/ext/XS-APItest/t/utf8.t b/gnu/usr.bin/perl/ext/XS-APItest/t/utf8.t
index bc5a7ed0c1d..8bafd89dab3 100644
--- a/gnu/usr.bin/perl/ext/XS-APItest/t/utf8.t
+++ b/gnu/usr.bin/perl/ext/XS-APItest/t/utf8.t
@@ -24,7 +24,7 @@ foreach ([0, '', '', 'empty'],
     is(bytes_cmp_utf8($right, $left), -$expect, "$desc reversed");
 }
 
-# Test uft8n_to_uvchr().  These provide essentially complete code coverage.
+# Test uft8n_to_uvuni().  These provide essentially complete code coverage.
 
 # Copied from utf8.h
 my $UTF8_ALLOW_EMPTY            = 0x0001;
@@ -89,7 +89,7 @@ foreach my $test (
 
     # Test what happens when this malformation is not allowed
     undef @warnings;
-    my $ret_ref = test_utf8n_to_uvchr($bytes, $length, 0);
+    my $ret_ref = test_utf8n_to_uvuni($bytes, $length, 0);
     is($ret_ref->[0], 0, "$testname: disallowed: Returns 0");
     is($ret_ref->[1], $expected_len, "$testname: disallowed: Returns expected length");
     if (is(scalar @warnings, 1, "$testname: disallowed: Got a single warning ")) {
@@ -104,7 +104,7 @@ foreach my $test (
     {   # Next test when disallowed, and warnings are off.
         undef @warnings;
         no warnings 'utf8';
-        my $ret_ref = test_utf8n_to_uvchr($bytes, $length, 0);
+        my $ret_ref = test_utf8n_to_uvuni($bytes, $length, 0);
         is($ret_ref->[0], 0, "$testname: disallowed: no warnings 'utf8': Returns 0");
         is($ret_ref->[1], $expected_len, "$testname: disallowed: no warnings 'utf8': Returns expected length");
         if (!is(scalar @warnings, 0, "$testname: disallowed: no warnings 'utf8': no warnings generated")) {
@@ -114,7 +114,7 @@ foreach my $test (
 
     # Test with CHECK_ONLY
     undef @warnings;
-    $ret_ref = test_utf8n_to_uvchr($bytes, $length, $UTF8_CHECK_ONLY);
+    $ret_ref = test_utf8n_to_uvuni($bytes, $length, $UTF8_CHECK_ONLY);
     is($ret_ref->[0], 0, "$testname: CHECK_ONLY: Returns 0");
     is($ret_ref->[1], -1, "$testname: CHECK_ONLY: returns expected length");
     if (! is(scalar @warnings, 0, "$testname: CHECK_ONLY: no warnings generated")) {
@@ -125,7 +125,7 @@ foreach my $test (
 
     # Test when the malformation is allowed
     undef @warnings;
-    $ret_ref = test_utf8n_to_uvchr($bytes, $length, $allow_flags);
+    $ret_ref = test_utf8n_to_uvuni($bytes, $length, $allow_flags);
     is($ret_ref->[0], $allowed_uv, "$testname: allowed: Returns expected uv");
     is($ret_ref->[1], $expected_len, "$testname: allowed: Returns expected length");
     if (!is(scalar @warnings, 0, "$testname: allowed: no warnings generated"))
@@ -166,7 +166,7 @@ my @tests = (
         # This code point is chosen so that it is representable in a UV on
         # 32-bit machines
         $UTF8_WARN_FE_FF, $UTF8_DISALLOW_FE_FF, 'utf8', 0x80000000, 7,
-        qr/Code point 0x80000000 is not Unicode, and not portable/
+        qr/Code point beginning with byte .* is not Unicode, and not portable/
     ],
     [ "overflow with FE/FF",
         # This tests the interaction of WARN_FE_FF/DISALLOW_FE_FF with
@@ -178,12 +178,9 @@ my @tests = (
         ($has_quad)
             ? "\xff\x80\x90\x90\x90\xbf\xbf\xbf\xbf\xbf\xbf\xbf\xbf"
             : "\xfe\x86\x80\x80\x80\x80\x80",
-
-        # We include both warning categories to make sure the FE_FF one has
-        # precedence
-        "$UTF8_WARN_FE_FF|$UTF8_WARN_SUPER", "$UTF8_DISALLOW_FE_FF", 'utf8', 0,
+        $UTF8_WARN_FE_FF, $UTF8_DISALLOW_FE_FF, 'utf8', 0,
         ($has_quad) ? 13 : 7,
-        qr/overflow at byte .*, after start byte 0xf/
+        qr/Code point beginning with byte .* is not Unicode, and not portable/
     ],
 );
 
@@ -191,7 +188,7 @@ if ($has_quad) {    # All FF's will overflow on 32 bit
     push @tests,
         [ "begins with FF", "\xff\x80\x80\x80\x80\x80\x81\x80\x80\x80\x80\x80\x80",
             $UTF8_WARN_FE_FF, $UTF8_DISALLOW_FE_FF, 'utf8', $FF_ret, 13,
-            qr/Code point 0x.* is not Unicode, and not portable/
+            qr/Code point beginning with byte .* is not Unicode, and not portable/
         ];
 }
 
@@ -205,114 +202,85 @@ foreach my $test (@tests) {
     # are several orthogonal variables involved.  We test all the subclasses
     # of utf8 warnings to verify they work with and without the utf8 class,
     # and don't have effects on other sublass warnings
-    foreach my $warning ('utf8', 'surrogate', 'nonchar', 'non_unicode') {
+    foreach my $warning (0, 'utf8', 'surrogate', 'nonchar', 'non_unicode') {
         foreach my $warn_flag (0, $warn_flags) {
             foreach my $disallow_flag (0, $disallow_flags) {
-                foreach my $do_warning (0, 1) {
-
-                    my $eval_warn = $do_warning
-                                  ? "use warnings '$warning'"
-                                  : $warning eq "utf8"
-                                  ? "no warnings 'utf8'"
-                                  : "use warnings 'utf8'; no warnings '$warning'";
 
-                    # is effectively disallowed if will overflow, even if the
-                    # flag indicates it is allowed, fix up test name to
-                    # indicate this as well
-                    my $disallowed = $disallow_flag || $will_overflow;
+                no warnings 'utf8';
+                my $eval_warn = $warning eq 0 ? "no warnings" : "use warnings '$warning'";
+
+                # is effectively disallowed if will overflow, even if the flag
+                # indicates it is allowed, fix up test name to indicate this
+                # as well
+                my $disallowed = $disallow_flag || $will_overflow;
+
+                my $this_name = "$testname: " . (($disallow_flag)
+                                                  ? 'disallowed'
+                                                  : ($disallowed)
+                                                    ? 'FE_FF allowed'
+                                                    : 'allowed');
+                $this_name .= ", $eval_warn";
+                $this_name .= ", " . (($warn_flag) ? 'with warning flag' : 'no warning flag');
+
+                undef @warnings;
+                my $ret_ref;
+                #note __LINE__ . ": $eval_warn; \$ret_ref = test_utf8n_to_uvuni('$bytes', $length, $warn_flag|$disallow_flag)";
+                my $eval_text = "$eval_warn; \$ret_ref = test_utf8n_to_uvuni('$bytes', $length, $warn_flag|$disallow_flag)";
+                eval "$eval_text";
+                if (! ok ("$@ eq ''", "$this_name: eval succeeded")) {
+                    note "\$!='$!'; eval'd=\"$eval_text\"";
+                    next;
+                }
+                if ($disallowed) {
+                    is($ret_ref->[0], 0, "$this_name: Returns 0");
+                }
+                else {
+                    is($ret_ref->[0], $allowed_uv, "$this_name: Returns expected uv");
+                }
+                is($ret_ref->[1], $expected_len, "$this_name: Returns expected length");
 
-                    my $this_name = "$testname: " . (($disallow_flag)
-                                                    ? 'disallowed'
-                                                    : ($disallowed)
-                                                        ? 'FE_FF allowed'
-                                                        : 'allowed');
-                    $this_name .= ", $eval_warn";
-                    $this_name .= ", " . (($warn_flag)
-                                          ? 'with warning flag'
-                                          : 'no warning flag');
+                if ($will_overflow && ! $disallow_flag && $warning eq 'utf8') {
 
-                    undef @warnings;
-                    my $ret_ref;
-                    #note __LINE__ . ": $eval_warn; \$ret_ref = test_utf8n_to_uvchr('$bytes', $length, $warn_flag|$disallow_flag)";
-                    my $eval_text = "$eval_warn; \$ret_ref = test_utf8n_to_uvchr('$bytes', $length, $warn_flag|$disallow_flag)";
-                    eval "$eval_text";
-                    if (! ok ("$@ eq ''", "$this_name: eval succeeded")) {
-                        note "\$!='$!'; eval'd=\"$eval_text\"";
-                        next;
-                    }
-                    if ($disallowed) {
-                        is($ret_ref->[0], 0, "$this_name: Returns 0");
+                    # Will get the overflow message instead of the expected
+                    # message under these circumstances, as they would
+                    # otherwise accept an overflowed value, which the code
+                    # should not allow, so falls back to overflow.
+                    if (is(scalar @warnings, 1, "$this_name: Got a single warning ")) {
+                        like($warnings[0], qr/overflow/, "$this_name: Got overflow warning");
                     }
                     else {
-                        is($ret_ref->[0], $allowed_uv,
-                                            "$this_name: Returns expected uv");
-                    }
-                    is($ret_ref->[1], $expected_len,
-                                        "$this_name: Returns expected length");
-
-                    if (! $do_warning
-                        && ($warning eq 'utf8' || $warning eq $category))
-                    {
-                        if (!is(scalar @warnings, 0,
-                                            "$this_name: No warnings generated"))
-                        {
+                        if (scalar @warnings) {
                             note "The warnings were: " . join(", ", @warnings);
                         }
                     }
-                    elsif ($will_overflow
-                           && ! $disallow_flag
-                           && $warning eq 'utf8')
-                    {
-
-                        # Will get the overflow message instead of the expected
-                        # message under these circumstances, as they would
-                        # otherwise accept an overflowed value, which the code
-                        # should not allow, so falls back to overflow.
-                        if (is(scalar @warnings, 1,
-                               "$this_name: Got a single warning "))
-                        {
-                            like($warnings[0], qr/overflow/,
-                                            "$this_name: Got overflow warning");
-                        }
-                        else {
-                            if (scalar @warnings) {
-                                note "The warnings were: "
-                                                        . join(", ", @warnings);
-                            }
+                }
+                elsif ($warn_flag && ($warning eq 'utf8' || $warning eq $category)) {
+                    if (is(scalar @warnings, 1, "$this_name: Got a single warning ")) {
+                        like($warnings[0], $message, "$this_name: Got expected warning");
+                    }
+                    else {
+                        if (scalar @warnings) {
+                            note "The warnings were: " . join(", ", @warnings);
                         }
                     }
-                    elsif ($warn_flag
-                           && ($warning eq 'utf8' || $warning eq $category))
+                }
+                else {
+                    if (!is(scalar @warnings, 0, "$this_name: No warnings generated"))
                     {
-                        if (is(scalar @warnings, 1,
-                               "$this_name: Got a single warning "))
-                        {
-                            like($warnings[0], $message,
-                                            "$this_name: Got expected warning");
-                        }
-                        else {
-                            if (scalar @warnings) {
-                                note "The warnings were: "
-                                                        . join(", ", @warnings);
-                            }
-                        }
+                        note "The warnings were: " . join(", ", @warnings);
                     }
+                }
 
-                    # Check CHECK_ONLY results when the input is disallowed.  Do
-                    # this when actually disallowed, not just when the
-                    # $disallow_flag is set
-                    if ($disallowed) {
-                        undef @warnings;
-                        $ret_ref = test_utf8n_to_uvchr($bytes, $length,
-                                                $disallow_flag|$UTF8_CHECK_ONLY);
-                        is($ret_ref->[0], 0, "$this_name, CHECK_ONLY: Returns 0");
-                        is($ret_ref->[1], -1,
-                            "$this_name: CHECK_ONLY: returns expected length");
-                        if (! is(scalar @warnings, 0,
-                            "$this_name, CHECK_ONLY: no warnings generated"))
-                        {
-                            note "The warnings were: " . join(", ", @warnings);
-                        }
+                # Check CHECK_ONLY results when the input is disallowed.  Do
+                # this when actually disallowed, not just when the
+                # $disallow_flag is set
+                if ($disallowed) {
+                    undef @warnings;
+                    $ret_ref = test_utf8n_to_uvuni($bytes, $length, $disallow_flag|$UTF8_CHECK_ONLY);
+                    is($ret_ref->[0], 0, "$this_name, CHECK_ONLY: Returns 0");
+                    is($ret_ref->[1], -1, "$this_name: CHECK_ONLY: returns expected length");
+                    if (! is(scalar @warnings, 0, "$this_name, CHECK_ONLY: no warnings generated")) {
+                        note "The warnings were: " . join(", ", @warnings);
                     }
                 }
             }
diff --git a/gnu/usr.bin/perl/ext/XS-APItest/t/xsub_h.t b/gnu/usr.bin/perl/ext/XS-APItest/t/xsub_h.t
index 9bf0710fa2e..93742b1ba8b 100644
--- a/gnu/usr.bin/perl/ext/XS-APItest/t/xsub_h.t
+++ b/gnu/usr.bin/perl/ext/XS-APItest/t/xsub_h.t
@@ -18,7 +18,7 @@ sub default {
 
 sub expect_good {
     my $package = $_[0];
-    my $version = @_ >= 2 ? ", $_[1]" : '';
+    my $version = exists $_[1] ? ", $_[1]" : '';
     local $Test::Builder::Level = $Test::Builder::Level + 1;
     is_deeply([XS_VERSION_defined(@_)], [],
 	      "Is good for $package$version");
@@ -37,7 +37,7 @@ sub expect_bad {
     } else {
 	$what = 'bootstrap parameter';
     }
-    if (@_ >= 2) {
+    if (exists $_[1]) {
 	$desc = "$_[0], $_[1]";
     } else {
 	$desc = $_[0];
diff --git a/gnu/usr.bin/perl/ext/arybase/arybase.pm b/gnu/usr.bin/perl/ext/arybase/arybase.pm
index 3c090d66c2e..1008684989a 100644
--- a/gnu/usr.bin/perl/ext/arybase/arybase.pm
+++ b/gnu/usr.bin/perl/ext/arybase/arybase.pm
@@ -1,6 +1,6 @@
 package arybase;
 
-our $VERSION = "0.07";
+our $VERSION = "0.05";
 
 require XSLoader;
 XSLoader::load(); # This returns true, which makes require happy.
@@ -14,7 +14,7 @@ arybase - Set indexing base via $[
 =head1 SYNOPSIS
 
     $[ = 1;
-
+    
     @a = qw(Sun Mon Tue Wed Thu Fri Sat);
     print $a[3], "\n";  # prints Tue
 
@@ -44,7 +44,7 @@ It affects the following operations:
     splice @array, $index, ...
     each @array
     keys @array
-
+    
     index $string, $substring  # return value is affected
     pos $string
     substr $string, $offset, ...
diff --git a/gnu/usr.bin/perl/ext/arybase/arybase.xs b/gnu/usr.bin/perl/ext/arybase/arybase.xs
index f8f9ce2b390..cde9bb8a843 100644
--- a/gnu/usr.bin/perl/ext/arybase/arybase.xs
+++ b/gnu/usr.bin/perl/ext/arybase/arybase.xs
@@ -436,7 +436,6 @@ FETCH(...)
 void
 STORE(SV *sv, IV newbase)
     CODE:
-      PERL_UNUSED_VAR(sv);
       if (FEATURE_ARYBASE_IS_ENABLED) {
 	SV *base = cop_hints_fetch_pvs(PL_curcop, "$[", 0);
 	if (SvOK(base) ? SvIV(base) == newbase : !newbase) XSRETURN_EMPTY;
diff --git a/gnu/usr.bin/perl/ext/arybase/ptable.h b/gnu/usr.bin/perl/ext/arybase/ptable.h
index b3f38d8c1ce..de6d816f278 100644
--- a/gnu/usr.bin/perl/ext/arybase/ptable.h
+++ b/gnu/usr.bin/perl/ext/arybase/ptable.h
@@ -164,13 +164,11 @@ STATIC void PTABLE_PREFIX(_store)(pPTBL_ ptable * const t, const void * const ke
  }
 }
 
-/* this function appears to be unused */
-#if 0
 #ifndef ptable_walk
 STATIC void ptable_walk(pTHX_ ptable * const t, void (*cb)(pTHX_ ptable_ent *ent, void *userdata), void *userdata) {
 #define ptable_walk(T, CB, UD) ptable_walk(aTHX_ (T), (CB), (UD))
  if (t && t->items) {
-  ptable_ent ** const array = t->ary;
+  register ptable_ent ** const array = t->ary;
   UV i = t->max;
   do {
    ptable_ent *entry;
@@ -180,13 +178,10 @@ STATIC void ptable_walk(pTHX_ ptable * const t, void (*cb)(pTHX_ ptable_ent *ent
  }
 }
 #endif /* !ptable_walk */
-#endif
 
-/* this function appears to be unused */
-#if 0
 STATIC void PTABLE_PREFIX(_clear)(pPTBL_ ptable * const t) {
  if (t && t->items) {
-  ptable_ent ** const array = t->ary;
+  register ptable_ent ** const array = t->ary;
   UV i = t->max;
 
   do {
@@ -204,10 +199,7 @@ STATIC void PTABLE_PREFIX(_clear)(pPTBL_ ptable * const t) {
   t->items = 0;
  }
 }
-#endif
 
-/* this function appears to be unused */
-#if 0
 STATIC void PTABLE_PREFIX(_free)(pPTBL_ ptable * const t) {
  if (!t)
   return;
@@ -215,7 +207,6 @@ STATIC void PTABLE_PREFIX(_free)(pPTBL_ ptable * const t) {
  PerlMemShared_free(t->ary);
  PerlMemShared_free(t);
 }
-#endif
 
 #undef pPTBL
 #undef pPTBL_
diff --git a/gnu/usr.bin/perl/ext/arybase/t/akeys.t b/gnu/usr.bin/perl/ext/arybase/t/akeys.t
index dc490c458e5..53e9db15e78 100644
--- a/gnu/usr.bin/perl/ext/arybase/t/akeys.t
+++ b/gnu/usr.bin/perl/ext/arybase/t/akeys.t
@@ -1,4 +1,4 @@
-use warnings; no warnings 'deprecated', 'experimental::lexical_topic';
+use warnings; no warnings 'deprecated';
 use strict;
 
 BEGIN {
diff --git a/gnu/usr.bin/perl/ext/arybase/t/aslice.t b/gnu/usr.bin/perl/ext/arybase/t/aslice.t
index 462ee3d6558..f4a507da6ba 100644
--- a/gnu/usr.bin/perl/ext/arybase/t/aslice.t
+++ b/gnu/usr.bin/perl/ext/arybase/t/aslice.t
@@ -1,4 +1,4 @@
-use warnings; no warnings 'deprecated', 'experimental::lexical_topic';
+use warnings; no warnings 'deprecated';
 use strict;
 
 use Test::More tests => 18;
diff --git a/gnu/usr.bin/perl/ext/arybase/t/lslice.t b/gnu/usr.bin/perl/ext/arybase/t/lslice.t
index 828ea3ef886..0db7a078f2d 100644
--- a/gnu/usr.bin/perl/ext/arybase/t/lslice.t
+++ b/gnu/usr.bin/perl/ext/arybase/t/lslice.t
@@ -1,4 +1,4 @@
-use warnings; no warnings 'deprecated', 'experimental::lexical_topic';
+use warnings; no warnings 'deprecated';
 use strict;
 
 use Test::More tests => 12;
diff --git a/gnu/usr.bin/perl/ext/re/t/re_funcs_u.t b/gnu/usr.bin/perl/ext/re/t/re_funcs_u.t
index 706437ec18b..57d7281acf9 100644
--- a/gnu/usr.bin/perl/ext/re/t/re_funcs_u.t
+++ b/gnu/usr.bin/perl/ext/re/t/re_funcs_u.t
@@ -41,7 +41,7 @@ if ('1234'=~/(?:(?<A>\d)|(?<C>!))(?<B>\d)(?<A>\d)(?<B>\d)/){
     @names = sort +regnames(0);
     is("@names","A B","regnames");
     my $names = regnames();
-    ok(($names eq  "B" || $names eq "A"), "regnames in scalar context");
+    is($names, "B", "regnames in scalar context");
     @names = sort +regnames(1);
     is("@names","A B C","regnames");
     is(join("", @{regname("A",1)}),"13");
@@ -92,7 +92,6 @@ if ('1234'=~/(?:(?<A>\d)|(?<C>!))(?<B>\d)(?<A>\d)(?<B>\d)/){
 
     SKIP: {
         skip_if_miniperl("no dynamic loading on miniperl, no POSIX", 3);
-        skip 'No locale testing without d_setlocale', 3 if(!$Config::Config{d_setlocale});
         require POSIX;
         my $current_locale = POSIX::setlocale( &POSIX::LC_CTYPE, 'de_DE.ISO-8859-1' );
         if ( !$current_locale || $current_locale ne 'de_DE.ISO-8859-1' ) {
@@ -109,7 +108,6 @@ if ('1234'=~/(?:(?<A>\d)|(?<C>!))(?<B>\d)(?<A>\d)(?<B>\d)/){
 
     SKIP: {
         skip_if_miniperl("no dynamic loading on miniperl, no POSIX", 3);
-        skip 'No locale testing without d_setlocale', 3 if(!$Config::Config{d_setlocale});
         require POSIX;
         my $current_locale = POSIX::setlocale( &POSIX::LC_CTYPE, 'C' );
         if ( !$current_locale || $current_locale ne 'C' ) {