X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=Makefile.PL;h=739eb06b0bd3b9ebbbfdf7d880119b2142fe57a7;hp=2314ce4ac582075f950706de05c83761e7044ed5;hb=f63c03e47ae0278e50d513b90ecbbdfd67d1a021;hpb=9624cd13b2e160bcf70784157e9527d64c900687

diff --git a/Makefile.PL b/Makefile.PL
index 2314ce4..739eb06 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,66 +1,62 @@
 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';
 
-include('ExtUtils::AutoInstall');
+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('inc::Module::Install');
-requires('ExtUtils::AutoInstall');
+requires 'perl'               => '5.8.1';
+requires 'UNIVERSAL::require' => "0.10";
+requires 'Carp';
+requires 'Class::Accessor::Fast';
+requires 'Class::Data::Inheritable';
+requires 'Class::Inspector' => '1.06';
+requires 'CGI::Cookie';
+requires 'Data::Dump';
+requires 'File::Modified';
+requires 'HTML::Entities';
+requires 'HTTP::Body'    => 0.5;
+requires 'HTTP::Headers' => 1.64;
+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';
+requires 'YAML'                   => '0.55';
+requires 'Data::Visitor'          => '0.02';
 
-features(
-    'Apache Support' => [
-        -default                   => 0,
-        'Catalyst::Engine::Apache' => '1.00'
-    ],
-    'FastCGI Support' => [
-        -default            => 0,
-        'FCGI'              => 0,
-        'FCGI::ProcManager' => 0
-    ],
-    'PAR Support' => [
-        -default => 0,
-        'PAR'    => 0
-    ],
-    'CPANPLUS' => [
-        -default   => 0,
-        'CPANPLUS' => 0
-    ],
-);
+feature 'Apache/mod_perl Support',
+  -default                   => 0,
+  'Catalyst::Engine::Apache' => '1.05';
 
-install_script( glob('script/*.pl') );
-auto_install();
-&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 =
@@ -83,12 +79,13 @@ 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.
 
+    Note that Catalyst::Helper has been split into a separate distribution,
+    and is required for using catalyst.pl to make new distributions. It is
+    included with Task::Catalyst
+
         perl -MCPANPLUS -e 'install Task::Catalyst'
         perl -MCPAN -e 'install Task::Catalyst'