Perl · jkeenan · Jul 15, 2024 · Jul 13, 2024 · Jul 15, 2024
diff --git a/MANIFEST b/MANIFEST
diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
@@ -981,22 +981,14 @@ package Maintainers;
     },
 
     'podlators' => {
-        'DISTRIBUTION' => 'RRA/podlators-5.01.tar.gz',
+        'DISTRIBUTION' => 'RRA/podlators-v6.0.2.tar.gz',
+        'SYNCINFO'     => 'jkeenan on Sun Jul 14 20:06:07 2024',
         'MAIN_MODULE'  => 'Pod::Man',
         'FILES'        => q[cpan/podlators pod/perlpodstyle.pod],
         'EXCLUDED'     => [
             qr{^\.github/dependabot\.yml},
             qr{^\.github/workflows/build\.yaml},
         ],
-        'CUSTOMIZED'   => [
-            # https://github.com/rra/podlators/pull/28
-            'lib/Pod/Man.pm',
-            'lib/Pod/ParseLink.pm',
-            'lib/Pod/Text.pm',
-            'lib/Pod/Text/Color.pm',
-            'lib/Pod/Text/Overstrike.pm',
-            'lib/Pod/Text/Termcap.pm'
-        ],
         'MAP' => {
             ''                 => 'cpan/podlators/',
             # this file lives outside the cpan/ directory

diff --git a/cpan/podlators/Makefile.PL b/cpan/podlators/Makefile.PL
@@ -4,38 +4,38 @@
 # which only supports that build method, and because it is a dependency of
 # other build systems like Module::Build.
 #
-# Copyright 1999-2001, 2008, 2010, 2012, 2014-2016, 2018-2019, 2022
+# Copyright 1999-2001, 2008, 2010, 2012, 2014-2016, 2018-2019, 2022, 2024
 #     Russ Allbery <[email protected]>
 #
 # This program is free software; you may redistribute it and/or modify it
 # under the same terms as Perl itself.
 #
 # SPDX-License-Identifier: GPL-1.0-or-later OR Artistic-1.0-Perl
 
-use 5.008;
-use strict;
+# Do not use autodie here.  When podlators is built as part of Perl core, it
+# is built before autodie is available.
+use 5.012;
 use warnings;
 
 use Config;
 use ExtUtils::MakeMaker;
 use File::Spec;
 
-# Determine the version of the distribution so that we can construct the
-# provides metadata that unfortunately ExtUtils::MakeMaker does not build.
-# This is a very simple $VERSION parser, since it only has to handle the
-# syntax Pod::Man uses.
+# Determine the version of the distribution, since we need it outside of
+# ExtUtils::MakeMaker to add some additional metadata. This is a very simple
+# parser since it only has to handle the syntax my modules use.
 #
 # Returns: Distribution version as a string
 sub dist_version {
-    open(my $fh, '<', File::Spec->catfile('lib', 'Pod', 'Man.pm'))
-      or die "$0: cannot open lib/Pod/Man.pm: $!\n";
+    my ($path) = @_;
+    open(my $fh, '<', $path) or die "$0: cannot open $path: $!\n";
     while (defined(my $line = <$fh>)) {
-        if ($line =~ m{ \A (?:our \s+)? \$VERSION \s+ = \s+ '([^\']+)' }xms) {
-            close($fh) or die "$0: cannot close lib/Pod/Man.pm\n";
+        if ($line =~ m{ \A package \s+ \S+ \s+ (v[\d.]+) }xms) {
+            close($fh) or die "$0: cannot close $path: $!\n";
             return $1;
         }
     }
-    close($fh) or die "$0: cannot close lib/Pod/Man.pm\n";
+    close($fh) or die "$0: cannot close $path: $!\n";
     die "$0: cannot find version in lib/Pod/Man.pm\n";
 }
 
@@ -45,15 +45,14 @@ sub dist_version {
 #
 # @scripts - List of script names
 #
-# Returns: (Array) List of relative paths from top of distribution
-#          (Scalar) Space-separated relative paths from top of distribution
+# Returns: List of relative paths from top of distribution
 sub scripts {
     my (@scripts) = @_;
     my @paths = map { File::Spec->catfile('scripts', $_) } @scripts;
     if ($^O eq 'VMS') {
         @paths = map { m{ [.] PL \z }xms ? $_ : $_ . '.com' } @paths;
     }
-    return wantarray ? @paths : join(q{ }, @paths);
+    return @paths;
 }
 
 # Generate an association between a source file and a destination man page for
@@ -80,18 +79,16 @@ sub man1pod {
 
 # The hash of all the metadata.  This will be modified before WriteMakefile to
 # remove keys not supported by the local version of ExtUtils::MakeMaker.
-my $dist_version = dist_version();
+my $dist_version = dist_version(File::Spec->catfile(qw(lib Pod Man.pm)));
 my %metadata = (
-    #<<<
     NAME             => 'Pod',
     DISTNAME         => 'podlators',
     ABSTRACT         => 'Convert POD data to various other formats',
     AUTHOR           => 'Russ Allbery <[email protected]>',
     LICENSE          => 'perl_5',
     EXE_FILES        => [scripts('pod2text', 'pod2man')],
-    VERSION_FROM     => 'lib/Pod/Man.pm',
-    MIN_PERL_VERSION => '5.010',
-    #>>>
+    VERSION          => $dist_version,
+    MIN_PERL_VERSION => '5.012',
 
     # Use *.PL files to generate the driver scripts so that we get the correct
     # invocation of Perl on non-UNIX platforms.
@@ -109,8 +106,8 @@ my %metadata = (
     },
 
     # Clean some additional files.
-    clean => { FILES => File::Spec->catdir('t', 'tmp') },
-    realclean => { FILES => scalar(scripts('pod2text', 'pod2man')) },
+    clean     => { FILES => File::Spec->catdir('t', 'tmp') },
+    realclean => { FILES => join(q{ }, scripts('pod2text', 'pod2man')) },
 
     # Dependencies on other modules.
     PREREQ_PM => { 'Pod::Simple' => 3.26 },
@@ -119,48 +116,43 @@ my %metadata = (
     # directories by default.
     test => { TESTS => 't/*/*.t' },
 
-    # For older versions of Perl, we have to force installation into the Perl
-    # module directories since site modules did not take precedence over core
-    # modules.
-    INSTALLDIRS => $] lt '5.011' ? 'perl' : 'site',
-
     # Additional metadata.
     META_ADD => {
         'meta-spec' => { version => 2 },
-        provides => {
+        provides    => {
             'Pod::Man' => {
-                file => 'lib/Pod/Man.pm',
+                file    => 'lib/Pod/Man.pm',
                 version => $dist_version,
             },
             'Pod::ParseLink' => {
-                file => 'lib/Pod/ParseLink.pm',
+                file    => 'lib/Pod/ParseLink.pm',
                 version => $dist_version,
             },
             'Pod::Text' => {
-                file => 'lib/Pod/Text.pm',
+                file    => 'lib/Pod/Text.pm',
                 version => $dist_version,
             },
             'Pod::Text::Color' => {
-                file => 'lib/Pod/Text/Color.pm',
+                file    => 'lib/Pod/Text/Color.pm',
                 version => $dist_version,
             },
             'Pod::Text::Overstrike' => {
-                file => 'lib/Pod/Text/Overstrike.pm',
+                file    => 'lib/Pod/Text/Overstrike.pm',
                 version => $dist_version,
             },
             'Pod::Text::Termcap' => {
-                file => 'lib/Pod/Text/Termcap.pm',
+                file    => 'lib/Pod/Text/Termcap.pm',
                 version => $dist_version,
             },
         },
         resources => {
             bugtracker => {
                 web => 'https://github.com/rra/podlators/issues',
             },
-            homepage => 'https://www.eyrie.org/~eagle/software/podlators/',
+            homepage   => 'https://www.eyrie.org/~eagle/software/podlators/',
             repository => {
-                url => 'https://github.com/rra/podlators.git',
-                web => 'https://github.com/rra/podlators',
+                url  => 'https://github.com/rra/podlators.git',
+                web  => 'https://github.com/rra/podlators',
                 type => 'git',
             },
         },
@@ -170,8 +162,8 @@ my %metadata = (
 # Remove keys that aren't supported by this version of ExtUtils::MakeMaker.
 # This hash maps keys to the minimum supported version.
 my %supported = (
-    LICENSE => 6.31,
-    META_ADD => 6.46,
+    LICENSE          => 6.31,
+    META_ADD         => 6.46,
     MIN_PERL_VERSION => 6.48,
 );
 for my $key (keys(%supported)) {

diff --git a/cpan/podlators/docs/docknot.yaml b/cpan/podlators/docs/docknot.yaml
@@ -15,14 +15,14 @@ format: v1
 
 name: podlators
 maintainer: Russ Allbery <[email protected]>
-version: '5.01'
+version: v6.0.2
 synopsis: format POD source into various output formats
 
 license:
   name: Perl
 copyrights:
   - holder: Russ Allbery <[email protected]>
-    years: 1999-2010, 2012-2022
+    years: 1999-2024
 
 build:
   type: ExtUtils::MakeMaker
@@ -31,10 +31,15 @@ distribution:
   section: perl
   tarname: podlators
   version: podlators
+  ignore:
+    - .github/dependabot.yml
+    - .github/workflows/build.yaml
 support:
   email: [email protected]
   github: rra/podlators
   web: https://www.eyrie.org/~eagle/software/podlators/
+  listname: pod-people
+  listurl: https://lists.perl.org/list/pod-people.html
 vcs:
   browse: https://git.eyrie.org/?p=perl/podlators.git
   github: rra/podlators
@@ -119,7 +124,7 @@ description: |
   example).
 
 requirements: |
-  This module requires Perl 5.10 or later and Pod::Simple 3.26 or later.
+  This module requires Perl 5.12 or later and Pod::Simple 3.26 or later.
   (Pod::Simple 3.26 was included in Perl 5.17.10.)
 
   The troff/nroff generated by Pod::Man should be compatible with any troff or
@@ -135,7 +140,9 @@ test:
     present:
 
     * Test::CPAN::Changes (part of CPAN-Changes)
+    * Test::Kwalitee
     * Test::MinimumVersion
+    * Test::Perl::Critic
     * Test::Pod
     * Test::Spelling
     * Test::Strict