From: Nicholas Clark <nick@ccl4.org>
Date: Tue, 9 Aug 2011 07:44:54 +0000 (+0200)
Subject: Remove 5.8.x VOS specific code from Porting/checkcfgvar.pl.
X-Git-Tag: accepted/trunk/20130322.191538~3148^2~62
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2186be13a01ba687b2fe25f0d5c898031257c2b5;p=platform%2Fupstream%2Fperl.git

Remove 5.8.x VOS specific code from Porting/checkcfgvar.pl.

Commit 3fd80bd61943d0f8 in 2002 removed vos/config.{alpha,gf}.def from
blead, but they were still present in maint-5.8, so the logic to process
them was retained, to minimise the differences in the Porting/* scripts.
maint-5.8 is EOL now, so these can be removed.
---

diff --git a/Porting/checkcfgvar.pl b/Porting/checkcfgvar.pl
index 50daa40..61ecb1e 100755
--- a/Porting/checkcfgvar.pl
+++ b/Porting/checkcfgvar.pl
@@ -31,7 +31,6 @@ my %MASTER_CFG;
 
 my %lst;
 my @CFG = (
-	   # This list contains both 5.8.x and 5.9.x files,
 	   # we check from MANIFEST whether they are expected to be present.
 	   # We can't base our check on $], because that's the version of the
 	   # perl that we are running, not the version of the source tree.
@@ -42,8 +41,6 @@ my @CFG = (
 	   "uconfig.sh",
 	   "uconfig64.sh",
 	   "plan9/config_sh.sample",
-	   "vos/config.alpha.def",
-	   "vos/config.ga.def",
 	   "win32/config.bc",
 	   "win32/config.gc",
 	   "win32/config.gc64",
@@ -118,12 +115,10 @@ for my $cfg (@CFG) {
 		  }
 		  # foo='bar'
 		  # foo=bar
-		  # $foo='bar' # VOS 5.8.x specialty
-		  # $foo=bar   # VOS 5.8.x specialty
-		  if (/^\$?(\w+)='(.*)'$/) {
+		  if (/^(\w+)='(.*)'$/) {
 		      $cfg{$1}++;
 		  }
-		  elsif (/^\$?(\w+)=(.*)$/) {
+		  elsif (/^(\w+)=(.*)$/) {
 		      $cfg{$1}++;
 		  }
 		  elsif (/^\$\s+WC "(\w+)='(.*)'"$/) {