From f493bd68e5935bee8e73c4c261b5e09878ae4215 Mon Sep 17 00:00:00 2001
From: Dima Panov <fluffy@FreeBSD.org>
Date: Tue, 17 Nov 2020 02:10:43 +0000
Subject: [PATCH] graphics/blender and graphics/openshadinglanguage: respect
 LLVM_DEFAULT

PR:		250990
Submitted by:	vvd@unislabs.com
Approved by:	maintainer
---
 graphics/blender/Makefile             | 9 ++++++++-
 graphics/openshadinglanguage/Makefile | 9 +++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile
index 3488f281f3a8..2d2cf763fa1d 100644
--- a/graphics/blender/Makefile
+++ b/graphics/blender/Makefile
@@ -51,7 +51,6 @@ LDFLAGS+=	-fuse-ld=lld
 .endif
 
 PLIST_SUB+=	VER=${DISTVERSION:R}
-LLVM_VER=	90
 OPTIONS_SUB=	yes
 
 .include "${.CURDIR}/Makefile.options"
@@ -164,6 +163,14 @@ XF86VMODE_USE=			XORG=xi,xxf86vm
 CMAKE_ARGS+=		-DWITH_GHOST_DEBUG:BOOL=ON
 .endif
 
+.include <bsd.port.options.mk>
+
+.if ${LLVM_DEFAULT:M[678]0}
+LLVM_VER=	90
+.else
+LLVM_VER=	${LLVM_DEFAULT}
+.endif
+
 post-patch-OPENCOLORIO-on:
 	@${REINPLACE_CMD} -e 's|yaml-cpp|&03|' \
 		${PATCH_WRKSRC}/build_files/cmake/Modules/FindOpenColorIO.cmake
diff --git a/graphics/openshadinglanguage/Makefile b/graphics/openshadinglanguage/Makefile
index f02824a796ec..eab06e5cdc09 100644
--- a/graphics/openshadinglanguage/Makefile
+++ b/graphics/openshadinglanguage/Makefile
@@ -33,11 +33,10 @@ GH_PROJECT=	OpenShadingLanguage
 LDFLAGS+=	-fuse-ld=lld
 .endif
 
-LLVM_VER=	90
 CMAKE_ON=	ENABLERTTI OSL_BUILD_TESTS USE_LLVM_BITCODE USE_LIBCPLUSPLUS
 CMAKE_OFF=	USE_BOOST_WAVE
 CMAKE_ARGS+=	-DLLVM_CONFIG:STRING="${LOCALBASE}/bin/llvm-config${LLVM_VER}" \
-		-DCMAKE_INSTALL_DOCDIR:STRING=${DOCSDIR}
+		-DCMAKE_INSTALL_DOCDIR:STRING=${DOCSDIR} -DCMAKE_CXX_STANDARD=14
 # This flag fixes linking with clang 9.0 ??
 CXXFLAGS+=	-DNDEBUG
 
@@ -60,6 +59,12 @@ PLIST_SUB+=	LIBVERS=${DISTVERSION:C/([0-9]*)\.([0-9]*)\.([0-9]*)(.*)/\1.\2.\3/}
 
 .include <bsd.port.options.mk>
 
+.if ${LLVM_DEFAULT:M[678]0}
+LLVM_VER=	90
+.else
+LLVM_VER=	${LLVM_DEFAULT}
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's,%%DATADIR%%,${DATADIR},' \
 		-e 's,%%PYCMD%%,${PYTHON_CMD},' \