From: Stuart Henderson Subject: llvm PLIST tweaks To: Sebastien Marie , Robert Nagy Cc: ports Date: Thu, 19 Feb 2026 12:38:43 +0000 updating an older laptop to -current I ran into problems due to having llvm 16 installed, depending on python 3.12, with no update path to a newer version. here's a diff to provide an update path, so the py3.12 can disappear, in order that pkg_add -u can work without having to run pkg_delete. I'm currently building to test but I'm pretty confident this is correct: - add @pkgpath markers to llvm/19 (i.e. the lowest version) so that old versions get merged in on update; fixes package updates from 7.8 to -current if an old version (depending on python 3.12) was present - expand PKGSPEC on llvm/19 (lowest version) to cover the above while I'm cleaning them up anyway, some extra fixes: - drop bogus "@conflict llvm-${LLVM_PKGSPEC}" in PLIST-python, currently it is not possible to pkg_add the py3-llvm packages. - drop "@pkgpath devel/llvm/${LLVM_MAJOR},-main" lines, these are a noop, they expand to the same as the implicit pkgpath coming from the port dir / subpackage assuming my test goes well, is this ok? Index: 19/Makefile =================================================================== RCS file: /cvs/ports/devel/llvm/19/Makefile,v diff -u -p -r1.20 Makefile --- 19/Makefile 6 Jan 2026 22:14:44 -0000 1.20 +++ 19/Makefile 19 Feb 2026 12:33:58 -0000 @@ -1,10 +1,10 @@ LLVM_MAJOR = 19 LLVM_VERSION = ${LLVM_MAJOR}.1.7 -LLVM_PKGSPEC = >=19,<20 +LLVM_PKGSPEC = <20 -REVISION-main = 11 -REVISION-lldb = 0 -REVISION-python = 0 +REVISION-main = 12 +REVISION-lldb = 1 +REVISION-python = 1 SHARED_LIBS += LLVM 0.0 \ LTO 0.0 \ Index: 19/pkg/PLIST-libcxx =================================================================== RCS file: /cvs/ports/devel/llvm/19/pkg/PLIST-libcxx,v diff -u -p -r1.1 PLIST-libcxx --- 19/pkg/PLIST-libcxx 21 May 2025 02:41:46 -0000 1.1 +++ 19/pkg/PLIST-libcxx 19 Feb 2026 12:33:58 -0000 @@ -1,6 +1,9 @@ @option no-default-conflict @option is-branch @conflict libcxx-${LLVM_PKGSPEC} +@pkgpath devel/llvm/13,-libcxx +@pkgpath devel/llvm/16,-libcxx +@pkgpath devel/llvm/18,-libcxx ${LLVM_BASE}/include/c++/ ${LLVM_BASE}/include/c++/v1/ ${LLVM_BASE}/include/c++/v1/__algorithm/ Index: 19/pkg/PLIST-lldb =================================================================== RCS file: /cvs/ports/devel/llvm/19/pkg/PLIST-lldb,v diff -u -p -r1.2 PLIST-lldb --- 19/pkg/PLIST-lldb 23 Oct 2025 13:19:06 -0000 1.2 +++ 19/pkg/PLIST-lldb 19 Feb 2026 12:33:58 -0000 @@ -1,6 +1,9 @@ @option no-default-conflict @option is-branch @conflict lldb-${LLVM_PKGSPEC} +@pkgpath devel/llvm/13,-lldb +@pkgpath devel/llvm/16,-lldb +@pkgpath devel/llvm/18,-lldb bin/lldb-${LLVM_MAJOR} bin/lldb-argdumper-${LLVM_MAJOR} bin/lldb-dap-${LLVM_MAJOR} Index: 19/pkg/PLIST-main =================================================================== RCS file: /cvs/ports/devel/llvm/19/pkg/PLIST-main,v diff -u -p -r1.2 PLIST-main --- 19/pkg/PLIST-main 23 Oct 2025 13:19:06 -0000 1.2 +++ 19/pkg/PLIST-main 19 Feb 2026 12:33:58 -0000 @@ -1,7 +1,10 @@ @option no-default-conflict @option is-branch @conflict llvm-${LLVM_PKGSPEC} -@pkgpath devel/llvm/${LLVM_MAJOR},-main +@pkgpath devel/llvm/13,-main +@pkgpath devel/llvm/16,-main +@pkgpath devel/llvm/17,-main +@pkgpath devel/llvm/18,-main bin/amdgpu-arch-${LLVM_MAJOR} bin/analyze-build-${LLVM_MAJOR} bin/bugpoint-${LLVM_MAJOR} Index: 19/pkg/PLIST-python =================================================================== RCS file: /cvs/ports/devel/llvm/19/pkg/PLIST-python,v diff -u -p -r1.2 PLIST-python --- 19/pkg/PLIST-python 23 Oct 2025 13:19:06 -0000 1.2 +++ 19/pkg/PLIST-python 19 Feb 2026 12:33:58 -0000 @@ -1,7 +1,10 @@ @option no-default-conflict @option is-branch @conflict ${MODPY_PY_PREFIX}llvm-${LLVM_PKGSPEC} -@conflict llvm-${LLVM_PKGSPEC} +@pkgpath devel/llvm/13,-python +@pkgpath devel/llvm/16,-python +@pkgpath devel/llvm/17,-python +@pkgpath devel/llvm/18,-python ${LLVM_BASE}/lib/python${MODPY_VERSION}/site-packages/clang/ ${LLVM_BASE}/lib/python${MODPY_VERSION}/site-packages/clang/__init__.py ${LLVM_BASE}/lib/python${MODPY_VERSION}/site-packages/clang/${MODPY_PYCACHE}/ Index: 20/Makefile =================================================================== RCS file: /cvs/ports/devel/llvm/20/Makefile,v diff -u -p -r1.11 Makefile --- 20/Makefile 17 Dec 2025 23:08:39 -0000 1.11 +++ 20/Makefile 19 Feb 2026 12:33:58 -0000 @@ -5,7 +5,8 @@ LLVM_MAJOR = 20 LLVM_VERSION = ${LLVM_MAJOR}.1.8 LLVM_PKGSPEC = >=20,<21 -REVISION-main = 2 +REVISION-main = 3 +REVISION-python = 0 SHARED_LIBS += LLVM 0.0 \ LTO 0.0 \ Index: 20/pkg/PLIST-main =================================================================== RCS file: /cvs/ports/devel/llvm/20/pkg/PLIST-main,v diff -u -p -r1.2 PLIST-main --- 20/pkg/PLIST-main 23 Oct 2025 13:19:06 -0000 1.2 +++ 20/pkg/PLIST-main 19 Feb 2026 12:33:58 -0000 @@ -1,7 +1,6 @@ @option no-default-conflict @option is-branch @conflict llvm-${LLVM_PKGSPEC} -@pkgpath devel/llvm/${LLVM_MAJOR},-main bin/amdgpu-arch-${LLVM_MAJOR} bin/analyze-build-${LLVM_MAJOR} bin/bugpoint-${LLVM_MAJOR} Index: 20/pkg/PLIST-python =================================================================== RCS file: /cvs/ports/devel/llvm/20/pkg/PLIST-python,v diff -u -p -r1.2 PLIST-python --- 20/pkg/PLIST-python 23 Oct 2025 13:19:06 -0000 1.2 +++ 20/pkg/PLIST-python 19 Feb 2026 12:33:58 -0000 @@ -1,7 +1,6 @@ @option no-default-conflict @option is-branch @conflict ${MODPY_PY_PREFIX}llvm-${LLVM_PKGSPEC} -@conflict llvm-${LLVM_PKGSPEC} ${LLVM_BASE}/lib/python${MODPY_VERSION}/site-packages/clang/ ${LLVM_BASE}/lib/python${MODPY_VERSION}/site-packages/clang/__init__.py ${LLVM_BASE}/lib/python${MODPY_VERSION}/site-packages/clang/${MODPY_PYCACHE}/ Index: 21/Makefile =================================================================== RCS file: /cvs/ports/devel/llvm/21/Makefile,v diff -u -p -r1.14 Makefile --- 21/Makefile 23 Dec 2025 09:05:20 -0000 1.14 +++ 21/Makefile 19 Feb 2026 12:33:58 -0000 @@ -5,6 +5,9 @@ LLVM_MAJOR = 21 LLVM_VERSION = ${LLVM_MAJOR}.1.8 LLVM_PKGSPEC = >=21,<22 +REVISION-main = 0 +REVISION-python = 0 + SHARED_LIBS += LLVM 0.0 \ LTO 0.0 \ Remarks 0.0 \ Index: 21/pkg/PLIST-main =================================================================== RCS file: /cvs/ports/devel/llvm/21/pkg/PLIST-main,v diff -u -p -r1.2 PLIST-main --- 21/pkg/PLIST-main 23 Oct 2025 13:19:06 -0000 1.2 +++ 21/pkg/PLIST-main 19 Feb 2026 12:33:58 -0000 @@ -1,7 +1,6 @@ @option no-default-conflict @option is-branch @conflict llvm-${LLVM_PKGSPEC} -@pkgpath devel/llvm/${LLVM_MAJOR},-main bin/amdgpu-arch-${LLVM_MAJOR} bin/analyze-build-${LLVM_MAJOR} bin/bugpoint-${LLVM_MAJOR} Index: 21/pkg/PLIST-python =================================================================== RCS file: /cvs/ports/devel/llvm/21/pkg/PLIST-python,v diff -u -p -r1.2 PLIST-python --- 21/pkg/PLIST-python 23 Oct 2025 13:19:06 -0000 1.2 +++ 21/pkg/PLIST-python 19 Feb 2026 12:33:58 -0000 @@ -1,7 +1,6 @@ @option no-default-conflict @option is-branch @conflict ${MODPY_PY_PREFIX}llvm-${LLVM_PKGSPEC} -@conflict llvm-${LLVM_PKGSPEC} ${LLVM_BASE}/lib/python${MODPY_VERSION}/site-packages/clang/ ${LLVM_BASE}/lib/python${MODPY_VERSION}/site-packages/clang/__init__.py ${LLVM_BASE}/lib/python${MODPY_VERSION}/site-packages/clang/${MODPY_PYCACHE}/