X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Makefile.PL;h=6ca54b86e765fd1de3320705fb7011ff066d9594;hb=HEAD;hp=55fed74c9b0ea3581b7bf946aa8d49c5250b71cb;hpb=845ea87642f93a7cba30096f426532a2ae398d8e;p=p5sagit%2Flocal-lib.git diff --git a/Makefile.PL b/Makefile.PL index 55fed74..6ca54b8 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -196,9 +196,8 @@ my %extra_info = ( 'meta-spec' => { version => 2 }, resources => { repository => { - # r/w: p5sagit@git.shadowcat.co.uk:local-lib.git - url => 'git://git.shadowcat.co.uk/p5sagit/local-lib.git', - web => 'http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit/local-lib.git', + url => 'git://github.com/Perl-Toolchain-Gang/local-lib', + web => 'https://github.com/Perl-Toolchain-Gang/local-lib', type => 'git', }, x_IRC => 'irc://irc.perl.org/#local-lib', @@ -209,7 +208,7 @@ my %extra_info = ( license => [ 'http://dev.perl.org/licenses/' ], }, prereqs => { - runtime => { requires => { perl => '5.8.1' } }, + runtime => { requires => { perl => '5.6.0' } }, }, ); @@ -259,7 +258,7 @@ else { my $value = $CPAN::Config->{$setting} or next; if ($setting =~ /^make/ ? $value =~ /(?:PREFIX|INSTALL_BASE)/ - : /(?:--prefix|--install_base)/ + : $value =~ /(?:--prefix|--install_base)/ ) { die <<"DEATH"; WHOA THERE! It looks like you've got $CPAN::Config->{$setting} set in @@ -283,12 +282,13 @@ chdir($cwd); @{$extra_info{prereqs}{runtime}{requires}}{keys %RUN_DEPS} = values %RUN_DEPS; # have to do this since old EUMM dev releases miss the eval $VERSION line -my $mymeta_works = do { no warnings; $ExtUtils::MakeMaker::VERSION >= 6.57_07 }; -my $mymeta = do { no warnings; $ExtUtils::MakeMaker::VERSION >= 6.57_02 }; +my $eumm_version = eval $ExtUtils::MakeMaker::VERSION; +my $mymeta_works = $eumm_version >= 6.57_07; +my $mymeta = $eumm_version >= 6.57_02; -my $has_test_requires = do { no warnings; $ExtUtils::MakeMaker::VERSION >= 6.63_03 }; +my $has_test_requires = $eumm_version >= 6.63_03; -my $has_meta_v2 = do { no warnings; $ExtUtils::MakeMaker::VERSION >= 6.57_10 }; +my $has_meta_v2 = $eumm_version >= 6.57_10; if (! $has_meta_v2) { %extra_info = (); } @@ -308,8 +308,8 @@ WriteMakefile( PREREQ_PM => { %RUN_DEPS, }, - keys %BUILD_DEPS ? ( BUILD_REQUIRES => \%BUILD_DEPS ) : (), - keys %TEST_DEPS ? ( TEST_REQUIRES => \%TEST_DEPS ) : (), + BUILD_REQUIRES => \%BUILD_DEPS, + TEST_REQUIRES => \%TEST_DEPS, META_ADD => \%extra_info, META_MERGE => { no_index => {