From e198ad16b8e9d759aac5600f4a4964317fd90b90 Mon Sep 17 00:00:00 2001
From: Florian Ragwitz <rafl@debian.org>
Date: Tue, 9 Nov 2010 21:18:21 +0100
Subject: [PATCH] Move ExtUtils-Command from cpan/ to dist/

Randy Kobes passed away recently, so let's have p5p maintain it for now.
---
 MANIFEST                                           |  8 +++----
 Porting/Maintainers.pl                             |  6 ++---
 .../ExtUtils-Command/lib/ExtUtils/Command.pm       | 27 +++++++++++-----------
 {cpan => dist}/ExtUtils-Command/t/cp.t             |  0
 {cpan => dist}/ExtUtils-Command/t/eu_command.t     |  2 +-
 {cpan => dist}/ExtUtils-Command/t/lib/TieOut.pm    |  0
 make_ext.pl                                        |  2 +-
 t/TEST                                             |  2 +-
 8 files changed, 23 insertions(+), 24 deletions(-)
 rename {cpan => dist}/ExtUtils-Command/lib/ExtUtils/Command.pm (97%)
 rename {cpan => dist}/ExtUtils-Command/t/cp.t (100%)
 rename {cpan => dist}/ExtUtils-Command/t/eu_command.t (99%)
 rename {cpan => dist}/ExtUtils-Command/t/lib/TieOut.pm (100%)

diff --git a/MANIFEST b/MANIFEST
index a28abe5..1ea8e21 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -876,10 +876,6 @@ cpan/ExtUtils-CBuilder/t/00-have-compiler.t			ExtUtils::CBuilder tests
 cpan/ExtUtils-CBuilder/t/01-basic.t				tests for ExtUtils::CBuilder
 cpan/ExtUtils-CBuilder/t/02-link.t				tests for ExtUtils::CBuilder
 cpan/ExtUtils-CBuilder/t/03-cplusplus.t				tests for ExtUtils::CBuilder
-cpan/ExtUtils-Command/lib/ExtUtils/Command.pm	Utilities for Make on non-UNIX platforms
-cpan/ExtUtils-Command/t/cp.t			See if ExtUtils::Command works
-cpan/ExtUtils-Command/t/eu_command.t		See if ExtUtils::Command works
-cpan/ExtUtils-Command/t/lib/TieOut.pm		Testing library to capture prints
 cpan/ExtUtils-Constant/lib/ExtUtils/Constant/Base.pm		generate XS code to import C header constants
 cpan/ExtUtils-Constant/lib/ExtUtils/Constant.pm			generate XS code to import C header constants
 cpan/ExtUtils-Constant/lib/ExtUtils/Constant/ProxySubs.pm	generate XS code for proxy constants
@@ -2697,6 +2693,10 @@ dist/Data-Dumper/t/overload.t	See if Data::Dumper works for overloaded data
 dist/Data-Dumper/t/pair.t	See if Data::Dumper pair separator works
 dist/Data-Dumper/t/perl-74170.t	Regression test for stack reallocation
 dist/Data-Dumper/t/terse.t	See if Data::Dumper terse option works
+dist/ExtUtils-Command/lib/ExtUtils/Command.pm	Utilities for Make on non-UNIX platforms
+dist/ExtUtils-Command/t/cp.t			See if ExtUtils::Command works
+dist/ExtUtils-Command/t/eu_command.t		See if ExtUtils::Command works
+dist/ExtUtils-Command/t/lib/TieOut.pm		Testing library to capture prints
 dist/ExtUtils-Install/Changes				ExtUtils-Install change log
 dist/ExtUtils-Install/lib/ExtUtils/Installed.pm		Information on installed extensions
 dist/ExtUtils-Install/lib/ExtUtils/Install.pm		Handles 'make install' on extensions
diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 654ed68..3a954e7 100755
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -534,15 +534,15 @@ use File::Glob qw(:case);
 
     'ExtUtils::Command' =>
 	{
-	'MAINTAINER'	=> 'rkobes',
+	'MAINTAINER'	=> 'p5p',
 	'DISTRIBUTION'	=> 'RKOBES/ExtUtils-Command-1.16.tar.gz',
-	'FILES'		=> q[cpan/ExtUtils-Command],
+	'FILES'		=> q[dist/ExtUtils-Command],
 	'EXCLUDED'	=> [ qw{ t/shell_command.t
 				 t/shell_exit.t
 				 lib/Shell/Command.pm
 			       },
 			   ],
-	'UPSTREAM'	=> undef,
+	'UPSTREAM'	=> 'blead',
 	},
 
     'ExtUtils::Constant' =>
diff --git a/cpan/ExtUtils-Command/lib/ExtUtils/Command.pm b/dist/ExtUtils-Command/lib/ExtUtils/Command.pm
similarity index 97%
rename from cpan/ExtUtils-Command/lib/ExtUtils/Command.pm
rename to dist/ExtUtils-Command/lib/ExtUtils/Command.pm
index b5632ff..7de4095 100644
--- a/cpan/ExtUtils-Command/lib/ExtUtils/Command.pm
+++ b/dist/ExtUtils-Command/lib/ExtUtils/Command.pm
@@ -32,7 +32,7 @@ if( $Is_VMS ) {
         my $unix_rpt = $ENV{'DECC$FILENAME_UNIX_REPORT'} || '';
         my $efs_charset = $ENV{'DECC$EFS_CHARSET'} || '';
         my $efs_case = $ENV{'DECC$EFS_CASE_PRESERVE'} || '';
-        $vms_unix_rpt = $unix_rpt =~ /^[ET1]/i; 
+        $vms_unix_rpt = $unix_rpt =~ /^[ET1]/i;
         $vms_efs = $efs_charset =~ /^[ET1]/i;
         $vms_case = $efs_case =~ /^[ET1]/i;
     }
@@ -97,7 +97,7 @@ sub expand_wildcards
 
 Concatenates all files mentioned on command line to STDOUT.
 
-=cut 
+=cut
 
 sub cat ()
 {
@@ -111,7 +111,7 @@ sub cat ()
 
 Sets modified time of destination to that of source.
 
-=cut 
+=cut
 
 sub eqtime
 {
@@ -126,7 +126,7 @@ sub eqtime
 
 Removes files and directories - recursively (even if readonly)
 
-=cut 
+=cut
 
 sub rm_rf
 {
@@ -140,7 +140,7 @@ sub rm_rf
 
 Removes files (even if readonly)
 
-=cut 
+=cut
 
 sub rm_f {
     expand_wildcards();
@@ -173,9 +173,9 @@ sub _unlink {
 
     touch file ...
 
-Makes files exist, with current timestamp 
+Makes files exist, with current timestamp
 
-=cut 
+=cut
 
 sub touch {
     my $t    = time;
@@ -197,7 +197,7 @@ destination is an existing directory.
 
 Returns true if all moves succeeded, false otherwise.
 
-=cut 
+=cut
 
 sub mv {
     expand_wildcards();
@@ -249,7 +249,7 @@ sub cp {
 
 Sets UNIX like permissions 'mode' on all the files.  e.g. 0666
 
-=cut 
+=cut
 
 sub chmod {
     local @ARGV = @ARGV;
@@ -280,7 +280,7 @@ sub chmod {
 
 Creates directories, including any parent directories.
 
-=cut 
+=cut
 
 sub mkpath
 {
@@ -295,7 +295,7 @@ sub mkpath
 Tests if a file exists.  I<Exits> with 0 if it does, 1 if it does not (ie.
 shell's idea of true and false).
 
-=cut 
+=cut
 
 sub test_f
 {
@@ -337,9 +337,9 @@ sub dos2unix {
 	my $orig = $_;
 	my $temp = '.dos2unix_tmp';
 	open ORIG, $_ or do { warn "dos2unix can't open $_: $!"; return };
-	open TEMP, ">$temp" or 
+	open TEMP, ">$temp" or
 	    do { warn "dos2unix can't create .dos2unix_tmp: $!"; return };
-        while (my $line = <ORIG>) { 
+        while (my $line = <ORIG>) {
             $line =~ s/\015\012/\012/g;
             print TEMP $line;
         }
@@ -366,4 +366,3 @@ ExtUtils-MakeMaker package and, as a separate CPAN package, by
 Randy Kobes C<r.kobes@uwinnipeg.ca>.
 
 =cut
-
diff --git a/cpan/ExtUtils-Command/t/cp.t b/dist/ExtUtils-Command/t/cp.t
similarity index 100%
rename from cpan/ExtUtils-Command/t/cp.t
rename to dist/ExtUtils-Command/t/cp.t
diff --git a/cpan/ExtUtils-Command/t/eu_command.t b/dist/ExtUtils-Command/t/eu_command.t
similarity index 99%
rename from cpan/ExtUtils-Command/t/eu_command.t
rename to dist/ExtUtils-Command/t/eu_command.t
index 71ec8c2..9037464 100644
--- a/cpan/ExtUtils-Command/t/eu_command.t
+++ b/dist/ExtUtils-Command/t/eu_command.t
@@ -42,7 +42,7 @@ BEGIN {
     @ARGV = ($self, $self);
 
     cat();
-    is( scalar( $$out =~ s/use_ok\( 'ExtUtils::Command'//g), 2, 
+    is( scalar( $$out =~ s/use_ok\( 'ExtUtils::Command'//g), 2,
         'concatenation worked' );
 
     # the truth value here is reversed -- Perl true is shell false
diff --git a/cpan/ExtUtils-Command/t/lib/TieOut.pm b/dist/ExtUtils-Command/t/lib/TieOut.pm
similarity index 100%
rename from cpan/ExtUtils-Command/t/lib/TieOut.pm
rename to dist/ExtUtils-Command/t/lib/TieOut.pm
diff --git a/make_ext.pl b/make_ext.pl
index 34ff212..56a5188 100644
--- a/make_ext.pl
+++ b/make_ext.pl
@@ -29,7 +29,7 @@ my $is_Unix = !$is_Win32 && !$is_VMS;
 # environment variables on VMS
 my @toolchain = qw(cpan/AutoLoader/lib
 		   dist/Cwd dist/Cwd/lib
-		   cpan/ExtUtils-Command/lib
+		   dist/ExtUtils-Command/lib
 		   dist/ExtUtils-Install/lib
 		   cpan/ExtUtils-MakeMaker/lib
 		   dist/ExtUtils-Manifest/lib
diff --git a/t/TEST b/t/TEST
index 6bcaa41..945015f 100755
--- a/t/TEST
+++ b/t/TEST
@@ -35,7 +35,6 @@ my %abs = (
 	   '../cpan/Class-ISA' => 1,
 	   '../cpan/Devel-PPPort' => 1,
 	   '../cpan/Encode' => 1,
-	   '../cpan/ExtUtils-Command' => 1,
 	   '../cpan/ExtUtils-Constant' => 1,
 	   '../cpan/ExtUtils-MakeMaker' => 1,
 	   '../cpan/File-Fetch' => 1,
@@ -56,6 +55,7 @@ my %abs = (
 	   '../cpan/Tie-File' => 1,
 	   '../cpan/podlators' => 1,
 	   '../dist/Cwd' => 1,
+	   '../dist/ExtUtils-Command' => 1,
 	   '../dist/ExtUtils-Install' => 1,
 	   '../dist/ExtUtils-Manifest' => 1,
 	   '../dist/ExtUtils-ParseXS' => 1,
-- 
2.7.4