diff --git a/graphics/dri/Makefile b/graphics/dri/Makefile
index bf658cdf3387..c5af035ea16f 100644
--- a/graphics/dri/Makefile
+++ b/graphics/dri/Makefile
@@ -60,19 +60,10 @@ DRIREVISION=	6
 PLIST=	${.CURDIR}/pkg-plist-old
 .endif
 
-DRI_LLVM_VER=	0
-
 .if ${PORT_OPTIONS:MGALLIUM}
-. if defined(WITH_NEW_MESA)
-# keep in sync with libopencl please
-DRI_LLVM_VER=	34
-. else
-DRI_LLVM_VER=	33
-. endif
-
-BUILD_DEPENDS+=	llvm${DRI_LLVM_VER}>=0:${PORTSDIR}/devel/llvm${DRI_LLVM_VER}
-RUN_DEPENDS+=	llvm${DRI_LLVM_VER}>=0:${PORTSDIR}/devel/llvm${DRI_LLVM_VER}
-CONFIGURE_ENV+=	LLVM_CONFIG=${LOCALBASE}/bin/llvm-config${DRI_LLVM_VER}
+BUILD_DEPENDS+=	llvm${MESA_LLVM_VER}>=0:${PORTSDIR}/devel/llvm${MESA_LLVM_VER}
+RUN_DEPENDS+=	llvm${MESA_LLVM_VER}>=0:${PORTSDIR}/devel/llvm${MESA_LLVM_VER}
+CONFIGURE_ENV+=	LLVM_CONFIG=${LOCALBASE}/bin/llvm-config${MESA_LLVM_VER}
 
 CONFIGURE_ARGS+=--enable-gallium-llvm \
 		--enable-xvmc \
diff --git a/graphics/libGL/bsd.mesalib.mk b/graphics/libGL/bsd.mesalib.mk
index 61b0d4705503..730213ed9149 100644
--- a/graphics/libGL/bsd.mesalib.mk
+++ b/graphics/libGL/bsd.mesalib.mk
@@ -11,6 +11,7 @@
 #    - graphics/libglapi
 #    - graphics/libglesv2
 #    - graphics/libosmesa
+#    - lang/clover
 #
 # $FreeBSD$
 
@@ -29,7 +30,7 @@ MESAVERSION=	${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/}
 MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/}
 
 .if defined(WITH_NEW_MESA)
-MESABASEVERSION=	10.4.0
+MESABASEVERSION=	10.4.3
 # if there is a subversion, don't include the '-' between 7.11-rc2.
 MESASUBVERSION=
 
@@ -95,6 +96,12 @@ INSTALL_TARGET=		install-strip
 
 COMPONENT=		${PORTNAME:tl:C/^lib//:C/mesa-//}
 
+.if defined(WITH_NEW_MESA)
+MESA_LLVM_VER=34
+.else
+MESA_LLVM_VER=33
+.endif
+
 .if ${COMPONENT:Mglesv2} == ""
 CONFIGURE_ARGS+=	--disable-gles2
 .else
@@ -107,13 +114,13 @@ CONFIGURE_ARGS+=	--disable-egl
 CONFIGURE_ARGS+=	--enable-egl
 .endif
 
-.if ${COMPONENT:Mopencl} == ""
+.if ${COMPONENT:Mclover} == ""
 CONFIGURE_ARGS+=	--disable-opencl
 .else
 CONFIGURE_ARGS+=	--enable-opencl
 .endif
 
-.if ${COMPONENT:Mdri} == ""
+.if ${COMPONENT:Mdri} == "" && ${COMPONENT:Mclover} == ""
 CONFIGURE_ARGS+=--with-dri-drivers=no
 CONFIGURE_ARGS+=--enable-gallium-llvm=no --without-gallium-drivers
 .else
diff --git a/graphics/libGL/distinfo b/graphics/libGL/distinfo
index 455fb0bb47b1..d8c560cef8f3 100644
--- a/graphics/libGL/distinfo
+++ b/graphics/libGL/distinfo
@@ -1,4 +1,4 @@
 SHA256 (MesaLib-9.1.7.tar.bz2) = 30e6b878b457c716221a9730b179b2846c38cfd5aa1b02d54aff685f50b844a0
 SIZE (MesaLib-9.1.7.tar.bz2) = 6134393
-SHA256 (MesaLib-10.4.0.tar.bz2) = 98a7dff3a1a6708c79789de8b9a05d8042e867067f70e8f30387c15026233219
-SIZE (MesaLib-10.4.0.tar.bz2) = 7479710
+SHA256 (MesaLib-10.4.3.tar.bz2) = ef6ecc9c2f36c9f78d1662382a69ae961f38f03af3a0c3268e53f351aa1978ad
+SIZE (MesaLib-10.4.3.tar.bz2) = 7504749