diff --git a/lang/pocl/Makefile b/lang/pocl/Makefile
index 1b3268cabd9e..505151e0e072 100644
--- a/lang/pocl/Makefile
+++ b/lang/pocl/Makefile
@@ -1,140 +1,152 @@
 PORTNAME=	pocl
 DISTVERSIONPREFIX=	v
-DISTVERSION=	7.0
-PORTREVISION=	1
+DISTVERSION=	7.1
 CATEGORIES=	lang
 
 MAINTAINER=	ohartmann@walstatt.org
 COMMENT=	POrtable Computing Language (POCL)
 WWW=		https://portablecl.org/docs/html
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=	aarch64 amd64 powerpc64 powerpc64le
 ONLY_FOR_ARCHS_REASON=	only tested on ${ONLY_FOR_ARCHS:tW:S/ /, /g}
 
-BUILD_DEPENDS=	clang${LLVM_VER}:devel/llvm${LLVM_VER} \
-		opencl>=3:devel/opencl \
-		spirv-llvm-translator-llvm${LLVM_VER}>=${LLVM_VER}:devel/spirv-llvm-translator@llvm${LLVM_VER} \
+_BR_DEPENDS=	opencl>=3:devel/opencl \
+		spirv-llvm-translator-llvm${LLVM_VERSION}>=${LLVM_VERSION}:devel/spirv-llvm-translator@llvm${LLVM_VERSION} \
 		spirv-tools>0:graphics/spirv-tools
-
+BUILD_DEPENDS=	${_BR_DEPENDS}
 LIB_DEPENDS=	libhwloc.so:devel/hwloc2 \
-		libLLVM-${LLVM_VER}.so:devel/llvm${LLVM_VER} \
 		libOpenCL.so:devel/ocl-icd
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS=	${_BR_DEPENDS}
 
 USES=		cmake:noninja gmake localbase:ldflags ncurses pkgconfig python
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 
-LLVM_VER=	20
 CMAKE_ARGS=	${CMAKE_ARGS_${ARCH}} \
 		-DENABLE_HOST_CPU_DEVICES=ON \
 		-DENABLE_HOST_CPU_DEVICES_OPENMP=ON \
 		-DENABLE_ICD=ON \
 		-DENABLE_LATEST_CXX_STD=YES \
 		-DENABLE_POCL_BUILDING=OFF \
 		-DENABLE_SPIRV=ON \
 		-DHAVE_OCL_ICD_30_COMPATIBLE=ON \
 		-DHOST_COMPILER_SUPPORTS_FLOAT16:BOOL=OFF \
-		-DLLVM_CONFIG_LOCATION=${LOCALBASE}/bin/llvm-config${LLVM_VER}/ \
+		-DLLVM_CONFIG_LOCATION=${LOCALBASE}/bin/llvm-config${LLVM_VERSION}/ \
 		-DPOCL_ICD_ABSOLUTE_PATH=ON \
 		-DPOCL_INSTALL_PKGCONFIG_DIR="${PREFIX}/libdata/pkgconfig" \
-		-DWITH_LLVM_CONFIG="${LOCALBASE}/llvm${LLVM_VER}/bin/llvm-config"
+		-DWITH_LLVM_CONFIG="${LOCALBASE}/llvm${LLVM_VERSION}/bin/llvm-config"
 
 CMAKE_ARGS_aarch64=	-DLLC_HOST_CPU=cortex-a53
 CMAKE_ARGS_powerpc64=	-DLLC_HOST_CPU=ppc64
 CMAKE_ARGS_powerpc64le=	-DLLC_HOST_CPU=ppc64le
 CMAKE_ARGS_amd64=	-DKERNELLIB_HOST_CPU_VARIANTS=distro
 
-PLIST_SUB=	CONFIGURE_TARGET=${CONFIGURE_TARGET:S/amd64/x86_64/}
+PLIST_SUB=		CONFIGURE_TARGET=${CONFIGURE_TARGET:S/amd64/x86_64/}
 
 OPTIONS_DEFINE=		CONFORMANCE DEBUG DOCS DOCS_PDF LTTNG OMP REMOTE \
 			SHARED_LIBS STATIC_LLVM TESTS
-OPTIONS_DEFAULT=	OMP SHARED_LIBS TESTS
+OPTIONS_DEFAULT=	LLVM21 OMP SHARED_LIBS TESTS
+OPTIONS_SINGLE=		LLVM
+OPTIONS_SINGLE_LLVM=	LLVM17 LLVM18 LLVM19 LLVM20 LLVM21 LLVMDEFAULT
 OPTIONS_SUB=		yes
 
 CONFORMANCE_DESC=	Conformant pocl build (defaults to OFF)
 DEBUG_DESC=		Build POCL with DEBUG messages
 DOCS_DESC=		Build documentation (needs textproc/py-sphinx)
 DOCS_PDF_DESC=		Build PDF alongside with standard HTML docs
+LLVM17_DESC=		Use llvm 17
+LLVM18_DESC=		Use llvm 18
+LLVM19_DESC=		Use llvm 19
+LLVM20_DESC=		Use llvm 20
+LLVM21_DESC=		Use llvm 21
+LLVMDEFAULT_DESC=	Use default llvm version
+LLVM_DESC=		LLVM version to choose
 LTTNG_DESC=		Trace both server and client lib with lttng
 OMP_DESC=		Enable OpenMP on CPU driver
-REMOTE_DESC=		Enable pocld, a remote server
+REMOTE_DESC=		Enable pocld, a remote server (esperimental)
 SHARED_LIBS_DESC=	Build shared libs
 STATIC_LLVM_DESC=	Have static libLLVM
 TESTS_DESC=		Enable compilation of internal tests
 
 CONFORMANCE_CMAKE_ON=	-DENABLE_CONFORMANCE=ON
 CONFORMANCE_CMAKE_OFF=	-DENABLE_CONFORMANCE=OFF
 
 DEBUG_CMAKE_ON=		-DPOCL_DEBUG_MESSAGES=ON
 DEBUG_CMAKE_OFF=	-DPOCL_DEBUG_MESSAGES=OFF
 
 DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${PY_FLAVOR}
 DOCS_CMAKE_ON=		-DENABLE_DOCS=ON
 DOCS_CMAKE_OFF=		-DENABLE_DOCS=OFF
 
 DOCS_PDF_IMPLIES=	DOCS
 DOCS_PDF_BROKEN=	TeX error: Unicode character ≈ (U+2248) not set up for use with LaTeX.
 
+LLVM17_USES=		llvm:17,build,lib,run
+LLVM18_USES=		llvm:18,build,lib,run
+LLVM19_USES=		llvm:19,build,lib,run
+LLVM20_USES=		llvm:20,build,lib,run
+LLVM21_USES=		llvm:21,build,lib,run
+LLVMDEFAULT_USES=	llvm:min=17,max=21,build,lib,run
+
 LTTNG_LIB_DEPENDS=	liblttng-ust.so:sysutils/lttng-ust
 LTTNG_CMAKE_ON=		-DENABLE_LTTNG=YES
 LTTNG_CMAKE_OFF=	-DENABLE_LTTNG=NO
 
 OMP_CMAKE_ON=	-DENABLE_HOST_CPU_DEVICES_OPENMP=YES
 OMP_CMAKE_OFF=	-DENABLE_HOST_CPU_DEVICES_OPENMP=NO
 
 REMOTE_BROKEN=		Not compiling. FreeBSD lacks sockettype AF_VSOCK
 REMOTE_CMAKE_ON=	-DENABLE_REMOTE_SERVER=ON
 REMOTE_CMAKE_OFF=	-DENABLE_REMOTE_SERVER=OFF
 
 SHARED_LIBS_CMAKE_ON=	-DBUILD_SHARED_LIBS=ON
 SHARED_LIBS_CMAKE_OFF=	-DBUILD_SHARED_LIBS=OFF
 
 STATIC_LLVM_CMAKE_ON=	-DSTATIC_LLVM_LLVM=ON
 STATIC_LLVM_CMAKE_OFF=	-DSTATIC_LLVM_LLVM=OFF
 
 TESTS_CMAKE_ON=		-DENABLE_TESTS=ON
 TESTS_CMAKE_OFF=	-DENABLE_TESTS=OFF
 
 do-build-DOCS-on:
 	${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} -C ${WRKSRC}/doc/sphinx html dirhtml
 do-build-DOCS_PDF-on:
 	${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} -C ${WRKSRC}/doc/sphinx latex
 	${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_CMD} -C ${WRKSRC}/doc/sphinx/build/latex all-pdf
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/html
 	${INSTALL_DATA} ${WRKSRC}/doc/sphinx/build/html/*.html ${STAGEDIR}${DOCSDIR}/html/
 post-install-DOCS_PDF-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/html
 	${INSTALL_DATA} ${WRKSRC}/doc/sphinx/build/latex/*.pdf ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == aarch64
 PLIST_SUB+=	AARCH64="" \
 		PPC64="@comment " \
 		PPC64LE="@comment " \
 		X86="@comment "
 .elif ${ARCH} == amd64 || ${ARCH} == i386
 PLIST_SUB+=	AARCH64="@comment " \
 		PPC64="@comment " \
 		PPC64LE="@comment " \
 		X86=""
 .elif ${ARCH} == powerpc64
 PLIST_SUB+=	AARCH64="@comment " \
 		PPC64="" \
 		PPC64LE="@comment " \
 		X86="@comment "
 .else
 PLIST_SUB+=	AARCH64="@comment " \
 		PPC64="@comment " \
 		PPC64LE="" \
 		X86="@comment "
 .endif
 
 .include <bsd.port.mk>
diff --git a/lang/pocl/distinfo b/lang/pocl/distinfo
index 8860b0ec290e..bf0d18ef2e01 100644
--- a/lang/pocl/distinfo
+++ b/lang/pocl/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1748010431
-SHA256 (pocl-pocl-v7.0_GH0.tar.gz) = f55caba8c3ce12bec7b683ce55104c7555e19457fc2ac72c6f035201e362be08
-SIZE (pocl-pocl-v7.0_GH0.tar.gz) = 3766036
+TIMESTAMP = 1760001904
+SHA256 (pocl-pocl-v7.1_GH0.tar.gz) = 1110057cb0736c74819ad65238655a03f7b93403a0ca60cdd8849082f515ca25
+SIZE (pocl-pocl-v7.1_GH0.tar.gz) = 3889905
diff --git a/lang/pocl/pkg-plist b/lang/pocl/pkg-plist
index 69b54bb8e7b6..d73eeb8ed328 100644
--- a/lang/pocl/pkg-plist
+++ b/lang/pocl/pkg-plist
@@ -1,71 +1,72 @@
 bin/poclcc
 etc/OpenCL/vendors/pocl.icd
 lib/libpocl.so
 lib/libpocl.so.2
-lib/libpocl.so.2.14.0
+lib/libpocl.so.2.15.0
 lib/pocl/libpocl-devices-basic.so
 lib/pocl/libpocl-devices-pthread.so
 libdata/pkgconfig/pocl.pc
 %%DOCS_PDF%%%%PORTDOCS%%%%DOCSDIR%%/PortableComputingLanguagepocl.pdf
 %%PORTDOCS%%%%DOCSDIR%%/html/almaif.html
 %%PORTDOCS%%%%DOCSDIR%%/html/android.html
 %%PORTDOCS%%%%DOCSDIR%%/html/conformance.html
 %%PORTDOCS%%%%DOCSDIR%%/html/cpu.html
 %%PORTDOCS%%%%DOCSDIR%%/html/cuda.html
 %%PORTDOCS%%%%DOCSDIR%%/html/dbk.html
 %%PORTDOCS%%%%DOCSDIR%%/html/debug.html
 %%PORTDOCS%%%%DOCSDIR%%/html/design.html
 %%PORTDOCS%%%%DOCSDIR%%/html/development.html
 %%PORTDOCS%%%%DOCSDIR%%/html/driver_design.html
 %%PORTDOCS%%%%DOCSDIR%%/html/drivers.html
 %%PORTDOCS%%%%DOCSDIR%%/html/extensions.html
 %%PORTDOCS%%%%DOCSDIR%%/html/faq.html
 %%PORTDOCS%%%%DOCSDIR%%/html/features.html
 %%PORTDOCS%%%%DOCSDIR%%/html/genindex.html
 %%PORTDOCS%%%%DOCSDIR%%/html/host_library.html
 %%PORTDOCS%%%%DOCSDIR%%/html/hsa.html
 %%PORTDOCS%%%%DOCSDIR%%/html/index.html
 %%PORTDOCS%%%%DOCSDIR%%/html/install.html
 %%PORTDOCS%%%%DOCSDIR%%/html/kernel_compiler.html
 %%PORTDOCS%%%%DOCSDIR%%/html/level0.html
 %%PORTDOCS%%%%DOCSDIR%%/html/macos.html
 %%PORTDOCS%%%%DOCSDIR%%/html/memory_management.html
 %%PORTDOCS%%%%DOCSDIR%%/html/notes_5_0.html
 %%PORTDOCS%%%%DOCSDIR%%/html/notes_6_0.html
 %%PORTDOCS%%%%DOCSDIR%%/html/notes_7_0.html
+%%PORTDOCS%%%%DOCSDIR%%/html/notes_7_1.html
 %%PORTDOCS%%%%DOCSDIR%%/html/opencl_status.html
 %%PORTDOCS%%%%DOCSDIR%%/html/pocl_binary.html
 %%PORTDOCS%%%%DOCSDIR%%/html/proxy.html
 %%PORTDOCS%%%%DOCSDIR%%/html/%%CMAKE_BUILD_TYPE%%_notes.html
 %%PORTDOCS%%%%DOCSDIR%%/html/remote.html
 %%PORTDOCS%%%%DOCSDIR%%/html/search.html
 %%PORTDOCS%%%%DOCSDIR%%/html/sycl_dpcpp.html
 %%PORTDOCS%%%%DOCSDIR%%/html/sycl_with_pocl_arm.html
 %%PORTDOCS%%%%DOCSDIR%%/html/using.html
 %%PORTDOCS%%%%DOCSDIR%%/html/vulkan.html
 %%PORTDOCS%%%%DOCSDIR%%/html/windows.html
 %%DATADIR%%/include/_builtin_renames.h
 %%DATADIR%%/include/_clang_opencl.h
 %%DATADIR%%/include/_enable_all_exts.h
 %%DATADIR%%/include/_kernel.h
 %%DATADIR%%/include/_kernel_c.h
 %%DATADIR%%/include/_kernel_constants.h
 %%DATADIR%%/include/opencl-c-base.h
 %%DATADIR%%/include/opencl-c.h
 %%DATADIR%%/include/pocl.h
 %%DATADIR%%/include/pocl_device.h
 %%DATADIR%%/include/pocl_image_types.h
 %%DATADIR%%/include/pocl_spir.h
 %%DATADIR%%/include/pocl_types.h
 %%X86%%%%DATADIR%%/kernel-%%CONFIGURE_TARGET%%-avx.bc
 %%X86%%%%DATADIR%%/kernel-%%CONFIGURE_TARGET%%-avx2.bc
 %%X86%%%%DATADIR%%/kernel-%%CONFIGURE_TARGET%%-avx512.bc
 %%X86%%%%DATADIR%%/kernel-%%CONFIGURE_TARGET%%-avx_f16c.bc
 %%X86%%%%DATADIR%%/kernel-%%CONFIGURE_TARGET%%-avx_fma4.bc
 %%X86%%%%DATADIR%%/kernel-%%CONFIGURE_TARGET%%-generic.bc
 %%X86%%%%DATADIR%%/kernel-%%CONFIGURE_TARGET%%-sse2.bc
 %%X86%%%%DATADIR%%/kernel-%%CONFIGURE_TARGET%%-sse41.bc
 %%X86%%%%DATADIR%%/kernel-%%CONFIGURE_TARGET%%-ssse3.bc
 %%AARCH64%%%%DATADIR%%/kernel-%%CONFIGURE_TARGET%%-cortex-a53.bc
 %%PPC64%%%%DATADIR%%/kernel-%%CONFIGURE_TARGET%%-ppc64.bc
 %%PPC64LE%%%%DATADIR%%/kernel-%%CONFIGURE_TARGET%%-ppc64le.bc