diff options
| author | Chris 'BinGOs' Williams <chris@bingosnet.co.uk> | 2013-06-15 00:07:26 +0100 |
|---|---|---|
| committer | Chris 'BinGOs' Williams <chris@bingosnet.co.uk> | 2013-06-15 00:07:26 +0100 |
| commit | 673553d05ec39a298e6406e9e5dfb51b075148e0 (patch) | |
| tree | 7487f959ccfd97b211ef964d168b05dbfaf62207 /cpan/ExtUtils-MakeMaker/lib | |
| parent | 3602d7b64bbbd934b60d02b4a3eb79d9a1daa79f (diff) | |
| download | perl-673553d05ec39a298e6406e9e5dfb51b075148e0.tar.gz | |
Update ExtUtils-MakeMaker to CPAN version 6.68
[DELTA]
6.68 Fri Jun 14 23:26:11 BST 2013
No changes from 6.67_05
6.67_05 Thu Jun 13 21:52:46 BST 2013
Doc fixes:
* RT#86007 - Restore meaning for divorced sentence
6.67_04 Mon Jun 10 20:18:25 BST 2013
Bug fixes
* Address RT#85406, where specifying 'meta-spec' in
META_[ADD|MERGE] would remove all prereqs (bingos)
6.67_03 Wed Jun 5 22:03:28 BST 2013
Doc Fixes
* Document how to specify meta-spec in META_MERGE (bingos)
6.67_02 Sun Jun 2 18:27:45 BST 2013
Bug Fixes
* Allow v-prefixed version strings once more (bingos)
* Typos fixed (David Steinbrunner)
* Resolve test failure with latest CPAN::Meta
6.67_01 Thu Apr 25 21:03:58 BST 2013
Doc Fixes
* Change references to makemaker.org in the docs
(Reported as RT#83246 by dolmen)
VOS Fixes
* 'core' files are keep files (*.kp) on vos, adjust the
'clean' target to account for this (Paul Green)
Win32 Fixes
* Increase dmake MAXLINELENGTH to 800000 (RT#77215) as
per kmx's recommendations (kmx)
Cygwin Fixes
* Allow linking of Cygwin libraries (Reini Urban)
Diffstat (limited to 'cpan/ExtUtils-MakeMaker/lib')
28 files changed, 96 insertions, 55 deletions
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Command/MM.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Command/MM.pm index add6b457ce..dcedd2cf1d 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Command/MM.pm +++ b/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.66'; +our $VERSION = '6.68'; my $Is_VMS = $^O eq 'VMS'; diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm index 3914e2f7e6..9abb959139 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm @@ -2,7 +2,7 @@ package ExtUtils::Liblist; use strict; -our $VERSION = '6.66'; +our $VERSION = '6.68'; use File::Spec; require ExtUtils::Liblist::Kid; diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm index f0a105cca2..48509d548a 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm @@ -11,7 +11,7 @@ use 5.006; use strict; use warnings; -our $VERSION = '6.66'; +our $VERSION = '6.68'; use ExtUtils::MakeMaker::Config; use Cwd 'cwd'; @@ -152,6 +152,8 @@ sub _unix_os2_ext { } elsif ( -f ( $fullname = "$thispth/lib$thislib.dll$Config_libext" ) ) { } + elsif ( -f ( $fullname = "$thispth/$thislib.dll" ) ) { + } elsif ( -f ( $fullname = "$thispth/Slib$thislib$Config_libext" ) ) { } elsif ($^O eq 'dgux' diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm index 26ed594270..f2cb557016 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm @@ -3,7 +3,7 @@ package ExtUtils::MM; use strict; use ExtUtils::MakeMaker::Config; -our $VERSION = '6.66'; +our $VERSION = '6.68'; require ExtUtils::Liblist; require ExtUtils::MakeMaker; diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_AIX.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_AIX.pm index 2fb7970588..21caf79276 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_AIX.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_AIX.pm @@ -1,7 +1,7 @@ package ExtUtils::MM_AIX; use strict; -our $VERSION = '6.66'; +our $VERSION = '6.68'; require ExtUtils::MM_Unix; our @ISA = qw(ExtUtils::MM_Unix); diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm index b37ee43bd8..7f8dfcbbae 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm @@ -1,7 +1,7 @@ package ExtUtils::MM_Any; use strict; -our $VERSION = '6.66'; +our $VERSION = '6.68'; use Carp; use File::Spec; @@ -531,10 +531,10 @@ clean :: clean_subdirs # push @dirs, qw($(INST_ARCHLIB) $(INST_LIB) # $(INST_BIN) $(INST_SCRIPT) # $(INST_MAN1DIR) $(INST_MAN3DIR) -# $(INST_LIBDIR) $(INST_ARCHLIBDIR) $(INST_AUTODIR) +# $(INST_LIBDIR) $(INST_ARCHLIBDIR) $(INST_AUTODIR) # $(INST_STATIC) $(INST_DYNAMIC) $(INST_BOOT) # ); - + if( $attribs{FILES} ) { # Use @dirs because we don't know what's in here. @@ -543,7 +543,7 @@ clean :: clean_subdirs split /\s+/, $attribs{FILES} ; } - push(@files, qw[$(MAKE_APERL_FILE) + push(@files, qw[$(MAKE_APERL_FILE) MYMETA.json MYMETA.yml perlmain.c tmon.out mon.out so_locations blibdirs.ts pm_to_blib pm_to_blib.ts *$(OBJ_EXT) *$(LIB_EXT) perl.exe perl perl$(EXE_EXT) @@ -556,7 +556,13 @@ clean :: clean_subdirs push(@files, $self->catfile('$(INST_ARCHAUTODIR)','extralibs.ld')); # core files - push(@files, qw[core core.*perl.*.? *perl.core]); + if ($^O eq 'vos') { + push(@files, qw[perl*.kp]); + } + else { + push(@files, qw[core core.*perl.*.? *perl.core]); + } + push(@files, map { "core." . "[0-9]"x$_ } (1..5)); # OS specific things to clean up. Use @dirs since we don't know @@ -625,7 +631,7 @@ Because depending on a directory to just ensure it exists doesn't work too well (the modified time changes too often) dir_target() creates a .exists file in the created directory. It is this you should depend on. For portability purposes you should use the $(DIRFILESEP) macro rather -than a '/' to seperate the directory from the file. +than a '/' to separate the directory from the file. yourdirectory$(DIRFILESEP).exists @@ -683,7 +689,7 @@ MAKE_FRAG =head3 dist_test Defines a target that produces the distribution in the -scratchdirectory, and runs 'perl Makefile.PL; make ;make test' in that +scratch directory, and runs 'perl Makefile.PL; make ;make test' in that subdirectory. =cut @@ -999,7 +1005,13 @@ sub metafile_data { }; } - %meta = $self->_add_requirements_to_meta_v1_4( %meta ); + { + my $vers = _metaspec_version( $meta_add, $meta_merge ); + my $method = $vers =~ m!^2! + ? '_add_requirements_to_meta_v2' + : '_add_requirements_to_meta_v1_4'; + %meta = $self->$method( %meta ); + } while( my($key, $val) = each %$meta_add ) { $meta{$key} = $val; @@ -1017,6 +1029,17 @@ sub metafile_data { =cut +sub _metaspec_version { + my ( $meta_add, $meta_merge ) = @_; + return $meta_add->{'meta-spec'}->{version} + if defined $meta_add->{'meta-spec'} + and defined $meta_add->{'meta-spec'}->{version}; + return $meta_merge->{'meta-spec'}->{version} + if defined $meta_merge->{'meta-spec'} + and defined $meta_merge->{'meta-spec'}->{version}; + return '1.4'; +} + sub _add_requirements_to_meta_v1_4 { my ( $self, %meta ) = @_; @@ -1977,7 +2000,7 @@ sub init_VERSION { # Graham Barr and Paul Marquess had some ideas how to ensure # version compatibility between the *.pm file and the - # corresponding *.xs file. The bottomline was, that we need an + # corresponding *.xs file. The bottom line was, that we need an # XS_VERSION macro that defaults to VERSION: $self->{XS_VERSION} ||= $self->{VERSION}; @@ -2194,7 +2217,7 @@ sub tools_other { $MM->init_DIRFILESEP; my $dirfilesep = $MM->{DIRFILESEP}; -Initializes the DIRFILESEP macro which is the seperator between the +Initializes the DIRFILESEP macro which is the separator between the directory and filename in a filepath. ie. / on Unix, \ on Win32 and nothing on VMS. @@ -2206,8 +2229,8 @@ For example: Something of a hack but it prevents a lot of code duplication between MM_* variants. -Do not use this as a seperator between directories. Some operating -systems use different seperators between subdirectories as between +Do not use this as a separator between directories. Some operating +systems use different separators between subdirectories as between directories and filenames (for example: VOLUME:[dir1.dir2]file on VMS). =head3 init_linker I<Abstract> @@ -2236,7 +2259,7 @@ Some OSes do not need these in which case leave it blank. Initialize any macros which are for platform specific use only. -A typical one is the version number of your OS specific mocule. +A typical one is the version number of your OS specific module. (ie. MM_Unix_VERSION or MM_VMS_VERSION). =cut @@ -2309,7 +2332,7 @@ sub POD2MAN_macro { my $self = shift; # Need the trailing '--' so perl stops gobbling arguments and - happens -# to be an alternative end of line seperator on VMS so we quote it +# to be an alternative end of line separator on VMS so we quote it return <<'END_OF_DEF'; POD2MAN_EXE = $(PERLRUN) "-MExtUtils::Command::MM" -e pod2man "--" POD2MAN = $(POD2MAN_EXE) diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_BeOS.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_BeOS.pm index 74d3105ca1..a47d08e66d 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_BeOS.pm +++ b/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.66'; +our $VERSION = '6.68'; =item os_flavor diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Cygwin.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Cygwin.pm index 643682e611..b7ae60670e 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Cygwin.pm +++ b/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.66'; +our $VERSION = '6.68'; =head1 NAME diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_DOS.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_DOS.pm index 4f0eca3ce8..20e71936c2 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_DOS.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_DOS.pm @@ -2,7 +2,7 @@ package ExtUtils::MM_DOS; use strict; -our $VERSION = '6.66'; +our $VERSION = '6.68'; require ExtUtils::MM_Any; require ExtUtils::MM_Unix; diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Darwin.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Darwin.pm index 96ec6fbc2c..f1f35c2634 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Darwin.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Darwin.pm @@ -7,7 +7,7 @@ BEGIN { our @ISA = qw( ExtUtils::MM_Unix ); } -our $VERSION = '6.66'; +our $VERSION = '6.68'; =head1 NAME @@ -20,7 +20,7 @@ ExtUtils::MM_Darwin - special behaviors for OS X =head1 DESCRIPTION -See L<ExtUtils::MM_Unix> for L<ExtUtils::MM_Any> for documention on the +See L<ExtUtils::MM_Unix> for L<ExtUtils::MM_Any> for documentation on the methods overridden here. =head2 Overriden Methods diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_MacOS.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_MacOS.pm index daba1166c3..835e318b83 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_MacOS.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_MacOS.pm @@ -2,7 +2,7 @@ package ExtUtils::MM_MacOS; use strict; -our $VERSION = '6.66'; +our $VERSION = '6.68'; sub new { die <<'UNSUPPORTED'; diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_NW5.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_NW5.pm index 94531a72e7..a52c351153 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_NW5.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_NW5.pm @@ -22,7 +22,7 @@ use strict; use ExtUtils::MakeMaker::Config; use File::Basename; -our $VERSION = '6.66'; +our $VERSION = '6.68'; require ExtUtils::MM_Win32; our @ISA = qw(ExtUtils::MM_Win32); diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_OS2.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_OS2.pm index 55d6c448c0..376f5fa9b5 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_OS2.pm +++ b/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.66'; +our $VERSION = '6.68'; require ExtUtils::MM_Any; require ExtUtils::MM_Unix; diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_QNX.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_QNX.pm index 16169399c8..be8a2c38c8 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_QNX.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_QNX.pm @@ -1,7 +1,7 @@ package ExtUtils::MM_QNX; use strict; -our $VERSION = '6.66'; +our $VERSION = '6.68'; require ExtUtils::MM_Unix; our @ISA = qw(ExtUtils::MM_Unix); diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_UWIN.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_UWIN.pm index 7c28520f48..17ba6f95bb 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_UWIN.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_UWIN.pm @@ -1,7 +1,7 @@ package ExtUtils::MM_UWIN; use strict; -our $VERSION = '6.66'; +our $VERSION = '6.68'; require ExtUtils::MM_Unix; our @ISA = qw(ExtUtils::MM_Unix); diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm index 1629b27369..36397bff50 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm @@ -15,7 +15,7 @@ use ExtUtils::MakeMaker qw($Verbose neatvalue); # If we make $VERSION an our variable parse_version() breaks use vars qw($VERSION); -$VERSION = '6.66'; +$VERSION = '6.68'; $VERSION = eval $VERSION; ## no critic [BuiltinFunctions::ProhibitStringyEval] require ExtUtils::MM_Any; @@ -1087,7 +1087,7 @@ sub fixin { # stolen from the pink Camel book, more or less open( my $fixin, '<', $file ) or croak "Can't process '$file': $!"; local $/ = "\n"; chomp( my $line = <$fixin> ); - next unless $line =~ s/^\s*\#!\s*//; # Not a shbang file. + next unless $line =~ s/^\s*\#!\s*//; # Not a shebang file. my $shb = $self->_fixin_replace_shebang( $file, $line ); next unless defined $shb; @@ -1874,7 +1874,7 @@ sub init_PERL { push @perls, map { "$_$Config{exe_ext}" } ('perl', 'perl5', "perl$Config{version}"); - # miniperl has priority over all but the cannonical perl when in the + # miniperl has priority over all but the canonical perl when in the # core. Otherwise its a last resort. my $miniperl = "miniperl$Config{exe_ext}"; if( $self->{PERL_CORE} ) { @@ -2367,7 +2367,7 @@ $(MAKE_APERL_FILE) : $(FIRST_MAKEFILE) pm_to_blib # don't include the installed version of this extension. I # leave this line here, although it is not necessary anymore: # I patched minimod.PL instead, so that Miniperl.pm won't - # enclude duplicates + # include duplicates # Once the patch to minimod.PL is in the distribution, I can # drop it diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VMS.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VMS.pm index 13a3b94b69..922a1a7da4 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VMS.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VMS.pm @@ -15,7 +15,7 @@ BEGIN { use File::Basename; -our $VERSION = '6.66'; +our $VERSION = '6.68'; require ExtUtils::MM_Any; require ExtUtils::MM_Unix; @@ -251,7 +251,7 @@ sub find_perl { =item _fixin_replace_shebang (override) Helper routine for MM->fixin(), overridden because there's no such thing as an -actual shebang line that will be intepreted by the shell, so we just prepend +actual shebang line that will be interpreted by the shell, so we just prepend $Config{startperl} and preserve the shebang line argument for any switches it may contain. @@ -396,7 +396,7 @@ sub init_DEST { =item init_DIRFILESEP -No seperator between a directory path and a filename on VMS. +No separator between a directory path and a filename on VMS. =cut diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VOS.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VOS.pm index feeca59728..cedb593821 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VOS.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VOS.pm @@ -1,7 +1,7 @@ package ExtUtils::MM_VOS; use strict; -our $VERSION = '6.66'; +our $VERSION = '6.68'; require ExtUtils::MM_Unix; our @ISA = qw(ExtUtils::MM_Unix); diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win32.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win32.pm index 34499d30b1..3b09330993 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win32.pm +++ b/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.66'; +our $VERSION = '6.68'; $ENV{EMXSHELL} = 'sh'; # to run `commands` @@ -251,7 +251,7 @@ sub constants { # # This has to come here before all the constants and not in # platform_constants which is after constants. - my $size = $self->{MAXLINELENGTH} || 64 * 1024; + my $size = $self->{MAXLINELENGTH} || 800000; my $prefix = qq{ # Get dmake to read long commands like PM_TO_BLIB MAXLINELENGTH = $size diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win95.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win95.pm index 9b3b3b85ba..7863f2fab9 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win95.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win95.pm @@ -2,7 +2,7 @@ package ExtUtils::MM_Win95; use strict; -our $VERSION = '6.66'; +our $VERSION = '6.68'; require ExtUtils::MM_Win32; our @ISA = qw(ExtUtils::MM_Win32); @@ -116,7 +116,7 @@ Currently maintained by Michael G Schwern C<schwern@pobox.com>. Send patches and ideas to C<makemaker@perl.org>. -See http://www.makemaker.org. +See https://metacpan.org/release/ExtUtils-MakeMaker. =cut diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MY.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MY.pm index 2f01658a54..857e17d6c4 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MY.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MY.pm @@ -3,7 +3,7 @@ package ExtUtils::MY; use strict; require ExtUtils::MM; -our $VERSION = '6.66'; +our $VERSION = '6.68'; our @ISA = qw(ExtUtils::MM); { diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm index f271ef7928..7ca7c2c4e6 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm @@ -18,7 +18,7 @@ our @Overridable; my @Prepend_parent; my %Recognized_Att_Keys; -our $VERSION = '6.66'; +our $VERSION = '6.68'; $VERSION = eval $VERSION; ## no critic [BuiltinFunctions::ProhibitStringyEval] # Emulate something resembling CVS $Revision$ @@ -978,7 +978,7 @@ sub mv_all_methods { # We have to clean out %INC also, because the current directory is # changed frequently and Graham Barr prefers to get his version - # out of a History.pl file which is "required" so woudn't get + # out of a History.pl file which is "required" so wouldn't get # loaded again in another extension requiring a History.pl # With perl5.002_01 the deletion of entries in %INC caused Tk-b11 @@ -1127,7 +1127,7 @@ sub clean_versions { for my $module (keys %$reqs) { my $version = $reqs->{$module}; - if( !defined $version or $version !~ /^[\d_\.]+$/ ) { + if( !defined $version or $version !~ /^v?[\d_\.]+$/ ) { carp "Unparsable version '$version' for prerequisite $module"; $reqs->{$module} = 0; } @@ -2029,6 +2029,22 @@ own. META_MERGE will merge its value with the default. Unless you want to override the defaults, prefer META_MERGE so as to get the advantage of any future defaults. +By default CPAN Meta specification C<1.4> is used. In order to use +CPAN Meta specification C<2.0>, indicate with C<meta-spec> the version +you want to use. + + META_MERGE => { + + "meta-spec" => { version => 2 }, + + repository => { + type => 'git', + url => 'git://github.com/Perl-Toolchain-Gang/ExtUtils-MakeMaker.git', + web => 'https://github.com/Perl-Toolchain-Gang/ExtUtils-MakeMaker', + }, + + }, + =item MIN_PERL_VERSION The minimum required version of Perl for this distribution. @@ -2470,6 +2486,8 @@ but these will fail: local $VERSION = '1.02'; local $FOO::VERSION = '1.30'; +(Putting C<my> or C<local> on the preceding line will work o.k.) + "Version strings" are incompatible and should not be used. # Bad @@ -2484,8 +2502,6 @@ as $VERSION is declared. # All on one line use version; our $VERSION = qv(1.2.3); -(Putting C<my> or C<local> on the preceding line will work o.k.) - The file named in VERSION_FROM is not added as a dependency to Makefile. This is not really correct, but it would be a major pain during development to have to rewrite the Makefile for any smallish @@ -2916,13 +2932,13 @@ Send patches and ideas to C<makemaker@perl.org>. Send bug reports via http://rt.cpan.org/. Please send your generated Makefile along with your report. -For more up-to-date information, see L<http://www.makemaker.org>. +For more up-to-date information, see L<https://metacpan.org/release/ExtUtils-MakeMaker>. Repository available at L<https://github.com/Perl-Toolchain-Gang/ExtUtils-MakeMaker>. =head1 LICENSE -This program is free software; you can redistribute it and/or +This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. See L<http://www.perl.com/perl/misc/Artistic.html> diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Config.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Config.pm index 6f5e541b81..454ae3a37c 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Config.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Config.pm @@ -2,7 +2,7 @@ package ExtUtils::MakeMaker::Config; use strict; -our $VERSION = '6.66'; +our $VERSION = '6.68'; use Config (); diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/FAQ.pod b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/FAQ.pod index 871eeded2a..71db660cf8 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/FAQ.pod +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/FAQ.pod @@ -1,6 +1,6 @@ package ExtUtils::MakeMaker::FAQ; -our $VERSION = '6.66'; +our $VERSION = '6.68'; 1; __END__ diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Tutorial.pod b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Tutorial.pod index a3352477b0..0e07f3fcb6 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Tutorial.pod +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Tutorial.pod @@ -1,6 +1,6 @@ package ExtUtils::MakeMaker::Tutorial; -our $VERSION = '6.66'; +our $VERSION = '6.68'; =head1 NAME diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mkbootstrap.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mkbootstrap.pm index f71655d635..4188eb7371 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mkbootstrap.pm +++ b/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.66'; +our $VERSION = '6.68'; require Exporter; our @ISA = ('Exporter'); diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mksymlists.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mksymlists.pm index a99d19840a..0af324870c 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mksymlists.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mksymlists.pm @@ -10,7 +10,7 @@ use Config; our @ISA = qw(Exporter); our @EXPORT = qw(&Mksymlists); -our $VERSION = '6.66'; +our $VERSION = '6.68'; sub Mksymlists { my(%spec) = @_; diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/testlib.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/testlib.pm index b5a51bf3fb..5e4f96d4d8 100644 --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/testlib.pm +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/testlib.pm @@ -3,7 +3,7 @@ package ExtUtils::testlib; use strict; use warnings; -our $VERSION = '6.66'; +our $VERSION = '6.68'; use Cwd; use File::Spec; |