X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=Makefile.PL;h=344dc71079a3627c24864621c09201a4745ec2de;hp=f06caa9153e07156b04146112c6a67ef5b0ae6b9;hb=ef0955faec3b6fabcd918c9c842733aad5bdb0ef;hpb=d538823f7f54a6d1037d3933ab61af23aade6059

diff --git a/Makefile.PL b/Makefile.PL
index f06caa9..344dc71 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,46 +1,54 @@
 use inc::Module::Install;
 
-name('Catalyst');
-abstract('Catalyst Web Framework');
-author('Sebastian Riedel');
-version_from('lib/Catalyst.pm');
-license('perl');
-
-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 );
-
-recommends( 'Catalyst::Engine::Apache' => '1.00' );
-recommends('FCGI');
-recommends('FCGI::ProcManager');
-recommends('PAR');
-
-install_script( glob('script/*.pl') );
-
-&WriteAll;
+name 'Catalyst';
+all_from 'lib/Catalyst.pm';
+
+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 'Module::Install::Admin' => '0.45';
+
+feature 'Apache/mod_perl Support',
+  -default                   => 0,
+  'Catalyst::Engine::Apache' => '1.05';
+
+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 =
@@ -51,17 +59,6 @@ my $banner =
 print " $banner \n";
 print( '*' x 80, "\n" );
 
-print <<'EOF';
-
-                    ____      _        _           _
-                   / ___|__ _| |_ __ _| |_   _ ___| |_
-                  | |   / _` | __/ _` | | | | / __| __|
-                  | |__| (_| | || (_| | | |_| \__ \ |_
-                   \____\__ _|\__\__ _|_|\__  |___/\__|
-                                         |___/  carpe diem!
-
-EOF
-
 eval "use FCGI";
 print qq/ Install "FCGI" for FastCGI support.\n/ if $@;
 eval "use FCGI::ProcManager";
@@ -74,14 +71,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