This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
Remove some unnecessary Makefile.PLs from cpan/ and ext/
authorSteve Hay <steve.m.hay@googlemail.com>
Wed, 23 Oct 2013 09:32:25 +0000 (10:32 +0100)
committerSteve Hay <steve.m.hay@googlemail.com>
Fri, 25 Oct 2013 07:27:44 +0000 (08:27 +0100)
These modules all work with the default Makefile.PL written by make_ext.pl.

(There are more Makefile.PLs in dist/ that could be removed too, but the
general policy with dist/ is to leave such files in place to make it easier
to roll CPAN releases from the blead source, which is canonical.)

MANIFEST
cpan/IO-Compress/Makefile.PL [deleted file]
cpan/MIME-Base64/Makefile.PL [deleted file]
cpan/Math-Complex/Makefile.PL [deleted file]
cpan/Time-Piece/Makefile.PL [deleted file]
ext/Devel-Peek/Makefile.PL [deleted file]
make_ext.pl

index b919d6d..da75c5f 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -1198,7 +1198,6 @@ cpan/IO-Compress/lib/IO/Uncompress/Gunzip.pm              IO::Compress
 cpan/IO-Compress/lib/IO/Uncompress/Inflate.pm          IO::Compress
 cpan/IO-Compress/lib/IO/Uncompress/RawInflate.pm       IO::Compress
 cpan/IO-Compress/lib/IO/Uncompress/Unzip.pm            IO::Compress
-cpan/IO-Compress/Makefile.PL                           IO::Compress
 cpan/IO-Compress/private/MakeUtil.pm                   IO::Compress
 cpan/IO-Compress/t/000prereq.t                         IO::Compress
 cpan/IO-Compress/t/001bzip2.t                          IO::Compress
@@ -1511,7 +1510,6 @@ cpan/Locale-Maketext-Simple/t/po_without_i_default/en.po  Locale::Simple tests
 cpan/Locale-Maketext-Simple/t/po_without_i_default/fr.po       Locale::Simple tests
 cpan/Math-Complex/lib/Math/Complex.pm  A Complex package
 cpan/Math-Complex/lib/Math/Trig.pm     A simple interface to complex trigonometry
-cpan/Math-Complex/Makefile.PL          Math-Complex building
 cpan/Math-Complex/t/Complex.t          See if Math::Complex works
 cpan/Math-Complex/t/Trig.t             See if Math::Trig works
 cpan/Math-Complex/t/underbar.t         See if Math::Complex works
@@ -1544,7 +1542,6 @@ cpan/Memoize/t/tie.t                      Memoize tied file test
 cpan/Memoize/t/unmemoize.t             Memoize 'unmemoize' function test
 cpan/MIME-Base64/Base64.pm             MIME::Base64 extension
 cpan/MIME-Base64/Base64.xs             MIME::Base64 extension
-cpan/MIME-Base64/Makefile.PL           MIME::Base64 extension
 cpan/MIME-Base64/QuotedPrint.pm                MIME::Base64 extension
 cpan/MIME-Base64/t/base64.t            See whether MIME::Base64 works
 cpan/MIME-Base64/t/length.t    See whether MIME::QuotedPrint works
@@ -2488,7 +2485,6 @@ cpan/Time-HiRes/t/Watchdog.pm             Test for Time::HiRes
 cpan/Time-HiRes/typemap                        Time::HiRes extension
 cpan/Time-Local/lib/Time/Local.pm      Reverse translation of localtime, gmtime
 cpan/Time-Local/t/Local.t              See if Time::Local works
-cpan/Time-Piece/Makefile.PL    Time::Piece extension
 cpan/Time-Piece/Piece.pm       Time::Piece extension
 cpan/Time-Piece/Piece.xs       Time::Piece extension
 cpan/Time-Piece/Seconds.pm     Time::Piece extension
@@ -3522,7 +3518,6 @@ ext/B/t/walkoptree.t      See if B::walkoptree (and friends) work
 ext/B/t/xref.t         See if B::Xref works
 ext/B/typemap                  Compiler backend interface types
 ext/Devel-Peek/Changes         Data debugging tool, changelog
-ext/Devel-Peek/Makefile.PL     Data debugging tool, makefile writer
 ext/Devel-Peek/Peek.pm         Data debugging tool, module and pod
 ext/Devel-Peek/Peek.xs         Data debugging tool, externals
 ext/Devel-Peek/t/Peek.t                See if Devel::Peek works
diff --git a/cpan/IO-Compress/Makefile.PL b/cpan/IO-Compress/Makefile.PL
deleted file mode 100644 (file)
index c1d188d..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-#! perl -w
-
-use strict ;
-require 5.006 ;
-
-$::VERSION = '2.062' ;
-
-use private::MakeUtil;
-use ExtUtils::MakeMaker 5.16 ;
-
-UpDowngrade(getPerlFiles('MANIFEST'))
-    unless $ENV{PERL_CORE};
-
-WriteMakefile( 
-    NAME         => 'IO::Compress',
-    VERSION_FROM => 'lib/IO/Compress/Base.pm',
-    'dist'       => { COMPRESS     => 'gzip', 
-                      TARFLAGS     => '-chvf',
-                      SUFFIX       => 'gz',
-                      DIST_DEFAULT => 'MyTrebleCheck tardist',
-                    },
-
-    (
-      $ENV{SKIP_FOR_CORE}
-        ? ()
-           : (PREREQ_PM   => { 'Compress::Raw::Bzip2' => $::VERSION,
-                                   'Compress::Raw::Zlib'   => $::VERSION,
-                                   'Scalar::Util'  => 0,
-                                   $] >= 5.005 && $] < 5.006   
-                                ? ('File::BSDGlob' => 0) 
-                                : () }
-             )
-    ),
-       
-    (
-    $] >= 5.005
-        ? (ABSTRACT => 'IO Interface to compressed data files/buffers',
-            AUTHOR  => 'Paul Marquess <pmqs@cpan.org>')
-        : ()
-    ),
-
-    INSTALLDIRS => ($] >= 5.009 && $] < 5.011 ? 'perl' : 'site'),
-
-    EXE_FILES => ['bin/zipdetails'],
-    
-    (
-    $] >= 5.009 && $] <= 5.011001 && ! $ENV{PERL_CORE}
-        ? (INSTALLPRIVLIB    => '$(INSTALLARCHLIB)')
-        : ()
-    ),
-
-    META_MERGE => {
-        no_index => {
-            directory => [ 't', 'private' ],
-        },
-    },    
-
-    ((ExtUtils::MakeMaker->VERSION() gt '6.30') ?
-        ('LICENSE'  => 'perl')         : ()),    
-
-) ;
-
-# end of file Makefile.PL
-
diff --git a/cpan/MIME-Base64/Makefile.PL b/cpan/MIME-Base64/Makefile.PL
deleted file mode 100644 (file)
index 72a95bc..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-require 5.006;
-use ExtUtils::MakeMaker;
-
-my @makefileopts;
-if ($] >= 5.008 && $] < 5.012) {
-    push @makefileopts, INSTALLDIRS => 'perl';
-}
-
-WriteMakefile(
-    NAME        => 'MIME::Base64',
-    VERSION_FROM => 'Base64.pm',
-    @makefileopts,
-
-    ABSTRACT     => 'The RFC 2045 encodings; base64 and quoted-printable',
-    AUTHOR       => 'Gisle Aas <gisle@activestate.com>',
-    LICENSE      => 'perl',
-    MIN_PERL_VERSION => 5.006,
-    META_MERGE   => {
-        resources  => {
-            repository => 'http://github.com/gisle/mime-base64',
-        }
-    },
-);
-
-BEGIN {
-    # compatibility with older versions of MakeMaker
-    my $developer = -d ".git";
-    my %mm_req = (
-        LICENCE => 6.31,
-        META_MERGE => 6.45,
-        META_ADD => 6.45,
-        MIN_PERL_VERSION => 6.48,
-    );
-    undef(*WriteMakefile);
-    *WriteMakefile = sub {
-        my %arg = @_;
-        for (keys %mm_req) {
-            unless (eval { ExtUtils::MakeMaker->VERSION($mm_req{$_}) }) {
-                warn "$_ $@" if $developer;
-                delete $arg{$_};
-            }
-        }
-        ExtUtils::MakeMaker::WriteMakefile(%arg);
-    };
-}
diff --git a/cpan/Math-Complex/Makefile.PL b/cpan/Math-Complex/Makefile.PL
deleted file mode 100644 (file)
index da1311b..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-{ use 5.006; }
-
-use ExtUtils::MakeMaker;
-
-WriteMakefile(
-             NAME            => 'Math::Complex',
-             VERSION_FROM    => 'lib/Math/Complex.pm',
-             INSTALLDIRS     => 'perl',
-             PREREQ_PM       =>
-               {
-                   'Config'            => 0,
-                   'Exporter'          => 0,
-                   'ExtUtils::MakeMaker' => 0,
-                   'Scalar::Util'      => '1.11',
-                   'Test::More'        => 0,
-                   'overload'          => 0,
-                   'strict'            => 0,
-                   'warnings'          => 0,
-               },
-              ($ExtUtils::MakeMaker::VERSION >= 6.3002 ?
-              ('LICENSE'=> 'perl', ) : ()),
-            );
diff --git a/cpan/Time-Piece/Makefile.PL b/cpan/Time-Piece/Makefile.PL
deleted file mode 100644 (file)
index 4d6d6c3..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-use ExtUtils::MakeMaker;
-
-require 5.006;
-
-WriteMakefile(
-    'NAME'     => 'Time::Piece',
-    'VERSION_FROM' => 'Piece.pm', # finds $VERSION
-    'AUTHOR' => 'Matt Sergeant',
-    'ABSTRACT_FROM' => 'Piece.pm',
-    'INSTALLDIRS' => ( ($] >= 5.009005 and $] < 5.011) ? 'perl' : 'site'),
-    'PREREQ_PM' => { Exporter => '5.57' },
-     (eval { ExtUtils::MakeMaker->VERSION(6.21) } ? (LICENSE => 'perl') : ()),
-);
diff --git a/ext/Devel-Peek/Makefile.PL b/ext/Devel-Peek/Makefile.PL
deleted file mode 100644 (file)
index 41fab87..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-use ExtUtils::MakeMaker;
-WriteMakefile(
-       NAME            => "Devel::Peek",
-       VERSION_FROM    => 'Peek.pm',
-        XSPROTOARG      => '-noprototypes',
-       'dist'          => {
-                            COMPRESS   => 'gzip -9f',
-                            SUFFIX     => 'gz',
-                            DIST_DEFAULT => 'all tardist',
-                          },
-);
index 55fa5ae..a5ece30 100644 (file)
@@ -356,6 +356,7 @@ sub build_extension {
                my $leafname = "$leaf.pm";
                my $pathname = join '/', @dirs, $leafname;
                my @locations = ($leafname, $pathname, "lib/$pathname");
+               unshift @locations, 'lib/IO/Compress/Base.pm' if $mname eq 'IO::Compress';
                foreach (@locations) {
                    if (-f $_) {
                        $fromname = $_;