ports@,
I'd like to rename MODGCC4 -> MODGCC4 as the next step, and the last step in
my head is rename module gcc4.port.mk to gcc.port.mk but I'd like to make it
after this.
I've tried to use MODPORTSGCC_ but it reads too long and ugly, and because
we have only ony gcc in ports, I think MODGCC is cleaners and simpler.
Thoughs?
diff --git astro/wcslib/Makefile astro/wcslib/Makefile
index 9e1017b5259..2dd3ccb76ea 100644
--- astro/wcslib/Makefile
+++ astro/wcslib/Makefile
@@ -18,10 +18,10 @@ COMPILER = base-clang ports-gcc
COMPILER_LANGS = c
MODULES = gcc4
-MODGCC4_LANGS = fortran
+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 comms/hamlib/Makefile comms/hamlib/Makefile
index c511592612c..65465520292 100644
--- comms/hamlib/Makefile
+++ comms/hamlib/Makefile
@@ -35,7 +35,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 databases/db/v4/Makefile databases/db/v4/Makefile
index 90bca359646..74cae6952ae 100644
--- databases/db/v4/Makefile
+++ 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 databases/redis/Makefile.inc databases/redis/Makefile.inc
index d2a4c579de6..e8b41eeec8e 100644
--- databases/redis/Makefile.inc
+++ databases/redis/Makefile.inc
@@ -25,7 +25,7 @@ TEST_FLAGS += TCL_BIN="${MODTCL_BIN}"
# 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 devel/dub/Makefile devel/dub/Makefile
index 8213e51bd82..84b15c2dd30 100644
--- devel/dub/Makefile
+++ devel/dub/Makefile
@@ -27,11 +27,11 @@ DMD = ${LOCALBASE}/bin/dmd
WANTLIB += c m pthread
MODULES = gcc4
-MODGCC4_LANGS = d
+MODGCC_LANGS = d
BUILD_DEPENDS = lang/gdmd
-RUN_DEPENDS = ${MODGCC4_DLANGDEP}
+RUN_DEPENDS = ${MODGCC_DLANGDEP}
DC = ${LOCALBASE}/bin/egdc
DMD = ${LOCALBASE}/bin/gdmd
diff --git devel/gmp/Makefile devel/gmp/Makefile
index 349c6ea9dbb..4a88d899aa3 100644
--- devel/gmp/Makefile
+++ 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 devel/libgit2/libgit2/Makefile devel/libgit2/libgit2/Makefile
index af37f4397f3..26271e08a56 100644
--- devel/libgit2/libgit2/Makefile
+++ 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 devel/libmtp/Makefile devel/libmtp/Makefile
index 0654232aa78..439afd3af58 100644
--- devel/libmtp/Makefile
+++ 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 editors/libreoffice/Makefile editors/libreoffice/Makefile
index 513c4a64416..8d92dd446b6 100644
--- editors/libreoffice/Makefile
+++ editors/libreoffice/Makefile
@@ -199,7 +199,7 @@ COMPILER = base-clang ports-gcc base-gcc
MODULES+= lang/python
LIB_DEPENDS-main= \
- ${MODGCC4_CPPLIBDEP} \
+ ${MODGCC_CPPLIBDEP} \
archivers/zstd \
databases/mariadb \
databases/openldap \
@@ -263,7 +263,7 @@ WANTLIB-kde += lib/libreoffice/program/uno_cppu \
lib/libreoffice/program/uno_salhelpergcc3
LIB_DEPENDS-kde= ${MODQT_LIB_DEPENDS} \
- ${MODGCC4_CPPLIBDEP} \
+ ${MODGCC_CPPLIBDEP} \
devel/kf6/kcoreaddons \
devel/kf6/kio \
devel/harfbuzz,-icu \
@@ -276,7 +276,7 @@ LIB_DEPENDS-kde= ${MODQT_LIB_DEPENDS} \
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 emulators/gambatte/Makefile emulators/gambatte/Makefile
index bf470bdd648..159c8b26cdd 100644
--- emulators/gambatte/Makefile
+++ 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} \
archivers/minizip \
devel/sdl
diff --git emulators/libretro-nestopia/Makefile
emulators/libretro-nestopia/Makefile
index 5465267df0a..5d1063db5e4 100644
--- emulators/libretro-nestopia/Makefile
+++ 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 games/ufoai/base/Makefile games/ufoai/base/Makefile
index f56cdf4fe9e..98caefce0ed 100644
--- games/ufoai/base/Makefile
+++ 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 infrastructure/bin/portbump infrastructure/bin/portbump
index c7ce8e1c243..68fcefacdee 100755
--- infrastructure/bin/portbump
+++ infrastructure/bin/portbump
@@ -792,7 +792,7 @@ sub process_makefile {
$v =~ s,^PYTHON$,PY,g;
"MOD${v}_WANTLIB"
} @{$self->{modules}});
- push(@mod_wantlib_seen, "MODGCC4_CPPWANTLIB", "MODGCC4_GCJWANTLIB")
+ push(@mod_wantlib_seen, "MODGCC_CPPWANTLIB", "MODGCC_GCJWANTLIB")
if $gcc4_seen;
if (scalar(@mod_wantlib_seen)) {
for ($self->run_make('show='.join(' ', @mod_wantlib_seen))) {
diff --git infrastructure/mk/compiler.port.mk infrastructure/mk/compiler.port.mk
index 311a02f3e58..ae99f1691f2 100644
--- infrastructure/mk/compiler.port.mk
+++ infrastructure/mk/compiler.port.mk
@@ -36,17 +36,17 @@ _COMPILER_ARCHS += ${CLANG_ARCHS}
CHOSEN_COMPILER ?= base-clang
. endif
. elif "$c" == "ports-gcc"
-MODGCC4_ARCHS ?= ${PORTSGCC_ARCHS}
-_MODGCC4_ARCH_USES = No
-_COMPILER_ARCHS += ${MODGCC4_ARCHS}
-. for _i in ${MODGCC4_ARCHS}
+MODGCC_ARCHS ?= ${PORTSGCC_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 infrastructure/mk/fortran.port.mk infrastructure/mk/fortran.port.mk
index 7076ccda981..322600a2508 100644
--- infrastructure/mk/fortran.port.mk
+++ infrastructure/mk/fortran.port.mk
@@ -8,11 +8,11 @@ ERRORS += "Fatal: need to specify MODFORTRAN_COMPILER"
.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}
+MODGCC_ARCHS ?= *
+MODGCC_LANGS += fortran
+MODFORTRAN_BUILD_DEPENDS += ${MODGCC_FORTRANDEP}
+MODFORTRAN_LIB_DEPENDS += ${MODGCC_FORTRANLIBDEP}
+MODFORTRAN_WANTLIB += ${MODGCC_FORTRANWANTLIB}
.else
ERRORS += "Fatal: MODFORTRAN_COMPILER must be one of: gfortran"
.endif
diff --git infrastructure/mk/gcc4.port.mk infrastructure/mk/gcc4.port.mk
index 7bb7a99233c..fe8a1af6ab9 100644
--- infrastructure/mk/gcc4.port.mk
+++ infrastructure/mk/gcc4.port.mk
@@ -1,2 +1,2 @@
-MODGCC4_VERSION?=16
-.include "${PORTSDIR}/lang/gcc/${MODGCC4_VERSION}/gcc4.port.mk"
+MODGCC_VERSION?=16
+.include "${PORTSDIR}/lang/gcc/${MODGCC_VERSION}/gcc4.port.mk"
diff --git infrastructure/templates/mk.conf.template
infrastructure/templates/mk.conf.template
index c1ba0fed485..0b57ae7f3b2 100644
--- infrastructure/templates/mk.conf.template
+++ infrastructure/templates/mk.conf.template
@@ -31,7 +31,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 japanese/mecab/Makefile japanese/mecab/Makefile
index 5890adcf709..1940db34953 100644
--- japanese/mecab/Makefile
+++ 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 lang/freebasic/Makefile lang/freebasic/Makefile
index 07487d31d1d..4064327b01d 100644
--- lang/freebasic/Makefile
+++ lang/freebasic/Makefile
@@ -31,7 +31,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 lang/gcc/16/gcc4.port.mk lang/gcc/16/gcc4.port.mk
index a2d60abe511..2f371871be2 100644
--- lang/gcc/16/gcc4.port.mk
+++ lang/gcc/16/gcc4.port.mk
@@ -1,47 +1,47 @@
-MODGCC4_ARCHS ?= ${PORTSGCC_ARCHS}
-MODGCC4_LANGS ?=
+MODGCC_ARCHS ?= ${PORTSGCC_ARCHS}
+MODGCC_LANGS ?=
# Always include support for this
-MODGCC4_LANGS += c
+MODGCC_LANGS += c
-_MODGCC4_OKAY = c c++ d fortran
-.for _l in ${MODGCC4_LANGS:L}
-. if !${_MODGCC4_OKAY:M${_l}}
+_MODGCC_OKAY = c c++ d 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/16,-libs>=16,<17
-MODGCC4_CPPDEP = lang/gcc/16,-c++>=16,<17
-MODGCC4_CPPWANTLIB = estdc++>=22 pthread
-MODGCC4_ATOMICWANTLIB = atomic
+_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
-MODGCC4_DLANGDEP = lang/gcc/16,-dlang>=16,<17
+MODGCC_DLANGDEP = lang/gcc/16,-dlang>=16,<17
-MODGCC4_FORTRANDEP = lang/gcc/16,-f95>=16,<17
-MODGCC4_FORTRANLIBDEP = lang/gcc/16,-libs>=16,<17
-MODGCC4_FORTRANWANTLIB = gfortran>=11
+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"
-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/16>=16,<17
# XXX ports-clang already defines this
. if !${COMPILER_LINKS:Mgcc}
@@ -49,29 +49,29 @@ 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:Md}
-BUILD_DEPENDS += ${MODGCC4_DLANGDEP}
+. if ${MODGCC_LANGS:L:Md}
+BUILD_DEPENDS += ${MODGCC_DLANGDEP}
COMPILER_LINKS += gdc ${LOCALBASE}/bin/egdc
. 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
@@ -79,8 +79,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 lang/gdmd/Makefile lang/gdmd/Makefile
index ac7017ce8ed..47ceb67ef68 100644
--- lang/gdmd/Makefile
+++ lang/gdmd/Makefile
@@ -13,7 +13,7 @@ GH_COMMIT = d14f7301b4bbae44996bc962121c9a1e7f7e3f12
PERMIT_PACKAGE = Yes
MODULES = gcc4
-MODGCC4_LANGS = d
+MODGCC_LANGS = d
RUN_DEPENDS = ${BUILD_DEPENDS}
diff --git lang/gforth/Makefile lang/gforth/Makefile
index 72cafaf01fe..9a12c997f25 100644
--- lang/gforth/Makefile
+++ lang/gforth/Makefile
@@ -45,8 +45,8 @@ 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
+MODGCC_ARCHS = powerpc
+MODGCC_LANGS = c
# We still need -O0 due to high memory usage though.
.if ${MACHINE_ARCH} == "powerpc"
diff --git misc/gpsd/Makefile misc/gpsd/Makefile
index 38598af0e7c..9a71d46d869 100644
--- misc/gpsd/Makefile
+++ misc/gpsd/Makefile
@@ -51,7 +51,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 net/isc-bind/Makefile net/isc-bind/Makefile
index 68b02305fb7..2d3f64875a7 100644
--- net/isc-bind/Makefile
+++ net/isc-bind/Makefile
@@ -63,7 +63,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 net/isc-dhcp/Makefile net/isc-dhcp/Makefile
index ce5c0327fbe..ca5cd2db206 100644
--- net/isc-dhcp/Makefile
+++ 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 net/openvpn-auth-ldap/Makefile net/openvpn-auth-ldap/Makefile
index cd3ce591bf0..88d5615b97e 100644
--- net/openvpn-auth-ldap/Makefile
+++ net/openvpn-auth-ldap/Makefile
@@ -24,7 +24,7 @@ BUILD_DEPENDS = ${RUN_DEPENDS} \
# not actually using c++ but leave COMPILER_LANGS as default (c c++);
# easier to pull in gcc-libs this way
COMPILER = ports-gcc
-BUILD_DEPENDS += ${MODGCC4_CPPLIBDEP:S/-libs/-objc/}
+BUILD_DEPENDS += ${MODGCC_CPPLIBDEP:S/-libs/-objc/}
SEPARATE_BUILD = Yes
diff --git print/poppler/Makefile print/poppler/Makefile
index 2dfd67e40c4..17508d24cf6 100644
--- print/poppler/Makefile
+++ 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 \
@@ -74,14 +74,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 sysutils/bacula/Makefile sysutils/bacula/Makefile
index ca89d234d75..488f16623cd 100644
--- sysutils/bacula/Makefile
+++ sysutils/bacula/Makefile
@@ -109,16 +109,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 ${COMPILER_LIBCXX}
-LIB_DEPENDS-sqlite3= ${MODGCC4_CPPLIBDEP} \
+LIB_DEPENDS-sqlite3= ${MODGCC_CPPLIBDEP} \
databases/sqlite3
MODULES += x11/qt6
diff --git sysutils/trash-d/Makefile sysutils/trash-d/Makefile
index 44c0f7bd88e..eb08d3d5349 100644
--- sysutils/trash-d/Makefile
+++ sysutils/trash-d/Makefile
@@ -13,11 +13,11 @@ PERMIT_PACKAGE = Yes
WANTLIB += c m pthread
MODULES = gcc4
-MODGCC4_LANGS = d
+MODGCC_LANGS = d
BUILD_DEPENDS += textproc/scdoc
-TEST_DEPENDS = ${MODGCC4_DLANGDEP}
+TEST_DEPENDS = ${MODGCC_DLANGDEP}
do-build:
cd ${WRKSRC} && egdc -O -frelease -finline-functions -Isource -J. \
diff --git telephony/asterisk/Makefile.inc telephony/asterisk/Makefile.inc
index f14b9191eeb..1c977f8a2ab 100644
--- telephony/asterisk/Makefile.inc
+++ telephony/asterisk/Makefile.inc
@@ -49,9 +49,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 \
@@ -161,7 +161,7 @@ BLOCKSLIBDEP = devel/libdispatch
BLOCKSWANTLIB = BlocksRuntime
.else
CFLAGS += -ftrampolines
-WANTLIB-main += ${MODGCC4_CPPWANTLIB}
+WANTLIB-main += ${MODGCC_CPPWANTLIB}
.endif
# calendar
diff --git telephony/pjsua/Makefile telephony/pjsua/Makefile
index 70ed36f5a22..77634fc6ed5 100644
--- telephony/pjsua/Makefile
+++ 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 www/chromium/Makefile www/chromium/Makefile
index 7ee164d6ec4..eaf663c503e 100644
--- www/chromium/Makefile
+++ www/chromium/Makefile
@@ -109,7 +109,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 \
@@ -122,7 +122,7 @@ LIB_DEPENDS= audio/opus \
x11/gnome/at-spi2-core \
x11/xkbcommon \
print/cups,-libs \
- ${MODGCC4_CPPLIBDEP}
+ ${MODGCC_CPPLIBDEP}
USE_GMAKE= Yes
diff --git www/iridium/Makefile www/iridium/Makefile
index 13aaafea8d8..d4cffdff32d 100644
--- www/iridium/Makefile
+++ www/iridium/Makefile
@@ -95,7 +95,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 \
@@ -108,7 +108,7 @@ LIB_DEPENDS= audio/opus \
x11/gnome/at-spi2-core \
x11/xkbcommon \
print/cups,-libs \
- ${MODGCC4_CPPLIBDEP}
+ ${MODGCC_CPPLIBDEP}
USE_GMAKE= Yes
diff --git www/ungoogled-chromium/Makefile www/ungoogled-chromium/Makefile
index 2f970dbf847..a1a82fd8d03 100644
--- www/ungoogled-chromium/Makefile
+++ www/ungoogled-chromium/Makefile
@@ -114,7 +114,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 \
@@ -127,7 +127,7 @@ LIB_DEPENDS= audio/opus \
x11/gnome/at-spi2-core \
x11/xkbcommon \
print/cups,-libs \
- ${MODGCC4_CPPLIBDEP}
+ ${MODGCC_CPPLIBDEP}
USE_GMAKE= Yes
diff --git x11/ogre/Makefile x11/ogre/Makefile
index 204251a3237..894165cd230 100644
--- x11/ogre/Makefile
+++ x11/ogre/Makefile
@@ -34,7 +34,7 @@ MAINTAINER = Pascal Stumpf <[email protected]>
# 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_thread-mt c
WANTLIB += freeimage freetype m pthread z zzip
diff --git x11/qt5/qtbase/Makefile x11/qt5/qtbase/Makefile
index 941a7cdf8fe..9c381af51b4 100644
--- x11/qt5/qtbase/Makefile
+++ x11/qt5/qtbase/Makefile
@@ -82,15 +82,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 x11/qt6/qtbase/Makefile x11/qt6/qtbase/Makefile
index a7f88c67d94..c4eb1a53987 100644
--- x11/qt6/qtbase/Makefile
+++ x11/qt6/qtbase/Makefile
@@ -84,12 +84,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-headers \
wayland/wayland-protocols \
and update for man pages:
diff --git share/man/man5/bsd.port.mk.5 share/man/man5/bsd.port.mk.5
index c82ed714302..8435a66e048 100644
--- share/man/man5/bsd.port.mk.5
+++ share/man/man5/bsd.port.mk.5
@@ -1440,9 +1440,9 @@ gcc 4.2 compiler from base
.It base-clang
clang compiler from base
.It ports-gcc
-gcc 8 compiler from ports
+gcc compiler from ports
(heeds
-.Ev MODGCC4_ARCHS
+.Ev MODGCC_ARCHS
from the module)
.It ports-clang
clang compiler from ports
@@ -1469,7 +1469,7 @@ errors.
With
.Ev COMPILER
in effect,
-.Ev MODGCC4_ARCHS
+.Ev MODGCC_ARCHS
and
.Ev MODCLANG_ARCHS
default to
@@ -1497,7 +1497,7 @@ or
still need old modules annotations, so that it's possible
to select, e.g.,
.Sq gfortran
-from gcc 8 while having clang from base.
+from gcc while having clang from base.
See also
.Ev CHOSEN_COMPILER .
.It Ev COMPILER_LINKS
@@ -4265,7 +4265,7 @@ should be built:
.Ed
.Pp
The
-.Pa lang/gcc/8
+.Pa lang/gcc
or
.Pa print/poppler
ports should provide examples of proper use.
diff --git share/man/man5/port-modules.5 share/man/man5/port-modules.5
index b7e81978fef..508f277055c 100644
--- share/man/man5/port-modules.5
+++ share/man/man5/port-modules.5
@@ -877,22 +877,22 @@ If
is not gcc4 (defined by
.Pa /usr/share/mk/bsd.own.mk ) ,
and architecture is in
-.Ev MODGCC4_ARCHS ,
+.Ev MODGCC_ARCHS ,
then the gcc4 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 MODGCC4_LANGS
+.Ev MODGCC_LANGS
(e.g. c++, fortran).
The
-.Ev MODGCC4_VERSION
+.Ev MODGCC_VERSION
variable can be used to change the version of gcc.
By default gcc 4.9 is used.
If
-.Ev MODGCC4_LANGS
+.Ev MODGCC_LANGS
contains c++, this module provides
-.Ev MODGCC4_CPPLIBDEP
+.Ev MODGCC_CPPLIBDEP
and
-.Ev MODGCC4_CPPWANTLIB .
+.Ev MODGCC_CPPWANTLIB .
.It Cm gnu
This module is documented in the main
.Xr bsd.port.mk 5
--
wbr, Kirill
