X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Porting%2Fcorelist.pl;h=5e4e5b139a22990e129b61e016d1b03f6cddb0cb;hb=d152a4c4e9147bb67eee2f34c9e64eeb8fdbd1b8;hp=4bd71e9808b9c185b18b3048365449478c4e113b;hpb=2ce7d67686eea320b2957e133f57dd60388f2044;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/Porting/corelist.pl b/Porting/corelist.pl
index 4bd71e9..5e4e5b1 100644
--- a/Porting/corelist.pl
+++ b/Porting/corelist.pl
@@ -17,7 +17,7 @@ use Maintainers qw(%Modules files_to_modules);
 use File::Spec;
 use Parse::CPAN::Meta;
 
-my $corelist_file = 'ext/Module-CoreList/lib/Module/CoreList.pm';
+my $corelist_file = 'dist/Module-CoreList/lib/Module/CoreList.pm';
 
 my %lines;
 my %module_to_file;
@@ -84,28 +84,32 @@ find(
         $version =~ /\d/ and $version = "'$version'";
 
         # some heuristics to figure out the module name from the file name
-        $module =~ s{^(lib|(win32/|vms/|symbian/)?ext)/}{}
-            and $1 ne 'lib'
+        $module =~ s{^(lib|cpan|dist|(?:vms/|symbian/)?ext)/}{}
+			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{^Encode/encoding}{encoding},
             $module =~ s{^IPC-SysV/}{IPC/},
             $module =~ s{^MIME-Base64/QuotedPrint}{MIME/QuotedPrint},
             $module =~ s{^(?:DynaLoader|Errno|Opcode)/}{},
             );
+		$module =~ s{^lib/}{}g;
         $module =~ s{/}{::}g;
         $module =~ s{-}{::}g;
-        $module =~ s{^.*::lib::}{};
+		$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;
     },
+    'vms/ext',
+    'symbian/ext',
     'lib',
     'ext',
-    'vms/ext',
-    'symbian/ext'
+	'cpan',
+	'dist'
 );
 
 -e 'configpm' and $lines{Config} = 'undef';
@@ -202,7 +206,7 @@ foreach my $module ( sort keys %module_to_upstream ) {
         if $dist;
 
     $bug_tracker = defined $bug_tracker ? "'$bug_tracker'" : 'undef';
-    next if $bug_tracker eq "'http://rt.perl.org/perlbug/'";
+	next if $bug_tracker eq "'http://rt.perl.org/perlbug/'";
     $tracker .= sprintf "    %-24s=> %s,\n", "'$module'", $bug_tracker;
 }
 $tracker .= ");";