Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 25 Feb 2014 00:32:10 +0000 (UTC)
From:      Gerald Pfeifer <gerald@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r345909 - in head/Mk: . Uses
Message-ID:  <201402250032.s1P0WAmp003346@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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.



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402250032.s1P0WAmp003346>