Index: head/devel/libclc/Makefile
===================================================================
--- head/devel/libclc/Makefile	(revision 512593)
+++ head/devel/libclc/Makefile	(revision 512594)
@@ -1,42 +1,49 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	libclc
 DISTVERSION=	0.4.0.20190527
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Required library functions for OpenCL C programming language
 
 LICENSE=	LLVM
 LICENSE_NAME=	LLVM Release License
 LICENSE_FILE=	${WRKSRC}/LICENSE.TXT
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 BUILD_DEPENDS=	llvm${LLVM_DEFAULT}>=4.0:devel/llvm${LLVM_DEFAULT} \
 		libedit>=0:devel/libedit
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	llvm-mirror
 GH_TAGNAME=	9f6204e
 
 # ninja based build is broken since commit 598792bc (16 sep 2016)
 USES=		gmake python:2.7,build gmake
 USE_LDCONFIG=	yes
 MAKE_ENV=	MAKE=${GMAKE} DESTDIR=${STAGEDIR}
 ALL_TARGET=
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/bin/python|${PYTHON_CMD}|g' \
 		-e 's|"python |"${PYTHON_VERSION} |g' \
 		${WRKSRC}/build/ninja_syntax.py \
 		${WRKSRC}/configure.py
 
 do-configure:
 	@cd ${WRKSRC} && ${PYTHON_CMD} configure.py ${CONFIGURE_ARGS} -g make \
 		--with-llvm-config=${LOCALBASE}/bin/llvm-config${LLVM_DEFAULT} \
 		--pkgconfigdir=${PREFIX}/libdata/pkgconfig \
 		--prefix=${PREFIX}
+
+.include <bsd.port.options.mk>
+
+# Keep in sync with lang/clover
+.if ${LLVM_DEFAULT:S,-devel,990,} >= 90
+LLVM_DEFAULT=	80
+.endif
 
 .include <bsd.port.mk>
Index: head/lang/clover/Makefile
===================================================================
--- head/lang/clover/Makefile	(revision 512593)
+++ head/lang/clover/Makefile	(revision 512594)
@@ -1,45 +1,46 @@
 # $FreeBSD$
 
 PORTNAME=	clover
 PORTVERSION=	${MESAVERSION}
 PORTREVISION=	3
 CATEGORIES=	lang
 
 COMMENT=	Mesa "Clover" OpenCL library
 
 BUILD_DEPENDS=	libclc>=0.3.0:devel/libclc \
 		opencl>=0:devel/opencl
 LIB_DEPENDS=	libOpenCL.so:devel/ocl-icd
 RUN_DEPENDS=	libclc>=0.3.0:devel/libclc \
 		opencl>=0:devel/opencl
 
 ONLY_FOR_ARCHS=		i386 amd64
 ONLY_FOR_ARCHS_REASON=	Clover needs a GPU supported by the Radeon KMS driver
 
 .include <bsd.port.options.mk>
 
+# Keep in sync with devel/libclc
 .if ${LLVM_DEFAULT:S,-devel,990,} >= 90
 LLVM_DEFAULT=	80
 .endif
 
 .include "${.CURDIR:H:H}/graphics/mesa-dri/Makefile.common"
 
 CONFIGURE_ARGS+=	--enable-opencl --enable-opencl-icd --disable-dri \
 			--disable-egl --disable-gbm --disable-gles2 --disable-glx \
 			--disable-va --disable-vdpau --disable-xvmc \
 			--with-gallium-drivers=r600,radeonsi	# only supported GPUs
 LDFLAGS_i386=		-Wl,-znotext
 
 #MESA_BUILD_WRKSRC=	src/util src/compiler src/mesa src/gallium
 MESA_INSTALL_WRKSRC=	src/gallium/targets/opencl src/gallium/targets/pipe-loader
 
 .include "${MASTERDIR}/Makefile.targets"
 
 pre-configure:
 	@if [ -e ${LOCALBASE}/bin/llvm-config${LLVM_DEFAULT} ] && \
 		! [ -e ${LOCALBASE}/bin/clang${LLVM_DEFAULT} ]; then \
 		${ECHO_MSG} "Your llvm${LLVM_DEFAULT} is not built with clang support, which is required."; \
 		${FALSE}; \
 	fi
 
 .include <bsd.port.post.mk>