- Fixes for rt.cpan #17322 and #17331

[catagits/Catalyst-Runtime.git] / Makefile.PL

diff --git a/Makefile.PL b/Makefile.PL
index bd568f8..f37fe54 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,49 +1,58 @@
 use inc::Module::Install;
 
-name('Catalyst');
-abstract('Catalyst Web Framework');
-author('Sebastian Riedel');
-version_from('lib/Catalyst.pm');
-license('perl');
+perl_version '5.8.1';
 
-requires( 'perl'               => '5.8.1' );
-requires( 'UNIVERSAL::require' => "0.10" );
-requires('Class::Accessor::Fast');
-requires('Class::Data::Inheritable');
-requires('Class::Inspector');
-requires('CGI::Cookie');
-requires('File::Modified');
-requires('HTML::Entities');
-requires( 'HTTP::Body'    => 0.5 );
-requires( 'HTTP::Headers' => 1.59 );
-requires('HTTP::Request');
-requires('HTTP::Response');
-requires('HTTP::Request::AsCGI');
-requires('LWP::UserAgent');
-requires('MIME::Types');
-requires( 'Module::Pluggable::Fast' => 0.16 );
-requires('NEXT');
-requires( 'Path::Class' => 0.09 );
-requires('Scalar::Util');
-requires('Template');
-requires('Text::SimpleTable');
-requires('Test::MockObject');
-requires('Time::HiRes');
-requires('Tree::Simple');
-requires('Tree::Simple::Visitor::FindByPath');
-requires( 'URI' => 1.35 );
-requires('File::Copy::Recursive');
-requires('inc::Module::Install');
+name 'Catalyst';
+all_from 'lib/Catalyst.pm';
 
-recommends( 'Catalyst::Engine::Apache' => '1.00' );
-recommends('FCGI');
-recommends('FCGI::ProcManager');
-recommends('PAR');
-recommends('CPANPLUS');
+requires 'perl'               => '5.8.1';
+requires 'UNIVERSAL::require' => "0.10";
+requires 'Class::Accessor::Fast';
+requires 'Class::Data::Inheritable';
+requires 'Class::Inspector';
+requires 'CGI::Cookie';
+requires 'File::Modified';
+requires 'HTML::Entities';
+requires 'HTTP::Body'    => 0.5;
+requires 'HTTP::Headers' => 1.59;
+requires 'HTTP::Request';
+requires 'HTTP::Response';
+requires 'HTTP::Request::AsCGI' => '0.5';
+requires 'LWP::UserAgent';
+requires 'MIME::Types';
+requires 'Module::Pluggable::Fast' => 0.16;
+requires 'NEXT';
+requires 'Path::Class' => 0.09;
+requires 'Scalar::Util';
+requires 'Template';
+requires 'Text::SimpleTable' => 0.03;
+requires 'Test::MockObject';
+requires 'Test::NoWarnings' => 0.082;
+requires 'Time::HiRes';
+requires 'Tree::Simple' => 1.15;
+requires 'Tree::Simple::Visitor::FindByPath';
+requires 'URI' => 1.35;
+requires 'File::Copy::Recursive';
+requires 'Module::Install::Admin' => '0.54';
+requires 'Module::Install'        => '0.54';
 
-install_script( glob('script/*.pl') );
+feature 'Apache/mod_perl Support',
+  -default                   => 0,
+  'Catalyst::Engine::Apache' => '1.05';
 
-&WriteAll;
+feature 'FastCGI Support', -default => 0, 'FCGI' => 0, 'FCGI::ProcManager' => 0;
+
+feature 'PAR Support',
+  -default => 0,
+  'PAR'    => 0;
+
+feature 'CPANPLUS (for easier installations)',
+  -default   => 0,
+  'CPANPLUS' => 0;
+
+install_script glob('script/*.pl');
+auto_install;
+WriteAll;
 
 print( '*' x 80, "\n" );
 my $banner =
@@ -66,15 +75,11 @@ print qq/ Install "PAR" for PAR packaging support.\n/ if $@;
 print <<"EOF";
 
  Important:
-    The Apache engines have been moved to a separate package in Catalyst 5.5.
-    Please install Catalyst::Engine::Apache if you need Apache support.
-
     Install Task::Catalyst to get everything you need to start writing
     serious applications with Catalyst.
 
         perl -MCPANPLUS -e 'install Task::Catalyst'
         perl -MCPAN -e 'install Task::Catalyst'
 
-
  Have fun!
 EOF