X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Porting%2FMaintainers.pl;h=6f7bf21dfe3e36b6cd508a424e1f1adddb122128;hb=906bad61c3bd0dd3a56a226b2981e4d14d5e71c9;hp=951c9d913364fc5c5935cf4b13fcd47a42ae3d1d;hpb=66c85ba8d72ac70beb51ca6fcf48ade6d6b89439;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 951c9d9..6f7bf21 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',
@@ -188,8 +188,8 @@ use File::Glob qw(:case);
     'Archive::Tar' =>
 	{
 	'MAINTAINER'	=> 'kane',
-	'DISTRIBUTION'	=> 'KANE/Archive-Tar-1.52.tar.gz',
-	'FILES'		=> q[ext/Archive-Tar],
+	'DISTRIBUTION'	=> 'BINGOS/Archive-Tar-1.54.tar.gz',
+	'FILES'		=> q[cpan/Archive-Tar],
 	'CPAN'		=> 1,
 	'UPSTREAM'	=> 'cpan',
 	'BUGS'		=> 'bug-archive-tar@rt.cpan.org',
@@ -198,17 +198,17 @@ use File::Glob qw(:case);
     'Attribute::Handlers' =>
 	{
 	'MAINTAINER'	=> 'rgarcia',
-	'DISTRIBUTION'	=> 'SMUELLER/Attribute-Handlers-0.86.tar.gz',
-	'FILES'		=> q[ext/Attribute-Handlers],
+	'DISTRIBUTION'	=> 'SMUELLER/Attribute-Handlers-0.87.tar.gz',
+	'FILES'		=> q[dist/Attribute-Handlers],
 	'CPAN'		=> 1,
-	'UPSTREAM'	=> "blead",
+	'UPSTREAM'	=> 'blead',
 	},
 
     'autodie' =>
 	{
 	'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[lib/AutoLoader.pm lib/AutoSplit.pm lib/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' =>
@@ -291,11 +291,7 @@ use File::Glob qw(:case);
 	{
 	'MAINTAINER'	=> 'tels',
 	'DISTRIBUTION'	=> 'TELS/math/bignum-0.23.tar.gz',
-	'FILES'		=> q[lib/big{int,num,rat}.pm
-			     lib/bignum
-			     lib/Math/BigInt/Trace.pm
-			     lib/Math/BigFloat/Trace.pm
-			    ],
+	'FILES'		=> q[ext/bignum],
 	'EXCLUDED'	=> [ qr{^inc/Module/}, qw(t/pod.t t/pod_cov.t) ],
 	'CPAN'		=> 1,
 	'UPSTREAM'	=> undef,
@@ -319,21 +315,19 @@ use File::Glob qw(:case);
 
     'Class::ISA' =>
 	{
-	'MAINTAINER'	=> 'sburke',
-	'DISTRIBUTION'	=> 'SBURKE/Class-ISA-0.33.tar.gz',
-	'FILES'		=> q[lib/Class/ISA.pm lib/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
 			     )
 			   ],
@@ -344,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,
 	},
@@ -380,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/},
@@ -417,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 },
@@ -444,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
@@ -467,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
@@ -482,7 +472,7 @@ use File::Glob qw(:case);
 	{
 	'MAINTAINER'	=> 'mhx',
 	'DISTRIBUTION'	=> 'MHX/Devel-PPPort-3.19.tar.gz',
-	'FILES'		=> q[ext/Devel-PPPort],
+	'FILES'		=> q[cpan/Devel-PPPort],
 	'EXCLUDED'	=> [ qw{PPPort.pm} ], # we use PPPort_pm.PL instead
 	'CPAN'		=> 1,
 	'UPSTREAM'	=> 'cpan',
@@ -525,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,
@@ -535,9 +525,10 @@ use File::Glob qw(:case);
 	{
 	'MAINTAINER'	=> 'audreyt',
 	'DISTRIBUTION'	=> 'AUDREYT/encoding-warnings-0.11.tar.gz',
-	'FILES'		=> q[lib/encoding/warnings.pm lib/encoding/warnings],
+	'FILES'		=> q[ext/encoding-warnings],
 	'EXCLUDED'	=> [ qr{^inc/Module/},
-			     qw{t/0-signature.t},
+			     qw{t/0-signature.t Makefile.PL MANIFEST META.yml
+			     README SIGNATURE},
 			   ],
 	'CPAN'		=> 1,
 	'UPSTREAM'	=> undef,
@@ -563,7 +554,7 @@ use File::Glob qw(:case);
 	{
 	'MAINTAINER'	=> 'kwilliams',
 	'DISTRIBUTION'	=> 'DAGOLDEN/ExtUtils-CBuilder-0.2602.tar.gz',
-	'FILES'		=> q[lib/ExtUtils/CBuilder.pm lib/ExtUtils/CBuilder],
+	'FILES'		=> q[cpan/ExtUtils-CBuilder],
 	'EXCLUDED'	=> [ qw{devtools} ],
 	'CPAN'		=> 1,
 	'UPSTREAM'	=> 'cpan',
@@ -587,18 +578,12 @@ use File::Glob qw(:case);
 	{
 	'MAINTAINER'	=> 'nwclark',
 	'DISTRIBUTION'	=> 'NWCLARK/ExtUtils-Constant-0.16.tar.gz',
-	'FILES'		=> q[lib/ExtUtils/Constant.pm
-			     lib/ExtUtils/Constant
-			     lib/ExtUtils/t/Constant.t
-			    ],
+	'FILES'		=> q[ext/ExtUtils-Constant],
 	'EXCLUDED'	=> [ qw{ lib/ExtUtils/Constant/Aaargh56Hash.pm
 				 examples/perl_keyword.pl
 				 examples/perl_regcomp_posix_keyword.pl
 			       },
 			   ],
-	'MAP'		=> { 't/'	=> 'lib/ExtUtils/t/',
-			     'lib/'	=> 'lib/',
-			   },
 	'CPAN'		=> 1,
 	'UPSTREAM'	=> undef,
 	},
@@ -607,26 +592,15 @@ use File::Glob qw(:case);
 	{
 	'MAINTAINER'	=> 'yves',
 	'DISTRIBUTION'	=> 'YVES/ExtUtils-Install-1.54.tar.gz',
-	'FILES' 	=> q[lib/ExtUtils/{Install,Installed,Packlist}.pm
-                             lib/ExtUtils/Changes_EU-Install
-			     lib/ExtUtils/t/Installed.t
-			     lib/ExtUtils/t/InstallWithMM.t
-			     lib/ExtUtils/t/{Install,Installapi2,Packlist,can_write_dir}.t],
-	'EXCLUDED'	=> [ qw{ t/lib/MakeMaker/Test/Setup/BFD.pm
-				 t/lib/MakeMaker/Test/Utils.pm
-				 t/lib/Test/Builder.pm
+	'FILES' 	=> q[ext/ExtUtils-Install],
+	'EXCLUDED'	=> [ qw{ t/lib/Test/Builder.pm
 				 t/lib/Test/Builder/Module.pm
 				 t/lib/Test/More.pm
 				 t/lib/Test/Simple.pm
-				 t/lib/TieOut.pm
 				 t/pod-coverage.t
 				 t/pod.t
 			       },
 			   ],
-	'MAP'		=> { 't/'	=> 'lib/ExtUtils/t/',
-			     'lib/'	=> 'lib/',
-			     'Changes'  => 'lib/ExtUtils/Changes_EU-Install',
-			   },
 	'CPAN'		=> 1,
 	'UPSTREAM'	=> 'blead',
 	},
@@ -635,28 +609,10 @@ use File::Glob qw(:case);
 	{
 	'MAINTAINER'	=> 'mschwern',
 	'DISTRIBUTION'	=> 'MSCHWERN/ExtUtils-MakeMaker-6.55_02.tar.gz',
-			    # note that t/lib/TieOut.pm is included in
-			    # more than one distro
-	'FILES'		=> q[lib/ExtUtils/{Liblist,MakeMaker,Mkbootstrap,Mksymlists,MM*,MY,testlib}.pm
-			     lib/ExtUtils/{Command,Liblist,MakeMaker}
-			     lib/ExtUtils/t/{[0-9FLV-Zabdf-z]*,IN*,Mkbootstrap,MM_*,PL_FILES,cd,config}.t
-			     lib/ExtUtils/t/testdata/
-			     lib/ExtUtils/t/MakeMaker_Parameters.t
-			     lib/ExtUtils/Changes
-			     lib/ExtUtils/{NOTES,PATCHING,README,TODO}
-			     lib/ExtUtils/instmodsh
-			     t/lib/MakeMaker
-			     t/lib/TieIn.pm
-			     t/lib/TieOut.pm
-			    ],
+	'FILES'		=> q[ext/ExtUtils-MakeMaker],
 	'EXCLUDED'	=> [ qr{^t/lib/Test/},
 			     qr{^inc/ExtUtils/},
 			   ],
-	'MAP'		=> { ''		=> 'lib/ExtUtils/',
-			     'lib/'	=> 'lib/',
-			     't/lib/'	=> 't/lib/',
-			     'bin/'	=> 'lib/ExtUtils/',
-			   },
 	'CPAN'		=> 1,
 	'UPSTREAM'	=> 'first-come',
 	},
@@ -665,12 +621,7 @@ use File::Glob qw(:case);
 	{
 	'MAINTAINER'	=> 'rkobes',
 	'DISTRIBUTION'	=> 'RKOBES/ExtUtils-Manifest-1.56.tar.gz',
-	'FILES'		=> q[lib/ExtUtils/{Manifest.pm,MANIFEST.SKIP}
-			     lib/ExtUtils/t/Manifest.t
-			    ],
-	'MAP'		=> { ''		=> 'lib/ExtUtils/',
-			     'lib/'	=> 'lib/',
-			   },
+	'FILES'		=> q[ext/ExtUtils-Manifest],
 	'CPAN'		=> 1,
 	'UPSTREAM'	=> undef,
 	},
@@ -679,10 +630,7 @@ use File::Glob qw(:case);
 	{
 	'MAINTAINER'	=> 'kwilliams',
 	'DISTRIBUTION'	=> 'DAGOLDEN/ExtUtils-ParseXS-2.2002.tar.gz',
-	'FILES'		=> q[lib/ExtUtils/ParseXS.pm
-			     lib/ExtUtils/ParseXS
-			     lib/ExtUtils/xsubpp
-			    ],
+	'FILES'		=> q[cpan/ExtUtils-ParseXS],
 	'CPAN'		=> 1,
 	'UPSTREAM'	=> 'cpan',
 	},
@@ -699,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',
 	},
@@ -708,14 +656,14 @@ use File::Glob qw(:case);
 	{
 	'MAINTAINER'	=> 'dland',
 	'DISTRIBUTION'	=> 'DLAND/File-Path-2.07_03.tar.gz',
-	'FILES'		=> q[lib/File/Path.pm lib/File/Path.t],
+	'FILES'		=> q[cpan/File-Path],
 	'EXCLUDED'	=> [ qw{eg/setup-extra-tests
 				t/pod.t
 				t/taint.t
 			       }
 			   ],
 	'MAP'		=> { ''		=> 'lib/File/',
-			     't/'	=> 'lib/File/',
+			     't/'	=> 't/',
 			   },
 	'CPAN'		=> 1,
 	'UPSTREAM'	=> undef,
@@ -725,14 +673,11 @@ use File::Glob qw(:case);
 	{
 	'MAINTAINER'	=> 'tjenness',
 	'DISTRIBUTION'	=> 'TJENNESS/File-Temp-0.22.tar.gz',
-	'FILES'		=> q[lib/File/Temp.pm lib/File/Temp],
+	'FILES'		=> q[ext/File-Temp],
 	'EXCLUDED'	=> [ qw{misc/benchmark.pl
 				misc/results.txt
 			       }
 			   ],
-	'MAP'		=> { ''		=> 'lib/File/',
-			     't/'	=> 'lib/File/Temp/t/',
-			   },
 	'CPAN'		=> 1,
 	'UPSTREAM'	=> undef,
 	},
@@ -788,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'		=> { ''		       => 'cpan/Getopt-Long/',
+			     'lib/newgetopt.pl' => 'lib/newgetopt.pl',
+			   },
 	'CPAN'		=> 1,
 	'UPSTREAM'	=> 'cpan',
 	},
@@ -815,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,
 	},
@@ -836,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,
 	},
@@ -850,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,
 	},
@@ -863,8 +801,8 @@ use File::Glob qw(:case);
     'IPC::Cmd' =>
 	{
 	'MAINTAINER'	=> 'kane',
-	'DISTRIBUTION'	=> 'BINGOS/IPC-Cmd-0.48.tar.gz',
-	'FILES'		=> q[ext/IPC-Cmd],
+	'DISTRIBUTION'	=> 'BINGOS/IPC-Cmd-0.50.tar.gz',
+	'FILES'		=> q[cpan/IPC-Cmd],
 	'CPAN'		=> 1,
 	'UPSTREAM'	=> 'cpan',
 	},
@@ -873,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',
@@ -883,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",
 	},
@@ -906,12 +841,7 @@ use File::Glob qw(:case);
 	{
 	'MAINTAINER'	=> 'neilb',
 	'DISTRIBUTION'	=> 'NEILB/Locale-Codes-2.07.tar.gz',
-	'FILES'		=> q[lib/Locale/{Codes,Constants,Country,Currency,Language,Script}*],
-	'MAP'		=> { 'lib/' => 'lib/',
-			     ''     => 'lib/Locale/Codes/',
-			     #XXX why is this file renamed???
-			     't/language.t' => 'lib/Locale/Codes/t/languages.t',
-			   },
+	'FILES'		=> q[ext/Locale-Codes],
 	'CPAN'		=> 1,
 	'UPSTREAM'	=> undef,
 	},
@@ -920,14 +850,7 @@ use File::Glob qw(:case);
 	{
 	'MAINTAINER'	=> 'ferreira',
 	'DISTRIBUTION'	=> 'FERREIRA/Locale-Maketext-1.13.tar.gz',
-	'FILES'		=> q[lib/Locale/Maketext.pm
-			     lib/Locale/Maketext.pod
-			     lib/Locale/Maketext/ChangeLog
-			     lib/Locale/Maketext/{Guts,GutsLoader}.pm
-			     lib/Locale/Maketext/README
-			     lib/Locale/Maketext/TPJ13.pod
-			     lib/Locale/Maketext/t
-			    ],
+	'FILES'		=> q[ext/Locale-Maketext],
 	'EXCLUDED'	=> [ qw{perlcriticrc t/00_load.t t/pod.t} ],
 	'CPAN'		=> 1,
 	'UPSTREAM'	=> undef,
@@ -936,10 +859,8 @@ use File::Glob qw(:case);
     'Locale::Maketext::Simple' =>
 	{
 	'MAINTAINER'	=> 'audreyt',
-	'DISTRIBUTION'	=> 'AUDREYT/Locale-Maketext-Simple-0.18.tar.gz',
-	'FILES'		=> q[lib/Locale/Maketext/Simple.pm
-			     lib/Locale/Maketext/Simple
-			    ],
+	'DISTRIBUTION'	=> 'JESSE/Locale-Maketext-Simple-0.21.tar.gz',
+	'FILES'		=> q[ext/Locale-Maketext-Simple],
 	'EXCLUDED'	=> [ qr{^inc/} ],
 	'CPAN'		=> 1,
 	'UPSTREAM'	=> undef,
@@ -949,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',
 	},
@@ -957,8 +878,8 @@ use File::Glob qw(:case);
     'Log::Message::Simple' =>
 	{
 	'MAINTAINER'	=> 'kane',
-	'DISTRIBUTION'	=> 'KANE/Log-Message-Simple-0.04.tar.gz',
-	'FILES'		=> q[ext/Log-Message-Simple],
+	'DISTRIBUTION'	=> 'BINGOS/Log-Message-Simple-0.06.tar.gz',
+	'FILES'		=> q[cpan/Log-Message-Simple],
 	'CPAN'		=> 1,
 	'UPSTREAM'	=> 'cpan',
 	},
@@ -975,25 +896,13 @@ use File::Glob qw(:case);
 	{
 	'MAINTAINER'	=> 'tels',
 	'DISTRIBUTION'	=> 'TELS/math/Math-BigInt-1.89.tar.gz',
-	'FILES'		=> q[lib/Math/BigInt.pm
-			     lib/Math/BigInt
-			     !lib/Math/BigInt/Trace.pm
-			     t/lib/Math/BigInt/
-			     t/lib/Math/BigFloat/
-			     lib/Math/BigFloat.pm
-			    ],
+	'FILES'		=> q[ext/Math-BigInt],
 	'EXCLUDED'	=> [ qr{^inc/},
 			     qr{^examples/},
 			     qw{t/pod.t
 				t/pod_cov.t
 			       }
 			   ],
-	'MAP'		=> { 'lib/'    => 'lib/',
-			     't/Math/' => 't/lib/Math/',
-			     ''        => 'lib/Math/BigInt/',
-			     't/new_overloaded.t' =>
-					'lib/Math/BigInt/t/new_ovld.t',
-			   },
 	'CPAN'		=> 1,
 	'UPSTREAM'	=> undef,
 	},
@@ -1029,21 +938,14 @@ use File::Glob qw(:case);
     'Math::BigRat' =>
 	{
 	'MAINTAINER'	=> 'tels',
-	'DISTRIBUTION'	=> 'TELS/math/Math-BigRat-0.22.tar.gz',
-	'FILES'		=> q[lib/Math/BigRat.pm
-			     lib/Math/BigRat
-			     t/lib/Math/BigRat/
-			    ],
+	'DISTRIBUTION'	=> 'LETO/Math-BigRat-0.24.tar.gz',
+	'FILES'		=> q[ext/Math-BigRat],
 	'EXCLUDED'	=> [ qr{^inc/},
 			     qw{
 				t/pod.t
 				t/pod_cov.t
 			       },
 			   ],
-	'MAP'		=> { 't/' => 'lib/Math/BigRat/t/',
-			     't/Math/BigRat/Test.pm'
-						=> 't/lib/Math/BigRat/Test.pm',
-			   },
 	'CPAN'		=> 1,
 	'UPSTREAM'	=> undef,
 	},
@@ -1052,19 +954,13 @@ use File::Glob qw(:case);
 	{
 	'MAINTAINER'	=> 'zefram',
 	'DISTRIBUTION'	=> 'JHI/Math-Complex-1.56.tar.gz',
-	'FILES'		=> q[lib/Math/Complex.pm
-			     lib/Math/Complex.t
-			     lib/Math/Trig.pm
-			     lib/Math/Trig.t
-			     lib/Math/underbar.t
-			    ],
+	'FILES'		=> q[cpan/Math-Complex],
 	'EXCLUDED'	=> [
 			     qw{
 				t/pod.t
 				t/pod-coverage.t
 			       },
 			   ],
-	'MAP'		=> { 't/' => 'lib/Math/' },
 	'CPAN'		=> 1,
 	'UPSTREAM'	=> 'cpan',
 	},
@@ -1080,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,
 	},
@@ -1102,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',
 	},
@@ -1121,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',
 	},
@@ -1130,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',
 	},
@@ -1139,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',
@@ -1168,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',
@@ -1178,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',
 	},
@@ -1187,7 +1078,7 @@ use File::Glob qw(:case);
 	{
 	'MAINTAINER'	=> 'kane',
 	'DISTRIBUTION'	=> 'KANE/Package-Constants-0.02.tar.gz',
-	'FILES'		=> q[ext/Package-Constants],
+	'FILES'		=> q[cpan/Package-Constants],
 	'CPAN'		=> 1,
 	'UPSTREAM'	=> 'cpan',
 	},
@@ -1199,7 +1090,7 @@ use File::Glob qw(:case);
 	# For some reason a file of this name appears within
 	# the tarball. Russell's Paradox eat your heart out.
 	'EXCLUDED'	=> [ qw( Params-Check-0.26.tar.gz ) ],
-	'FILES'		=> q[ext/Params-Check],
+	'FILES'		=> q[cpan/Params-Check],
 	'CPAN'		=> 1,
 	'UPSTREAM'	=> 'cpan',
 	},
@@ -1207,8 +1098,8 @@ use File::Glob qw(:case);
     'parent' =>
 	{
 	'MAINTAINER'	=> 'corion',
-	'DISTRIBUTION'	=> 'CORION/parent-0.221.tar.gz',
-	'FILES'		=> q[lib/parent lib/parent.pm],
+	'DISTRIBUTION'	=> 'CORION/parent-0.223.tar.gz',
+	'FILES'		=> q[ext/parent],
 	'CPAN'		=> 1,
 	'UPSTREAM'	=> undef,
 	},
@@ -1217,35 +1108,23 @@ use File::Glob qw(:case);
 	{
 	'MAINTAINER'	=> 'smueller',
 	'DISTRIBUTION'	=> 'ADAMK/Parse-CPAN-Meta-1.39.tar.gz',
-	'FILES'		=> q[ext/Parse-CPAN-Meta],
+	'FILES'		=> q[cpan/Parse-CPAN-Meta],
 	'EXCLUDED'	=> [ qw( t/97_meta.t t/98_pod.t t/99_pmv.t ) ],
 	'CPAN'		=> 1,
-	'UPSTREAM'	=> "cpan",
+	'UPSTREAM'	=> 'cpan',
 	},
 
     'PathTools' =>
 	{
 	'MAINTAINER'	=> 'kwilliams',
-	'DISTRIBUTION'	=> 'SMUELLER/PathTools-3.30.tar.gz',
-	'FILES'		=> q[lib/File/Spec.pm
-			     lib/File/Spec
-			     ext/Cwd
-			     lib/Cwd.pm
-			    ],
+	'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/',
-			     'Cwd.pm'    => 'lib/Cwd.pm',
-			     ''          => '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",
 	},
@@ -1270,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,
 	},
@@ -1333,7 +1208,7 @@ use File::Glob qw(:case);
 	{
 	'MAINTAINER'	=> 'arandal',
 	'DISTRIBUTION'	=> 'SBURKE/Pod-Escapes-1.04.tar.gz',
-	'FILES'		=> q[lib/Pod/Escapes.pm lib/Pod/Escapes],
+	'FILES'		=> q[ext/Pod-Escapes],
 	'CPAN'		=> 1,
 	'UPSTREAM'	=> undef,
 	},
@@ -1342,12 +1217,11 @@ use File::Glob qw(:case);
 	{
 	'MAINTAINER'	=> 'tjenness',
 	'DISTRIBUTION'	=> 'TJENNESS/Pod-LaTeX-0.58.tar.gz',
-	'FILES'		=> q[lib/Pod/LaTeX.pm
-			     lib/Pod/t/{pod2latex,user}.t
+	'FILES'		=> q[ext/Pod-LaTeX
 			     pod/pod2latex.PL
 			    ],
 	'EXCLUDED'	=> [ qw( t/require.t ) ],
-	'MAP'		=> { '' => 'lib/Pod/',
+	'MAP'		=> { '' => 'ext/Pod-LaTeX/',
 			     'pod2latex.PL' => 'pod/pod2latex.PL',
 			   },
 	'CPAN'		=> 1,
@@ -1361,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,
@@ -1410,16 +1249,19 @@ use File::Glob qw(:case);
 	{
 	'MAINTAINER'	=> 'ferreira',
 	'DISTRIBUTION'	=> 'FERREIRA/Pod-Perldoc-3.15.tar.gz',
-	'FILES'		=> q[lib/Pod/Perldoc.pm
-			     lib/Pod/Perldoc
+	# I don't know whether it's conceptually cleaner to a rule to copy
+	# ext/Pod-Perldoc/pod/perldoc.pod to pod/perldoc.pod at make time
+	# (in 4 places), or leave it as 1 mapping here.
+	'FILES'		=> q[ext/Pod-Perldoc
 			     pod/perldoc.pod
 			    ],
 	# in blead, the perldoc executable is generated by perldoc.PL
 	# instead
-	
+	# 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',
-			     't/'              => 'lib/Pod/Perldoc/t/',
+	'MAP'		=> { '' => 'ext/Pod-Perldoc/',
+			     'lib/perldoc.pod' => 'pod/perldoc.pod',
 			   },
 	'CPAN'		=> 1,
 	'UPSTREAM'	=> undef,
@@ -1429,18 +1271,16 @@ use File::Glob qw(:case);
 	{
 	'MAINTAINER'	=> 'rmbarker',
 	'FILES'		=> q[ext/Pod-Plainer],
-	'CPAN'		=> 0,
+	'CPAN'		=> 1,
 	'UPSTREAM'	=> 'blead',
+	# DEPRECATED	=> 5.11.0,
 	},
 
     'Pod::Simple' =>
 	{
 	'MAINTAINER'	=> 'arandal',
 	'DISTRIBUTION'	=> 'ARANDAL/Pod-Simple-3.07.tar.gz',
-	'FILES'		=> q[lib/Pod/Simple.pm
-			     lib/Pod/Simple.pod
-			     lib/Pod/Simple
-			    ],
+	'FILES'		=> q[ext/Pod-Simple],
 	# XXX these two files correspond to similar ones in bleed under
 	# pod/, but the bleed ones have newer changes, and also seem to
 	# have been in blead a long time. I'm going to assume then that
@@ -1454,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[cpan/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'		=> { '' => 'cpan/podlators/',
+			     'scripts/' => 'pod/',
 			   },
 	'CPAN'		=> 1,
 	'UPSTREAM'	=> 'cpan',
@@ -1532,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
@@ -1551,7 +1390,7 @@ use File::Glob qw(:case);
 	{
 	'MAINTAINER'	=> 'rra',
 	'DISTRIBUTION'	=> 'RRA/ANSIColor-2.02.tar.gz',
-	'FILES'		=> q{ext/Term-ANSIColor},
+	'FILES'		=> q{cpan/Term-ANSIColor},
 	'EXCLUDED'	=> [ qr{^tests/}, qw(t/pod-spelling.t t/pod.t) ],
 	'CPAN'		=> 1,
 	'UPSTREAM'	=> 'cpan',
@@ -1570,7 +1409,7 @@ use File::Glob qw(:case);
 	{
 	'MAINTAINER'	=> 'kane',
 	'DISTRIBUTION'	=> 'KANE/Term-UI-0.20.tar.gz',
-	'FILES'		=> q{ext/Term-UI},
+	'FILES'		=> q{cpan/Term-UI},
 	'CPAN'		=> 1,
 	'UPSTREAM'	=> 'cpan',
 	},
@@ -1579,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[cpan/Test],
 	'CPAN'		=> 1,
 	'UPSTREAM'	=> 'cpan',
 	},
@@ -1607,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
@@ -1626,17 +1455,8 @@ use File::Glob qw(:case);
 				t/Builder/reset_outputs.t
 
 				lib/Test/Builder/IO/Scalar.pm
-
-				t/lib/TieOut.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,
 	},
@@ -1685,7 +1505,7 @@ use File::Glob qw(:case);
 	{
 	'MAINTAINER'	=> 'muir',
 	'DISTRIBUTION'	=> 'MUIR/modules/Text-Tabs+Wrap-2009.0305.tar.gz',
-	'FILES'		=> q[ext/Text-Tabs],
+	'FILES'		=> q[cpan/Text-Tabs],
 	'EXCLUDED'	=> [ qw( t/dnsparks.t ) ], # see af6492bf9e
 	'CPAN'		=> 1,
 	'UPSTREAM'	=> 'cpan',
@@ -1760,10 +1580,7 @@ use File::Glob qw(:case);
 	{
 	'MAINTAINER'	=> 'nuffin',
 	'DISTRIBUTION'	=> 'NUFFIN/Tie-RefHash-1.38.tar.gz',
-	'FILES'		=> q[lib/Tie/RefHash.pm lib/Tie/RefHash],
-	'MAP'		=> { 'lib/' => 'lib/',
-	                     't/'   => 'lib/Tie/RefHash/',
-			   },
+	'FILES'		=> q[cpan/Tie-RefHash],
 	'CPAN'		=> 1,
 	'UPSTREAM'	=> 'cpan',
 	},
@@ -1781,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,
 	},
@@ -1803,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',
 	},
@@ -1914,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
@@ -2048,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}