[Jifty-commit] r2576 - in Template-Declare: inc/Module/Install

[jifty-commit at lists.jifty.org]

Author: audreyt
Date: Fri Jan 26 06:39:30 2007
New Revision: 2576

Modified:
   Template-Declare/Makefile.PL
   Template-Declare/inc/Module/Install/Makefile.pm
   Template-Declare/inc/Module/Install/Metadata.pm

Log:
* Makefile.PL - Modernize Module::Install usage, as well as listing HTML::Lint 
  as build_requires() so that tests won't randomly fail.

Modified: Template-Declare/Makefile.PL
==============================================================================
--- Template-Declare/Makefile.PL	(original)
+++ Template-Declare/Makefile.PL	Fri Jan 26 06:39:30 2007
@@ -1,6 +1,9 @@
 use inc::Module::Install;
-name('Template-Declare');
-license('Perl');
-author('Jesse Vincent <jesse at bestpractical.com>');
-version_from('lib/Template/Declare.pm');
+
+name            'Template-Declare';
+license         'perl';
+author          'Jesse Vincent <jesse at bestpractical.com>';
+all_from        'lib/Template/Declare.pm';
+build_requires  'HTML::Lint';
+
 WriteAll;

Modified: Template-Declare/inc/Module/Install/Makefile.pm
==============================================================================
--- Template-Declare/inc/Module/Install/Makefile.pm	(original)
+++ Template-Declare/inc/Module/Install/Makefile.pm	Fri Jan 26 06:39:30 2007
@@ -137,8 +137,10 @@
     }
 
     my %args = map { ( $_ => $args->{$_} ) } grep {defined($args->{$_})} keys %$args;
-    if ($self->admin->preop) {
-        $args{dist} = $self->admin->preop;
+
+    my $user_preop = delete $args{dist}->{PREOP};
+    if (my $preop = $self->admin->preop($user_preop)) {
+        $args{dist} = $preop;
     }
 
     my $mm = ExtUtils::MakeMaker::WriteMakefile(%args);
@@ -205,4 +207,4 @@
 
 __END__
 
-#line 334
+#line 336

Modified: Template-Declare/inc/Module/Install/Metadata.pm
==============================================================================
--- Template-Declare/inc/Module/Install/Metadata.pm	(original)
+++ Template-Declare/inc/Module/Install/Metadata.pm	Fri Jan 26 06:39:30 2007
@@ -279,9 +279,11 @@
 
     if (
         $self->_slurp($file) =~ m/
-        =head \d \s+
-        (?:licen[cs]e|licensing|copyright|legal)\b
-        (.*?)
+        (
+            =head \d \s+
+            (?:licen[cs]e|licensing|copyright|legal)\b
+            .*?
+        )
         (=head\\d.*|=cut.*|)
         \z
     /ixms
@@ -298,6 +300,7 @@
             'LGPL'                                            => 'lgpl',
             'BSD'                                             => 'bsd',
             'Artistic'                                        => 'artistic',
+            'MIT'                                             => 'MIT',
         );
         while ( my ( $pattern, $license ) = splice( @phrases, 0, 2 ) ) {
             $pattern =~ s{\s+}{\\s+}g;