From ad6084761d35128e06db73b70042e354de7588b8 Mon Sep 17 00:00:00 2001 From: "E. Choroba" Date: Mon, 25 Jul 2022 11:47:47 +0200 Subject: [PATCH 1/2] Handle module extension/suffix earlier in corelist update This makes Devel::PPPort less special and handles Pod-Functions/Functions_pm.PL correctly. --- Porting/corelist.pl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Porting/corelist.pl b/Porting/corelist.pl index eb84c18b7c91..562caa90f22d 100755 --- a/Porting/corelist.pl +++ b/Porting/corelist.pl @@ -111,12 +111,12 @@ $version =~ /\d/ and $version = "'$version'"; # some heuristics to figure out the module name from the file name + $module =~ s/(\.pm|_pm\.PL)$//; $module =~ s{^(lib|cpan|dist|ext|os2/OS2)/}{} and $1 ne 'lib' and ( $module =~ s{\b(\w+)/\1\b}{$1}, $module =~ s{^B/O}{O}, - $module =~ s{^Devel-PPPort}{Devel}, $module =~ s{^libnet/}{}, $module =~ s{^PathTools/}{}, $module =~ s{REXX/DLL}{DLL}, @@ -131,7 +131,6 @@ $module =~ s{/}{::}g; $module =~ s{-}{::}g; $module =~ s{^.*::lib::}{}; # turns Foo/lib/Foo.pm into Foo.pm - $module =~ s/(\.pm|_pm\.PL)$//; $lines{$module} = $version; $module_to_file{$module} = $File::Find::name; }, From d24b7d413e33515d2cb76a26242e83b069f7d867 Mon Sep 17 00:00:00 2001 From: "E. Choroba" Date: Mon, 25 Jul 2022 00:47:20 +0200 Subject: [PATCH 2/2] Remove Pod::Functions::Functions from CoreList There's no such module and there never has been. --- dist/Module-CoreList/lib/Module/CoreList.pm | 7 ------- 1 file changed, 7 deletions(-) diff --git a/dist/Module-CoreList/lib/Module/CoreList.pm b/dist/Module-CoreList/lib/Module/CoreList.pm index d4b6369c924b..95ebacc08eed 100644 --- a/dist/Module-CoreList/lib/Module/CoreList.pm +++ b/dist/Module-CoreList/lib/Module/CoreList.pm @@ -9967,7 +9967,6 @@ for my $version ( sort { $a <=> $b } keys %released ) { 'ExtUtils::Mkbootstrap' => '6.98', 'ExtUtils::Mksymlists' => '6.98', 'ExtUtils::testlib' => '6.98', - 'Pod::Functions::Functions'=> '1.08', }, removed => { } @@ -11396,7 +11395,6 @@ for my $version ( sort { $a <=> $b } keys %released ) { 'Module::CoreList::Utils'=> '5.20150320', 'POSIX' => '1.52', 'Pod::Functions' => '1.09', - 'Pod::Functions::Functions'=> '1.09', 'Term::Complete' => '1.403', 'Test::Builder' => '1.001014', 'Test::Builder::IO::Scalar'=> '2.113', @@ -12437,7 +12435,6 @@ for my $version ( sort { $a <=> $b } keys %released ) { 'Module::CoreList::Utils'=> '5.20160320', 'POSIX' => '1.64', 'Pod::Functions' => '1.10', - 'Pod::Functions::Functions'=> '1.10', 'Scalar::Util' => '1.42_02', 'SelfLoader' => '1.23', 'Socket' => '2.020_03', @@ -12744,7 +12741,6 @@ for my $version ( sort { $a <=> $b } keys %released ) { 'POSIX' => '1.70', 'Pod::Checker' => '1.73', 'Pod::Functions' => '1.11', - 'Pod::Functions::Functions'=> '1.11', 'Pod::Usage' => '1.69', 'Test2' => '1.302026', 'Test2::API' => '1.302026', @@ -14936,7 +14932,6 @@ for my $version ( sort { $a <=> $b } keys %released ) { 'Opcode' => '1.42', 'POSIX' => '1.81', 'Pod::Functions' => '1.12', - 'Pod::Functions::Functions'=> '1.12', 'Pod::Html' => '1.23', 'Sys::Hostname' => '1.22', 'Test2' => '1.302120', @@ -15059,7 +15054,6 @@ for my $version ( sort { $a <=> $b } keys %released ) { 'Module::CoreList::Utils'=> '5.20180120', 'Opcode' => '1.43', 'Pod::Functions' => '1.13', - 'Pod::Functions::Functions'=> '1.13', 'Pod::Html' => '1.24', 'Pod::Man' => '4.10', 'Pod::ParseLink' => '4.10', @@ -18725,7 +18719,6 @@ for my $version ( sort { $a <=> $b } keys %released ) { 'Opcode' => '1.52', 'PerlIO' => '1.12', 'Pod::Functions' => '1.14', - 'Pod::Functions::Functions'=> '1.14', 'Pod::Html' => '1.31', 'Pod::Html::Util' => '1.31', 'Pod::Simple' => '3.43',