From 51bb656f28ceaaa7cc8551dd112e983a0dd86480 Mon Sep 17 00:00:00 2001 From: Jens Rehsack Date: Mon, 22 May 2017 12:35:20 +0200 Subject: [PATCH] Makefile.PL: remove toolchain uri, update LMU Since maintainers engagement in PTG is dead, there will likely no help from PTG regarding to File::ConfigDir because lack of knowledge. Anyway - it'll impolite to force PTG providing support for external modules. Signed-off-by: Jens Rehsack --- Makefile.PL | 53 ++++++++++++++++++++++++++--------------------------- 1 file changed, 26 insertions(+), 27 deletions(-) diff --git a/Makefile.PL b/Makefile.PL index e9e7b65..b953ef1 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -24,7 +24,7 @@ my %TEST_DEPS = ( WriteMakefile1( MIN_PERL_VERSION => '5.008001', META_ADD => { - 'meta-spec' => { version => 2 }, + 'meta-spec' => {version => 2}, resources => { homepage => 'https://metacpan.org/release/File-ConfigDir', repository => { @@ -36,9 +36,7 @@ WriteMakefile1( web => 'http://rt.cpan.org/Public/Dist/Display.html?Name=File-ConfigDir', mailto => 'bug-File-ConfigDir@rt.cpan.org', }, - license => 'http://dev.perl.org/licenses/', - x_IRC => "irc://irc.perl.org/#toolchain", - x_MailingList => "mailto:cpan-workers\@perl.org'", + license => 'http://dev.perl.org/licenses/', }, prereqs => { develop => { @@ -56,12 +54,13 @@ WriteMakefile1( configure => { requires => {%CONFIGURE_DEPS}, }, - build => { requires => {%BUILD_DEPS} }, - test => { requires => {%TEST_DEPS} }, + build => {requires => {%BUILD_DEPS}}, + test => {requires => {%TEST_DEPS}}, runtime => { recommends => { - 'File::HomeDir' => '0.50', - 'List::MoreUtils' => '0.22', + 'File::HomeDir' => '0.50', + 'List::MoreUtils' => '0.0.419', + 'List::MoreUtils::XS' => '0.0.418', }, requires => { %RUN_DEPS, @@ -79,7 +78,7 @@ WriteMakefile1( PREREQ_PM => \%RUN_DEPS, BUILD_REQUIRES => \%BUILD_DEPS, TEST_REQUIRES => \%TEST_DEPS, - test => { TESTS => 't/*.t xt/*.t' }, + test => {TESTS => 't/*.t xt/*.t'}, ); sub WriteMakefile1 @@ -87,37 +86,37 @@ sub WriteMakefile1 my %params = @_; my $eumm_version = $ExtUtils::MakeMaker::VERSION; $eumm_version = eval $eumm_version; - die "EXTRA_META is deprecated" if ( exists( $params{EXTRA_META} ) ); - die "License not specified" if ( !exists( $params{LICENSE} ) ); + die "EXTRA_META is deprecated" if (exists($params{EXTRA_META})); + die "License not specified" if (!exists($params{LICENSE})); $params{TEST_REQUIRES} and $eumm_version < 6.6303 - and $params{BUILD_REQUIRES} = { %{ $params{BUILD_REQUIRES} || {} }, %{ delete $params{TEST_REQUIRES} } }; + and $params{BUILD_REQUIRES} = {%{$params{BUILD_REQUIRES} || {}}, %{delete $params{TEST_REQUIRES}}}; #EUMM 6.5502 has problems with BUILD_REQUIRES $params{BUILD_REQUIRES} and $eumm_version < 6.5503 - and $params{PREREQ_PM} = { %{ $params{PREREQ_PM} || {} }, %{ delete $params{BUILD_REQUIRES} } }; + and $params{PREREQ_PM} = {%{$params{PREREQ_PM} || {}}, %{delete $params{BUILD_REQUIRES}}}; ref $params{AUTHOR} and "ARRAY" eq ref $params{AUTHOR} and $eumm_version < 6.5702 - and $params{AUTHOR} = join( ", ", @{ $params{AUTHOR} } ); - delete $params{CONFIGURE_REQUIRES} if ( $eumm_version < 6.52 ); - delete $params{MIN_PERL_VERSION} if ( $eumm_version < 6.48 ); - delete $params{META_MERGE} if ( $eumm_version < 6.46 ); - delete $params{META_ADD}{prereqs} if ( $eumm_version < 6.58 ); - delete $params{META_ADD}{'meta-spec'} if ( $eumm_version < 6.58 ); - delete $params{META_ADD} if ( $eumm_version < 6.46 ); - delete $params{LICENSE} if ( $eumm_version < 6.31 ); - delete $params{AUTHOR} if ( $] < 5.005 ); - delete $params{ABSTRACT_FROM} if ( $] < 5.005 ); - delete $params{BINARY_LOCATION} if ( $] < 5.005 ); + and $params{AUTHOR} = join(", ", @{$params{AUTHOR}}); + delete $params{CONFIGURE_REQUIRES} if ($eumm_version < 6.52); + delete $params{MIN_PERL_VERSION} if ($eumm_version < 6.48); + delete $params{META_MERGE} if ($eumm_version < 6.46); + delete $params{META_ADD}{prereqs} if ($eumm_version < 6.58); + delete $params{META_ADD}{'meta-spec'} if ($eumm_version < 6.58); + delete $params{META_ADD} if ($eumm_version < 6.46); + delete $params{LICENSE} if ($eumm_version < 6.31); + delete $params{AUTHOR} if ($] < 5.005); + delete $params{ABSTRACT_FROM} if ($] < 5.005); + delete $params{BINARY_LOCATION} if ($] < 5.005); # more or less taken from Moose' Makefile.PL - if ( $params{CONFLICTS} ) + if ($params{CONFLICTS}) { my $ok = CheckConflicts(%params); - exit(0) if ( $params{PREREQ_FATAL} and not $ok ); + exit(0) if ($params{PREREQ_FATAL} and not $ok); my $cpan_smoker = grep { $_ =~ m/(?:CR_SMOKER|CPAN_REPORTER|AUTOMATED_TESTING)/ } keys %ENV; - unless ( $cpan_smoker || $ENV{PERL_MM_USE_DEFAULT} ) + unless ($cpan_smoker || $ENV{PERL_MM_USE_DEFAULT}) { sleep 4 unless ($ok); }