X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=Makefile.PL;h=87d6f090040e84b561ed66fe9b0a77df9672ac8b;hp=11621751852de01a002617cfc8cfdaa42f1f6e82;hb=a134d05c2425e693917a005843552d29c1d327f5;hpb=a85294b6627a8b1b9006f478f125be7e203247fa

diff --git a/Makefile.PL b/Makefile.PL
index 1162175..87d6f09 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -16,7 +16,6 @@ requires 'Carp';
 requires 'Class::C3::Adopt::NEXT' => '0.07';
 requires 'CGI::Simple::Cookie';
 requires 'Data::Dump';
-requires 'File::Modified';
 requires 'HTML::Entities';
 requires 'HTTP::Body'    => '1.04'; # makes uploadtmp work
 requires 'HTTP::Headers' => '1.64';
@@ -24,7 +23,7 @@ requires 'HTTP::Request';
 requires 'HTTP::Response';
 requires 'HTTP::Request::AsCGI' => '0.8';
 requires 'LWP::UserAgent';
-requires 'Module::Pluggable' => '3.01';
+requires 'Module::Pluggable' => '3.9';
 requires 'Path::Class' => '0.09';
 requires 'Scalar::Util';
 requires 'Sub::Exporter';
@@ -54,33 +53,29 @@ else {
         map  { glob } qw[t/*.t t/aggregate/*.t];
 }
 
-author_requires($_) for qw(
+author_requires(map {; $_ => 0 } qw(
   Test::NoTabs
   Test::Pod
   Test::Pod::Coverage
   Pod::Coverage
-);
+));
 
 if ($Module::Install::AUTHOR) {
     darwin_check_no_resource_forks();
 }
 
+resources(
+    'MailingList' => 'http://lists.scsys.co.uk/cgi-bin/mailman/listinfo/catalyst',
+    'IRC'         => 'irc://irc.perl.org/#catalyst',
+    'license',    => 'http://dev.perl.org/licenses/',
+    'homepage',   => 'http://dev.catalyst.perl.org/',
+    'repository', => 'http://dev.catalyst.perl.org/repos/Catalyst/Catalyst-Runtime/',
+);
+
 install_script glob('script/*.pl');
 auto_install;
 WriteAll;
 
-if ($Module::Install::AUTHOR) {
-  Meta->{values}{resources} = [
-    [ 'MailingList' => 'http://lists.scsys.co.uk/cgi-bin/mailman/listinfo/catalyst' ],
-    [ 'IRC'         => 'irc://irc.perl.org/#catalyst' ],
-    [ 'license',    => 'http://dev.perl.org/licenses/' ],
-    [ 'homepage',   => 'http://dev.catalyst.perl.org/'],
-    [ 'repository', => 'http://dev.catalyst.perl.org/repos/Catalyst/Catalyst-Runtime/' ],
-  ];
-
-  Meta->write;
-}
-
 print <<"EOF";
 
  Important:
@@ -93,7 +88,7 @@ print <<"EOF";
         perl -MCPANPLUS -e 'install Catalyst::Devel' # or
         perl -MCPAN -e 'install Catalyst::Devel'
 
-    To get some commonly used plugins, as well as the TT view and DBIC 
+    To get some commonly used plugins, as well as the TT view and DBIC
     model, install Task::Catalyst in the same way.
 
  Have fun!
@@ -139,50 +134,11 @@ sub darwin_check_no_resource_forks {
 
         # TAR on 10.4 wants COPY_EXTENDED_ATTRIBUTES_DISABLE
         # On 10.5 (Leopard) it wants COPYFILE_DISABLE
-        my $attr = $osx_ver eq '10.5' ? 'COPYFILE_DISABLE' : 'COPY_EXTENDED_ATTRIBUTES_DISABLE';
+        die("Oh, you got Snow Lepoard, snazzy. Please read the man page for tar to find out if Apple renamed COPYFILE_DISABLE again and fix this Makefile.PL please?\n") if $osx_ver =~ /^10.6/;
+        my $attr = $osx_ver =~ /^10.5/ ? 'COPYFILE_DISABLE' : 'COPY_EXTENDED_ATTRIBUTES_DISABLE';
 
         makemaker_args(dist => { PREOP => qq{\@if [ "\$\$$attr" != "true" ]; then}.
                                           qq{ echo "You must set the ENV variable $attr to true,"; }.
                                           ' echo "to avoid getting resource forks in your dist."; exit 255; fi' });
-        }
-}
-
-sub check_conflicts {
-    my %conflicts = @_;
-
-    my %conflicts_found;
-    for my $mod ( sort keys %conflicts ) {
-        eval "require($mod)";
-        next if $@;
-
-        my $installed = $mod->VERSION();
-        $conflicts_found{$mod} = $installed if ( $installed le $conflicts{$mod} );
-    }
-
-    return unless scalar keys %conflicts_found;
-
-    print <<"EOF";
-
- WARNING:
-
-    This version of Catalyst conflicts with the versions of
-    some components you have installed.
-
-    You will need to upgrade these modules after installing
-    this version of Catalyst.
-
-    List of the conflicting components and their installed versions:
-
-EOF
-
-    foreach my $mod (keys %conflicts_found) {
-        print sprintf("    %s => %s\n", $mod, $conflicts_found{$mod});
     }
-    print "\n";
-
-    # More or less copied from Module::Build, via Moose
-    return if $ENV{PERL_MM_USE_DEFAULT};
-    return unless -t STDIN && (-t STDOUT || !(-f STDOUT || -c STDOUT));
-
-    sleep 4;
 }