ports@,
I think we should bump global MODCLANG_VERSION to 22 to match the base.
Here a diff where I:
1. Bump MODCLANG_VERSION to 22;
2. Remove hardcoded MODCLANG_VERSION=22 as useless.
The tree has a few ports which enforces other version of clang, like rust.
Not sure that it is safe, and I think it should be done on per-port basis
but after we stabelize the tree.
Ok for this diff?
Index: audio/openal/Makefile
===================================================================
RCS file: /home/cvs/ports/audio/openal/Makefile,v
diff -u -p -r1.76 Makefile
--- audio/openal/Makefile 30 May 2026 02:01:26 -0000 1.76
+++ audio/openal/Makefile 31 May 2026 13:55:01 -0000
@@ -51,7 +51,6 @@ MODULES = devel/cmake
# XXX cmake config uses CXX_MODULES, which needs clang-scan-deps
MODULES += lang/clang
-MODCLANG_VERSION = 22
MODCLANG_COMPILER_LINKS = No
COMPILER = base-clang ports-gcc
Index: devel/clang-tools-extra/Makefile
===================================================================
RCS file: /home/cvs/ports/devel/clang-tools-extra/Makefile,v
diff -u -p -r1.50 Makefile
--- devel/clang-tools-extra/Makefile 23 May 2026 19:12:04 -0000 1.50
+++ devel/clang-tools-extra/Makefile 31 May 2026 13:55:51 -0000
@@ -38,7 +38,6 @@ MODULES = devel/cmake \
lang/clang \
lang/python
-MODCLANG_VERSION = 22
MODCLANG_COMPILER_LINKS = No
MODCLANG_BUILDDEP = No
Index: lang/clang/clang.port.mk
===================================================================
RCS file: /home/cvs/ports/lang/clang/clang.port.mk,v
diff -u -p -r1.45 clang.port.mk
--- lang/clang/clang.port.mk 16 Jun 2025 07:46:50 -0000 1.45
+++ lang/clang/clang.port.mk 31 May 2026 12:22:53 -0000
@@ -1,4 +1,4 @@
-MODCLANG_VERSION ?= 19
+MODCLANG_VERSION ?= 22
MODCLANG_RUN_DEPENDS= devel/llvm/${MODCLANG_VERSION}
MODCLANG_LIB_DEPENDS= devel/llvm/${MODCLANG_VERSION}
Index: lang/wasi-libc/Makefile
===================================================================
RCS file: /home/cvs/ports/lang/wasi-libc/Makefile,v
diff -u -p -r1.15 Makefile
--- lang/wasi-libc/Makefile 29 May 2026 11:56:52 -0000 1.15
+++ lang/wasi-libc/Makefile 31 May 2026 13:54:35 -0000
@@ -21,7 +21,6 @@ PERMIT_PACKAGE = Yes
COMPILER = ports-clang
COMPILER_LANGS =c
-MODCLANG_VERSION = 22
TRIPLE = wasm32-wasip1
SUBST_VARS += TRIPLE
USE_GMAKE = yes
Index: lang/wasi-sdk/Makefile.inc
===================================================================
RCS file: /home/cvs/ports/lang/wasi-sdk/Makefile.inc,v
diff -u -p -r1.12 Makefile.inc
--- lang/wasi-sdk/Makefile.inc 29 May 2026 12:15:27 -0000 1.12
+++ lang/wasi-sdk/Makefile.inc 31 May 2026 13:55:22 -0000
@@ -4,7 +4,6 @@ CATEGORIES = lang
SITES =
https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_V}/
EXTRACT_SUFX = .tar.xz
COMPILER = ports-clang
-MODCLANG_VERSION= 22
MODULES = devel/cmake
WASI_SYSROOT = ${LOCALBASE}/share/wasi-sysroot
# https://github.com/WebAssembly/wasi-sdk/issues/52
Index: mail/mozilla-thunderbird/Makefile
===================================================================
RCS file: /home/cvs/ports/mail/mozilla-thunderbird/Makefile,v
diff -u -p -r1.531 Makefile
--- mail/mozilla-thunderbird/Makefile 29 May 2026 16:15:55 -0000 1.531
+++ mail/mozilla-thunderbird/Makefile 31 May 2026 13:54:48 -0000
@@ -37,7 +37,6 @@ PATCH_DIST_STRIP = -p1 -f
COMPILER = ports-clang
MODCLANG_ARCHS = amd64 aarch64 riscv64
-MODCLANG_VERSION = 22
USE_LLD = ports
# 63 requires node because why not #1483595
Index: multimedia/mlt7/Makefile
===================================================================
RCS file: /home/cvs/ports/multimedia/mlt7/Makefile,v
diff -u -p -r1.23 Makefile
--- multimedia/mlt7/Makefile 30 May 2026 19:15:04 -0000 1.23
+++ multimedia/mlt7/Makefile 31 May 2026 13:54:11 -0000
@@ -44,7 +44,6 @@ MODULES = devel/cmake \
x11/qt6
# Does not directly use CXX_MODULES; still ends up pulling in clang-scan-deps
-MODCLANG_VERSION = 22
MODCLANG_COMPILER_LINKS = No
BUILD_DEPENDS = audio/ladspa \
Index: print/poppler/Makefile
===================================================================
RCS file: /home/cvs/ports/print/poppler/Makefile,v
diff -u -p -r1.213 Makefile
--- print/poppler/Makefile 30 May 2026 02:02:12 -0000 1.213
+++ print/poppler/Makefile 31 May 2026 13:54:23 -0000
@@ -40,7 +40,6 @@ MULTI_PACKAGES=-main -qt5 -qt6 -utils
# (stolen from audio/openal)
MODULES += lang/clang
MODCLANG_COMPILER_LINKS = No
-MODCLANG_VERSION = 22
# c++-17
COMPILER= base-clang ports-gcc
Index: www/chromium/Makefile
===================================================================
RCS file: /home/cvs/ports/www/chromium/Makefile,v
diff -u -p -r1.907 Makefile
--- www/chromium/Makefile 30 May 2026 09:40:41 -0000 1.907
+++ www/chromium/Makefile 31 May 2026 13:52:42 -0000
@@ -54,7 +54,6 @@ MODCARGO_BUILD= No
MODCARGO_INSTALL= No
MODCARGO_TEST= No
-MODCLANG_VERSION= 22
MODQT5_DEPS= No
MODQT6_DEPS= No
MODPY_RUNDEP= No
Index: www/firefox-esr/Makefile
===================================================================
RCS file: /home/cvs/ports/www/firefox-esr/Makefile,v
diff -u -p -r1.274 Makefile
--- www/firefox-esr/Makefile 29 May 2026 12:05:47 -0000 1.274
+++ www/firefox-esr/Makefile 31 May 2026 13:53:18 -0000
@@ -31,7 +31,6 @@ PATCHFILES.p= bug-2038504-backport-bug-D
PATCH_DIST_STRIP = -p1 -f
COMPILER = ports-clang
-MODCLANG_VERSION = 22
USE_LLD = ports
# 63 requires node because why not #1483595
Index: www/iridium/Makefile
===================================================================
RCS file: /home/cvs/ports/www/iridium/Makefile,v
diff -u -p -r1.283 Makefile
--- www/iridium/Makefile 21 May 2026 12:03:25 -0000 1.283
+++ www/iridium/Makefile 31 May 2026 13:52:53 -0000
@@ -49,7 +49,6 @@ MODCARGO_BUILD= No
MODCARGO_INSTALL= No
MODCARGO_TEST= No
-MODCLANG_VERSION= 22
MODQT5_DEPS= No
MODQT6_DEPS= No
MODPY_RUNDEP= No
Index: www/mozilla-firefox/Makefile
===================================================================
RCS file: /home/cvs/ports/www/mozilla-firefox/Makefile,v
diff -u -p -r1.688 Makefile
--- www/mozilla-firefox/Makefile 31 May 2026 08:38:58 -0000 1.688
+++ www/mozilla-firefox/Makefile 31 May 2026 13:53:29 -0000
@@ -30,7 +30,6 @@ MODULES = www/mozilla lang/python
MODPY_RUNDEP = No
COMPILER = ports-clang
-MODCLANG_VERSION = 22
USE_LLD = ports
# 63 requires node because why not #1483595
Index: www/tor-browser/browser/Makefile
===================================================================
RCS file: /home/cvs/ports/www/tor-browser/browser/Makefile,v
diff -u -p -r1.203 Makefile
--- www/tor-browser/browser/Makefile 29 May 2026 14:03:47 -0000 1.203
+++ www/tor-browser/browser/Makefile 31 May 2026 13:53:05 -0000
@@ -40,7 +40,6 @@ PATCHFILES.p= bug-2038504-backport-bug-D
PATCH_DIST_STRIP = -p1 -f
COMPILER = ports-clang
-MODCLANG_VERSION = 22
USE_LLD = ports
# tor-browser needs built-in nss
Index: www/ungoogled-chromium/Makefile
===================================================================
RCS file: /home/cvs/ports/www/ungoogled-chromium/Makefile,v
diff -u -p -r1.232 Makefile
--- www/ungoogled-chromium/Makefile 30 May 2026 12:45:33 -0000 1.232
+++ www/ungoogled-chromium/Makefile 31 May 2026 13:52:34 -0000
@@ -48,7 +48,6 @@ SITES.a= http://nerd.hu/distfiles/
MODULES= lang/clang lang/python x11/qt5 x11/qt6
-MODCLANG_VERSION= 22
MODQT5_DEPS= No
MODQT6_DEPS= No
MODPY_RUNDEP= No
--
wbr, Kirill
