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)
svn path=/head/; revision=324851
2024-12-23 04:23:08 +00:00 · 2013-08-17 16:27:24 +00:00 · 2013-08-17 16:27:24 +00:00 · 41e60477bd · 2021-03-31 03:12:20 +00:00
commit 41e60477bd
parent b60960981b
93 changed files with 120 additions and 123 deletions
--- a/archivers/rvm/Makefile
+++ b/archivers/rvm/Makefile
@ -17,7 +17,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 NO_LATEST_LINK=	yes

 USE_GMAKE=	yes
-USE_GCC=	4.6+
+USE_GCC=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-default-config-file=${PREFIX}/etc/rvm.conf \
 		--enable-assume-stl-memory-exception
--- a/audio/beast/Makefile
+++ b/audio/beast/Makefile
@ -22,7 +22,7 @@ OPTIONS_DEFINE_i386=	SSE

 USE_BZIP2=	yes
 USES=		pathfix gettext
-USE_GCC=	4.6+
+USE_GCC=	yes
 USE_GNOME=	gnomehier libgnomecanvas
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
--- a/audio/py-tagpy/Makefile
+++ b/audio/py-tagpy/Makefile
@ -26,7 +26,7 @@ CONFIGURE_ARGS=	--taglib-inc-dir="${LOCALBASE}/include/taglib" \

 PLIST_FILES=	%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%

-USE_GCC=	4.4+
+USE_GCC=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	easy_install
 PYEASYINSTALL_ARCHDEP=	yes
--- a/biology/seqan/Makefile
+++ b/biology/seqan/Makefile
@ -33,7 +33,7 @@ PKG_MESSAGE=	${WRKDIR}/pkg-message

 .if ${ARCH} == i386
 # triggers internal error in system gcc
-USE_GCC=	4.6+
+USE_GCC=	yes
 .endif

 # unsafe workaround because FreeBSD lacks logl and expl
--- a/cad/calculix/Makefile
+++ b/cad/calculix/Makefile
@ -74,7 +74,7 @@ LAPACK_LIBS=		-llapack
 .endif

 USE_FORTRAN=	yes
-USE_GCC=	4.6+
+USE_GCC=	yes

 .if ${ARCH} == "sparc64"
 CFLAGS+=	-fPIC
--- a/cad/gspiceui/Makefile
+++ b/cad/gspiceui/Makefile
@ -29,7 +29,7 @@ OPTIONS_DEFAULT=	NGSPICE GWAVE

 USE_WX=		2.6+
 WX_UNICODE=	yes
-USE_GCC=	4.6+
+USE_GCC=	yes
 USE_GMAKE=	yes

 DESKTOP_ENTRIES=	"GSpiceUI" "Circuit Simulator GUI" \
--- a/chinese/ibus-pinyin/Makefile
+++ b/chinese/ibus-pinyin/Makefile
@ -20,7 +20,7 @@ RUN_DEPENDS=	ibus-daemon:${PORTSDIR}/textproc/ibus \
 USE_PYTHON=	yes
 USE_GNOME=	pygtk2

-USE_GCC=	4.6+
+USE_GCC=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-dependency-tracking --disable-lua-extension
--- a/comms/dabstick-radio/Makefile
+++ b/comms/dabstick-radio/Makefile
@ -40,7 +40,7 @@ CC=		clang
 CXX=		clang++
 CPP=		clang-cpp
 .else
-USE_GCC=	4.6+
+USE_GCC=	yes
 .endif

 do-configure:
--- a/comms/efax-gtk/Makefile
+++ b/comms/efax-gtk/Makefile
@ -20,7 +20,7 @@ USES=		pkgconfig
 USE_GHOSTSCRIPT_RUN=yes
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
-USE_GCC=	4.4+
+USE_GCC=	yes

 CONFLICTS=	efax-[0-9]*

--- a/comms/ems-flasher/Makefile
+++ b/comms/ems-flasher/Makefile
@ -20,7 +20,7 @@ LICENSE=	MIT
 USE_GMAKE=	yes
 CFLAGS+=	-g -Wall
 LDFLAGS+=	-lusb
-USE_GCC=	4.6+
+USE_GCC=	yes

 PLIST_FILES=	bin/ems-flasher

--- a/databases/dbf/Makefile
+++ b/databases/dbf/Makefile
@ -18,7 +18,7 @@ WRKSRC=		${WRKDIR}/lib${PORTNAME}
 USE_ZIP=	yes
 USES=        pathfix
 USE_GNOME=	intltool
-USE_GCC=	4.6+
+USE_GCC=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_prog_DOC_TO_MAN=""
 USE_LDCONFIG=	yes
--- a/databases/tarantool/Makefile
+++ b/databases/tarantool/Makefile
@ -14,7 +14,7 @@ LICENSE=	BSD

 TR_REV=		45-g2f7b3f9
 USES=		cmake gettext:build
-USE_GCC=	4.6+
+USE_GCC=	yes
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 USE_PERL5=	yes
--- a/deskutils/notify-osd/Makefile
+++ b/deskutils/notify-osd/Makefile
@ -22,6 +22,6 @@ RUN_DEPENDS=	dbus-daemon:${PORTSDIR}/devel/dbus
 GNU_CONFIGURE=	yes
 USES=		gmake
 USE_GNOME=	libwnck gconf2
-USE_GCC=	4.4+
+USE_GCC=	yes

 .include <bsd.port.mk>
--- a/devel/astyle/Makefile
+++ b/devel/astyle/Makefile
@ -15,7 +15,7 @@ CFLAGS+=	-W -Wall -fno-rtti -fno-exceptions
 LDFLAGS+=	-s
 MAKE_ARGS+=	CFLAGS="${CFLAGS}"
 USE_GMAKE=	yes
-USE_GCC=	4.4+
+USE_GCC=	yes

 WRKSRC=		${WRKDIR}/astyle/build/gcc

--- a/devel/clanlib/Makefile
+++ b/devel/clanlib/Makefile
@ -24,7 +24,7 @@ LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
 		pcre:${PORTSDIR}/devel/pcre

 USE_GMAKE=	yes
-USE_GCC=	4.6+
+USE_GCC=	yes
 USE_XORG=	x11
 USES=	pathfix pkgconfig
 USE_LDCONFIG=	yes
--- a/devel/cocaine-core/Makefile
+++ b/devel/cocaine-core/Makefile
@ -20,7 +20,7 @@ LIB_DEPENDS=	boost_iostreams:${PORTSDIR}/devel/boost-libs \
 		zmq:${PORTSDIR}/devel/zmq

 USES=		cmake
-USE_GCC=	4.6+
+USE_GCC=	yes
 USE_LDCONFIG=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	zloidemon
--- a/devel/covtool/Makefile
+++ b/devel/covtool/Makefile
@ -11,7 +11,7 @@ COMMENT=	C++ test coverage analyzer

 WRKSRC=	        ${WRKDIR}
 USE_ZIP=	yes
-USE_GCC=	4.6+
+USE_GCC=	yes
 USE_GMAKE=	yes
 MAKEFILE=	makefile

--- a/devel/freeocl/Makefile
+++ b/devel/freeocl/Makefile
@ -17,7 +17,7 @@ LICENSE=	LGPL3

 WRKSRC=		${WRKDIR}/FreeOCL-${PORTVERSION}-Source

-USE_GCC=	4.6+
+USE_GCC=	yes
 USES=		cmake
 USE_LDCONFIG=	yes
 CMAKE_BUILD_TYPE=Release
--- a/devel/kdevelop-pg-qt/Makefile
+++ b/devel/kdevelop-pg-qt/Makefile
@ -16,7 +16,7 @@ COMMENT=	Parser-generator from KDevplatform

 BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex

-USE_GCC=	4.6+
+USE_GCC=	yes
 USE_BZIP2=	yes
 USES=		bison cmake:outsource
 USE_KDE4=	automoc4 kdehier kdelibs kdeprefix
--- a/devel/libYGP/Makefile
+++ b/devel/libYGP/Makefile
@ -15,7 +15,7 @@ LIB_DEPENDS=	gmp.10:${PORTSDIR}/math/gmp \
 		boost_filesystem:${PORTSDIR}/devel/boost-libs

 USE_BZIP2=	yes
-USE_GCC=	4.6+
+USE_GCC=	yes
 GNU_CONFIGURE=	yes
 USES=	pathfix pkgconfig gettext
 USE_LDCONFIG=	yes
--- a/devel/libclaw/Makefile
+++ b/devel/libclaw/Makefile
@ -16,7 +16,7 @@ BUILD_DEPENDS=	${LOCALBASE}/include/boost/bind.hpp:${PORTSDIR}/devel/boost-libs
 USES=		cmake gettext
 CMAKE_ARGS=	-DCLAW_CMAKE_MODULES_INSTALL_PATH="${DATADIR}/cmake"
 USE_LDCONFIG=	yes
-USE_GCC=	4.6+
+USE_GCC=	yes

 post-patch:
 	@${REINPLACE_CMD} -e '/subdirs/ s|doc||' ${WRKSRC}/CMakeLists.txt
--- a/devel/msgpack/Makefile
+++ b/devel/msgpack/Makefile
@ -20,7 +20,7 @@ USE_LDCONFIG=	yes

 .if ${ARCH} == "sparc64"
 # required for __sync _* atomic operations on sparc
-USE_GCC=	4.4+
+USE_GCC=	yes
 .else
 USE_GCC=	4.2+
 .endif
--- a/devel/nemiver/Makefile
+++ b/devel/nemiver/Makefile
@ -28,7 +28,7 @@ CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	ac_cv_path_GDB_PROG=${LOCALBASE}/bin/gdb
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intltool gnomedocutils gconf2 vte
-USE_GCC=	4.4+
+USE_GCC=	yes
 USE_LDCONFIG=	yes
 USES=		gettext
 INSTALLS_OMF=	yes
--- a/devel/p5-perlkde/Makefile
+++ b/devel/p5-perlkde/Makefile
@ -14,7 +14,7 @@ COMMENT=	Perl bindings for KDE
 USE_XZ=		yes
 USE_PERL5=	yes
 # Build fails with system gcc
-USE_GCC=	4.6+
+USE_GCC=	yes
 USE_KDE4=	kdehier kdeprefix perlqt smokekde automoc4
 USE_QT4=	network opengl sql svg xml \
 		qmake_build moc_build uic_build rcc_build
--- a/devel/pure-stldict/Makefile
+++ b/devel/pure-stldict/Makefile
@ -10,8 +10,7 @@ COMMENT=	Pure interface to C++ STL map/unordered_map

 USE_PURE=	yes

-USE_GCC=	4.6+
-CXX=		g++${GCC_DEFAULT_V}
+USE_GCC=	yes
 CXXFLAGS+=	-std=c++0x -DHAVE_STD_IS_PERMUTATION

 .include "${.CURDIR}/../../lang/pure/bsd.pure.mk"
--- a/devel/raknet/Makefile
+++ b/devel/raknet/Makefile
@ -28,7 +28,7 @@ USE_LDCONFIG=	yes
 USE_DOS2UNIX=	yes
 DOS2UNIX_REGEX=	.*\.(cpp|h|txt)

-USE_GCC=	4.6+
+USE_GCC=	yes
 USE_GMAKE=	yes
 USES=		cmake

--- a/editors/emacs-devel/Makefile
+++ b/editors/emacs-devel/Makefile
@ -232,7 +232,7 @@ CONFIGURE_ARGS+=	--without-gnutls
 .endif

 .if ${PORT_OPTIONS:MLTO}
-USE_GCC=	4.6+
+USE_GCC=	yes
 CONFIGURE_ARGS+=	--enable-link-time-optimization
 .endif

--- a/editors/libreoffice/Makefile
+++ b/editors/libreoffice/Makefile
@ -339,7 +339,7 @@ CONFIGURE_ARGS+=	--disable-neon
 .include <bsd.port.pre.mk>

 .if defined(WITH_GCC)
-USE_GCC=	4.6+
+USE_GCC=	yes
 CONFIGURE_ENV+=	CXXCPP="${CPP}"
 .else
 .if exists(/usr/bin/clang) && ${OSVERSION} > 901502
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@ -24,7 +24,7 @@ USE_XORG=	x11 ice xaw xau xext xrender xrandr \
 		xi xt xcursor xdamage xcomposite xfixes
 USE_GL=		gl glu
 USE_GSTREAMER=	yes
-#USE_GCC=	4.6+
+#USE_GCC=	yes
 USE_GMAKE=	yes
 USE_PYTHON=	yes
 USE_PERL5=	build
--- a/emulators/dolphin-emu-devel/Makefile
+++ b/emulators/dolphin-emu-devel/Makefile
@ -34,7 +34,7 @@ DOS2UNIX_REGEX=	.*\.(h|c|cpp)

 # XXX Has only been tested with clang and gcc
 .if ${CC} != "clang" && ${CXX} != "clang++"
-USE_GCC=	4.6+
+USE_GCC=	yes
 .endif

 USES=		cmake pkgconfig iconv
--- a/emulators/fceux/Makefile
+++ b/emulators/fceux/Makefile
@ -110,7 +110,7 @@ CC=		/usr/bin/clang
 CXX=		/usr/bin/clang++
 CPP=		/usr/bin/clang-cpp
 .else
-USE_GCC=	4.6+
+USE_GCC=	yes
 .endif
 .endif

--- a/emulators/higan/Makefile
+++ b/emulators/higan/Makefile
@ -14,7 +14,7 @@ COMMENT=	Nintendo multi-system emulator
 USES=		pkgconfig
 USE_XZ=		yes
 USE_GMAKE=	yes
-USE_GCC=	4.6+
+USE_GCC=	yes
 USE_LDCONFIG=	yes

 ONLY_FOR_ARCHS=	i386 amd64
--- a/emulators/mame/Makefile
+++ b/emulators/mame/Makefile
@ -91,7 +91,7 @@ CC=		/usr/bin/clang
 CPP=		/usr/bin/clang-cpp
 CXX=		/usr/bin/clang++
 .else
-USE_GCC=	4.6+
+USE_GCC=	yes
 .endif

 .if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
--- a/emulators/mess/Makefile
+++ b/emulators/mess/Makefile
@ -91,7 +91,7 @@ CC=		/usr/bin/clang
 CPP=		/usr/bin/clang-cpp
 CXX=		/usr/bin/clang++
 .else
-USE_GCC=	4.6+
+USE_GCC=	yes
 .endif

 .if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
--- a/finance/qhacc/Makefile
+++ b/finance/qhacc/Makefile
@ -17,7 +17,7 @@ LIB_DEPENDS=	qwt6:${PORTSDIR}/x11-toolkits/qwt6
 OPTIONS_DEFINE=	DOCS

 USE_QT4=	corelib gui sql moc_build qmake_build rcc_build uic_build
-USE_GCC=	4.6+
+USE_GCC=	yes
 USE_LDCONFIG=	yes

 CXXFLAGS+=	-fpermissive
--- a/games/bastet/Makefile
+++ b/games/bastet/Makefile
@ -27,7 +27,7 @@ PLIST_FILES=	bin/bastet
 .include <bsd.port.pre.mk>

 .if ${ARCH} != "i386"
-USE_GCC=	4.6+
+USE_GCC=	yes
 .endif

 post-patch:
--- a/games/battletanks/Makefile
+++ b/games/battletanks/Makefile
@ -17,7 +17,7 @@ LIB_DEPENDS=	sigc-2.0.0:${PORTSDIR}/devel/libsigc++20 \
 		smpeg.1:${PORTSDIR}/multimedia/smpeg

 USE_BZIP2=	yes
-USE_GCC=	4.6+
+USE_GCC=	yes
 USE_LDCONFIG=	yes
 USE_LUA=	5.0+
 USE_OPENAL=	al
--- a/games/corsix-th/Makefile
+++ b/games/corsix-th/Makefile
@ -38,7 +38,7 @@ CC=		/usr/bin/clang
 CPP=		/usr/bin/clang-cpp
 CXX=		/usr/bin/clang++
 .else
-USE_GCC=	4.6+
+USE_GCC=	yes
 .endif
 .endif
 .else
--- a/games/openlierox/Makefile
+++ b/games/openlierox/Makefile
@ -20,7 +20,7 @@ USE_BZIP2=	yes
 USE_SDL=	sdl image
 USE_GNOME=	libxml2
 USE_OPENAL=	yes
-USE_GCC=	4.6+
+USE_GCC=	yes

 CFLAGS+=	-I${LOCALBASE}/include
 CXXFLAGS+=	-I${LOCALBASE}/include
--- a/games/openxcom/Makefile
+++ b/games/openxcom/Makefile
@ -23,7 +23,7 @@ GH_COMMIT=	5c8b540
 USE_GMAKE=	yes
 USE_SDL=	sdl mixer image gfx
 USE_GL=		gl
-USE_GCC=	4.6+
+USE_GCC=	yes

 BUILD_WRKSRC=	${WRKSRC}/src
 MAKEFILE=	Makefile.simple
--- a/games/openyahtzee/Makefile
+++ b/games/openyahtzee/Makefile
@ -20,7 +20,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/scoped_ptr.hpp:${PORTSDIR}/devel/boost-libs

 USE_BZIP2=	yes
-USE_GCC=	4.6+
+USE_GCC=	yes
 USE_WX=		2.8+
 WX_CONF_ARGS=	absolute
 GNU_CONFIGURE=	yes
--- a/games/plee-the-bear/Makefile
+++ b/games/plee-the-bear/Makefile
@ -25,7 +25,7 @@ USE_GL=		gl glu
 WANT_GNOME=	yes
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
-USE_GCC=	4.6+
+USE_GCC=	yes

 USES=		cmake
 CMAKE_ARGS=	-Dlibclaw_DIR="${LOCALBASE}/share/libclaw/cmake" \
--- a/games/super_methane_brothers/Makefile
+++ b/games/super_methane_brothers/Makefile
@ -17,7 +17,7 @@ LIB_DEPENDS=	clan23Core:${PORTSDIR}/devel/clanlib \
 		execinfo:${PORTSDIR}/devel/libexecinfo

 USES=		pkgconfig
-USE_GCC=	4.6+
+USE_GCC=	yes
 USE_GL=		glu
 USE_GMAKE=	yes
 MAKE_ENV=	METHANE_FLAGS="${CPPFLAGS}" METHANE_LIBS="${LDFLAGS}"
--- a/games/warzone2100/Makefile
+++ b/games/warzone2100/Makefile
@ -41,7 +41,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 REINPLACE_ARGS=	-i ''
 PORTDOCS=	*
-USE_GCC=	4.6+
+USE_GCC=	yes

 .include <bsd.port.options.mk>

--- a/games/xonotic/Makefile
+++ b/games/xonotic/Makefile
@ -28,7 +28,7 @@ MAKE_ARGS=	DP_FS_BASEDIR="${DATADIR}" \
 MAKE_JOBS_UNSAFE=yes
 ALL_TARGET=	#
 BINARIES=	#
-USE_GCC=	4.6+
+USE_GCC=	yes

 OPTIONS_DEFAULT=CLIENT DEDICATED
 OPTIONS_MULTI=	COMPONENTS
--- a/graphics/darktable/Makefile
+++ b/graphics/darktable/Makefile
@ -32,15 +32,15 @@ MAN1=		${PORTNAME}.1
 LDFLAGS+=	-L${LOCALBASE}/lib -lintl

 OPTIONS_DEFINE=	GPHOTO GEO FLICKR FACEBOOK KWALLET GNOMEKEYRING RAWSPEED \
-		OPENJPEG SLIDESHOW NLS GCC46
+		OPENJPEG SLIDESHOW NLS GCC

 GEO_DESC=	Geotagging support
 FACEBOOK_DESC=	Support images export to Facebook
 RAWSPEED_DESC=	Compile with rawspeed backend
 SLIDESHOW_DESC=	Build OpenGL/SDL slideshow viewer
-GCC46_DESC=	Build with GCC 4.6+ (better OpenMP support)
+GCC_DESC=	Build with a current version of GCC (better OpenMP support)

-OPTIONS_DEFAULT=	GPHOTO RAWSPEED GCC46
+OPTIONS_DEFAULT=	GPHOTO RAWSPEED GCC

 .include <bsd.port.options.mk>

@ -114,8 +114,8 @@ USES+=		gettext
 CMAKE_ARGS+=	-DUSE_NLS:BOOL=OFF
 .endif

-.if ${PORT_OPTIONS:MGCC46}
-USE_GCC=	4.6+
+.if ${PORT_OPTIONS:MGCC}
+USE_GCC=	yes
 # libdarktable.so has parts written in C++ (built-in rawspeed and libraw)
 # and is linked to GCC 4.6's libstdc++.  However CMake removes RPATH from
 # this library, and libstdc++ from base (GCC 4.2.1) is pulled at runtime,
--- a/graphics/enblend/Makefile
+++ b/graphics/enblend/Makefile
@ -29,8 +29,7 @@ CONFIGURE_ARGS=	MAKEINFO="${LOCALBASE}/bin/makeinfo"

 # GCC 4.2 has some problems, see
 # http://groups.google.com/group/hugin-ptx/browse_thread/thread/725b1581c9889e37/50abe3387d61541a#50abe3387d61541a
-# Gerald Pfeifer <gerald@pfeifer.com> asked to use 4.4+ instead of 4.3+
-USE_GCC=	4.4+
+USE_GCC=	yes
 USE_GL=		glew glut
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	"LIBS=-lboost_system"
--- a/graphics/k3d/Makefile
+++ b/graphics/k3d/Makefile
@ -37,7 +37,7 @@ USE_BZIP2=	yes
 USE_GL=		glu
 USE_GNOME=	gtksourceview2
 USE_DOS2UNIX=	*.hpp
-USE_GCC=	4.6+
+USE_GCC=	yes
 USE_PYTHON=	yes
 USES=		cmake:outsource gettext
 CMAKE_ARGS=	-DK3D_INTL_INCLUDE_DIRS:STRING="-I${LOCALBASE}/include" \
--- a/graphics/libosmesa/Makefile
+++ b/graphics/libosmesa/Makefile
@ -45,7 +45,7 @@ CC=	/usr/bin/clang
 CXX=	/usr/bin/clang++
 CPP=	/usr/bin/clang-cpp
 .else
-USE_GCC=4.6+
+USE_GCC=yes
 .endif
 .endif

--- a/graphics/libraw/Makefile
+++ b/graphics/libraw/Makefile
@ -42,7 +42,7 @@ CFLAGS+=	-O3
 .endif

 .if ${PORT_OPTIONS:MOPENMP}
-USE_GCC=	4.6+
+USE_GCC=	yes
 CONFIGURE_ARGS+=--enable-openmp
 .else
 CONFIGURE_ARGS+=--disable-openmp
--- a/graphics/mahotas/Makefile
+++ b/graphics/mahotas/Makefile
@ -13,7 +13,7 @@ COMMENT=	Computer vision and image processing library for Python
 BUILD_DEPENDS=	${PYNUMPY}
 LIB_DEPENDS=	freeimage:${PORTSDIR}/graphics/freeimage

-USE_GCC=	4.6+
+USE_GCC=	yes
 USE_PYTHON=	2.5+
 USE_PYDISTUTILS=	easy_install
 PYEASYINSTALL_ARCHDEP=	yes
--- a/graphics/oyranos/Makefile
+++ b/graphics/oyranos/Makefile
@ -45,7 +45,7 @@ MAN3=		oyranos-config.3 oyranos.3
 CC=		/usr/bin/clang
 CXX=		/usr/bin/clang++
 .else
-USE_GCC=	4.6+
+USE_GCC=	yes
 .endif

 .include <bsd.port.post.mk>
--- a/graphics/rawtherapee/Makefile
+++ b/graphics/rawtherapee/Makefile
@ -27,7 +27,7 @@ USE_XZ=		yes
 USE_GNOME=	gtk20 glib20
 USE_LDCONFIG=	yes
 # base GCC and clang in 9.1-RELEASE are insufficient:
-USE_GCC=	4.6+
+USE_GCC=	yes
 CFLAGS+=	-I${LOCALBASE}/include -fPIC ${PTHREAD_CFLAGS}
 CXXFLAGS+=	-I${LOCALBASE}/include -fPIC ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
--- a/graphics/vigra/Makefile
+++ b/graphics/vigra/Makefile
@ -44,7 +44,7 @@ CMAKE_ARGS+=	-DWITH_OPENEXR=0
 .if ${PORT_OPTIONS:MNUMPY}
 CONFLICTS_BUILD=	python3*
 CMAKE_ARGS+=	-DWITH_VIGRANUMPY=1
-USE_GCC=	4.6+
+USE_GCC=	yes
 USE_FORTRAN=	yes
 USE_PYTHON=	2.6-2.7
 BUILD_DEPENDS+=	nosetests:${PORTSDIR}/devel/py-nose
@ -92,8 +92,8 @@ pre-everything::
 .if ${PORT_OPTIONS:MNUMPY}
 	@${ECHO} ""
 	@${ECHO} "* BEWARE!"
-	@${ECHO} "* Using py-NumPY implies Fortran and GCC4.6+ as hard dependencies"
-	@${ECHO} "* and require to all ports, depended on vigra, set USE_GCC=4.6+"
+	@${ECHO} "* Using py-NumPY implies Fortran and GCC 4.6+ as hard dependencies"
+	@${ECHO} "* and require all ports, depending on vigra, to set USE_GCC=yes"
 	@${ECHO} ""
 .endif

--- a/java/classpath/Makefile
+++ b/java/classpath/Makefile
@ -141,7 +141,7 @@ JAVA?=			${LOCALBASE}/bootstrap-openjdk/bin/java
 JAVAC?=			${LOCALBASE}/bootstrap-openjdk/bin/javac
 .else
 USE_BINUTILS=		yes
-USE_GCC=		4.6+
+USE_GCC=		yes
 GCC_SUFX=		${_USE_GCC:S/.//}
 JAR?=			${LOCALBASE}/bin/gjar${GCC_SUFX}
 JAVA?=			${LOCALBASE}/bin/gij${GCC_SUFX}
--- 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
--- 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}
--- 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}
--- 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}
--- 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
--- 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>
--- a/math/fftw3/Makefile
+++ b/math/fftw3/Makefile
@ -98,7 +98,7 @@ FFTW3_SUFX=	q
 FFTW3_PKGNAMESUFFIX=	-quad
 CONFIGURE_ARGS+=--enable-quad-precision
 ONLY_FOR_ARCHS =	i386 amd64
-USE_GCC=	4.6+
+USE_GCC=	yes
 .endif

 .if ${FFTW3_FLAVOR} == "default"
--- a/math/ised/Makefile
+++ b/math/ised/Makefile
@ -13,7 +13,7 @@ LICENSE=	GPLv3

 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GCC=	4.6+
+USE_GCC=	yes

 MAN1=		${PORTNAME}.1

--- a/math/p5-Math-Int128/Makefile
+++ b/math/p5-Math-Int128/Makefile
@ -20,7 +20,7 @@ RUN_DEPENDS=    p5-Math-Int64>=0.28:${PORTSDIR}/math/p5-Math-Int64
 USES=		perl5
 USE_PERL5=	configure

-USE_GCC=	4.6+
+USE_GCC=	yes

 MAN3=		Math::Int128.3 \
 		Math::Int128::die_on_overflow.3
--- a/math/py-graphtool/Makefile
+++ b/math/py-graphtool/Makefile
@ -19,7 +19,7 @@ LIB_DEPENDS=	boost_python:${PORTSDIR}/devel/boost-python-libs \
 		CGAL.5:${PORTSDIR}/math/cgal

 USE_BZIP2=	yes
-USE_GCC=	4.6+
+USE_GCC=	yes
 USE_GMAKE=	yes
 USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
--- a/math/sage/Makefile
+++ b/math/sage/Makefile
@ -29,7 +29,7 @@ OPTIONS_DEFINE_amd64=	387

 PLIST_FILES=	bin/sage
 USE_FORTRAN=	yes
-USE_GCC=	4.6+
+USE_GCC=	yes
 USE_TK=		yes
 USE_GMAKE=	yes
 USE_TEX=	latex:build
--- a/misc/libmetalink/Makefile
+++ b/misc/libmetalink/Makefile
@ -20,7 +20,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING

 FETCH_ARGS=
 USE_BZIP2=	yes
-USE_GCC=	4.4+
+USE_GCC=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	\
 		--with-libexpat-prefix="${LOCALBASE}" \
--- a/multimedia/assimp/Makefile
+++ b/multimedia/assimp/Makefile
@ -18,7 +18,7 @@ LIB_DEPENDS=	boost_filesystem:${PORTSDIR}/devel/boost-libs

 USE_ZIP=	yes
 USES=		cmake pkgconfig
-USE_GCC=	4.6+ # 4.2+ causes compiler warnings
+USE_GCC=	yes	# GCC 4.2 causes compiler warnings
 USE_LDCONFIG=	yes

 # CMAKE_ARGS instructs cmake to skip runtime path removal during install
--- a/multimedia/mkvtoolnix/Makefile
+++ b/multimedia/mkvtoolnix/Makefile
@ -22,7 +22,7 @@ LIB_DEPENDS=	vorbis:${PORTSDIR}/audio/libvorbis \

 USES=		pkgconfig gettext iconv
 USE_XZ=		yes
-USE_GCC=	4.6+
+USE_GCC=	yes
 GNU_CONFIGURE=	yes
 USE_RAKE=	yes
 USE_RUBY=	yes
--- a/multimedia/mplayer/Makefile.options
+++ b/multimedia/mplayer/Makefile.options
@ -71,7 +71,7 @@ CPP=		clang-cpp
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-clang-version
 .else
 .if ${PORT_OPTIONS:MOTCHAIN}
-USE_GCC?=	4.6+
+USE_GCC?=	yes
 BUILD_DEPENDS+=	${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
 .else
 CONFIGURE_ARGS+=--disable-ssse3 --disable-sse4 --disable-sse42 \
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@ -694,7 +694,7 @@ CXX=	clang++
 CPP=	clang-cpp
 .else
 .if ${ARCH} == "i386"
-USE_GCC?=	4.6+ # sse/3dnow detection on i386 needs newer gcc
+USE_GCC?=	yes # sse/3dnow detection on i386 needs newer GCC 
 .endif
 .endif

--- a/multimedia/x264/Makefile
+++ b/multimedia/x264/Makefile
@ -40,7 +40,7 @@ HAS_CONFIGURE=	yes
 OPTIONS_DEFINE=	ASM DEBUG PGO GCC44 GPAC X11_OUTPUT
 OPTIONS_DEFAULT=	ASM PGO GPAC
 ASM_DESC=		Assembly optimizations (devel/binutils)
-GCC44_DESC=		Use gcc 4.4+ (implies WITH_ASM)
+GCC44_DESC=		Use current GCC (implies WITH_ASM)
 GPAC_DESC=		Enable MPEG-4 Output
 X11_OUTPUT_DESC=	Enable X11 Output

@ -53,7 +53,7 @@ PLIST_SUB+=	X264_BUILD=${X264_BUILD}
 .include <bsd.port.options.mk>

 .if ${PORT_OPTIONS:MGCC44}
-USE_GCC?=	4.4+
+USE_GCC?=	yes
 .endif

 .include <bsd.port.pre.mk>
--- a/net-p2p/eiskaltdcpp-daemon/Makefile
+++ b/net-p2p/eiskaltdcpp-daemon/Makefile
@ -19,7 +19,7 @@ BUILD_DEPENDS+=	chrpath:${PORTSDIR}/devel/chrpath
 PROJECTHOST=	eiskaltdc

 USE_XZ=		yes
-USE_GCC=	4.6+
+USE_GCC=	yes
 USES=		cmake gettext
 USE_OPENSSL=	yes

--- a/net-p2p/eiskaltdcpp-gtk/Makefile
+++ b/net-p2p/eiskaltdcpp-gtk/Makefile
@ -21,7 +21,7 @@ CMAKE_ARGS+=	-DBUILD_LIB:BOOL=OFF
 PROJECTHOST=	eiskaltdc

 USE_XZ=		yes
-USE_GCC=	4.6+
+USE_GCC=	yes
 USES=		cmake gettext
 USE_OPENSSL=	yes

--- a/net-p2p/eiskaltdcpp-lib/Makefile
+++ b/net-p2p/eiskaltdcpp-lib/Makefile
@ -19,7 +19,7 @@ BUILD_DEPENDS+=	chrpath:${PORTSDIR}/devel/chrpath
 PROJECTHOST=	eiskaltdc

 USE_XZ=		yes
-USE_GCC=	4.6+
+USE_GCC=	yes
 USES=		cmake gettext
 USE_OPENSSL=	yes
 USE_LDCONFIG=	yes
--- a/net-p2p/eiskaltdcpp-qt/Makefile
+++ b/net-p2p/eiskaltdcpp-qt/Makefile
@ -24,7 +24,7 @@ CMAKE_ARGS+=	-DBUILD_LIB:BOOL=OFF
 PROJECTHOST=	eiskaltdc

 USE_XZ=		yes
-USE_GCC=	4.6+
+USE_GCC=	yes
 USES=		cmake gettext
 USE_OPENSSL=	yes

--- a/print/pdftk/Makefile
+++ b/print/pdftk/Makefile
@ -17,10 +17,10 @@ BUILD_DEPENDS=	gcj${CSUFF}:${PORTSDIR}/lang/gcc${CSUFF} \
 		gcjh${CSUFF}:${PORTSDIR}/lang/gcc${CSUFF} \
 		cpp${CSUFF}:${PORTSDIR}/lang/gcc${CSUFF}

-# Get gcc version suffix without the dot in USE_GCC
+# Get GCC version suffix without the dot in USE_GCC
 CSUFF=		${_USE_GCC:S/.//}

-USE_GCC=	4.6+
+USE_GCC=	yes
 USE_GMAKE=	yes
 USES=		iconv
 USE_LDCONFIG=	${PREFIX}/lib/gcc${CSUFF}
--- a/science/gnudatalanguage/Makefile
+++ b/science/gnudatalanguage/Makefile
@ -33,7 +33,7 @@ LIB_DEPENDS+=	plplotd.11:${PORTSDIR}/math/plplot	\
 		gsl.16:${PORTSDIR}/math/gsl		\
 		dps.0:${PORTSDIR}/x11/dgs

-USE_GCC=	4.6+
+USE_GCC=	yes
 USE_WX=		2.8
 USES=		pkgconfig
 GNU_CONFIGURE=	yes
--- a/science/harminv/Makefile
+++ b/science/harminv/Makefile
@ -17,7 +17,7 @@ COMMENT=	Solver of harmonic inversion
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_FORTRAN=	yes
-USE_GCC=	4.4+
+USE_GCC=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LD_LIBRARY_PATH=	-L${LOCALBASE}/lib -L/usr/lib
 LDFLAGS+=	-L${LOCALBASE}/lib
--- a/science/kalzium/Makefile
+++ b/science/kalzium/Makefile
@ -18,8 +18,7 @@ BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/eigen2.pc:${PORTSDIR}/math/eigen2

 CONFLICTS=	kdeedu-4.[0-6].*

-# Keep USE_GCC in sync with science/avogadro.
-USE_GCC=	4.4+
+USE_GCC=	yes
 USE_KDE4=	kdehier kdelibs kdeprefix automoc4
 USES=		cmake:outsource
 USE_OCAML=	yes
--- a/science/meep/Makefile
+++ b/science/meep/Makefile
@ -22,7 +22,7 @@ RUN_DEPENDS+=	harminv:${PORTSDIR}/science/harminv
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_FORTRAN=	yes
-USE_GCC=	4.6+
+USE_GCC=	yes
 USES=		gettext iconv pathfix
 USE_AUTOTOOLS+=	libltdl
 CPPFLAGS+=	-I${LOCALBASE}/include
--- a/science/peekabot/Makefile
+++ b/science/peekabot/Makefile
@ -21,7 +21,7 @@ LIB_DEPENDS=	boost_regex:${PORTSDIR}/devel/boost-libs \

 USE_BZIP2=	yes
 USES=	pathfix gmake
-USE_GCC=	4.6+
+USE_GCC=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes

--- a/security/cryptopp/Makefile
+++ b/security/cryptopp/Makefile
@ -11,10 +11,10 @@ DISTNAME=		cryptopp${PORTVERSION:S/.//g}
 MAINTAINER=		delphij@FreeBSD.org
 COMMENT=		Free C++ class library of Cryptographic Primitives

-OPTIONS_DEFINE=		DEBUG DOCS GCC46 STATIC THREADS
+OPTIONS_DEFINE=		DEBUG DOCS GCC STATIC THREADS
 OPTIONS_DEFAULT=	STATIC THREADS
 STATIC_DESC=		Build static version only (no shared libs)
-GCC46_DESC=		Build with GCC 4.6+
+GCC_DESC=		Build with current GCC

 .include <bsd.port.options.mk>

@ -32,8 +32,8 @@ PLIST_SUB+=		PORTVERSION=${PORTVERSION}
 CXXFLAGS+=		-DNDEBUG
 .endif

-.if ${PORT_OPTIONS:MGCC46}
-USE_GCC=		4.6+
+.if ${PORT_OPTIONS:MGCC}
+USE_GCC=		yes
 .endif

 .if ${PORT_OPTIONS:MSTATIC}
--- a/sysutils/grub2/Makefile
+++ b/sysutils/grub2/Makefile
@ -18,7 +18,7 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex \

 CONFLICTS=	grub-0*
 USE_XZ=		yes
-USE_GCC=	4.6+
+USE_GCC=	yes
 USE_AUTOTOOLS=	automake aclocal autoconf
 ACLOCAL_ARGS=	-Im4
 GNU_CONFIGURE=	yes
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@ -138,7 +138,7 @@ CXX=		clang++
 .endif
 GYP_DEFINES+=	clang=1
 .else
-USE_GCC?=	4.6+
+USE_GCC?=	yes
 GYP_DEFINES+=	gcc_version=${CXX:S/g++//}
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-gcc
 .endif
--- a/www/mod_pagespeed/Makefile
+++ b/www/mod_pagespeed/Makefile
@ -60,7 +60,7 @@ GYP_DEFINES+=	\
 .include <bsd.port.pre.mk>

 # testing
-#USE_GCC=	4.6+
+#USE_GCC=	yes
 #.if ${OSVERSION} > 1000000
 #CC=		clang
 #CXX=		clang++
--- a/www/mod_spdy/Makefile
+++ b/www/mod_spdy/Makefile
@ -62,7 +62,7 @@ CC=	clang
 CXX=	clang++
 GYP_DEFINES+=	clang=1
 .else
-USE_GCC?=	4.6+
+USE_GCC?=	yes
 GYP_DEFINES+=	gcc_version=${CXX:S/g++//}
 .endif

--- a/www/node-devel/Makefile
+++ b/www/node-devel/Makefile
@ -33,7 +33,7 @@ CC=	clang
 CXX=	clang++
 GYP_DEFINES+=	clang=1
 .else
-USE_GCC?=	4.6+
+USE_GCC?=	yes
 GYP_DEFINES+=	gcc_version=${CXX:S/g++//}
 .endif

--- a/www/openvrml/Makefile
+++ b/www/openvrml/Makefile
@ -25,7 +25,7 @@ USES=		 pathfix pkgconfig
 USE_GNOME=	libglade2 libgnomeui
 USE_SDL=	sdl
 USE_JAVA=	yes
-USE_GCC=	4.6+
+USE_GCC=	yes
 GNU_CONFIGURE=	yes
 LIBTOOLFILES=	configure
 CONFIGURE_ARGS=	--enable-gecko-rpath \
--- a/x11-toolkits/c++-gtk-utils/Makefile
+++ b/x11-toolkits/c++-gtk-utils/Makefile
@ -13,7 +13,7 @@ COMMENT=	Lightweight library for programming GTK+ programs
 LICENSE=	LGPL21

 GNU_CONFIGURE=	yes
-USE_GCC=	4.4+
+USE_GCC=	yes
 USES=		pathfix pkgconfig
 USE_GNOME=	gtk20
 USE_LDCONFIG=	yes
--- a/x11-toolkits/gigi/Makefile
+++ b/x11-toolkits/gigi/Makefile
@ -16,7 +16,7 @@ LIB_DEPENDS=	IL.2:${PORTSDIR}/graphics/devil \
 		boost_python:${PORTSDIR}/devel/boost-python-libs \
 		freetype.9:${PORTSDIR}/print/freetype2

-USE_GCC=	4.4+
+USE_GCC=	yes
 USES=		cmake
 CMAKE_ARGS=	-DBUILD_TUTORIALS:BOOL=OFF
 USE_BZIP2=	yes
--- a/x11-toolkits/mygui/Makefile
+++ b/x11-toolkits/mygui/Makefile
@ -20,7 +20,7 @@ USE_ZIP=	yes
 USES=		cmake
 CMAKE_ARGS=	-DMYGUI_BUILD_DEMOS=OFF -DMYGUI_BUILD_DOCS=OFF
 USE_LDCONFIG=	yes
-USE_GCC=	4.6+
+USE_GCC=	yes
 USE_DOS2UNIX=	*.cpp *.h

 post-patch:
--- a/x11/kactivitymanagerd/Makefile
+++ b/x11/kactivitymanagerd/Makefile
@ -26,8 +26,8 @@ MAKE_ENV=	XDG_CONFIG_HOME=/dev/null
 # https://bugs.kde.org/show_bug.cgi?id=305529#c10
 CMAKE_ARGS+=	-DCMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS=-rdynamic

-# 'USES= moderncompiler' would help, for now force dependency on gcc
-USE_GCC=	4.6+
+# 'USES= moderncompiler' would help, for now force dependency on GCC
+USE_GCC=	yes

 .include <bsd.port.pre.mk>