Replace USE_GCC=4.6+ and USE_GCC=4.4+ by USE_GCC=yes.

Right now this is a noop in the former case and a noop in the latter
case unless lang/gcc44 has been installed explicitly.

This puts a bit more emphasis on standardizing on a canonical version
"current" GCC and makes it easier to update that canonical version
by changing the default in Mk/bsd.gcc.mk and updating the lang/gcc port.

That is, USE_GCC=yes means "use a decent/modern version of GCC" without
having to worry about details.

Approved by:	portmgr (bdrewery)

6 files changed, 21 insertions, 21 deletions

diff --git a/lang/bigloo/Makefile b/lang/bigloo/Makefile
index 8872101e263e..c70965b2f084 100644
--- a/lang/bigloo/Makefile
+++ b/lang/bigloo/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	pcre:${PORTSDIR}/devel/pcre \
 OPTIONS_DEFINE=	AVAHI ALSA FLAC GSTREAMER MPG123 SQLITE OPENSSL DOCS
 OPTIONS_DEFAULT=OPENSSL
 
-USE_GCC=	4.6+
+USE_GCC=	yes
 USE_EMACS=	yes
 USE_GMAKE=	yes
 HAS_CONFIGURE=	yes
diff --git a/lang/erlang-runtime15/Makefile b/lang/erlang-runtime15/Makefile
index 3f0bd9680578..d297dc1f10a4 100644
--- a/lang/erlang-runtime15/Makefile
+++ b/lang/erlang-runtime15/Makefile
@@ -36,11 +36,11 @@ PLIST_SUB=	ERLANG_LIB=${ERLANG_LIB}
 
 MAKE_JOBS_UNSAFE=yes
 
-OPTIONS_DEFINE=	GCC46 DOCS GS HIPE JAVA KQUEUE ODBC OPENSSL SCTP SMP THREADS WX DTRACE
+OPTIONS_DEFINE=	GCC DOCS GS HIPE JAVA KQUEUE ODBC OPENSSL SCTP SMP THREADS WX DTRACE
 OPTIONS_SINGLE=	ODBC
 OPTIONS_SINGLE_ODBC=	IODBC UNIXODBC
 
-GCC46_DESC=	Use gcc 4.6
+GCC_DESC=	Use current GCC
 HIPE_DESC=	Build native HiPE compiler
 KQUEUE_DESC=	Enable Kernel Poll (kqueue) support
 SCTP_DESC=	Enable SCTP support
@@ -67,12 +67,12 @@ DISTFILES+=	${ERLANG_DOCS}:erlangorg
 # probes fixed does not match the number of defined probes (54 != 132,
 # respectively)" you probably misconfigured DTrace in some way.
 
-.if ${ARCH} == "amd64" && ${PORT_OPTIONS:MDTRACE} && ! ${PORT_OPTIONS:MGCC46}
-IGNORE=		DTRACE support on amd64 requires GCC46 option
+.if ${ARCH} == "amd64" && ${PORT_OPTIONS:MDTRACE} && ! ${PORT_OPTIONS:MGCC}
+IGNORE=		DTRACE support on amd64 requires GCC option
 .endif
 
-.if ${PORT_OPTIONS:MGCC46}
-USE_GCC?=	4.6+
+.if ${PORT_OPTIONS:MGCC}
+USE_GCC?=	yes
 .endif
 
 .if ${PORT_OPTIONS:MDTRACE}
diff --git a/lang/erlang-runtime16/Makefile b/lang/erlang-runtime16/Makefile
index e085eb3f8a3e..cfeacc427133 100644
--- a/lang/erlang-runtime16/Makefile
+++ b/lang/erlang-runtime16/Makefile
@@ -35,11 +35,11 @@ PLIST_SUB=	ERLANG_LIB=${ERLANG_LIB}
 
 MAKE_JOBS_UNSAFE=yes
 
-OPTIONS_DEFINE=	GCC46 DOCS GS HIPE JAVA KQUEUE ODBC OPENSSL SCTP SMP THREADS WX DTRACE
+OPTIONS_DEFINE=	GCC DOCS GS HIPE JAVA KQUEUE ODBC OPENSSL SCTP SMP THREADS WX DTRACE
 OPTIONS_SINGLE=	ODBC
 OPTIONS_SINGLE_ODBC=	IODBC UNIXODBC
 
-GCC46_DESC=	Use gcc 4.6
+GCC_DESC=	Use current GCC
 HIPE_DESC=	Build native HiPE compiler
 KQUEUE_DESC=	Enable Kernel Poll (kqueue) support
 SCTP_DESC=	Enable SCTP support
@@ -66,12 +66,12 @@ DISTFILES+=	${ERLANG_DOCS}:erlangorg
 # probes fixed does not match the number of defined probes (54 != 132,
 # respectively)" you probably misconfigured DTrace in some way.
 
-.if ${ARCH} == "amd64" && ${PORT_OPTIONS:MDTRACE} && ! ${PORT_OPTIONS:MGCC46}
-IGNORE=		DTRACE support on amd64 requires GCC46 option
+.if ${ARCH} == "amd64" && ${PORT_OPTIONS:MDTRACE} && ! ${PORT_OPTIONS:MGCC}
+IGNORE=		DTRACE support on amd64 requires GCC option
 .endif
 
-.if ${PORT_OPTIONS:MGCC46}
-USE_GCC?=	4.6+
+.if ${PORT_OPTIONS:MGCC}
+USE_GCC?=	yes
 .endif
 
 .if ${PORT_OPTIONS:MDTRACE}
diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
index 46ad2bed6d7b..5dff97e1d6ad 100644
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -34,11 +34,11 @@ PLIST_SUB=	ERLANG_LIB=${ERLANG_LIB}
 
 MAKE_JOBS_UNSAFE=yes
 
-OPTIONS_DEFINE=	GCC46 DOCS GS HIPE JAVA KQUEUE ODBC OPENSSL SCTP SMP THREADS WX DTRACE
+OPTIONS_DEFINE=	GCC DOCS GS HIPE JAVA KQUEUE ODBC OPENSSL SCTP SMP THREADS WX DTRACE
 OPTIONS_SINGLE=	ODBC
 OPTIONS_SINGLE_ODBC=	IODBC UNIXODBC
 
-GCC46_DESC=	Use gcc 4.6
+GCC_DESC=	Use current GCC
 HIPE_DESC=	Build native HiPE compiler
 KQUEUE_DESC=	Enable Kernel Poll (kqueue) support
 SCTP_DESC=	Enable SCTP support
@@ -72,12 +72,12 @@ DOC_DISTFILES=	armstrong_thesis_2003.pdf:joe		\
 # probes fixed does not match the number of defined probes (54 != 132,
 # respectively)" you probably misconfigured DTrace in some way.
 
-.if ${ARCH} == "amd64" && ${PORT_OPTIONS:MDTRACE} && ! ${PORT_OPTIONS:MGCC46}
-IGNORE=		DTRACE support on amd64 requires GCC46 option
+.if ${ARCH} == "amd64" && ${PORT_OPTIONS:MDTRACE} && ! ${PORT_OPTIONS:MGCC}
+IGNORE=		DTRACE support on amd64 requires GCC option
 .endif
 
-.if ${PORT_OPTIONS:MGCC46}
-USE_GCC?=	4.6+
+.if ${PORT_OPTIONS:MGCC}
+USE_GCC?=	yes
 .endif
 
 .if ${PORT_OPTIONS:MDTRACE}
diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
index 1eace3ce2a48..99f77ff833c9 100644
--- a/lang/ghc/Makefile
+++ b/lang/ghc/Makefile
@@ -31,7 +31,7 @@ USE_PERL5_BUILD=	yes
 USE_GMAKE=		yes
 USES=			iconv ncurses
 USE_BINUTILS=		yes
-USE_GCC=		4.6+
+USE_GCC=		yes
 
 LICENSE=	BSD
 LICENSE_FILE=	${WRKSRC}/LICENSE
diff --git a/lang/intercal/Makefile b/lang/intercal/Makefile
index 0d3411d0bbfd..a8e1da78eff1 100644
--- a/lang/intercal/Makefile
+++ b/lang/intercal/Makefile
@@ -25,7 +25,7 @@ post-patch:
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 900000
-USE_GCC=	4.6+
+USE_GCC=	yes
 .endif
 
 .include <bsd.port.post.mk>