diff --git a/devel/intel-graphics-compiler/Makefile b/devel/intel-graphics-compiler/Makefile
index ec010d9a3569..338444e1547a 100644
--- a/devel/intel-graphics-compiler/Makefile
+++ b/devel/intel-graphics-compiler/Makefile
@@ -1,41 +1,46 @@
 PORTNAME=	intel-graphics-compiler
 DISTVERSIONPREFIX=	igc-
 DISTVERSION=	1.0.8744
 CATEGORIES=	devel
+PKGNAMESUFFIX=	-${FLAVOR}
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Intel Graphics Compiler for OpenCL
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 ONLY_FOR_ARCHS=	amd64 i386
 ONLY_FOR_ARCHS_REASON=	Only Intel GPUs on x86 are supported
 
-BUILD_DEPENDS=	vc-intrinsics-llvm11>=s20210730:devel/vc-intrinsics@llvm11
-LIB_DEPENDS=	libopencl-clang.so.11:devel/opencl-clang@llvm11
+BUILD_DEPENDS=	vc-intrinsics-${FLAVOR}>=s20210730:devel/vc-intrinsics@${FLAVOR}
+LIB_DEPENDS=	libopencl-clang.so.${FLAVOR:S/llvm//}:devel/opencl-clang@${FLAVOR}
+
+FLAVORS=	${12 11:L:S/^/llvm/}
+
+CONFLICTS_INSTALL=	${PORTNAME}-*
 
 USES=		bison cmake compiler:c++17-lang python:build
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 GH_ACCOUNT=	intel
 CMAKE_OFF=	INSTALL_SPIRVDLL
-CMAKE_ARGS=	-DCMAKE_PREFIX_PATH:PATH="${LOCALBASE}/${LIB_DEPENDS:M*@llvm*:C/.*@//}" \
-		-DIGC_OPTION__LLVM_PREFERRED_VERSION:STRING="${LIB_DEPENDS:M*@llvm*:C/.*so\.//:C/:.*//}"
+CMAKE_ARGS=	-DCMAKE_PREFIX_PATH:PATH="${LOCALBASE}/${FLAVOR}" \
+		-DIGC_OPTION__LLVM_PREFERRED_VERSION:STRING="${FLAVOR:S/llvm//}"
 CFLAGS+=	-Wno-macro-redefined # __fastcall
 PLIST_SUB=	ARCH_SUFX=${ARCH:S/i386/32/:S/amd//:S/x86_//}
 
 post-patch:
 # lang/python* don't install unsuffixed symlinks
 	@${REINPLACE_CMD} -i .python \
 		-e '/EXECUTABLE/s/"python"/"${PYTHON_CMD:T}"/' \
 		-e '/IGC_PYTHON/s/"python"/"${PYTHON_CMD:T}"/' \
 		${WRKSRC}/IGC/CMakeLists.txt \
 		${WRKSRC}/IGC/BiFModule/linux/CMakeLists.txt
 # No need to abort on every benign warning enabled by default
 # Disable debug symbols unless WITH_DEBUG passed via CXXFLAGS
 	@${REINPLACE_CMD} -e 's/"-Werror"//; /-Werror/d' \
 		-e 's/"-g"//' \
 		${WRKSRC}/IGC/CMakeLists.txt
 
 .include <bsd.port.mk>
diff --git a/devel/intel-graphics-compiler/files/patch-llvm12 b/devel/intel-graphics-compiler/files/patch-llvm12
new file mode 100644
index 000000000000..68e7995988dd
--- /dev/null
+++ b/devel/intel-graphics-compiler/files/patch-llvm12
@@ -0,0 +1,22 @@
+CMake Error at external/llvm/llvm_deps.cmake:50 (file):
+  file COPY cannot find
+  "IGC/DEFAULT_IGC_LLVM_SOURCES_DIR-NOTFOUND/libunwind/include/mach-o/compact_unwind_encoding.h":
+  No such file or directory.
+Call Stack (most recent call first):
+  IGC/CMakeLists.txt:1250 (include)
+
+--- external/llvm/llvm_deps.cmake.orig	2021-09-16 08:50:38 UTC
++++ external/llvm/llvm_deps.cmake
+@@ -44,12 +44,6 @@ include(llvm_spirv_source_hook)
+ # LLD source hook.
+ if(IGC_OPTION__LLVM_LLD)
+   include(llvm_lld_source_hook)
+-  if(NOT EXISTS "${IGC_LLVM_WORKSPACE_SRC}/libunwind/include/mach-o" AND ${IGC_OPTION__LLVM_PREFERRED_VERSION} GREATER_EQUAL "12.0.0")
+-    # Need to copy one header from unwind package for LLD (only for building from sources)
+-    file(MAKE_DIRECTORY ${IGC_LLVM_WORKSPACE_SRC}/libunwind/include/mach-o)
+-    file(COPY ${DEFAULT_IGC_LLVM_SOURCES_DIR}/libunwind/include/mach-o/compact_unwind_encoding.h
+-         DESTINATION ${IGC_LLVM_WORKSPACE_SRC}/libunwind/include/mach-o/)
+-  endif()
+ endif()
+ 
+ # Process LLVM.
diff --git a/lang/intel-compute-runtime/Makefile b/lang/intel-compute-runtime/Makefile
index 47168dd162bf..ebd3ab1e73e2 100644
--- a/lang/intel-compute-runtime/Makefile
+++ b/lang/intel-compute-runtime/Makefile
@@ -1,61 +1,66 @@
 PORTNAME=	compute-runtime
 DISTVERSION=	21.37.20939
 CATEGORIES=	lang
 PKGNAMEPREFIX=	intel-
+PKGNAMESUFFIX=	-${FLAVOR}
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES+=	aa5a39a2db79.patch:-p1 # https://github.com/intel/compute-runtime/pull/361
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	OpenCL implementation for Intel HD 5000 (Gen8) or newer
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 ONLY_FOR_ARCHS=	amd64 i386
 ONLY_FOR_ARCHS_REASON=	Only Intel GPUs on x86 are supported
 
-LIB_DEPENDS=	libigc.so:devel/intel-graphics-compiler \
+LIB_DEPENDS=	libigc.so:devel/intel-graphics-compiler@${FLAVOR} \
 		libigdgmm.so:multimedia/gmmlib
 
+FLAVORS=	${12 11:L:S/^/llvm/}
+
+CONFLICTS_INSTALL=	${PORTNAME}-*
+
 USES=		cmake compiler:c++17-lang localbase:ldflags pkgconfig
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 GH_ACCOUNT=	intel
 CMAKE_ON=	RELEASE_WITH_REGKEYS SKIP_UNIT_TESTS SUPPORT_DG1
 CMAKE_ARGS=	-DNEO_OCL_DRIVER_VERSION:STRING="${DISTVERSIONFULL}"
 PLIST_FILES=	bin/ocloc \
 		etc/OpenCL/vendors/intel.icd \
 		include/ocloc_api.h \
 		lib/intel-opencl/libigdrcl.so \
 		lib/libocloc.so \
 		${NULL}
 
 OPTIONS_DEFINE=	VAAPI
 OPTIONS_DEFAULT=VAAPI
 OPTIONS_DEFINE_amd64=	L0
 OPTIONS_DEFAULT_amd64=	L0
 
 L0_DESC=		oneAPI Level Zero support
 L0_BUILD_DEPENDS=	level-zero>=1.0:devel/level-zero
 L0_CMAKE_BOOL=		BUILD_WITH_L0
 L0_CMAKE_ON=		-DNEO_VERSION_BUILD:STRING="0"
 L0_PLIST_FILES=		lib/libze_intel_gpu.so.1 \
 			lib/libze_intel_gpu.so.1.2.0
 
 VAAPI_BUILD_DEPENDS=	${LOCALBASE}/include/va/va.h:multimedia/libva
 VAAPI_CMAKE_BOOL_OFF=	DISABLE_LIBVA
 
 post-patch:
 	@${REINPLACE_CMD} -e '/-Werror/d' \
 		-e '/FORCE_RESPONSE_FILE/d' \
 		${WRKSRC}/CMakeLists.txt
 	@${REINPLACE_CMD} -e '/OCL_ICD_VENDORDIR/s,/etc,${PREFIX}&,' \
 		${WRKSRC}/package.cmake
 
 post-install:
 # install/strip has no effect on install(FILES), so strip manually
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/intel-opencl/*.so
 
 .include <bsd.port.mk>