svn commit: r314673 - head/Mk

[Gerald Pfeifer]

Author: gerald
Date: Tue Mar 19 18:37:30 2013
New Revision: 314673
URL: http://svnweb.freebsd.org/changeset/ports/314673

Log:
  When the same version of GCC is present as a port and in base, prefer
  the former.
  
  Improve consistency of the code in on place.

Modified:
  head/Mk/bsd.gcc.mk

Modified: head/Mk/bsd.gcc.mk
==============================================================================
--- head/Mk/bsd.gcc.mk	Tue Mar 19 18:36:00 2013	(r314672)
+++ head/Mk/bsd.gcc.mk	Tue Mar 19 18:37:30 2013	(r314673)
@@ -146,15 +146,13 @@ IGNORE=	Unknown version of GCC specified
 .for v in ${GCCVERSIONS}
 . if exists(${LOCALBASE}/bin/gcc${_GCCVERSION_${v}_V:S/.//})
 _GCC_FOUND${v}=	port
-. endif
-. if ${OSVERSION} >= ${_GCCVERSION_${v}_L} && ${OSVERSION} < ${_GCCVERSION_${v}_R}
+. elif ${OSVERSION} >= ${_GCCVERSION_${v}_L} && ${OSVERSION} < ${_GCCVERSION_${v}_R}
 .  if exists(/usr/bin/gcc)
-_GCC_FOUND${v}:=	base
+_GCC_FOUND${v}=	base
 .  endif
 . endif
 .endfor
 
-#
 # If the GCC package defined in USE_GCC does not exist, but a later
 # version is allowed (for example 4.2+), see if there is a later.
 # First check if the base installed version is good enough, otherwise