From owner-svn-ports-head@FreeBSD.ORG  Wed Feb 26 22:44:49 2014
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])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 1B38DEA2;
 Wed, 26 Feb 2014 22:44:49 +0000 (UTC)
Received: from ainaz.pair.com (ainaz.pair.com [209.68.2.66])
 by mx1.freebsd.org (Postfix) with ESMTP id 6E5AB156E;
 Wed, 26 Feb 2014 22:44:48 +0000 (UTC)
Received: from [149.44.171.213] (nat.nue.novell.com [195.135.221.2])
 by ainaz.pair.com (Postfix) with ESMTPSA id 9B69E3F463;
 Wed, 26 Feb 2014 17:44:45 -0500 (EST)
Date: Wed, 26 Feb 2014 23:44:59 +0100 (CET)
From: Gerald Pfeifer <gerald@pfeifer.com>
To: Tijl Coosemans <tijl@FreeBSD.org>, Baptiste Daroussin <bapt@FreeBSD.org>
Subject: Re: svn commit: r336343 - in head: . Mk/Uses
In-Reply-To: <alpine.LSU.2.11.1402242318220.2233@tuna.site>
Message-ID: <alpine.LSU.2.11.1402262343320.2600@tuna.site>
References: <201312131322.rBDDMWZC038800@svn.freebsd.org>
 <alpine.LSU.2.11.1312160847420.2366@tuna.site>
 <20131217215533.3c0d9fcb@kalimero.tijl.coosemans.org>
 <20131217210048.GM99753@ithaqua.etoilebsd.net>
 <alpine.LSU.2.11.1402242318220.2233@tuna.site>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org,
 ports-committers@freebsd.org
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.17
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: Wed, 26 Feb 2014 22:44:49 -0000

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