In perl.git, the branch blead has been updated

<http://perl5.git.perl.org/perl.git/commitdiff/1299eb144ab48940fecb7865750908c77577bfd5?hp=c1effa61278e47c916466883d74905b04fedc388>

- Log -----------------------------------------------------------------
commit 1299eb144ab48940fecb7865750908c77577bfd5
Author: Nicholas Clark <[email protected]>
Date:   Thu Sep 24 10:51:41 2009 +0100

    Move DB_File from ext/ to cpan/
    
    (Also XS, skipped on Win32 and VMS)

M       MANIFEST
M       Porting/Maintainers.pl
A       cpan/DB_File/.gitignore
A       cpan/DB_File/Changes
A       cpan/DB_File/DB_File.pm
A       cpan/DB_File/DB_File.xs
A       cpan/DB_File/DB_File_BS
A       cpan/DB_File/Makefile.PL
A       cpan/DB_File/config.in
A       cpan/DB_File/dbinfo
A       cpan/DB_File/hints/dynixptx.pl
A       cpan/DB_File/hints/sco.pl
A       cpan/DB_File/t/db-btree.t
A       cpan/DB_File/t/db-hash.t
A       cpan/DB_File/t/db-recno.t
A       cpan/DB_File/typemap
A       cpan/DB_File/version.c
D       ext/DB_File/.gitignore
D       ext/DB_File/Changes
D       ext/DB_File/DB_File.pm
D       ext/DB_File/DB_File.xs
D       ext/DB_File/DB_File_BS
D       ext/DB_File/Makefile.PL
D       ext/DB_File/config.in
D       ext/DB_File/dbinfo
D       ext/DB_File/hints/dynixptx.pl
D       ext/DB_File/hints/sco.pl
D       ext/DB_File/t/db-btree.t
D       ext/DB_File/t/db-hash.t
D       ext/DB_File/t/db-recno.t
D       ext/DB_File/typemap
D       ext/DB_File/version.c

commit 5aacae8537a14b9d6238ea441c002451d7abea35
Author: Nicholas Clark <[email protected]>
Date:   Thu Sep 24 10:30:56 2009 +0100

    Move IPC-SysV from ext/ to cpan/
    
    (Also XS, skipped on Win32 and VMS)

M       MANIFEST
M       Porting/Maintainers.pl
A       cpan/IPC-SysV/.gitignore
A       cpan/IPC-SysV/Changes
A       cpan/IPC-SysV/MANIFEST.SKIP
A       cpan/IPC-SysV/Makefile.PL
A       cpan/IPC-SysV/README
A       cpan/IPC-SysV/SysV.xs
A       cpan/IPC-SysV/TODO
A       cpan/IPC-SysV/hints/cygwin.pl
A       cpan/IPC-SysV/hints/next_3.pl
A       cpan/IPC-SysV/lib/IPC/Msg.pm
A       cpan/IPC-SysV/lib/IPC/Semaphore.pm
A       cpan/IPC-SysV/lib/IPC/SharedMem.pm
A       cpan/IPC-SysV/lib/IPC/SysV.pm
A       cpan/IPC-SysV/regen.pl
A       cpan/IPC-SysV/t/ipcsysv.t
A       cpan/IPC-SysV/t/msg.t
A       cpan/IPC-SysV/t/pod.t
A       cpan/IPC-SysV/t/podcov.t
A       cpan/IPC-SysV/t/sem.t
A       cpan/IPC-SysV/t/shm.t
A       cpan/IPC-SysV/typemap
D       ext/IPC-SysV/.gitignore
D       ext/IPC-SysV/Changes
D       ext/IPC-SysV/MANIFEST.SKIP
D       ext/IPC-SysV/Makefile.PL
D       ext/IPC-SysV/README
D       ext/IPC-SysV/SysV.xs
D       ext/IPC-SysV/TODO
D       ext/IPC-SysV/hints/cygwin.pl
D       ext/IPC-SysV/hints/next_3.pl
D       ext/IPC-SysV/lib/IPC/Msg.pm
D       ext/IPC-SysV/lib/IPC/Semaphore.pm
D       ext/IPC-SysV/lib/IPC/SharedMem.pm
D       ext/IPC-SysV/lib/IPC/SysV.pm
D       ext/IPC-SysV/regen.pl
D       ext/IPC-SysV/t/ipcsysv.t
D       ext/IPC-SysV/t/msg.t
D       ext/IPC-SysV/t/pod.t
D       ext/IPC-SysV/t/podcov.t
D       ext/IPC-SysV/t/sem.t
D       ext/IPC-SysV/t/shm.t
D       ext/IPC-SysV/typemap

commit e14adb6005c86f724c57fce18f4514abf3c57041
Author: Nicholas Clark <[email protected]>
Date:   Thu Sep 24 10:16:04 2009 +0100

    Move Sys-Syslog from ext/ to cpan/
    
    (Something had to be first, and it had to be XS, and skipped on Win32 and 
VMS)

M       MANIFEST
M       Porting/Maintainers.pl
A       cpan/.gitignore
A       cpan/Sys-Syslog/.gitignore
A       cpan/Sys-Syslog/Changes
A       cpan/Sys-Syslog/Makefile.PL
A       cpan/Sys-Syslog/README
A       cpan/Sys-Syslog/README.win32
A       cpan/Sys-Syslog/Syslog.pm
A       cpan/Sys-Syslog/Syslog.xs
A       cpan/Sys-Syslog/fallback/const-c.inc
A       cpan/Sys-Syslog/fallback/const-xs.inc
A       cpan/Sys-Syslog/fallback/syslog.h
A       cpan/Sys-Syslog/t/00-load.t
A       cpan/Sys-Syslog/t/constants.t
A       cpan/Sys-Syslog/t/syslog.t
A       cpan/Sys-Syslog/win32/PerlLog.mc
A       cpan/Sys-Syslog/win32/PerlLog_RES.uu
A       cpan/Sys-Syslog/win32/PerlLog_dll.uu
A       cpan/Sys-Syslog/win32/Win32.pm
A       cpan/Sys-Syslog/win32/compile.pl
D       ext/Sys-Syslog/.gitignore
D       ext/Sys-Syslog/Changes
D       ext/Sys-Syslog/Makefile.PL
D       ext/Sys-Syslog/README
D       ext/Sys-Syslog/README.win32
D       ext/Sys-Syslog/Syslog.pm
D       ext/Sys-Syslog/Syslog.xs
D       ext/Sys-Syslog/fallback/const-c.inc
D       ext/Sys-Syslog/fallback/const-xs.inc
D       ext/Sys-Syslog/fallback/syslog.h
D       ext/Sys-Syslog/t/00-load.t
D       ext/Sys-Syslog/t/constants.t
D       ext/Sys-Syslog/t/syslog.t
D       ext/Sys-Syslog/win32/PerlLog.mc
D       ext/Sys-Syslog/win32/PerlLog_RES.uu
D       ext/Sys-Syslog/win32/PerlLog_dll.uu
D       ext/Sys-Syslog/win32/Win32.pm
D       ext/Sys-Syslog/win32/compile.pl

commit 9271a704fa108e9f1352cdcdd0dd7ed1a71d1db9
Author: Nicholas Clark <[email protected]>
Date:   Thu Sep 24 10:15:26 2009 +0100

    Support comparing extensions in cpan/ as well as ext/

M       Porting/core-cpan-diff

commit dd6c21bebf897e04754ff0d50210c6e54cc753c7
Author: Nicholas Clark <[email protected]>
Date:   Thu Sep 24 10:12:13 2009 +0100

    Search for extensions in cpan/ as well as ext/
    
    This required inverting the logic of test for "are we flattened or not".
    Currently we can only build XS extensions on Unix from cpan/

M       Configure

commit 8a99276313ed95fde25e45e5b89a48e5080ab4cd
Author: Nicholas Clark <[email protected]>
Date:   Thu Sep 24 10:11:42 2009 +0100

    Support building extensions in cpan/ as well as ext/

M       make_ext.pl
-----------------------------------------------------------------------

Summary of changes:
 Configure                                      |   30 ++++---
 MANIFEST                                       |  102 ++++++++++++------------
 Porting/Maintainers.pl                         |    6 +-
 Porting/core-cpan-diff                         |    2 +-
 {ext => cpan}/.gitignore                       |    0
 {ext => cpan}/DB_File/.gitignore               |    0
 {ext => cpan}/DB_File/Changes                  |    0
 {ext => cpan}/DB_File/DB_File.pm               |    0
 {ext => cpan}/DB_File/DB_File.xs               |    0
 {ext => cpan}/DB_File/DB_File_BS               |    0
 {ext => cpan}/DB_File/Makefile.PL              |    0
 {ext => cpan}/DB_File/config.in                |    0
 {ext => cpan}/DB_File/dbinfo                   |    0
 {ext => cpan}/DB_File/hints/dynixptx.pl        |    0
 {ext => cpan}/DB_File/hints/sco.pl             |    0
 {ext => cpan}/DB_File/t/db-btree.t             |    0
 {ext => cpan}/DB_File/t/db-hash.t              |    0
 {ext => cpan}/DB_File/t/db-recno.t             |    0
 {ext => cpan}/DB_File/typemap                  |    0
 {ext => cpan}/DB_File/version.c                |    0
 {ext => cpan}/IPC-SysV/.gitignore              |    0
 {ext => cpan}/IPC-SysV/Changes                 |    0
 {ext => cpan}/IPC-SysV/MANIFEST.SKIP           |    0
 {ext => cpan}/IPC-SysV/Makefile.PL             |    0
 {ext => cpan}/IPC-SysV/README                  |    0
 {ext => cpan}/IPC-SysV/SysV.xs                 |    0
 {ext => cpan}/IPC-SysV/TODO                    |    0
 {ext => cpan}/IPC-SysV/hints/cygwin.pl         |    0
 {ext => cpan}/IPC-SysV/hints/next_3.pl         |    0
 {ext => cpan}/IPC-SysV/lib/IPC/Msg.pm          |    0
 {ext => cpan}/IPC-SysV/lib/IPC/Semaphore.pm    |    0
 {ext => cpan}/IPC-SysV/lib/IPC/SharedMem.pm    |    0
 {ext => cpan}/IPC-SysV/lib/IPC/SysV.pm         |    0
 {ext => cpan}/IPC-SysV/regen.pl                |    0
 {ext => cpan}/IPC-SysV/t/ipcsysv.t             |    0
 {ext => cpan}/IPC-SysV/t/msg.t                 |    0
 {ext => cpan}/IPC-SysV/t/pod.t                 |    0
 {ext => cpan}/IPC-SysV/t/podcov.t              |    0
 {ext => cpan}/IPC-SysV/t/sem.t                 |    0
 {ext => cpan}/IPC-SysV/t/shm.t                 |    0
 {ext => cpan}/IPC-SysV/typemap                 |    0
 {ext => cpan}/Sys-Syslog/.gitignore            |    0
 {ext => cpan}/Sys-Syslog/Changes               |    0
 {ext => cpan}/Sys-Syslog/Makefile.PL           |    0
 {ext => cpan}/Sys-Syslog/README                |    0
 {ext => cpan}/Sys-Syslog/README.win32          |    0
 {ext => cpan}/Sys-Syslog/Syslog.pm             |    0
 {ext => cpan}/Sys-Syslog/Syslog.xs             |    0
 {ext => cpan}/Sys-Syslog/fallback/const-c.inc  |    0
 {ext => cpan}/Sys-Syslog/fallback/const-xs.inc |    0
 {ext => cpan}/Sys-Syslog/fallback/syslog.h     |    0
 {ext => cpan}/Sys-Syslog/t/00-load.t           |    0
 {ext => cpan}/Sys-Syslog/t/constants.t         |    0
 {ext => cpan}/Sys-Syslog/t/syslog.t            |    0
 {ext => cpan}/Sys-Syslog/win32/PerlLog.mc      |    0
 {ext => cpan}/Sys-Syslog/win32/PerlLog_RES.uu  |    0
 {ext => cpan}/Sys-Syslog/win32/PerlLog_dll.uu  |    0
 {ext => cpan}/Sys-Syslog/win32/Win32.pm        |    0
 {ext => cpan}/Sys-Syslog/win32/compile.pl      |    0
 make_ext.pl                                    |   13 +++-
 60 files changed, 84 insertions(+), 69 deletions(-)
 copy {ext => cpan}/.gitignore (100%)
 rename {ext => cpan}/DB_File/.gitignore (100%)
 rename {ext => cpan}/DB_File/Changes (100%)
 rename {ext => cpan}/DB_File/DB_File.pm (100%)
 rename {ext => cpan}/DB_File/DB_File.xs (100%)
 rename {ext => cpan}/DB_File/DB_File_BS (100%)
 rename {ext => cpan}/DB_File/Makefile.PL (100%)
 rename {ext => cpan}/DB_File/config.in (100%)
 rename {ext => cpan}/DB_File/dbinfo (100%)
 rename {ext => cpan}/DB_File/hints/dynixptx.pl (100%)
 rename {ext => cpan}/DB_File/hints/sco.pl (100%)
 rename {ext => cpan}/DB_File/t/db-btree.t (100%)
 rename {ext => cpan}/DB_File/t/db-hash.t (100%)
 rename {ext => cpan}/DB_File/t/db-recno.t (100%)
 rename {ext => cpan}/DB_File/typemap (100%)
 rename {ext => cpan}/DB_File/version.c (100%)
 rename {ext => cpan}/IPC-SysV/.gitignore (100%)
 rename {ext => cpan}/IPC-SysV/Changes (100%)
 rename {ext => cpan}/IPC-SysV/MANIFEST.SKIP (100%)
 rename {ext => cpan}/IPC-SysV/Makefile.PL (100%)
 rename {ext => cpan}/IPC-SysV/README (100%)
 rename {ext => cpan}/IPC-SysV/SysV.xs (100%)
 rename {ext => cpan}/IPC-SysV/TODO (100%)
 rename {ext => cpan}/IPC-SysV/hints/cygwin.pl (100%)
 rename {ext => cpan}/IPC-SysV/hints/next_3.pl (100%)
 rename {ext => cpan}/IPC-SysV/lib/IPC/Msg.pm (100%)
 rename {ext => cpan}/IPC-SysV/lib/IPC/Semaphore.pm (100%)
 rename {ext => cpan}/IPC-SysV/lib/IPC/SharedMem.pm (100%)
 rename {ext => cpan}/IPC-SysV/lib/IPC/SysV.pm (100%)
 rename {ext => cpan}/IPC-SysV/regen.pl (100%)
 rename {ext => cpan}/IPC-SysV/t/ipcsysv.t (100%)
 rename {ext => cpan}/IPC-SysV/t/msg.t (100%)
 rename {ext => cpan}/IPC-SysV/t/pod.t (100%)
 rename {ext => cpan}/IPC-SysV/t/podcov.t (100%)
 rename {ext => cpan}/IPC-SysV/t/sem.t (100%)
 rename {ext => cpan}/IPC-SysV/t/shm.t (100%)
 rename {ext => cpan}/IPC-SysV/typemap (100%)
 rename {ext => cpan}/Sys-Syslog/.gitignore (100%)
 rename {ext => cpan}/Sys-Syslog/Changes (100%)
 rename {ext => cpan}/Sys-Syslog/Makefile.PL (100%)
 rename {ext => cpan}/Sys-Syslog/README (100%)
 rename {ext => cpan}/Sys-Syslog/README.win32 (100%)
 rename {ext => cpan}/Sys-Syslog/Syslog.pm (100%)
 rename {ext => cpan}/Sys-Syslog/Syslog.xs (100%)
 rename {ext => cpan}/Sys-Syslog/fallback/const-c.inc (100%)
 rename {ext => cpan}/Sys-Syslog/fallback/const-xs.inc (100%)
 rename {ext => cpan}/Sys-Syslog/fallback/syslog.h (100%)
 rename {ext => cpan}/Sys-Syslog/t/00-load.t (100%)
 rename {ext => cpan}/Sys-Syslog/t/constants.t (100%)
 rename {ext => cpan}/Sys-Syslog/t/syslog.t (100%)
 rename {ext => cpan}/Sys-Syslog/win32/PerlLog.mc (100%)
 rename {ext => cpan}/Sys-Syslog/win32/PerlLog_RES.uu (100%)
 rename {ext => cpan}/Sys-Syslog/win32/PerlLog_dll.uu (100%)
 rename {ext => cpan}/Sys-Syslog/win32/Win32.pm (100%)
 rename {ext => cpan}/Sys-Syslog/win32/compile.pl (100%)

diff --git a/Configure b/Configure
index b63287b..c97a42e 100755
--- a/Configure
+++ b/Configure
@@ -21656,19 +21656,7 @@ find_extensions='
            *)
            this_ext=`echo $xxx | $sed -e s/-/\\\//g`;
            leaf=`echo $xxx | $sed -e s/.*-//`;
-           if $test -d File-Glob; then
-               $ls -1 $xxx > $$.tmp;
-               if   $contains "\.xs$" $$.tmp > /dev/null 2>&1; then
-                   known_extensions="$known_extensions $this_ext";
-               elif $contains "\.c$"  $$.tmp > /dev/null 2>&1; then
-                   known_extensions="$known_extensions $this_ext";
-               elif $test "$this_ext" = "IO/Compress"; then
-                   known_extensions="$known_extensions $this_ext";
-               elif $test -d $xxx; then
-                   nonxs_extensions="$nonxs_extensions $this_ext";
-               fi;
-               $rm -f $$.tmp;
-           else
+           if $test -d File; then
                if $test -f $xxx/$leaf.xs -o -f $xxx/$leaf.c; then
                    known_extensions="$known_extensions $1$this_ext";
                elif $test -f $xxx/Makefile.PL; then
@@ -21682,11 +21670,27 @@ find_extensions='
                        shift;
                    fi;
                fi;
+           else
+               $ls -1 $xxx > $$.tmp;
+               if   $contains "\.xs$" $$.tmp > /dev/null 2>&1; then
+                   known_extensions="$known_extensions $this_ext";
+               elif $contains "\.c$"  $$.tmp > /dev/null 2>&1; then
+                   known_extensions="$known_extensions $this_ext";
+               elif $test "$this_ext" = "IO/Compress"; then
+                   known_extensions="$known_extensions $this_ext";
+               elif $test -d $xxx; then
+                   nonxs_extensions="$nonxs_extensions $this_ext";
+               fi;
+               $rm -f $$.tmp;
            fi
            ;;
        esac;
     done'
 tdir=`pwd`
+cd "$rsrc/cpan"
+set X
+shift
+eval $find_extensions
 cd "$rsrc/ext"
 set X
 shift
diff --git a/MANIFEST b/MANIFEST
index ef563d7..ac08892 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -17,6 +17,57 @@ configure.com                Configure-equivalent for VMS
 configure.gnu          Crude emulation of GNU configure
 cop.h                  Control operator header
 Copying                        The GNU General Public License
+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
+cpan/DB_File/DB_File.pm                Berkeley DB extension Perl module
+cpan/DB_File/DB_File.xs                Berkeley DB extension external 
subroutines
+cpan/DB_File/dbinfo            Berkeley DB database version checker
+cpan/DB_File/hints/dynixptx.pl Hint for DB_File for named architecture
+cpan/DB_File/hints/sco.pl      Hint for DB_File for named architecture
+cpan/DB_File/Makefile.PL       Berkeley DB extension makefile writer
+cpan/DB_File/t/db-btree.t      See if DB_File works
+cpan/DB_File/t/db-hash.t       See if DB_File works
+cpan/DB_File/t/db-recno.t      See if DB_File works
+cpan/DB_File/typemap           Berkeley DB extension interface types
+cpan/DB_File/version.c         Berkeley DB extension interface version check
+cpan/IPC-SysV/Changes                  IPC::SysV changes
+cpan/IPC-SysV/hints/cygwin.pl          Hint for IPC::SysV for named 
architecture
+cpan/IPC-SysV/hints/next_3.pl          Hint for IPC::SysV for named 
architecture
+cpan/IPC-SysV/lib/IPC/Msg.pm           IPC::SysV extension Perl module
+cpan/IPC-SysV/lib/IPC/Semaphore.pm     IPC::SysV extension Perl module
+cpan/IPC-SysV/lib/IPC/SharedMem.pm     IPC::SysV extension Perl module
+cpan/IPC-SysV/lib/IPC/SysV.pm          IPC::SysV extension Perl module
+cpan/IPC-SysV/Makefile.PL              IPC::SysV makefile writer
+cpan/IPC-SysV/MANIFEST.SKIP            IPC::SysV manifest skip specs
+cpan/IPC-SysV/README                   IPC::SysV README
+cpan/IPC-SysV/regen.pl                 IPC::SysV file regeneration script
+cpan/IPC-SysV/SysV.xs                  IPC::SysV extension Perl module
+cpan/IPC-SysV/t/ipcsysv.t              IPC::SysV test file
+cpan/IPC-SysV/t/msg.t                  IPC::SysV test file
+cpan/IPC-SysV/TODO                     IPC::SysV todo file
+cpan/IPC-SysV/t/podcov.t               IPC::SysV test file
+cpan/IPC-SysV/t/pod.t                  IPC::SysV test file
+cpan/IPC-SysV/t/sem.t                  IPC::SysV test file
+cpan/IPC-SysV/t/shm.t                  IPC::SysV test file
+cpan/IPC-SysV/typemap                  IPC::SysV typemap
+cpan/Sys-Syslog/Changes                        Changlog for Sys::Syslog
+cpan/Sys-Syslog/fallback/const-c.inc   Sys::Syslog constants fallback file
+cpan/Sys-Syslog/fallback/const-xs.inc  Sys::Syslog constants fallback file
+cpan/Sys-Syslog/fallback/syslog.h      Sys::Syslog header fallback file
+cpan/Sys-Syslog/Makefile.PL            Sys::Syslog extension makefile writer
+cpan/Sys-Syslog/README                 README for Sys::Syslog
+cpan/Sys-Syslog/README.win32           README for Sys::Syslog on Windows
+cpan/Sys-Syslog/Syslog.pm              Sys::Syslog extension Perl module
+cpan/Sys-Syslog/Syslog.xs              Sys::Syslog extension external 
subroutines
+cpan/Sys-Syslog/t/00-load.t            test for Sys::Syslog
+cpan/Sys-Syslog/t/constants.t          test for Sys::Syslog
+cpan/Sys-Syslog/t/syslog.t             See if Sys::Syslog works
+cpan/Sys-Syslog/win32/compile.pl       Sys::Syslog extension Win32 related file
+cpan/Sys-Syslog/win32/PerlLog_dll.uu   Sys::Syslog extension Win32 related file
+cpan/Sys-Syslog/win32/PerlLog.mc       Sys::Syslog extension Win32 related file
+cpan/Sys-Syslog/win32/PerlLog_RES.uu   Sys::Syslog extension Win32 related file
+cpan/Sys-Syslog/win32/Win32.pm         Sys::Syslog extension Win32 related file
 Cross/build-arm-n770-sh        Cross-compilation
 Cross/cflags-cross-arm Cross-compilation
 Cross/config           Cross-compilation
@@ -585,20 +636,6 @@ ext/Data-Dumper/t/freezer.t        See if 
$Data::Dumper::Freezer works
 ext/Data-Dumper/Todo           Data pretty printer, futures
 ext/Data-Dumper/t/overload.t   See if Data::Dumper works for overloaded data
 ext/Data-Dumper/t/pair.t       See if Data::Dumper pair separator works
-ext/DB_File/Changes    Berkeley DB extension change log
-ext/DB_File/config.in  Part of Berkeley DB configuration
-ext/DB_File/DB_File_BS Berkeley DB extension mkbootstrap fodder
-ext/DB_File/DB_File.pm Berkeley DB extension Perl module
-ext/DB_File/DB_File.xs Berkeley DB extension external subroutines
-ext/DB_File/dbinfo     Berkeley DB database version checker
-ext/DB_File/hints/dynixptx.pl  Hint for DB_File for named architecture
-ext/DB_File/hints/sco.pl       Hint for DB_File for named architecture
-ext/DB_File/Makefile.PL        Berkeley DB extension makefile writer
-ext/DB_File/t/db-btree.t       See if DB_File works
-ext/DB_File/t/db-hash.t                See if DB_File works
-ext/DB_File/t/db-recno.t       See if DB_File works
-ext/DB_File/typemap            Berkeley DB extension interface types
-ext/DB_File/version.c          Berkeley DB extension interface version check
 ext/Devel-DProf/Changes                Perl code profiler changelog
 ext/Devel-DProf/DProf.pm       Perl code profiler
 ext/Devel-DProf/dprof/test1_t  Perl code profiler tests
@@ -1549,26 +1586,6 @@ ext/IPC-Open2/lib/IPC/Open2.pm   Open a two-ended pipe
 ext/IPC-Open2/t/IPC-Open2.t    See if IPC::Open2 works
 ext/IPC-Open3/lib/IPC/Open3.pm Open a three-ended pipe
 ext/IPC-Open3/t/IPC-Open3.t    See if IPC::Open3 works
-ext/IPC-SysV/Changes   IPC::SysV changes
-ext/IPC-SysV/hints/cygwin.pl   Hint for IPC::SysV for named architecture
-ext/IPC-SysV/hints/next_3.pl   Hint for IPC::SysV for named architecture
-ext/IPC-SysV/lib/IPC/Msg.pm    IPC::SysV extension Perl module
-ext/IPC-SysV/lib/IPC/Semaphore.pm      IPC::SysV extension Perl module
-ext/IPC-SysV/lib/IPC/SharedMem.pm      IPC::SysV extension Perl module
-ext/IPC-SysV/lib/IPC/SysV.pm   IPC::SysV extension Perl module
-ext/IPC-SysV/Makefile.PL       IPC::SysV makefile writer
-ext/IPC-SysV/MANIFEST.SKIP     IPC::SysV manifest skip specs
-ext/IPC-SysV/README            IPC::SysV README
-ext/IPC-SysV/regen.pl  IPC::SysV file regeneration script
-ext/IPC-SysV/SysV.xs           IPC::SysV extension Perl module
-ext/IPC-SysV/t/ipcsysv.t               IPC::SysV test file
-ext/IPC-SysV/t/msg.t           IPC::SysV test file
-ext/IPC-SysV/TODO      IPC::SysV todo file
-ext/IPC-SysV/t/podcov.t        IPC::SysV test file
-ext/IPC-SysV/t/pod.t   IPC::SysV test file
-ext/IPC-SysV/t/sem.t           IPC::SysV test file
-ext/IPC-SysV/t/shm.t   IPC::SysV test file
-ext/IPC-SysV/typemap   IPC::SysV typemap
 ext/lib/lib_pm.PL              For "use lib", produces lib/lib.pm
 ext/lib/Makefile.PL
 ext/libnet/Changes                     libnet
@@ -2562,23 +2579,6 @@ ext/Switch/t/switch.t            See if Perl 5 switch 
works
 ext/Sys-Hostname/Hostname.pm   Sys::Hostname extension Perl module
 ext/Sys-Hostname/Hostname.xs   Sys::Hostname extension external subroutines
 ext/Sys-Hostname/t/Hostname.t  See if Sys::Hostname works
-ext/Sys-Syslog/Changes         Changlog for Sys::Syslog
-ext/Sys-Syslog/fallback/const-c.inc    Sys::Syslog constants fallback file
-ext/Sys-Syslog/fallback/const-xs.inc   Sys::Syslog constants fallback file
-ext/Sys-Syslog/fallback/syslog.h       Sys::Syslog header fallback file
-ext/Sys-Syslog/Makefile.PL     Sys::Syslog extension makefile writer
-ext/Sys-Syslog/README          README for Sys::Syslog
-ext/Sys-Syslog/README.win32    README for Sys::Syslog on Windows
-ext/Sys-Syslog/Syslog.pm       Sys::Syslog extension Perl module
-ext/Sys-Syslog/Syslog.xs       Sys::Syslog extension external subroutines
-ext/Sys-Syslog/t/00-load.t     test for Sys::Syslog
-ext/Sys-Syslog/t/constants.t   test for Sys::Syslog
-ext/Sys-Syslog/t/syslog.t      See if Sys::Syslog works
-ext/Sys-Syslog/win32/compile.pl        Sys::Syslog extension Win32 related file
-ext/Sys-Syslog/win32/PerlLog_dll.uu    Sys::Syslog extension Win32 related file
-ext/Sys-Syslog/win32/PerlLog.mc        Sys::Syslog extension Win32 related file
-ext/Sys-Syslog/win32/PerlLog_RES.uu    Sys::Syslog extension Win32 related file
-ext/Sys-Syslog/win32/Win32.pm  Sys::Syslog extension Win32 related file
 ext/Term-ANSIColor/ANSIColor.pm                Perl module supporting termcap 
usage
 ext/Term-ANSIColor/ChangeLog           Term::ANSIColor
 ext/Term-ANSIColor/README              Term::ANSIColor
diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 0ba03e2..0511309 100755
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -457,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
@@ -811,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',
@@ -1373,7 +1373,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
diff --git a/Porting/core-cpan-diff b/Porting/core-cpan-diff
index 1b38a94..8e3feeb 100755
--- a/Porting/core-cpan-diff
+++ b/Porting/core-cpan-diff
@@ -432,7 +432,7 @@ sub get_map {
 
     my $ext;
     for (@$perl_files) {
-       if (m{^(ext/[^/]+/)}) {
+       if (m{^((?:ext|cpan)/[^/]+/)}) {
            if (defined $ext and $ext ne $1) {
                # more than one ext/$ext/
                undef $ext;
diff --git a/ext/.gitignore b/cpan/.gitignore
similarity index 100%
copy from ext/.gitignore
copy to cpan/.gitignore
diff --git a/ext/DB_File/.gitignore b/cpan/DB_File/.gitignore
similarity index 100%
rename from ext/DB_File/.gitignore
rename to cpan/DB_File/.gitignore
diff --git a/ext/DB_File/Changes b/cpan/DB_File/Changes
similarity index 100%
rename from ext/DB_File/Changes
rename to cpan/DB_File/Changes
diff --git a/ext/DB_File/DB_File.pm b/cpan/DB_File/DB_File.pm
similarity index 100%
rename from ext/DB_File/DB_File.pm
rename to cpan/DB_File/DB_File.pm
diff --git a/ext/DB_File/DB_File.xs b/cpan/DB_File/DB_File.xs
similarity index 100%
rename from ext/DB_File/DB_File.xs
rename to cpan/DB_File/DB_File.xs
diff --git a/ext/DB_File/DB_File_BS b/cpan/DB_File/DB_File_BS
similarity index 100%
rename from ext/DB_File/DB_File_BS
rename to cpan/DB_File/DB_File_BS
diff --git a/ext/DB_File/Makefile.PL b/cpan/DB_File/Makefile.PL
similarity index 100%
rename from ext/DB_File/Makefile.PL
rename to cpan/DB_File/Makefile.PL
diff --git a/ext/DB_File/config.in b/cpan/DB_File/config.in
similarity index 100%
rename from ext/DB_File/config.in
rename to cpan/DB_File/config.in
diff --git a/ext/DB_File/dbinfo b/cpan/DB_File/dbinfo
similarity index 100%
rename from ext/DB_File/dbinfo
rename to cpan/DB_File/dbinfo
diff --git a/ext/DB_File/hints/dynixptx.pl b/cpan/DB_File/hints/dynixptx.pl
similarity index 100%
rename from ext/DB_File/hints/dynixptx.pl
rename to cpan/DB_File/hints/dynixptx.pl
diff --git a/ext/DB_File/hints/sco.pl b/cpan/DB_File/hints/sco.pl
similarity index 100%
rename from ext/DB_File/hints/sco.pl
rename to cpan/DB_File/hints/sco.pl
diff --git a/ext/DB_File/t/db-btree.t b/cpan/DB_File/t/db-btree.t
similarity index 100%
rename from ext/DB_File/t/db-btree.t
rename to cpan/DB_File/t/db-btree.t
diff --git a/ext/DB_File/t/db-hash.t b/cpan/DB_File/t/db-hash.t
similarity index 100%
rename from ext/DB_File/t/db-hash.t
rename to cpan/DB_File/t/db-hash.t
diff --git a/ext/DB_File/t/db-recno.t b/cpan/DB_File/t/db-recno.t
similarity index 100%
rename from ext/DB_File/t/db-recno.t
rename to cpan/DB_File/t/db-recno.t
diff --git a/ext/DB_File/typemap b/cpan/DB_File/typemap
similarity index 100%
rename from ext/DB_File/typemap
rename to cpan/DB_File/typemap
diff --git a/ext/DB_File/version.c b/cpan/DB_File/version.c
similarity index 100%
rename from ext/DB_File/version.c
rename to cpan/DB_File/version.c
diff --git a/ext/IPC-SysV/.gitignore b/cpan/IPC-SysV/.gitignore
similarity index 100%
rename from ext/IPC-SysV/.gitignore
rename to cpan/IPC-SysV/.gitignore
diff --git a/ext/IPC-SysV/Changes b/cpan/IPC-SysV/Changes
similarity index 100%
rename from ext/IPC-SysV/Changes
rename to cpan/IPC-SysV/Changes
diff --git a/ext/IPC-SysV/MANIFEST.SKIP b/cpan/IPC-SysV/MANIFEST.SKIP
similarity index 100%
rename from ext/IPC-SysV/MANIFEST.SKIP
rename to cpan/IPC-SysV/MANIFEST.SKIP
diff --git a/ext/IPC-SysV/Makefile.PL b/cpan/IPC-SysV/Makefile.PL
similarity index 100%
rename from ext/IPC-SysV/Makefile.PL
rename to cpan/IPC-SysV/Makefile.PL
diff --git a/ext/IPC-SysV/README b/cpan/IPC-SysV/README
similarity index 100%
rename from ext/IPC-SysV/README
rename to cpan/IPC-SysV/README
diff --git a/ext/IPC-SysV/SysV.xs b/cpan/IPC-SysV/SysV.xs
similarity index 100%
rename from ext/IPC-SysV/SysV.xs
rename to cpan/IPC-SysV/SysV.xs
diff --git a/ext/IPC-SysV/TODO b/cpan/IPC-SysV/TODO
similarity index 100%
rename from ext/IPC-SysV/TODO
rename to cpan/IPC-SysV/TODO
diff --git a/ext/IPC-SysV/hints/cygwin.pl b/cpan/IPC-SysV/hints/cygwin.pl
similarity index 100%
rename from ext/IPC-SysV/hints/cygwin.pl
rename to cpan/IPC-SysV/hints/cygwin.pl
diff --git a/ext/IPC-SysV/hints/next_3.pl b/cpan/IPC-SysV/hints/next_3.pl
similarity index 100%
rename from ext/IPC-SysV/hints/next_3.pl
rename to cpan/IPC-SysV/hints/next_3.pl
diff --git a/ext/IPC-SysV/lib/IPC/Msg.pm b/cpan/IPC-SysV/lib/IPC/Msg.pm
similarity index 100%
rename from ext/IPC-SysV/lib/IPC/Msg.pm
rename to cpan/IPC-SysV/lib/IPC/Msg.pm
diff --git a/ext/IPC-SysV/lib/IPC/Semaphore.pm 
b/cpan/IPC-SysV/lib/IPC/Semaphore.pm
similarity index 100%
rename from ext/IPC-SysV/lib/IPC/Semaphore.pm
rename to cpan/IPC-SysV/lib/IPC/Semaphore.pm
diff --git a/ext/IPC-SysV/lib/IPC/SharedMem.pm 
b/cpan/IPC-SysV/lib/IPC/SharedMem.pm
similarity index 100%
rename from ext/IPC-SysV/lib/IPC/SharedMem.pm
rename to cpan/IPC-SysV/lib/IPC/SharedMem.pm
diff --git a/ext/IPC-SysV/lib/IPC/SysV.pm b/cpan/IPC-SysV/lib/IPC/SysV.pm
similarity index 100%
rename from ext/IPC-SysV/lib/IPC/SysV.pm
rename to cpan/IPC-SysV/lib/IPC/SysV.pm
diff --git a/ext/IPC-SysV/regen.pl b/cpan/IPC-SysV/regen.pl
similarity index 100%
rename from ext/IPC-SysV/regen.pl
rename to cpan/IPC-SysV/regen.pl
diff --git a/ext/IPC-SysV/t/ipcsysv.t b/cpan/IPC-SysV/t/ipcsysv.t
similarity index 100%
rename from ext/IPC-SysV/t/ipcsysv.t
rename to cpan/IPC-SysV/t/ipcsysv.t
diff --git a/ext/IPC-SysV/t/msg.t b/cpan/IPC-SysV/t/msg.t
similarity index 100%
rename from ext/IPC-SysV/t/msg.t
rename to cpan/IPC-SysV/t/msg.t
diff --git a/ext/IPC-SysV/t/pod.t b/cpan/IPC-SysV/t/pod.t
similarity index 100%
rename from ext/IPC-SysV/t/pod.t
rename to cpan/IPC-SysV/t/pod.t
diff --git a/ext/IPC-SysV/t/podcov.t b/cpan/IPC-SysV/t/podcov.t
similarity index 100%
rename from ext/IPC-SysV/t/podcov.t
rename to cpan/IPC-SysV/t/podcov.t
diff --git a/ext/IPC-SysV/t/sem.t b/cpan/IPC-SysV/t/sem.t
similarity index 100%
rename from ext/IPC-SysV/t/sem.t
rename to cpan/IPC-SysV/t/sem.t
diff --git a/ext/IPC-SysV/t/shm.t b/cpan/IPC-SysV/t/shm.t
similarity index 100%
rename from ext/IPC-SysV/t/shm.t
rename to cpan/IPC-SysV/t/shm.t
diff --git a/ext/IPC-SysV/typemap b/cpan/IPC-SysV/typemap
similarity index 100%
rename from ext/IPC-SysV/typemap
rename to cpan/IPC-SysV/typemap
diff --git a/ext/Sys-Syslog/.gitignore b/cpan/Sys-Syslog/.gitignore
similarity index 100%
rename from ext/Sys-Syslog/.gitignore
rename to cpan/Sys-Syslog/.gitignore
diff --git a/ext/Sys-Syslog/Changes b/cpan/Sys-Syslog/Changes
similarity index 100%
rename from ext/Sys-Syslog/Changes
rename to cpan/Sys-Syslog/Changes
diff --git a/ext/Sys-Syslog/Makefile.PL b/cpan/Sys-Syslog/Makefile.PL
similarity index 100%
rename from ext/Sys-Syslog/Makefile.PL
rename to cpan/Sys-Syslog/Makefile.PL
diff --git a/ext/Sys-Syslog/README b/cpan/Sys-Syslog/README
similarity index 100%
rename from ext/Sys-Syslog/README
rename to cpan/Sys-Syslog/README
diff --git a/ext/Sys-Syslog/README.win32 b/cpan/Sys-Syslog/README.win32
similarity index 100%
rename from ext/Sys-Syslog/README.win32
rename to cpan/Sys-Syslog/README.win32
diff --git a/ext/Sys-Syslog/Syslog.pm b/cpan/Sys-Syslog/Syslog.pm
similarity index 100%
rename from ext/Sys-Syslog/Syslog.pm
rename to cpan/Sys-Syslog/Syslog.pm
diff --git a/ext/Sys-Syslog/Syslog.xs b/cpan/Sys-Syslog/Syslog.xs
similarity index 100%
rename from ext/Sys-Syslog/Syslog.xs
rename to cpan/Sys-Syslog/Syslog.xs
diff --git a/ext/Sys-Syslog/fallback/const-c.inc 
b/cpan/Sys-Syslog/fallback/const-c.inc
similarity index 100%
rename from ext/Sys-Syslog/fallback/const-c.inc
rename to cpan/Sys-Syslog/fallback/const-c.inc
diff --git a/ext/Sys-Syslog/fallback/const-xs.inc 
b/cpan/Sys-Syslog/fallback/const-xs.inc
similarity index 100%
rename from ext/Sys-Syslog/fallback/const-xs.inc
rename to cpan/Sys-Syslog/fallback/const-xs.inc
diff --git a/ext/Sys-Syslog/fallback/syslog.h 
b/cpan/Sys-Syslog/fallback/syslog.h
similarity index 100%
rename from ext/Sys-Syslog/fallback/syslog.h
rename to cpan/Sys-Syslog/fallback/syslog.h
diff --git a/ext/Sys-Syslog/t/00-load.t b/cpan/Sys-Syslog/t/00-load.t
similarity index 100%
rename from ext/Sys-Syslog/t/00-load.t
rename to cpan/Sys-Syslog/t/00-load.t
diff --git a/ext/Sys-Syslog/t/constants.t b/cpan/Sys-Syslog/t/constants.t
similarity index 100%
rename from ext/Sys-Syslog/t/constants.t
rename to cpan/Sys-Syslog/t/constants.t
diff --git a/ext/Sys-Syslog/t/syslog.t b/cpan/Sys-Syslog/t/syslog.t
similarity index 100%
rename from ext/Sys-Syslog/t/syslog.t
rename to cpan/Sys-Syslog/t/syslog.t
diff --git a/ext/Sys-Syslog/win32/PerlLog.mc b/cpan/Sys-Syslog/win32/PerlLog.mc
similarity index 100%
rename from ext/Sys-Syslog/win32/PerlLog.mc
rename to cpan/Sys-Syslog/win32/PerlLog.mc
diff --git a/ext/Sys-Syslog/win32/PerlLog_RES.uu 
b/cpan/Sys-Syslog/win32/PerlLog_RES.uu
similarity index 100%
rename from ext/Sys-Syslog/win32/PerlLog_RES.uu
rename to cpan/Sys-Syslog/win32/PerlLog_RES.uu
diff --git a/ext/Sys-Syslog/win32/PerlLog_dll.uu 
b/cpan/Sys-Syslog/win32/PerlLog_dll.uu
similarity index 100%
rename from ext/Sys-Syslog/win32/PerlLog_dll.uu
rename to cpan/Sys-Syslog/win32/PerlLog_dll.uu
diff --git a/ext/Sys-Syslog/win32/Win32.pm b/cpan/Sys-Syslog/win32/Win32.pm
similarity index 100%
rename from ext/Sys-Syslog/win32/Win32.pm
rename to cpan/Sys-Syslog/win32/Win32.pm
diff --git a/ext/Sys-Syslog/win32/compile.pl b/cpan/Sys-Syslog/win32/compile.pl
similarity index 100%
rename from ext/Sys-Syslog/win32/compile.pl
rename to cpan/Sys-Syslog/win32/compile.pl
diff --git a/make_ext.pl b/make_ext.pl
index 61945c4..0e0bc9b 100644
--- a/make_ext.pl
+++ b/make_ext.pl
@@ -19,6 +19,8 @@ my @toolchain = qw(ext/constant/lib ext/Cwd ext/Cwd/lib 
ext/ExtUtils-Command/lib
                   ext/ExtUtils-Manifest/lib ext/Text-ParseWords/lib
        ext/File-Path/lib ext/AutoLoader/lib);
 
+my @ext_dirs = qw(ext cpan);
+
 # This script acts as a simple interface for building extensions.
 
 # It's actually a cut and shut of the Unix version ext/utils/makeext and the
@@ -232,7 +234,16 @@ foreach my $spec (@extspec)  {
        # New style ext/Data-Dumper/
        my $copy = $spec;
        $copy =~ tr!/!-!;
-       $ext_pathname = "ext/$copy";
+       foreach my $dir (@ext_dirs) {
+           if (-d "$dir/$copy") {
+               $ext_pathname = "$dir/$copy";
+               last;
+           }
+       }
+       if (!defined $ext_pathname) {
+           warn "Can't find extension $spec in any of @ext_dirs";
+           next;
+       }
     }
 
     if ($Config{osname} eq 'catamount') {

--
Perl5 Master Repository

Reply via email to