diff --git a/lang/pocl/Makefile b/lang/pocl/Makefile
index 8eb903a7b308..15d285260bd2 100644
--- a/lang/pocl/Makefile
+++ b/lang/pocl/Makefile
@@ -1,70 +1,70 @@
 PORTNAME=	pocl
 PORTVERSION=	1.8
 DISTVERSIONPREFIX=v
 CATEGORIES=	lang
 
 MAINTAINER=	ohartmann@freebsd-de.org
 COMMENT=	POrtable Computing Language (POCL)
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=	aarch64 amd64 i386 powerpc64 powerpc64le
-ONLY_FOR_ARCHS_REASON=	only tested on aarch64, amd64, i386, powerpc64 and powerpc64le
+ONLY_FOR_ARCHS_REASON=	only tested on ${ONLY_FOR_ARCHS:tW:S/ /, /g}
 
 BUILD_DEPENDS=	llvm${LLVM_VERSION}>=10:devel/llvm${LLVM_VERSION} \
 		opencl>=2.2:devel/opencl
 LIB_DEPENDS=	libhwloc.so:devel/hwloc2 libOpenCL.so:devel/ocl-icd
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USES=		cmake localbase:ldflags ncurses pkgconfig
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 
 LLVM_VERSION=	${MESA_LLVM_VER:U13}
 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 sphinx)
 DOCS_CMAKE_OFF=	-DENABLE_DOCS=OFF
 DOCS_CMAKE_ON=	-DENABLE_DOCS=ON
 DOCS_USES=	python:3.6+
 DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=0,1: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
 PLIST_SUB+=	CONFIGURE_TARGET=${CONFIGURE_TARGET:S/amd64/x86_64/}
 
 .include <bsd.port.mk>
diff --git a/lang/pocl/pkg-descr b/lang/pocl/pkg-descr
index 1fbd54e182a3..ebf154f496d4 100644
--- a/lang/pocl/pkg-descr
+++ b/lang/pocl/pkg-descr
@@ -1,22 +1,19 @@
-Portable OpenCL (pocl)
-----------------------
-
 Portable OpenCL aims to be an efficient open source (MIT-licensed)
 implementation of the OpenCL 1.2 standard.
 
 In addition to producing an easily portable open source OpenCL
 implementation, another major goal of the project is improving
 performance portability of OpenCL programs with compiler
 optimizations, reducing the need for target-dependent manual
-optimizations. At the core of pocl is a set of LLVM passes
-used to statically parallelize multiple work-items with the kernel
+optimizations. At the core of POCL is a set of LLVM passes used
+to statically parallelize multiple work-items with the kernel
 compiler, even in the presence of work-group barriers. This enables
 parallelization of the fine-grained static concurrency in the work
-groups in multiple ways (SIMD, VLIW, superscalar,...).
+groups in multiple ways (SIMD, VLIW, superscalar, ...).
 
 The code base is modularized to allow easy adding of new "device drivers"
 in the host-device layer. A generic multithreaded "target driver" is
 included. It allows running OpenCL applications on a host that supports
 the pthread library with multithreading at the work group granularity.
 
 WWW: http://portablecl.org/
diff --git a/lang/pocl/pkg-message b/lang/pocl/pkg-message
deleted file mode 100644
index 3dfd31c876d7..000000000000
--- a/lang/pocl/pkg-message
+++ /dev/null
@@ -1,12 +0,0 @@
-
-Deadlocks (freezes) on FreeBSD:
-
-OpenCL applications using pocl on FreeBSD must be compiled with 
-options CFLAGS+=-pthread or CXXFLAGS+=-pthread, otherwise someone risk
-that a library may not initialize the threading on BSD independently, 
-even if an ICD loader is used.
-
-See: 
-	http://www.freebsd.org/cgi/query-pr.cgi?pr=163512
-
-(Source: http://portablecl.org/docs/html/faq.html?highlight=freebsd)