From owner-svn-ports-head@FreeBSD.ORG  Tue Feb 25 00:32:11 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 16659F49;
 Tue, 25 Feb 2014 00:32:11 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id DC6AA199C;
 Tue, 25 Feb 2014 00:32:10 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1P0WAEq003349;
 Tue, 25 Feb 2014 00:32:10 GMT (envelope-from gerald@svn.freebsd.org)
Received: (from gerald@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1P0WAmp003346;
 Tue, 25 Feb 2014 00:32:10 GMT (envelope-from gerald@svn.freebsd.org)
Message-Id: <201402250032.s1P0WAmp003346@svn.freebsd.org>
From: Gerald Pfeifer <gerald@FreeBSD.org>
Date: Tue, 25 Feb 2014 00:32:10 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r345909 - in head/Mk: . Uses
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.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: Tue, 25 Feb 2014 00:32:11 -0000

Author: gerald
Date: Tue Feb 25 00:32:09 2014
New Revision: 345909
URL: http://svnweb.freebsd.org/changeset/ports/345909
QAT: https://qat.redports.org/buildarchive/r345909/

Log:
  Reword the documentation at the top of this file.
  
  Sort the FPC_DEFAULT and GCC_DEFAULT entries.

Modified:
  head/Mk/Uses/fortran.mk
  head/Mk/bsd.default-versions.mk
  head/Mk/bsd.gcc.mk

Modified: head/Mk/Uses/fortran.mk
==============================================================================
--- head/Mk/Uses/fortran.mk	Mon Feb 24 23:05:10 2014	(r345908)
+++ head/Mk/Uses/fortran.mk	Tue Feb 25 00:32:09 2014	(r345909)
@@ -16,7 +16,7 @@ fortran_ARGS=	gcc
 .endif
 
 .if ${fortran_ARGS} == gcc
-_GCC_VER=	46
+_GCC_VER=	47
 BUILD_DEPENDS+=	gfortran${_GCC_VER}:${PORTSDIR}/lang/gcc
 RUN_DEPENDS+=	gfortran${_GCC_VER}:${PORTSDIR}/lang/gcc
 USE_BINUTILS=	yes

Modified: head/Mk/bsd.default-versions.mk
==============================================================================
--- head/Mk/bsd.default-versions.mk	Mon Feb 24 23:05:10 2014	(r345908)
+++ head/Mk/bsd.default-versions.mk	Tue Feb 25 00:32:09 2014	(r345909)
@@ -2,12 +2,13 @@
 #
 # MAINTAINER:	ports@FreeBSD.org
 #
-# Handle the default versions for users chosable multi versions.
+# Provide default versions for ports with multiple versions selectable
+# by the user.
 #
-# It expects users to define DEFAULT_VERSIONS in their make.conf
-# Syntax is the following:
+# Users who want to override these defaults can easily do so by defining
+# DEFAULT_VERSIONS in their make.conf as follows:
 #
-# DEFAULT_VERSIONS=	perl5=5.18 ruby=2.0
+#   DEFAULT_VERSIONS=	perl5=5.18 ruby=2.0
 
 .if !defined(_INCLUDE_BSD_DEFAULT_VERSIONS_MK)
 _INCLUDE_BSD_DEFAULT_VERSIONS_MK=	yes
@@ -18,8 +19,8 @@ ${_l:U}_DEFAULT=	${lang:C/.*=//g}
 .endfor
 
 APACHE_DEFAULT?=	2.2
-GCC_DEFAULT?=		4.6
 FPC_DEFAULT?=		2.6.2
+GCC_DEFAULT?=		4.6
 LUA_DEFAULT?=		5.2
 MYSQL_DEFAULT?=		5.5
 PERL5_DEFAULT?=		5.16

Modified: head/Mk/bsd.gcc.mk
==============================================================================
--- head/Mk/bsd.gcc.mk	Mon Feb 24 23:05:10 2014	(r345908)
+++ head/Mk/bsd.gcc.mk	Tue Feb 25 00:32:09 2014	(r345909)
@@ -19,7 +19,7 @@
 #
 # Examples:
 #   USE_GCC=	yes			# port requires a current version of GCC
-#							# (4.6 as of today, subject to change).
+#							# (4.7 as of today, subject to change).
 #   USE_GCC=	any			# port requires GCC 4.2 or later.
 #   USE_GCC=	4.8+		# port requires GCC 4.8 or later.
 #   USE_GCC=	4.8			# port requires GCC 4.8.