Re: Retire gcc4.port.mk

On Fri Feb 06, 2026 at 07:29:58PM +0100, Rafael Sadowski wrote: > Anyone? For 7.9? > > On Sat Jan 03, 2026 at 10:22:52AM +0100, Rafael Sadowski wrote: > > This is an initial proposal to retire gcc4.port.mk. > > > > The following diff replaces gcc4.port.mk with lang/gcc/gcc.port.mk > > and makes some renames (gcc4 and MODGCC4* ... NOT GCC49_*). > > > > What porters think about this? +1 or don't touch it? > > > > Rafael > > > > diff --git a/astro/wcslib/Makefile b/astro/wcslib/Makefile > > index b73f5e9b337..de8e0199659 100644 > > --- a/astro/wcslib/Makefile > > +++ b/astro/wcslib/Makefile > > @@ -13,12 +13,12 @@ WANTLIB = c cfitsio m > > SITES = https://www.atnf.csiro.au/people/mcalabre/WCS/ > > EXTRACT_SUFX = .tar.bz2 > > > > -MODULES = gcc4 > > -MODGCC4_ARCHS = * > > -MODGCC4_LANGS = fortran > > +MODULES = gcc > > +MODGCC_ARCHS = * > > +MODGCC_LANGS = fortran > > > > LIB_DEPENDS = math/cfitsio > > -TEST_DEPENDS = lang/gcc/${MODGCC4_VERSION},-f95 > > +TEST_DEPENDS = lang/gcc/${MODGCC_VERSION},-f95 > > # failure in Fortran tunits test; some strings are not printed > > # as expected, instead replaced by NULs. > > # diff -a Fortran/test/tunits.out Fortran/tunits.out | cat -v > > diff --git a/comms/hamlib/Makefile b/comms/hamlib/Makefile > > index 8b60e527ce3..e9f82af184e 100644 > > --- a/comms/hamlib/Makefile > > +++ b/comms/hamlib/Makefile > > @@ -34,7 +34,7 @@ WANTLIB-tcl= ${cWANTLIB} hamlib ${MODTCL_WANTLIB} z > > > > LIB_DEPENDS-main= textproc/libxml \ > > devel/libusb1 \ > > - ${MODGCC4_CPPLIBDEP} > > + ${MODGCC_CPPLIBDEP} > > LIB_DEPENDS-python= ${BUILD_PKGPATH} \ > > ${MODPY_LIB_DEPENDS} > > LIB_DEPENDS-tcl= ${BUILD_PKGPATH} \ > > diff --git a/databases/db/v4/Makefile b/databases/db/v4/Makefile > > index 90bca359646..74cae6952ae 100644 > > --- a/databases/db/v4/Makefile > > +++ b/databases/db/v4/Makefile > > @@ -33,7 +33,7 @@ PATCHFILES.stu= patch.${VERSION}.1 \ > > CONFIGURE_STYLE= gnu > > > > DEST_SUBDIR= ${REV} > > -LIB_DEPENDS-main= ${MODGCC4_CPPLIBDEP} > > +LIB_DEPENDS-main= ${MODGCC_CPPLIBDEP} > > WANTLIB= c m ${COMPILER_LIBCXX} > > > > PSEUDO_FLAVORS= no_java bootstrap > > diff --git a/databases/redis/Makefile b/databases/redis/Makefile > > index 08eb997941a..9d1a6fff400 100644 > > --- a/databases/redis/Makefile > > +++ b/databases/redis/Makefile > > @@ -33,7 +33,7 @@ MAKE_FLAGS = BUILD_TLS=yes \ > > # Fix "undefined reference to `__atomic_store_8'" > > .if ${MACHINE_ARCH:Mhppa} > > WANTLIB += atomic > > -LIB_DEPENDS += lang/gcc/${MODGCC4_VERSION},-libs > > +LIB_DEPENDS += lang/gcc/${MODGCC_VERSION},-libs > > MAKE_FLAGS += LDFLAGS="${LDFLAGS} -latomic" > > .endif > > > > diff --git a/devel/gmp/Makefile b/devel/gmp/Makefile > > index 349c6ea9dbb..4a88d899aa3 100644 > > --- a/devel/gmp/Makefile > > +++ b/devel/gmp/Makefile > > @@ -26,7 +26,7 @@ WANTLIB-main= # empty > > WANTLIB-cxx= gmp m ${COMPILER_LIBCXX} > > > > LIB_DEPENDS-cxx=${FULLPKGNAME-main}:${BASE_PKGPATH},-main \ > > - ${MODGCC4_CPPLIBDEP} > > + ${MODGCC_CPPLIBDEP} > > > > PSEUDO_FLAVORS= no_cxx bootstrap > > FLAVOR?= > > diff --git a/devel/libgit2/libgit2/Makefile b/devel/libgit2/libgit2/Makefile > > index 7833358a69f..49a7cfa7da2 100644 > > --- a/devel/libgit2/libgit2/Makefile > > +++ b/devel/libgit2/libgit2/Makefile > > @@ -16,7 +16,7 @@ MODPY_RUNDEP= No > > COMPILER= base-clang ports-gcc base-gcc > > COMPILER_LANGS= c > > # for atomic builtins > > -MODGCC4_ARCHS= hppa > > +MODGCC_ARCHS= hppa > > > > DEBUG_PACKAGES= ${BUILD_PACKAGES} > > > > diff --git a/devel/libmtp/Makefile b/devel/libmtp/Makefile > > index 1b3ba00d415..aa7dfa06a60 100644 > > --- a/devel/libmtp/Makefile > > +++ b/devel/libmtp/Makefile > > @@ -17,7 +17,7 @@ SITES= ${SITE_SOURCEFORGE:=libmtp/} > > COMPILER= base-clang ports-gcc base-gcc > > COMPILER_LANGS= c > > # avoid "libmtp.so.7.0: undefined reference to `.L2085'" > > -MODGCC4_ARCHS= mips64 mips64el > > +MODGCC_ARCHS= mips64 mips64el > > > > USE_GMAKE= Yes > > > > diff --git a/devel/llvm/Makefile.inc b/devel/llvm/Makefile.inc > > index 70e63460397..bdac3596a91 100644 > > --- a/devel/llvm/Makefile.inc > > +++ b/devel/llvm/Makefile.inc > > @@ -102,7 +102,7 @@ BUILD_DEPENDS += devel/swig \ > > textproc/py-recommonmark > > > > .if !${PROPERTIES:Mclang} > > -RUN_DEPENDS += lang/gcc/${MODGCC4_VERSION},-c++ > > +RUN_DEPENDS += lang/gcc/${MODGCC_VERSION},-c++ > > .endif > > > > CONFIGURE_STYLE += cmake > > diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile > > index ae12bd3c09f..bca05d420b0 100644 > > --- a/editors/libreoffice/Makefile > > +++ b/editors/libreoffice/Makefile > > @@ -209,7 +209,7 @@ LIB_DEPENDS-main= \ > > graphics/graphite2 \ > > graphics/libwebp \ > > graphics/tiff \ > > - ${MODGCC4_CPPLIBDEP} \ > > + ${MODGCC_CPPLIBDEP} \ > > multimedia/gstreamer1/plugins-base \ > > print/cups,-libs \ > > print/poppler \ > > @@ -259,7 +259,7 @@ LIB_DEPENDS-kde= devel/kf5/kcoreaddons \ > > devel/kf5/kio \ > > editors/libreoffice \ > > ${MODQT_LIB_DEPENDS} \ > > - ${MODGCC4_CPPLIBDEP} > > + ${MODGCC_CPPLIBDEP} > > WANTLIB-kde+= icuuc ${COMPILER_LIBCXX} m pthread xcb > > WANTLIB-kde+= cairo graphite2 epoxy harfbuzz harfbuzz-icu > > WANTLIB-kde+= KF5ConfigCore KF5CoreAddons KF5I18n KF5KIOCore > > @@ -277,7 +277,7 @@ WANTLIB-kde+= lib/libreoffice/program/uno_cppu \ > > MODULES+= java > > MODJAVA_VER= 17+ > > .endif > > -LIB_DEPENDS-java= ${MODGCC4_CPPLIBDEP} \ > > +LIB_DEPENDS-java= ${MODGCC_CPPLIBDEP} \ > > editors/libreoffice > > RUN_DEPENDS-java= ${MODJAVA_RUN_DEPENDS} \ > > databases/db/v4,-java \ > > diff --git a/emulators/gambatte/Makefile b/emulators/gambatte/Makefile > > index b1ee24bab0e..ba5d09e60db 100644 > > --- a/emulators/gambatte/Makefile > > +++ b/emulators/gambatte/Makefile > > @@ -32,7 +32,7 @@ MODPY_TESTDEP = Yes > > SEPARATE_BUILD = No > > > > BUILD_DEPENDS = graphics/png > > -LIB_DEPENDS = ${MODGCC4_CPPLIBDEP} \ > > +LIB_DEPENDS = ${MODGCC_CPPLIBDEP} \ > > devel/sdl > > > > TEST_DEPENDS = graphics/png > > diff --git a/emulators/libretro-nestopia/Makefile b/emulators/libretro-nestopia/Makefile > > index 5465267df0a..5d1063db5e4 100644 > > --- a/emulators/libretro-nestopia/Makefile > > +++ b/emulators/libretro-nestopia/Makefile > > @@ -25,7 +25,7 @@ WANTLIB = ${COMPILER_LIBCXX} m pthread > > COMPILER = base-clang ports-gcc base-gcc > > > > BUILD_DEPENDS = devel/autoconf-archive > > -LIB_DEPENDS = ${MODGCC4_CPPLIBDEP} > > +LIB_DEPENDS = ${MODGCC_CPPLIBDEP} > > > > MAKE_FLAGS = CC="${CC}" \ > > CXX="${CXX}" \ > > diff --git a/games/gottcode/Makefile.inc b/games/gottcode/Makefile.inc > > index 9a7b1182159..76d7e1e20e9 100644 > > --- a/games/gottcode/Makefile.inc > > +++ b/games/gottcode/Makefile.inc > > @@ -12,7 +12,7 @@ PERMIT_PACKAGE = Yes > > > > WRKDIST ?= ${WRKDIR}/${DISTNAME:S/-src//} > > MODULES += devel/qmake x11/qt5 > > -MODGCC4_ARCHS = i386 amd64 powerpc sparc64 > > +MODGCC_ARCHS = i386 amd64 powerpc sparc64 > > WANTLIB += GL Qt5Core Qt5Gui Qt5Widgets > > WANTLIB += c m pthread ${COMPILER_LIBCXX} > > RUN_DEPENDS += devel/desktop-file-utils x11/gtk+4,-guic > > diff --git a/games/prboom-plus/Makefile b/games/prboom-plus/Makefile > > index 2f0419680d7..be88eeca8bf 100644 > > --- a/games/prboom-plus/Makefile > > +++ b/games/prboom-plus/Makefile > > @@ -11,7 +11,7 @@ MAINTAINER = Ryan Freeman <ryan@slipgate.org> > > PERMIT_PACKAGE = Yes > > > > # undefined reference to `__builtin_bswap32' > > -# requires gcc >= 4.3 for gcc4 archs. > > +# requires gcc >= 4.3 for gcc archs. > > COMPILER = base-clang ports-gcc > > COMPILER_LANGS = c > > > > diff --git a/games/ufoai/base/Makefile b/games/ufoai/base/Makefile > > index f56cdf4fe9e..98caefce0ed 100644 > > --- a/games/ufoai/base/Makefile > > +++ b/games/ufoai/base/Makefile > > @@ -41,14 +41,14 @@ LIB_DEPENDS-main = devel/sdl-mixer \ > > multimedia/xvidcore \ > > net/curl \ > > textproc/mxml \ > > - ${MODGCC4_CPPLIBDEP} > > + ${MODGCC_CPPLIBDEP} > > > > LIB_DEPENDS-editor = audio/libvorbis \ > > audio/openal \ > > devel/sdl \ > > x11/gtkglext \ > > x11/gtksourceview \ > > - ${MODGCC4_CPPLIBDEP} > > + ${MODGCC_CPPLIBDEP} > > > > USE_GMAKE = Yes > > MAKE_ENV += ${CONFIGURE_ENV} > > diff --git a/infrastructure/bin/portbump b/infrastructure/bin/portbump > > index c7ce8e1c243..94efc77e106 100755 > > --- a/infrastructure/bin/portbump > > +++ b/infrastructure/bin/portbump > > @@ -784,16 +784,16 @@ sub process_makefile { > > } > > $self->{wantlib_start} = $wstart; > > > > - my $gcc4_seen = 0; > > + my $gcc_seen = 0; > > push(@mod_wantlib_seen, map { > > - $gcc4_seen = 1 if $_ eq "gcc4"; > > + $gcc_seen = 1 if $_ eq "gcc"; > > my $v = uc($_); > > $v =~ s,.*/,,g; > > $v =~ s,^PYTHON$,PY,g; > > "MOD${v}_WANTLIB" > > } @{$self->{modules}}); > > - push(@mod_wantlib_seen, "MODGCC4_CPPWANTLIB", "MODGCC4_GCJWANTLIB") > > - if $gcc4_seen; > > + push(@mod_wantlib_seen, "MODGCC_CPPWANTLIB", "MODGCC_GCJWANTLIB") > > + if $gcc_seen; > > if (scalar(@mod_wantlib_seen)) { > > for ($self->run_make('show='.join(' ', @mod_wantlib_seen))) { > > chomp; > > diff --git a/infrastructure/bin/portcheck b/infrastructure/bin/portcheck > > index 36ad80abe14..b6656d6dd29 100755 > > --- a/infrastructure/bin/portcheck > > +++ b/infrastructure/bin/portcheck > > @@ -1314,18 +1314,18 @@ check_plist() { > > } > > > > # Checks made: > > -# * stdc++ doesn't get into WANTLIB when gcc4.port.mk is used. > > +# * stdc++ doesn't get into WANTLIB when gcc.port.mk is used. > > check_wantlib() { > > local portref="$1"; shift > > local modules="$1"; shift > > local default_compiler="$1"; shift > > > > - local gcc4_module=false > > + local gcc_module=false > > > > local v > > > > for v in $modules; do case $v in > > - gcc4) gcc4_module=true;; > > + gcc) gcc_module=true;; > > esac; done > > > > for v; do case $v in > > @@ -1348,8 +1348,8 @@ check_wantlib() { > > ;; > > > > stdc++?(?('>')=+([0-9]))) > > - if $gcc4_module; then > > - err "$portref$v in WANTLIB when gcc4 is" \ > > + if $gcc_module; then > > + err "$portref$v in WANTLIB when gcc is" \ > > "in MODULES; run port-lib-depends-check" \ > > "and if stdc++ is still there, check" \ > > "actual build thoroughly, it's broken" > > diff --git a/infrastructure/mk/README.internals b/infrastructure/mk/README.internals > > index 686fdadb22d..654fb61a6e6 100644 > > --- a/infrastructure/mk/README.internals > > +++ b/infrastructure/mk/README.internals > > @@ -323,8 +323,8 @@ recursion: modules may trigger the inclusion of other modules, thus > > modules.port.mk will re-include itself until the whole list is done. > > > > - COMPILER support is somewhat meshed with modules.port.mk, since it's > > -a back&forth with arch-defines, the gcc4 module, and the clang module. > > -It's got special treatment, because COMPILER must happen before gcc4 > > +a back&forth with arch-defines, the gcc module, and the clang module. > > +It's got special treatment, because COMPILER must happen before gcc > > and clang, while at the same time some modules (qt mostly) may want to > > set COMPILER. > > > > diff --git a/infrastructure/mk/bsd.port.mk b/infrastructure/mk/bsd.port.mk > > index 36e25b83a5a..883955d8bc1 100644 > > --- a/infrastructure/mk/bsd.port.mk > > +++ b/infrastructure/mk/bsd.port.mk > > @@ -842,7 +842,7 @@ IGNORE += "Not built because unlinked \(${UNLINKED}\)" > > .endif > > > > # setup locations of compilers from the base system or environment variables. > > -# MODULES for compilers (gcc4.port.mk, clang.port.mk) also append to this, > > +# MODULES for compilers (gcc.port.mk, clang.port.mk) also append to this, > > # used to write wrappers to WRKDIR/bin which is at the head of the PATH. > > .if ${PROPERTIES:Mclang} > > . if !${COMPILER_LINKS:Mclang} > > diff --git a/infrastructure/mk/compiler.port.mk b/infrastructure/mk/compiler.port.mk > > index 00e36470c93..db830166e54 100644 > > --- a/infrastructure/mk/compiler.port.mk > > +++ b/infrastructure/mk/compiler.port.mk > > @@ -36,17 +36,17 @@ _COMPILER_ARCHS += ${CLANG_ARCHS} > > CHOSEN_COMPILER ?= base-clang > > . endif > > . elif "$c" == "ports-gcc" > > -MODGCC4_ARCHS ?= ${GCC49_ARCHS} > > -_MODGCC4_ARCH_USES = No > > -_COMPILER_ARCHS += ${MODGCC4_ARCHS} > > -. for _i in ${MODGCC4_ARCHS} > > +MODGCC_ARCHS ?= ${GCC49_ARCHS} > > +_MODGCC_ARCH_USES = No > > +_COMPILER_ARCHS += ${MODGCC_ARCHS} > > +. for _i in ${MODGCC_ARCHS} > > . if !empty(MACHINE_ARCH:M${_i}) > > -_MODGCC4_ARCH_USES = Yes > > +_MODGCC_ARCH_USES = Yes > > . endif > > . endfor > > -. if ${_MODGCC4_ARCH_USES:L} == "yes" && !defined(CHOSEN_COMPILER) > > +. if ${_MODGCC_ARCH_USES:L} == "yes" && !defined(CHOSEN_COMPILER) > > MODULES += gcc4 > > -MODGCC4_LANGS += ${COMPILER_LANGS} > > +MODGCC_LANGS += ${COMPILER_LANGS} > > CHOSEN_COMPILER = ports-gcc > > . endif > > . elif "$c" == "ports-clang" > > diff --git a/infrastructure/mk/fortran.port.mk b/infrastructure/mk/fortran.port.mk > > index 9b2eb79ec89..7bfa909fb34 100644 > > --- a/infrastructure/mk/fortran.port.mk > > +++ b/infrastructure/mk/fortran.port.mk > > @@ -7,12 +7,12 @@ ERRORS += "Fatal: need to specify MODFORTRAN_COMPILER" > > .endif > > > > .if ${MODFORTRAN_COMPILER:L} == "gfortran" > > -MODULES += gcc4 > > -MODGCC4_ARCHS ?= * > > -MODGCC4_LANGS += fortran > > -MODFORTRAN_BUILD_DEPENDS += ${MODGCC4_FORTRANDEP} > > -MODFORTRAN_LIB_DEPENDS += ${MODGCC4_FORTRANLIBDEP} > > -MODFORTRAN_WANTLIB += ${MODGCC4_FORTRANWANTLIB} > > +MODULES += gcc > > +MODGCC_ARCHS ?= * > > +MODGCC_LANGS += fortran > > +MODFORTRAN_BUILD_DEPENDS += ${MODGCC_FORTRANDEP} > > +MODFORTRAN_LIB_DEPENDS += ${MODGCC_FORTRANLIBDEP} > > +MODFORTRAN_WANTLIB += ${MODGCC_FORTRANWANTLIB} > > # XXX revisit when we move to lang/gcc/11; also see ports which use > > # fortran libraries that have "USE_NOBTCFI-aarch64.*# fortran" > > USE_NOBTCFI-aarch64 ?= Yes > > diff --git a/infrastructure/mk/gcc4.port.mk b/infrastructure/mk/gcc4.port.mk > > deleted file mode 100644 > > index da9a2625098..00000000000 > > --- a/infrastructure/mk/gcc4.port.mk > > +++ /dev/null > > @@ -1,2 +0,0 @@ > > -MODGCC4_VERSION?=15 > > -.include "${PORTSDIR}/lang/gcc/${MODGCC4_VERSION}/gcc4.port.mk" > > diff --git a/infrastructure/mk/modules.port.mk b/infrastructure/mk/modules.port.mk > > index cd2e4bdf931..cd601e2753d 100644 > > --- a/infrastructure/mk/modules.port.mk > > +++ b/infrastructure/mk/modules.port.mk > > @@ -30,7 +30,7 @@ > > > > _COMPILER= > > .if defined(COMPILER) && !defined(CHOSEN_COMPILER) > > -. if defined(_MODULES_DONE) && ${_MODULES_DONE:Mgcc4} > > +. if defined(_MODULES_DONE) && ${_MODULES_DONE:Mgcc} > > ERRORS += "Fatal: COMPILER coming from a file included *after* the gcc module" > > . endif > > COMPILER_LANGS ?= c c++ > > diff --git a/infrastructure/templates/mk.conf.template b/infrastructure/templates/mk.conf.template > > index 8ccf23174b2..3d67b892145 100644 > > --- a/infrastructure/templates/mk.conf.template > > +++ b/infrastructure/templates/mk.conf.template > > @@ -28,7 +28,7 @@ > > .poison LIB_DEPEDNS > > .poison LIB_DEPEMDS > > .poison LIB_DEPEND > > -.poison MODGCC4_ARCHES > > +.poison MODGCC_ARCHES > > .poison MODGNOME_DESKTOP_FILE > > .poison MODGNOME_ICON_CACHE > > .poison MODGNOME_MIME_FILE > > diff --git a/japanese/mecab/Makefile b/japanese/mecab/Makefile > > index 5890adcf709..1940db34953 100644 > > --- a/japanese/mecab/Makefile > > +++ b/japanese/mecab/Makefile > > @@ -32,7 +32,7 @@ SITES = https://distfiles.sigtrap.nl/ > > DISTFILES = ${DISTNAME}${EXTRACT_SUFX} \ > > ${PKGNAME-ipadic}-${IPADIC_VER}.tar.gz > > > > -LIB_DEPENDS-main = converters/libiconv ${MODGCC4_CPPLIBDEP} > > +LIB_DEPENDS-main = converters/libiconv ${MODGCC_CPPLIBDEP} > > RUN_DEPENDS-main = mecab-ipadic-*:japanese/mecab,-ipadic > > RUN_DEPENDS-ipadic = > > > > diff --git a/lang/clang/clang.port.mk b/lang/clang/clang.port.mk > > index 91c24d3a4e1..8998d63e285 100644 > > --- a/lang/clang/clang.port.mk > > +++ b/lang/clang/clang.port.mk > > @@ -66,10 +66,10 @@ COMPILER_LINKS += g++ ${LOCALBASE}/bin/clang++-${MODCLANG_VERSION} \ > > > > . if ${_MODCLANG_ARCH_CLANG:L} == "no" > > # uses libestdc++ > > -MODULES += gcc4 > > -MODCLANG_CPPLIBDEP = ${MODGCC4_CPPLIBDEP} > > +MODULES += gcc > > +MODCLANG_CPPLIBDEP = ${MODGCC_CPPLIBDEP} > > LIB_DEPENDS += ${MODCLANG_CPPLIBDEP} > > -MODCLANG_CPPWANTLIB = ${MODGCC4_CPPWANTLIB} > > +MODCLANG_CPPWANTLIB = ${MODGCC_CPPWANTLIB} > > LIBECXX = ${MODCLANG_CPPWANTLIB} > > . elif ${MODCLANG_CPPLIB:L} == "yes" > > # uses libec++ > > diff --git a/lang/freebasic/Makefile b/lang/freebasic/Makefile > > index 58c0e9ea753..9a94537b86a 100644 > > --- a/lang/freebasic/Makefile > > +++ b/lang/freebasic/Makefile > > @@ -32,7 +32,7 @@ COMPILER_LANGS = c > > BUILD_DEPENDS = devel/libffi > > > > RUN_DEPENDS = devel/libffi \ > > - lang/gcc/${MODGCC4_VERSION},-main > > + lang/gcc/${MODGCC_VERSION},-main > > > > USE_GMAKE = Yes > > MAKE_FILE = makefile > > diff --git a/lang/gcc/11/Makefile b/lang/gcc/11/Makefile > > index ea82428ffa5..fda2038e012 100644 > > --- a/lang/gcc/11/Makefile > > +++ b/lang/gcc/11/Makefile > > @@ -104,7 +104,7 @@ CXX = ${WRKDIR}/bin/eg++ > > # make sure we link the right libestdc++.a in stage1 when using a bootstrap > > CONFIGURE_ARGS += --with-stage1-ldflags="-L${WRKDIR}/bootstrap/lib" > > TEST_DEPENDS += ${BUILD_PKGPATH},-ada > > -.elif ${PROPERTIES:Mgcc4} > > +.elif ${PROPERTIES:Mgcc} > > # We now require C++11. > > BUILD_DEPENDS += lang/bootgcc > > CC = ${LOCALBASE}/bootstrap-gcc/bin/gcc > > diff --git a/lang/gcc/11/gcc4.port.mk b/lang/gcc/11/gcc4.port.mk > > index 35462739a68..8aa0d1547da 100644 > > --- a/lang/gcc/11/gcc4.port.mk > > +++ b/lang/gcc/11/gcc4.port.mk > > @@ -1,45 +1,45 @@ > > -MODGCC4_ARCHS ?= ${GCC49_ARCHS} > > -MODGCC4_LANGS ?= > > +MODGCC_ARCHS ?= ${GCC49_ARCHS} > > +MODGCC_LANGS ?= > > > > > > # Always include support for this > > -MODGCC4_LANGS += c > > +MODGCC_LANGS += c > > > > -_MODGCC4_OKAY = c c++ fortran > > -.for _l in ${MODGCC4_LANGS:L} > > -. if !${_MODGCC4_OKAY:M${_l}} > > +_MODGCC_OKAY = c c++ fortran > > +.for _l in ${MODGCC_LANGS:L} > > +. if !${_MODGCC_OKAY:M${_l}} > > ERRORS += "Fatal: unknown language ${_l}" > > . endif > > .endfor > > > > -_MODGCC4_ARCH_USES = No > > +_MODGCC_ARCH_USES = No > > > > -.for _i in ${MODGCC4_ARCHS} > > +.for _i in ${MODGCC_ARCHS} > > . if !empty(MACHINE_ARCH:M${_i}) > > -_MODGCC4_ARCH_USES = Yes > > +_MODGCC_ARCH_USES = Yes > > . endif > > .endfor > > > > COMPILER_VERSION ?= gcc2 > > > > -_MODGCC4_LINKS = > > -MODGCC4STDCPP = estdc++ > > -MODGCC4_CPPLIBDEP = lang/gcc/11,-libs>=11,<12 > > -MODGCC4_CPPDEP = lang/gcc/11,-c++>=11,<12 > > -MODGCC4_CPPWANTLIB = estdc++>=20 pthread > > -MODGCC4_ATOMICWANTLIB = atomic > > +_MODGCC_LINKS = > > +MODGCCSTDCPP = estdc++ > > +MODGCC_CPPLIBDEP = lang/gcc/11,-libs>=11,<12 > > +MODGCC_CPPDEP = lang/gcc/11,-c++>=11,<12 > > +MODGCC_CPPWANTLIB = estdc++>=20 pthread > > +MODGCC_ATOMICWANTLIB = atomic > > > > -MODGCC4_FORTRANDEP = lang/gcc/11,-f95>=11,<12 > > -MODGCC4_FORTRANLIBDEP = lang/gcc/11,-libs>=11,<12 > > -MODGCC4_FORTRANWANTLIB = gfortran>=9 > > +MODGCC_FORTRANDEP = lang/gcc/11,-f95>=11,<12 > > +MODGCC_FORTRANLIBDEP = lang/gcc/11,-libs>=11,<12 > > +MODGCC_FORTRANWANTLIB = gfortran>=9 > > # XXX sync with Makefile > > .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" > > -MODGCC4_FORTRANWANTLIB += quadmath > > +MODGCC_FORTRANWANTLIB += quadmath > > .endif > > > > -.if ${_MODGCC4_ARCH_USES:L} == "yes" > > +.if ${_MODGCC_ARCH_USES:L} == "yes" > > > > -. if ${MODGCC4_LANGS:L:Mc} > > +. if ${MODGCC_LANGS:L:Mc} > > BUILD_DEPENDS += lang/gcc/11>=11,<12 > > # XXX ports-clang already defines this > > . if !${COMPILER_LINKS:Mgcc} > > @@ -47,24 +47,24 @@ COMPILER_LINKS += gcc ${LOCALBASE}/bin/egcc cc ${LOCALBASE}/bin/egcc > > . endif > > . endif > > > > -. if ${MODGCC4_LANGS:L:Mc++} > > -BUILD_DEPENDS += ${MODGCC4_CPPDEP} > > -LIB_DEPENDS += ${MODGCC4_CPPLIBDEP} > > -LIBECXX = ${MODGCC4_CPPWANTLIB} > > +. if ${MODGCC_LANGS:L:Mc++} > > +BUILD_DEPENDS += ${MODGCC_CPPDEP} > > +LIB_DEPENDS += ${MODGCC_CPPLIBDEP} > > +LIBECXX = ${MODGCC_CPPWANTLIB} > > # XXX ports-clang already defines this > > . if !${COMPILER_LINKS:Mg++} > > COMPILER_LINKS += c++ ${LOCALBASE}/bin/eg++ g++ ${LOCALBASE}/bin/eg++ > > . endif > > . endif > > > > -. if ${MODGCC4_LANGS:L:Mfortran} > > -BUILD_DEPENDS += ${MODGCC4_FORTRANDEP} > > -WANTLIB += ${MODGCC4_FORTRANWANTLIB} > > -LIB_DEPENDS += ${MODGCC4_FORTRANLIBDEP} > > +. if ${MODGCC_LANGS:L:Mfortran} > > +BUILD_DEPENDS += ${MODGCC_FORTRANDEP} > > +WANTLIB += ${MODGCC_FORTRANWANTLIB} > > +LIB_DEPENDS += ${MODGCC_FORTRANLIBDEP} > > COMPILER_LINKS += gfortran ${LOCALBASE}/bin/egfortran > > . endif > > > > -#. if ${MODGCC4_LANGS:L:Mgo} > > +#. if ${MODGCC_LANGS:L:Mgo} > > #BUILD_DEPENDS += lang/gcc/6,-go>=6,<7 > > #WANTLIB += go > > #LIB_DEPENDS += lang/gcc/6,-go>=6,<7 > > @@ -72,8 +72,8 @@ COMPILER_LINKS += gfortran ${LOCALBASE}/bin/egfortran > > #. endif > > .endif > > > > -.if !empty(_MODGCC4_LINKS) > > -. for _src in ${_MODGCC4_LINKS} > > -MODGCC4_post-patch += ln -sf ${LOCALBASE}/bin/e${_src} ${WRKDIR}/bin/${_src}; > > +.if !empty(_MODGCC_LINKS) > > +. for _src in ${_MODGCC_LINKS} > > +MODGCC_post-patch += ln -sf ${LOCALBASE}/bin/e${_src} ${WRKDIR}/bin/${_src}; > > . endfor > > .endif > > diff --git a/lang/gcc/15/Makefile b/lang/gcc/15/Makefile > > index 4b4e067289f..25c22453d7a 100644 > > --- a/lang/gcc/15/Makefile > > +++ b/lang/gcc/15/Makefile > > @@ -104,7 +104,7 @@ CXX = ${WRKDIR}/bin/eg++ > > GDC = ${WRKDIR}/bin/egdc > > # make sure we link the right libestdc++.a in stage1 when using a bootstrap > > CONFIGURE_ARGS += --with-stage1-ldflags="-L${WRKDIR}/bootstrap/lib" > > -.elif ${PROPERTIES:Mgcc4} > > +.elif ${PROPERTIES:Mgcc} > > # We now require C++11. > > BUILD_DEPENDS += lang/bootgcc > > CC = ${LOCALBASE}/bootstrap-gcc/bin/gcc > > diff --git a/lang/gcc/15/gcc4.port.mk b/lang/gcc/15/gcc4.port.mk > > index c5d791458f8..f6b3fb0d25f 100644 > > --- a/lang/gcc/15/gcc4.port.mk > > +++ b/lang/gcc/15/gcc4.port.mk > > @@ -1,45 +1,45 @@ > > -MODGCC4_ARCHS ?= ${GCC49_ARCHS} > > -MODGCC4_LANGS ?= > > +MODGCC_ARCHS ?= ${GCC49_ARCHS} > > +MODGCC_LANGS ?= > > > > > > # Always include support for this > > -MODGCC4_LANGS += c > > +MODGCC_LANGS += c > > > > -_MODGCC4_OKAY = c c++ fortran > > -.for _l in ${MODGCC4_LANGS:L} > > -. if !${_MODGCC4_OKAY:M${_l}} > > +_MODGCC_OKAY = c c++ fortran > > +.for _l in ${MODGCC_LANGS:L} > > +. if !${_MODGCC_OKAY:M${_l}} > > ERRORS += "Fatal: unknown language ${_l}" > > . endif > > .endfor > > > > -_MODGCC4_ARCH_USES = No > > +_MODGCC_ARCH_USES = No > > > > -.for _i in ${MODGCC4_ARCHS} > > +.for _i in ${MODGCC_ARCHS} > > . if !empty(MACHINE_ARCH:M${_i}) > > -_MODGCC4_ARCH_USES = Yes > > +_MODGCC_ARCH_USES = Yes > > . endif > > .endfor > > > > COMPILER_VERSION ?= gcc2 > > > > -_MODGCC4_LINKS = > > -MODGCC4STDCPP = estdc++ > > -MODGCC4_CPPLIBDEP = lang/gcc/15,-libs>=15,<16 > > -MODGCC4_CPPDEP = lang/gcc/15,-c++>=15,<16 > > -MODGCC4_CPPWANTLIB = estdc++>=21 pthread > > -MODGCC4_ATOMICWANTLIB = atomic > > +_MODGCC_LINKS = > > +MODGCCSTDCPP = estdc++ > > +MODGCC_CPPLIBDEP = lang/gcc/15,-libs>=15,<16 > > +MODGCC_CPPDEP = lang/gcc/15,-c++>=15,<16 > > +MODGCC_CPPWANTLIB = estdc++>=21 pthread > > +MODGCC_ATOMICWANTLIB = atomic > > > > -MODGCC4_FORTRANDEP = lang/gcc/15,-f95>=15,<16 > > -MODGCC4_FORTRANLIBDEP = lang/gcc/15,-libs>=15,<16 > > -MODGCC4_FORTRANWANTLIB = gfortran>=10 > > +MODGCC_FORTRANDEP = lang/gcc/15,-f95>=15,<16 > > +MODGCC_FORTRANLIBDEP = lang/gcc/15,-libs>=15,<16 > > +MODGCC_FORTRANWANTLIB = gfortran>=10 > > # XXX sync with Makefile > > .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" > > -MODGCC4_FORTRANWANTLIB += quadmath > > +MODGCC_FORTRANWANTLIB += quadmath > > .endif > > > > -.if ${_MODGCC4_ARCH_USES:L} == "yes" > > +.if ${_MODGCC_ARCH_USES:L} == "yes" > > > > -. if ${MODGCC4_LANGS:L:Mc} > > +. if ${MODGCC_LANGS:L:Mc} > > BUILD_DEPENDS += lang/gcc/15>=15,<16 > > # XXX ports-clang already defines this > > . if !${COMPILER_LINKS:Mgcc} > > @@ -47,24 +47,24 @@ COMPILER_LINKS += gcc ${LOCALBASE}/bin/egcc cc ${LOCALBASE}/bin/egcc > > . endif > > . endif > > > > -. if ${MODGCC4_LANGS:L:Mc++} > > -BUILD_DEPENDS += ${MODGCC4_CPPDEP} > > -LIB_DEPENDS += ${MODGCC4_CPPLIBDEP} > > -LIBECXX = ${MODGCC4_CPPWANTLIB} > > +. if ${MODGCC_LANGS:L:Mc++} > > +BUILD_DEPENDS += ${MODGCC_CPPDEP} > > +LIB_DEPENDS += ${MODGCC_CPPLIBDEP} > > +LIBECXX = ${MODGCC_CPPWANTLIB} > > # XXX ports-clang already defines this > > . if !${COMPILER_LINKS:Mg++} > > COMPILER_LINKS += c++ ${LOCALBASE}/bin/eg++ g++ ${LOCALBASE}/bin/eg++ > > . endif > > . endif > > > > -. if ${MODGCC4_LANGS:L:Mfortran} > > -BUILD_DEPENDS += ${MODGCC4_FORTRANDEP} > > -WANTLIB += ${MODGCC4_FORTRANWANTLIB} > > -LIB_DEPENDS += ${MODGCC4_FORTRANLIBDEP} > > +. if ${MODGCC_LANGS:L:Mfortran} > > +BUILD_DEPENDS += ${MODGCC_FORTRANDEP} > > +WANTLIB += ${MODGCC_FORTRANWANTLIB} > > +LIB_DEPENDS += ${MODGCC_FORTRANLIBDEP} > > COMPILER_LINKS += gfortran ${LOCALBASE}/bin/egfortran > > . endif > > > > -#. if ${MODGCC4_LANGS:L:Mgo} > > +#. if ${MODGCC_LANGS:L:Mgo} > > #BUILD_DEPENDS += lang/gcc/6,-go>=6,<7 > > #WANTLIB += go > > #LIB_DEPENDS += lang/gcc/6,-go>=6,<7 > > @@ -72,8 +72,8 @@ COMPILER_LINKS += gfortran ${LOCALBASE}/bin/egfortran > > #. endif > > .endif > > > > -.if !empty(_MODGCC4_LINKS) > > -. for _src in ${_MODGCC4_LINKS} > > -MODGCC4_post-patch += ln -sf ${LOCALBASE}/bin/e${_src} ${WRKDIR}/bin/${_src}; > > +.if !empty(_MODGCC_LINKS) > > +. for _src in ${_MODGCC_LINKS} > > +MODGCC_post-patch += ln -sf ${LOCALBASE}/bin/e${_src} ${WRKDIR}/bin/${_src}; > > . endfor > > .endif > > diff --git a/lang/gcc/8/gcc4.port.mk b/lang/gcc/8/gcc4.port.mk > > index a414a56809d..0ee61c2c749 100644 > > --- a/lang/gcc/8/gcc4.port.mk > > +++ b/lang/gcc/8/gcc4.port.mk > > @@ -1,45 +1,45 @@ > > -MODGCC4_ARCHS ?= ${GCC49_ARCHS} > > -MODGCC4_LANGS ?= > > +MODGCC_ARCHS ?= ${GCC49_ARCHS} > > +MODGCC_LANGS ?= > > > > > > # Always include support for this > > -MODGCC4_LANGS += c > > +MODGCC_LANGS += c > > > > -_MODGCC4_OKAY = c c++ fortran > > -.for _l in ${MODGCC4_LANGS:L} > > -. if !${_MODGCC4_OKAY:M${_l}} > > +_MODGCC_OKAY = c c++ fortran > > +.for _l in ${MODGCC_LANGS:L} > > +. if !${_MODGCC_OKAY:M${_l}} > > ERRORS += "Fatal: unknown language ${_l}" > > . endif > > .endfor > > > > -_MODGCC4_ARCH_USES = No > > +_MODGCC_ARCH_USES = No > > > > -.for _i in ${MODGCC4_ARCHS} > > +.for _i in ${MODGCC_ARCHS} > > . if !empty(MACHINE_ARCH:M${_i}) > > -_MODGCC4_ARCH_USES = Yes > > +_MODGCC_ARCH_USES = Yes > > . endif > > .endfor > > > > COMPILER_VERSION ?= gcc2 > > > > -_MODGCC4_LINKS = > > -MODGCC4STDCPP = estdc++ > > -MODGCC4_CPPLIBDEP = lang/gcc/8,-libs>=8,<9 > > -MODGCC4_CPPDEP = lang/gcc/8,-c++>=8,<9 > > -MODGCC4_CPPWANTLIB = estdc++>=19 pthread > > -MODGCC4_ATOMICWANTLIB = atomic > > +_MODGCC_LINKS = > > +MODGCCSTDCPP = estdc++ > > +MODGCC_CPPLIBDEP = lang/gcc/8,-libs>=8,<9 > > +MODGCC_CPPDEP = lang/gcc/8,-c++>=8,<9 > > +MODGCC_CPPWANTLIB = estdc++>=19 pthread > > +MODGCC_ATOMICWANTLIB = atomic > > > > -MODGCC4_FORTRANDEP = lang/gcc/8,-f95>=8,<9 > > -MODGCC4_FORTRANLIBDEP = lang/gcc/8,-libs>=8,<9 > > -MODGCC4_FORTRANWANTLIB = gfortran>=8 > > +MODGCC_FORTRANDEP = lang/gcc/8,-f95>=8,<9 > > +MODGCC_FORTRANLIBDEP = lang/gcc/8,-libs>=8,<9 > > +MODGCC_FORTRANWANTLIB = gfortran>=8 > > # XXX sync with Makefile > > .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" > > -MODGCC4_FORTRANWANTLIB += quadmath > > +MODGCC_FORTRANWANTLIB += quadmath > > .endif > > > > -.if ${_MODGCC4_ARCH_USES:L} == "yes" > > +.if ${_MODGCC_ARCH_USES:L} == "yes" > > > > -. if ${MODGCC4_LANGS:L:Mc} > > +. if ${MODGCC_LANGS:L:Mc} > > BUILD_DEPENDS += lang/gcc/8>=8,<9 > > # XXX ports-clang already defines this > > . if !${COMPILER_LINKS:Mgcc} > > @@ -47,24 +47,24 @@ COMPILER_LINKS += gcc ${LOCALBASE}/bin/egcc cc ${LOCALBASE}/bin/egcc > > . endif > > . endif > > > > -. if ${MODGCC4_LANGS:L:Mc++} > > -BUILD_DEPENDS += ${MODGCC4_CPPDEP} > > -LIB_DEPENDS += ${MODGCC4_CPPLIBDEP} > > -LIBECXX = ${MODGCC4_CPPWANTLIB} > > +. if ${MODGCC_LANGS:L:Mc++} > > +BUILD_DEPENDS += ${MODGCC_CPPDEP} > > +LIB_DEPENDS += ${MODGCC_CPPLIBDEP} > > +LIBECXX = ${MODGCC_CPPWANTLIB} > > # XXX ports-clang already defines this > > . if !${COMPILER_LINKS:Mg++} > > COMPILER_LINKS += c++ ${LOCALBASE}/bin/eg++ g++ ${LOCALBASE}/bin/eg++ > > . endif > > . endif > > > > -. if ${MODGCC4_LANGS:L:Mfortran} > > -BUILD_DEPENDS += ${MODGCC4_FORTRANDEP} > > -WANTLIB += ${MODGCC4_FORTRANWANTLIB} > > -LIB_DEPENDS += ${MODGCC4_FORTRANLIBDEP} > > +. if ${MODGCC_LANGS:L:Mfortran} > > +BUILD_DEPENDS += ${MODGCC_FORTRANDEP} > > +WANTLIB += ${MODGCC_FORTRANWANTLIB} > > +LIB_DEPENDS += ${MODGCC_FORTRANLIBDEP} > > COMPILER_LINKS += gfortran ${LOCALBASE}/bin/egfortran > > . endif > > > > -#. if ${MODGCC4_LANGS:L:Mgo} > > +#. if ${MODGCC_LANGS:L:Mgo} > > #BUILD_DEPENDS += lang/gcc/6,-go>=6,<7 > > #WANTLIB += go > > #LIB_DEPENDS += lang/gcc/6,-go>=6,<7 > > @@ -72,8 +72,8 @@ COMPILER_LINKS += gfortran ${LOCALBASE}/bin/egfortran > > #. endif > > .endif > > > > -.if !empty(_MODGCC4_LINKS) > > -. for _src in ${_MODGCC4_LINKS} > > -MODGCC4_post-patch += ln -sf ${LOCALBASE}/bin/e${_src} ${WRKDIR}/bin/${_src}; > > +.if !empty(_MODGCC_LINKS) > > +. for _src in ${_MODGCC_LINKS} > > +MODGCC_post-patch += ln -sf ${LOCALBASE}/bin/e${_src} ${WRKDIR}/bin/${_src}; > > . endfor > > .endif > > diff --git a/lang/gforth/Makefile b/lang/gforth/Makefile > > index 72cafaf01fe..7341694f3e7 100644 > > --- a/lang/gforth/Makefile > > +++ b/lang/gforth/Makefile > > @@ -44,9 +44,9 @@ PATCH_LIST = patch-* patch_i386-* > > > > # With base-clang on powerpc it either runs out of memory with i386 patches or > > # -O1. Using -O0 makes preforth segfault. Use ports-gcc instead. > > -MODULES += gcc4 > > -MODGCC4_ARCHS = powerpc > > -MODGCC4_LANGS = c > > +MODULES += gcc > > +MODGCC_ARCHS = powerpc > > +MODGCC_LANGS = c > > > > # We still need -O0 due to high memory usage though. > > .if ${MACHINE_ARCH} == "powerpc" > > diff --git a/misc/gpsd/Makefile b/misc/gpsd/Makefile > > index 844883f6cce..4b7769dc4a9 100644 > > --- a/misc/gpsd/Makefile > > +++ b/misc/gpsd/Makefile > > @@ -48,7 +48,7 @@ TEST_DEPENDS= ${FULLPKGNAME-main}:${FULLPKGPATH-main} \ > > > > LIB_DEPENDS-main = devel/libusb1 \ > > x11/dbus \ > > - ${MODGCC4_CPPLIBDEP} > > + ${MODGCC_CPPLIBDEP} > > RUN_DEPENDS-main= ${MODPY_RUN_DEPENDS} \ > > devel/py-serial > > > > diff --git a/net/avahi/Makefile b/net/avahi/Makefile > > index cba1a551a6c..3aa35dcfd3a 100755 > > --- a/net/avahi/Makefile > > +++ b/net/avahi/Makefile > > @@ -184,7 +184,7 @@ CONFIGURE_ARGS+= --with-dbus-sys="${SYSCONFDIR}/dbus-1/system.d" \ > > --disable-doxygen-xml \ > > --disable-doxygen-html > > > > -# don't link with libssp from the gcc4 port > > +# don't link with libssp from the gcc port > > # __guard and __stack_smash_handler are part of libc > > CONFIGURE_ARGS += --disable-stack-protector > > > > diff --git a/net/isc-bind/Makefile b/net/isc-bind/Makefile > > index c25059672ef..5ee26d2bc07 100644 > > --- a/net/isc-bind/Makefile > > +++ b/net/isc-bind/Makefile > > @@ -65,7 +65,7 @@ COMPILER_LANGS= c > > > > .if ${MACHINE_ARCH:Mhppa} > > WANTLIB += atomic > > -LIB_DEPENDS += ${MODGCC4_CPPLIBDEP} > > +LIB_DEPENDS += ${MODGCC_CPPLIBDEP} > > MAKE_FLAGS += LDFLAGS="${LDFLAGS} -latomic" > > .endif > > > > diff --git a/net/isc-dhcp/Makefile b/net/isc-dhcp/Makefile > > index ce5c0327fbe..ca5cd2db206 100644 > > --- a/net/isc-dhcp/Makefile > > +++ b/net/isc-dhcp/Makefile > > @@ -45,7 +45,7 @@ MAKE_ENV += CC='${CC}' > > # Fix "undefined reference to `__atomic_store_8'" > > .if ${MACHINE_ARCH:Mhppa} > > WANTLIB += atomic > > -LIB_DEPENDS += lang/gcc/${MODGCC4_VERSION},-libs > > +LIB_DEPENDS += lang/gcc/${MODGCC_VERSION},-libs > > MAKE_FLAGS += LDFLAGS="${LDFLAGS} -latomic" > > .endif > > > > diff --git a/print/poppler/Makefile b/print/poppler/Makefile > > index 69107d519a7..33cfcef056c 100644 > > --- a/print/poppler/Makefile > > +++ b/print/poppler/Makefile > > @@ -62,7 +62,7 @@ RUN_DEPENDS-main= \ > > print/poppler-data>=0.4.7 \ > > devel/boost > > > > -LIB_DEPENDS-main=${MODGCC4_CPPLIBDEP} \ > > +LIB_DEPENDS-main=${MODGCC_CPPLIBDEP} \ > > converters/libiconv \ > > devel/gettext,-runtime \ > > devel/glib2 \ > > @@ -73,14 +73,14 @@ LIB_DEPENDS-main=${MODGCC4_CPPLIBDEP} \ > > graphics/tiff > > > > LIB_DEPENDS-qt5=${MODQT5_LIB_DEPENDS} \ > > - ${MODGCC4_CPPLIBDEP} \ > > + ${MODGCC_CPPLIBDEP} \ > > print/poppler > > > > LIB_DEPENDS-qt6=${MODQT6_LIB_DEPENDS} \ > > - ${MODGCC4_CPPLIBDEP} \ > > + ${MODGCC_CPPLIBDEP} \ > > print/poppler > > > > -LIB_DEPENDS-utils=${MODGCC4_CPPLIBDEP} \ > > +LIB_DEPENDS-utils=${MODGCC_CPPLIBDEP} \ > > print/poppler > > > > WANTLIB-main= ${COMPILER_LIBCXX} \ > > diff --git a/sysutils/bacula/Makefile b/sysutils/bacula/Makefile > > index 5fc5bacbd31..c8e358bc5b2 100644 > > --- a/sysutils/bacula/Makefile > > +++ b/sysutils/bacula/Makefile > > @@ -108,16 +108,16 @@ LIB_DEPENDS-server= ${LIB_DEPENDS} \ > > bacula-pgsql-*|bacula-mysql-*|bacula-sqlite3-*:sysutils/bacula,-pgsql > > > > WANTLIB-pgsql += pq m ${COMPILER_LIBCXX} > > -LIB_DEPENDS-pgsql += ${MODGCC4_CPPLIBDEP} \ > > +LIB_DEPENDS-pgsql += ${MODGCC_CPPLIBDEP} \ > > databases/postgresql > > RUN_DEPENDS-pgsql += databases/postgresql,-contrib > > > > WANTLIB-mysql += m mariadb ${COMPILER_LIBCXX} > > -LIB_DEPENDS-mysql += ${MODGCC4_CPPLIBDEP} \ > > +LIB_DEPENDS-mysql += ${MODGCC_CPPLIBDEP} \ > > databases/mariadb > > > > WANTLIB-sqlite3 += sqlite3 m pthread z ${COMPILER_LIBCXX} > > -LIB_DEPENDS-sqlite3= ${MODGCC4_CPPLIBDEP} \ > > +LIB_DEPENDS-sqlite3= ${MODGCC_CPPLIBDEP} \ > > databases/sqlite3 > > > > MODULES += x11/qt5 > > diff --git a/telephony/asterisk/Makefile.inc b/telephony/asterisk/Makefile.inc > > index a0430e89cd3..90fd1799568 100644 > > --- a/telephony/asterisk/Makefile.inc > > +++ b/telephony/asterisk/Makefile.inc > > @@ -60,9 +60,9 @@ FLAVOR?= > > FLAVOR+= no_vm_odbc > > .endif > > > > -# MODGCC4_CPPLIBDEP is empty on a clang build. > > +# MODGCC_CPPLIBDEP is empty on a clang build. > > # leave it here, don't try to conditionalize it below, dpb doesn't like that. > > -LIB_DEPENDS-main= ${MODGCC4_CPPLIBDEP} \ > > +LIB_DEPENDS-main= ${MODGCC_CPPLIBDEP} \ > > audio/gsm \ > > audio/libogg \ > > audio/libvorbis \ > > @@ -172,7 +172,7 @@ BLOCKSLIBDEP = devel/libdispatch > > BLOCKSWANTLIB = BlocksRuntime > > .else > > CFLAGS += -ftrampolines > > -WANTLIB-main += ${MODGCC4_CPPWANTLIB} > > +WANTLIB-main += ${MODGCC_CPPWANTLIB} > > .endif > > > > # calendar > > diff --git a/telephony/pjsua/Makefile b/telephony/pjsua/Makefile > > index 1bbef3c168a..bd0abf763a7 100644 > > --- a/telephony/pjsua/Makefile > > +++ b/telephony/pjsua/Makefile > > @@ -57,7 +57,7 @@ LIB_DEPENDS-main= \ > > telephony/bcg729 > > > > # needed for gcc archs, it's not inherited by subpackages > > -LIB_DEPENDS-main += ${MODGCC4_CPPLIBDEP} > > +LIB_DEPENDS-main += ${MODGCC_CPPLIBDEP} > > > > LIB_DEPENDS-pjsua= telephony/pjsua,-main \ > > audio/portaudio-svn > > diff --git a/tests/portbump/t1.sample b/tests/portbump/t1.sample > > index c132453471f..58baeffc5af 100644 > > --- a/tests/portbump/t1.sample > > +++ b/tests/portbump/t1.sample > > @@ -212,7 +212,7 @@ CONFIGURE_ARGS+=--with-dbus-sys="${SYSCONFDIR}/dbus-1/" \ > > --disable-doxygen-xml \ > > --disable-doxygen-html > > > > -# don't link with libssp from the gcc4 port > > +# don't link with libssp from the gcc port > > # __guard and __stack_smash_handler are part of libc > > CONFIGURE_ARGS+=--disable-stack-protector > > > > diff --git a/tests/portbump/t1/Makefile b/tests/portbump/t1/Makefile > > index caf92222f76..a495b86703d 100644 > > --- a/tests/portbump/t1/Makefile > > +++ b/tests/portbump/t1/Makefile > > @@ -210,7 +210,7 @@ CONFIGURE_ARGS+=--with-dbus-sys="${SYSCONFDIR}/dbus-1/" \ > > --disable-doxygen-xml \ > > --disable-doxygen-html > > > > -# don't link with libssp from the gcc4 port > > +# don't link with libssp from the gcc port > > # __guard and __stack_smash_handler are part of libc > > CONFIGURE_ARGS+=--disable-stack-protector > > > > diff --git a/tests/portbump/t4.sample b/tests/portbump/t4.sample > > index 29fbaaf21b2..1fbf77e9152 100644 > > --- a/tests/portbump/t4.sample > > +++ b/tests/portbump/t4.sample > > @@ -204,7 +204,7 @@ CONFIGURE_ARGS+=--with-dbus-sys="${SYSCONFDIR}/dbus-1/" \ > > --disable-doxygen-xml \ > > --disable-doxygen-html > > > > -# don't link with libssp from the gcc4 port > > +# don't link with libssp from the gcc port > > # __guard and __stack_smash_handler are part of libc > > CONFIGURE_ARGS+=--disable-stack-protector > > > > diff --git a/tests/portbump/t4/Makefile b/tests/portbump/t4/Makefile > > index caf92222f76..a495b86703d 100644 > > --- a/tests/portbump/t4/Makefile > > +++ b/tests/portbump/t4/Makefile > > @@ -210,7 +210,7 @@ CONFIGURE_ARGS+=--with-dbus-sys="${SYSCONFDIR}/dbus-1/" \ > > --disable-doxygen-xml \ > > --disable-doxygen-html > > > > -# don't link with libssp from the gcc4 port > > +# don't link with libssp from the gcc port > > # __guard and __stack_smash_handler are part of libc > > CONFIGURE_ARGS+=--disable-stack-protector > > > > diff --git a/tests/portbump/t5.sample b/tests/portbump/t5.sample > > index 168c6fc0533..adfee80440d 100644 > > --- a/tests/portbump/t5.sample > > +++ b/tests/portbump/t5.sample > > @@ -230,7 +230,7 @@ CONFIGURE_ARGS+=--with-dbus-sys="${SYSCONFDIR}/dbus-1/" \ > > --disable-doxygen-xml \ > > --disable-doxygen-html > > > > -# don't link with libssp from the gcc4 port > > +# don't link with libssp from the gcc port > > # __guard and __stack_smash_handler are part of libc > > CONFIGURE_ARGS+=--disable-stack-protector > > > > diff --git a/tests/portbump/t5/Makefile b/tests/portbump/t5/Makefile > > index 25076b76926..7f307310156 100644 > > --- a/tests/portbump/t5/Makefile > > +++ b/tests/portbump/t5/Makefile > > @@ -218,7 +218,7 @@ CONFIGURE_ARGS+=--with-dbus-sys="${SYSCONFDIR}/dbus-1/" \ > > --disable-doxygen-xml \ > > --disable-doxygen-html > > > > -# don't link with libssp from the gcc4 port > > +# don't link with libssp from the gcc port > > # __guard and __stack_smash_handler are part of libc > > CONFIGURE_ARGS+=--disable-stack-protector > > > > diff --git a/tests/portcheck/t14.sample b/tests/portcheck/t14.sample > > index f06873c5aa8..27425a5f406 100644 > > --- a/tests/portcheck/t14.sample > > +++ b/tests/portcheck/t14.sample > > @@ -1 +1 @@ > > -in -foo: stdc++ in WANTLIB when gcc4 is in MODULES; run port-lib-depends-check and if stdc++ is still there, check actual build thoroughly, it's broken > > +in -foo: stdc++ in WANTLIB when gcc is in MODULES; run port-lib-depends-check and if stdc++ is still there, check actual build thoroughly, it's broken > > diff --git a/tests/portcheck/t14/Makefile b/tests/portcheck/t14/Makefile > > index aee577155ef..b1bfd3061a0 100644 > > --- a/tests/portcheck/t14/Makefile > > +++ b/tests/portcheck/t14/Makefile > > @@ -10,6 +10,6 @@ WANTLIB-foo = m stdc++ z > > > > MULTI_PACKAGES = -main -foo > > > > -MODULES = gcc4 > > +MODULES = gcc > > > > .include <bsd.port.mk> > > diff --git a/www/chromium/Makefile b/www/chromium/Makefile > > index 505ca4ea71e..334ca59903c 100644 > > --- a/www/chromium/Makefile > > +++ b/www/chromium/Makefile > > @@ -85,7 +85,7 @@ BUILD_DEPENDS= archivers/bzip2 \ > > x11/py-xcbgen \ > > ${MODQT5_LIB_DEPENDS} \ > > ${MODQT6_LIB_DEPENDS} \ > > - ${MODGCC4_CPPDEP} \ > > + ${MODGCC_CPPDEP} \ > > ${RUN_DEPENDS} > > LIB_DEPENDS= audio/opus \ > > devel/pango \ > > @@ -98,7 +98,7 @@ LIB_DEPENDS= audio/opus \ > > x11/gnome/at-spi2-core \ > > x11/xkbcommon \ > > print/cups,-libs \ > > - ${MODGCC4_CPPLIBDEP} > > + ${MODGCC_CPPLIBDEP} > > > > USE_GMAKE= Yes > > > > diff --git a/www/iridium/Makefile b/www/iridium/Makefile > > index 6a848d1d35d..9c86f24a3ca 100644 > > --- a/www/iridium/Makefile > > +++ b/www/iridium/Makefile > > @@ -81,7 +81,7 @@ BUILD_DEPENDS= archivers/bzip2 \ > > x11/py-xcbgen \ > > ${MODQT5_LIB_DEPENDS} \ > > ${MODQT6_LIB_DEPENDS} \ > > - ${MODGCC4_CPPDEP} \ > > + ${MODGCC_CPPDEP} \ > > ${RUN_DEPENDS} > > LIB_DEPENDS= audio/opus \ > > devel/pango \ > > @@ -94,7 +94,7 @@ LIB_DEPENDS= audio/opus \ > > x11/gnome/at-spi2-core \ > > x11/xkbcommon \ > > print/cups,-libs \ > > - ${MODGCC4_CPPLIBDEP} > > + ${MODGCC_CPPLIBDEP} > > > > USE_GMAKE= Yes > > > > diff --git a/www/ungoogled-chromium/Makefile b/www/ungoogled-chromium/Makefile > > index 95996983357..312cc686b03 100644 > > --- a/www/ungoogled-chromium/Makefile > > +++ b/www/ungoogled-chromium/Makefile > > @@ -91,7 +91,7 @@ BUILD_DEPENDS= archivers/bzip2 \ > > x11/py-xcbgen \ > > ${MODQT5_LIB_DEPENDS} \ > > ${MODQT6_LIB_DEPENDS} \ > > - ${MODGCC4_CPPDEP} \ > > + ${MODGCC_CPPDEP} \ > > ${RUN_DEPENDS} > > LIB_DEPENDS= audio/opus \ > > devel/pango \ > > @@ -104,7 +104,7 @@ LIB_DEPENDS= audio/opus \ > > x11/gnome/at-spi2-core \ > > x11/xkbcommon \ > > print/cups,-libs \ > > - ${MODGCC4_CPPLIBDEP} > > + ${MODGCC_CPPLIBDEP} > > > > USE_GMAKE= Yes > > > > diff --git a/x11/ogre/Makefile b/x11/ogre/Makefile > > index 5c3d08d7fba..0bcfe3f0ab1 100644 > > --- a/x11/ogre/Makefile > > +++ b/x11/ogre/Makefile > > @@ -34,7 +34,7 @@ MAINTAINER = Pascal Stumpf <pascal@stumpf.co> > > # MIT > > PERMIT_PACKAGE = Yes > > > > -WANTLIB += ICE SM X11 Xaw Xext Xt $(MODGCC4_ATOMICWANTLIB) > > +WANTLIB += ICE SM X11 Xaw Xext Xt $(MODGCC_ATOMICWANTLIB) > > WANTLIB += boost_atomic-mt boost_date_time-mt > > WANTLIB += boost_chrono-mt boost_system-mt boost_thread-mt c > > WANTLIB += freeimage freetype m pthread z zzip > > diff --git a/x11/qt5/qtbase/Makefile b/x11/qt5/qtbase/Makefile > > index ef8bfc84ba6..17e7ae08aa2 100644 > > --- a/x11/qt5/qtbase/Makefile > > +++ b/x11/qt5/qtbase/Makefile > > @@ -83,15 +83,15 @@ LIB_DEPENDS-main += devel/gettext,-runtime > > LIB_DEPENDS-global = > > > > LIB_DEPENDS-mysql = ${BASE_PKGPATH},-main>=${VERSION:R},<${QT5_NEXT_VERSION} \ > > - ${MODGCC4_CPPLIBDEP} \ > > + ${MODGCC_CPPLIBDEP} \ > > databases/mariadb > > > > LIB_DEPENDS-psql = ${BASE_PKGPATH},-main>=${VERSION:R},<${QT5_NEXT_VERSION} \ > > - ${MODGCC4_CPPLIBDEP} \ > > + ${MODGCC_CPPLIBDEP} \ > > databases/postgresql > > > > LIB_DEPENDS-tds = ${BASE_PKGPATH},-main>=${VERSION:R},<${QT5_NEXT_VERSION} \ > > - ${MODGCC4_CPPLIBDEP} \ > > + ${MODGCC_CPPLIBDEP} \ > > databases/freetds > > > > # The atspi is checked at configure time and used via D-Bus. > > diff --git a/x11/qt6/qtbase/Makefile b/x11/qt6/qtbase/Makefile > > index bb9d7cb9022..72f73924f1b 100644 > > --- a/x11/qt6/qtbase/Makefile > > +++ b/x11/qt6/qtbase/Makefile > > @@ -85,12 +85,12 @@ LIB_DEPENDS-main += devel/gettext,-runtime > > LIB_DEPENDS-mysql = ${BASE_PKGPATH},-main \ > > databases/mariadb > > > > -LIB_DEPENDS-mysql += ${MODGCC4_CPPLIBDEP} > > +LIB_DEPENDS-mysql += ${MODGCC_CPPLIBDEP} > > > > LIB_DEPENDS-psql = ${BASE_PKGPATH},-main \ > > databases/postgresql > > > > -LIB_DEPENDS-psql += ${MODGCC4_CPPLIBDEP} > > +LIB_DEPENDS-psql += ${MODGCC_CPPLIBDEP} > > > > BUILD_DEPENDS = graphics/vulkan-loader \ > > wayland/wayland-protocols \ > > >