diff --git a/graphics/dri/Makefile b/graphics/dri/Makefile
index daa465d..9897bdd 100644
--- a/graphics/dri/Makefile
+++ b/graphics/dri/Makefile
@@ -14,14 +14,13 @@ LIB_DEPENDS=	libdrm.so:${PORTSDIR}/graphics/libdrm \
 
 USE_XORG=	glproto x11 xext xxf86vm xdamage xfixes dri2proto \
 		presentproto xvmc xshmfence
-USES=		gettext:build
 
 OPTIONS_DEFINE=	TEXTURE
 
-OPTIONS_DEFINE_i386=	GALLIUM VDPAU
-OPTIONS_DEFAULT_i386=	GALLIUM VDPAU
-OPTIONS_DEFINE_amd64=	GALLIUM VDPAU
-OPTIONS_DEFAULT_amd64=	GALLIUM VDPAU
+OPTIONS_DEFINE_i386=	GALLIUM
+OPTIONS_DEFAULT_i386=	GALLIUM
+OPTIONS_DEFINE_amd64=	GALLIUM
+OPTIONS_DEFAULT_amd64=	GALLIUM
 
 GALLIUM_DESC=	Gallium (llvm backed) dri drivers
 TEXTURE_DESC=	Enable texture-float support (patent encumbered)
@@ -60,16 +59,19 @@ 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
-BUILD_DEPENDS+=	llvm34>=0:${PORTSDIR}/devel/llvm34
-CONFIGURE_ENV+=	LLVM_CONFIG=${LOCALBASE}/bin/llvm-config34
+DRI_LLVM_VER=	34
 . else
-BUILD_DEPENDS+=	llvm33>=0:${PORTSDIR}/devel/llvm33
-CONFIGURE_ENV+=	LLVM_CONFIG=${LOCALBASE}/bin/llvm-config33
+DRI_LLVM_VER=	33
 . endif
 
+BUILD_DEPENDS+=	llvm${DRI_LLVM_VER}>=0:${PORTSDIR}/devel/llvm${DRI_LLVM_VER}
+CONFIGURE_ENV+=	LLVM_CONFIG=${LOCALBASE}/bin/llvm-config${DRI_LLVM_VER}
+
 CONFIGURE_ARGS+=--enable-gallium-llvm \
 		--enable-xvmc \
 		--with-gallium-drivers=r300,r600,radeonsi,svga,swrast
@@ -84,9 +86,13 @@ PLIST_SUB+=	GALLIUM="@comment "
 CONFIGURE_ARGS+=--enable-texture-float
 .endif
 
-.if ${PORT_OPTIONS:MVDPAU}
+.if 0 #${PORT_OPTIONS:MVDPAU}
+.if ${PORT_OPTIONS:MGALLIUM} == ""
+IGNORE=	VDPAU option requires GALLIUM support to be enabled
+.endif
 CONFIGURE_ARGS+=--enable-vdpau
 LIB_DEPENDS+=	libvdpau.so:${PORTSDIR}/multimedia/libvdpau
+RUN_DEPENDS+=	llvm${DRI_LLVM_VER}:${PORTSDIR}/lang/llvm${DRI_LLVM_VER}
 PLIST_SUB+=	VDPAU=""
 .else
 CONFIGURE_ARGS+=--disable-vdpau
diff --git a/graphics/libGL/bsd.mesalib.mk b/graphics/libGL/bsd.mesalib.mk
index 69be8af..a159347 100644
--- a/graphics/libGL/bsd.mesalib.mk
+++ b/graphics/libGL/bsd.mesalib.mk
@@ -28,7 +28,7 @@ MESAVERSION=	${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/}
 MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/}
 
 .if defined(WITH_NEW_MESA)
-MESABASEVERSION=	10.3.2
+MESABASEVERSION=	10.3.3
 # if there is a subversion, don't include the '-' between 7.11-rc2.
 MESASUBVERSION=	
 
@@ -58,8 +58,8 @@ BUILD_DEPENDS+=	makedepend:${PORTSDIR}/devel/makedepend \
 
 LIB_DEPENDS+=	libdevq.so:${PORTSDIR}/devel/libdevq
 
-USES+=		bison gmake libtool pathfix pkgconfig python:2,build \
-		shebangfix tar:bzip2
+USES+=		bison gettext:build gmake libtool pathfix pkgconfig \
+		python:2,build shebangfix tar:bzip2
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/graphics/libGL/distinfo b/graphics/libGL/distinfo
index 7936487..9769cdd 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.3.2.tar.bz2) = e9849bcb9aa9acd98a753d6d46d2e7d7238d3367036e11357a60efd16de8bea3
-SIZE (MesaLib-10.3.2.tar.bz2) = 7270878
+SHA256 (MesaLib-10.3.3.tar.bz2) = 0e4eee4a2ddf86456eed2fc44da367f95471f74249636710491e85cc256c4753
+SIZE (MesaLib-10.3.3.tar.bz2) = 7282929