From 41e60477bdfd199f4fa53ac14af9a86349cff50b Mon Sep 17 00:00:00 2001 From: Gerald Pfeifer Date: Sat, 17 Aug 2013 16:27:24 +0000 Subject: [PATCH] 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) --- archivers/rvm/Makefile | 2 +- audio/beast/Makefile | 2 +- audio/py-tagpy/Makefile | 2 +- biology/seqan/Makefile | 2 +- cad/calculix/Makefile | 2 +- cad/gspiceui/Makefile | 2 +- chinese/ibus-pinyin/Makefile | 2 +- comms/dabstick-radio/Makefile | 2 +- comms/efax-gtk/Makefile | 2 +- comms/ems-flasher/Makefile | 2 +- databases/dbf/Makefile | 2 +- databases/tarantool/Makefile | 2 +- deskutils/notify-osd/Makefile | 2 +- devel/astyle/Makefile | 2 +- devel/clanlib/Makefile | 2 +- devel/cocaine-core/Makefile | 2 +- devel/covtool/Makefile | 2 +- devel/freeocl/Makefile | 2 +- devel/kdevelop-pg-qt/Makefile | 2 +- devel/libYGP/Makefile | 2 +- devel/libclaw/Makefile | 2 +- devel/msgpack/Makefile | 2 +- devel/nemiver/Makefile | 2 +- devel/p5-perlkde/Makefile | 2 +- devel/pure-stldict/Makefile | 3 +-- devel/raknet/Makefile | 2 +- editors/emacs-devel/Makefile | 2 +- editors/libreoffice/Makefile | 2 +- editors/openoffice-3/Makefile | 2 +- emulators/dolphin-emu-devel/Makefile | 2 +- emulators/fceux/Makefile | 2 +- emulators/higan/Makefile | 2 +- emulators/mame/Makefile | 2 +- emulators/mess/Makefile | 2 +- finance/qhacc/Makefile | 2 +- games/bastet/Makefile | 2 +- games/battletanks/Makefile | 2 +- games/corsix-th/Makefile | 2 +- games/openlierox/Makefile | 2 +- games/openxcom/Makefile | 2 +- games/openyahtzee/Makefile | 2 +- games/plee-the-bear/Makefile | 2 +- games/super_methane_brothers/Makefile | 2 +- games/warzone2100/Makefile | 2 +- games/xonotic/Makefile | 2 +- graphics/darktable/Makefile | 10 +++++----- graphics/enblend/Makefile | 3 +-- graphics/k3d/Makefile | 2 +- graphics/libosmesa/Makefile | 2 +- graphics/libraw/Makefile | 2 +- graphics/mahotas/Makefile | 2 +- graphics/oyranos/Makefile | 2 +- graphics/rawtherapee/Makefile | 2 +- graphics/vigra/Makefile | 6 +++--- java/classpath/Makefile | 2 +- lang/bigloo/Makefile | 2 +- lang/erlang-runtime15/Makefile | 12 ++++++------ lang/erlang-runtime16/Makefile | 12 ++++++------ lang/erlang/Makefile | 12 ++++++------ lang/ghc/Makefile | 2 +- lang/intercal/Makefile | 2 +- math/fftw3/Makefile | 2 +- math/ised/Makefile | 2 +- math/p5-Math-Int128/Makefile | 2 +- math/py-graphtool/Makefile | 2 +- math/sage/Makefile | 2 +- misc/libmetalink/Makefile | 2 +- multimedia/assimp/Makefile | 2 +- multimedia/mkvtoolnix/Makefile | 2 +- multimedia/mplayer/Makefile.options | 2 +- multimedia/vlc/Makefile | 2 +- multimedia/x264/Makefile | 4 ++-- net-p2p/eiskaltdcpp-daemon/Makefile | 2 +- net-p2p/eiskaltdcpp-gtk/Makefile | 2 +- net-p2p/eiskaltdcpp-lib/Makefile | 2 +- net-p2p/eiskaltdcpp-qt/Makefile | 2 +- print/pdftk/Makefile | 4 ++-- science/gnudatalanguage/Makefile | 2 +- science/harminv/Makefile | 2 +- science/kalzium/Makefile | 3 +-- science/meep/Makefile | 2 +- science/peekabot/Makefile | 2 +- security/cryptopp/Makefile | 8 ++++---- sysutils/grub2/Makefile | 2 +- www/chromium/Makefile | 2 +- www/mod_pagespeed/Makefile | 2 +- www/mod_spdy/Makefile | 2 +- www/node-devel/Makefile | 2 +- www/openvrml/Makefile | 2 +- x11-toolkits/c++-gtk-utils/Makefile | 2 +- x11-toolkits/gigi/Makefile | 2 +- x11-toolkits/mygui/Makefile | 2 +- x11/kactivitymanagerd/Makefile | 4 ++-- 93 files changed, 120 insertions(+), 123 deletions(-) diff --git a/archivers/rvm/Makefile b/archivers/rvm/Makefile index efd651486883..480348962889 100644 --- 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 diff --git a/audio/beast/Makefile b/audio/beast/Makefile index 266bb42345e0..54b5a141aea1 100644 --- 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 diff --git a/audio/py-tagpy/Makefile b/audio/py-tagpy/Makefile index 5e070bb33de7..cecb842110cb 100644 --- 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 diff --git a/biology/seqan/Makefile b/biology/seqan/Makefile index db1d664a9c44..ab38bc1812c5 100644 --- 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 diff --git a/cad/calculix/Makefile b/cad/calculix/Makefile index fa1071d5958a..faf47fb27957 100644 --- 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 diff --git a/cad/gspiceui/Makefile b/cad/gspiceui/Makefile index 04c1e8c22e5a..7f2497147f9a 100644 --- 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" \ diff --git a/chinese/ibus-pinyin/Makefile b/chinese/ibus-pinyin/Makefile index 237736fc87f4..0405607fe61a 100644 --- 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 diff --git a/comms/dabstick-radio/Makefile b/comms/dabstick-radio/Makefile index 8e32e0ae7b5f..6348c9e0b771 100644 --- 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: diff --git a/comms/efax-gtk/Makefile b/comms/efax-gtk/Makefile index cd1bb47a4c76..00a6d13338eb 100644 --- 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]* diff --git a/comms/ems-flasher/Makefile b/comms/ems-flasher/Makefile index ff9615781f91..9c5fe1adb656 100644 --- 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 diff --git a/databases/dbf/Makefile b/databases/dbf/Makefile index 6009f45e0925..b9db23cd46f9 100644 --- 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 diff --git a/databases/tarantool/Makefile b/databases/tarantool/Makefile index 7f52135c7712..a2dbcb35ab50 100644 --- 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 diff --git a/deskutils/notify-osd/Makefile b/deskutils/notify-osd/Makefile index cdab216d496a..62e605203a4c 100644 --- 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 diff --git a/devel/astyle/Makefile b/devel/astyle/Makefile index 2e3211672c6f..58aed754df9b 100644 --- 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 diff --git a/devel/clanlib/Makefile b/devel/clanlib/Makefile index 6592c0bcf2ea..d94b0a973266 100644 --- 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 diff --git a/devel/cocaine-core/Makefile b/devel/cocaine-core/Makefile index 2eb4d0133f4a..7ee7118b9f6e 100644 --- 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 diff --git a/devel/covtool/Makefile b/devel/covtool/Makefile index b6765c307976..70ca334923f1 100644 --- 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 diff --git a/devel/freeocl/Makefile b/devel/freeocl/Makefile index ace9d545efab..ce544fbdbf03 100644 --- 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 diff --git a/devel/kdevelop-pg-qt/Makefile b/devel/kdevelop-pg-qt/Makefile index f0093fcb7431..ce1e0a8a1105 100644 --- 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 diff --git a/devel/libYGP/Makefile b/devel/libYGP/Makefile index fcbceeae0beb..8b691c3a1798 100644 --- 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 diff --git a/devel/libclaw/Makefile b/devel/libclaw/Makefile index e0ae701dbdfc..542d341db3fc 100644 --- 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 diff --git a/devel/msgpack/Makefile b/devel/msgpack/Makefile index 350b552097d3..81c4df5757fd 100644 --- 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 diff --git a/devel/nemiver/Makefile b/devel/nemiver/Makefile index f6a285e45248..bebe3be4d683 100644 --- 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 diff --git a/devel/p5-perlkde/Makefile b/devel/p5-perlkde/Makefile index d1edb4e48fde..b762ab4b58ef 100644 --- 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 diff --git a/devel/pure-stldict/Makefile b/devel/pure-stldict/Makefile index 432793b55613..2b2ec2f5b628 100644 --- 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" diff --git a/devel/raknet/Makefile b/devel/raknet/Makefile index 65b0e6e87e2e..8a8dfb9b0060 100644 --- 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 diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile index 077943a72466..75447a16f014 100644 --- 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 diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile index fe344ba4a59c..3222dcc769fa 100644 --- a/editors/libreoffice/Makefile +++ b/editors/libreoffice/Makefile @@ -339,7 +339,7 @@ CONFIGURE_ARGS+= --disable-neon .include .if defined(WITH_GCC) -USE_GCC= 4.6+ +USE_GCC= yes CONFIGURE_ENV+= CXXCPP="${CPP}" .else .if exists(/usr/bin/clang) && ${OSVERSION} > 901502 diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile index 2b58b53a858c..2c440f193aeb 100644 --- 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 diff --git a/emulators/dolphin-emu-devel/Makefile b/emulators/dolphin-emu-devel/Makefile index d6ab2bc8639c..797a79a0c834 100644 --- 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 diff --git a/emulators/fceux/Makefile b/emulators/fceux/Makefile index f14880281487..11ffd069fe8b 100644 --- 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 diff --git a/emulators/higan/Makefile b/emulators/higan/Makefile index 841ba612e659..e65e0d52d907 100644 --- 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 diff --git a/emulators/mame/Makefile b/emulators/mame/Makefile index 5a07b4ca7eeb..f412e1c9fcd8 100644 --- 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" diff --git a/emulators/mess/Makefile b/emulators/mess/Makefile index aafd4613ad95..cce664bc9e02 100644 --- 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" diff --git a/finance/qhacc/Makefile b/finance/qhacc/Makefile index accb3cd4940d..4f39ca652c4d 100644 --- 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 diff --git a/games/bastet/Makefile b/games/bastet/Makefile index f637959d2c1f..9c11e575ff95 100644 --- a/games/bastet/Makefile +++ b/games/bastet/Makefile @@ -27,7 +27,7 @@ PLIST_FILES= bin/bastet .include .if ${ARCH} != "i386" -USE_GCC= 4.6+ +USE_GCC= yes .endif post-patch: diff --git a/games/battletanks/Makefile b/games/battletanks/Makefile index f8ae95365af3..46ef70900237 100644 --- 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 diff --git a/games/corsix-th/Makefile b/games/corsix-th/Makefile index 5aa2284e6a04..46b096be66ef 100644 --- 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 diff --git a/games/openlierox/Makefile b/games/openlierox/Makefile index c342bdee1b7a..26d67a91b7e8 100644 --- 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 diff --git a/games/openxcom/Makefile b/games/openxcom/Makefile index 4403df6299b9..8d23c6a428b9 100644 --- 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 diff --git a/games/openyahtzee/Makefile b/games/openyahtzee/Makefile index c95e6965a054..1ccf8eeaff7a 100644 --- 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 diff --git a/games/plee-the-bear/Makefile b/games/plee-the-bear/Makefile index c98d87ae2095..3b9723604a82 100644 --- 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" \ diff --git a/games/super_methane_brothers/Makefile b/games/super_methane_brothers/Makefile index 12455697b48d..8875ce62737e 100644 --- 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}" diff --git a/games/warzone2100/Makefile b/games/warzone2100/Makefile index 7eaf7c4ffd97..b45ee7181fc0 100644 --- 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 diff --git a/games/xonotic/Makefile b/games/xonotic/Makefile index 9c963483739d..882a37e6b422 100644 --- 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 diff --git a/graphics/darktable/Makefile b/graphics/darktable/Makefile index bf6e451f3f32..71df575fdab4 100644 --- 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 @@ -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, diff --git a/graphics/enblend/Makefile b/graphics/enblend/Makefile index 82ad65afdafc..8b62d52c582d 100644 --- 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 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" diff --git a/graphics/k3d/Makefile b/graphics/k3d/Makefile index edb627d9aea6..159d329919cf 100644 --- 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" \ diff --git a/graphics/libosmesa/Makefile b/graphics/libosmesa/Makefile index 72c7d4ff9f8f..a5842bc09136 100644 --- 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 diff --git a/graphics/libraw/Makefile b/graphics/libraw/Makefile index 64dae9ac65db..b90092dc3c21 100644 --- 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 diff --git a/graphics/mahotas/Makefile b/graphics/mahotas/Makefile index b4dbbff38fb8..2a0b6dd501e0 100644 --- 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 diff --git a/graphics/oyranos/Makefile b/graphics/oyranos/Makefile index 24589df70375..070e8bdccff3 100644 --- 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 diff --git a/graphics/rawtherapee/Makefile b/graphics/rawtherapee/Makefile index 0c7ba8c7334c..690d03f53315 100644 --- 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} diff --git a/graphics/vigra/Makefile b/graphics/vigra/Makefile index 8b10a591f3ac..eb17de357069 100644 --- 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 diff --git a/java/classpath/Makefile b/java/classpath/Makefile index 054db015678f..f0fd24687da0 100644 --- 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} 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 .if ${OSVERSION} < 900000 -USE_GCC= 4.6+ +USE_GCC= yes .endif .include diff --git a/math/fftw3/Makefile b/math/fftw3/Makefile index e69d25bb5626..9ea1decf50c4 100644 --- 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" diff --git a/math/ised/Makefile b/math/ised/Makefile index cf363a7fea47..d92a098fee43 100644 --- 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 diff --git a/math/p5-Math-Int128/Makefile b/math/p5-Math-Int128/Makefile index e01c8aa10915..f230395cc04d 100644 --- 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 diff --git a/math/py-graphtool/Makefile b/math/py-graphtool/Makefile index 900dc71ce6d7..5c728300a7c8 100644 --- 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 diff --git a/math/sage/Makefile b/math/sage/Makefile index ae72774afca2..99b0a1d0a96c 100644 --- 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 diff --git a/misc/libmetalink/Makefile b/misc/libmetalink/Makefile index 46c47fbae180..f555f6f93150 100644 --- 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}" \ diff --git a/multimedia/assimp/Makefile b/multimedia/assimp/Makefile index 27d9b993e8f6..36b831cc648e 100644 --- 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 diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile index 9576b7ef229d..eebd8abc5b61 100644 --- 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 diff --git a/multimedia/mplayer/Makefile.options b/multimedia/mplayer/Makefile.options index 59dd4beeae83..f4ec25cc37c7 100644 --- 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 \ diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile index bac67d18e3ed..6fb57d4886c2 100644 --- 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 diff --git a/multimedia/x264/Makefile b/multimedia/x264/Makefile index e54a6fa64b7c..a5a297430f4e 100644 --- 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 .if ${PORT_OPTIONS:MGCC44} -USE_GCC?= 4.4+ +USE_GCC?= yes .endif .include diff --git a/net-p2p/eiskaltdcpp-daemon/Makefile b/net-p2p/eiskaltdcpp-daemon/Makefile index 5fad1866422f..5f8434066752 100644 --- 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 diff --git a/net-p2p/eiskaltdcpp-gtk/Makefile b/net-p2p/eiskaltdcpp-gtk/Makefile index 7a2e47bbf257..2abd8576e233 100644 --- 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 diff --git a/net-p2p/eiskaltdcpp-lib/Makefile b/net-p2p/eiskaltdcpp-lib/Makefile index 76e79fe2394a..6954e50f66e4 100644 --- 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 diff --git a/net-p2p/eiskaltdcpp-qt/Makefile b/net-p2p/eiskaltdcpp-qt/Makefile index 93ee49278e0f..bc5f2a4dc9d6 100644 --- 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 diff --git a/print/pdftk/Makefile b/print/pdftk/Makefile index edc06a900990..9107868669e8 100644 --- 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} diff --git a/science/gnudatalanguage/Makefile b/science/gnudatalanguage/Makefile index bfe754b61c80..eb780e01f7d4 100644 --- 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 diff --git a/science/harminv/Makefile b/science/harminv/Makefile index 433048bfdf1e..0f3d3d8c6044 100644 --- 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 diff --git a/science/kalzium/Makefile b/science/kalzium/Makefile index cc822b138913..d24941353369 100644 --- 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 diff --git a/science/meep/Makefile b/science/meep/Makefile index 73ff7f5ef060..b4f3ffe9d96e 100644 --- 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 diff --git a/science/peekabot/Makefile b/science/peekabot/Makefile index 0ea1afb923d1..1359127e884f 100644 --- 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 diff --git a/security/cryptopp/Makefile b/security/cryptopp/Makefile index a81b31988dfd..0754531fc45d 100644 --- 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 @@ -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} diff --git a/sysutils/grub2/Makefile b/sysutils/grub2/Makefile index a5065dab92aa..31acac741ece 100644 --- 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 diff --git a/www/chromium/Makefile b/www/chromium/Makefile index b3256c2442cd..b335993379d8 100644 --- 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 diff --git a/www/mod_pagespeed/Makefile b/www/mod_pagespeed/Makefile index 0cb4fdf266e1..e3a4f689a496 100644 --- a/www/mod_pagespeed/Makefile +++ b/www/mod_pagespeed/Makefile @@ -60,7 +60,7 @@ GYP_DEFINES+= \ .include # testing -#USE_GCC= 4.6+ +#USE_GCC= yes #.if ${OSVERSION} > 1000000 #CC= clang #CXX= clang++ diff --git a/www/mod_spdy/Makefile b/www/mod_spdy/Makefile index 7ccfbcf39592..08e81652cd6a 100644 --- 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 diff --git a/www/node-devel/Makefile b/www/node-devel/Makefile index 26b2e8f93943..6d694b91e3f8 100644 --- 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 diff --git a/www/openvrml/Makefile b/www/openvrml/Makefile index 818033d93186..bbd5256fdf4e 100644 --- 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 \ diff --git a/x11-toolkits/c++-gtk-utils/Makefile b/x11-toolkits/c++-gtk-utils/Makefile index 403b36ed5ff4..76f2b5821b08 100644 --- 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 diff --git a/x11-toolkits/gigi/Makefile b/x11-toolkits/gigi/Makefile index d9f303317106..3f56f5efe2d0 100644 --- 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 diff --git a/x11-toolkits/mygui/Makefile b/x11-toolkits/mygui/Makefile index 50c04866fd8f..d2a0fba5f271 100644 --- 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: diff --git a/x11/kactivitymanagerd/Makefile b/x11/kactivitymanagerd/Makefile index 68920d40e5e2..00a30c1fd8fc 100644 --- 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