In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/f689ad3712ab49cc145f08ba0540043ee9ce5cdc?hp=7e9deda3926b2444b9d169a6fcbb8dd4444c9b56>
- Log ----------------------------------------------------------------- commit f689ad3712ab49cc145f08ba0540043ee9ce5cdc Author: David Mitchell <[email protected]> Date: Wed Dec 3 16:55:46 2014 +0000 special-case Pod::Checker ABSTRACT Currently the auto-generated Makefile.PL for Pod::Checker raises a warning with MakeMaker, since the abstract in the pod isn't parseable. Also, the package's own Makefile.PL doesn't work with blead (I didn't exactly understand what the issue was, but porting/dual_lift.t complained about missing utilities). So the most expedient hack is to special-case the ABSTRACT in make_ext.pl. M make_ext.pl commit 95a2e48fd5a4c8e221149d1c1de129f30eaeadce Author: David Mitchell <[email protected]> Date: Wed Dec 3 15:49:15 2014 +0000 reinstate cpan/IO-Compress/Makefile.PL This was removed a year ago, but it causes problems with ABSTACT and ABSTACT_FROM; since there isn't an IO/Compress.pm file. make_ext.pl special-cases Makefile.PL to get the abstract from IO/Compress/Base.pm; but MakeMaker looks for, and fails to find, 'IO::Compress - ...' in the pod for that file,and prints an error. Rather than more special-casing, it's easier to just restore the distribution's Makefile.PL, which already contains the correct 'ABSTRACT => ...' entry. M MANIFEST A cpan/IO-Compress/Makefile.PL M make_ext.pl ----------------------------------------------------------------------- Summary of changes: MANIFEST | 1 + cpan/IO-Compress/Makefile.PL | 64 ++++++++++++++++++++++++++++++++++++++++++++ make_ext.pl | 12 ++++++++- 3 files changed, 76 insertions(+), 1 deletion(-) create mode 100644 cpan/IO-Compress/Makefile.PL diff --git a/MANIFEST b/MANIFEST index 14228ba..4775d8e 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1231,6 +1231,7 @@ 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 diff --git a/cpan/IO-Compress/Makefile.PL b/cpan/IO-Compress/Makefile.PL new file mode 100644 index 0000000..9b90c37 --- /dev/null +++ b/cpan/IO-Compress/Makefile.PL @@ -0,0 +1,64 @@ +#! perl -w + +use strict ; +require 5.006 ; + +$::VERSION = '2.066' ; + +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 <[email protected]>') + : () + ), + + 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/make_ext.pl b/make_ext.pl index e900874..12926f8 100644 --- a/make_ext.pl +++ b/make_ext.pl @@ -368,7 +368,6 @@ 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 = $_; @@ -382,6 +381,17 @@ sub build_extension { ($value = $fromname) =~ s/\.pm\z/.pod/; $value = $fromname unless -e $value; } + + if ($mname eq 'Pod::Checker') { + # the abstract in the .pm file is unparseable by MM, + # so special-case it. We can't use the package's own + # Makefile.PL, as it doesn't handle the executable scripts + # right. + $key = 'ABSTRACT'; + # this is copied from the CPAN Makefile.PL v 1.171 + $value = 'Pod::Checker verifies POD documentation contents for compliance with the POD format specifications'; + } + open my $fh, '>', 'Makefile.PL' or die "Can't open Makefile.PL for writing: $!"; printf $fh <<'EOM', $0, $mname, $fromname, $key, $value; -- Perl5 Master Repository
