Index: head/graphics/libEGL/Makefile
===================================================================
--- head/graphics/libEGL/Makefile
+++ head/graphics/libEGL/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libEGL
 PORTVERSION=	${MESAVERSION}
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	graphics
 
 COMMENT=	OpenEGL library
Index: head/graphics/libGL/Makefile
===================================================================
--- head/graphics/libGL/Makefile
+++ head/graphics/libGL/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libGL
 PORTVERSION=	${MESAVERSION}
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	graphics
 
 COMMENT=	OpenGL library that renders using GLX or DRI
Index: head/graphics/libGL/Makefile.common
===================================================================
--- head/graphics/libGL/Makefile.common
+++ head/graphics/libGL/Makefile.common
@@ -18,7 +18,7 @@
 MESAVERSION=	${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/}
 MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/}
 
-MESABASEVERSION=	13.0.4
+MESABASEVERSION=	13.0.5
 # if there is a subversion, don't include the '-' between 7.11-rc2.
 MESASUBVERSION=
 
@@ -79,9 +79,7 @@
 CONFIGURE_ARGS+=	--enable-egl --with-egl-platforms=x11,drm
 
 # we don't care about GLes v1
-CONFIGURE_ARGS+=	--disable-gles1
-
-CONFIGURE_ARGS+=	--enable-gles2
+CONFIGURE_ARGS+=	--disable-gles1 --enable-gles2
 
 # Clover (OpenCL).
 .if ${OPSYS} == DragonFly || \
@@ -104,8 +102,7 @@
 	fi
 .endif
 
-CONFIGURE_ARGS+=	--enable-opencl \
-			--enable-opencl-icd
+CONFIGURE_ARGS+=	--enable-opencl --enable-opencl-icd
 .else
 CONFIGURE_ARGS+=	--disable-opencl
 .endif
@@ -140,27 +137,22 @@
 # VAAPI support?
 CONFIGURE_ARGS+=--disable-va
 
-ALL_DRI_DRIVERS=I915 I965 R200 RADEON SWRAST
-ALL_GALLIUM_DRIVERS=R300 R600 RADEONSI SVGA SWRAST
+ALL_DRI_DRIVERS=	I915 I965 RADEON R200 SWRAST
+ALL_GALLIUM_DRIVERS=	R300 R600 RADEONSI SVGA SWRAST
 
-.if ${ARCH} == amd64 || ${ARCH} == i386 || ${ARCH} == ia64
-DRI_DRIVERS=	${ALL_DRI_DRIVERS}
-GALLIUM_DRIVERS=	${ALL_GALLIUM_DRIVERS}
+.if ${ARCH} == amd64 || ${ARCH} == i386
+DRI_DRIVERS=		I915 I965 RADEON R200
+GALLIUM_DRIVERS=	R300 R600 RADEONSI SVGA
 .endif
 
 .if ${ARCH} == powerpc || ${ARCH} == powerpc64
-DRI_DRIVERS=	RADEON R200 SWRAST
-GALLIUM_DRIVERS=	R300 R600 RADEONSI SWRAST
-.endif
-
-.if ${ARCH} == sparc64 || ${ARCH} == armv6
-DRI_DRIVERS=	SWRAST
-GALLIUM_DRIVERS=	SWRAST
+DRI_DRIVERS=		RADEON R200
+GALLIUM_DRIVERS=	R300 R600 RADEONSI
 .endif
 
-# empty for unsupported arches
-DRI_DRIVERS+=
-GALLIUM_DRIVERS+=
+# software rendering for all arches
+DRI_DRIVERS+=		SWRAST
+GALLIUM_DRIVERS+=	SWRAST
 
 .for _d in ${ALL_DRI_DRIVERS}
 . if ${DRI_DRIVERS:M${_d}}
Index: head/graphics/libGL/distinfo
===================================================================
--- head/graphics/libGL/distinfo
+++ head/graphics/libGL/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1486052718
-SHA256 (mesa-13.0.4.tar.xz) = a95d7ce8f7bd5f88585e4be3144a341236d8c0fc91f6feaec59bb8ba3120e726
-SIZE (mesa-13.0.4.tar.xz) = 9164612
+TIMESTAMP = 1487852413
+SHA256 (mesa-13.0.5.tar.xz) = bfcea7e2c801525a60895c8aff11aa68457ee9aa35d01a4638e1f310a3f5ef87
+SIZE (mesa-13.0.5.tar.xz) = 9171480
Index: head/graphics/libglesv2/Makefile
===================================================================
--- head/graphics/libglesv2/Makefile
+++ head/graphics/libglesv2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libglesv2
 PORTVERSION=	${MESAVERSION}
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	graphics
 
 COMMENT=	OpenGL ES v2 library
Index: head/graphics/libosmesa/Makefile
===================================================================
--- head/graphics/libosmesa/Makefile
+++ head/graphics/libosmesa/Makefile
@@ -12,7 +12,7 @@
 		libglapi.so:graphics/libglapi
 
 USES=		ssl
-USE_XORG=	x11 xau xcb xdmcp xvmc
+USE_XORG=	dri2proto dri3proto glproto presentproto x11 xau xcb xdmcp xvmc
 # libosmesa doesn't link agains libGL but osmesa.h needs GL/gl.h
 # and both headers are intalled by libGL ....
 USE_GL=		gl