it looks right to me.
On 2026/10/26 15:46, Kirill A. Korinsky wrote:
> On Wed, 21 Oct 2026 13:41:11 +0200,
> Kirill A. Korinsky <[email protected]> wrote:
> >
> > ports@,
> >
> > here the final step of renaming / refactoring of ports gcc integration.
> >
>
> Anyone?
>
>
> Index: src/share/man/man5/port-modules.5
> ===================================================================
> RCS file: /home/cvs/src/share/man/man5/port-modules.5,v
> diff -u -p -r1.291 port-modules.5
> --- src/share/man/man5/port-modules.5 21 Oct 2026 09:09:47 -0000 1.291
> +++ src/share/man/man5/port-modules.5 21 Oct 2026 11:19:54 -0000
> @@ -871,14 +871,14 @@ The current default and only supported v
> .Cm gfortran .
> The dependencies are chosen according to
> .Ev MODFORTRAN_COMPILER .
> -.It Cm gcc4
> +.It Cm gcc
> If
> .Ev COMPILER_VERSION
> is not gcc4 (defined by
> .Pa /usr/share/mk/bsd.own.mk ) ,
> and architecture is in
> .Ev MODGCC_ARCHS ,
> -then the gcc4 compilers will be put at the front of the path.
> +then the gcc compilers will be put at the front of the path.
> By default, only C language support is included by this module.
> If other languages are needed, they must be listed in
> .Ev MODGCC_LANGS
> @@ -938,7 +938,7 @@ target (if not already defined).
> It heeds
> .Ev NO_BUILD .
> .It Cm lang/clang
> -Similar to gcc4 module.
> +Similar to gcc module.
> If architecture is in MODCLANG_ARCHS, the Clang compilers will be
> put at the front of the path.
> By default, only C language support is included by this module.
> Index: ports/astro/wcslib/Makefile
> ===================================================================
> RCS file: /home/cvs/ports/astro/wcslib/Makefile,v
> diff -u -p -r1.23 Makefile
> --- ports/astro/wcslib/Makefile 21 Oct 2026 09:09:47 -0000 1.23
> +++ ports/astro/wcslib/Makefile 21 Oct 2026 11:09:20 -0000
> @@ -17,7 +17,7 @@ EXTRACT_SUFX = .tar.bz2
> COMPILER = base-clang ports-gcc
> COMPILER_LANGS = c
>
> -MODULES = gcc4
> +MODULES = gcc
> MODGCC_LANGS = fortran
>
> LIB_DEPENDS = math/cfitsio
> Index: ports/devel/dub/Makefile
> ===================================================================
> RCS file: /home/cvs/ports/devel/dub/Makefile,v
> diff -u -p -r1.12 Makefile
> --- ports/devel/dub/Makefile 21 Oct 2026 09:09:47 -0000 1.12
> +++ ports/devel/dub/Makefile 21 Oct 2026 11:09:20 -0000
> @@ -26,7 +26,7 @@ DMD = ${LOCALBASE}/bin/dmd
> .else
> WANTLIB += c m pthread
>
> -MODULES = gcc4
> +MODULES = gcc
> MODGCC_LANGS = d
>
> BUILD_DEPENDS = lang/gdmd
> Index: ports/infrastructure/bin/portbump
> ===================================================================
> RCS file: /home/cvs/ports/infrastructure/bin/portbump,v
> diff -u -p -r1.26 portbump
> --- ports/infrastructure/bin/portbump 21 Oct 2026 09:09:47 -0000 1.26
> +++ ports/infrastructure/bin/portbump 21 Oct 2026 11:09:20 -0000
> @@ -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, "MODGCC_CPPWANTLIB", "MODGCC_GCJWANTLIB")
> - if $gcc4_seen;
> + if $gcc_seen;
> if (scalar(@mod_wantlib_seen)) {
> for ($self->run_make('show='.join(' ', @mod_wantlib_seen))) {
> chomp;
> Index: ports/infrastructure/bin/portcheck
> ===================================================================
> RCS file: /home/cvs/ports/infrastructure/bin/portcheck,v
> diff -u -p -r1.150 portcheck
> --- ports/infrastructure/bin/portcheck 24 Oct 2025 14:25:34 -0000
> 1.150
> +++ ports/infrastructure/bin/portcheck 21 Oct 2026 11:09:20 -0000
> @@ -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"
> Index: ports/infrastructure/mk/README.internals
> ===================================================================
> RCS file: /home/cvs/ports/infrastructure/mk/README.internals,v
> diff -u -p -r1.20 README.internals
> --- ports/infrastructure/mk/README.internals 4 Dec 2025 18:18:34 -0000
> 1.20
> +++ ports/infrastructure/mk/README.internals 21 Oct 2026 11:09:20 -0000
> @@ -323,8 +323,8 @@ recursion: modules may trigger the inclu
> 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.
>
> Index: ports/infrastructure/mk/bsd.port.mk
> ===================================================================
> RCS file: /home/cvs/ports/infrastructure/mk/bsd.port.mk,v
> diff -u -p -r1.1653 bsd.port.mk
> --- ports/infrastructure/mk/bsd.port.mk 14 Oct 2026 11:11:29 -0000
> 1.1653
> +++ ports/infrastructure/mk/bsd.port.mk 21 Oct 2026 11:09:20 -0000
> @@ -845,7 +845,7 @@ IGNORE += "Not built because 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}
> Index: ports/infrastructure/mk/compiler.port.mk
> ===================================================================
> RCS file: /home/cvs/ports/infrastructure/mk/compiler.port.mk,v
> diff -u -p -r1.8 compiler.port.mk
> --- ports/infrastructure/mk/compiler.port.mk 21 Oct 2026 09:09:47 -0000
> 1.8
> +++ ports/infrastructure/mk/compiler.port.mk 21 Oct 2026 11:09:20 -0000
> @@ -45,7 +45,7 @@ _MODGCC_ARCH_USES = Yes
> . endif
> . endfor
> . if ${_MODGCC_ARCH_USES:L} == "yes" && !defined(CHOSEN_COMPILER)
> -MODULES += gcc4
> +MODULES += gcc
> MODGCC_LANGS += ${COMPILER_LANGS}
> CHOSEN_COMPILER = ports-gcc
> . endif
> Index: ports/infrastructure/mk/fortran.port.mk
> ===================================================================
> RCS file: /home/cvs/ports/infrastructure/mk/fortran.port.mk,v
> diff -u -p -r1.22 fortran.port.mk
> --- ports/infrastructure/mk/fortran.port.mk 21 Oct 2026 09:09:47 -0000
> 1.22
> +++ ports/infrastructure/mk/fortran.port.mk 21 Oct 2026 11:09:20 -0000
> @@ -7,7 +7,7 @@ ERRORS += "Fatal: need to specify MODFOR
> .endif
>
> .if ${MODFORTRAN_COMPILER:L} == "gfortran"
> -MODULES += gcc4
> +MODULES += gcc
> MODGCC_ARCHS ?= *
> MODGCC_LANGS += fortran
> MODFORTRAN_BUILD_DEPENDS += ${MODGCC_FORTRANDEP}
> Index: ports/infrastructure/mk/gcc.port.mk
> ===================================================================
> RCS file: ports/infrastructure/mk/gcc.port.mk
> diff -N ports/infrastructure/mk/gcc.port.mk
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ ports/infrastructure/mk/gcc.port.mk 21 Oct 2026 11:16:21 -0000
> @@ -0,0 +1,2 @@
> +MODGCC_VERSION?=16
> +.include "${PORTSDIR}/lang/gcc/${MODGCC_VERSION}/gcc.port.mk"
> Index: ports/infrastructure/mk/gcc4.port.mk
> ===================================================================
> RCS file: ports/infrastructure/mk/gcc4.port.mk
> diff -N ports/infrastructure/mk/gcc4.port.mk
> --- ports/infrastructure/mk/gcc4.port.mk 21 Oct 2026 09:09:47 -0000
> 1.17
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,2 +0,0 @@
> -MODGCC_VERSION?=16
> -.include "${PORTSDIR}/lang/gcc/${MODGCC_VERSION}/gcc4.port.mk"
> Index: ports/infrastructure/mk/modules.port.mk
> ===================================================================
> RCS file: /home/cvs/ports/infrastructure/mk/modules.port.mk,v
> diff -u -p -r1.17 modules.port.mk
> --- ports/infrastructure/mk/modules.port.mk 6 Sep 2023 09:51:34 -0000
> 1.17
> +++ ports/infrastructure/mk/modules.port.mk 21 Oct 2026 11:09:20 -0000
> @@ -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++
> Index: ports/lang/gcc/16/gcc.port.mk
> ===================================================================
> RCS file: ports/lang/gcc/16/gcc.port.mk
> diff -N ports/lang/gcc/16/gcc.port.mk
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ ports/lang/gcc/16/gcc.port.mk 21 Oct 2026 09:03:46 -0000
> @@ -0,0 +1,86 @@
> +MODGCC_ARCHS ?= ${PORTSGCC_ARCHS}
> +MODGCC_LANGS ?=
> +
> +
> +# Always include support for this
> +MODGCC_LANGS += c
> +
> +_MODGCC_OKAY = c c++ d fortran
> +.for _l in ${MODGCC_LANGS:L}
> +. if !${_MODGCC_OKAY:M${_l}}
> +ERRORS += "Fatal: unknown language ${_l}"
> +. endif
> +.endfor
> +
> +_MODGCC_ARCH_USES = No
> +
> +.for _i in ${MODGCC_ARCHS}
> +. if !empty(MACHINE_ARCH:M${_i})
> +_MODGCC_ARCH_USES = Yes
> +. endif
> +.endfor
> +
> +COMPILER_VERSION ?= gcc2
> +
> +_MODGCC_LINKS =
> +MODGCCSTDCPP = estdc++
> +MODGCC_CPPLIBDEP = lang/gcc/16,-libs>=16,<17
> +MODGCC_CPPDEP = lang/gcc/16,-c++>=16,<17
> +MODGCC_CPPWANTLIB = estdc++>=22 pthread
> +MODGCC_ATOMICWANTLIB = atomic
> +
> +MODGCC_DLANGDEP = lang/gcc/16,-dlang>=16,<17
> +
> +MODGCC_FORTRANDEP = lang/gcc/16,-f95>=16,<17
> +MODGCC_FORTRANLIBDEP = lang/gcc/16,-libs>=16,<17
> +MODGCC_FORTRANWANTLIB = gfortran>=11
> +# XXX sync with Makefile
> +.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
> +MODGCC_FORTRANWANTLIB += quadmath
> +.endif
> +
> +.if ${_MODGCC_ARCH_USES:L} == "yes"
> +
> +. if ${MODGCC_LANGS:L:Mc}
> +BUILD_DEPENDS += lang/gcc/16>=16,<17
> +# XXX ports-clang already defines this
> +. if !${COMPILER_LINKS:Mgcc}
> +COMPILER_LINKS += gcc ${LOCALBASE}/bin/egcc cc ${LOCALBASE}/bin/egcc
> +. endif
> +. endif
> +
> +. 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 ${MODGCC_LANGS:L:Md}
> +BUILD_DEPENDS += ${MODGCC_DLANGDEP}
> +COMPILER_LINKS += gdc ${LOCALBASE}/bin/egdc
> +. endif
> +
> +. if ${MODGCC_LANGS:L:Mfortran}
> +BUILD_DEPENDS += ${MODGCC_FORTRANDEP}
> +WANTLIB += ${MODGCC_FORTRANWANTLIB}
> +LIB_DEPENDS += ${MODGCC_FORTRANLIBDEP}
> +COMPILER_LINKS += gfortran ${LOCALBASE}/bin/egfortran
> +. endif
> +
> +#. if ${MODGCC_LANGS:L:Mgo}
> +#BUILD_DEPENDS += lang/gcc/6,-go>=6,<7
> +#WANTLIB += go
> +#LIB_DEPENDS += lang/gcc/6,-go>=6,<7
> +#COMPILER_LINKS += gccgo ${LOCALBASE}/bin/egccgo
> +#. endif
> +.endif
> +
> +.if !empty(_MODGCC_LINKS)
> +. for _src in ${_MODGCC_LINKS}
> +MODGCC_post-patch += ln -sf ${LOCALBASE}/bin/e${_src} ${WRKDIR}/bin/${_src};
> +. endfor
> +.endif
> Index: ports/lang/gcc/16/gcc4.port.mk
> ===================================================================
> RCS file: ports/lang/gcc/16/gcc4.port.mk
> diff -N ports/lang/gcc/16/gcc4.port.mk
> --- ports/lang/gcc/16/gcc4.port.mk 21 Oct 2026 09:09:47 -0000 1.4
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,86 +0,0 @@
> -MODGCC_ARCHS ?= ${PORTSGCC_ARCHS}
> -MODGCC_LANGS ?=
> -
> -
> -# Always include support for this
> -MODGCC_LANGS += c
> -
> -_MODGCC_OKAY = c c++ d fortran
> -.for _l in ${MODGCC_LANGS:L}
> -. if !${_MODGCC_OKAY:M${_l}}
> -ERRORS += "Fatal: unknown language ${_l}"
> -. endif
> -.endfor
> -
> -_MODGCC_ARCH_USES = No
> -
> -.for _i in ${MODGCC_ARCHS}
> -. if !empty(MACHINE_ARCH:M${_i})
> -_MODGCC_ARCH_USES = Yes
> -. endif
> -.endfor
> -
> -COMPILER_VERSION ?= gcc2
> -
> -_MODGCC_LINKS =
> -MODGCCSTDCPP = estdc++
> -MODGCC_CPPLIBDEP = lang/gcc/16,-libs>=16,<17
> -MODGCC_CPPDEP = lang/gcc/16,-c++>=16,<17
> -MODGCC_CPPWANTLIB = estdc++>=22 pthread
> -MODGCC_ATOMICWANTLIB = atomic
> -
> -MODGCC_DLANGDEP = lang/gcc/16,-dlang>=16,<17
> -
> -MODGCC_FORTRANDEP = lang/gcc/16,-f95>=16,<17
> -MODGCC_FORTRANLIBDEP = lang/gcc/16,-libs>=16,<17
> -MODGCC_FORTRANWANTLIB = gfortran>=11
> -# XXX sync with Makefile
> -.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
> -MODGCC_FORTRANWANTLIB += quadmath
> -.endif
> -
> -.if ${_MODGCC_ARCH_USES:L} == "yes"
> -
> -. if ${MODGCC_LANGS:L:Mc}
> -BUILD_DEPENDS += lang/gcc/16>=16,<17
> -# XXX ports-clang already defines this
> -. if !${COMPILER_LINKS:Mgcc}
> -COMPILER_LINKS += gcc ${LOCALBASE}/bin/egcc cc ${LOCALBASE}/bin/egcc
> -. endif
> -. endif
> -
> -. 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 ${MODGCC_LANGS:L:Md}
> -BUILD_DEPENDS += ${MODGCC_DLANGDEP}
> -COMPILER_LINKS += gdc ${LOCALBASE}/bin/egdc
> -. endif
> -
> -. if ${MODGCC_LANGS:L:Mfortran}
> -BUILD_DEPENDS += ${MODGCC_FORTRANDEP}
> -WANTLIB += ${MODGCC_FORTRANWANTLIB}
> -LIB_DEPENDS += ${MODGCC_FORTRANLIBDEP}
> -COMPILER_LINKS += gfortran ${LOCALBASE}/bin/egfortran
> -. endif
> -
> -#. if ${MODGCC_LANGS:L:Mgo}
> -#BUILD_DEPENDS += lang/gcc/6,-go>=6,<7
> -#WANTLIB += go
> -#LIB_DEPENDS += lang/gcc/6,-go>=6,<7
> -#COMPILER_LINKS += gccgo ${LOCALBASE}/bin/egccgo
> -#. endif
> -.endif
> -
> -.if !empty(_MODGCC_LINKS)
> -. for _src in ${_MODGCC_LINKS}
> -MODGCC_post-patch += ln -sf ${LOCALBASE}/bin/e${_src} ${WRKDIR}/bin/${_src};
> -. endfor
> -.endif
> Index: ports/lang/gdmd/Makefile
> ===================================================================
> RCS file: /home/cvs/ports/lang/gdmd/Makefile,v
> diff -u -p -r1.9 Makefile
> --- ports/lang/gdmd/Makefile 21 Oct 2026 09:09:47 -0000 1.9
> +++ ports/lang/gdmd/Makefile 21 Oct 2026 11:09:20 -0000
> @@ -12,7 +12,7 @@ GH_COMMIT = d14f7301b4bbae44996bc962121c
> # GPLv3+
> PERMIT_PACKAGE = Yes
>
> -MODULES = gcc4
> +MODULES = gcc
> MODGCC_LANGS = d
>
> RUN_DEPENDS = ${BUILD_DEPENDS}
> Index: ports/lang/gforth/Makefile
> ===================================================================
> RCS file: /home/cvs/ports/lang/gforth/Makefile,v
> diff -u -p -r1.31 Makefile
> --- ports/lang/gforth/Makefile 21 Oct 2026 09:09:47 -0000 1.31
> +++ ports/lang/gforth/Makefile 21 Oct 2026 11:09:20 -0000
> @@ -44,7 +44,7 @@ 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
> +MODULES += gcc
> MODGCC_ARCHS = powerpc
> MODGCC_LANGS = c
>
> Index: ports/sysutils/trash-d/Makefile
> ===================================================================
> RCS file: /home/cvs/ports/sysutils/trash-d/Makefile,v
> diff -u -p -r1.13 Makefile
> --- ports/sysutils/trash-d/Makefile 21 Oct 2026 09:09:48 -0000 1.13
> +++ ports/sysutils/trash-d/Makefile 21 Oct 2026 11:09:20 -0000
> @@ -12,7 +12,7 @@ PERMIT_PACKAGE = Yes
>
> WANTLIB += c m pthread
>
> -MODULES = gcc4
> +MODULES = gcc
> MODGCC_LANGS = d
>
> BUILD_DEPENDS += textproc/scdoc
> Index: ports/tests/portbump/t1.sample
> ===================================================================
> RCS file: /home/cvs/ports/tests/portbump/t1.sample,v
> diff -u -p -r1.6 t1.sample
> --- ports/tests/portbump/t1.sample 27 Sep 2023 21:41:17 -0000 1.6
> +++ ports/tests/portbump/t1.sample 21 Oct 2026 11:09:20 -0000
> @@ -212,7 +212,7 @@ CONFIGURE_ARGS+=--with-dbus-sys="${SYSCO
> --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
>
> Index: ports/tests/portbump/t4.sample
> ===================================================================
> RCS file: /home/cvs/ports/tests/portbump/t4.sample,v
> diff -u -p -r1.5 t4.sample
> --- ports/tests/portbump/t4.sample 27 Sep 2023 21:41:17 -0000 1.5
> +++ ports/tests/portbump/t4.sample 21 Oct 2026 11:09:20 -0000
> @@ -204,7 +204,7 @@ CONFIGURE_ARGS+=--with-dbus-sys="${SYSCO
> --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
>
> Index: ports/tests/portbump/t5.sample
> ===================================================================
> RCS file: /home/cvs/ports/tests/portbump/t5.sample,v
> diff -u -p -r1.4 t5.sample
> --- ports/tests/portbump/t5.sample 27 Sep 2023 21:41:17 -0000 1.4
> +++ ports/tests/portbump/t5.sample 21 Oct 2026 11:09:20 -0000
> @@ -230,7 +230,7 @@ CONFIGURE_ARGS+=--with-dbus-sys="${SYSCO
> --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
>
> Index: ports/tests/portbump/t1/Makefile
> ===================================================================
> RCS file: /home/cvs/ports/tests/portbump/t1/Makefile,v
> diff -u -p -r1.9 Makefile
> --- ports/tests/portbump/t1/Makefile 27 Sep 2023 21:41:16 -0000 1.9
> +++ ports/tests/portbump/t1/Makefile 21 Oct 2026 11:09:20 -0000
> @@ -210,7 +210,7 @@ CONFIGURE_ARGS+=--with-dbus-sys="${SYSCO
> --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
>
> Index: ports/tests/portbump/t4/Makefile
> ===================================================================
> RCS file: /home/cvs/ports/tests/portbump/t4/Makefile,v
> diff -u -p -r1.8 Makefile
> --- ports/tests/portbump/t4/Makefile 27 Sep 2023 21:41:17 -0000 1.8
> +++ ports/tests/portbump/t4/Makefile 21 Oct 2026 11:09:20 -0000
> @@ -210,7 +210,7 @@ CONFIGURE_ARGS+=--with-dbus-sys="${SYSCO
> --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
>
> Index: ports/tests/portbump/t5/Makefile
> ===================================================================
> RCS file: /home/cvs/ports/tests/portbump/t5/Makefile,v
> diff -u -p -r1.8 Makefile
> --- ports/tests/portbump/t5/Makefile 27 Sep 2023 21:41:17 -0000 1.8
> +++ ports/tests/portbump/t5/Makefile 21 Oct 2026 11:09:20 -0000
> @@ -218,7 +218,7 @@ CONFIGURE_ARGS+=--with-dbus-sys="${SYSCO
> --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
>
> Index: ports/tests/portcheck/t14.sample
> ===================================================================
> RCS file: /home/cvs/ports/tests/portcheck/t14.sample,v
> diff -u -p -r1.1 t14.sample
> --- ports/tests/portcheck/t14.sample 12 Jul 2014 19:44:43 -0000 1.1
> +++ ports/tests/portcheck/t14.sample 21 Oct 2026 11:09:20 -0000
> @@ -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
> Index: ports/tests/portcheck/t14/Makefile
> ===================================================================
> RCS file: /home/cvs/ports/tests/portcheck/t14/Makefile,v
> diff -u -p -r1.2 Makefile
> --- ports/tests/portcheck/t14/Makefile 11 Mar 2022 20:00:23 -0000
> 1.2
> +++ ports/tests/portcheck/t14/Makefile 21 Oct 2026 11:09:20 -0000
> @@ -1,4 +1,4 @@
> -# Check for both stdc++ in WANTLIB and gcc4 in MODULES
> +# Check for both stdc++ in WANTLIB and gcc in MODULES
>
> DISTNAME = test-14
>
> @@ -10,6 +10,6 @@ WANTLIB-foo = m stdc++ z
>
> MULTI_PACKAGES = -main -foo
>
> -MODULES = gcc4
> +MODULES = gcc
>
> .include <bsd.port.mk>
>
