X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Porting%2FMaintainers.pl;h=b786b3160d000834cbaa6179fe7c351324ab277a;hb=71e9501eb5f515e4c2f2e89dacb9f682c4e7fb0f;hp=d0e1889e400c66fb5886e3fa147c77e0d5617a29;hpb=1f46ac67c17bb3adfe5f1fe67d76a063d10662cc;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index d0e1889..b786b31 100755
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -179,7 +179,7 @@ use File::Glob qw(:case);
 	{
 	'MAINTAINER'	=> 'kane',
 	'DISTRIBUTION'	=> 'KANE/Archive-Extract-0.34.tar.gz',
-	'FILES'		=> q[ext/Archive-Extract],
+	'FILES'		=> q[cpan/Archive-Extract],
 	'CPAN'		=> 1,
 	'UPSTREAM'	=> 'cpan',
 	'BUGS'		=> 'bug-archive-extract@rt.cpan.org',
@@ -189,7 +189,7 @@ use File::Glob qw(:case);
 	{
 	'MAINTAINER'	=> 'kane',
 	'DISTRIBUTION'	=> 'KANE/Archive-Tar-1.52.tar.gz',
-	'FILES'		=> q[ext/Archive-Tar],
+	'FILES'		=> q[cpan/Archive-Tar],
 	'CPAN'		=> 1,
 	'UPSTREAM'	=> 'cpan',
 	'BUGS'		=> 'bug-archive-tar@rt.cpan.org',
@@ -198,7 +198,7 @@ use File::Glob qw(:case);
     'Attribute::Handlers' =>
 	{
 	'MAINTAINER'	=> 'rgarcia',
-	'DISTRIBUTION'	=> 'SMUELLER/Attribute-Handlers-0.86.tar.gz',
+	'DISTRIBUTION'	=> 'SMUELLER/Attribute-Handlers-0.87.tar.gz',
 	'FILES'		=> q[ext/Attribute-Handlers],
 	'CPAN'		=> 1,
 	'UPSTREAM'	=> "blead",
@@ -208,7 +208,7 @@ use File::Glob qw(:case);
 	{
 	'MAINTAINER'	=> 'pjf',
 	'DISTRIBUTION'	=> 'PJF/autodie-2.06_01.tar.gz',
-	'FILES' 	=> q[ext/autodie],
+	'FILES' 	=> q[cpan/autodie],
 	'EXCLUDED'	=> [ qr{^inc/Module/},
 
                              # All these tests depend upon external
@@ -235,11 +235,11 @@ use File::Glob qw(:case);
     'AutoLoader' =>
 	{
 	'MAINTAINER'	=> 'smueller',
-	'DISTRIBUTION'	=> 'SMUELLER/AutoLoader-5.69.tar.gz',
-	'FILES'		=> q[ext/AutoLoader],
+	'DISTRIBUTION'	=> 'SMUELLER/AutoLoader-5.70.tar.gz',
+	'FILES'		=> q[cpan/AutoLoader],
 	'EXCLUDED'	=> [ qw( t/00pod.t ) ],
 	'CPAN'		=> 1,
-	'UPSTREAM'	=> "cpan",
+	'UPSTREAM'	=> 'cpan',
 	},
 
     'B::Concise' =>
@@ -315,21 +315,19 @@ use File::Glob qw(:case);
 
     'Class::ISA' =>
 	{
-	'MAINTAINER'	=> 'sburke',
-	'DISTRIBUTION'	=> 'SBURKE/Class-ISA-0.33.tar.gz',
-	'FILES'		=> q[ext/Class-ISA],
+	'MAINTAINER'	=> 'smueller',
+	'DISTRIBUTION'	=> 'SMUELLER/Class-ISA-0.35.tar.gz',
+	'FILES'		=> q[cpan/Class-ISA],
 	'CPAN'		=> 1,
-	'UPSTREAM'	=> undef,
+	'UPSTREAM'	=> 'cpan',
 	},
 
     'Compress::Raw::Bzip2' =>
 	{
 	'MAINTAINER'	=> 'pmqs',
-	'DISTRIBUTION'	=> 'PMQS/Compress-Raw-Bzip2-2.020.tar.gz',
+	'DISTRIBUTION'	=> 'PMQS/Compress-Raw-Bzip2-2.021.tar.gz',
 	'FILES'		=> q[ext/Compress-Raw-Bzip2],
 	'EXCLUDED'	=> [ qr{^t/Test/},
-			     # NB: we use the CompTestUtils.pm
-			     # from IO-Compress instead
 			     qw( bzip2-src/bzip2-cpp.patch
 			     )
 			   ],
@@ -340,18 +338,14 @@ use File::Glob qw(:case);
     'Compress::Raw::Zlib' =>
 	{
 	'MAINTAINER'	=> 'pmqs',
-	'DISTRIBUTION'	=> 'PMQS/Compress-Raw-Zlib-2.020.tar.gz',
+	'DISTRIBUTION'	=> 'PMQS/Compress-Raw-Zlib-2.021.tar.gz',
 
 	'FILES'		=> q[ext/Compress-Raw-Zlib],
-			     # NB: we use the CompTestUtils.pm
-			     # from IO-Compress instead
 	'EXCLUDED'	=> [ qr{^t/Test/},
 			     qw( t/000prereq.t
 				 t/99pod.t
 			       )
 			   ],
-	'MAP'		=> { ''	=> 'ext/Compress-Raw-Zlib/',
-			   },
 	'CPAN'		=> 1,
 	'UPSTREAM'	=> undef,
 	},
@@ -376,7 +370,7 @@ use File::Glob qw(:case);
 	{
 	'MAINTAINER'	=> 'andk',
 	'DISTRIBUTION'	=> 'ANDK/CPAN-1.9402.tar.gz',
-	'FILES'		=> q[ext/CPAN],
+	'FILES'		=> q[cpan/CPAN],
 	'EXCLUDED'	=> [ qr{^distroprefs/},
 			     qr{^inc/Test/},
 			     qr{^t/CPAN/authors/},
@@ -413,14 +407,14 @@ use File::Glob qw(:case);
 			       },
 			   ],
 	'CPAN'		=> 1,
-	'UPSTREAM'	=> 'CPAN',
+	'UPSTREAM'	=> 'cpan',
 	},
 
     'CPANPLUS' =>
 	{
 	'MAINTAINER'	=> 'kane',
 	'DISTRIBUTION'	=> 'KANE/CPANPLUS-0.88.tar.gz',
-	'FILES'		=> q[ext/CPANPLUS],
+	'FILES'		=> q[cpan/CPANPLUS],
 	'EXCLUDED'	=> [ qr{^inc/},
 			     qr{^t/dummy-.*\.hidden$},
 			     qw{ bin/cpanp-boxed },
@@ -440,7 +434,7 @@ use File::Glob qw(:case);
 	{
 	'MAINTAINER'	=> 'bingos',
 	'DISTRIBUTION'	=> 'BINGOS/CPANPLUS-Dist-Build-0.40.tar.gz',
-	'FILES'		=> q[ext/CPANPLUS-Dist-Build],
+	'FILES'		=> q[cpan/CPANPLUS-Dist-Build],
 	'EXCLUDED'	=> [ qr{^inc/},
 			     qw{ t/99_pod.t
 			         t/99_pod_coverage.t
@@ -463,7 +457,7 @@ use File::Glob qw(:case);
 	{
 	'MAINTAINER'	=> 'pmqs',
 	'DISTRIBUTION'	=> 'PMQS/DB_File-1.820.tar.gz',
-	'FILES'		=> q[ext/DB_File],
+	'FILES'		=> q[cpan/DB_File],
 	'EXCLUDED'	=> [ qr{^patches/},
 			     qw{ t/pod.t
 			         fallback.h
@@ -521,7 +515,7 @@ use File::Glob qw(:case);
 	{
 	'MAINTAINER'	=> 'dankogai',
 	'DISTRIBUTION'	=> 'DANKOGAI/Encode-2.35.tar.gz',
-	'FILES'		=> q[ext/Encode],
+	'FILES'		=> q[cpan/Encode],
 	'EXCLUDED'	=> [ qw{t/piconv.t} ], # FIXME
 	'CPAN'		=> 1,
 	'UPSTREAM'	=> undef,
@@ -560,7 +554,7 @@ use File::Glob qw(:case);
 	{
 	'MAINTAINER'	=> 'kwilliams',
 	'DISTRIBUTION'	=> 'DAGOLDEN/ExtUtils-CBuilder-0.2602.tar.gz',
-	'FILES'		=> q[ext/ExtUtils-CBuilder],
+	'FILES'		=> q[cpan/ExtUtils-CBuilder],
 	'EXCLUDED'	=> [ qw{devtools} ],
 	'CPAN'		=> 1,
 	'UPSTREAM'	=> 'cpan',
@@ -636,7 +630,7 @@ use File::Glob qw(:case);
 	{
 	'MAINTAINER'	=> 'kwilliams',
 	'DISTRIBUTION'	=> 'DAGOLDEN/ExtUtils-ParseXS-2.2002.tar.gz',
-	'FILES'		=> q[ext/ExtUtils-ParseXS],
+	'FILES'		=> q[cpan/ExtUtils-ParseXS],
 	'CPAN'		=> 1,
 	'UPSTREAM'	=> 'cpan',
 	},
@@ -653,7 +647,7 @@ use File::Glob qw(:case);
 	{
 	'MAINTAINER'	=> 'kane',
 	'DISTRIBUTION'	=> 'KANE/File-Fetch-0.20.tar.gz',
-	'FILES'		=> q[ext/File-Fetch],
+	'FILES'		=> q[cpan/File-Fetch],
 	'CPAN'		=> 1,
 	'UPSTREAM'	=> 'cpan',
 	},
@@ -662,7 +656,7 @@ use File::Glob qw(:case);
 	{
 	'MAINTAINER'	=> 'dland',
 	'DISTRIBUTION'	=> 'DLAND/File-Path-2.07_03.tar.gz',
-	'FILES'		=> q[ext/File-Path],
+	'FILES'		=> q[cpan/File-Path],
 	'EXCLUDED'	=> [ qw{eg/setup-extra-tests
 				t/pod.t
 				t/taint.t
@@ -684,9 +678,6 @@ use File::Glob qw(:case);
 				misc/results.txt
 			       }
 			   ],
-	'MAP'		=> { ''		=> 'lib/File/',
-			     't/'	=> 't/',
-			   },
 	'CPAN'		=> 1,
 	'UPSTREAM'	=> undef,
 	},
@@ -742,13 +733,15 @@ use File::Glob qw(:case);
 	{
 	'MAINTAINER'	=> 'jv',
 	'DISTRIBUTION'	=> 'JV/Getopt-Long-2.38.tar.gz',
-	'FILES'		=> q[lib/Getopt/Long.pm
-			     lib/Getopt/Long
+	'FILES'		=> q[cpan/Getopt-Long
 			     lib/newgetopt.pl
 			    ],
 	'EXCLUDED'	=> [ qr{^examples/},
 			     qw{perl-Getopt-Long.spec},
 			   ],
+	'MAP'		=> { ''		       => 'ext/Getopt-Long/',
+			     'lib/newgetopt.pl' => 'lib/newgetopt.pl',
+			   },
 	'CPAN'		=> 1,
 	'UPSTREAM'	=> 'cpan',
 	},
@@ -769,10 +762,7 @@ use File::Glob qw(:case);
 	{
 	'MAINTAINER'	=> 'ilyaz',
 	'DISTRIBUTION'	=> 'ILYAZ/modules/if-0.0401.tar.gz',
-	'FILES'		=> q[lib/if.{pm,t}],
-	'MAP'		=> { 't/' => 'lib/',
-			     ''   => 'lib/',
-			   },
+	'FILES'		=> q[ext/if],
 	'CPAN'		=> 1,
 	'UPSTREAM'	=> undef,
 	},
@@ -790,13 +780,11 @@ use File::Glob qw(:case);
     'IO-Compress' =>
 	{
 	'MAINTAINER'	=> 'pmqs',
-	'DISTRIBUTION'	=> 'PMQS/IO-Compress-2.020.tar.gz',
-	'FILES'		=> q[ext/IO-Compress t/lib/compress ],
+	'DISTRIBUTION'	=> 'PMQS/IO-Compress-2.021.tar.gz',
+	'FILES'		=> q[ext/IO-Compress],
 	'EXCLUDED'	=> [ qr{t/Test/},
 			     qw{t/cz-03zlib-v1.t},
 			   ],
-	'MAP'		=> { ''		  => 'ext/IO-Compress/',
-			   },
 	'CPAN'		=> 1,
 	'UPSTREAM'	=> undef,
 	},
@@ -804,12 +792,8 @@ use File::Glob qw(:case);
     'IO::Zlib' =>
 	{
 	'MAINTAINER'	=> 'tomhughes',
-	'DISTRIBUTION'	=> 'TOMHUGHES/IO-Zlib-1.09.tar.gz',
+	'DISTRIBUTION'	=> 'TOMHUGHES/IO-Zlib-1.10.tar.gz',
 	'FILES'		=> q[ext/IO-Zlib],
-  # Hmmm is this following bit needed now? CW
-	'MAP'		=> { 'Zlib.pm' => 'lib/IO/Zlib.pm',
-			     ''	       => 'lib/IO/Zlib/',
-			   },
 	'CPAN'		=> 1,
 	'UPSTREAM'	=> undef,
 	},
@@ -818,7 +802,7 @@ use File::Glob qw(:case);
 	{
 	'MAINTAINER'	=> 'kane',
 	'DISTRIBUTION'	=> 'BINGOS/IPC-Cmd-0.48.tar.gz',
-	'FILES'		=> q[ext/IPC-Cmd],
+	'FILES'		=> q[cpan/IPC-Cmd],
 	'CPAN'		=> 1,
 	'UPSTREAM'	=> 'cpan',
 	},
@@ -827,7 +811,7 @@ use File::Glob qw(:case);
 	{
 	'MAINTAINER'	=> 'mhx',
 	'DISTRIBUTION'	=> 'MHX/IPC-SysV-2.01.tar.gz',
-	'FILES'		=> q[ext/IPC-SysV],
+	'FILES'		=> q[cpan/IPC-SysV],
 	'EXCLUDED'	=> [ qw{const-c.inc const-xs.inc} ],
 	'CPAN'		=> 1,
 	'UPSTREAM'	=> 'cpan',
@@ -837,11 +821,8 @@ use File::Glob qw(:case);
 	{
 	'MAINTAINER'	=> 'smueller',
 	'DISTRIBUTION'	=> 'SMUELLER/lib-0.62.tar.gz',
-	'FILES'		=> q[lib/lib_pm.PL lib/lib.t],
+	'FILES'		=> q[ext/lib/],
 	'EXCLUDED'	=> [ qw{forPAUSE/lib.pm t/00pod.t} ],
-	'MAP'		=> { 'lib_pm.PL' => 'lib/lib_pm.PL',
-			     't/01lib.t' => 'lib/lib.t',
-			   },
 	'CPAN'		=> 1,
 	'UPSTREAM'	=> "blead",
 	},
@@ -889,7 +870,7 @@ use File::Glob qw(:case);
 	{
 	'MAINTAINER'	=> 'kane',
 	'DISTRIBUTION'	=> 'KANE/Log-Message-0.02.tar.gz',
-	'FILES'		=> q[ext/Log-Message],
+	'FILES'		=> q[cpan/Log-Message],
 	'CPAN'		=> 1,
 	'UPSTREAM'	=> 'cpan',
 	},
@@ -898,7 +879,7 @@ use File::Glob qw(:case);
 	{
 	'MAINTAINER'	=> 'kane',
 	'DISTRIBUTION'	=> 'KANE/Log-Message-Simple-0.04.tar.gz',
-	'FILES'		=> q[ext/Log-Message-Simple],
+	'FILES'		=> q[cpan/Log-Message-Simple],
 	'CPAN'		=> 1,
 	'UPSTREAM'	=> 'cpan',
 	},
@@ -922,11 +903,6 @@ use File::Glob qw(:case);
 				t/pod_cov.t
 			       }
 			   ],
-	'MAP'		=> { 'lib/'    => 'lib/',
-			     ''        => 'lib/Math/BigInt/',
-			     't/new_overloaded.t' =>
-					 't/new_ovld.t',
-			   },
 	'CPAN'		=> 1,
 	'UPSTREAM'	=> undef,
 	},
@@ -978,7 +954,7 @@ use File::Glob qw(:case);
 	{
 	'MAINTAINER'	=> 'zefram',
 	'DISTRIBUTION'	=> 'JHI/Math-Complex-1.56.tar.gz',
-	'FILES'		=> q[ext/Math-Complex],
+	'FILES'		=> q[cpan/Math-Complex],
 	'EXCLUDED'	=> [
 			     qw{
 				t/pod.t
@@ -1000,10 +976,6 @@ use File::Glob qw(:case);
 				Memoize/Saves.pm
 			       },
 			   ],
-	'MAP'		=> { ''		  => 'lib/Memoize/',
-			     'Memoize/'	  => 'lib/Memoize/',
-			     'Memoize.pm' => 'lib/Memoize.pm',
-			   },
 	'CPAN'		=> 1,
 	'UPSTREAM'	=> undef,
 	},
@@ -1022,8 +994,9 @@ use File::Glob qw(:case);
 	{
 	'MAINTAINER'	=> 'kwilliams',
 	'DISTRIBUTION'	=> 'DAGOLDEN/Module-Build-0.35.tar.gz',
-	'FILES'		=> q[lib/Module/Build lib/Module/Build.pm],
-	'EXCLUDED'	=> [ qw{ t/par.t t/signature.t scripts/bundle.pl}, ],
+	'FILES'		=> q[cpan/Module-Build],
+	'EXCLUDED'	=> [ qw{ t/par.t t/signature.t scripts/bundle.pl},
+			     qr!^contrib/! ],
 	'CPAN'		=> 1,
 	'UPSTREAM'	=> 'cpan',
 	},
@@ -1041,7 +1014,7 @@ use File::Glob qw(:case);
 	{
 	'MAINTAINER'	=> 'kane',
 	'DISTRIBUTION'	=> 'KANE/Module-Load-0.16.tar.gz',
-	'FILES'		=> q[ext/Module-Load],
+	'FILES'		=> q[cpan/Module-Load],
 	'CPAN'		=> 1,
 	'UPSTREAM'	=> 'cpan',
 	},
@@ -1050,7 +1023,7 @@ use File::Glob qw(:case);
 	{
 	'MAINTAINER'	=> 'kane',
 	'DISTRIBUTION'	=> 'KANE/Module-Load-Conditional-0.30.tar.gz',
-	'FILES'		=> q[ext/Module-Load-Conditional],
+	'FILES'		=> q[cpan/Module-Load-Conditional],
 	'CPAN'		=> 1,
 	'UPSTREAM'	=> 'cpan',
 	},
@@ -1059,13 +1032,11 @@ use File::Glob qw(:case);
 	{
 	'MAINTAINER'	=> 'kane',
 	'DISTRIBUTION'	=> 'BINGOS/Module-Loaded-0.06.tar.gz',
-	'FILES'		=> q[ext/Module-Loaded],
+	'FILES'		=> q[cpan/Module-Loaded],
 	'CPAN'		=> 1,
 	'UPSTREAM'	=> 'cpan',
 	},
 
-    # NB. tests are located in t/Module_Pluggable to avoid directory
-    # depth issues on VMS
     'Module::Pluggable' =>
 	{
 	'MAINTAINER'	=> 'simonw',
@@ -1088,7 +1059,7 @@ use File::Glob qw(:case);
 	{
 	'MAINTAINER'	=> 'rafl',
 	'DISTRIBUTION'	=> 'FLORA/NEXT-0.64.tar.gz',
-	'FILES'		=> q[lib/NEXT.pm lib/NEXT],
+	'FILES'		=> q[cpan/NEXT],
 	'EXCLUDED'	=> [ qr{^demo/} ],
 	'CPAN'		=> 1,
 	'UPSTREAM'	=> 'cpan',
@@ -1098,7 +1069,7 @@ use File::Glob qw(:case);
 	{
 	'MAINTAINER'	=> 'kane',
 	'DISTRIBUTION'	=> 'KANE/Object-Accessor-0.34.tar.gz',
-	'FILES'		=> q[ext/Object-Accessor],
+	'FILES'		=> q[cpan/Object-Accessor],
 	'CPAN'		=> 1,
 	'UPSTREAM'	=> 'cpan',
 	},
@@ -1146,24 +1117,14 @@ use File::Glob qw(:case);
     'PathTools' =>
 	{
 	'MAINTAINER'	=> 'kwilliams',
-	'DISTRIBUTION'	=> 'SMUELLER/PathTools-3.30.tar.gz',
-	'FILES'		=> q[lib/File/Spec.pm
-			     lib/File/Spec
-			     ext/Cwd
-			    ],
+	'DISTRIBUTION'	=> 'SMUELLER/PathTools-3.30_01.tar.gz',
+	'FILES'		=> q[ext/Cwd],
 	# XXX note that the CPAN and blead Makefile.PL are totally
 	# unrelated. The blead one is described as 'core-only'.
 	# Perhaps after the big lib/ => ext/ migration it will be possible
 	# to harmonize them?
 	
 	'EXCLUDED'	=> [ qr{^t/lib/Test/} ],
-	'MAP'		=> { 'lib/'      => 'lib/',
-			     ''          => 'ext/Cwd/',
-			     't/'        => 'lib/File/Spec/t/',
-			     't/cwd.t'   => 'ext/Cwd/t/cwd.t',
-			     't/taint.t' => 'ext/Cwd/t/taint.t',
-			     't/win32.t' => 'ext/Cwd/t/win32.t',
-			   },
 	'CPAN'		=> 1,
 	'UPSTREAM'	=> "cpan",
 	},
@@ -1188,11 +1149,7 @@ use File::Glob qw(:case);
 	{
 	'MAINTAINER'	=> 'elizabeth',
 	'DISTRIBUTION'	=> 'ELIZABETH/PerlIO-via-QuotedPrint-0.06.tar.gz',
-	'FILES'		=> q[lib/PerlIO/via/QuotedPrint.pm
-			     lib/PerlIO/via/t/QuotedPrint.t],
-	'MAP'		=> { 'lib/'      => 'lib/',
-			     ''        => 'lib/PerlIO/via/',
-			   },
+	'FILES'		=> q[ext/PerlIO-via-QuotedPrint],
 	'CPAN'		=> 1,
 	'UPSTREAM'	=> undef,
 	},
@@ -1264,7 +1221,7 @@ use File::Glob qw(:case);
 			     pod/pod2latex.PL
 			    ],
 	'EXCLUDED'	=> [ qw( t/require.t ) ],
-	'MAP'		=> { '' => 'lib/Pod/',
+	'MAP'		=> { '' => 'ext/Pod-LaTeX/',
 			     'pod2latex.PL' => 'pod/pod2latex.PL',
 			   },
 	'CPAN'		=> 1,
@@ -1278,46 +1235,11 @@ use File::Glob qw(:case);
 	# version 1.37!
 
 	'DISTRIBUTION'	=> 'MAREKR/Pod-Parser-1.38.tar.gz',
-	'FILES'		=> q[lib/Pod/{Checker,Find,InputObjects,Parser,ParseUtils,PlainText,Select,Usage}.pm
-			     lib/Pod/t/contains_pod.t
+	'FILES'		=> q[ext/Pod-Parser
 			     pod/pod{2usage,checker,select}.PL
-			     t/lib/contains_bad_pod.xr
-			     t/lib/contains_pod.xr
-			     t/pod/emptycmd.*
-			     t/pod/find.t
-			     t/pod/for.*
-			     t/pod/headings.*
-			     t/pod/include.*
-			     t/pod/included.*
-			     t/pod/lref.*
-			     t/pod/multiline_items.*
-			     t/pod/nested_items.*
-			     t/pod/nested_seqs.*
-			     t/pod/oneline_cmds.*
-			     t/pod/p2u_data.pl
-			     t/pod/pod2usage.*
-			     t/pod/pod2usage2.t
-			     t/pod/podchkenc.*
-			     t/pod/poderrs.*
-			     t/pod/podselect.*
-			     t/pod/special_seqs.*
-			     t/pod/testcmp.pl
-			     t/pod/testp2pt.pl
-			     t/pod/testpchk.pl
-			     t/pod/testpods/
-			     t/pod/twice.t
-			     t/pod/usage*.pod
 			    ],
-	'MAP'		=> { 't/pod/'   => 't/pod/',
+	'MAP'		=> { '' => 'ext/Pod-Parser/',
 			     'scripts/' => 'pod/',
-				't/pod/contains_pod.t'
-				=> 'lib/Pod/t/contains_pod.t',
-			     # XXX these two dislocations have required
-			     # t/pod/contains_pod.t to be edited to match
-			     
-			     't/pod/contains_pod.xr' => 't/lib/contains_pod.xr',
-			     't/pod/contains_bad_pod.xr'
-				=> 't/lib/contains_bad_pod.xr',
 			   },
 	'CPAN'		=> 1,
 	'UPSTREAM'	=> undef,
@@ -1338,7 +1260,8 @@ use File::Glob qw(:case);
 	# XXX We can and should fix this, but clean up the DRY-failure in utils
 	# first
 	'EXCLUDED'	=> [ qw( perldoc ) ],
-	'MAP'		=> { 'lib/perldoc.pod' => 'pod/perldoc.pod',
+	'MAP'		=> { '' => 'ext/Pod-Perldoc/',
+			     'lib/perldoc.pod' => 'pod/perldoc.pod',
 			   },
 	'CPAN'		=> 1,
 	'UPSTREAM'	=> undef,
@@ -1348,8 +1271,9 @@ use File::Glob qw(:case);
 	{
 	'MAINTAINER'	=> 'rmbarker',
 	'FILES'		=> q[ext/Pod-Plainer],
-	'CPAN'		=> 0,
+	'CPAN'		=> 1,
 	'UPSTREAM'	=> 'blead',
+	# DEPRECATED	=> 5.11.0,
 	},
 
     'Pod::Simple' =>
@@ -1370,13 +1294,12 @@ use File::Glob qw(:case);
 	{
 	'MAINTAINER'	=> 'rra',
 	'DISTRIBUTION'	=> 'RRA/podlators-2.2.2.tar.gz',
-	'FILES'		=> q[lib/Pod/{Man,ParseLink,Text,Text/{Color,Overstrike,Termcap}}.pm
+	'FILES'		=> q[ext/podlators
 			     pod/pod2man.PL
 			     pod/pod2text.PL
-			     lib/Pod/t/{basic.*,{color,filehandle,man*,parselink,pod-parser,pod-spelling,pod,termcap,text*}.t}
 			    ],
-	'MAP'		=> { 'scripts/' => 'pod/',
-			     't/'       => 'lib/Pod/t/',
+	'MAP'		=> { '' => 'ext/podlators/',
+			     'scripts/' => 'pod/',
 			   },
 	'CPAN'		=> 1,
 	'UPSTREAM'	=> 'cpan',
@@ -1448,7 +1371,7 @@ use File::Glob qw(:case);
 	{
 	'MAINTAINER'	=> 'saper',
 	'DISTRIBUTION'	=> 'SAPER/Sys-Syslog-0.27.tar.gz',
-	'FILES'		=> q[ext/Sys-Syslog],
+	'FILES'		=> q[cpan/Sys-Syslog],
 	'EXCLUDED'	=> [ qr{^eg/},
 			     qw{t/data-validation.t
 			        t/distchk.t
@@ -1495,7 +1418,7 @@ use File::Glob qw(:case);
 	{
 	'MAINTAINER'	=> 'jesse',
 	'DISTRIBUTION'	=> 'JESSE/Test-1.25_02.tar.gz',
-	'FILES'		=> q[lib/Test.pm lib/Test/t],
+	'FILES'		=> q[ext/Test],
 	'CPAN'		=> 1,
 	'UPSTREAM'	=> 'cpan',
 	},
@@ -1523,18 +1446,8 @@ use File::Glob qw(:case);
 	{
 	'MAINTAINER'	=> 'mschwern',
 	'DISTRIBUTION'	=> 'MSCHWERN/Test-Simple-0.92.tar.gz',
-	'FILES'		=> q[lib/Test/Simple.pm
-			     lib/Test/Simple
-			     lib/Test/Builder.pm
-			     lib/Test/Builder
-			     lib/Test/More.pm
-			     lib/Test/Tutorial.pod
-			     t/lib/Test/
-			     t/lib/Dev/Null.pm
-			    ],
+	'FILES'		=> q[ext/Test-Simple],
 	'EXCLUDED'	=> [
-			     # NB - TieOut.pm comes with more than one
-			     # distro. We use the MM one
 			     qw{.perlcriticrc
 				.perltidyrc
 				t/pod.t
@@ -1544,13 +1457,6 @@ use File::Glob qw(:case);
 				lib/Test/Builder/IO/Scalar.pm
 			       }
 			   ],
-	'MAP'		=> {
-			     'lib/'        => 'lib/',
-			     't/lib/'      => 'lib/Test/Simple/t/lib/',
-			     't/lib/Test/' => 't/lib/Test/',
-			     't/lib/Dev/' =>  't/lib/Dev/',
-			     ''            => 'lib/Test/Simple/',
-			   },
 	'CPAN'		=> 1,
 	'UPSTREAM'	=> undef,
 	},
@@ -1692,11 +1598,8 @@ use File::Glob qw(:case);
 	{
 	'MAINTAINER'	=> 'drolsky',
 	'DISTRIBUTION'	=> 'DROLSKY/Time-Local-1.1901.tar.gz',
-	'FILES'		=> q[lib/Time/Local.{pm,t}],
+	'FILES'		=> q[ext/Time-Local],
 	'EXCLUDED'	=> [ qw(t/pod-coverage.t t/pod.t) ],
-	'MAP'		=> { 'lib/' => 'lib/',
-	                     't/'   => 'lib/Time/',
-			   },
 	'CPAN'		=> 1,
 	'UPSTREAM'	=> undef,
 	},
@@ -1714,17 +1617,11 @@ use File::Glob qw(:case);
 	{
 	'MAINTAINER'	=> 'sadahiro',
 	'DISTRIBUTION'	=> 'SADAHIRO/Unicode-Collate-0.52.tar.gz',
-	'FILES'		=> q[lib/Unicode/Collate.pm
-			     lib/Unicode/Collate
-			    ],
+	'FILES'		=> q[ext/Unicode-Collate],
 			    # ignore experimental XS version
 	'EXCLUDED'	=> [ qr{X$},
 			     qw{disableXS enableXS }
 			   ],
-	'MAP'		=> { ''           => 'lib/Unicode/Collate/',
-	                     'Collate.pm' => 'lib/Unicode/Collate.pm',
-	                     'Collate/'   => 'lib/Unicode/Collate/',
-			   },
 	'CPAN'		=> 1,
 	'UPSTREAM'	=> 'first-come',
 	},
@@ -1825,9 +1722,7 @@ use File::Glob qw(:case);
 	{
 	'MAINTAINER'	=> 'saper',
 	'DISTRIBUTION'	=> 'SAPER/XSLoader-0.10.tar.gz',
-	'FILES'		=> q[ext/DynaLoader/t/XSLoader.t
-			     ext/DynaLoader/XSLoader_pm.PL
-			    ],
+	'FILES'		=> q[ext/XSLoader],
 	'EXCLUDED'	=> [ qr{^eg/},
 			     qw{t/pod.t
 			        t/podcover.t
@@ -1959,6 +1854,7 @@ use File::Glob qw(:case);
 				lib/Getopt/Std.{pm,t}
 				lib/I18N/Collate.{pm,t}
 				lib/Internals.t
+				lib/Module/Build/ConfigData.pm
 				lib/Net/hostent.{pm,t}
 				lib/Net/netent.{pm,t}
 				lib/Net/protoent.{pm,t}