Index: head/lang/pocl/Makefile
===================================================================
--- head/lang/pocl/Makefile	(revision 504034)
+++ head/lang/pocl/Makefile	(revision 504035)
@@ -1,46 +1,46 @@
 # $FreeBSD$
 
 PORTNAME=	pocl
 PORTVERSION=	1.3
 DISTVERSIONPREFIX=	v
 CATEGORIES=	lang
 
 MAINTAINER=	ohartmann@walstatt.org
 COMMENT=	POrtable Computing Language (POCL)
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=		amd64 i386
 ONLY_FOR_ARCHS_REASON=	only tested on x86
 
 BUILD_DEPENDS=	llvm${LLVM_VERSION}>=0:devel/llvm${LLVM_VERSION} \
 		opencl>=2.1:devel/opencl
 LIB_DEPENDS=	libhwloc.so:devel/hwloc \
 		libOpenCL.so:devel/ocl-icd \
 		libltdl.so:devel/libltdl
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 LLVM_VERSION=	${MESA_LLVM_VER:U80}
 
 USES=		cmake localbase:ldflags ncurses pkgconfig
 
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS=	-DWITH_LLVM_CONFIG="${LOCALBASE}/llvm${LLVM_VERSION}/bin/llvm-config" \
 		-DPOCL_INSTALL_PKGCONFIG_DIR="${PREFIX}/libdata/pkgconfig" \
 		-DKERNELLIB_HOST_CPU_VARIANTS="distro" \
 		-DSINGLE_LLVM_LIB=OFF
 
-PLIST_SUB=	OPSYS=${OPSYS:tl} ARCH=${ARCH:S/amd64/x86_64/}
+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
 DOCS_BUILD_DEPENDS=	${PY_FLAVOR}-sphinx>0:textproc/py-sphinx@${PY_FLAVOR}
 
 .include <bsd.port.mk>
Index: head/lang/pocl/pkg-plist
===================================================================
--- head/lang/pocl/pkg-plist	(revision 504034)
+++ head/lang/pocl/pkg-plist	(revision 504035)
@@ -1,27 +1,27 @@
 bin/poclcc
 etc/OpenCL/vendors/pocl.icd
 lib/libpocl.so
 lib/libpocl.so.2
 lib/libpocl.so.2.3.0
 lib/pocl/libllvmopencl.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/_pocl_opencl.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
-%%DATADIR%%/kernel-%%ARCH%%-portbld-%%PYTHON_PLATFORM%%.2-avx.bc
-%%DATADIR%%/kernel-%%ARCH%%-portbld-%%PYTHON_PLATFORM%%.2-avx2.bc
-%%DATADIR%%/kernel-%%ARCH%%-portbld-%%PYTHON_PLATFORM%%.2-avx512.bc
-%%DATADIR%%/kernel-%%ARCH%%-portbld-%%PYTHON_PLATFORM%%.2-avx_f16c.bc
-%%DATADIR%%/kernel-%%ARCH%%-portbld-%%PYTHON_PLATFORM%%.2-avx_fma4.bc
-%%DATADIR%%/kernel-%%ARCH%%-portbld-%%PYTHON_PLATFORM%%.2-sse2.bc
-%%DATADIR%%/kernel-%%ARCH%%-portbld-%%PYTHON_PLATFORM%%.2-sse41.bc
-%%DATADIR%%/kernel-%%ARCH%%-portbld-%%PYTHON_PLATFORM%%.2-ssse3.bc
+%%DATADIR%%/kernel-%%CONFIGURE_TARGET%%-avx.bc
+%%DATADIR%%/kernel-%%CONFIGURE_TARGET%%-avx2.bc
+%%DATADIR%%/kernel-%%CONFIGURE_TARGET%%-avx512.bc
+%%DATADIR%%/kernel-%%CONFIGURE_TARGET%%-avx_f16c.bc
+%%DATADIR%%/kernel-%%CONFIGURE_TARGET%%-avx_fma4.bc
+%%DATADIR%%/kernel-%%CONFIGURE_TARGET%%-sse2.bc
+%%DATADIR%%/kernel-%%CONFIGURE_TARGET%%-sse41.bc
+%%DATADIR%%/kernel-%%CONFIGURE_TARGET%%-ssse3.bc