svn commit: r336343 - in head: . Mk/Uses

[Gerald Pfeifer]

On Wed, 26 Feb 2014, Gerald Pfeifer wrote:
>>> - I expect converting Fortran ports will be relatively straightforward
>>>   so the Fortran bits in bsd.gcc.mk can eventually be removed.
> This created more redundancy [...]

Some of this addressed thusly.

Gerald

====== snip ======
Author: gerald
Date: Wed Feb 26 22:42:58 2014
New Revision: 346234
URL: http://svnweb.freebsd.org/changeset/ports/346234
QAT: https://qat.redports.org/buildarchive/r346234/

Log:
  Instead of hardcoding the version of GCC to provide Fortran support,
  leverage ${GCC_DEFAULT} from ${PORTSDIR}/Mk/bsd.default-versions.mk.

Modified:
  head/Mk/Uses/fortran.mk

Modified: head/Mk/Uses/fortran.mk
==============================================================================
--- head/Mk/Uses/fortran.mk	Wed Feb 26 22:15:09 2014	(r346233)
+++ head/Mk/Uses/fortran.mk	Wed Feb 26 22:42:58 2014	(r346234)
@@ -16,7 +16,8 @@ fortran_ARGS=	gcc
 .endif
 
 .if ${fortran_ARGS} == gcc
-_GCC_VER=	46
+.include "${PORTSDIR}/Mk/bsd.default-versions.mk"
+_GCC_VER=	${GCC_DEFAULT:S/.//}
 BUILD_DEPENDS+=	gfortran${_GCC_VER}:${PORTSDIR}/lang/gcc
 RUN_DEPENDS+=	gfortran${_GCC_VER}:${PORTSDIR}/lang/gcc
 USE_BINUTILS=	yes