From owner-svn-ports-head@FreeBSD.ORG  Sat Mar 16 13:01:13 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 11938E2A;
 Sat, 16 Mar 2013 13:01:13 +0000 (UTC)
 (envelope-from gerald@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id E1412DC7;
 Sat, 16 Mar 2013 13:01:12 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2GD1C2d060142;
 Sat, 16 Mar 2013 13:01:12 GMT (envelope-from gerald@svn.freebsd.org)
Received: (from gerald@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2GD1Con060141;
 Sat, 16 Mar 2013 13:01:12 GMT (envelope-from gerald@svn.freebsd.org)
Message-Id: <201303161301.r2GD1Con060141@svn.freebsd.org>
From: Gerald Pfeifer <gerald@FreeBSD.org>
Date: Sat, 16 Mar 2013 13:01:12 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r314352 - head/Mk
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 16 Mar 2013 13:01:13 -0000

Author: gerald
Date: Sat Mar 16 13:01:12 2013
New Revision: 314352
URL: http://svnweb.freebsd.org/changeset/ports/314352

Log:
  Simplify (and strictly speaking, though not practically given version
  number schemes between FreeBSD and GCC, correct) the check for a valid
  version specified by USE_GCC. [1]
  
  If IGNORE is set, have test-gcc note that instead of showing its usual,
  and in that case incorrect and useless, debugging output.
  
  PR:		175252 [1]
  Submitted by:	Yamaya Takashi <yamayan@kbh.biglobe.ne.jp> [1]

Modified:
  head/Mk/bsd.gcc.mk

Modified: head/Mk/bsd.gcc.mk
==============================================================================
--- head/Mk/bsd.gcc.mk	Sat Mar 16 12:51:56 2013	(r314351)
+++ head/Mk/bsd.gcc.mk	Sat Mar 16 13:01:12 2013	(r314352)
@@ -131,11 +131,9 @@ _GCC_ORLATER:=	true
 
 # Check if USE_GCC points to a valid version.
 .for v in ${GCCVERSIONS}
-. for j in ${GCCVERSION_${v}}
-.  if ${_USE_GCC}==${j}
+. if ${_USE_GCC}==${_GCCVERSION_${v}_V}
 _GCCVERSION_OKAY=	true;
-.  endif
-. endfor
+. endif
 .endfor
 
 .if !defined(_GCCVERSION_OKAY)
@@ -251,6 +249,9 @@ USE_BINUTILS=	yes
 test-gcc:
 	@echo USE_GCC=${USE_GCC}
 	@echo USE_FORTRAN=${USE_FORTRAN}
+.if defined(IGNORE)
+	@echo "IGNORE: ${IGNORE}"
+.else
 .if defined(USE_GCC)
 .if defined(_GCC_ORLATER)
 	@echo Port can use later versions.
@@ -272,3 +273,4 @@ test-gcc:
 	@echo LDFLAGS=\"${LDFLAGS}\"
 	@echo "BUILD_DEPENDS=${BUILD_DEPENDS}"
 	@echo "RUN_DEPENDS=${RUN_DEPENDS}"
+.endif