Index: graphics/dri/pkg-plist
===================================================================
--- graphics/dri/pkg-plist	(revision 1253)
+++ graphics/dri/pkg-plist	(working copy)
@@ -1,14 +1,11 @@
 %%NEW%%%%I965_DRIVER%%etc/drirc
 include/GL/internal/dri_interface.h
 %%OLD%%%%I810_DRIVER%%lib/dri/i810_dri.so
-%%NEW%%%%I915_DRIVER%%lib/dri/i915_dri.la
 %%I915_DRIVER%%lib/dri/i915_dri.so
-%%NEW%%%%I965_DRIVER%%lib/dri/i965_dri.la
 %%I965_DRIVER%%lib/dri/i965_dri.so
 %%OLD%%%%MACH64_DRIVER%%lib/dri/mach64_dri.so
 %%OLD%%%%MGA_DRIVER%%lib/dri/mga_dri.so
 %%OLD%%%%R128_DRIVER%%lib/dri/r128_dri.so
-%%NEW%%%%R200_DRIVER%%lib/dri/r200_dri.la
 %%R200_DRIVER%%lib/dri/r200_dri.so
 %%OLD%%%%R300_DRIVER%%lib/dri/r300_dri.so
 %%NEW%%%%GALLIUM%%lib/dri/r300_dri.la
@@ -16,7 +13,6 @@
 %%OLD%%%%R600_DRIVER%%lib/dri/r600_dri.so
 %%NEW%%%%GALLIUM%%lib/dri/r600_dri.la
 %%NEW%%%%GALLIUM%%lib/dri/r600_dri.so
-%%NEW%%%%RADEON_DRIVER%%lib/dri/radeon_dri.la
 %%RADEON_DRIVER%%lib/dri/radeon_dri.so
 %%NEW%%%%GALLIUM%%lib/dri/radeonsi_dri.la
 %%NEW%%%%GALLIUM%%lib/dri/radeonsi_dri.so
@@ -28,18 +24,9 @@
 %%OLD%%%%UNICHROME_DRIVER%%lib/dri/unichrome_dri.so
 %%NEW%%%%GALLIUM%%lib/dri/vmwgfx_dri.la
 %%NEW%%%%GALLIUM%%lib/dri/vmwgfx_dri.so
-%%NEW%%%%GALLIUM%%lib/libXvMCr300.la
-%%NEW%%%%GALLIUM%%lib/libXvMCr300.so
-%%NEW%%%%GALLIUM%%lib/libXvMCr300.so.1
 %%NEW%%%%GALLIUM%%lib/libXvMCr600.la
 %%NEW%%%%GALLIUM%%lib/libXvMCr600.so
 %%NEW%%%%GALLIUM%%lib/libXvMCr600.so.1
-%%NEW%%%%GALLIUM%%lib/libXvMCsoftpipe.la
-%%NEW%%%%GALLIUM%%lib/libXvMCsoftpipe.so
-%%NEW%%%%GALLIUM%%lib/libXvMCsoftpipe.so.1
-%%NEW%%lib/libdricore%%VERSION%%.la
-%%NEW%%lib/libdricore%%VERSION%%.so
-%%NEW%%lib/libdricore%%VERSION%%.so.1
 libdata/pkgconfig/dri.pc
 @dirrm lib/dri
 @dirrmtry include/GL/internal
Index: graphics/libGL/bsd.mesalib.mk
===================================================================
--- graphics/libGL/bsd.mesalib.mk	(revision 1253)
+++ graphics/libGL/bsd.mesalib.mk	(working copy)
@@ -17,10 +17,14 @@
 MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/}
 
 .if defined(WITH_NEW_XORG)
-MESABASEVERSION=	9.2.3
-# if there is a subversion, include the '-' between 7.11-rc2 for example.
-MESASUBVERSION=	
+MESABASEVERSION=	10.0.0
+# if there is a subversion, don't include the '-' between 7.11-rc2.
+MESASUBVERSION=	rc1
 PLIST_SUB+=	OLD="@comment " NEW=""
+
+# work around libarchive bug?
+EXTRACT_CMD=${LOCALBASE}/bin/gtar
+BUILD_DEPENDS+=	gtar:${PORTSDIR}/archivers/gtar
 .else
 MESABASEVERSION=	7.6.1
 MESASUBVERSION=		
@@ -27,7 +31,7 @@
 PLIST_SUB+=	OLD="" NEW="@comment "
 .endif
 
-MASTER_SITES=	ftp://ftp.freedesktop.org/pub/mesa/${MESABASEVERSION:S/9.2.0/9.2/}/
+MASTER_SITES=	ftp://ftp.freedesktop.org/pub/mesa/${MESABASEVERSION:S/9.2.0/9.2/:S/10.0.0/10.0/}/
 DISTFILES=	MesaLib-${MESADISTVERSION}${EXTRACT_SUFX}
 MAINTAINER?=	x11@FreeBSD.org
 
@@ -61,8 +65,7 @@
 		${PATCHDIR}/patch-src_mapi_es2api_Makefile.in \
 		${PATCHDIR}/patch-src_mapi_shared-glapi_Makefile.in \
 		${PATCHDIR}/patch-src_mesa_drivers_dri_common_Makefile.in \
-		${PATCHDIR}/patch-src_mesa_drivers_dri_common_xmlpool_Makefile.in \
-		${PATCHDIR}/patch-src_mesa_libdricore_Makefile.in
+		${PATCHDIR}/patch-src_mesa_drivers_dri_common_xmlpool_Makefile.in
 
 python_OLD_CMD=	"/usr/bin/env[[:space:]]python"
 python_CMD=	${LOCALBASE}/bin/python2
@@ -127,8 +130,7 @@
 		${WRKSRC}/src/mesa/drivers/dri/Makefile
 .else
 	@${REINPLACE_CMD} -e 's|#!/use/bin/python|#!${LOCALBASE}/bin/python2|g' \
-		${WRKSRC}/src/mesa/drivers/dri/common/xmlpool/gen_xmlpool.py \
-		${WRKSRC}/src/glsl/builtins/tools/*.py
+		${WRKSRC}/src/mesa/drivers/dri/common/xmlpool/gen_xmlpool.py
 	@${REINPLACE_CMD} -e 's|!/use/bin/python2|!${LOCALBASE}/bin/python2|g' \
 		${WRKSRC}/src/mesa/main/get_hash_generator.py \
 		${WRKSRC}/src/mapi/glapi/gen/gl_enums.py \
Index: graphics/libGL/distinfo
===================================================================
--- graphics/libGL/distinfo	(revision 1253)
+++ graphics/libGL/distinfo	(working copy)
@@ -1,4 +1,2 @@
-SHA256 (MesaLib-7.6.1.tar.bz2) = 701f0e4cb85d6298181651b780d1c0a439fadd02aad29ee6623fc05588bb8d44
-SIZE (MesaLib-7.6.1.tar.bz2) = 4886995
-SHA256 (MesaLib-9.2.3.tar.bz2) = e06d4c0d9f93391be7944e5f063fc70226a273a797934ff6602ee6cd5719175d
-SIZE (MesaLib-9.2.3.tar.bz2) = 6665764
+SHA256 (MesaLib-10.0.0-rc1.tar.bz2) = ab9b5763708b27b2dd0d12ab605c28995851f7df041e7f8738d8afa74a413ccc
+SIZE (MesaLib-10.0.0-rc1.tar.bz2) = 6725918
Index: graphics/libGL/files/patch-src_mapi_glapi_gen_gl-gentable.py
===================================================================
--- graphics/libGL/files/patch-src_mapi_glapi_gen_gl-gentable.py	(revision 1253)
+++ graphics/libGL/files/patch-src_mapi_glapi_gen_gl-gentable.py	(working copy)
@@ -1,11 +1,11 @@
---- src/mapi/glapi/gen/gl_gentable.py.orig	2013-08-14 03:34:42.000000000 +0200
-+++ src/mapi/glapi/gen/gl_gentable.py	2013-08-20 18:03:41.000000000 +0200
+--- src/mapi/glapi/gen/gl_gentable.py.orig	2013-11-19 22:05:23.000000000 +0100
++++ src/mapi/glapi/gen/gl_gentable.py	2013-11-19 22:06:41.000000000 +0100
 @@ -42,7 +42,7 @@
  #endif
  
  #if (defined(GLXEXT) && defined(HAVE_BACKTRACE)) \\
--	|| (!defined(GLXEXT) && defined(DEBUG) && !defined(_WIN32_WCE) && !defined(__CYGWIN__) && !defined(__MINGW32__) && !defined(__OpenBSD__))
-+	|| (!defined(GLXEXT) && defined(DEBUG) && !defined(_WIN32_WCE) && !defined(__CYGWIN__) && !defined(__MINGW32__) && !defined(__OpenBSD__) && !defined(__FreeBSD__))
+-	|| (!defined(GLXEXT) && defined(DEBUG) && !defined(_WIN32_WCE) && !defined(__CYGWIN__) && !defined(__MINGW32__) && !defined(__OpenBSD__) && !defined(__NetBSD__))
++	|| (!defined(GLXEXT) && defined(DEBUG) && !defined(_WIN32_WCE) && !defined(__CYGWIN__) && !defined(__MINGW32__) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__FreeBSD__))
  #define USE_BACKTRACE
  #endif
  
Index: graphics/libGL/files/patch-src_mesa_libdricore_Makefile.in
===================================================================
--- graphics/libGL/files/patch-src_mesa_libdricore_Makefile.in	(revision 1253)
+++ graphics/libGL/files/patch-src_mesa_libdricore_Makefile.in	(working copy)
@@ -1,19 +0,0 @@
---- src/mesa/libdricore/Makefile.in.orig	2013-06-27 00:21:26.000000000 +0200
-+++ src/mesa/libdricore/Makefile.in	2013-06-27 00:28:29.000000000 +0200
-@@ -3950,8 +4000,14 @@
- # a while by putting a link to the driver into /lib of the build tree.
- @HAVE_DRI_TRUE@all-local: libdricore@VERSION@.la
- @HAVE_DRI_TRUE@	$(MKDIR_P) $(top_builddir)/$(LIB_DIR);
--@HAVE_DRI_TRUE@	ln -f .libs/libdricore@VERSION@.so.1.0.0 $(top_builddir)/$(LIB_DIR)/libdricore@VERSION@.so.1;
--@HAVE_DRI_TRUE@	ln -sf libdricore@VERSION@.so.1 $(top_builddir)/$(LIB_DIR)/libdricore@VERSION@.so
-+@HAVE_DRI_TRUE@	base=$(basename $<);					\
-+@HAVE_DRI_TRUE@	dlname=$$(grep dlname= .libs/$< | cut -d "'" -f 2);	\
-+@HAVE_DRI_TRUE@	ver=$$(grep current= .libs/$< | cut -d "=" -f 2);	\
-+@HAVE_DRI_TRUE@	ln -f .libs/$$dlname $(top_builddir)/$(LIB_DIR)/$$dlname; \
-+@HAVE_DRI_TRUE@	if [ ! -f $(top_builddir)/$(LIB_DIR)/$$base.so.$$ver ]; then \
-+@HAVE_DRI_TRUE@	  ln -sf $$dlname $(top_builddir)/$(LIB_DIR)/$$base.so.$$ver; \
-+@HAVE_DRI_TRUE@	fi;							\
-+@HAVE_DRI_TRUE@	ln -sf $$base.so.$$ver $(top_builddir)/$(LIB_DIR)/$$base.so
- 
- -include $(DEPENDS)
-