diff --git a/lang/pocl/Makefile b/lang/pocl/Makefile
index 52b76134f7ce..e9f0dd2ebe2a 100644
--- a/lang/pocl/Makefile
+++ b/lang/pocl/Makefile
@@ -1,70 +1,70 @@
 PORTNAME=	pocl
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.1
+DISTVERSION=	4.0
 CATEGORIES=	lang
 
 MAINTAINER=	ohartmann@walstatt.org
 COMMENT=	POrtable Computing Language (POCL)
 WWW=	http://portablecl.org/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=	aarch64 amd64 i386 powerpc64 powerpc64le
 ONLY_FOR_ARCHS_REASON=	only tested on ${ONLY_FOR_ARCHS:tW:S/ /, /g}
 BROKEN_i386=	Unable to access file /wrkdirs/usr/ports/lang/pocl/work/stage/usr/local/share/pocl/kernel-i386-portbld-freebsd13.0-avx.bc:No such file or directory
 
 BUILD_DEPENDS=	llvm${LLVM_VERSION}>=14:devel/llvm${LLVM_VERSION} \
 		opencl>=3:devel/opencl
 LIB_DEPENDS=	libhwloc.so:devel/hwloc2 libOpenCL.so:devel/ocl-icd
 
 USES=		cmake localbase:ldflags ncurses pkgconfig
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 
-LLVM_VERSION=	${MESA_LLVM_VER:U15}
+LLVM_VERSION=	${MESA_LLVM_VER:U16}
 CMAKE_ARGS=	-DWITH_LLVM_CONFIG="${LOCALBASE}/llvm${LLVM_VERSION}/bin/llvm-config" \
 		-DPOCL_INSTALL_PKGCONFIG_DIR="${PREFIX}/libdata/pkgconfig" \
 		-DSINGLE_LLVM_LIB=ON \
 		${CMAKE_ARGS_${ARCH}}
 
 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/}
 
 OPTIONS_DEFINE=	DOCS
 
 DOCS_DESC=	Build documentation (needs textproc/py-sphinx)
 DOCS_CMAKE_ON=	-DENABLE_DOCS=ON
 DOCS_CMAKE_OFF=	-DENABLE_DOCS=OFF
-DOCS_USES=	python
+DOCS_USES=	python:3.6+
 DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=0:textproc/py-sphinx@${PY_FLAVOR}
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == aarch64
 PLIST_SUB+=	AARCH64=""
 PLIST_SUB+=	PPC64="@comment "
 PLIST_SUB+=	PPC64LE="@comment "
 PLIST_SUB+=	X86="@comment "
 .elif ${ARCH} == amd64 || ${ARCH} == i386
 PLIST_SUB+=	AARCH64="@comment "
 PLIST_SUB+=	PPC64="@comment "
 PLIST_SUB+=	PPC64LE="@comment "
 PLIST_SUB+=	X86=""
 .elif ${ARCH} == powerpc64
 PLIST_SUB+=	AARCH64="@comment "
 PLIST_SUB+=	PPC64=""
 PLIST_SUB+=	PPC64LE="@comment "
 PLIST_SUB+=	X86="@comment "
 .else
 PLIST_SUB+=	AARCH64="@comment "
 PLIST_SUB+=	PPC64="@comment "
 PLIST_SUB+=	PPC64LE=""
 PLIST_SUB+=	X86="@comment "
 .endif
 
 .include <bsd.port.mk>
diff --git a/lang/pocl/distinfo b/lang/pocl/distinfo
index a60086168896..aaa5e1c12075 100644
--- a/lang/pocl/distinfo
+++ b/lang/pocl/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1670346593
-SHA256 (pocl-pocl-v3.1_GH0.tar.gz) = 82314362552e050aff417318dd623b18cf0f1d0f84f92d10a7e3750dd12d3a9a
-SIZE (pocl-pocl-v3.1_GH0.tar.gz) = 1928607
+TIMESTAMP = 1687856826
+SHA256 (pocl-pocl-v4.0_GH0.tar.gz) = 7f4e8ab608b3191c2b21e3f13c193f1344b40aba7738f78762f7b88f45e8ce03
+SIZE (pocl-pocl-v4.0_GH0.tar.gz) = 2140919
diff --git a/lang/pocl/pkg-plist b/lang/pocl/pkg-plist
index 3544359ccbea..9a1ad0efaa8d 100644
--- a/lang/pocl/pkg-plist
+++ b/lang/pocl/pkg-plist
@@ -1,33 +1,33 @@
 bin/poclcc
 etc/OpenCL/vendors/pocl.icd
 lib/libpocl.so
 lib/libpocl.so.2
-lib/libpocl.so.2.10.0
+lib/libpocl.so.2.11.0
 lib/pocl/libpocl-devices-basic.so
 lib/pocl/libpocl-devices-pthread.so
 libdata/pkgconfig/pocl.pc
 %%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/_libclang_versions_checks.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%%-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