Index: head/graphics/gbm/Makefile
===================================================================
--- head/graphics/gbm/Makefile	(revision 437214)
+++ head/graphics/gbm/Makefile	(revision 437215)
@@ -1,30 +1,30 @@
 # Created by: kwm@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	gbm
 PORTVERSION=	${MESAVERSION}
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	graphics
 
 COMMENT=	gbm library
 
 BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:devel/libpthread-stubs
 LIB_DEPENDS+=	libexpat.so:textproc/expat2 \
 		libdrm.so:graphics/libdrm \
 		libglapi.so:graphics/libglapi
 
 USE_XORG=	x11 xau xcb xdmcp
 
 # stuff not needed by gbm but configure wants it
 USE_XORG+=	dri2proto dri3proto glproto presentproto xdamage xext xfixes \
 		xshmfence
 
 .include <bsd.port.options.mk>
 .include "${.CURDIR}/../../graphics/libGL/Makefile.common"
 
 MESA_BUILD_WRKSRC=	src/mapi src/gbm
 MESA_INSTALL_WRKSRC=	src/gbm
 
 .include "${.CURDIR}/../../graphics/libGL/Makefile.targets"
 
 .include <bsd.port.mk>
Index: head/graphics/libEGL/Makefile
===================================================================
--- head/graphics/libEGL/Makefile	(revision 437214)
+++ head/graphics/libEGL/Makefile	(revision 437215)
@@ -1,30 +1,30 @@
 # Created by: kwm@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	libEGL
 PORTVERSION=	${MESAVERSION}
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	graphics
 
 COMMENT=	OpenEGL library
 
 BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:devel/libpthread-stubs
 LIB_DEPENDS+=	libexpat.so:textproc/expat2 \
 		libdrm.so:graphics/libdrm
 
 USE_GL=		gbm
 USE_XORG=	x11 xau xcb xdmcp
 
 # stuff not needed by libEGL but configure wants it
 USE_XORG+=	dri2proto dri3proto glproto presentproto xdamage xext xfixes \
 		xshmfence
 
 .include <bsd.port.options.mk>
 .include "${.CURDIR}/../../graphics/libGL/Makefile.common"
 
 MESA_BUILD_WRKSRC=	src/mapi src/gbm src/egl/
 MESA_INSTALL_WRKSRC=	src/egl
 
 .include "${.CURDIR}/../../graphics/libGL/Makefile.targets"
 
 .include <bsd.port.mk>
Index: head/graphics/libGL/Makefile.common
===================================================================
--- head/graphics/libGL/Makefile.common	(revision 437214)
+++ head/graphics/libGL/Makefile.common	(revision 437215)
@@ -1,180 +1,194 @@
 # Makefile.common - shared code between MesaLib ports.
 #
 # !!! Here be dragons !!! (they seem to be everywhere these days)
 #
 # Remember to upgrade the following ports everytime you bump MESAVERSION:
 #
 #    - graphics/dri
 #    - graphics/gbm
 #    - graphics/libEGL
 #    - graphics/libGL
 #    - graphics/libglapi
 #    - graphics/libglesv2
 #    - graphics/libosmesa
 #    - lang/clover
 #
 # $FreeBSD$
 
 MESAVERSION=	${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/}
 MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/}
 
-MESABASEVERSION=	13.0.5
+MESABASEVERSION=	13.0.6
 # if there is a subversion, don't include the '-' between 7.11-rc2.
 MESASUBVERSION=
 
-MASTER_SITES=	ftp://ftp.freedesktop.org/pub/mesa/${MESABASEVERSION}/
+MASTER_SITES=	https://mesa.freedesktop.org/archive/ \
+		https://mesa.freedesktop.org/archive/${MESABASEVERSION}/ \
+		ftp://ftp.freedesktop.org/pub/mesa/ \
+		ftp://ftp.freedesktop.org/pub/mesa/${MESABASEVERSION}/
 
 DISTFILES=	mesa-${MESADISTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	x11@FreeBSD.org
 
 BUILD_DEPENDS+=	makedepend:devel/makedepend
 
 USES+=		compiler:c++11-lib bison gettext-tools gmake libtool \
 		localbase pathfix pkgconfig python:2,build shebangfix tar:xz
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-LDFLAGS+=	-Wl,-rpath=${LOCALBASE}/llvm${MESA_LLVM_VER}/lib
 
 PKGINSTALL=	${.CURDIR}/pkg-install
 PKGDEINSTALL=	${.CURDIR}/pkg-deinstall
 
 # only have one port to check with portscout.
 .if ${PORTNAME} != libGL
 PORTSCOUT=	ignore:1
 .endif
 
 python_OLD_CMD=	"/usr/bin/env[[:space:]]python"
 python_CMD=	${LOCALBASE}/bin/python2
 SHEBANG_FILES=	src/gallium/*/*/*.py src/gallium/tools/trace/*.py \
 		src/gallium/drivers/svga/svgadump/svga_dump.py \
 		src/mapi/glapi/gen/*.py
 SHEBANG_FILES+=	src/mapi/mapi_abi.py
 
 MASTERDIR=		${.CURDIR}/../../graphics/libGL
 PATCHDIR=		${MASTERDIR}/files
 WRKSRC=			${WRKDIR}/mesa-${MESADISTVERSION}
 DESCR=			${.CURDIR}/pkg-descr
 PLIST=			${.CURDIR}/pkg-plist
 INSTALL_TARGET=		install-strip
 
 COMPONENT=		${PORTNAME:tl:C/^lib//:C/mesa-//}
 
-MESA_LLVM_VER=39
+.if (${ARCH} != sparc64 && ${ARCH} != ia64)	# no working LLVM
+MESA_LLVM_VER?=	39
+LDFLAGS+=	-Wl,-rpath=${LOCALBASE}/llvm${MESA_LLVM_VER}/lib
+.endif
 
 CONFIGURE_ARGS+=	--with-sha1=libcrypto
 
 CONFIGURE_ARGS+=	--enable-gbm
 
 # There are issues that need to be fixed to use TLS model "initial-exec"
 # So stick with "global-dynamic"'s model for now. kan@ is working on a
 # patch for rtld. We might want to backport global-dynamic or
 # pthread_setspecific which it uses now by default. But since this
 # configure switch is going away ...
 # https://lists.freebsd.org/pipermail/freebsd-arch/2016-February/017699.html
-#CONFIGURE_ARGS+=	--enable-glx-tls
+CONFIGURE_ARGS+=	--disable-glx-tls
 
 # libEGL, dri and clover need gallium enabled.
 # the third option in --with-egl-platforms is wayland.
+.if (${MESA_LLVM_VER} != "")
 CONFIGURE_ARGS+=	--enable-egl --with-egl-platforms=x11,drm
+.else
+CONFIGURE_ARGS+=	--disable-egl
+.endif
 
 # we don't care about GLes v1
 CONFIGURE_ARGS+=	--disable-gles1 --enable-gles2
 
 # Clover (OpenCL).
 .if ${OPSYS} == DragonFly || \
 	(${OPSYS} == FreeBSD && \
 		(${ARCH} == amd64 || ${ARCH} == i386))
 
 BUILD_DEPENDS+=	libclc>=0.2.0.20160915:devel/libclc
 
 # We need the clang port too even if it is not used to compile because
 # Clover needs some of the clang includes to build.
 .if ${COMPONENT:Mdri} != "" || ${COMPONENT:Mclover} != "" || ${COMPONENT:Mosmesa} != ""
 _USES_pre_configure+=	290:clover-pre-configure
 
 # .if !exists() evaluates too early before cairo has a chance to be installed
 clover-pre-configure:
 	@if [ -e ${LOCALBASE}/bin/llvm-config${MESA_LLVM_VER} ] && \
 		! [ -e ${LOCALBASE}/bin/clang${MESA_LLVM_VER} ]; then \
 		${ECHO_MSG} "Your llvm${MESA_LLVM_VER} is not build with clang support, which is required."; \
 		${FALSE}; \
 	fi
 .endif
 
 CONFIGURE_ARGS+=	--enable-opencl --enable-opencl-icd
 .else
 CONFIGURE_ARGS+=	--disable-opencl
 .endif
 
-CONFIGURE_ARGS+=	--enable-osmesa
+CONFIGURE_ARGS+=	--enable-osmesa --enable-xvmc
 
 # gallium
+.if (${MESA_LLVM_VER} != "")
 BUILD_DEPENDS+= llvm${MESA_LLVM_VER}>=3.9.0_4:devel/llvm${MESA_LLVM_VER}
 .if ${COMPONENT:Mdri} != "" || ${COMPONENT:Mclover} != "" || ${COMPONENT:Megl} != ""
 RUN_DEPENDS+=   llvm${MESA_LLVM_VER}>=3.9.0_4:devel/llvm${MESA_LLVM_VER}
 .endif
 
 CONFIGURE_ENV+= LLVM_CONFIG=${LOCALBASE}/bin/llvm-config${MESA_LLVM_VER}
 
-CONFIGURE_ARGS+=--enable-gallium-llvm --enable-llvm-shared-libs \
-                --enable-xvmc
+CONFIGURE_ARGS+=	--enable-gallium-llvm --enable-llvm-shared-libs
+.else
+CONFIGURE_ARGS+=	--disable-gallium-llvm
+.endif
 
 .if ${PORT_OPTIONS:MTEXTURE}
 CONFIGURE_ARGS+=--enable-texture-float
 .endif
 
 # only support on DragonFly. FreeBSD's drm doesn't support it.
 .if ${OPSYS} == DragonFly && ${COMPONENT:Mdri} != ""
 CONFIGURE_ARGS+=--enable-vdpau
 LIB_DEPENDS+=   libvdpau.so:multimedia/libvdpau
 PLIST_SUB+=     VDPAU=""
 .else
 CONFIGURE_ARGS+=--disable-vdpau
 PLIST_SUB+=     VDPAU="@comment "
 .endif
 
 # VAAPI support?
 CONFIGURE_ARGS+=--disable-va
 
 ALL_DRI_DRIVERS=	I915 I965 RADEON R200 SWRAST
 ALL_GALLIUM_DRIVERS=	R300 R600 RADEONSI SVGA SWRAST
 
 .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
 GALLIUM_DRIVERS=	R300 R600 RADEONSI
 .endif
 
 # software rendering for all arches
 DRI_DRIVERS+=		SWRAST
 GALLIUM_DRIVERS+=	SWRAST
 
 .for _d in ${ALL_DRI_DRIVERS}
 . if ${DRI_DRIVERS:M${_d}}
 PLIST_SUB+=	${_d}_DRIVER=""
 . else
 PLIST_SUB+=	${_d}_DRIVER="@comment "
 . endif
 .endfor
 
 CONFIGURE_ARGS+=--with-dri-drivers="${DRI_DRIVERS:tl}"
 
 .for _gd in ${ALL_GALLIUM_DRIVERS}
 . if ${GALLIUM_DRIVERS:M${_gd}}
 PLIST_SUB+=	${_gd}_GDRIVER=""
 . else
 PLIST_SUB+=	${_gd}_GDRIVER="@comment "
 . endif
 .endfor
 
+.if (${MESA_LLVM_VER} != "")
 CONFIGURE_ARGS+=--with-gallium-drivers="${GALLIUM_DRIVERS:tl}"
+.endif
 
 .if ${OPSYS} == DragonFly
 LIB_DEPENDS+= libelf.so:devel/libelf
 .endif
 
Index: head/graphics/libGL/Makefile.targets
===================================================================
--- head/graphics/libGL/Makefile.targets	(revision 437214)
+++ head/graphics/libGL/Makefile.targets	(revision 437215)
@@ -1,54 +1,55 @@
 # $FreeBSD$
 #
 # this file holds common targets
 
 post-patch:
 .if ${OPSYS} == FreeBSD
-	@${REINPLACE_CMD} -e 's|x86_64|amd64|' \
+	@${REINPLACE_CMD} -e 's|x86_64|amd64|' -e 's|\\S\*//|[:space:]* //|' \
 		${WRKSRC}/configure
 # Clang 3.4 in 10.x on i386 fails with the following error when using "GCC atomics"
 #
 # glsl/cache.c:613:4: error: cannot compile this atomic library call yet
 #   p_atomic_add(cache->size, size); note: expanded from macro 'p_atomic_add'
 # define p_atomic_add(v, i) (void) __atomic_add_fetch((v), (i), __ATOMIC_ACQ_REL)
 #
 .if ${OSVERSION} < 1100000 && ${ARCH} == "i386"
 	@${REINPLACE_CMD} -e 's|-DUSE_GCC_ATOMIC_BUILTINS||' ${WRKSRC}/configure
 .endif
-.endif
-#	Sed on 9.x and dragonfly don't support \< or \>
-	@${REINPLACE_CMD} -e 's|\\>//|[[:>:]]//|' -e 's|\\S\*//|[:graph:]* //|' \
+.else # ${OPSYS} == DragonFly
+#	Sed on dragonfly doesn't support \< or \>
+	@${REINPLACE_CMD} -e 's|\\>//|[[:>:]]//|' -e 's|\\S\*//|[:space:]* //|' \
 		${WRKSRC}/configure
+.endif # ${OPSYS}
 	@${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' \
 		${WRKSRC}/src/mesa/drivers/dri/common/xmlconfig.c
 	@${REINPLACE_CMD} -e 's|#!/use/bin/python|#!${PYTHON_CMD}|g' \
 		${WRKSRC}/src/mesa/drivers/dri/common/xmlpool/gen_xmlpool.py
 	@${REINPLACE_CMD} -e 's|!/use/bin/python2|!${PYTHON_CMD}|g' \
 		${WRKSRC}/src/mesa/main/get_hash_generator.py \
 		${WRKSRC}/src/mapi/glapi/gen/gl_enums.py \
 		${WRKSRC}/src/mapi/glapi/gen/gl_table.py
 
 pre-build: mesa-pre-build
 
 #custom targets so we can build parts of Mesa
 mesa-pre-build:
 # do propper gmake target.
 	@cd ${WRKSRC}/src/mesa/drivers/dri/common/ && ${MAKE_CMD}
 	@cd ${WRKSRC}/src/loader && ${MAKE_CMD}
 # libloader.la
 
 .if defined(MESA_BUILD_WRKSRC)
 do-build:
 . for dir in ${MESA_BUILD_WRKSRC}
 	(cd ${WRKSRC}/${dir}; ${DO_MAKE_BUILD} ${ALL_TARGET};)
 . endfor
 .endif
 
 .if defined(MESA_INSTALL_WRKSRC)
 do-install:
 . for dir in ${MESA_INSTALL_WRKSRC}
 	(cd ${WRKSRC}/${dir} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
 		${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET})
 . endfor
 .endif
 
Index: head/graphics/libGL/distinfo
===================================================================
--- head/graphics/libGL/distinfo	(revision 437214)
+++ head/graphics/libGL/distinfo	(revision 437215)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1487852413
-SHA256 (mesa-13.0.5.tar.xz) = bfcea7e2c801525a60895c8aff11aa68457ee9aa35d01a4638e1f310a3f5ef87
-SIZE (mesa-13.0.5.tar.xz) = 9171480
+TIMESTAMP = 1490202594
+SHA256 (mesa-13.0.6.tar.xz) = 29ef104a7fc082d352b1599bd6cb1d040be424ccd22f5e0eb7ee9b0e9acd3597
+SIZE (mesa-13.0.6.tar.xz) = 9179236
Index: head/graphics/libglapi/Makefile
===================================================================
--- head/graphics/libglapi/Makefile	(revision 437214)
+++ head/graphics/libglapi/Makefile	(revision 437215)
@@ -1,36 +1,36 @@
 # Created by: kwm@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	libglapi
 PORTVERSION=	${MESAVERSION}
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	graphics
 
 COMMENT=	Common GL api library used by Mesa based ports
 
 LICENSE=	MIT
 
 BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:devel/libpthread-stubs
 
 USE_XORG=	x11 xau xcb xdmcp xvmc
 
 # stuff not needed by libglapi but configure wants it
 USE_XORG+=	dri2proto dri3proto glproto presentproto xdamage xext xfixes \
 		xshmfence
 LIB_DEPENDS+=	libexpat.so:textproc/expat2 \
 		libdrm.so:graphics/libdrm
 
 .include <bsd.port.options.mk>
 .include "${.CURDIR}/../../graphics/libGL/Makefile.common"
 
 MESA_BUILD_WRKSRC=	src/mapi
 MESA_INSTALL_WRKSRC=	src/mapi
 
 .include "${.CURDIR}/../../graphics/libGL/Makefile.targets"
 
 post-install:
 	@${RM} -r ${STAGEDIR}${PREFIX}/include/GLES*
 	@${RM} ${STAGEDIR}${PREFIX}/lib/libGLESv2.so*
 	@${RM} ${STAGEDIR}${PREFIX}/libdata/pkgconfig/glesv2.pc
 
 .include <bsd.port.mk>