Move CPAN from ext/ to cpan/

diff --git a/MANIFEST b/MANIFEST
index 9634862..f00f8f1 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -135,6 +135,50 @@ cpan/Class-ISA/ChangeLog           Changes for Class::ISA
 cpan/Class-ISA/lib/Class/ISA.pm                Class::ISA
 cpan/Class-ISA/t/00_about_verbose.t    Tests for Class::ISA
 cpan/Class-ISA/t/01_old_junk.t         Tests for Class::ISA
+cpan/CPAN/lib/CPAN/API/HOWTO.pod               recipe book for programming with CPAN.pm
+cpan/CPAN/lib/CPAN/Author.pm           helper package for CPAN.pm
+cpan/CPAN/lib/CPAN/Bundle.pm           helper package for CPAN.pm
+cpan/CPAN/lib/CPAN/CacheMgr.pm         helper package for CPAN.pm
+cpan/CPAN/lib/CPAN/Complete.pm         helper package for CPAN.pm
+cpan/CPAN/lib/CPAN/Debug.pm            helper package for CPAN.pm
+cpan/CPAN/lib/CPAN/DeferredCode.pm     helper package for CPAN.pm
+cpan/CPAN/lib/CPAN/Distribution.pm     helper package for CPAN.pm
+cpan/CPAN/lib/CPAN/Distroprefs.pm              helper package for CPAN.pm
+cpan/CPAN/lib/CPAN/Distrostatus.pm     helper package for CPAN.pm
+cpan/CPAN/lib/CPAN/Exception/blocked_urllist.pm        helper package for CPAN.pm
+cpan/CPAN/lib/CPAN/Exception/RecursiveDependency.pm    helper package for CPAN.pm
+cpan/CPAN/lib/CPAN/Exception/yaml_not_installed.pm     helper package for CPAN.pm
+cpan/CPAN/lib/CPAN/FirstTime.pm                Utility for creating CPAN config files
+cpan/CPAN/lib/CPAN/FTP/netrc.pm                helper package for CPAN.pm
+cpan/CPAN/lib/CPAN/FTP.pm                      helper package for CPAN.pm
+cpan/CPAN/lib/CPAN/HandleConfig.pm     helper package for CPAN.pm
+cpan/CPAN/lib/CPAN/Index.pm            helper package for CPAN.pm
+cpan/CPAN/lib/CPAN/InfoObj.pm          helper package for CPAN.pm
+cpan/CPAN/lib/CPAN/Kwalify/distroprefs.dd              helper file for validating config files
+cpan/CPAN/lib/CPAN/Kwalify/distroprefs.yml     helper file for validating config files
+cpan/CPAN/lib/CPAN/Kwalify.pm          helper package for CPAN.pm
+cpan/CPAN/lib/CPAN/LWP/UserAgent.pm    helper package for CPAN.pm
+cpan/CPAN/lib/CPAN/Module.pm           helper package for CPAN.pm
+cpan/CPAN/lib/CPAN/Nox.pm                      Runs CPAN while avoiding compiled extensions
+cpan/CPAN/lib/CPAN/PAUSE2003.pub               CPAN public key
+cpan/CPAN/lib/CPAN/PAUSE2005.pub               CPAN public key
+cpan/CPAN/lib/CPAN/PAUSE2007.pub               CPAN public key
+cpan/CPAN/lib/CPAN/PAUSE2009.pub               CPAN public key
+cpan/CPAN/lib/CPAN.pm                  Interface to Comprehensive Perl Archive Network
+cpan/CPAN/lib/CPAN/Prompt.pm
+cpan/CPAN/lib/CPAN/Queue.pm            queueing system for CPAN.pm
+cpan/CPAN/lib/CPAN/Shell.pm
+cpan/CPAN/lib/CPAN/SIGNATURE           CPAN public key
+cpan/CPAN/lib/CPAN/Tarzip.pm           helper package for CPAN.pm
+cpan/CPAN/lib/CPAN/URL.pm
+cpan/CPAN/lib/CPAN/Version.pm          Simple math with different flavors of version strings
+cpan/CPAN/Makefile.PL
+cpan/CPAN/scripts/cpan         easily interact with CPAN from the command line
+cpan/CPAN/t/01loadme.t         See if CPAN the module works
+cpan/CPAN/t/02nox.t            See if CPAN::Nox works
+cpan/CPAN/t/03pkgs.t           See if CPAN::Version works
+cpan/CPAN/t/10version.t                See if CPAN the module works
+cpan/CPAN/t/11mirroredby.t             See if CPAN::Mirrored::By works
 cpan/DB_File/Changes           Berkeley DB extension change log
 cpan/DB_File/config.in         Part of Berkeley DB configuration
 cpan/DB_File/DB_File_BS                Berkeley DB extension mkbootstrap fodder
@@ -671,44 +715,6 @@ ext/Compress-Raw-Zlib/zlib-src/zutil.h     Compress::Raw::Zlib
 ext/Compress-Raw-Zlib/Zlib.xs          Compress::Raw::Zlib
 ext/constant/lib/constant.pm   For "use constant"
 ext/constant/t/constant.t      See if compile-time constants work
-ext/CPAN/lib/CPAN/API/HOWTO.pod                recipe book for programming with CPAN.pm
-ext/CPAN/lib/CPAN/Author.pm            helper package for CPAN.pm
-ext/CPAN/lib/CPAN/Bundle.pm            helper package for CPAN.pm
-ext/CPAN/lib/CPAN/CacheMgr.pm          helper package for CPAN.pm
-ext/CPAN/lib/CPAN/Complete.pm          helper package for CPAN.pm
-ext/CPAN/lib/CPAN/Debug.pm             helper package for CPAN.pm
-ext/CPAN/lib/CPAN/DeferredCode.pm      helper package for CPAN.pm
-ext/CPAN/lib/CPAN/Distribution.pm      helper package for CPAN.pm
-ext/CPAN/lib/CPAN/Distroprefs.pm               helper package for CPAN.pm
-ext/CPAN/lib/CPAN/Distrostatus.pm      helper package for CPAN.pm
-ext/CPAN/lib/CPAN/Exception/blocked_urllist.pm helper package for CPAN.pm
-ext/CPAN/lib/CPAN/Exception/RecursiveDependency.pm     helper package for CPAN.pm
-ext/CPAN/lib/CPAN/Exception/yaml_not_installed.pm      helper package for CPAN.pm
-ext/CPAN/lib/CPAN/FirstTime.pm         Utility for creating CPAN config files
-ext/CPAN/lib/CPAN/FTP/netrc.pm         helper package for CPAN.pm
-ext/CPAN/lib/CPAN/FTP.pm                       helper package for CPAN.pm
-ext/CPAN/lib/CPAN/HandleConfig.pm      helper package for CPAN.pm
-ext/CPAN/lib/CPAN/Index.pm             helper package for CPAN.pm
-ext/CPAN/lib/CPAN/InfoObj.pm           helper package for CPAN.pm
-ext/CPAN/lib/CPAN/Kwalify/distroprefs.dd               helper file for validating config files
-ext/CPAN/lib/CPAN/Kwalify/distroprefs.yml      helper file for validating config files
-ext/CPAN/lib/CPAN/Kwalify.pm           helper package for CPAN.pm
-ext/CPAN/lib/CPAN/LWP/UserAgent.pm     helper package for CPAN.pm
-ext/CPAN/lib/CPAN/Module.pm            helper package for CPAN.pm
-ext/CPAN/lib/CPAN/Nox.pm                       Runs CPAN while avoiding compiled extensions
-ext/CPAN/lib/CPAN/PAUSE2003.pub                CPAN public key
-ext/CPAN/lib/CPAN/PAUSE2005.pub                CPAN public key
-ext/CPAN/lib/CPAN/PAUSE2007.pub                CPAN public key
-ext/CPAN/lib/CPAN/PAUSE2009.pub                CPAN public key
-ext/CPAN/lib/CPAN.pm                   Interface to Comprehensive Perl Archive Network
-ext/CPAN/lib/CPAN/Prompt.pm
-ext/CPAN/lib/CPAN/Queue.pm             queueing system for CPAN.pm
-ext/CPAN/lib/CPAN/Shell.pm
-ext/CPAN/lib/CPAN/SIGNATURE            CPAN public key
-ext/CPAN/lib/CPAN/Tarzip.pm            helper package for CPAN.pm
-ext/CPAN/lib/CPAN/URL.pm
-ext/CPAN/lib/CPAN/Version.pm           Simple math with different flavors of version strings
-ext/CPAN/Makefile.PL
 ext/CPANPLUS/bin/cpan2dist     the cpan2dist utility
 ext/CPANPLUS/bin/cpanp the cpanp utility
 ext/CPANPLUS/bin/cpanp-run-perl        the cpanp-run-perl utility
@@ -803,12 +809,6 @@ ext/CPANPLUS/t/dummy-CPAN/autobundle/Snapshot.pm   CPANPLUS tests
 ext/CPANPLUS/t/dummy-CPAN/modules/02packages.details.txt.gz    CPANPLUS tests
 ext/CPANPLUS/t/dummy-CPAN/modules/03modlist.data.gz    CPANPLUS tests
 ext/CPANPLUS/t/inc/conf.pl     CPANPLUS tests
-ext/CPAN/scripts/cpan          easily interact with CPAN from the command line
-ext/CPAN/t/01loadme.t          See if CPAN the module works
-ext/CPAN/t/02nox.t             See if CPAN::Nox works
-ext/CPAN/t/03pkgs.t            See if CPAN::Version works
-ext/CPAN/t/10version.t         See if CPAN the module works
-ext/CPAN/t/11mirroredby.t              See if CPAN::Mirrored::By works
 ext/Cwd/Changes                                Cwd extension Changelog
 ext/Cwd/Cwd.pm                         Various cwd routines (getcwd, fastcwd, chdir)
 ext/Cwd/Cwd.xs                         Cwd extension external subroutines

diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 124ee25..16a4c8e 100755 (executable)
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -370,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/},
@@ -407,7 +407,7 @@ use File::Glob qw(:case);
                               },
                           ],
        'CPAN'          => 1,
-       'UPSTREAM'      => 'CPAN',
+       'UPSTREAM'      => 'cpan',
        },
 
     'CPANPLUS' =>

diff --git a/ext/CPAN/Makefile.PL b/cpan/CPAN/Makefile.PL
similarity index 100%
rename from ext/CPAN/Makefile.PL
rename to cpan/CPAN/Makefile.PL

diff --git a/ext/CPAN/lib/CPAN.pm b/cpan/CPAN/lib/CPAN.pm
similarity index 100%
rename from ext/CPAN/lib/CPAN.pm
rename to cpan/CPAN/lib/CPAN.pm

diff --git a/ext/CPAN/lib/CPAN/API/HOWTO.pod b/cpan/CPAN/lib/CPAN/API/HOWTO.pod
similarity index 100%
rename from ext/CPAN/lib/CPAN/API/HOWTO.pod
rename to cpan/CPAN/lib/CPAN/API/HOWTO.pod

diff --git a/ext/CPAN/lib/CPAN/Author.pm b/cpan/CPAN/lib/CPAN/Author.pm
similarity index 100%
rename from ext/CPAN/lib/CPAN/Author.pm
rename to cpan/CPAN/lib/CPAN/Author.pm

diff --git a/ext/CPAN/lib/CPAN/Bundle.pm b/cpan/CPAN/lib/CPAN/Bundle.pm
similarity index 100%
rename from ext/CPAN/lib/CPAN/Bundle.pm
rename to cpan/CPAN/lib/CPAN/Bundle.pm

diff --git a/ext/CPAN/lib/CPAN/CacheMgr.pm b/cpan/CPAN/lib/CPAN/CacheMgr.pm
similarity index 100%
rename from ext/CPAN/lib/CPAN/CacheMgr.pm
rename to cpan/CPAN/lib/CPAN/CacheMgr.pm

diff --git a/ext/CPAN/lib/CPAN/Complete.pm b/cpan/CPAN/lib/CPAN/Complete.pm
similarity index 100%
rename from ext/CPAN/lib/CPAN/Complete.pm
rename to cpan/CPAN/lib/CPAN/Complete.pm

diff --git a/ext/CPAN/lib/CPAN/Debug.pm b/cpan/CPAN/lib/CPAN/Debug.pm
similarity index 100%
rename from ext/CPAN/lib/CPAN/Debug.pm
rename to cpan/CPAN/lib/CPAN/Debug.pm

diff --git a/ext/CPAN/lib/CPAN/DeferredCode.pm b/cpan/CPAN/lib/CPAN/DeferredCode.pm
similarity index 100%
rename from ext/CPAN/lib/CPAN/DeferredCode.pm
rename to cpan/CPAN/lib/CPAN/DeferredCode.pm

diff --git a/ext/CPAN/lib/CPAN/Distribution.pm b/cpan/CPAN/lib/CPAN/Distribution.pm
similarity index 100%
rename from ext/CPAN/lib/CPAN/Distribution.pm
rename to cpan/CPAN/lib/CPAN/Distribution.pm

diff --git a/ext/CPAN/lib/CPAN/Distroprefs.pm b/cpan/CPAN/lib/CPAN/Distroprefs.pm
similarity index 100%
rename from ext/CPAN/lib/CPAN/Distroprefs.pm
rename to cpan/CPAN/lib/CPAN/Distroprefs.pm

diff --git a/ext/CPAN/lib/CPAN/Distrostatus.pm b/cpan/CPAN/lib/CPAN/Distrostatus.pm
similarity index 100%
rename from ext/CPAN/lib/CPAN/Distrostatus.pm
rename to cpan/CPAN/lib/CPAN/Distrostatus.pm

diff --git a/ext/CPAN/lib/CPAN/Exception/RecursiveDependency.pm b/cpan/CPAN/lib/CPAN/Exception/RecursiveDependency.pm
similarity index 100%
rename from ext/CPAN/lib/CPAN/Exception/RecursiveDependency.pm
rename to cpan/CPAN/lib/CPAN/Exception/RecursiveDependency.pm

diff --git a/ext/CPAN/lib/CPAN/Exception/blocked_urllist.pm b/cpan/CPAN/lib/CPAN/Exception/blocked_urllist.pm
similarity index 100%
rename from ext/CPAN/lib/CPAN/Exception/blocked_urllist.pm
rename to cpan/CPAN/lib/CPAN/Exception/blocked_urllist.pm

diff --git a/ext/CPAN/lib/CPAN/Exception/yaml_not_installed.pm b/cpan/CPAN/lib/CPAN/Exception/yaml_not_installed.pm
similarity index 100%
rename from ext/CPAN/lib/CPAN/Exception/yaml_not_installed.pm
rename to cpan/CPAN/lib/CPAN/Exception/yaml_not_installed.pm

diff --git a/ext/CPAN/lib/CPAN/FTP.pm b/cpan/CPAN/lib/CPAN/FTP.pm
similarity index 100%
rename from ext/CPAN/lib/CPAN/FTP.pm
rename to cpan/CPAN/lib/CPAN/FTP.pm

diff --git a/ext/CPAN/lib/CPAN/FTP/netrc.pm b/cpan/CPAN/lib/CPAN/FTP/netrc.pm
similarity index 100%
rename from ext/CPAN/lib/CPAN/FTP/netrc.pm
rename to cpan/CPAN/lib/CPAN/FTP/netrc.pm

diff --git a/ext/CPAN/lib/CPAN/FirstTime.pm b/cpan/CPAN/lib/CPAN/FirstTime.pm
similarity index 100%
rename from ext/CPAN/lib/CPAN/FirstTime.pm
rename to cpan/CPAN/lib/CPAN/FirstTime.pm

diff --git a/ext/CPAN/lib/CPAN/HandleConfig.pm b/cpan/CPAN/lib/CPAN/HandleConfig.pm
similarity index 100%
rename from ext/CPAN/lib/CPAN/HandleConfig.pm
rename to cpan/CPAN/lib/CPAN/HandleConfig.pm

diff --git a/ext/CPAN/lib/CPAN/Index.pm b/cpan/CPAN/lib/CPAN/Index.pm
similarity index 100%
rename from ext/CPAN/lib/CPAN/Index.pm
rename to cpan/CPAN/lib/CPAN/Index.pm

diff --git a/ext/CPAN/lib/CPAN/InfoObj.pm b/cpan/CPAN/lib/CPAN/InfoObj.pm
similarity index 100%
rename from ext/CPAN/lib/CPAN/InfoObj.pm
rename to cpan/CPAN/lib/CPAN/InfoObj.pm

diff --git a/ext/CPAN/lib/CPAN/Kwalify.pm b/cpan/CPAN/lib/CPAN/Kwalify.pm
similarity index 100%
rename from ext/CPAN/lib/CPAN/Kwalify.pm
rename to cpan/CPAN/lib/CPAN/Kwalify.pm

diff --git a/ext/CPAN/lib/CPAN/Kwalify/distroprefs.dd b/cpan/CPAN/lib/CPAN/Kwalify/distroprefs.dd
similarity index 100%
rename from ext/CPAN/lib/CPAN/Kwalify/distroprefs.dd
rename to cpan/CPAN/lib/CPAN/Kwalify/distroprefs.dd

diff --git a/ext/CPAN/lib/CPAN/Kwalify/distroprefs.yml b/cpan/CPAN/lib/CPAN/Kwalify/distroprefs.yml
similarity index 100%
rename from ext/CPAN/lib/CPAN/Kwalify/distroprefs.yml
rename to cpan/CPAN/lib/CPAN/Kwalify/distroprefs.yml

diff --git a/ext/CPAN/lib/CPAN/LWP/UserAgent.pm b/cpan/CPAN/lib/CPAN/LWP/UserAgent.pm
similarity index 100%
rename from ext/CPAN/lib/CPAN/LWP/UserAgent.pm
rename to cpan/CPAN/lib/CPAN/LWP/UserAgent.pm

diff --git a/ext/CPAN/lib/CPAN/Module.pm b/cpan/CPAN/lib/CPAN/Module.pm
similarity index 100%
rename from ext/CPAN/lib/CPAN/Module.pm
rename to cpan/CPAN/lib/CPAN/Module.pm

diff --git a/ext/CPAN/lib/CPAN/Nox.pm b/cpan/CPAN/lib/CPAN/Nox.pm
similarity index 100%
rename from ext/CPAN/lib/CPAN/Nox.pm
rename to cpan/CPAN/lib/CPAN/Nox.pm

diff --git a/ext/CPAN/lib/CPAN/PAUSE2003.pub b/cpan/CPAN/lib/CPAN/PAUSE2003.pub
similarity index 100%
rename from ext/CPAN/lib/CPAN/PAUSE2003.pub
rename to cpan/CPAN/lib/CPAN/PAUSE2003.pub

diff --git a/ext/CPAN/lib/CPAN/PAUSE2005.pub b/cpan/CPAN/lib/CPAN/PAUSE2005.pub
similarity index 100%
rename from ext/CPAN/lib/CPAN/PAUSE2005.pub
rename to cpan/CPAN/lib/CPAN/PAUSE2005.pub

diff --git a/ext/CPAN/lib/CPAN/PAUSE2007.pub b/cpan/CPAN/lib/CPAN/PAUSE2007.pub
similarity index 100%
rename from ext/CPAN/lib/CPAN/PAUSE2007.pub
rename to cpan/CPAN/lib/CPAN/PAUSE2007.pub

diff --git a/ext/CPAN/lib/CPAN/PAUSE2009.pub b/cpan/CPAN/lib/CPAN/PAUSE2009.pub
similarity index 100%
rename from ext/CPAN/lib/CPAN/PAUSE2009.pub
rename to cpan/CPAN/lib/CPAN/PAUSE2009.pub

diff --git a/ext/CPAN/lib/CPAN/Prompt.pm b/cpan/CPAN/lib/CPAN/Prompt.pm
similarity index 100%
rename from ext/CPAN/lib/CPAN/Prompt.pm
rename to cpan/CPAN/lib/CPAN/Prompt.pm

diff --git a/ext/CPAN/lib/CPAN/Queue.pm b/cpan/CPAN/lib/CPAN/Queue.pm
similarity index 100%
rename from ext/CPAN/lib/CPAN/Queue.pm
rename to cpan/CPAN/lib/CPAN/Queue.pm

diff --git a/ext/CPAN/lib/CPAN/SIGNATURE b/cpan/CPAN/lib/CPAN/SIGNATURE
similarity index 100%
rename from ext/CPAN/lib/CPAN/SIGNATURE
rename to cpan/CPAN/lib/CPAN/SIGNATURE

diff --git a/ext/CPAN/lib/CPAN/Shell.pm b/cpan/CPAN/lib/CPAN/Shell.pm
similarity index 100%
rename from ext/CPAN/lib/CPAN/Shell.pm
rename to cpan/CPAN/lib/CPAN/Shell.pm

diff --git a/ext/CPAN/lib/CPAN/Tarzip.pm b/cpan/CPAN/lib/CPAN/Tarzip.pm
similarity index 100%
rename from ext/CPAN/lib/CPAN/Tarzip.pm
rename to cpan/CPAN/lib/CPAN/Tarzip.pm

diff --git a/ext/CPAN/lib/CPAN/URL.pm b/cpan/CPAN/lib/CPAN/URL.pm
similarity index 100%
rename from ext/CPAN/lib/CPAN/URL.pm
rename to cpan/CPAN/lib/CPAN/URL.pm

diff --git a/ext/CPAN/lib/CPAN/Version.pm b/cpan/CPAN/lib/CPAN/Version.pm
similarity index 100%
rename from ext/CPAN/lib/CPAN/Version.pm
rename to cpan/CPAN/lib/CPAN/Version.pm

diff --git a/ext/CPAN/scripts/cpan b/cpan/CPAN/scripts/cpan
similarity index 100%
rename from ext/CPAN/scripts/cpan
rename to cpan/CPAN/scripts/cpan

diff --git a/ext/CPAN/t/01loadme.t b/cpan/CPAN/t/01loadme.t
similarity index 100%
rename from ext/CPAN/t/01loadme.t
rename to cpan/CPAN/t/01loadme.t

diff --git a/ext/CPAN/t/02nox.t b/cpan/CPAN/t/02nox.t
similarity index 100%
rename from ext/CPAN/t/02nox.t
rename to cpan/CPAN/t/02nox.t

diff --git a/ext/CPAN/t/03pkgs.t b/cpan/CPAN/t/03pkgs.t
similarity index 100%
rename from ext/CPAN/t/03pkgs.t
rename to cpan/CPAN/t/03pkgs.t

diff --git a/ext/CPAN/t/10version.t b/cpan/CPAN/t/10version.t
similarity index 100%
rename from ext/CPAN/t/10version.t
rename to cpan/CPAN/t/10version.t

diff --git a/ext/CPAN/t/11mirroredby.t b/cpan/CPAN/t/11mirroredby.t
similarity index 100%
rename from ext/CPAN/t/11mirroredby.t
rename to cpan/CPAN/t/11mirroredby.t

diff --git a/utils/cpan.PL b/utils/cpan.PL
index 4752843..c7c2668 100644 (file)
--- a/utils/cpan.PL
+++ b/utils/cpan.PL
@@ -33,7 +33,7 @@ $Config{startperl}
 
 use File::Spec;
 
-my $cpan = File::Spec->catfile(File::Spec->catdir(File::Spec->updir, "ext", "CPAN", "scripts"), "cpan");
+my $cpan = File::Spec->catfile(File::Spec->catdir(File::Spec->updir, qw(cpan CPAN scripts)), "cpan");
 
 if (open(CPAN, $cpan)) {
     print OUT <CPAN>;