cvs commit: ports/ports-mgmt/portlint Makefile ports/ports-mgmt/portlint/src portlint.pl

[Gerald Pfeifer]

Hi Marcus,

On Sun, 18 Jan 2009, Joe Marcus Clarke wrote:
>   Requested by:   Dominic Fandrey <kamikaze at bsdforen.de> [1]
>                   gerlad [3]

who is that gerlad guy? :-P

Seriously, thanks a lot for the fast reaction to my suggestion.  I never 
would have come up with this code myself, but now that it is there, I 
managed to debug a problem and make some other fixes.  (Checking for 
FCFLAGS instead of FFLAGS was a specification problem in my original
mail, sorry about that.)

Gerald


Commit log:
Check for CONFIGURE_ENV+=, too.  Warn about FFLAGS instead of FCFLAGS 
being passed to CONFIGURE_ENV and rework the associated error message.

--- /usr/local/bin/portlint	2009-01-18 20:24:16.000000000 +0100
+++ x	2009-01-19 04:37:47.132874000 +0100
@@ -1894,7 +1894,7 @@
 	#
 	# whole file: CONFIGURE_ENV
 	#
-	if ($whole =~ /\nCONFIGURE_ENV[?:]?=\s*([^\\\n]+(\\\n[^\\\n]+)*)/) {
+	if ($whole =~ /\nCONFIGURE_ENV[?:+]?=\s*([^\\\n]+(\\\n[^\\\n]+)*)/) {
 		my $configure_env = $1;
 		my $cflags = undef;
 		my $cxxflags = undef;
@@ -1937,10 +1937,10 @@
 
 		if ($configure_env =~ /(FC)=/ ||
 			$configure_env =~ /(F77)=/ ||
-			$configure_env =~ /(FCFLAGS)=/) {
-				&perror("FATAL", $file, -1, "The Fortran flag, $1 is already ".
+			$configure_env =~ /(FFLAGS)=/) {
+				&perror("FATAL", $file, -1, "$1 is already ".
 					"passed in CONFIGURE_ENV via bsd.gcc.mk.  If you need to ".
-					"override the the default value, alter $1 in the Makefile ".
+					"override the default value, alter $1 in the Makefile ".
 					"instead with $1=...");
 		}
 	}