From 891b5d1e801a71f1f19eca67ec985b7b55f74aa1 Mon Sep 17 00:00:00 2001
From: Chris 'BinGOs' Williams <chris@bingosnet.co.uk>
Date: Fri, 16 Sep 2011 21:02:58 +0100
Subject: [PATCH] Update CPANPLUS to CPAN version 0.9111

  [DELTA]

  Changes for 0.9111      Fri Sep 16 10:15:06 2011
  ================================================
  * Enhance CPANPLUS::Dist::MM Makefile/Makefile.PL
    age checking code to resolve some issues.
---
 Porting/Maintainers.pl                      | 2 +-
 cpan/CPANPLUS/lib/CPANPLUS.pm               | 2 +-
 cpan/CPANPLUS/lib/CPANPLUS/Dist/MM.pm       | 8 ++++++--
 cpan/CPANPLUS/lib/CPANPLUS/Internals.pm     | 2 +-
 cpan/CPANPLUS/lib/CPANPLUS/Shell/Default.pm | 2 +-
 pod/perldelta.pod                           | 2 +-
 6 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 8e06b40..4a1f20f 100755
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -462,7 +462,7 @@ use File::Glob qw(:case);
     'CPANPLUS' =>
 	{
 	'MAINTAINER'	=> 'kane',
-	'DISTRIBUTION'	=> 'BINGOS/CPANPLUS-0.9110.tar.gz',
+	'DISTRIBUTION'	=> 'BINGOS/CPANPLUS-0.9111.tar.gz',
 	'FILES'		=> q[cpan/CPANPLUS],
 	'EXCLUDED'	=> [ qr{^inc/},
 			     qr{^t/dummy-.*\.hidden$},
diff --git a/cpan/CPANPLUS/lib/CPANPLUS.pm b/cpan/CPANPLUS/lib/CPANPLUS.pm
index 715be77..6a37717 100644
--- a/cpan/CPANPLUS/lib/CPANPLUS.pm
+++ b/cpan/CPANPLUS/lib/CPANPLUS.pm
@@ -13,7 +13,7 @@ BEGIN {
     use vars        qw( @EXPORT @ISA $VERSION );
     @EXPORT     =   qw( shell fetch get install );
     @ISA        =   qw( Exporter );
-    $VERSION = "0.9110";     #have to hardcode or cpan.org gets unhappy
+    $VERSION = "0.9111";     #have to hardcode or cpan.org gets unhappy
 }
 
 ### purely for backward compatibility, so we can call it from the commandline:
diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Dist/MM.pm b/cpan/CPANPLUS/lib/CPANPLUS/Dist/MM.pm
index f031e2b..de3d138 100644
--- a/cpan/CPANPLUS/lib/CPANPLUS/Dist/MM.pm
+++ b/cpan/CPANPLUS/lib/CPANPLUS/Dist/MM.pm
@@ -418,8 +418,12 @@ sub prepare {
         ### Make (haha) sure that Makefile.PL is older than the Makefile
         ### we just generated.
         eval {
-          my $ftime = time - 4;
-          utime $ftime, $ftime, MAKEFILE_PL->( $cb->_safe_path( path => $dir ) );
+          my $makestat = ( stat MAKEFILE->( $dir ) )[9];
+          my $mplstat = ( stat MAKEFILE_PL->( $cb->_safe_path( path => $dir ) ) )[9];
+          if ( $makestat < $mplstat ) {
+            my $ftime = $makestat - 60;
+            utime $ftime, $ftime, MAKEFILE_PL->( $cb->_safe_path( path => $dir ) );
+          }
         };
 
         ### start resolving prereqs ###
diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Internals.pm b/cpan/CPANPLUS/lib/CPANPLUS/Internals.pm
index 647da5a..f070b14 100644
--- a/cpan/CPANPLUS/lib/CPANPLUS/Internals.pm
+++ b/cpan/CPANPLUS/lib/CPANPLUS/Internals.pm
@@ -42,7 +42,7 @@ use vars qw[@ISA $VERSION];
             CPANPLUS::Internals::Report
         ];
 
-$VERSION = "0.9110";
+$VERSION = "0.9111";
 
 =pod
 
diff --git a/cpan/CPANPLUS/lib/CPANPLUS/Shell/Default.pm b/cpan/CPANPLUS/lib/CPANPLUS/Shell/Default.pm
index d8ec275..2350615 100644
--- a/cpan/CPANPLUS/lib/CPANPLUS/Shell/Default.pm
+++ b/cpan/CPANPLUS/lib/CPANPLUS/Shell/Default.pm
@@ -26,7 +26,7 @@ local $Data::Dumper::Indent     = 1; # for dumpering from !
 BEGIN {
     use vars        qw[ $VERSION @ISA ];
     @ISA        =   qw[ CPANPLUS::Shell::_Base::ReadLine ];
-    $VERSION = "0.9110";
+    $VERSION = "0.9111";
 }
 
 load CPANPLUS::Shell;
diff --git a/pod/perldelta.pod b/pod/perldelta.pod
index 9c3de2d..27143b5 100644
--- a/pod/perldelta.pod
+++ b/pod/perldelta.pod
@@ -176,7 +176,7 @@ L<CPAN::Meta::YAML> has been upgraded from version 0.003 to version 0.004.
 
 =item *
 
-L<CPANPLUS> has been upgraded from version 0.9109 to version 0.9110.
+L<CPANPLUS> has been upgraded from version 0.9109 to version 0.9111.
 
 =item *
 
-- 
1.8.3.1