From: Steve Hay <SteveHay@planit.com>
Date: Sat, 10 Oct 2009 11:24:52 +0000 (+0100)
Subject: Upgrade to ExtUtils-Manifest-1.57
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=551c793ccd7e5d2e1bf93b1a3b33a4be3862ff39;p=p5sagit%2Fp5-mst-13.2.git

Upgrade to ExtUtils-Manifest-1.57
---

diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index fd71d6d..d6e7f1e 100755
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -616,10 +616,10 @@ use File::Glob qw(:case);
     'ExtUtils::Manifest' =>
 	{
 	'MAINTAINER'	=> 'rkobes',
-	'DISTRIBUTION'	=> 'RKOBES/ExtUtils-Manifest-1.56.tar.gz',
+	'DISTRIBUTION'	=> 'RKOBES/ExtUtils-Manifest-1.57.tar.gz',
 	'FILES'		=> q[cpan/ExtUtils-Manifest],
 	'CPAN'		=> 1,
-	'UPSTREAM'	=> undef,
+	'UPSTREAM'	=> 'cpan',
 	},
 
     'ExtUtils::ParseXS' =>
diff --git a/cpan/ExtUtils-Manifest/lib/ExtUtils/MANIFEST.SKIP b/cpan/ExtUtils-Manifest/lib/ExtUtils/MANIFEST.SKIP
index 885fedc..e50a7b3 100644
--- a/cpan/ExtUtils-Manifest/lib/ExtUtils/MANIFEST.SKIP
+++ b/cpan/ExtUtils-Manifest/lib/ExtUtils/MANIFEST.SKIP
@@ -7,6 +7,12 @@
 \B\.git\b
 \B\.gitignore\b
 \b_darcs\b
+\B\.cvsignore$
+
+# Avoid VMS specific MakeMaker generated files
+\bDescrip.MMS$
+\bDESCRIP.MMS$
+\bdescrip.mms$
 
 # Avoid Makemaker generated and utility files.
 \bMANIFEST\.bak
@@ -20,6 +26,10 @@
 # Avoid Module::Build generated and utility files.
 \bBuild$
 \b_build/
+\bBuild.bat$
+\bBuild.COM$
+\bBUILD.COM$
+\bbuild.com$
 
 # Avoid temp and backup files.
 ~$
@@ -27,6 +37,15 @@
 \#$
 \b\.#
 \.bak$
+\.tmp$
+\.#
+\.rej$
+
+# Avoid OS-specific files/dirs
+# Mac OSX metadata
+\B\.DS_Store
+# Mac OSX SMB mount metadata files
+\B\._
 
 # Avoid Devel::Cover files.
 \bcover_db\b
diff --git a/cpan/ExtUtils-Manifest/lib/ExtUtils/Manifest.pm b/cpan/ExtUtils-Manifest/lib/ExtUtils/Manifest.pm
index 7281421..df621d5 100644
--- a/cpan/ExtUtils-Manifest/lib/ExtUtils/Manifest.pm
+++ b/cpan/ExtUtils-Manifest/lib/ExtUtils/Manifest.pm
@@ -13,7 +13,7 @@ use vars qw($VERSION @ISA @EXPORT_OK
           $Is_MacOS $Is_VMS $Is_VMS_mode $Is_VMS_lc $Is_VMS_nodot
           $Debug $Verbose $Quiet $MANIFEST $DEFAULT_MSKIP);
 
-$VERSION = '1.56';
+$VERSION = '1.57';
 @ISA=('Exporter');
 @EXPORT_OK = qw(mkmanifest
                 manicheck  filecheck  fullcheck  skipcheck
@@ -268,7 +268,7 @@ sub skipcheck {
     my @skipped = ();
     foreach my $file (_sort keys %$found){
         if (&$matches($file)){
-            warn "Skipping $file\n";
+            warn "Skipping $file\n" unless $Quiet;
             push @skipped, $file;
             next;
         }
@@ -409,13 +409,17 @@ sub maniskip {
     local(*M, $_);
     open M, "< $mfile" or open M, "< $DEFAULT_MSKIP" or return sub {0};
     while (<M>){
-	chomp;
-	s/\r//;
-	next if /^#/;
-	next if /^\s*$/;
-        s/^'//;
-        s/'$//;
-	push @skip, _macify($_);
+      chomp;
+      s/\r//;
+      $_ =~ qr{^\s*(?:(?:'([^\\']*(?:\\.[^\\']*)*)')|([^#\s]\S*))?(?:(?:\s*)|(?:\s+(.*?)\s*))$};
+      #my $comment = $3;
+      my $filename = $2;
+      if ( defined($1) ) { 
+        $filename = $1; 
+        $filename =~ s/\\(['\\])/$1/g;
+      }
+      next if (not defined($filename) or not $filename);
+      push @skip, _macify($filename);
     }
     close M;
     return sub {0} unless (scalar @skip > 0);