diff options
| author |   afresh1 <afresh1@openbsd.org> | 2014-03-24 14:58:42 +0000 |
|---|---|---|
| committer | afresh1 <afresh1@openbsd.org> | 2014-03-24 14:58:42 +0000 |
| commit | 91f110e064cd7c194e59e019b83bb7496c1c84d4 (patch) | |
| tree | 3e8e577405dba7e94b43cbf21c22f21aaa5ab949 /gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker | |
| parent | do not call purge_task every 10 secs, it is only needed once at startup and (diff) | |
| download | wireguard-openbsd-91f110e064cd7c194e59e019b83bb7496c1c84d4.tar.xz wireguard-openbsd-91f110e064cd7c194e59e019b83bb7496c1c84d4.zip | |
Import perl-5.18.2
OK espie@ sthen@ deraadt@
Diffstat (limited to 'gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker')
36 files changed, 228 insertions, 188 deletions
diff --git a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/MANIFEST b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/MANIFEST index fe47e55b181..72feb7d3b78 100644 --- a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/MANIFEST +++ b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/MANIFEST @@ -1,3 +1,4 @@ +.perlcriticrc bin/instmodsh bundled/CPAN-Meta-YAML/CPAN/Meta/YAML.pm bundled/CPAN-Meta/CPAN/Meta.pm @@ -60,7 +61,7 @@ lib/ExtUtils/MM_Win95.pm lib/ExtUtils/MY.pm lib/ExtUtils/testlib.pm Makefile.PL -MANIFEST This list of files +MANIFEST MANIFEST.SKIP my/bundles.pm NOTES @@ -68,6 +69,7 @@ PATCHING README README.packaging t/00compile.t +t/01perl_bugs.t t/arch_check.t t/backwards.t t/basic.t @@ -106,6 +108,7 @@ t/liblist/win32/__test.lib 't/liblist/win32/di r/dir_test.lib' t/liblist/win32/dir/dir_test.lib t/liblist/win32/double.lib +t/liblist/win32/imp.dll.a t/liblist/win32/lib/CORE/c_test.lib t/liblist/win32/lib/CORE/double.lib t/liblist/win32/lib__test.lib @@ -165,6 +168,3 @@ t/WriteEmptyMakefile.t t/writemakefile_args.t t/xs.t TODO -META.yml Module YAML meta-data (added by MakeMaker) -META.json Module JSON meta-data (added by MakeMaker) -SIGNATURE Public-key signature (added by MakeMaker) diff --git a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Command/MM.pm b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Command/MM.pm index 8d82ee49b12..add6b457ce6 100644 --- a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Command/MM.pm +++ b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Command/MM.pm @@ -10,7 +10,7 @@ our @ISA = qw(Exporter); our @EXPORT = qw(test_harness pod2man perllocal_install uninstall warn_if_old_packlist); -our $VERSION = '6.63_02'; +our $VERSION = '6.66'; my $Is_VMS = $^O eq 'VMS'; @@ -99,7 +99,7 @@ sub pod2man { if( !eval { require Pod::Man } ) { warn "Pod::Man is not available: $@". "Man pages will not be generated during this install.\n"; - return undef; + return 0; } } require Getopt::Long; diff --git a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm index a2ef4268d1d..3914e2f7e63 100644 --- a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm +++ b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm @@ -2,7 +2,7 @@ package ExtUtils::Liblist; use strict; -our $VERSION = '6.63_02'; +our $VERSION = '6.66'; use File::Spec; require ExtUtils::Liblist::Kid; diff --git a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm index eddcc72c749..f0a105cca28 100644 --- a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm +++ b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm @@ -11,7 +11,7 @@ use 5.006; use strict; use warnings; -our $VERSION = '6.63_02'; +our $VERSION = '6.66'; use ExtUtils::MakeMaker::Config; use Cwd 'cwd'; @@ -232,7 +232,7 @@ sub _unix_os2_ext { } last; # found one here so don't bother looking further } - warn "Note (probably harmless): " . "No library found for -l$thislib\n" + warn "Warning (mostly harmless): " . "No library found for -l$thislib\n" unless $found_lib > 0; } @@ -308,7 +308,7 @@ sub _win32_ext { my ( $fullname, $path ) = _win32_search_file( $thislib, $libext, \@paths, $verbose, $GC ); if ( !$fullname ) { - warn "Note (probably harmless): No library found for $thislib\n"; + warn "Warning (mostly harmless): No library found for $thislib\n"; next; } @@ -422,7 +422,8 @@ sub _win32_try_attach_extension { sub _win32_lib_extensions { my %extensions; $extensions{ $Config{'lib_ext'} } = 1 if $Config{'lib_ext'}; - $extensions{".lib"} = 1; + $extensions{".dll.a"} = 1 if $extensions{".a"}; + $extensions{".lib"} = 1; return [ keys %extensions ]; } @@ -559,11 +560,11 @@ sub _vms_ext { if ( $fullname =~ /(?:$so|exe)$/i ) { $type = 'SHR'; } elsif ( $fullname =~ /(?:$lib_ext|olb)$/i ) { $type = 'OLB'; } elsif ( $fullname =~ /(?:$obj_ext|obj)$/i ) { - warn "Note (probably harmless): " . "Plain object file $fullname found in library list\n"; + warn "Warning (mostly harmless): " . "Plain object file $fullname found in library list\n"; $type = 'OBJ'; } else { - warn "Note (probably harmless): " . "Unknown library type for $fullname; assuming shared\n"; + warn "Warning (mostly harmless): " . "Unknown library type for $fullname; assuming shared\n"; $type = 'SHR'; } } @@ -588,7 +589,7 @@ sub _vms_ext { ( -f ( $fullname = VMS::Filespec::rmsexpand( $name, $obj_ext ) ) or -f ( $fullname = VMS::Filespec::rmsexpand( $name, '.obj' ) ) ) ) { - warn "Note (probably harmless): " . "Plain object file $fullname found in library list\n"; + warn "Warning (mostly harmless): " . "Plain object file $fullname found in library list\n"; $type = 'OBJ'; $name = $fullname unless $fullname =~ /obj;?\d*$/i; } @@ -609,7 +610,7 @@ sub _vms_ext { next LIB; } } - warn "Note (probably harmless): " . "No library found for $lib\n"; + warn "Warning (mostly harmless): " . "No library found for $lib\n"; } push @fndlibs, @{ $found{OBJ} } if exists $found{OBJ}; diff --git a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm index 418eb190dd1..26ed5942707 100644 --- a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm +++ b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm @@ -3,7 +3,7 @@ package ExtUtils::MM; use strict; use ExtUtils::MakeMaker::Config; -our $VERSION = '6.63_02'; +our $VERSION = '6.66'; require ExtUtils::Liblist; require ExtUtils::MakeMaker; diff --git a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_AIX.pm b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_AIX.pm index 0b0547ff521..2fb79705888 100644 --- a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_AIX.pm +++ b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_AIX.pm @@ -1,7 +1,7 @@ package ExtUtils::MM_AIX; use strict; -our $VERSION = '6.63_02'; +our $VERSION = '6.66'; require ExtUtils::MM_Unix; our @ISA = qw(ExtUtils::MM_Unix); diff --git a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_BeOS.pm b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_BeOS.pm index a31cf2320c3..74d3105ca15 100644 --- a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_BeOS.pm +++ b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_BeOS.pm @@ -26,7 +26,7 @@ require ExtUtils::MM_Any; require ExtUtils::MM_Unix; our @ISA = qw( ExtUtils::MM_Any ExtUtils::MM_Unix ); -our $VERSION = '6.63_02'; +our $VERSION = '6.66'; =item os_flavor diff --git a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Cygwin.pm b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Cygwin.pm index de6f13085ee..643682e6119 100644 --- a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Cygwin.pm +++ b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Cygwin.pm @@ -9,7 +9,7 @@ require ExtUtils::MM_Unix; require ExtUtils::MM_Win32; our @ISA = qw( ExtUtils::MM_Unix ); -our $VERSION = '6.63_02'; +our $VERSION = '6.66'; =head1 NAME diff --git a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_DOS.pm b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_DOS.pm index d902038412b..4f0eca3ce8e 100644 --- a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_DOS.pm +++ b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_DOS.pm @@ -2,7 +2,7 @@ package ExtUtils::MM_DOS; use strict; -our $VERSION = '6.63_02'; +our $VERSION = '6.66'; require ExtUtils::MM_Any; require ExtUtils::MM_Unix; diff --git a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Darwin.pm b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Darwin.pm index 6d78157fe5f..96ec6fbc2c6 100644 --- a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Darwin.pm +++ b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Darwin.pm @@ -7,7 +7,7 @@ BEGIN { our @ISA = qw( ExtUtils::MM_Unix ); } -our $VERSION = '6.63_02'; +our $VERSION = '6.66'; =head1 NAME diff --git a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_MacOS.pm b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_MacOS.pm index 17bcde790e4..daba1166c3a 100644 --- a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_MacOS.pm +++ b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_MacOS.pm @@ -2,7 +2,7 @@ package ExtUtils::MM_MacOS; use strict; -our $VERSION = '6.63_02'; +our $VERSION = '6.66'; sub new { die <<'UNSUPPORTED'; diff --git a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_NW5.pm b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_NW5.pm index be1e1555576..94531a72e7a 100644 --- a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_NW5.pm +++ b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_NW5.pm @@ -22,7 +22,7 @@ use strict; use ExtUtils::MakeMaker::Config; use File::Basename; -our $VERSION = '6.63_02'; +our $VERSION = '6.66'; require ExtUtils::MM_Win32; our @ISA = qw(ExtUtils::MM_Win32); diff --git a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_OS2.pm b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_OS2.pm index f4ebd1e738e..55d6c448c08 100644 --- a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_OS2.pm +++ b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_OS2.pm @@ -5,7 +5,7 @@ use strict; use ExtUtils::MakeMaker qw(neatvalue); use File::Spec; -our $VERSION = '6.63_02'; +our $VERSION = '6.66'; require ExtUtils::MM_Any; require ExtUtils::MM_Unix; @@ -84,7 +84,7 @@ $self->{BASEEXT}.def: Makefile.PL system "emximp -o tmpimp$Config::Config{lib_ext} tmpimp.imp" and die "Cannot make import library: $!, \$?=$?"; # May be running under miniperl, so have no glob... - eval "unlink <tmp_imp/*>; 1" or system "rm tmp_imp/*"; + eval { unlink <tmp_imp/*>; 1 } or system "rm tmp_imp/*"; system "cd tmp_imp; $Config::Config{ar} x ../tmpimp$Config::Config{lib_ext}" and die "Cannot extract import objects: $!, \$?=$?"; } diff --git a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_QNX.pm b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_QNX.pm index 9d1f29223d0..16169399c89 100644 --- a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_QNX.pm +++ b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_QNX.pm @@ -1,7 +1,7 @@ package ExtUtils::MM_QNX; use strict; -our $VERSION = '6.63_02'; +our $VERSION = '6.66'; require ExtUtils::MM_Unix; our @ISA = qw(ExtUtils::MM_Unix); diff --git a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_UWIN.pm b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_UWIN.pm index d4b9370bd1a..7c28520f486 100644 --- a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_UWIN.pm +++ b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_UWIN.pm @@ -1,7 +1,7 @@ package ExtUtils::MM_UWIN; use strict; -our $VERSION = '6.63_02'; +our $VERSION = '6.66'; require ExtUtils::MM_Unix; our @ISA = qw(ExtUtils::MM_Unix); diff --git a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VMS.pm b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VMS.pm index c204abcb2d1..13a3b94b692 100644 --- a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VMS.pm +++ b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VMS.pm @@ -15,7 +15,7 @@ BEGIN { use File::Basename; -our $VERSION = '6.63_02'; +our $VERSION = '6.66'; require ExtUtils::MM_Any; require ExtUtils::MM_Unix; @@ -134,13 +134,13 @@ sub guess_name { last; } } - print STDOUT "Warning (non-fatal): Couldn't find package name in ${defpm}.pm;\n\t", + print "Warning (non-fatal): Couldn't find package name in ${defpm}.pm;\n\t", "defaulting package name to $defname\n" if eof($pm); close $pm; } else { - print STDOUT "Warning (non-fatal): Couldn't find ${defpm}.pm;\n\t", + print "Warning (non-fatal): Couldn't find ${defpm}.pm;\n\t", "defaulting package name to $defname\n"; } $defname =~ s#[\d.\-_]+$##; @@ -244,7 +244,7 @@ sub find_perl { return "MCR $vmsfile"; } } - print STDOUT "Unable to find a perl $ver (by these names: @$names, in these dirs: @$dirs)\n"; + print "Unable to find a perl $ver (by these names: @$names, in these dirs: @$dirs)\n"; 0; # false and not empty } @@ -507,34 +507,6 @@ CODE return; } - -=item init_others (override) - -Provide VMS-specific forms of various compile and link commands - -=cut - -sub init_others { - my $self = shift; - - # Must come first as we're modifying and deriving from the defaults. - $self->SUPER::init_others; - - if ($self->{OBJECT} =~ /\s/) { - $self->{OBJECT} =~ s/(\\)?\n+\s+/ /g; - $self->{OBJECT} = $self->wraplist( - map $self->fixpath($_,0), split /,?\s+/, $self->{OBJECT} - ); - } - - $self->{LDFROM} = $self->wraplist( - map $self->fixpath($_,0), split /,?\s+/, $self->{LDFROM} - ); - - return; -} - - =item init_platform (override) Add PERL_VMS, MM_VMS_REVISION and MM_VMS_VERSION. @@ -628,13 +600,31 @@ sub constants { # Fixup files for MMS macros # XXX is this list complete? for my $macro (qw/ - FULLEXT VERSION_FROM OBJECT LDFROM + FULLEXT VERSION_FROM / ) { next unless defined $self->{$macro}; $self->{$macro} = $self->fixpath($self->{$macro},0); } + for my $macro (qw/ + OBJECT LDFROM + / ) { + next unless defined $self->{$macro}; + + # Must expand macros before splitting on unescaped whitespace. + $self->{$macro} = $self->eliminate_macros($self->{$macro}); + if ($self->{$macro} =~ /(?<!\^)\s/) { + $self->{$macro} =~ s/(\\)?\n+\s+/ /g; + $self->{$macro} = $self->wraplist( + map $self->fixpath($_,0), split /,?(?<!\^)\s+/, $self->{$macro} + ); + } + else { + $self->{$macro} = $self->fixpath($self->{$macro},0); + } + } + for my $macro (qw/ XS MAN1PODS MAN3PODS PM /) { # Where is the space coming from? --jhi next unless $self ne " " && defined $self->{$macro}; @@ -697,7 +687,7 @@ sub cflags { my($name,$sys,@m); ( $name = $self->{NAME} . "_cflags" ) =~ s/:/_/g ; - print STDOUT "Unix shell script ".$Config{"$self->{'BASEEXT'}_cflags"}. + print "Unix shell script ".$Config{"$self->{'BASEEXT'}_cflags"}. " required to modify CC command for $self->{'BASEEXT'}\n" if ($Config{$name}); @@ -1298,23 +1288,12 @@ sub perldepend { my($self) = @_; my(@m); - push @m, ' -$(OBJECT) : $(PERL_INC)EXTERN.h, $(PERL_INC)INTERN.h, $(PERL_INC)XSUB.h -$(OBJECT) : $(PERL_INC)av.h, $(PERL_INC)config.h -$(OBJECT) : $(PERL_INC)cop.h, $(PERL_INC)cv.h, $(PERL_INC)embed.h -$(OBJECT) : $(PERL_INC)embedvar.h, $(PERL_INC)form.h -$(OBJECT) : $(PERL_INC)gv.h, $(PERL_INC)handy.h, $(PERL_INC)hv.h -$(OBJECT) : $(PERL_INC)intrpvar.h, $(PERL_INC)iperlsys.h, $(PERL_INC)keywords.h -$(OBJECT) : $(PERL_INC)mg.h, $(PERL_INC)nostdio.h, $(PERL_INC)op.h -$(OBJECT) : $(PERL_INC)opcode.h, $(PERL_INC)patchlevel.h -$(OBJECT) : $(PERL_INC)perl.h, $(PERL_INC)perlio.h -$(OBJECT) : $(PERL_INC)perlsdio.h, $(PERL_INC)perlvars.h -$(OBJECT) : $(PERL_INC)perly.h, $(PERL_INC)pp.h, $(PERL_INC)pp_proto.h -$(OBJECT) : $(PERL_INC)proto.h, $(PERL_INC)regcomp.h, $(PERL_INC)regexp.h -$(OBJECT) : $(PERL_INC)regnodes.h, $(PERL_INC)scope.h, $(PERL_INC)sv.h -$(OBJECT) : $(PERL_INC)thread.h, $(PERL_INC)util.h, $(PERL_INC)vmsish.h - -' if $self->{OBJECT}; + if ($self->{OBJECT}) { + # Need to add an object file dependency on the perl headers. + # this is very important for XS modules in perl.git development. + + push @m, $self->_perl_header_files_fragment(""); # empty separator on VMS as its in the $(PERL_INC) + } if ($self->{PERL_SRC}) { my(@macros); @@ -1513,7 +1492,7 @@ $(MAP_TARGET) :: $(MAKE_APERL_FILE) push @optlibs, grep { !/PerlShr/i } split ' ', +($self->ext())[2]; if ($libperl) { unless (-f $libperl || -f ($libperl = $self->catfile($Config{'installarchlib'},'CORE',$libperl))) { - print STDOUT "Warning: $libperl not found\n"; + print "Warning: $libperl not found\n"; undef $libperl; } } @@ -1522,7 +1501,7 @@ $(MAP_TARGET) :: $(MAKE_APERL_FILE) $libperl = $self->catfile($self->{PERL_SRC},"libperl$self->{LIB_EXT}"); } elsif (-f ($libperl = $self->catfile($Config{'installarchlib'},'CORE',"libperl$self->{LIB_EXT}")) ) { } else { - print STDOUT "Warning: $libperl not found + print "Warning: $libperl not found If you're going to build a static perl binary, make sure perl is installed otherwise ignore this warning\n"; } @@ -1651,23 +1630,23 @@ sub prefixify { $Config{lc $var} || $Config{lc $var_no_install}; if( !$path ) { - print STDERR " no Config found for $var.\n" if $Verbose >= 2; + warn " no Config found for $var.\n" if $Verbose >= 2; $path = $self->_prefixify_default($rprefix, $default); } elsif( !$self->{ARGS}{PREFIX} || !$self->file_name_is_absolute($path) ) { # do nothing if there's no prefix or if its relative } elsif( $sprefix eq $rprefix ) { - print STDERR " no new prefix.\n" if $Verbose >= 2; + warn " no new prefix.\n" if $Verbose >= 2; } else { - print STDERR " prefixify $var => $path\n" if $Verbose >= 2; - print STDERR " from $sprefix to $rprefix\n" if $Verbose >= 2; + warn " prefixify $var => $path\n" if $Verbose >= 2; + warn " from $sprefix to $rprefix\n" if $Verbose >= 2; my($path_vol, $path_dirs) = $self->splitpath( $path ); if( $path_vol eq $Config{vms_prefix}.':' ) { - print STDERR " $Config{vms_prefix}: seen\n" if $Verbose >= 2; + warn " $Config{vms_prefix}: seen\n" if $Verbose >= 2; $path_dirs =~ s{^\[}{\[.} unless $path_dirs =~ m{^\[\.}; $path = $self->_catprefix($rprefix, $path_dirs); @@ -1685,14 +1664,14 @@ sub prefixify { sub _prefixify_default { my($self, $rprefix, $default) = @_; - print STDERR " cannot prefix, using default.\n" if $Verbose >= 2; + warn " cannot prefix, using default.\n" if $Verbose >= 2; if( !$default ) { - print STDERR "No default!\n" if $Verbose >= 1; + warn "No default!\n" if $Verbose >= 1; return; } if( !$rprefix ) { - print STDERR "No replacement prefix!\n" if $Verbose >= 1; + warn "No replacement prefix!\n" if $Verbose >= 1; return ''; } diff --git a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VOS.pm b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VOS.pm index cdc6659b7f5..feeca59728b 100644 --- a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VOS.pm +++ b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VOS.pm @@ -1,7 +1,7 @@ package ExtUtils::MM_VOS; use strict; -our $VERSION = '6.63_02'; +our $VERSION = '6.66'; require ExtUtils::MM_Unix; our @ISA = qw(ExtUtils::MM_Unix); diff --git a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win32.pm b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win32.pm index 43ae9a4dd5f..34499d30b1a 100644 --- a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win32.pm +++ b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win32.pm @@ -27,7 +27,7 @@ use ExtUtils::MakeMaker qw( neatvalue ); require ExtUtils::MM_Any; require ExtUtils::MM_Unix; our @ISA = qw( ExtUtils::MM_Any ExtUtils::MM_Unix ); -our $VERSION = '6.63_02'; +our $VERSION = '6.66'; $ENV{EMXSHELL} = 'sh'; # to run `commands` diff --git a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win95.pm b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win95.pm index 694655c1baf..9b3b3b85ba8 100644 --- a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win95.pm +++ b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win95.pm @@ -2,7 +2,7 @@ package ExtUtils::MM_Win95; use strict; -our $VERSION = '6.63_02'; +our $VERSION = '6.66'; require ExtUtils::MM_Win32; our @ISA = qw(ExtUtils::MM_Win32); diff --git a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MY.pm b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MY.pm index 92d4da0a4b9..2f01658a545 100644 --- a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MY.pm +++ b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MY.pm @@ -3,7 +3,7 @@ package ExtUtils::MY; use strict; require ExtUtils::MM; -our $VERSION = '6.63_02'; +our $VERSION = '6.66'; our @ISA = qw(ExtUtils::MM); { diff --git a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Config.pm b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Config.pm index 872f8c181cf..6f5e541b810 100644 --- a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Config.pm +++ b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Config.pm @@ -2,7 +2,7 @@ package ExtUtils::MakeMaker::Config; use strict; -our $VERSION = '6.63_02'; +our $VERSION = '6.66'; use Config (); diff --git a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Tutorial.pod b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Tutorial.pod index 5120271979f..a3352477b0f 100644 --- a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Tutorial.pod +++ b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Tutorial.pod @@ -1,6 +1,6 @@ package ExtUtils::MakeMaker::Tutorial; -our $VERSION = 6.63_02; +our $VERSION = '6.66'; =head1 NAME @@ -19,7 +19,7 @@ ExtUtils::MakeMaker::Tutorial - Writing a module with MakeMaker =head1 DESCRIPTION This is a short tutorial on writing a simple module with MakeMaker. -Its really not that hard. +It's really not that hard. =head2 The Mantra @@ -95,8 +95,8 @@ See L<ExtUtils::Manifest> for more details. =item lib/ -This is the directory where your .pm and .pod files you wish to have -installed go. They are layed out according to namespace. So Foo::Bar +This is the directory where the .pm and .pod files you wish to have +installed go. They are laid out according to namespace. So Foo::Bar is F<lib/Foo/Bar.pm>. diff --git a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mkbootstrap.pm b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mkbootstrap.pm index b5f19ea95ce..f71655d6355 100644 --- a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mkbootstrap.pm +++ b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mkbootstrap.pm @@ -3,7 +3,7 @@ package ExtUtils::Mkbootstrap; # There's just too much Dynaloader incest here to turn on strict vars. use strict 'refs'; -our $VERSION = '6.63_02'; +our $VERSION = '6.66'; require Exporter; our @ISA = ('Exporter'); @@ -18,7 +18,7 @@ sub Mkbootstrap { my($baseext, @bsloadlibs)=@_; @bsloadlibs = grep($_, @bsloadlibs); # strip empty libs - print STDOUT " bsloadlibs=@bsloadlibs\n" if $Verbose; + print " bsloadlibs=@bsloadlibs\n" if $Verbose; # We need DynaLoader here because we and/or the *_BS file may # call dl_findfile(). We don't say `use' here because when @@ -50,8 +50,8 @@ sub Mkbootstrap { if (@all){ open my $bs, ">", "$baseext.bs" or die "Unable to open $baseext.bs: $!"; - print STDOUT "Writing $baseext.bs\n"; - print STDOUT " containing: @all" if $Verbose; + print "Writing $baseext.bs\n"; + print " containing: @all" if $Verbose; print $bs "# $baseext DynaLoader bootstrap file for $^O architecture.\n"; print $bs "# Do not edit this file, changes will be lost.\n"; print $bs "# This file was automatically generated by the\n"; diff --git a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mksymlists.pm b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mksymlists.pm index f0860855923..a99d19840a4 100644 --- a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mksymlists.pm +++ b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mksymlists.pm @@ -10,7 +10,7 @@ use Config; our @ISA = qw(Exporter); our @EXPORT = qw(&Mksymlists); -our $VERSION = '6.63_02'; +our $VERSION = '6.66'; sub Mksymlists { my(%spec) = @_; @@ -27,7 +27,7 @@ sub Mksymlists { unless ( ($spec{DL_FUNCS} and keys %{$spec{DL_FUNCS}}) or @{$spec{FUNCLIST}}); if (defined $spec{DL_FUNCS}) { - foreach my $package (keys %{$spec{DL_FUNCS}}) { + foreach my $package (sort keys %{$spec{DL_FUNCS}}) { my($packprefix,$bootseen); ($packprefix = $package) =~ s/\W/_/g; foreach my $sym (@{$spec{DL_FUNCS}->{$package}}) { @@ -106,14 +106,20 @@ sub _write_os2 { print $def "EXPORTS\n "; print $def join("\n ",@{$data->{DL_VARS}}, "\n") if @{$data->{DL_VARS}}; print $def join("\n ",@{$data->{FUNCLIST}}, "\n") if @{$data->{FUNCLIST}}; - if (%{$data->{IMPORTS}}) { + _print_imports($def, $data); + close $def; +} + +sub _print_imports { + my ($def, $data)= @_; + my $imports= $data->{IMPORTS} + or return; + if ( keys %$imports ) { print $def "IMPORTS\n"; - my ($name, $exp); - while (($name, $exp)= each %{$data->{IMPORTS}}) { - print $def " $name=$exp\n"; + foreach my $name (sort keys %$imports) { + print $def " $name=$imports->{$name}\n"; } } - close $def; } sub _write_win32 { @@ -150,13 +156,7 @@ sub _write_win32 { } } print $def join("\n ",@syms, "\n") if @syms; - if (%{$data->{IMPORTS}}) { - print $def "IMPORTS\n"; - my ($name, $exp); - while (($name, $exp)= each %{$data->{IMPORTS}}) { - print $def " $name=$exp\n"; - } - } + _print_imports($def, $data); close $def; } @@ -212,10 +212,10 @@ ExtUtils::Mksymlists - write linker options files for dynamic extension =head1 SYNOPSIS use ExtUtils::Mksymlists; - Mksymlists({ NAME => $name , + Mksymlists( NAME => $name , DL_VARS => [ $var1, $var2, $var3 ], DL_FUNCS => { $pkg1 => [ $func1, $func2 ], - $pkg2 => [ $func3 ] }); + $pkg2 => [ $func3 ] ); =head1 DESCRIPTION @@ -281,9 +281,9 @@ generation of the bootstrap function for the package. To still create the bootstrap name you have to specify the package name in the DL_FUNCS hash: - Mksymlists({ NAME => $name , + Mksymlists( NAME => $name , FUNCLIST => [ $func1, $func2 ], - DL_FUNCS => { $pkg => [] } }); + DL_FUNCS => { $pkg => [] } ); =item IMPORTS diff --git a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/testlib.pm b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/testlib.pm index 44832ee3531..b5a51bf3fb1 100644 --- a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/testlib.pm +++ b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/lib/ExtUtils/testlib.pm @@ -3,7 +3,7 @@ package ExtUtils::testlib; use strict; use warnings; -our $VERSION = '6.63_02'; +our $VERSION = '6.66'; use Cwd; use File::Spec; diff --git a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/t/01perl_bugs.t b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/t/01perl_bugs.t new file mode 100644 index 00000000000..618dc092784 --- /dev/null +++ b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/t/01perl_bugs.t @@ -0,0 +1,25 @@ +#!/usr/bin/env perl -w + +# Inform the user early and clearly that their Perl is broken beyond redemption + +use strict; +use warnings; + +use lib 't/lib'; + +use Test::More; + +note "The 0.01 / Gconvert bug"; { + my $number = 0.01; + my $string = "VERSION=$number"; + + is "VERSION=$number", "VERSION=0.01" or do { + diag <<END; +Sorry, but your perl's ability to translate decimal numbers to strings +is broken. You should probably recompile it with -Dd_Gconvert=sprintf +or upgrade to a newer version of Perl. +END + }; +} + +done_testing; diff --git a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/t/FIRST_MAKEFILE.t b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/t/FIRST_MAKEFILE.t index 6de5a73e947..71f65f8bd50 100755 --- a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/t/FIRST_MAKEFILE.t +++ b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/t/FIRST_MAKEFILE.t @@ -31,4 +31,4 @@ cmp_ok( $?, '==', 0, 'Makefile.PL exited with zero' ) || diag @mpl_out; ok( -e 'jakefile', 'FIRST_MAKEFILE honored' ); ok( grep(/^Writing jakefile(?:\.)? for Big::Dummy/, @mpl_out) == 1, - 'Makefile.PL output looks right' ); + 'Makefile.PL output looks right' ); diff --git a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/t/Liblist.t b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/t/Liblist.t index 7161fd373b5..37d10a1c6e7 100755 --- a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/t/Liblist.t +++ b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/t/Liblist.t @@ -24,5 +24,5 @@ ok( defined &ExtUtils::Liblist::ext, unlike( $out[2], qr/-ln0tt43r3_perl/, 'bogus library not added' ); ok( @warn, 'had warning'); - is( grep(/\QNote (probably harmless): No library found for \E(-l)?n0tt43r3_perl/, map { @$_ } @warn), 1 ) || diag join "\n", @warn; + is( grep(/\QWarning (mostly harmless): No library found for \E(-l)?n0tt43r3_perl/, map { @$_ } @warn), 1 ) || diag join "\n", @warn; } diff --git a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/t/MM_OS2.t b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/t/MM_OS2.t index 4d88e85f28c..08d0e1abab2 100755 --- a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/t/MM_OS2.t +++ b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/t/MM_OS2.t @@ -42,7 +42,7 @@ delete $mm->{SKIPHASH}; my $res = $mm->dlsyms(); like( $res, qr/baseext\.def: Makefile/, '... without flag, should return make targets' ); -like( $res, qr/"DL_FUNCS" => { }/, +like( $res, qr/"DL_FUNCS" => \{ \}/, '... should provide empty hash refs where necessary' ); like( $res, qr/"DL_VARS" => \[]/, '... and empty array refs too' ); diff --git a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/t/MM_Win32.t b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/t/MM_Win32.t index 4bc030d9021..6d4bf8d2885 100755 --- a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/t/MM_Win32.t +++ b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/t/MM_Win32.t @@ -272,12 +272,6 @@ unlink "${script_name}$script_ext" if -f "${script_name}$script_ext"; # dist_ci() should look into that # dist_core() should look into that -# pasthru() -{ - my $pastru = "PASTHRU = " . ($Config{make} =~ /^nmake/i ? "-nologo" : ""); - is( $MM->pasthru(), $pastru, 'pasthru()' ); -} - # _identify_compiler_environment() { sub _run_cc_id { diff --git a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/t/basic.t b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/t/basic.t index fb374c0c9b8..1410465a9f4 100755 --- a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/t/basic.t +++ b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/t/basic.t @@ -412,8 +412,5 @@ close SAVERR; sub _normalize { my $hash = shift; - while(my($k,$v) = each %$hash) { - delete $hash->{$k}; - $hash->{lc $k} = $v; - } + %$hash= map { lc($_) => $hash->{$_} } keys %$hash; } diff --git a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/t/hints.t b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/t/hints.t index ab9d9553f7e..19bee553cd1 100755 --- a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/t/hints.t +++ b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/t/hints.t @@ -1,8 +1,9 @@ #!/usr/bin/perl -w -BEGIN { - unshift @INC, 't/lib/'; -} +use strict; +use warnings; + +use lib 't/lib'; chdir 't'; use File::Spec; @@ -13,36 +14,55 @@ use Test::More tests => 3; my $curdir = File::Spec->curdir; @INC = grep { $_ ne $curdir && $_ ne '.' } @INC; +use ExtUtils::MakeMaker; + +# Make a hints directory for testing mkdir('hints', 0777); (my $os = $^O) =~ s/\./_/g; -my $hint_file = File::Spec->catfile('hints', "$os.pl"); +my $Hint_File = File::Spec->catfile('hints', "$os.pl"); -open(HINT, ">$hint_file") || die "Can't write dummy hints file $hint_file: $!"; -print HINT <<'CLOO'; + +my $mm = bless {}, 'ExtUtils::MakeMaker'; + +# Write a hints file for testing +{ + open my $hint_fh, ">", $Hint_File || die "Can't write dummy hints file $Hint_File: $!"; + print $hint_fh <<'CLOO'; $self->{CCFLAGS} = 'basset hounds got long ears'; CLOO -close HINT; +} -use TieOut; -use ExtUtils::MakeMaker; +# Test our hint file is detected +{ + my $stderr = ''; + local $SIG{__WARN__} = sub { $stderr .= join '', @_ }; + + $mm->check_hints; + is( $mm->{CCFLAGS}, 'basset hounds got long ears' ); + is( $stderr, "Processing hints file $Hint_File\n" ); +} -my $out = tie *STDERR, 'TieOut'; -my $mm = bless {}, 'ExtUtils::MakeMaker'; -$mm->check_hints; -is( $mm->{CCFLAGS}, 'basset hounds got long ears' ); -is( $out->read, "Processing hints file $hint_file\n" ); -open(HINT, ">$hint_file") || die "Can't write dummy hints file $hint_file: $!"; -print HINT <<'CLOO'; +# Test a hint file which dies +{ + open my $hint_fh, ">", $Hint_File || die "Can't write dummy hints file $Hint_File: $!"; + print $hint_fh <<'CLOO'; die "Argh!\n"; CLOO -close HINT; +} + -$mm->check_hints; -is( $out->read, <<OUT, 'hint files produce errors' ); -Processing hints file $hint_file +# Test the hint file which produces errors +{ + my $stderr = ''; + local $SIG{__WARN__} = sub { $stderr .= join '', @_ }; + + $mm->check_hints; + is( $stderr, <<OUT, 'hint files produce errors' ); +Processing hints file $Hint_File Argh! OUT +} END { use File::Path; diff --git a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/t/metafile_data.t b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/t/metafile_data.t index 4c8fa76231b..1fb8d10b9dc 100755 --- a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/t/metafile_data.t +++ b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/t/metafile_data.t @@ -3,7 +3,7 @@ BEGIN { } use strict; -use Test::More tests => 19; +use Test::More tests => 22; use Data::Dumper; use File::Temp; @@ -402,29 +402,37 @@ my $new_mm = sub { version => '6.57_07', abstract => 'Create a module Makefile', author => ['Michael G Schwern <schwern@pobox.com>'], - license => 'perl', + license => ['perl_5'], dynamic_config => 0, - requires => { - "DirHandle" => 0, - "File::Basename" => 0, - "File::Spec" => "0.8", - "Pod::Man" => 0, - "perl" => "5.006" - }, - - configure_requires => { - }, - build_requires => { - 'Fake::Module1' => 1.01, + prereqs => { + runtime => { + requires => { + "DirHandle" => 0, + "File::Basename" => 0, + "File::Spec" => "0.8", + "Pod::Man" => 0, + "perl" => "5.006", + }, + }, + configure => { + requires => { + }, + }, + build => { + requires => { + 'Fake::Module1' => 1.01, + }, + }, }, + release_status => 'testing', resources => { - license => 'http://dev.perl.org/licenses/', - homepage => 'http://makemaker.org', - bugtracker => 'http://rt.cpan.org/NoAuth/Bugs.html?Dist=ExtUtils-MakeMaker', - repository => 'http://github.com/Perl-Toolchain-Gang/ExtUtils-MakeMaker', - x_MailingList => 'makemaker@perl.org', + license => [ 'http://dev.perl.org/licenses/' ], + homepage => 'http://makemaker.org', + bugtracker => { web => 'http://rt.cpan.org/NoAuth/Bugs.html?Dist=ExtUtils-MakeMaker' }, + repository => { url => 'http://github.com/Perl-Toolchain-Gang/ExtUtils-MakeMaker' }, + x_MailingList => 'makemaker@perl.org', }, no_index => { @@ -434,8 +442,8 @@ my $new_mm = sub { generated_by => "ExtUtils::MakeMaker version 6.5707, CPAN::Meta::Converter version 2.110580", 'meta-spec' => { - url => 'http://module-build.sourceforge.net/META-spec-v1.4.html', - version => 1.4 + url => 'http://search.cpan.org/perldoc?CPAN::Meta::Spec', + version => 2, }, }; @@ -448,6 +456,28 @@ my $new_mm = sub { 'MYMETA YAML data (BUILD_REQUIRES wins)'; } +{ + my $mm = $new_mm->( + DISTNAME => 'Foo-Bar', + VERSION => 1.23, + BUILD_REQUIRES => { "Fake::Module1" => 1.01 }, + TEST_REQUIRES => { "Fake::Module2" => 1.23 }, + ); + + my $meta = $mm->mymeta('t/META_for_testing.json'); + is($meta->{build_requires}, undef, "no build_requires in v2 META"); + is_deeply( + $meta->{prereqs}{build}{requires}, + { "Fake::Module1" => 1.01 }, + "build requires are one thing in META v2...", + ); + + is_deeply( + $meta->{prereqs}{test}{requires}, + { "Fake::Module2" => 1.23 }, + "...and test requires are another", + ); +} note "CPAN::Meta bug using the module version instead of the meta spec version"; { my $mm = $new_mm->( @@ -462,7 +492,7 @@ note "CPAN::Meta bug using the module version instead of the meta spec version"; ); my $meta = $mm->mymeta("t/META_for_testing_tricky_version.yml"); - is $meta->{'meta-spec'}{version}, 1.4; + is $meta->{'meta-spec'}{version}, 2, "internally, our MYMETA struct is v2"; in_dir { $mm->write_mymeta($meta); @@ -475,7 +505,6 @@ note "CPAN::Meta bug using the module version instead of the meta spec version"; my $meta_json = Parse::CPAN::Meta->load_file("MYMETA.json"); cmp_ok $meta_json->{'meta-spec'}{version}, ">=", 2, "MYMETA.json at 2 or better"; }; - } diff --git a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/t/parse_abstract.t b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/t/parse_abstract.t index 03e56c932e4..5ced676a5e0 100644 --- a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/t/parse_abstract.t +++ b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/t/parse_abstract.t @@ -3,8 +3,9 @@ use strict; use warnings; +use lib 't/lib'; use ExtUtils::MakeMaker; - +use File::Temp qw[tempfile]; use Test::More 'no_plan'; sub test_abstract { @@ -12,12 +13,9 @@ sub test_abstract { local $Test::Builder::Level = $Test::Builder::Level + 1; - my $file = "t/abstract.tmp"; - { - open my $fh, ">", $file or die "Can't open $file"; - print $fh $code; - close $fh; - } + my ($fh,$file) = tempfile( DIR => 't', UNLINK => 1 ); + print $fh $code; + close $fh; # Hack up a minimal MakeMaker object. my $mm = bless { DISTNAME => $package }, "MM"; @@ -25,9 +23,6 @@ sub test_abstract { my $ok = is( $have, $want, $name ); - # Clean up the temp file, VMS style - 1 while unlink $file; - return $ok; } diff --git a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/t/pod2man.t b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/t/pod2man.t index 1632234b15f..d206e0bc956 100755 --- a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/t/pod2man.t +++ b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/t/pod2man.t @@ -38,7 +38,7 @@ use Test::More tests => 3; $warnings .= join '', @_; }; - is pod2man(), undef; + ok !pod2man(); is $warnings, <<'END' Pod::Man is not available: Simulated Pod::Man failure Man pages will not be generated during this install. diff --git a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/t/xs.t b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/t/xs.t index efd682edfd3..5cb17c2fedf 100755 --- a/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/t/xs.t +++ b/gnu/usr.bin/perl/cpan/ExtUtils-MakeMaker/t/xs.t @@ -53,6 +53,6 @@ my $make_out = run("$make"); is( $?, 0, ' make exited normally' ) || diag $make_out; -my $test_out = run("$make"); +my $test_out = run("$make test"); is( $?, 0, ' make test exited normally' ) || diag $test_out; |