From 36392a5f57ced56add402125103d4aaf4e746c07 Mon Sep 17 00:00:00 2001
From: Chris Williams <chris@bingosnet.co.uk>
Date: Tue, 30 Jun 2009 23:15:18 +0100
Subject: [PATCH] Update CPANPLUS::Dist::Build to CPAN version 0.35_03

---
 Porting/Maintainers.pl                             |  2 +-
 lib/CPANPLUS/Dist/Build.pm                         | 12 +++---------
 lib/CPANPLUS/Dist/Build/Constants.pm               |  2 +-
 lib/CPANPLUS/Dist/Build/t/02_CPANPLUS-Dist-Build.t |  3 ++-
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 7cb95b2..07aa92e 100755
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -484,7 +484,7 @@ package Maintainers;
     'CPANPLUS::Dist::Build' =>
 	{
 	'MAINTAINER'	=> 'bingos',
-	'DISTRIBUTION'	=> 'BINGOS/CPANPLUS-Dist-Build-0.35_02.tar.gz',
+	'DISTRIBUTION'	=> 'BINGOS/CPANPLUS-Dist-Build-0.35_03.tar.gz',
 	'FILES'		=> q[lib/CPANPLUS/Dist/Build.pm
 			     lib/CPANPLUS/Dist/Build
 			    ],
diff --git a/lib/CPANPLUS/Dist/Build.pm b/lib/CPANPLUS/Dist/Build.pm
index 84efc66..1396401 100644
--- a/lib/CPANPLUS/Dist/Build.pm
+++ b/lib/CPANPLUS/Dist/Build.pm
@@ -30,7 +30,7 @@ use Locale::Maketext::Simple    Class => 'CPANPLUS', Style => 'gettext';
 
 local $Params::Check::VERBOSE = 1;
 
-$VERSION = '0.35_02';
+$VERSION = '0.35_03';
 
 =pod
 
@@ -311,13 +311,7 @@ sub prepare {
         my $env = ENV_CPANPLUS_IS_EXECUTING;
         local $ENV{$env} = BUILD_PL->( $dir );
         my $run_perl    = $conf->get_program('perlwrapper');
-        my $cmd;
-        if ( ON_VMS ) {
-            $cmd = [$perl, BUILD_PL->($dir), @buildflags]
-        }
-        else {
-            $cmd = [$perl, $run_perl, BUILD_PL->($dir), @buildflags]
-        }
+        my $cmd = [$perl, $run_perl, BUILD_PL->($dir), @buildflags];
 
         unless ( scalar run(    command => $cmd,
                                 buffer  => \$prep_output,
@@ -385,7 +379,7 @@ sub _find_prereqs {
 
     my $content;
 
-    if ( version->new( $Module::Build::VERSION ) >= $safe_ver and ! ON_WIN32 and ! ON_VMS ) {
+    if ( version->new( $Module::Build::VERSION ) >= $safe_ver and IPC::Cmd->can_capture_buffer ) {
         my @buildflags = $dist->_buildflags_as_list( $buildflags );
 
         # Use the new Build action 'prereq_data'
diff --git a/lib/CPANPLUS/Dist/Build/Constants.pm b/lib/CPANPLUS/Dist/Build/Constants.pm
index 675151a..e9864a0 100644
--- a/lib/CPANPLUS/Dist/Build/Constants.pm
+++ b/lib/CPANPLUS/Dist/Build/Constants.pm
@@ -9,7 +9,7 @@ BEGIN {
     require Exporter;
     use vars    qw[$VERSION @ISA @EXPORT];
   
-    $VERSION    = '0.35_02';
+    $VERSION    = '0.35_03';
     @ISA        = qw[Exporter];
     @EXPORT     = qw[ BUILD_DIR BUILD ];
 }
diff --git a/lib/CPANPLUS/Dist/Build/t/02_CPANPLUS-Dist-Build.t b/lib/CPANPLUS/Dist/Build/t/02_CPANPLUS-Dist-Build.t
index bc40808..23f9398 100644
--- a/lib/CPANPLUS/Dist/Build/t/02_CPANPLUS-Dist-Build.t
+++ b/lib/CPANPLUS/Dist/Build/t/02_CPANPLUS-Dist-Build.t
@@ -197,8 +197,9 @@ while( my($path,$need_cc) = each %Map ) {
 
 ### test ENV setting while running Build.PL code
 SKIP: {   ### use print() not die() -- we're redirecting STDERR in tests!
-    skip("Known issues due to capturing with this test and MSWin32/VMS") if ON_WIN32 or ON_VMS;
     my $env     = ENV_CPANPLUS_IS_EXECUTING;
+    skip("Can't test ENV{$env} -- no buffers available")
+      unless IPC::Cmd->can_capture_buffer;
     my $clone   = $Mod->clone;
     
     ok( $clone,                 'Testing ENV settings $dist->prepare' );
-- 
2.7.4