Index: branches/2018Q1/lang/beignet/Makefile
===================================================================
--- branches/2018Q1/lang/beignet/Makefile	(revision 466026)
+++ branches/2018Q1/lang/beignet/Makefile	(revision 466027)
@@ -1,67 +1,70 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	beignet
 DISTVERSION=	1.3.2
 DISTVERSIONSUFFIX=	-source
 PORTREVISION=	2
 CATEGORIES=	lang
 MASTER_SITES=	https://01.org/sites/default/files/
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	OpenCL library for Intel GPUs
 
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	clang${LLVMVER}:devel/llvm${LLVMVER} \
 		opencl>=0:devel/opencl
 LIB_DEPENDS=	libOpenCL.so:devel/ocl-icd \
 		libdrm.so:graphics/libdrm
 RUN_DEPENDS=	opencl>=0:devel/opencl \
 		clang${LLVMVER}:devel/llvm${LLVMVER}
 
 WRKSRC=		${WRKDIR}/Beignet-${DISTVERSION}-Source
 
 USES=		cmake ncurses pkgconfig shebangfix
 USE_XORG=	sm ice x11 xext xfixes
 USE_GL=		gl egl
 USE_LDCONFIG=	${LOCALBASE}/lib/${PORTNAME}
 SHEBANG_FILES=	src/git_sha1.sh backend/kernels/compile.sh
 ALL_TARGET=	all
 LLVMVER=	${MESA_LLVM_VER:U50}
 
-CMAKE_ARGS+=	-DLLVM_CONFIG_EXECUTABLE=${LOCALBASE}/bin/llvm-config${LLVMVER}
+CMAKE_ARGS=	-DCLANG_EXECUTABLE:FILEPATH=${LOCALBASE}/bin/clang${LLVMVER} \
+		-DLLVM_AS_EXECUTABLE:FILEPATH=${LOCALBASE}/bin/llvm-as${LLVMVER} \
+		-DLLVM_CONFIG_EXECUTABLE:FILEPATH=${LOCALBASE}/bin/llvm-config${LLVMVER} \
+		-DLLVM_LINK_EXECUTABLE:FILEPATH=${LOCALBASE}/bin/llvm-link${LLVMVER}
 
 ONLY_FOR_ARCHS=	i386 amd64
 ONLY_FOR_ARCHS_REASON=	Beignet needs a graphics driver supported by the Intel KMS driver
 
 OPTIONS_DEFINE=	FP64 OCL20 TEST
 OPTIONS_DEFAULT=	OCL20
 OPTIONS_EXCLUDE_i386=	OCL20
 OPTIONS_SUB=	yes
 
 FP64_DESC=	Double precision (experimental)
 FP64_CMAKE_BOOL=	EXPERIMENTAL_DOUBLE
 
 OCL20_DESC=	OpenCL 2.0 support
 OCL20_CMAKE_BOOL=	ENABLE_OPENCL_20
 
 TEST_ALL_TARGET=	flat_address_space utest_run
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|llvm-dis|llvm-dis${LLVMVER}|g; \
 		s|clang |clang${LLVMVER} |g' \
 		${WRKSRC}/backend/kernels/compile.sh
 
 # XXX bug 213732: compiler_device_enqueue() Interrupt signal (SIGSEGV) received.
 do-test-TEST-on:
 	-@(cd ${TEST_WRKSRC}/utests; . ./setenv.sh; \
 		./flat_address_space; ./utest_run; )
 
 pre-install-TEST-on: do-test-TEST-on
 
 post-install:
 	@${RM} -r ${STAGEDIR}${PREFIX}/include/CL
 
 .include <bsd.port.mk>
Index: branches/2018Q1/lang/beignet/files/patch-CMake_FindLLVM.cmake
===================================================================
--- branches/2018Q1/lang/beignet/files/patch-CMake_FindLLVM.cmake	(revision 466026)
+++ branches/2018Q1/lang/beignet/files/patch-CMake_FindLLVM.cmake	(revision 466027)
@@ -1,40 +1,12 @@
 --- CMake/FindLLVM.cmake.orig	2017-01-20 10:40:51 UTC
 +++ CMake/FindLLVM.cmake
-@@ -46,21 +46,21 @@ endif (LLVM_FIND_VERSION_MAJOR AND LLVM_
- 
- if (LLVM_INSTALL_DIR)
-   find_program(CLANG_EXECUTABLE
--               NAMES clang-${LLVM_VERSION_NODOT} clang-${LLVM_VERSION_NOPATCH} clang
-+               NAMES clang${LLVM_VERSION_NODOT} clang-${LLVM_VERSION_NODOT} clang-${LLVM_VERSION_NOPATCH} clang
-                PATHS ${LLVM_INSTALL_DIR} NO_DEFAULT_PATH)
-   find_program(LLVM_AS_EXECUTABLE
--               NAMES llvm-as-${LLVM_VERSION_NODOT} llvm-as-${LLVM_VERSION_NOPATCH} llvm-as
-+               NAMES llvm-as${LLVM_VERSION_NODOT} llvm-as-${LLVM_VERSION_NODOT} llvm-as-${LLVM_VERSION_NOPATCH} llvm-as
-                PATHS ${LLVM_INSTALL_DIR} NO_DEFAULT_PATH)
-   find_program(LLVM_LINK_EXECUTABLE
--               NAMES llvm-link-${LLVM_VERSION_NODOT} llvm-link-${LLVM_VERSION_NOPATCH} llvm-link
-+               NAMES llvm-link${LLVM_VERSION_NODOT} llvm-link-${LLVM_VERSION_NODOT} llvm-link-${LLVM_VERSION_NOPATCH} llvm-link
-                PATHS ${LLVM_INSTALL_DIR} NO_DEFAULT_PATH)
- else (LLVM_INSTALL_DIR)
-   find_program(CLANG_EXECUTABLE
--               NAMES clang-${LLVM_VERSION_NODOT} clang-${LLVM_VERSION_NOPATCH} clang)
-+               NAMES clang${LLVM_VERSION_NODOT} clang-${LLVM_VERSION_NODOT} clang-${LLVM_VERSION_NOPATCH} clang)
-   find_program(LLVM_AS_EXECUTABLE
--               NAMES llvm-as-${LLVM_VERSION_NODOT} llvm-as-${LLVM_VERSION_NOPATCH} llvm-as)
-+               NAMES llvm-as${LLVM_VERSION_NODOT} llvm-as-${LLVM_VERSION_NODOT} llvm-as-${LLVM_VERSION_NOPATCH} llvm-as)
-   find_program(LLVM_LINK_EXECUTABLE
--               NAMES llvm-link-${LLVM_VERSION_NODOT} llvm-link-${LLVM_VERSION_NOPATCH} llvm-link)
-+               NAMES llvm-link${LLVM_VERSION_NODOT} llvm-link-${LLVM_VERSION_NODOT} llvm-link-${LLVM_VERSION_NOPATCH} llvm-link)
- endif (LLVM_INSTALL_DIR)
- 
- execute_process(
 @@ -100,6 +100,9 @@ execute_process(
    OUTPUT_STRIP_TRAILING_WHITESPACE
  )
  if (LLVM_SYSTEM_LIBS_ORIG)
 +# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=223191#c3
 +string(REPLACE "-l/usr/lib/libexecinfo.so" "-lexecinfo"
 +       LLVM_SYSTEM_LIBS_ORIG ${LLVM_SYSTEM_LIBS_ORIG})
  string(REGEX REPLACE " *\n" "" LLVM_SYSTEM_LIBS ${LLVM_SYSTEM_LIBS_ORIG})
  endif (LLVM_SYSTEM_LIBS_ORIG)
  endif (LLVM_VERSION_NODOT VERSION_GREATER 34)
Index: branches/2018Q1
===================================================================
--- branches/2018Q1	(revision 466026)
+++ branches/2018Q1	(revision 466027)

Property changes on: branches/2018Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r461114