upgrade to MesaLib-7.11.2

author: richard <richard@pkgsrc.org> 2013-05-16 05:22:02 +0000
committer: richard <richard@pkgsrc.org> 2013-05-16 05:22:02 +0000
commit: 53523cefe4b3c3623d86a3be7a75b062dfc9c80d (patch)
tree: a9ab59272c2f6b0cbb8397af320167dcbd235f03 /graphics
parent: 9a92a3b230e369a619ed3910ac4eb3266a2cef94 (diff)
download: pkgsrc-53523cefe4b3c3623d86a3be7a75b062dfc9c80d.tar.gz
63 files changed, 711 insertions, 1244 deletions
diff --git a/graphics/MesaLib/Makefile b/graphics/MesaLib/Makefile
index 4e65def2cea..d7af7bb9a75 100644
--- a/graphics/MesaLib/Makefile
+++ b/graphics/MesaLib/Makefile
@@ -1,26 +1,20 @@
-# $NetBSD: Makefile,v 1.90 2012/10/06 14:10:40 asau Exp $
+# $NetBSD: Makefile,v 1.91 2013/05/16 05:22:02 richard Exp $
 
 PKGNAME=	MesaLib-${MESA_PKGVERSION}
-PKGREVISION=	6
 COMMENT=	Graphics library similar to SGI's OpenGL
 
 CONFLICTS+=	xf86driproto<2.0.4
 
-MESA_HEADERS=	gl.h gl_mangle.h glext.h glx.h glxext.h	\
-		glx_mangle.h osmesa.h xmesa.h xmesa_x.h	\
- 		xmesa_xf86.h
-
-MESA_HEADERS+=	internal/dri_interface.h internal/sarea.h
-
-BUILD_DEFS+=		MESA_HZ
 PLIST_VARS=		dri nodri
 
 PKGCONFIG_OVERRIDE+=	src/mesa/drivers/dri/dri.pc.in
 PKGCONFIG_OVERRIDE+=	src/mesa/gl.pc.in
 PKGCONFIG_OVERRIDE+=	src/mesa/osmesa.pc.in
 PKGCONFIG_OVERRIDE+=	src/glw/glw.pc.in
-# no configure stage
-PKGCONFIG_OVERRIDE_STAGE=	pre-build
+
+CONFIGURE_ARGS+=        --disable-glu
+CONFIGURE_ARGS+=        --disable-glut
+CONFIGURE_ARGS+=        --disable-motif
 
 .include "glx-config.mk"
 .include "../../graphics/Mesa/Makefile.lib"
@@ -55,21 +49,19 @@ MAKE_ENV+=		PTHREAD_STUBLIB=${PTHREAD_STUBLIB:Q}
 MAKE_ENV+=	CROSS_COMPILING=yes
 .endif
 
-RM_PATCH_BACKUP_DIRS=	docs src/mesa src/glut/glx \
-			progs/demos progs/xdemos progs/glsl
 post-extract:
+.if !empty(PKG_OPTIONS:Mdri) && (${OPSYS} == "SunOS")
+	${CP} ${FILESDIR}/mapfile.externs ${WRKSRC}/src/mesa/drivers/dri/
+.endif
 	${CP} ${FILESDIR}/gen_matypes.awk ${WRKSRC}/src/mesa/x86
 	${CP} ${FILESDIR}/gen_matypes.sh ${WRKSRC}/src/mesa/x86
 	${CHMOD} a+x ${WRKSRC}/src/mesa/x86/gen_matypes.sh
-	for fn in ${RM_PATCH_BACKUP_DIRS}; do \
-		${RM} -f ${WRKSRC}/$${fn}/*.orig; \
-	done
 
+#
+# remove include files installed respectively by ../glu and ../glut
+#
 pre-install:
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include/GL/internal
-
-pre-build:
-	cd ${WRKSRC} && ${RM} -fr src/glu src/glut progs
+	${RM} -f ${WRKSRC}/include/GL/glu*.h
 
 .include "../../mk/compiler.mk"
 
@@ -77,6 +69,4 @@ pre-build:
 CFLAGS+=	-no-integrated-as -fvisibility=hidden
 .endif
 
-# no configure phase
-.include "../../mk/configure/pkg-config-override.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/MesaLib/PLIST b/graphics/MesaLib/PLIST
index 0bbf5984e4a..1c5a0824032 100644
--- a/graphics/MesaLib/PLIST
+++ b/graphics/MesaLib/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.24 2009/06/19 18:19:15 hasso Exp $
+@comment $NetBSD: PLIST,v 1.25 2013/05/16 05:22:02 richard Exp $
 include/GL/GLwDrawA.h
 include/GL/GLwDrawAP.h
 include/GL/GLwMDrawA.h
@@ -6,29 +6,39 @@ include/GL/GLwMDrawAP.h
 include/GL/gl.h
 include/GL/gl_mangle.h
 include/GL/glext.h
+include/GL/glfbdev.h
 include/GL/glx.h
 include/GL/glx_mangle.h
 include/GL/glxext.h
 include/GL/internal/dri_interface.h
-include/GL/internal/sarea.h
+include/GL/mesa_wgl.h
 include/GL/osmesa.h
-lib/libGL.la
-lib/libGLw.la
-${PLIST.nodri}lib/libOSMesa.la
-${PLIST.dri}lib/dri/i810_dri.la
-${PLIST.dri}lib/dri/i915_dri.la
-${PLIST.dri}lib/dri/i965_dri.la
-${PLIST.dri}lib/dri/mach64_dri.la
-${PLIST.dri}lib/dri/mga_dri.la
-${PLIST.dri}lib/dri/r128_dri.la
-${PLIST.dri}lib/dri/r200_dri.la
-${PLIST.dri}lib/dri/r300_dri.la
-${PLIST.dri}lib/dri/radeon_dri.la
-${PLIST.dri}lib/dri/savage_dri.la
-${PLIST.dri}lib/dri/sis_dri.la
-${PLIST.dri}lib/dri/swrast_dri.la
-${PLIST.dri}lib/dri/tdfx_dri.la
-${PLIST.dri}lib/dri/unichrome_dri.la
+include/GL/vms_x_fix.h
+include/GL/wglext.h
+include/GL/wmesa.h
+lib/libGL.so
+lib/libGL.so.1
+lib/libGL.so.1.2
+lib/libGLw.so
+lib/libGLw.so.1
+lib/libGLw.so.1.0.0
+${PLIST.nodri}lib/libOSMesa.so
+${PLIST.nodri}lib/libOSMesa.so.7
+${PLIST.dri}lib/dri/i810_dri.so
+${PLIST.dri}lib/dri/i915_dri.so
+${PLIST.dri}lib/dri/i965_dri.so
+${PLIST.dri}lib/dri/mach64_dri.so
+${PLIST.dri}lib/dri/mga_dri.so
+${PLIST.dri}lib/dri/r128_dri.so
+${PLIST.dri}lib/dri/r200_dri.so
+${PLIST.dri}lib/dri/r300_dri.so
+${PLIST.dri}lib/dri/r600_dri.so
+${PLIST.dri}lib/dri/radeon_dri.so
+${PLIST.dri}lib/dri/savage_dri.so
+${PLIST.dri}lib/dri/sis_dri.so
+${PLIST.dri}lib/dri/swrast_dri.so
+${PLIST.dri}lib/dri/tdfx_dri.so
+${PLIST.dri}lib/dri/unichrome_dri.so
 ${PLIST.dri}lib/pkgconfig/dri.pc
 lib/pkgconfig/gl.pc
 lib/pkgconfig/glw.pc
diff --git a/graphics/MesaLib/TODO b/graphics/MesaLib/TODO
index 9991ce233e7..2977979908a 100644
--- a/graphics/MesaLib/TODO
+++ b/graphics/MesaLib/TODO
@@ -1,4 +1,4 @@
- $NetBSD: TODO,v 1.2 2008/07/18 01:54:23 bjs Exp $
+ $NetBSD: TODO,v 1.3 2013/05/16 05:22:02 richard Exp $
 
  Here is a [possibly non-exhaustive] list of issues to resolve prior 
  to the next quarterly freeze:
@@ -14,18 +14,15 @@
    assume the entire world conforms to the behavior of (recent?) Linux 
    "distros".
 
- - Check to see if HZ is actually used anywhere.  Cursory grepping
-   of the code found nothing.
-
- - Once we settle on which build-time configuration variables we will
-   use, document them and/or add them to mk/defaults/mk.conf.
-
- - The xcb (X C Bindings, not X Cut Buffer, heh) support is currently 
-   disabled.
+ - I have not packaged the new MesaDemos yet due to lack of time.
 
- - The pkg-config files are not generated with any dependency information.
-   I'm not sure that anything in pkgsrc currently uses these, though.
+ - verify and update BUILDLINK_API_DEPENDS
 
- - I have not packaged the new MesaDemos yet due to lack of time.
+ - the following platforms are dealt with in PLIST for the libGL.so and 
+   libGLw.so: 'Linux' | 'OpenBSD' | 'DragonFly' | 'GNU' | GNU/* | 'NetBSD'
+   and 'SunOS'.  Any other platforms may need to have a look in
+   ${WRKSRC}/bin/mklib and perhaps notice how SunOS was updated via the
+   patchfile patch-bin_mklib.
 
    --bjs
+   and updated by richard
diff --git a/graphics/MesaLib/buildlink3.mk b/graphics/MesaLib/buildlink3.mk
index 1b9ad3ac2c7..9ba0724a52e 100644
--- a/graphics/MesaLib/buildlink3.mk
+++ b/graphics/MesaLib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.50 2013/04/19 13:42:37 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.51 2013/05/16 05:22:02 richard Exp $
 
 BUILDLINK_TREE+=	MesaLib
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	MesaLib
 MESALIB_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.MesaLib+=	MesaLib>=3.4.2
-BUILDLINK_ABI_DEPENDS.MesaLib+=	MesaLib>=7.0.3
+BUILDLINK_ABI_DEPENDS.MesaLib+=	MesaLib>=7.11.2
 BUILDLINK_PKGSRCDIR.MesaLib?=	../../graphics/MesaLib
 
 .include "../../mk/bsd.fast.prefs.mk"
diff --git a/graphics/MesaLib/distinfo b/graphics/MesaLib/distinfo
index 51b1e1c210b..c64c89c3be4 100644
--- a/graphics/MesaLib/distinfo
+++ b/graphics/MesaLib/distinfo
@@ -1,37 +1,29 @@
-$NetBSD: distinfo,v 1.73 2012/09/12 14:12:28 dsainty Exp $
+$NetBSD: distinfo,v 1.74 2013/05/16 05:22:02 richard Exp $
 
-SHA1 (Mesa-7.4.4/MesaDemos-7.4.4.tar.bz2) = 190b51dd1e456f12c70cd428ec47ca8de0ed72fe
-RMD160 (Mesa-7.4.4/MesaDemos-7.4.4.tar.bz2) = 492850ff48aa54d35f1acdd09ac90e61a9d93bc1
-Size (Mesa-7.4.4/MesaDemos-7.4.4.tar.bz2) = 1367659 bytes
-SHA1 (Mesa-7.4.4/MesaGLUT-7.4.4.tar.bz2) = 41635a1c5b3bfe4bff4f9a086fb0b17fd441c431
-RMD160 (Mesa-7.4.4/MesaGLUT-7.4.4.tar.bz2) = 33a9e1a7b014d284ea4ec785c1912baccc5b2176
-Size (Mesa-7.4.4/MesaGLUT-7.4.4.tar.bz2) = 328900 bytes
-SHA1 (Mesa-7.4.4/MesaLib-7.4.4.tar.bz2) = 1cdcef24900489bc0a879013b2138c0d9aedffe3
-RMD160 (Mesa-7.4.4/MesaLib-7.4.4.tar.bz2) = 9c9a5e8b7f8d2fd175cc8542e2aecf48edf8c084
-Size (Mesa-7.4.4/MesaLib-7.4.4.tar.bz2) = 3375615 bytes
-SHA1 (patch-aa) = e1ccbfd075b644b84af23d0185aa92263fe848c6
-SHA1 (patch-ab) = 97ad742b8c766d151da2cafc86f26342f4ea6d16
-SHA1 (patch-ac) = ed3ec49ea2aacf231bbcb38093f3dc01a0cb2468
-SHA1 (patch-ad) = 080413cbdc2ed7484cc2fff25f00bc53dca3a393
-SHA1 (patch-ae) = 07cf84391b4e828b558129eb90daaeb48e43e1ab
+SHA1 (Mesa-7.11.2/MesaGLUT-7.11.2.tar.bz2) = 2e6e730204800a0748b301a5f58b86332699788b
+RMD160 (Mesa-7.11.2/MesaGLUT-7.11.2.tar.bz2) = bb2b140375aa13df79fcdb60a7ad0a63622dc531
+Size (Mesa-7.11.2/MesaGLUT-7.11.2.tar.bz2) = 201575 bytes
+SHA1 (Mesa-7.11.2/MesaLib-7.11.2.tar.bz2) = 5981ac2de8438e5f4a1f3561f2044d700c5f0de9
+RMD160 (Mesa-7.11.2/MesaLib-7.11.2.tar.bz2) = 656ded1db6c1f6fdd15a3f2cdee1b895d393bcea
+Size (Mesa-7.11.2/MesaLib-7.11.2.tar.bz2) = 6257280 bytes
 SHA1 (patch-af) = da0bd412b81d4b826b6d9b4bb8d98ca1fe0006ba
-SHA1 (patch-ag) = da4de00aaebf226489ca3f5c25470fe3ed41e3b7
-SHA1 (patch-ah) = 2ecaee79c6b139272ef247d97d2a9f5834550a9f
-SHA1 (patch-ai) = 620c80ffbca1249469138f0af28eec575c546b87
-SHA1 (patch-aj) = 3749b279b500b1a93e45985ae956e8a70d854d9c
-SHA1 (patch-ak) = d991d27d0ef5f3a4d98dbddfd973a3ff752745d4
-SHA1 (patch-al) = 0970dfcc87f464df6ab979a272aeac3d7f869388
-SHA1 (patch-am) = 744f13b6a2fc79746bcacecf11461e78de7bf1ef
-SHA1 (patch-an) = ff03138906ab51c88007f11fdcf1765778b8d5f8
-SHA1 (patch-aq) = 0e6099b0d23f5931b5d6ee80debc2231f9a58de5
-SHA1 (patch-at) = a6ec9a663b8d1634ae20216fc3e6a0b52220e905
-SHA1 (patch-au) = 6ce0d6236e5fb9f53db3bcb388b328ab0e132907
-SHA1 (patch-av) = 5b03aeed0c4a9405be77f08cb0b1e56e544f7ef7
-SHA1 (patch-aw) = c6f0f499587346a3f270b37b497a0b3b1e3f79f3
-SHA1 (patch-ax) = 9a1c488526ba1a7a0cdd0f34c85861edcd5976e3
-SHA1 (patch-ay) = 8a5eb2d874026032f9b9c15e06abb40863a21a8a
-SHA1 (patch-ba) = 44e258235ac949713c4fcead25cb7ab7498cbb7f
-SHA1 (patch-bb) = 4fd8a770bd0275c3467447f77f51e957996c93ac
-SHA1 (patch-be) = 28caa14529347138ff1a86fa64964fe253989cb5
-SHA1 (patch-cb) = 83789d71de41aed2ba81a8239fb035a4cd295477
-SHA1 (patch-cc) = 737d8b474b1c296f3ceb4de515dd385aae072394
+SHA1 (patch-bin_mklib) = 152b61d40d2e24cf3674d346e94fcab04b850909
+SHA1 (patch-configure.ac) = 0e3f9a1f21ba3a50161312683e9a0ad36f9f3e61
+SHA1 (patch-src_gallium_include_pipe_p__config.h) = 5ddb2d95c7e951ad88bd14fd8b257b1f1dfac34f
+SHA1 (patch-src_glu_sgi_glu.exports) = 66609d2ea59b02fc46b41311b0042fe4a2da517f
+SHA1 (patch-src_mesa_drivers_dri_common_dri__util.h) = 53e63dcc6243b1872f4e4816b46e92910cf97edc
+SHA1 (patch-src_mesa_drivers_dri_common_mmio.h) = b6da48111fb2792b1c71eb7549d0f03adceec9f1
+SHA1 (patch-src_mesa_drivers_dri_i915_intel__batchbuffer.c) = fec8b1a9f6888e9a4225861ea5bda776ecc5f054
+SHA1 (patch-src_mesa_drivers_dri_i915_intel__tris.c) = 74a2ca9f9c865db9b6212087e442f65bb0621227
+SHA1 (patch-src_mesa_drivers_dri_i965_brw__draw.c) = ce12dc2d2391300d32776a06f5d0096448019c6b
+SHA1 (patch-src_mesa_drivers_dri_i965_brw__draw__upload.c) = 44162ca546072669b85093981728e635dda69e55
+SHA1 (patch-src_mesa_drivers_dri_i965_brw__misc__state.c) = d37f967dea0fc3bd32566d6a26fd434ca9564081
+SHA1 (patch-src_mesa_drivers_dri_i965_gen6__vs__state.c) = c918b5a91b339e49850d718c957d7e717c2dc130
+SHA1 (patch-src_mesa_drivers_dri_i965_gen6__wm__state.c) = a8ecf943525888b22ec99fe454b08f43c5d8a911
+SHA1 (patch-src_mesa_drivers_dri_i965_intel__batchbuffer.c) = 653c87e1123ce9a27b71221fff4119df34abe15f
+SHA1 (patch-src_mesa_drivers_dri_intel_intel__context.c) = 21d3c08a27817a6358b88101f889120869eebcce
+SHA1 (patch-src_mesa_drivers_dri_intel_intel__context.h) = 6d394e704636134768a6cb5a200ebcc7bc3f52ed
+SHA1 (patch-src_mesa_drivers_dri_mach64_mach64__context.h) = aef722152a5b892da62caf94cc8da7806da10859
+SHA1 (patch-src_mesa_main_compiler.h) = 4150ca7ed49a928515b7b25e1166b38090356e12
+SHA1 (patch-src_mesa_main_imports.c) = d0c50004c749e4c5c136ac2ed50a6989ca90065f
+SHA1 (patch-src_mesa_main_imports.h) = f5a96195b3a14294ca3389c9fe17a6076c46db8a
diff --git a/graphics/MesaLib/files/configs/default b/graphics/MesaLib/files/configs/default
deleted file mode 100644
index c1cddb39b42..00000000000
--- a/graphics/MesaLib/files/configs/default
+++ /dev/null
@@ -1,64 +0,0 @@
-# $NetBSD: default,v 1.4 2009/08/25 05:27:57 hasso Exp $
-
-CONFIG_NAME = default
-
-# Version info
-MESA_MAJOR=	7
-MESA_MINOR=	4
-MESA_TINY=	4
-
-GLU_CFLAGS=	# defined
-
-MKLIB_OPTIONS=
-MKDEP?=	makedepend
-MKDEP_OPTIONS?=	-fdepend
-INSTALL?=	$(TOP)/bin/minstall
-
-# Python and flags (generally only needed by the developers)
-PYTHON2=	$(PYTHONBIN)
-PYTHON_FLAGS=	-t -O -O
-
-GL_LIB=		GL
-GLU_LIB=	GLU
-GLUT_LIB=	glut
-GLW_LIB=	GLw
-OSMESA_LIB=	OSMesa
-
-GL_LIB_NAME?=		lib$(GL_LIB).so
-GLU_LIB_NAME?=		lib$(GLU_LIB).so
-GLUT_LIB_NAME?=		lib$(GLUT_LIB).so
-GLW_LIB_NAME?=		lib$(GLW_LIB).so
-OSMESA_LIB_NAME?=	lib$(OSMESA_LIB).so
-
-ASM_SOURCES?=	# defined
-GLW_SOURCES?=	GLwDrawA.c
-
-LIB_DIR=	lib
-SRC_DIRS=	mesa glu glut/glx glw
-GLU_DIRS=	sgi
-DRIVER_DIRS=	x11 osmesa
-PROGRAM_DIRS=	demos redbook samples glsl xdemos
-
-EXTRA_LIB_PATH?=	# defined
-GL_LIB_DEPS=\
-	$(EXTRA_LIB_PATH) -lX11 -lXext -lm $(PTHREAD_STUBLIB)
-OSMESA_LIB_DEPS=\
-	-L$(TOP)/$(LIB_DIR) -l$(GL_LIB)
-GLU_LIB_DEPS=\
-	-L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm
-GLUT_LIB_DEPS=\
-	-L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) \
-	$(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lm
-GLW_LIB_DEPS=\
-	-L$(TOP)/$(LIB_DIR) -l$(GL_LIB)  \
-	 $(EXTRA_LIB_PATH) -lXt -lX11
-APP_LIB_DEPS=\
-	 -lm
-
-INSTALL_DIR?= $(PREFIX)
-INSTALL_LIB_DIR = $(INSTALL_DIR)/$(LIB_DIR)
-INSTALL_INC_DIR = $(INSTALL_DIR)/include
-
-DRI_DRIVER_INSTALL_DIR?= $(PREFIX)/lib/dri
-
-DRI_DRIVER_SEARCH_DIR?=  $(LOCALBASE)/lib/dri
diff --git a/graphics/MesaLib/files/configs/interix3 b/graphics/MesaLib/files/configs/interix3
deleted file mode 100644
index 16a4566aad6..00000000000
--- a/graphics/MesaLib/files/configs/interix3
+++ /dev/null
@@ -1,12 +0,0 @@
-# $NetBSD: interix3,v 1.1 2008/04/24 07:40:24 bjs Exp $
-#
-# Configuration for Interix 3.x
-
-include $(TOP)/configs/default
-
-CONFIG_NAME = pkgsrc
-
-# Compiler and flags
-CFLAGS+= -DUSE_XSHM_HDRONLY -DPTHREADS
-APP_LIB_DEPS = -L$(LIB_DIR) -L${PREFIX}/lib -L${X11PREFIX}/lib -lXext -lXmu -lXi -lX11 -lm
-
diff --git a/graphics/MesaLib/files/configs/pkgsrc b/graphics/MesaLib/files/configs/pkgsrc
deleted file mode 100644
index 17ad444db68..00000000000
--- a/graphics/MesaLib/files/configs/pkgsrc
+++ /dev/null
@@ -1,36 +0,0 @@
-# $NetBSD: pkgsrc,v 1.2 2008/07/27 00:03:42 bjs Exp $
-
-include $(TOP)/configs/default
-
-ifeq ($(USE_XCB), yes)
-include $(TOP)/configs/xcb-defs
-endif
-
-CONFIG_NAME=	pkgsrc
-
-DEFINES=	-DPTHREADS -DUSE_XSHM -DHZ=$(MESA_HZ) $(XCB_DEFS)
-X11_INCLUDES=	-I$(X11BASE)/include $(XCB_X11_INCLUDES)
-
-CFLAGS+=	$(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) \
-		$(DEFINES) $(X11_INCLUDES)
-CXXFLAGS+=	$(WARN_FLAGS) $(OPT_FLAGS) $(PIC_FLAGS) \
-		$(DEFINES) $(X11_INCLUDES)
-
-LIBTOOL?=	libtool
-
-GLUT_CFLAGS=	-fexceptions # XXX gcc
-GL_LIB_DEPS=\
-	$(EXTRA_LIB_PATH) -lX11 $(XCB_GL_LIB_DEPS) -lXext -lm $(PTHREAD_STUBLIB)
-OSMESA_LIB_DEPS=\
-	$(TOP)/$(LIB_DIR)/lib$(GL_LIB).la
-GLU_LIB_DEPS=\
-	-lGL -lm
-GLUT_LIB_DEPS=\
-	-lGLU -lGL -lX11 -lXmu -lXt -lXi -lm
-GLW_LIB_DEPS=\
-	$(TOP)/$(LIB_DIR)/lib$(GL_LIB).la -lXt -lX11
-
-APP_LIB_DEPS=	-lGL -lGLU -lglut -lXext -lXmu -lXi -lX11 -lm
-
-SRC_DIRS=	mesa glw glu glut/glx
-DRIVER_DIRS=	x11 osmesa
diff --git a/graphics/MesaLib/files/configs/pkgsrc-dri b/graphics/MesaLib/files/configs/pkgsrc-dri
deleted file mode 100644
index e9ecd99bf82..00000000000
--- a/graphics/MesaLib/files/configs/pkgsrc-dri
+++ /dev/null
@@ -1,40 +0,0 @@
-# $NetBSD: pkgsrc-dri,v 1.4 2009/06/05 11:10:35 wiz Exp $
-
-include $(TOP)/configs/pkgsrc
-
-ifeq ($(USE_XCB), yes)
-include $(TOP)/configs/xcb-defs
-endif
-
-CONFIG_NAME= 	pkgsrc-dri
-
-DEFINES=\
-	-DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \
-	-DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING -DHZ=$(MESA_HZ) \
-	-DHAVE_ALIAS -D_REENTRANT $(XCB_DEFS)
-CFLAGS+=\
-	$(WARN_FLAGS) -Wmissing-prototypes -Wall \
-	$(ASM_FLAGS) $(X11_INCLUDES)
-CXXFLAGS+=\
-	$(WARN_FLAGS) $(COPTS) -Wall $(ASM_FLAGS)
-
-ASM_SOURCES?=	# defined
-
-LIBDRM_CFLAGS=	`$(PKG_CONFIG) --cflags libdrm`
-LIBDRM_LIB=	`$(PKG_CONFIG) --libs libdrm`
-#PCIACCESS_CFLAGS=	`$(PKG_CONFIG) --cflags pciaccess`
-#PCIACCESS_LIBS=	`$(PKG_CONFIG) --cflags pciaccess`
-
-DRI_LIB_DEPS?=	-lm -lexpat $(LIBDRM_LIB)
-GL_LIB_DEPS=\
-	-lX11 -lXext -lXxf86vm -lXdamage \
-	-lXfixes -lm $(LIBDRM_LIB) $(PTHREAD_STUBLIB) \
-	$(XCB_GL_LIB_DEPS)
-
-SRC_DIRS=	glx/x11 mesa glw
-DRIVER_DIRS=	dri
-PROGRAM_DIRS=	# defined
-WINDOW_SYSTEM=	dri
-
-DRI_DIRS?=	i810 i915 i965 mach64 mga r128 r200  \
-		r300 radeon tdfx unichrome savage sis swrast
diff --git a/graphics/MesaLib/files/configs/pkgsrc-dri-i386 b/graphics/MesaLib/files/configs/pkgsrc-dri-i386
deleted file mode 100644
index 47f0323ad7b..00000000000
--- a/graphics/MesaLib/files/configs/pkgsrc-dri-i386
+++ /dev/null
@@ -1,9 +0,0 @@
-# $NetBSD: pkgsrc-dri-i386,v 1.1 2008/04/24 07:40:24 bjs Exp $
-
-include $(TOP)/configs/pkgsrc-dri$(MESA_CONFIG_SUFX)
-
-CONFIG_NAME=	pkgsrc-dri-i386
-
-ASM_FLAGS=	-DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
-ASM_SOURCES=	$(X86_SOURCES)
-ASM_API=	$(X86_API)
diff --git a/graphics/MesaLib/files/configs/pkgsrc-dri-x86_64 b/graphics/MesaLib/files/configs/pkgsrc-dri-x86_64
deleted file mode 100644
index 11d1fa7d1ba..00000000000
--- a/graphics/MesaLib/files/configs/pkgsrc-dri-x86_64
+++ /dev/null
@@ -1,9 +0,0 @@
-# $NetBSD: pkgsrc-dri-x86_64,v 1.1 2008/04/24 07:40:24 bjs Exp $
-
-include $(TOP)/configs/pkgsrc-dri$(MESA_CONFIG_SUFX)
-
-CONFIG_NAME=	pkgsrc-dri-x86_64
-
-ASM_FLAGS=	-DUSE_X86_64_ASM
-ASM_SOURCES=	$(X86-64_SOURCES)
-ASM_API=	$(X86-64_API)
diff --git a/graphics/MesaLib/files/configs/pkgsrc-i386 b/graphics/MesaLib/files/configs/pkgsrc-i386
deleted file mode 100644
index 8fbe266c6ab..00000000000
--- a/graphics/MesaLib/files/configs/pkgsrc-i386
+++ /dev/null
@@ -1,9 +0,0 @@
-# $NetBSD: pkgsrc-i386,v 1.1 2008/04/24 07:40:24 bjs Exp $
-
-include $(TOP)/configs/pkgsrc
-
-CONFIG_NAME=	pkgsrc-i386
-
-ASM_FLAGS?=	-DUSE_X86_ASM -DUSE_MMX_ASM -DUSE_3DNOW_ASM -DUSE_SSE_ASM
-ASM_SOURCES=	$(X86_SOURCES)
-ASM_API=	$(X86_API)
diff --git a/graphics/MesaLib/files/configs/pkgsrc-indirect b/graphics/MesaLib/files/configs/pkgsrc-indirect
deleted file mode 100644
index 101e30ac97d..00000000000
--- a/graphics/MesaLib/files/configs/pkgsrc-indirect
+++ /dev/null
@@ -1,39 +0,0 @@
-# $NetBSD: pkgsrc-indirect,v 1.2 2009/06/05 11:10:35 wiz Exp $
-
-include $(TOP)/configs/pkgsrc
-
-ifeq ($(USE_XCB), yes)
-include $(TOP)/configs/xcb-defs
-endif
-
-CONFIG_NAME=	pkgsrc-indirect
-
-DEFINES=\
-	-DPTHREADS -DGLX_INDIRECT_RENDERING -DHAVE_ALIAS -D_REENTRANT \
-	$(XCB_DEFS)
-CFLAGS+=\
-	$(WARN_FLAGS) $(COPTS) -Wmissing-prototypes -Wall \
-	$(ASM_FLAGS) $(X11_INCLUDES) $(XCB_X11_INCLUDES)
-CXXFLAGS+=\
-	$(WARN_FLAGS) $(COPTS) -Wall $(ASM_FLAGS)
-
-ASM_SOURCES?=	# defined
-
-LIBDRM_CFLAGS=	`$(PKG_CONFIG) --cflags libdrm`
-LIBDRM_LIB=	`$(PKG_CONFIG) --libs libdrm`
-#PCIACCESS_CFLAGS=	`$(PKG_CONFIG) --cflags pciaccess`
-#PCIACCESS_LIBS=	`$(PKG_CONFIG) --cflags pciaccess`
-
-DRI_LIB_DEPS?= -lm -lexpat $(LIBDRM_LIB)
-GL_LIB_DEPS=\
-	-lX11 -lXext -lXxf86vm -lXdamage \
-	-lXfixes -lm $(LIBDRM_LIB) \
-	$(XCB_GL_LIB_DEPS)
-
-SRC_DIRS=	glx/x11 mesa glw
-DRIVER_DIRS=	dri
-PROGRAM_DIRS=	# defined
-WINDOW_SYSTEM=	dri
-
-DRI_DIRS?=	i810 i915 i915tex i965 mach64 mga r128 r200  \
-		r300 radeon tdfx unichrome savage sis swrast
diff --git a/graphics/MesaLib/files/configs/pkgsrc-x86_64 b/graphics/MesaLib/files/configs/pkgsrc-x86_64
deleted file mode 100644
index 500cb2d4e1e..00000000000
--- a/graphics/MesaLib/files/configs/pkgsrc-x86_64
+++ /dev/null
@@ -1,9 +0,0 @@
-# $NetBSD: pkgsrc-x86_64,v 1.2 2008/06/26 04:50:05 bjs Exp $
-
-include $(TOP)/configs/pkgsrc
-
-CONFIG_NAME=	pkgsrc-x86_64
-
-ASM_FLAGS=	-DUSE_X86_64_ASM
-ASM_SOURCES=	$(X86-64_SOURCES)
-ASM_API=	$(X86-64_API)
diff --git a/graphics/MesaLib/files/configs/xcb-defs b/graphics/MesaLib/files/configs/xcb-defs
deleted file mode 100644
index 34b9a8e2dd3..00000000000
--- a/graphics/MesaLib/files/configs/xcb-defs
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: xcb-defs,v 1.1 2008/04/24 07:40:24 bjs Exp $
-
-
-XCB_DEFS=	-DUSE_XCB
-
-XCB_X11_INCLUDES=\
-	`pkg-config --cflags-only-I x11` \
-	`pkg-config --cflags-only-I xcb` \
-	`pkg-config --cflags-only-I x11-xcb` \
-	`pkg-config --cflags-only-I xcb-glx`
-
-XCB_GL_LIB_DEPS=\
-	`pkg-config --libs xcb` \
-	`pkg-config --libs x11-xcb` \
-	`pkg-config --libs xcb-glx` 
diff --git a/graphics/MesaLib/files/mapfile.externs b/graphics/MesaLib/files/mapfile.externs
new file mode 100644
index 00000000000..9a4dccbdb9d
--- /dev/null
+++ b/graphics/MesaLib/files/mapfile.externs
@@ -0,0 +1,27 @@
+# Functions which are allowed to be unresolved when building dri modules
+
+{
+  global:
+    _glapi_Context = DATA extern;
+    _glapi_Dispatch = DATA extern;
+    _glapi_add_dispatch = FUNCTION extern;
+    _glapi_get_dispatch = FUNCTION extern;
+    _glapi_get_dispatch_table_size = FUNCTION extern;
+    _glapi_set_dispatch = FUNCTION extern;
+    _glapi_get_context = FUNCTION extern;
+    _glapi_set_context = FUNCTION extern;
+    _glapi_set_warning_func = FUNCTION extern;
+    _glapi_noop_enable_warnings = FUNCTION extern;
+    _glapi_check_multithread = FUNCTION extern;
+    _glthread_GetID = FUNCTION extern;
+    sl_pp_context_add_extension = FUNCTION extern;
+    sl_pp_context_create = FUNCTION extern;
+    sl_pp_context_error_message = FUNCTION extern;
+    sl_pp_context_destroy = FUNCTION extern;
+    sl_pp_version = FUNCTION extern;
+    sl_cl_compile = FUNCTION extern;
+    
+    radeon_gem_get_kernel_name = FUNCTION extern;
+
+    _mesa_bitcount = FUNCTION extern;
+};
diff --git a/graphics/MesaLib/hacks.mk b/graphics/MesaLib/hacks.mk
deleted file mode 100644
index fc7ab2e22f1..00000000000
--- a/graphics/MesaLib/hacks.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-# $NetBSD: hacks.mk,v 1.13 2008/07/27 00:03:42 bjs Exp $
-
-.if !defined(MESALIBS_HACKS_MK)
-MESALIBS_HACKS_MK=	# defined
-
-### [Fri Dec 30 21:00:59 CET 2005 : schwarz]
-### make sys/types.h not conflict with inttypes.h
-### (issue is specific to IRIX 5.3)
-###
-.  if !empty(MACHINE_PLATFORM:MIRIX-5.3-*)
-PKG_HACKS+=		sys_types_h-inttypes_h-conflict
-post-wrapper:
-		${MKDIR} ${BUILDLINK_DIR}/include/sys && ${GREP} -v '^typedef.*[^u_]int[12368]*_t;' /usr/include/sys/types.h > ${BUILDLINK_DIR}/include/sys/types.h
-# should match int8_t, int16_t, and int32_t (only)
-.  endif
-
-.include "../../mk/compiler.mk"
-###
-### Ordinarily, this is defined by the build.  However, in pkgsrc,
-### policy dictates that we do it here.
-###
-### XXXbjs:  -ffast-math seems to cause instability, at least on amd64.
-###	      I have disabled it pending further testing.
-###
-.  if !empty(CC_VERSION:Mgcc-[34]*)
-PKG_HACKS+=		no-strict-aliasing
-CFLAGS+=		-fno-strict-aliasing
-#PKG_HACKS+=		gcc-fast-math
-#CFLAGS+=		-ffast-math
-.  endif
-
-.  if !empty(CC_VERSION:Mgcc-[4-9]*)
-# Don't hide symbols for glut by default, it doesn't know how to unhide them.
-.    if empty(PKGNAME:M*glut*)
-PKG_HACKS+=		gcc-hidden-visibility
-CFLAGS+=		-fvisibility=hidden
-.    endif
-.  endif
-###
-### XXX this shoddy hack is here to fix the unresolved symbol error that
-###	results due to '.extern pthread_getspecific' in the x86/x86-64
-###	assembler dispatch routines.  Morever, there are also link-time
-###	issues with certain other applications due to pthread_getspecific()
-###	in glthread.c and glxext.c, so "fix" those also.
-###
-.  include "../../mk/bsd.fast.prefs.mk"
-
-.  if ${OPSYS} == "NetBSD" && !empty(MACHINE_ARCH:M*86*) && \
-	empty(PTHREAD_STUBLIB:U:M*pthstub*)
-SUBST_CLASSES+=	asm-hack
-SUBST_FILES.asm-hack=	src/mesa/x86/glapi_x86.S
-SUBST_FILES.asm-hack+=	src/mesa/x86-64/glapi_x86-64.S
-SUBST_FILES.asm-hack+=	src/mesa/glapi/glthread.c
-SUBST_FILES.asm-hack+=	src/glx/x11/glxext.c
-SUBST_MESSAGE.asm-hack=Teaching glapi about NetBSD thread stubs
-SUBST_SED.asm-hack=	-e 's,pthread_getspecific,__libc_thr_getspecific,g'
-SUBST_STAGE.asm-hack=	post-patch
-.  endif
-
-.endif
diff --git a/graphics/MesaLib/options.mk b/graphics/MesaLib/options.mk
index c01fc306666..d58286105d5 100644
--- a/graphics/MesaLib/options.mk
+++ b/graphics/MesaLib/options.mk
@@ -1,13 +1,13 @@
-# $NetBSD: options.mk,v 1.19 2012/10/17 11:36:02 jperkin Exp $
+# $NetBSD: options.mk,v 1.20 2013/05/16 05:22:02 richard Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.MesaLib
 PKG_SUPPORTED_OPTIONS=
 
 # Assembler code build configurations
 .if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64") && \
-    ${OPSYS} != "SunOS" && ${OPSYS} != "Darwin"
-PKG_SUPPORTED_OPTIONS+=		${MACHINE_ARCH}
-PKG_SUGGESTED_OPTIONS+=		${MACHINE_ARCH}
+    ${OPSYS} != "Darwin"
+#PKG_SUPPORTED_OPTIONS+=		${MACHINE_ARCH}
+#PKG_SUGGESTED_OPTIONS+=		${MACHINE_ARCH}
 .endif
 ###
 ### XXX  There are [probably] others, but let's not get crazy just yet.
@@ -42,24 +42,25 @@ PKG_SUGGESTED_OPTIONS+=		dri
 ###
 ### XXX Yes, this is a bit overly verbose; with Mesa, that can't hurt much.
 ###	NOTE: there is no assembler code built with libOSMesa.
-.if (!empty(PKG_OPTIONS:Mi386) || !empty(PKG_OPTIONS:Mx86_64)) && \
-     !empty(PKG_OPTIONS:Mdri)
-BUILD_TARGET_SUFFIX=	-${MACHINE_ARCH}
-.else
-BUILD_TARGET_SUFFIX=	# empty
-.endif
+#.if (!empty(PKG_OPTIONS:Mi386) || !empty(PKG_OPTIONS:Mx86_64)) && \
+#     !empty(PKG_OPTIONS:Mdri)
+#BUILD_TARGET_SUFFIX=	-${MACHINE_ARCH}
+#.else
+#BUILD_TARGET_SUFFIX=	# empty
+#.endif
 
 .if !empty(PKG_OPTIONS:Mdri)
-BUILD_TARGET=	pkgsrc-dri${BUILD_TARGET_SUFFIX}
+CONFIGURE_ARGS+=        --with-driver=dri
 PLIST.dri=	yes
 BUILDLINK_API_DEPENDS.libdrm+= libdrm>=2.4.9
 .  include "../../sysutils/libpciaccess/buildlink3.mk"
 .  include "../../graphics/MesaLib/dri.mk"
+CONFIGURE_ARGS+=        --with-dri-drivers="i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon savage sis swrast tdfx unichrome"
 .else
-BUILD_TARGET=	pkgsrc
+CONFIGURE_ARGS+=        --with-driver=xlib,osmesa
 PLIST.nodri=	yes
 ###
 ### XXX building libOSMesa breaks with -j, and GNU make has no .WAIT
 ###
-MAKE_JOBS_SAFE=			no
+#MAKE_JOBS_SAFE=			no
 .endif
diff --git a/graphics/MesaLib/patches/patch-aa b/graphics/MesaLib/patches/patch-aa
deleted file mode 100644
index d8884441ffb..00000000000
--- a/graphics/MesaLib/patches/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-aa,v 1.12 2010/03/27 12:26:19 tnn Exp $
-
---- src/mesa/drivers/dri/mach64/mach64_context.h.orig	2009-01-22 17:38:33.000000000 +0000
-+++ src/mesa/drivers/dri/mach64/mach64_context.h
-@@ -294,12 +294,19 @@ extern GLboolean mach64UnbindContext( __
- #define LE32_OUT( x, y )	do { *(GLuint *)(x) = (y); } while (0)
- #define LE32_OUT_FLOAT( x, y )	do { *(GLfloat *)(x) = (y); } while (0)
- #else
-+/* XXX mesa should handle many more platforms here [properly] */
-+#if defined(__NetBSD__)
-+#include <sys/types.h>
-+#include <machine/bswap.h>
-+#define bswap_32 bswap32
-+#else
- #ifndef __OpenBSD__
- #include <byteswap.h>
- #else
- #include <machine/endian.h>
- #define bswap_32 bswap32
- #endif
-+#endif
- 
- #define LE32_IN( x )		bswap_32( *(GLuint *)(x) )
- #define LE32_IN_FLOAT( x )						\
diff --git a/graphics/MesaLib/patches/patch-ab b/graphics/MesaLib/patches/patch-ab
deleted file mode 100644
index e53ecd2501e..00000000000
--- a/graphics/MesaLib/patches/patch-ab
+++ /dev/null
@@ -1,56 +0,0 @@
-$NetBSD: patch-ab,v 1.19 2012/02/16 18:56:23 hans Exp $
-
---- src/glu/sgi/Makefile.orig	2008-08-25 14:46:42.000000000 +0000
-+++ src/glu/sgi/Makefile
-@@ -8,7 +8,8 @@ include $(TOP)/configs/current
- 
- GLU_MAJOR = 1
- GLU_MINOR = 3
--GLU_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY)
-+GLU_TINY= 0 # What is the point of having such a strange versioning scheme?
-+	    # It breaks libtool, but I hate to say it: libtool is right!
- 
- INCDIRS = -I$(TOP)/include -Iinclude -Iinternals -Ilibnurbs/internals -Ilibnurbs/interface -Ilibnurbs/nurbtess
- 
-@@ -115,10 +116,12 @@ OBJECTS = $(C_OBJECTS) $(CC_OBJECTS)
- ##### RULES #####
- 
- .c.o:
--	$(CC) -c $(INCDIRS) $(CFLAGS) -DNDEBUG -DLIBRARYBUILD $< -o $@
-+	$(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(INCDIRS) \
-+		$(CFLAGS) $(COPTS) -DNDEBUG -DLIBRARYBUILD $< -o $(@:.o=.lo)
- 
- .cc.o:
--	$(CXX) -c $(INCDIRS) $(CXXFLAGS) -DNDEBUG -DLIBRARYBUILD $< -o $@
-+	$(LIBTOOL) --mode=compile --tag=CXX $(CXX) -c $(INCDIRS) \
-+		$(CXXFLAGS) -DNDEBUG -DLIBRARYBUILD $< -o $(@:.o=.lo)
- 
- 
- ##### TARGETS #####
-@@ -134,14 +137,19 @@ default:
- $(TOP)/$(LIB_DIR):
- 	-mkdir $(TOP)/$(LIB_DIR)
- 
--# Make the library:
--$(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME): $(OBJECTS)
--	$(MKLIB) -o $(GLU_LIB) -linker '$(CXX)' -ldflags '$(LDFLAGS)' \
--		-major $(GLU_MAJOR) -minor $(GLU_MINOR) -patch $(GLU_TINY) \
--		-cplusplus $(MKLIB_OPTIONS) -install $(TOP)/$(LIB_DIR) \
--		-exports glu.exports -id $(INSTALL_LIB_DIR)/lib$(GLU_LIB).$(GLU_MAJOR).dylib \
--		$(GLU_LIB_DEPS) $(OBJECTS)
-+# Make the exports file with the mangled or unmangled names per $CFLAGS
-+glu.exports: glu.exports.in
-+	$(CC) -E -I $(TOP)/include/GL $(CFLAGS) -xc-header $< | \
-+		awk '/^[^#]+/ {print}' > $@
-+
- 
-+# Make the library:
-+$(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME): $(OBJECTS) glu.exports
-+	$(LIBTOOL) --mode=link $(CXX) \
-+		-o $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME:.so=.la) $(LDFLAGS) \
-+		-rpath $(PREFIX)/lib $(GLU_LIB_DEPS) $(OBJECTS:.o=.lo) \
-+		-version-info $(GLU_MAJOR):$(GLU_MINOR):$(GLU_TINY) \
-+		-export-symbols glu.exports
- 
- clean:
- 	-rm -f *.o */*.o */*/*.o
diff --git a/graphics/MesaLib/patches/patch-ac b/graphics/MesaLib/patches/patch-ac
deleted file mode 100644
index 8cad8670fe6..00000000000
--- a/graphics/MesaLib/patches/patch-ac
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD: patch-ac,v 1.12 2008/04/24 07:40:24 bjs Exp $
-
---- Makefile.orig	2008-02-21 18:58:08.000000000 -0500
-+++ Makefile
-@@ -1,8 +1,8 @@
- # Top-level Mesa makefile
- 
--TOP = .
-+TOP= .
- 
--SUBDIRS = src progs
-+SUBDIRS?= src
- 
- 
- default: $(TOP)/configs/current
-@@ -90,6 +90,7 @@ hpux11-ia64 \
- hpux11-ia64-static \
- hpux9 \
- hpux9-gcc \
-+interix3 \
- irix6-64 \
- irix6-64-static \
- irix6-n32 \
-@@ -140,6 +141,10 @@ netbsd \
- openbsd \
- osf1 \
- osf1-static \
-+pkgsrc \
-+pkgsrc-dri \
-+pkgsrc-dri-i386 \
-+pkgsrc-dri-x86_64 \
- solaris-x86 \
- solaris-x86-gcc \
- solaris-x86-gcc-static \
-@@ -156,10 +161,6 @@ sunos5-v9 \
- sunos5-v9-static \
- sunos5-v9-cc-g++ \
- ultrix-gcc:
--	@ if test -f configs/current || test -L configs/current ; then \
--		echo "Please run 'make realclean' before changing configs" ; \
--		exit 1 ; \
--	fi
- 	(cd configs && rm -f current && ln -s $@ current)
- 	$(MAKE) default
- 
diff --git a/graphics/MesaLib/patches/patch-ad b/graphics/MesaLib/patches/patch-ad
deleted file mode 100644
index 6a16eb872b7..00000000000
--- a/graphics/MesaLib/patches/patch-ad
+++ /dev/null
@@ -1,106 +0,0 @@
-$NetBSD: patch-ad,v 1.15 2009/06/10 17:28:07 wiz Exp $
-
---- src/mesa/Makefile.orig	2009-03-13 05:28:49 +0200
-+++ src/mesa/Makefile	2009-05-17 16:29:41 +0300
-@@ -9,19 +9,22 @@ include sources
- .SUFFIXES : .cpp
- 
- .c.o:
--	$(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@
-+	$(LIBTOOL) --mode=compile --tag=CC \
-+	$(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $(COPTS) $< -o $(@:.o=.lo)
- 
- .cpp.o:
--	$(CXX) -c $(INCLUDE_DIRS) $(CXXFLAGS) $< -o $@
-+	$(LIBTOOL) --mode=compile --tag=CXX \
-+	$(CXX) -c $(INCLUDE_DIRS) $(CXXFLAGS) $< -o $(@:.o=.lo)
- 
- .S.o:
--	$(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@
-+	$(LIBTOOL) --mode=compile --tag=CC \
-+	$(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $(COPTS) $< -o $(@:.o=.lo)
- 
- 
- 
- # Default: build dependencies, then asm_subdirs, then convenience
- # libs (.a) and finally the device drivers:
--default: depend asm_subdirs libmesa.a libglapi.a driver_subdirs
-+default: depend asm_subdirs libmesa.la libglapi.la driver_subdirs
- 
- 
- 
-@@ -29,17 +32,19 @@ default: depend asm_subdirs libmesa.a li
- # Helper libraries used by many drivers:
- 
- # Make archive of core mesa object files
--libmesa.a: $(MESA_OBJECTS)
--	@ $(MKLIB) -o mesa -static $(MESA_OBJECTS)
-+libmesa.la: $(MESA_OBJECTS)
-+	$(LIBTOOL) --mode=link $(CC) -o $@ $(MESA_OBJECTS:.o=.lo) \
-+	-static -avoid-version
- 
- # Make archive of gl* API dispatcher functions only
--libglapi.a: $(GLAPI_OBJECTS)
--	@ $(MKLIB) -o glapi -static $(GLAPI_OBJECTS)
-+libglapi.la: $(GLAPI_OBJECTS)
-+	$(LIBTOOL) --mode=link $(CC) -o $@ $(GLAPI_OBJECTS:.o=.lo) \
-+	-static -avoid-version
- 
- 
- ######################################################################
- # Device drivers
--driver_subdirs: libmesa.a libglapi.a
-+driver_subdirs: libmesa.la libglapi.la
- 	(cd drivers && $(MAKE))
- 
- 
-@@ -113,23 +118,27 @@ osmesa.pc: osmesa.pc.in
- 	$(osmesa_pcedit) $< > $@
- 
- install-headers:
--	$(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL
--	$(INSTALL) -m 644 $(TOP)/include/GL/*.h \
--		$(DESTDIR)$(INSTALL_INC_DIR)/GL
-+	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(INSTALL_DIR)/include/GL
- 
- install-libgl: default gl.pc install-headers
--	$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)
--	$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
--	$(INSTALL) $(TOP)/$(LIB_DIR)/$(GL_LIB_GLOB) \
--		$(DESTDIR)$(INSTALL_LIB_DIR)
--	$(INSTALL) -m 644 gl.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
-+	$(BSD_INSTALL_LIB_DIR) $(DESTDIR)$(INSTALL_DIR)/lib
-+	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(INSTALL_DIR)/lib/pkgconfig
-+	@if [ -f "$(TOP)/$(LIB_DIR)/$(GL_LIB_NAME:.so=.la)" ]; then \
-+		$(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) \
-+			$(TOP)/$(LIB_DIR)/$(GL_LIB_NAME:.so=.la) \
-+			$(DESTDIR)$(INSTALL_DIR)/lib; \
-+	fi
-+	$(BSD_INSTALL_DATA) gl.pc $(DESTDIR)$(INSTALL_DIR)/lib/pkgconfig
- 
- install-osmesa: default osmesa.pc
--	$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)
--	$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
--	$(INSTALL) $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_GLOB) \
--		$(DESTDIR)$(INSTALL_LIB_DIR)
--	$(INSTALL) -m 644 osmesa.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
-+	$(BSD_INSTALL_LIB_DIR) $(DESTDIR)$(INSTALL_DIR)/lib
-+	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(INSTALL_DIR)/lib/pkgconfig
-+	@if [ -f "$(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME:.so=.la)" ]; then \
-+		$(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) \
-+			$(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME:.so=.la) \
-+			$(DESTDIR)$(INSTALL_DIR)/lib; \
-+	fi
-+	$(BSD_INSTALL_DATA) osmesa.pc $(DESTDIR)$(INSTALL_DIR)/lib/pkgconfig
- 
- install-dri: default
- 	cd drivers/dri && $(MAKE) install
-@@ -144,7 +153,7 @@ tags:
- clean:
- 	-rm -f */*.o
- 	-rm -f */*/*.o
--	-rm -f depend depend.bak libmesa.a libglapi.a
-+	-rm -f depend depend.bak libmesa* libglapi*
- 	-rm -f drivers/*/*.o
- 	-rm -f *.pc
- 	-@cd drivers/dri && $(MAKE) clean
diff --git a/graphics/MesaLib/patches/patch-ae b/graphics/MesaLib/patches/patch-ae
deleted file mode 100644
index 3d383da1252..00000000000
--- a/graphics/MesaLib/patches/patch-ae
+++ /dev/null
@@ -1,55 +0,0 @@
-$NetBSD: patch-ae,v 1.11 2009/06/05 11:10:35 wiz Exp $
-
---- src/glw/Makefile.orig	2009-03-13 05:28:49 +0200
-+++ src/glw/Makefile	2009-05-17 11:36:19 +0300
-@@ -17,7 +17,8 @@ OBJECTS = $(GLW_SOURCES:.c=.o)
- ##### RULES #####
- 
- .c.o:
--	$(CC) -c $(INCDIRS) $(CFLAGS) $<
-+	$(LIBTOOL) --mode=compile --tag=CC \
-+		$(CC) -c $(INCDIRS) $(CFLAGS) $(COPTS) -o $(@:.o=.lo) $<
- 
- 
- 
-@@ -38,12 +39,16 @@ glw.pc: glw.pc.in
- 	$(pcedit) $< > $@
- 
- install: glw.pc
--	$(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL
--	$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)
--	$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
--	$(INSTALL) -m 644 *.h $(DESTDIR)$(INSTALL_INC_DIR)/GL
--	$(INSTALL) $(TOP)/$(LIB_DIR)/$(GLW_LIB_GLOB) $(DESTDIR)$(INSTALL_LIB_DIR)
--	$(INSTALL) -m 644 glw.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
-+	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(INSTALL_DIR)/include/GL
-+	$(BSD_INSTALL_LIB_DIR) $(DESTDIR)$(INSTALL_DIR)/lib
-+	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(INSTALL_DIR)/lib/pkgconfig
-+	@for fn in *.h; do \
-+		$(BSD_INSTALL_DATA) $$fn $(DESTDIR)$(INSTALL_DIR)/include/GL; \
-+	done
-+	$(LIBTOOL) --mode=install \
-+		$(BSD_INSTALL_LIB) $(TOP)/$(LIB_DIR)/libGLw.la \
-+			$(DESTDIR)$(INSTALL_DIR)/lib
-+	$(BSD_INSTALL_DATA) glw.pc $(DESTDIR)$(INSTALL_DIR)/lib/pkgconfig
- 
- clean:
- 	-rm -f depend depend.bak
-@@ -52,12 +57,11 @@ clean:
- 
- # Make the library
- $(TOP)/$(LIB_DIR)/$(GLW_LIB_NAME): $(OBJECTS)
--	$(MKLIB) -o $(GLW_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
--		-major $(MAJOR) -minor $(MINOR) -patch $(TINY) \
--		$(MKLIB_OPTIONS) -install $(TOP)/$(LIB_DIR) \
--		-id $(INSTALL_LIB_DIR)/lib$(GLW_LIB).$(MAJOR).dylib \
--		$(GLW_LIB_DEPS) $(OBJECTS)
--
-+	$(LIBTOOL) --mode=link $(CC) \
-+		-o $(TOP)/$(LIB_DIR)/$(GLW_LIB_NAME:.so=.la) \
-+		-rpath $(PREFIX)/lib $(LDFLAGS) \
-+		-version-info $(MAJOR):$(MINOR):$(TINY) \
-+		$(GLW_LIB_DEPS) $(OBJECTS:.o=.lo)
- 
- #
- # Run 'make depend' to update the dependencies if you change what's included
diff --git a/graphics/MesaLib/patches/patch-ag b/graphics/MesaLib/patches/patch-ag
deleted file mode 100644
index 8bd0b861f17..00000000000
--- a/graphics/MesaLib/patches/patch-ag
+++ /dev/null
@@ -1,54 +0,0 @@
-$NetBSD: patch-ag,v 1.12 2009/06/05 11:10:35 wiz Exp $
-
---- src/glut/glx/Makefile.orig	2009-03-13 05:28:49 +0200
-+++ src/glut/glx/Makefile	2009-05-17 20:34:53 +0300
-@@ -81,9 +81,8 @@ OBJECTS = $(SOURCES:.c=.o)
- ##### RULES #####
- 
- .c.o:
--	$(CC) -c -I$(TOP)/include $(X11_INCLUDES) $(CFLAGS) $(GLUT_CFLAGS) $<
--
--
-+	$(LIBTOOL) --mode=compile --tag=CC $(CC) -c -I$(TOP)/include \
-+	  $(X11_INCLUDES) $(CFLAGS) $(GLUT_CFLAGS) -o $(@:.o=.lo) $<
- 
- ##### TARGETS #####
- 
-@@ -92,11 +91,11 @@ default: $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NA
- 
- # Make the library
- $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS)
--	$(MKLIB) -o $(GLUT_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
--		-major $(GLUT_MAJOR) -minor $(GLUT_MINOR) -patch $(GLUT_TINY) \
--		$(MKLIB_OPTIONS) -install $(TOP)/$(LIB_DIR) \
--		-id $(INSTALL_LIB_DIR)/lib$(GLUT_LIB).$(GLUT_MAJOR).dylib \
--		$(GLUT_LIB_DEPS) $(OBJECTS)
-+	$(LIBTOOL) --mode=link $(CC) \
-+		-o $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME:.so=.la) $(LDFLAGS) \
-+		-rpath $(PREFIX)/lib $(GLUT_LIB_DEPS) \
-+		-version-info $(GLUT_MAJOR):$(GLUT_MINOR):$(GLUT_TINY) \
-+		$(GLUT_LIB_DEPS) $(OBJECTS:.o=.lo)
- 
- 
- # glut pkgconfig file
-@@ -112,12 +111,14 @@ glut.pc: glut.pc.in
- 	$(pcedit) $< > $@
- 
- install: glut.pc
--	$(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL
--	$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)
--	$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
--	$(INSTALL) -m 644 $(TOP)/include/GL/glut.h $(DESTDIR)$(INSTALL_INC_DIR)/GL
--	$(INSTALL) $(TOP)/$(LIB_DIR)/$(GLUT_LIB_GLOB) $(DESTDIR)$(INSTALL_LIB_DIR)
--	$(INSTALL) -m 644 glut.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
-+	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(INSTALL_DIR)/include/GL
-+	$(BSD_INSTALL_LIB_DIR) $(DESTDIR)$(INSTALL_DIR)/lib
-+	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(INSTALL_DIR)/lib/pkgconfig
-+	$(BSD_INSTALL_DATA) $(TOP)/include/GL/glut.h $(DESTDIR)$(INSTALL_DIR)/include/GL
-+	$(LIBTOOL) --mode=install \
-+		$(BSD_INSTALL_LIB) $(TOP)/$(LIB_DIR)/libglut.la \
-+		$(DESTDIR)$(INSTALL_DIR)/lib
-+	$(BSD_INSTALL_DATA) glut.pc $(DESTDIR)$(INSTALL_DIR)/lib/pkgconfig
- 
- 
- clean:
diff --git a/graphics/MesaLib/patches/patch-ah b/graphics/MesaLib/patches/patch-ah
deleted file mode 100644
index dce42ada965..00000000000
--- a/graphics/MesaLib/patches/patch-ah
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ah,v 1.10 2009/06/10 17:28:07 wiz Exp $
-
---- src/mesa/drivers/dri/Makefile.orig	2009-03-13 03:28:49.000000000 +0000
-+++ src/mesa/drivers/dri/Makefile
-@@ -38,11 +38,11 @@ install: dri.pc
- 			(cd $$dir && $(MAKE) install) || exit 1 ; \
- 		fi \
- 	done
--	$(INSTALL) -d $(DESTDIR)$(INSTALL_INC_DIR)/GL/internal
--	$(INSTALL) -m 0644 $(TOP)/include/GL/internal/dri_interface.h \
--	  $(DESTDIR)$(INSTALL_INC_DIR)/GL/internal
--	$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
--	$(INSTALL) -m 0644 dri.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
-+	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(INSTALL_DIR)/include/GL/internal
-+	$(BSD_INSTALL_LIB_DIR) $(DESTDIR)$(INSTALL_DIR)/lib
-+	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(INSTALL_DIR)/lib/pkgconfig
-+	$(BSD_INSTALL_DATA) $(TOP)/include/GL/internal/dri_interface.h $(DESTDIR)$(INSTALL_DIR)/include/GL/internal
-+	$(BSD_INSTALL_DATA) dri.pc $(DESTDIR)$(INSTALL_DIR)/lib/pkgconfig
- 
- 
- clean:
diff --git a/graphics/MesaLib/patches/patch-ai b/graphics/MesaLib/patches/patch-ai
deleted file mode 100644
index 3718741d866..00000000000
--- a/graphics/MesaLib/patches/patch-ai
+++ /dev/null
@@ -1,62 +0,0 @@
-$NetBSD: patch-ai,v 1.3 2009/06/05 11:10:35 wiz Exp $
-
---- ./src/mesa/drivers/dri/Makefile.template.orig	2009-03-13 05:28:49 +0200
-+++ ./src/mesa/drivers/dri/Makefile.template	2009-05-17 15:52:13 +0300
-@@ -1,6 +1,6 @@
- # -*-makefile-*-
- 
--MESA_MODULES = $(TOP)/src/mesa/libmesa.a
-+MESA_MODULES = $(TOP)/src/mesa/libmesa.la
- 
- COMMON_SOURCES = \
-         ../common/utils.c \
-@@ -48,25 +48,22 @@ SHARED_INCLUDES = \
- ##### RULES #####
- 
- .c.o:
--	$(CC) -c $(INCLUDES) $(CFLAGS) $(DRIVER_DEFINES) $< -o $@
-+	$(LIBTOOL) --mode=compile --tag=CC $(CC) -c -prefer-pic \
-+		$(INCLUDES) $(CFLAGS) $(DRIVER_DEFINES) $< -o $(@:.o=.lo)
- 
- .S.o:
--	$(CC) -c $(INCLUDES) $(CFLAGS) $(DRIVER_DEFINES)  $< -o $@
-+	$(LIBTOOL) --mode=compile --tag=CC $(CC) -c -prefer-pic \
-+		$(INCLUDES) $(CFLAGS) $(DRIVER_DEFINES) $< -o $(@:.o=.lo)
- 
- 
- ##### TARGETS #####
- 
--default: symlinks depend $(LIBNAME) $(TOP)/$(LIB_DIR)/$(LIBNAME)
--
--
--$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template
--	$(MKLIB) -o $@ -noprefix -linker '$(CC)' -ldflags '$(LDFLAGS)' \
--		$(OBJECTS) $(MESA_MODULES) $(WINOBJ) $(DRI_LIB_DEPS)
--
--
--$(TOP)/$(LIB_DIR)/$(LIBNAME): $(LIBNAME)
--	$(INSTALL) $(LIBNAME) $(TOP)/$(LIB_DIR) 
-+default: symlinks depend $(TOP)/$(LIB_DIR)/$(LIBNAME)
- 
-+$(TOP)/$(LIB_DIR)/$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template
-+	$(LIBTOOL) --mode=link $(CC) -o $(TOP)/$(LIB_DIR)/$(LIBNAME:.so=.la) \
-+	$(OBJECTS:.o=.lo) $(WINOBJ:.o=.lo) $(DRI_LIB_DEPS) \
-+	$(MESA_MODULES:.a=.la) -rpath $(PREFIX)/lib -module -avoid-version
- 
- depend: $(C_SOURCES) $(ASM_SOURCES) $(SYMLINKS)
- 	touch depend
-@@ -85,9 +82,11 @@ clean:
- 	-rm -f depend depend.bak
- 
- 
--install: $(LIBNAME)
--	$(INSTALL) -d $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
--	$(INSTALL) -m 755 $(LIBNAME) $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
-+install: $(TOP)/$(LIB_DIR)/$(LIBNAME)
-+	$(BSD_INSTALL_LIB_DIR) $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
-+	$(LIBTOOL) --mode=install \
-+		$(BSD_INSTALL_LIB) $(TOP)/$(LIB_DIR)/$(LIBNAME:.so=.la) \
-+		$(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
- 
- 
- -include depend
diff --git a/graphics/MesaLib/patches/patch-aj b/graphics/MesaLib/patches/patch-aj
deleted file mode 100644
index ede93f975fa..00000000000
--- a/graphics/MesaLib/patches/patch-aj
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-aj,v 1.5 2008/04/24 07:40:24 bjs Exp $
-
---- src/mesa/x86/Makefile.orig	2007-06-21 18:10:55.000000000 -0400
-+++ src/mesa/x86/Makefile
-@@ -21,11 +21,19 @@ clean:
- 
- 
- gen_matypes: gen_matypes.c
--	$(CC) $(INCLUDE_DIRS) $(CFLAGS) gen_matypes.c -o gen_matypes
-+	$(LIBTOOL) --mode=link --tag=CC \
-+		$(CC) $(INCLUDE_DIRS) $(CFLAGS) -no-install \
-+		gen_matypes.c -o gen_matypes
- 
- # need some special rules here, unfortunately
-+ifdef CROSS_COMPILING
-+matypes.h: ../main/mtypes.h ../tnl/t_context.h gen_matypes.c
-+	CFLAGS="${INCLUDE_DIRS} ${CFLAGS}" \
-+	$(LIBTOOL) --mode=execute ./gen_matypes.sh > matypes.h
-+else
- matypes.h: ../main/mtypes.h ../tnl/t_context.h gen_matypes
--	./gen_matypes > matypes.h
-+	$(LIBTOOL) --mode=execute ./gen_matypes > matypes.h
-+endif
- 
- common_x86_asm.o: matypes.h
- 3dnow_normal.o: matypes.h
diff --git a/graphics/MesaLib/patches/patch-ak b/graphics/MesaLib/patches/patch-ak
deleted file mode 100644
index 120781df6b5..00000000000
--- a/graphics/MesaLib/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.8 2009/07/08 20:00:58 hasso Exp $
-
---- src/mesa/glapi/glapi.c.orig	2009-07-01 20:41:37 +0300
-+++ src/mesa/glapi/glapi.c	2009-07-01 20:41:52 +0300
-@@ -221,7 +221,7 @@ PUBLIC void *_glapi_Context = NULL;
-  * We should call this periodically from a function such as glXMakeCurrent
-  * in order to test if multiple threads are being used.
-  */
--void
-+PUBLIC void
- _glapi_check_multithread(void)
- {
- #if defined(THREADS) && !defined(GLX_USE_TLS)
diff --git a/graphics/MesaLib/patches/patch-al b/graphics/MesaLib/patches/patch-al
deleted file mode 100644
index fe35b7c9194..00000000000
--- a/graphics/MesaLib/patches/patch-al
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-al,v 1.6 2009/07/08 20:00:58 hasso Exp $
-
-http://cgit.freedesktop.org/mesa/mesa/commit/?id=32c44fb8
-
---- src/glx/x11/glxcmds.c.orig	2009-07-08 21:22:47 +0300
-+++ src/glx/x11/glxcmds.c	2009-07-08 21:23:31 +0300
-@@ -164,7 +164,7 @@ GetGLXScreenConfigs(Display *dpy, int sc
- {
-     __GLXdisplayPrivate * const priv = __glXInitialize(dpy);
- 
--    return (priv->screenConfigs != NULL) ? &priv->screenConfigs[scrn] : NULL;
-+    return (priv && priv->screenConfigs != NULL) ? &priv->screenConfigs[scrn] : NULL;
- }
- 
- 
diff --git a/graphics/MesaLib/patches/patch-am b/graphics/MesaLib/patches/patch-am
deleted file mode 100644
index 0b291372536..00000000000
--- a/graphics/MesaLib/patches/patch-am
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-am,v 1.8 2008/04/24 07:40:24 bjs Exp $
-
---- src/mesa/drivers/x11/xmesaP.h.orig	2007-11-01 11:30:52.000000000 -0400
-+++ src/mesa/drivers/x11/xmesaP.h
-@@ -228,7 +228,8 @@ struct xmesa_buffer {
- 				/*    0 = not available			*/
- 				/*    1 = XImage support available	*/
- 				/*    2 = Pixmap support available too	*/
--#if defined(USE_XSHM) && !defined(XFree86Server)
-+#if (defined(USE_XSHM) || defined(USE_XSHM_HDRONLY)) && \
-+ 	!defined(XFree86Server)
-    XShmSegmentInfo shminfo;
- #endif
- 
diff --git a/graphics/MesaLib/patches/patch-an b/graphics/MesaLib/patches/patch-an
deleted file mode 100644
index 44ac3254aaa..00000000000
--- a/graphics/MesaLib/patches/patch-an
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-an,v 1.3 2009/09/02 22:30:34 wiz Exp $
-
---- src/glx/x11/dri_common.c.orig	2009-06-17 17:31:54.000000000 +0000
-+++ src/glx/x11/dri_common.c
-@@ -103,7 +103,11 @@ _X_HIDDEN void *driOpenDriver(const char
-    int len;
- 
-    /* Attempt to make sure libGL symbols will be visible to the driver */
-+#ifdef __NetBSD__
-+   glhandle = dlopen("libGL.so", RTLD_NOW | RTLD_GLOBAL);
-+#else
-    glhandle = dlopen("libGL.so.1", RTLD_NOW | RTLD_GLOBAL);
-+#endif
- 
-    libPaths = NULL;
-    if (geteuid() == getuid()) {
diff --git a/graphics/MesaLib/patches/patch-aq b/graphics/MesaLib/patches/patch-aq
deleted file mode 100644
index fb0f7f95dd8..00000000000
--- a/graphics/MesaLib/patches/patch-aq
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-aq,v 1.1 2008/04/24 07:40:24 bjs Exp $
-
---- src/mesa/main/imports.h.orig	2008-03-19 19:25:18.000000000 -0400
-+++ src/mesa/main/imports.h
-@@ -292,7 +292,7 @@ static INLINE int GET_FLOAT_BITS( float 
-  *** LDEXPF: multiply value by an integral power of two
-  *** FREXPF: extract mantissa and exponent from value
-  ***/
--#if defined(__gnu_linux__)
-+#if defined(USE_NATIVE_LIBM_FUNCS)
- /* C99 functions */
- #define CEILF(x)   ceilf(x)
- #define FLOORF(x)  floorf(x)
-@@ -515,7 +515,9 @@ static INLINE int iceil(float f)
- /* Hardware default: All exceptions masked, extended double precision,
-  * round to nearest (IEEE compliant):
-  */
-+#ifndef DEFAULT_X86_FPU
- #define DEFAULT_X86_FPU		0x037f
-+#endif
- /* All exceptions masked, single precision, round to nearest:
-  */
- #define FAST_X86_FPU		0x003f
diff --git a/graphics/MesaLib/patches/patch-at b/graphics/MesaLib/patches/patch-at
deleted file mode 100644
index 903ede33fec..00000000000
--- a/graphics/MesaLib/patches/patch-at
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-at,v 1.2 2009/06/05 11:10:35 wiz Exp $
-
---- src/glx/x11/Makefile.orig	2009-03-13 05:28:49 +0200
-+++ src/glx/x11/Makefile	2009-05-17 15:56:03 +0300
-@@ -60,10 +60,12 @@ INCLUDES = -I. \
- ##### RULES #####
- 
- .c.o:
--	$(CC) -c $(INCLUDES) $(CFLAGS) $(EXTRA_DEFINES) $< -o $@
-+	$(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(INCLUDES) \
-+		$(CFLAGS) $(EXTRA_DEFINES) $< -o $(@:.o=.lo)
- 
- .S.o:
--	$(CC) -c $(INCLUDES) $(CFLAGS) $(EXTRA_DEFINES)  $< -o $@
-+	$(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(INCLUDES) \
-+		$(CFLAGS) $(EXTRA_DEFINES)  $< -o $(@:.o=.lo)
- 
- ##### TARGETS #####
- 
-@@ -71,10 +73,10 @@ default: depend $(TOP)/$(LIB_DIR)/$(GL_L
- 
- # Make libGL
- $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME):  $(OBJECTS) Makefile
--	$(MKLIB) -o $(GL_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
--		-major 1 -minor 2 $(MKLIB_OPTIONS) \
--		-install $(TOP)/$(LIB_DIR) -id $(INSTALL_LIB_DIR)/lib$(GL_LIB).1.dylib \
--		$(GL_LIB_DEPS) $(OBJECTS)
-+	$(LIBTOOL) --mode=link $(CC) \
-+		-o $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME:.so=.la) \
-+		$(LDFLAGS) -version-info 1:2 $(GL_LIB_DEPS) \
-+		-rpath $(PREFIX)/lib $(OBJECTS:.o=.lo)
- 
- 
- depend: $(SOURCES) $(MESA_GLAPI_SOURCES) $(MESA_ASM_API) Makefile
diff --git a/graphics/MesaLib/patches/patch-au b/graphics/MesaLib/patches/patch-au
deleted file mode 100644
index 284830f9cbe..00000000000
--- a/graphics/MesaLib/patches/patch-au
+++ /dev/null
@@ -1,68 +0,0 @@
-$NetBSD: patch-au,v 1.1 2008/04/24 07:40:24 bjs Exp $
-
---- src/mesa/shader/slang/library/Makefile.orig	2007-06-21 18:10:54.000000000 -0400
-+++ src/mesa/shader/slang/library/Makefile
-@@ -28,26 +28,26 @@ builtin: builtin_110 builtin_120
- #
- 
- syn_to_c: syn_to_c.c
--	$(CC) syn_to_c.c -o syn_to_c
-+	$(LIBTOOL) --mode=link $(CC) syn_to_c.c -o syn_to_c -no-install
- 
- gc_to_bin: gc_to_bin.c slang_shader_syn.h
--	$(CC) gc_to_bin.c -o gc_to_bin
-+	$(LIBTOOL) --mode=link $(CC) gc_to_bin.c -o gc_to_bin -no-install
- 
- #
- # syntax scripts
- #
- 
- slang_pp_directives_syn.h: syn_to_c slang_pp_directives.syn
--	./syn_to_c slang_pp_directives.syn > slang_pp_directives_syn.h
-+	$(LIBTOOL) --mode=execute ./syn_to_c slang_pp_directives.syn > slang_pp_directives_syn.h
- 
- slang_pp_expression_syn.h: syn_to_c slang_pp_expression.syn
--	./syn_to_c slang_pp_expression.syn > slang_pp_expression_syn.h
-+	$(LIBTOOL) --mode=execute ./syn_to_c slang_pp_expression.syn > slang_pp_expression_syn.h
- 
- slang_shader_syn.h: syn_to_c slang_shader.syn
--	./syn_to_c slang_shader.syn > slang_shader_syn.h
-+	$(LIBTOOL) --mode=execute ./syn_to_c slang_shader.syn > slang_shader_syn.h
- 
- slang_pp_version_syn.h: syn_to_c slang_pp_version.syn
--	./syn_to_c slang_pp_version.syn > slang_pp_version_syn.h
-+	$(LIBTOOL) --mode=execute ./syn_to_c slang_pp_version.syn > slang_pp_version_syn.h
- 
- #
- # builtin library sources
-@@ -59,23 +59,23 @@ builtin_120: slang_120_core_gc.h slang_b
- 
- 
- slang_120_core_gc.h: gc_to_bin slang_120_core.gc
--	./gc_to_bin 1 slang_120_core.gc slang_120_core_gc.h
-+	$(LIBTOOL) --mode=execute ./gc_to_bin 1 slang_120_core.gc slang_120_core_gc.h
- 
- slang_builtin_120_common_gc.h: gc_to_bin slang_builtin_120_common.gc
--	./gc_to_bin 1 slang_builtin_120_common.gc slang_builtin_120_common_gc.h
-+	$(LIBTOOL) --mode=execute ./gc_to_bin 1 slang_builtin_120_common.gc slang_builtin_120_common_gc.h
- 
- slang_builtin_120_fragment_gc.h: gc_to_bin slang_builtin_120_fragment.gc
--	./gc_to_bin 1 slang_builtin_120_fragment.gc slang_builtin_120_fragment_gc.h
-+	$(LIBTOOL) --mode=execute ./gc_to_bin 1 slang_builtin_120_fragment.gc slang_builtin_120_fragment_gc.h
- 
- slang_common_builtin_gc.h: gc_to_bin slang_common_builtin.gc
--	./gc_to_bin 1 slang_common_builtin.gc slang_common_builtin_gc.h
-+	$(LIBTOOL) --mode=execute ./gc_to_bin 1 slang_common_builtin.gc slang_common_builtin_gc.h
- 
- slang_core_gc.h: gc_to_bin slang_core.gc
--	./gc_to_bin 1 slang_core.gc slang_core_gc.h
-+	$(LIBTOOL) --mode=execute ./gc_to_bin 1 slang_core.gc slang_core_gc.h
- 
- slang_fragment_builtin_gc.h: gc_to_bin slang_fragment_builtin.gc
--	./gc_to_bin 1 slang_fragment_builtin.gc slang_fragment_builtin_gc.h
-+	$(LIBTOOL) --mode=execute ./gc_to_bin 1 slang_fragment_builtin.gc slang_fragment_builtin_gc.h
- 
- slang_vertex_builtin_gc.h: gc_to_bin slang_vertex_builtin.gc
--	./gc_to_bin 2 slang_vertex_builtin.gc slang_vertex_builtin_gc.h
-+	$(LIBTOOL) --mode=execute ./gc_to_bin 2 slang_vertex_builtin.gc slang_vertex_builtin_gc.h
- 
diff --git a/graphics/MesaLib/patches/patch-av b/graphics/MesaLib/patches/patch-av
deleted file mode 100644
index a207f54ff70..00000000000
--- a/graphics/MesaLib/patches/patch-av
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-av,v 1.1 2008/06/03 06:59:13 dsainty Exp $
-
-'program_invocation_short_name' may be conditionally defined even if there is
-a declaration available.  Make sure it's always available by making the
-extern unconditional.
-
---- src/mesa/drivers/dri/common/xmlconfig.c.orig	2007-06-22 10:10:54.000000000 +1200
-+++ src/mesa/drivers/dri/common/xmlconfig.c	2008-04-27 21:31:28.660265951 +1200
-@@ -49,10 +49,8 @@
- #undef GET_PROGRAM_NAME
- 
- #if (defined(__GNU_LIBRARY__) || defined(__GLIBC__)) && !defined(__UCLIBC__)
--#    if !defined(__GLIBC__) || (__GLIBC__ < 2)
- /* These aren't declared in any libc5 header */
- extern char *program_invocation_name, *program_invocation_short_name;
--#    endif
- #    define GET_PROGRAM_NAME() program_invocation_short_name
- #elif defined(__FreeBSD__) && (__FreeBSD__ >= 2)
- #    include <osreldate.h>
diff --git a/graphics/MesaLib/patches/patch-aw b/graphics/MesaLib/patches/patch-aw
deleted file mode 100644
index f7e7663dde1..00000000000
--- a/graphics/MesaLib/patches/patch-aw
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-aw,v 1.2 2012/09/12 14:12:29 dsainty Exp $
-
-Expose glXGetProcAddress and glXGetProcAddressARB.
-
-The consequences of not making this patch are platform dependent - some build
-chains will still expose the symbols, but some will not.  The API expects
-them to be exposed.
-
---- src/mesa/drivers/x11/glxapi.c.orig	2007-11-01 16:30:52.000000000 +0100
-+++ src/mesa/drivers/x11/glxapi.c
-@@ -1391,6 +1391,7 @@
-  * This function does not get dispatched through the dispatch table
-  * since it's really a "meta" function.
-  */
-+PUBLIC
- __GLXextFuncPtr
- glXGetProcAddressARB(const GLubyte *procName)
- {
-@@ -1407,6 +1408,7 @@
- 
- 
- /* GLX 1.4 */
-+PUBLIC
- void (*glXGetProcAddress(const GLubyte *procName))()
- {
-    return glXGetProcAddressARB(procName);
diff --git a/graphics/MesaLib/patches/patch-ax b/graphics/MesaLib/patches/patch-ax
deleted file mode 100644
index c3b64890374..00000000000
--- a/graphics/MesaLib/patches/patch-ax
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ax,v 1.2 2009/06/05 11:10:35 wiz Exp $
-
---- src/glu/Makefile.orig	2009-01-22 19:38:33 +0200
-+++ src/glu/Makefile	2009-05-17 16:10:41 +0300
-@@ -27,10 +27,12 @@ glu.pc: glu.pc.in
- 	$(pcedit) $< > $@
- 
- install: glu.pc
--	$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)
--	$(INSTALL) -d $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
--	$(INSTALL) $(TOP)/$(LIB_DIR)/$(GLU_LIB_GLOB) $(DESTDIR)$(INSTALL_LIB_DIR)
--	$(INSTALL) -m 644 glu.pc $(DESTDIR)$(INSTALL_LIB_DIR)/pkgconfig
-+	$(BSD_INSTALL_LIB_DIR) $(DESTDIR)$(INSTALL_DIR)/lib
-+	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(INSTALL_DIR)/lib/pkgconfig
-+	$(LIBTOOL) --mode=install \
-+		$(BSD_INSTALL_LIB) $(TOP)/$(LIB_DIR)/libGLU.la \
-+		$(DESTDIR)$(INSTALL_DIR)/lib
-+	$(BSD_INSTALL_DATA) glu.pc $(DESTDIR)$(INSTALL_DIR)/lib/pkgconfig
- 
- clean:
- 	-@for dir in $(SUBDIRS) ; do \
diff --git a/graphics/MesaLib/patches/patch-ay b/graphics/MesaLib/patches/patch-ay
deleted file mode 100644
index b49469feb2f..00000000000
--- a/graphics/MesaLib/patches/patch-ay
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-ay,v 1.1 2008/07/27 00:03:42 bjs Exp $
-
---- progs/xdemos/Makefile.orig	2008-07-18 10:39:12.000000000 -0400
-+++ progs/xdemos/Makefile
-@@ -94,3 +94,5 @@ xrotfontdemo.o: xrotfontdemo.c xuserotfo
- yuvrect_client: yuvrect_client.c
- 	$(CC) -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) $< $(LDFLAGS) $(LIBS) -l$(GLU_LIB) -o $@
- 
-+glthreads: glthreads.c
-+	$(CC) $(PTHREAD_CFLAGS) -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) $< $(LDFLAGS) $(LIBS) -l$(GLU_LIB) $(PTHREAD_LDFLAGS) $(PTHREAD_LIBS) -o $@
diff --git a/graphics/MesaLib/patches/patch-ba b/graphics/MesaLib/patches/patch-ba
deleted file mode 100644
index 8b570b1f2d5..00000000000
--- a/graphics/MesaLib/patches/patch-ba
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ba,v 1.1 2009/06/05 11:10:35 wiz Exp $
-
---- src/mesa/drivers/dri/intel/intel_fbo.c.orig	2009-05-18 15:03:52 +0300
-+++ src/mesa/drivers/dri/intel/intel_fbo.c	2009-05-18 15:04:28 +0300
-@@ -619,8 +619,7 @@ intel_render_texture(GLcontext * ctx,
-        return;
-    }
- 
--   DBG("Begin render texture tid %x tex=%u w=%d h=%d refcount=%d\n",
--       _glthread_GetID(),
-+   DBG("Begin render texture tex=%u w=%d h=%d refcount=%d\n",
-        att->Texture->Name, newImage->Width, newImage->Height,
-        irb->Base.RefCount);
- 
-@@ -660,7 +659,7 @@ intel_finish_render_texture(GLcontext * 
- {
-    struct intel_renderbuffer *irb = intel_renderbuffer(att->Renderbuffer);
- 
--   DBG("End render texture (tid %x) tex %u\n", _glthread_GetID(), att->Texture->Name);
-+   DBG("End render texture tex %u\n", att->Texture->Name);
- 
-    if (irb) {
-       /* just release the region */
diff --git a/graphics/MesaLib/patches/patch-bb b/graphics/MesaLib/patches/patch-bb
deleted file mode 100644
index 2bfbd5d5f60..00000000000
--- a/graphics/MesaLib/patches/patch-bb
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-bb,v 1.1 2009/06/05 11:10:35 wiz Exp $
-
---- src/mesa/drivers/dri/swrast/Makefile.orig	2009-05-19 10:25:12 +0300
-+++ src/mesa/drivers/dri/swrast/Makefile	2009-05-19 10:25:27 +0300
-@@ -16,7 +16,6 @@ C_SOURCES = \
- ASM_SOURCES =
- 
- SWRAST_COMMON_SOURCES = \
--	../../common/driverfuncs.c \
- 	../common/utils.c
- 
- include ../Makefile.template
diff --git a/graphics/MesaLib/patches/patch-be b/graphics/MesaLib/patches/patch-be
deleted file mode 100644
index 81df6577450..00000000000
--- a/graphics/MesaLib/patches/patch-be
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-be,v 1.2 2009/07/08 20:00:58 hasso Exp $
-
---- src/mesa/drivers/osmesa/Makefile.orig	2009-06-17 20:30:03 +0300
-+++ src/mesa/drivers/osmesa/Makefile	2009-06-22 07:52:00 +0300
-@@ -21,14 +21,15 @@ INCLUDE_DIRS = \
- 
- # Standalone osmesa needs to be linked with core Mesa APIs
- ifeq ($(DRIVER_DIRS), osmesa)
--CORE_MESA = $(TOP)/src/mesa/libmesa.a $(TOP)/src/mesa/libglapi.a
-+CORE_MESA = $(TOP)/src/mesa/libmesa.la $(TOP)/src/mesa/libglapi.la
- else
- CORE_MESA =
- endif
- 
- 
- .c.o:
--	$(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@
-+	$(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(INCLUDE_DIRS) \
-+		$(CFLAGS) $< -o $(@:.o=.lo)
- 
- 
- default: $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME)
-@@ -38,11 +39,11 @@ default: $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_
- # sources. We can also build libOSMesa16/libOSMesa32 by setting
- # -DCHAN_BITS=16/32.
- $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME): $(OBJECTS) $(CORE_MESA)
--	$(MKLIB) -o $(OSMESA_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
--		-major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \
--		-install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
--		-id $(INSTALL_LIB_DIR)/lib$(OSMESA_LIB).$(MESA_MAJOR).dylib \
--		$(OSMESA_LIB_DEPS) $(OBJECTS) $(CORE_MESA)
-+	$(LIBTOOL) --mode=link $(CC) \
-+		-o $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME:.so=.la) $(LDFLAGS) \
-+		-rpath $(PREFIX)/lib \
-+		-version-info $(MESA_MAJOR):$(MESA_MINOR):0 \
-+		$(OSMESA_LIB_DEPS) $(OBJECTS:.o=.lo) $(CORE_MESA)
- 
- 
- 
diff --git a/graphics/MesaLib/patches/patch-bin_mklib b/graphics/MesaLib/patches/patch-bin_mklib
new file mode 100644
index 00000000000..4701a8fcca4
--- /dev/null
+++ b/graphics/MesaLib/patches/patch-bin_mklib
@@ -0,0 +1,75 @@
+$NetBSD: patch-bin_mklib,v 1.1 2013/05/16 05:22:02 richard Exp $
+
+Solaris ld seemingly has a hard time swallowing nested archives,
+so flatten them out as is done for linux.
+
+Also, to simplify PLIST processing, add versioned shared libraries
+for SunOS.
+
+--- bin/mklib.orig	2011-10-15 00:43:58.000000000 +0000
++++ bin/mklib
+@@ -305,6 +305,12 @@ fi
+ #
+ # OK, make the library now
+ #
++if [ x${PATCH} = "x" ] ; then
++	VERSION="${MAJOR}.${MINOR}"
++else
++	VERSION="${MAJOR}.${MINOR}.${PATCH}"
++fi
++
+ case $ARCH in
+ 
+     'Linux' | 'OpenBSD' | 'DragonFly' | 'GNU' | GNU/* | 'NetBSD')
+@@ -398,12 +404,6 @@ case $ARCH in
+                 OPTS=${ALTOPTS}
+             fi
+ 
+-	    if [ x${PATCH} = "x" ] ; then
+-		VERSION="${MAJOR}.${MINOR}"
+-	    else
+-		VERSION="${MAJOR}.${MINOR}.${PATCH}"
+-	    fi
+-
+             echo "mklib: Making" $ARCH "shared library: " ${LIBNAME}.so.${VERSION}
+ 
+             # rm any old libs
+@@ -426,7 +426,20 @@ case $ARCH in
+         if [ $STATIC = 1 ] ; then
+ 	    LIBNAME="lib${LIBNAME}.a"
+ 	    echo "mklib: Making SunOS static library: " ${LIBNAME}
+-	    FINAL_LIBS=`make_ar_static_lib -ruc 0 ${LIBNAME} ${OBJECTS}`
++#	    FINAL_LIBS=`make_ar_static_lib -ruc 0 ${LIBNAME} ${OBJECTS}`
++           OPTS="-rucs"
++            if [ "${ALTOPTS}" ] ; then
++                OPTS=${ALTOPTS}
++            fi
++
++            # expand .a into .o files
++            NEW_OBJECTS=`expand_archives ${LIBNAME}.obj $OBJECTS`
++
++            # make static lib
++            FINAL_LIBS=`make_ar_static_lib ${OPTS} 0 ${LIBNAME} ${NEW_OBJECTS}`
++
++            # remove temporary extracted .o files
++            rm -rf ${LIBNAME}.obj
+ 	else
+ 	    if [ $NOPREFIX = 0 ] ; then
+ 		LIBNAME="lib${LIBNAME}.so"
+@@ -517,10 +530,13 @@ case $ARCH in
+ 		${LINK} ${OPTS} ${LDFLAGS} -o ${LIBNAME} ${OBJECTS} ${DEPS}
+ 		FINAL_LIBS="${LIBNAME}"
+ 	    else
+-		rm -f ${LIBNAME}.${MAJOR} ${LIBNAME}
+-		${LINK} ${OPTS} ${LDFLAGS} -o ${LIBNAME}.${MAJOR} -h ${LIBNAME}.${MAJOR} ${OBJECTS} ${DEPS}
++        # rm any old libs
++		rm -f ${LIBNAME}.${VERSION} ${LIBNAME}.${MAJOR} ${LIBNAME}
++		${LINK} ${OPTS} ${LDFLAGS} -o ${LIBNAME}.${VERSION} -h ${LIBNAME}.${VERSION} ${OBJECTS} ${DEPS}
++
++        ln -s ${LIBNAME}.${VERSION} ${LIBNAME}.${MAJOR}
+ 		ln -s ${LIBNAME}.${MAJOR} ${LIBNAME}
+-		FINAL_LIBS="${LIBNAME}.${MAJOR} ${LIBNAME}"
++		FINAL_LIBS="${LIBNAME}.${VERSION} ${LIBNAME}.${MAJOR} ${LIBNAME}"
+ 	    fi
+ 	fi
+ 	;;
diff --git a/graphics/MesaLib/patches/patch-cb b/graphics/MesaLib/patches/patch-cb
deleted file mode 100644
index 64437c5211e..00000000000
--- a/graphics/MesaLib/patches/patch-cb
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-cb,v 1.3 2009/06/05 11:10:35 wiz Exp $
-
---- src/mesa/x86-64/Makefile.orig	2009-05-19 11:53:27 +0300
-+++ src/mesa/x86-64/Makefile	2009-05-19 11:55:54 +0300
-@@ -23,7 +23,13 @@ clean:
- 
- 
- # need some special rules here, unfortunately
-+#ifdef CROSS_COMPILING
- matypes.h: ../main/mtypes.h ../tnl/t_context.h ../x86/gen_matypes
--	../x86/gen_matypes > matypes.h
-+	CFLAGS="${INCLUDE_DIRS} ${CFLAGS}" $(LIBTOOL) --mode=execute \
-+	../x86/gen_matypes.sh > matypes.h
-+#else
-+matypes.h: ../main/mtypes.h ../tnl/t_context.h ../x86/gen_matypes
-+	$(LIBTOOL) --mode=execute ../x86/gen_matypes > matypes.h
-+#endif
- 
- xform4.o: matypes.h
diff --git a/graphics/MesaLib/patches/patch-cc b/graphics/MesaLib/patches/patch-cc
deleted file mode 100644
index 3286495e59b..00000000000
--- a/graphics/MesaLib/patches/patch-cc
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-cc,v 1.1 2009/06/11 13:11:32 tnn Exp $
-
---- src/mesa/drivers/x11/Makefile.orig	2008-08-25 16:46:44.000000000 +0200
-+++ src/mesa/drivers/x11/Makefile
-@@ -43,25 +43,24 @@ INCLUDE_DIRS = \
- 	-I$(TOP)/src/mesa \
- 	-I$(TOP)/src/mesa/main
- 
--CORE_MESA = $(TOP)/src/mesa/libmesa.a $(TOP)/src/mesa/libglapi.a
-+CORE_MESA = $(TOP)/src/mesa/libmesa.la $(TOP)/src/mesa/libglapi.la
- 
- 
- 
- .c.o:
--	$(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@
-+	$(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(INCLUDE_DIRS) \
-+		$(CFLAGS) $< -o $(@:.o=.lo)
- 
- 
- default: $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME)
- 
- 
- $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(OBJECTS) $(CORE_MESA)
--	@ $(MKLIB) -o $(GL_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
--		-major $(GL_MAJOR) -minor $(GL_MINOR) -patch $(GL_TINY) \
--		-install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
--		-id $(INSTALL_LIB_DIR)/lib$(GL_LIB).$(GL_MAJOR).dylib \
--		$(GL_LIB_DEPS) $(OBJECTS) $(CORE_MESA)
--
--
-+	$(LIBTOOL) --mode=link $(CC) \
-+		-o $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME:.so=.la) $(LDFLAGS) \
-+		-rpath $(PREFIX)/lib \
-+		-version-info $(GL_MAJOR):$(GL_MINOR):0 \
-+		$(GL_LIB_DEPS) $(OBJECTS:.o=.lo) $(CORE_MESA)
- 
- clean:
- 	-rm -f *.o *~
diff --git a/graphics/MesaLib/patches/patch-configure.ac b/graphics/MesaLib/patches/patch-configure.ac
new file mode 100644
index 00000000000..9a977091de6
--- /dev/null
+++ b/graphics/MesaLib/patches/patch-configure.ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-configure.ac,v 1.1 2013/05/16 05:22:02 richard Exp $
+
+--- configure.ac.orig	2011-10-15 00:43:58.000000000 +0000
++++ configure.ac
+@@ -1086,6 +1086,8 @@ if test "$mesa_driver" = dri -o "$mesa_d
+         if test "x$driglx_direct" = xyes; then
+             DEFINES="$DEFINES -DGLX_DIRECT_RENDERING"
+         fi
++        DRI_LIB_MAPFILE='-Wl,-M,$(TOP)/src/mesa/drivers/dri/mapfile.externs'
++        DRI_LIB_DEPS="$DRI_LIB_DEPS $DRI_LIB_MAPFILE"
+         ;;
+     cygwin*)
+         DEFINES="$DEFINES -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER"
diff --git a/graphics/MesaLib/patches/patch-src_gallium_include_pipe_p__config.h b/graphics/MesaLib/patches/patch-src_gallium_include_pipe_p__config.h
new file mode 100644
index 00000000000..fc7068fd40b
--- /dev/null
+++ b/graphics/MesaLib/patches/patch-src_gallium_include_pipe_p__config.h
@@ -0,0 +1,20 @@
+$NetBSD: patch-src_gallium_include_pipe_p__config.h,v 1.1 2013/05/16 05:22:02 richard Exp $
+
+--- src/gallium/include/pipe/p_config.h.orig	2011-10-15 00:43:58.000000000 +0000
++++ src/gallium/include/pipe/p_config.h
+@@ -129,6 +129,15 @@
+ # define PIPE_ARCH_BIG_ENDIAN
+ #endif
+ 
++#elif defined(__sun)
++#include <sys/isa_defs.h>
++
++#if defined(_LITTLE_ENDIAN)
++# define PIPE_ARCH_LITTLE_ENDIAN
++#elif defined(_BIG_ENDIAN)
++# define PIPE_ARCH_BIG_ENDIAN
++#endif
++
+ #else
+ 
+ #if defined(PIPE_ARCH_X86) || defined(PIPE_ARCH_X86_64)
diff --git a/graphics/MesaLib/patches/patch-src_glu_sgi_glu.exports b/graphics/MesaLib/patches/patch-src_glu_sgi_glu.exports
new file mode 100644
index 00000000000..4d5e8ac51d4
--- /dev/null
+++ b/graphics/MesaLib/patches/patch-src_glu_sgi_glu.exports
@@ -0,0 +1,67 @@
+$NetBSD: patch-src_glu_sgi_glu.exports,v 1.1 2013/05/16 05:22:02 richard Exp $
+
+--- src/glu/sgi/glu.exports.orig	2010-02-05 00:10:40.000000000 +0000
++++ src/glu/sgi/glu.exports
+@@ -57,62 +57,3 @@
+ 	gluTessVertex
+ 	gluUnProject
+ 	gluUnProject4
+-	mgluBeginCurve
+-	mgluBeginPolygon
+-	mgluBeginSurface
+-	mgluBeginTrim
+-	mgluBuild1DMipmapLevels
+-	mgluBuild1DMipmaps
+-	mgluBuild2DMipmapLevels
+-	mgluBuild2DMipmaps
+-	mgluBuild3DMipmapLevels
+-	mgluBuild3DMipmaps
+-	mgluCheckExtension
+-	mgluCylinder
+-	mgluDeleteNurbsRenderer
+-	mgluDeleteQuadric
+-	mgluDeleteTess
+-	mgluDisk
+-	mgluEndCurve
+-	mgluEndPolygon
+-	mgluEndSurface
+-	mgluEndTrim
+-	mgluErrorString
+-	mgluGetNurbsProperty
+-	mgluGetString
+-	mgluGetTessProperty
+-	mgluLoadSamplingMatrices
+-	mgluLookAt
+-	mgluNewNurbsRenderer
+-	mgluNewQuadric
+-	mgluNewTess
+-	mgluNextContour
+-	mgluNurbsCallback
+-	mgluNurbsCallbackData
+-	mgluNurbsCallbackDataEXT
+-	mgluNurbsCurve
+-	mgluNurbsProperty
+-	mgluNurbsSurface
+-	mgluOrtho2D
+-	mgluPartialDisk
+-	mgluPerspective
+-	mgluPickMatrix
+-	mgluProject
+-	mgluPwlCurve
+-	mgluQuadricCallback
+-	mgluQuadricDrawStyle
+-	mgluQuadricNormals
+-	mgluQuadricOrientation
+-	mgluQuadricTexture
+-	mgluScaleImage
+-	mgluSphere
+-	mgluTessBeginContour
+-	mgluTessBeginPolygon
+-	mgluTessCallback
+-	mgluTessEndContour
+-	mgluTessEndPolygon
+-	mgluTessNormal
+-	mgluTessProperty
+-	mgluTessVertex
+-	mgluUnProject
+-	mgluUnProject4
diff --git a/graphics/MesaLib/patches/patch-src_mesa_drivers_dri_common_dri__util.h b/graphics/MesaLib/patches/patch-src_mesa_drivers_dri_common_dri__util.h
new file mode 100644
index 00000000000..e247383eb18
--- /dev/null
+++ b/graphics/MesaLib/patches/patch-src_mesa_drivers_dri_common_dri__util.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_mesa_drivers_dri_common_dri__util.h,v 1.1 2013/05/16 05:22:02 richard Exp $
+
+--- src/mesa/drivers/dri/common/dri_util.h.orig	2011-07-09 01:31:41.000000000 +0000
++++ src/mesa/drivers/dri/common/dri_util.h
+@@ -58,6 +58,10 @@
+ 
+ #define GLX_BAD_CONTEXT                    5
+ 
++#define u_int64_t uint64_t
++#define u_int32_t uint32_t
++#define u_int8_t uint8_t
++
+ typedef struct __DRIswapInfoRec        __DRIswapInfo;
+ 
+ /**
diff --git a/graphics/MesaLib/patches/patch-src_mesa_drivers_dri_common_mmio.h b/graphics/MesaLib/patches/patch-src_mesa_drivers_dri_common_mmio.h
new file mode 100644
index 00000000000..530d30e6036
--- /dev/null
+++ b/graphics/MesaLib/patches/patch-src_mesa_drivers_dri_common_mmio.h
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_mesa_drivers_dri_common_mmio.h,v 1.1 2013/05/16 05:22:02 richard Exp $
+
+--- src/mesa/drivers/dri/common/mmio.h.orig	2010-02-05 00:10:40.000000000 +0000
++++ src/mesa/drivers/dri/common/mmio.h
+@@ -34,6 +34,7 @@
+ #define MMIO_H
+ 
+ #include "main/glheader.h"
++#include "dri_util.h"
+ 
+ #if defined( __powerpc__ )
+ 
diff --git a/graphics/MesaLib/patches/patch-src_mesa_drivers_dri_i915_intel__batchbuffer.c b/graphics/MesaLib/patches/patch-src_mesa_drivers_dri_i915_intel__batchbuffer.c
new file mode 100644
index 00000000000..c33e6364155
--- /dev/null
+++ b/graphics/MesaLib/patches/patch-src_mesa_drivers_dri_i915_intel__batchbuffer.c
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_mesa_drivers_dri_i915_intel__batchbuffer.c,v 1.1 2013/05/16 05:22:02 richard Exp $
+
+--- src/mesa/drivers/dri/i915/intel_batchbuffer.c.orig	2011-10-15 04:29:59.000000000 +0000
++++ src/mesa/drivers/dri/i915/intel_batchbuffer.c
+@@ -427,8 +427,10 @@ intel_batchbuffer_emit_mi_flush(struct i
+ 	 OUT_BATCH(PIPE_CONTROL_INSTRUCTION_FLUSH |
+ 		   PIPE_CONTROL_WRITE_FLUSH |
+ 		   PIPE_CONTROL_DEPTH_CACHE_FLUSH |
++		   PIPE_CONTROL_VF_CACHE_INVALIDATE |
+ 		   PIPE_CONTROL_TC_FLUSH |
+-		   PIPE_CONTROL_NO_WRITE);
++		   PIPE_CONTROL_NO_WRITE |
++		   PIPE_CONTROL_CS_STALL);
+ 	 OUT_BATCH(0); /* write address */
+ 	 OUT_BATCH(0); /* write data */
+ 	 ADVANCE_BATCH();
diff --git a/graphics/MesaLib/patches/patch-src_mesa_drivers_dri_i915_intel__tris.c b/graphics/MesaLib/patches/patch-src_mesa_drivers_dri_i915_intel__tris.c
new file mode 100644
index 00000000000..d410fa42942
--- /dev/null
+++ b/graphics/MesaLib/patches/patch-src_mesa_drivers_dri_i915_intel__tris.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_mesa_drivers_dri_i915_intel__tris.c,v 1.1 2013/05/16 05:22:02 richard Exp $
+
+--- src/mesa/drivers/dri/i915/intel_tris.c.orig	2011-10-15 00:43:58.000000000 +0000
++++ src/mesa/drivers/dri/i915/intel_tris.c
+@@ -337,7 +337,7 @@ void intel_finish_vb(struct intel_contex
+  *                    Emit primitives as inline vertices               *
+  ***********************************************************************/
+ 
+-#ifdef __i386__
++#if (defined(i386) || defined(__i386__)) && !(defined(__SOLARIS__) || defined(sun))
+ #define COPY_DWORDS( j, vb, vertsize, v )			\
+ do {								\
+    int __tmp;							\
diff --git a/graphics/MesaLib/patches/patch-src_mesa_drivers_dri_i965_brw__draw.c b/graphics/MesaLib/patches/patch-src_mesa_drivers_dri_i965_brw__draw.c
new file mode 100644
index 00000000000..f46659bbd7a
--- /dev/null
+++ b/graphics/MesaLib/patches/patch-src_mesa_drivers_dri_i965_brw__draw.c
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_mesa_drivers_dri_i965_brw__draw.c,v 1.1 2013/05/16 05:22:02 richard Exp $
+
+--- src/mesa/drivers/dri/i965/brw_draw.c.orig	2013-04-23 05:46:06.246377394 +0000
++++ src/mesa/drivers/dri/i965/brw_draw.c
+@@ -168,7 +168,7 @@ static void brw_emit_prim(struct brw_con
+     * and missed flushes of the render cache as it heads to other parts of
+     * the besides the draw code.
+     */
+-   if (intel->always_flush_cache) {
++   if ((intel->always_flush_cache) || (intel->gen == 6)) {
+       intel_batchbuffer_emit_mi_flush(intel);
+    }
+ 
+@@ -185,7 +185,7 @@ static void brw_emit_prim(struct brw_con
+ 
+    intel->batch.need_workaround_flush = true;
+ 
+-   if (intel->always_flush_cache) {
++   if ((intel->always_flush_cache) || (intel->gen == 6)) {
+       intel_batchbuffer_emit_mi_flush(intel);
+    }
+ }
diff --git a/graphics/MesaLib/patches/patch-src_mesa_drivers_dri_i965_brw__draw__upload.c b/graphics/MesaLib/patches/patch-src_mesa_drivers_dri_i965_brw__draw__upload.c
new file mode 100644
index 00000000000..d163a3bfd26
--- /dev/null
+++ b/graphics/MesaLib/patches/patch-src_mesa_drivers_dri_i965_brw__draw__upload.c
@@ -0,0 +1,19 @@
+$NetBSD: patch-src_mesa_drivers_dri_i965_brw__draw__upload.c,v 1.1 2013/05/16 05:22:02 richard Exp $
+
+--- src/mesa/drivers/dri/i965/brw_draw_upload.c.orig	2011-10-15 00:43:58.000000000 +0000
++++ src/mesa/drivers/dri/i965/brw_draw_upload.c
+@@ -531,8 +531,14 @@ static void brw_emit_vertices(struct brw
+    struct intel_context *intel = intel_context(ctx);
+    GLuint i;
+ 
++   /* workaround for gen6, reserve enough space for HW workaround */
++   if (intel->gen == 6) {
++	if (intel_batchbuffer_space(intel) < (13 + 4*brw->vb.nr_buffers + 2* brw->vb.nr_enabled)*4)
++	    intel_batchbuffer_flush(intel);
++   }
+    brw_emit_query_begin(brw);
+ 
++
+    /* If the VS doesn't read any inputs (calculating vertex position from
+     * a state variable for some reason, for example), emit a single pad
+     * VERTEX_ELEMENT struct and bail.
diff --git a/graphics/MesaLib/patches/patch-src_mesa_drivers_dri_i965_brw__misc__state.c b/graphics/MesaLib/patches/patch-src_mesa_drivers_dri_i965_brw__misc__state.c
new file mode 100644
index 00000000000..ae2002fdefa
--- /dev/null
+++ b/graphics/MesaLib/patches/patch-src_mesa_drivers_dri_i965_brw__misc__state.c
@@ -0,0 +1,142 @@
+$NetBSD: patch-src_mesa_drivers_dri_i965_brw__misc__state.c,v 1.1 2013/05/16 05:22:02 richard Exp $
+
+--- src/mesa/drivers/dri/i965/brw_misc_state.c.orig	2013-04-23 05:46:06.246006959 +0000
++++ src/mesa/drivers/dri/i965/brw_misc_state.c
+@@ -223,6 +223,12 @@ static void emit_depthbuffer(struct brw_
+    struct intel_region *hiz_region = depth_irb ? depth_irb->hiz_region : NULL;
+    unsigned int len;
+ 
++   /* workaround for gen6, reserve enough space for HW workaround */
++   if (intel->gen == 6) {
++      if (intel_batchbuffer_space(intel) < 31*4)
++         intel_batchbuffer_flush(intel);
++   }
++
+    /* 3DSTATE_DEPTH_BUFFER, 3DSTATE_STENCIL_BUFFER are both
+     * non-pipelined state that will need the PIPE_CONTROL workaround.
+     */
+@@ -456,6 +462,12 @@ static void upload_polygon_stipple(struc
+    if (!ctx->Polygon.StippleFlag)
+       return;
+ 
++   /* workaround for gen6, reserve enough space for HW workaround */
++   if (intel->gen == 6) {
++      if (intel_batchbuffer_space(intel) < 41*4)
++         intel_batchbuffer_flush(intel);
++   }
++
+    if (intel->gen == 6)
+       intel_emit_post_sync_nonzero_flush(intel);
+ 
+@@ -504,6 +516,12 @@ static void upload_polygon_stipple_offse
+    if (!ctx->Polygon.StippleFlag)
+       return;
+ 
++   /* workaround for gen6, reserve enough space for HW workaround */
++   if (intel->gen == 6) {
++      if (intel_batchbuffer_space(intel) < 10*4)
++         intel_batchbuffer_flush(intel);
++   }
++
+    if (intel->gen == 6)
+       intel_emit_post_sync_nonzero_flush(intel);
+ 
+@@ -548,6 +566,12 @@ static void upload_aa_line_parameters(st
+    if (!ctx->Line.SmoothFlag || !brw->has_aa_line_parameters)
+       return;
+ 
++   /* workaround for gen6, reserve enough space for HW workaround */
++   if (intel->gen == 6) {
++      if (intel_batchbuffer_space(intel) < 11*4)
++         intel_batchbuffer_flush(intel);
++   }
++
+    if (intel->gen == 6)
+       intel_emit_post_sync_nonzero_flush(intel);
+ 
+@@ -581,6 +605,12 @@ static void upload_line_stipple(struct b
+    if (!ctx->Line.StippleFlag)
+       return;
+ 
++   /* workaround for gen6, reserve enough space for HW workaround */
++   if (intel->gen == 6) {
++      if (intel_batchbuffer_space(intel) < 11*4)
++         intel_batchbuffer_flush(intel);
++   }
++
+    if (intel->gen == 6)
+       intel_emit_post_sync_nonzero_flush(intel);
+ 
+@@ -612,8 +642,62 @@ static void upload_invarient_state( stru
+    struct intel_context *intel = &brw->intel;
+ 
+    /* 3DSTATE_SIP, 3DSTATE_MULTISAMPLE, etc. are nonpipelined. */
+-   if (intel->gen == 6)
+-      intel_emit_post_sync_nonzero_flush(intel);
++   if (intel->gen == 6) {
++      int i;
++
++      if (intel->batch.need_workaround_flush) {
++
++         BEGIN_BATCH(33);
++         OUT_BATCH(_3DSTATE_PIPE_CONTROL);
++         OUT_BATCH(PIPE_CONTROL_CS_STALL |
++	     PIPE_CONTROL_STALL_AT_SCOREBOARD);
++         OUT_BATCH(0); /* address */
++         OUT_BATCH(0); /* write data */
++
++         OUT_BATCH(_3DSTATE_PIPE_CONTROL);
++         OUT_BATCH(PIPE_CONTROL_WRITE_IMMEDIATE);
++         OUT_RELOC(intel->batch.workaround_bo,
++	     I915_GEM_DOMAIN_INSTRUCTION, I915_GEM_DOMAIN_INSTRUCTION, 0);
++         OUT_BATCH(0); /* write data */
++      } else
++	 BEGIN_BATCH(25);
++      /* Select the 3D pipeline (as opposed to media) */
++      OUT_BATCH(brw->CMD_PIPELINE_SELECT << 16 | 0);
++
++      OUT_BATCH(_3DSTATE_MULTISAMPLE << 16 | (1));
++      OUT_BATCH(MS_PIXEL_LOCATION_CENTER |
++                MS_NUMSAMPLES_1);
++      OUT_BATCH(0); /* positions for 4/8-sample */
++
++      OUT_BATCH(_3DSTATE_SAMPLE_MASK << 16 | (2 - 2));
++      OUT_BATCH(1);
++
++      if (intel->gen < 7) {
++         for (i = 0; i < 4; i++) {
++            OUT_BATCH(_3DSTATE_GS_SVB_INDEX << 16 | (4 - 2));
++            OUT_BATCH(i << SVB_INDEX_SHIFT);
++            OUT_BATCH(0);
++            OUT_BATCH(0xffffffff);
++         }
++      }
++
++      /* 0x61020000  State Instruction Pointer */
++      {
++         OUT_BATCH(CMD_STATE_INSN_POINTER);
++         OUT_BATCH(0);
++      }
++
++
++      {
++         OUT_BATCH(brw->CMD_VF_STATISTICS << 16 |
++            (unlikely(INTEL_DEBUG & DEBUG_STATS) ? 1 : 0));
++      }
++      ADVANCE_BATCH();
++
++      if (intel->batch.need_workaround_flush)
++         intel->batch.need_workaround_flush = false;
++
++   } else {
+ 
+    {
+       /* 0x61040000  Pipeline Select */
+@@ -693,6 +777,7 @@ static void upload_invarient_state( stru
+ 
+       BRW_BATCH_STRUCT(brw, &vfs);
+    }
++   }
+ }
+ 
+ const struct brw_tracked_state brw_invarient_state = {
diff --git a/graphics/MesaLib/patches/patch-src_mesa_drivers_dri_i965_gen6__vs__state.c b/graphics/MesaLib/patches/patch-src_mesa_drivers_dri_i965_gen6__vs__state.c
new file mode 100644
index 00000000000..c3efd0cb230
--- /dev/null
+++ b/graphics/MesaLib/patches/patch-src_mesa_drivers_dri_i965_gen6__vs__state.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_mesa_drivers_dri_i965_gen6__vs__state.c,v 1.1 2013/05/16 05:22:02 richard Exp $
+
+--- src/mesa/drivers/dri/i965/gen6_vs_state.c.orig	2011-11-23 01:09:52.000000000 +0000
++++ src/mesa/drivers/dri/i965/gen6_vs_state.c
+@@ -120,6 +120,12 @@ upload_vs_state(struct brw_context *brw)
+ {
+    struct intel_context *intel = &brw->intel;
+ 
++   /* workaround for gen6, reserve enough space for HW workaround */
++   if (intel->gen == 6) {
++       if (intel_batchbuffer_space(intel) < 23*4)
++           intel_batchbuffer_flush(intel);
++   }
++
+    if (brw->vs.push_const_size == 0) {
+       /* Disable the push constant buffers. */
+       BEGIN_BATCH(5);
diff --git a/graphics/MesaLib/patches/patch-src_mesa_drivers_dri_i965_gen6__wm__state.c b/graphics/MesaLib/patches/patch-src_mesa_drivers_dri_i965_gen6__wm__state.c
new file mode 100644
index 00000000000..3eee4a30019
--- /dev/null
+++ b/graphics/MesaLib/patches/patch-src_mesa_drivers_dri_i965_gen6__wm__state.c
@@ -0,0 +1,38 @@
+$NetBSD: patch-src_mesa_drivers_dri_i965_gen6__wm__state.c,v 1.1 2013/05/16 05:22:02 richard Exp $
+
+--- src/mesa/drivers/dri/i965/gen6_wm_state.c.orig	2011-10-15 00:43:58.000000000 +0000
++++ src/mesa/drivers/dri/i965/gen6_wm_state.c
+@@ -102,15 +102,14 @@ upload_wm_state(struct brw_context *brw)
+     /* CACHE_NEW_WM_PROG */
+    if (brw->wm.prog_data->nr_params == 0) {
+       /* Disable the push constant buffers. */
+-      BEGIN_BATCH(5);
++      BEGIN_BATCH(14);
+       OUT_BATCH(_3DSTATE_CONSTANT_PS << 16 | (5 - 2));
+       OUT_BATCH(0);
+       OUT_BATCH(0);
+       OUT_BATCH(0);
+       OUT_BATCH(0);
+-      ADVANCE_BATCH();
+    } else {
+-      BEGIN_BATCH(5);
++      BEGIN_BATCH(14);
+       OUT_BATCH(_3DSTATE_CONSTANT_PS << 16 |
+ 		GEN6_CONSTANT_BUFFER_0_ENABLE |
+ 		(5 - 2));
+@@ -123,7 +122,6 @@ upload_wm_state(struct brw_context *brw)
+       OUT_BATCH(0);
+       OUT_BATCH(0);
+       OUT_BATCH(0);
+-      ADVANCE_BATCH();
+    }
+ 
+    dw2 = dw4 = dw5 = dw6 = 0;
+@@ -183,7 +181,6 @@ upload_wm_state(struct brw_context *brw)
+    dw6 |= brw_count_bits(brw->fragment_program->Base.InputsRead) <<
+       GEN6_WM_NUM_SF_OUTPUTS_SHIFT;
+ 
+-   BEGIN_BATCH(9);
+    OUT_BATCH(_3DSTATE_WM << 16 | (9 - 2));
+    OUT_BATCH(brw->wm.prog_offset);
+    OUT_BATCH(dw2);
diff --git a/graphics/MesaLib/patches/patch-src_mesa_drivers_dri_i965_intel__batchbuffer.c b/graphics/MesaLib/patches/patch-src_mesa_drivers_dri_i965_intel__batchbuffer.c
new file mode 100644
index 00000000000..20bb87b5c23
--- /dev/null
+++ b/graphics/MesaLib/patches/patch-src_mesa_drivers_dri_i965_intel__batchbuffer.c
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_mesa_drivers_dri_i965_intel__batchbuffer.c,v 1.1 2013/05/16 05:22:02 richard Exp $
+
+--- src/mesa/drivers/dri/i965/intel_batchbuffer.c.orig	2011-10-15 04:29:59.000000000 +0000
++++ src/mesa/drivers/dri/i965/intel_batchbuffer.c
+@@ -427,8 +427,10 @@ intel_batchbuffer_emit_mi_flush(struct i
+ 	 OUT_BATCH(PIPE_CONTROL_INSTRUCTION_FLUSH |
+ 		   PIPE_CONTROL_WRITE_FLUSH |
+ 		   PIPE_CONTROL_DEPTH_CACHE_FLUSH |
++		   PIPE_CONTROL_VF_CACHE_INVALIDATE |
+ 		   PIPE_CONTROL_TC_FLUSH |
+-		   PIPE_CONTROL_NO_WRITE);
++		   PIPE_CONTROL_NO_WRITE |
++		   PIPE_CONTROL_CS_STALL);
+ 	 OUT_BATCH(0); /* write address */
+ 	 OUT_BATCH(0); /* write data */
+ 	 ADVANCE_BATCH();
diff --git a/graphics/MesaLib/patches/patch-src_mesa_drivers_dri_intel_intel__context.c b/graphics/MesaLib/patches/patch-src_mesa_drivers_dri_intel_intel__context.c
new file mode 100644
index 00000000000..d40410275ed
--- /dev/null
+++ b/graphics/MesaLib/patches/patch-src_mesa_drivers_dri_intel_intel__context.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_mesa_drivers_dri_intel_intel__context.c,v 1.1 2013/05/16 05:22:02 richard Exp $
+
+--- src/mesa/drivers/dri/intel/intel_context.c.orig	2011-11-23 01:10:52.000000000 +0000
++++ src/mesa/drivers/dri/intel/intel_context.c
+@@ -737,7 +737,7 @@ intelInitContext(struct intel_context *i
+    driParseConfigFiles(&intel->optionCache, &intelScreen->optionCache,
+                        sPriv->myNum, (intel->gen >= 4) ? "i965" : "i915");
+    if (intel->gen < 4)
+-      intel->maxBatchSize = 4096;
++      intel->maxBatchSize = 2*4096;
+    else
+       intel->maxBatchSize = sizeof(intel->batch.map);
+ 
diff --git a/graphics/MesaLib/patches/patch-src_mesa_drivers_dri_intel_intel__context.h b/graphics/MesaLib/patches/patch-src_mesa_drivers_dri_intel_intel__context.h
new file mode 100644
index 00000000000..707eb35a964
--- /dev/null
+++ b/graphics/MesaLib/patches/patch-src_mesa_drivers_dri_intel_intel__context.h
@@ -0,0 +1,27 @@
+$NetBSD: patch-src_mesa_drivers_dri_intel_intel__context.h,v 1.1 2013/05/16 05:22:02 richard Exp $
+
+--- src/mesa/drivers/dri/intel/intel_context.h.orig	2011-10-15 00:43:58.000000000 +0000
++++ src/mesa/drivers/dri/intel/intel_context.h
+@@ -304,8 +304,12 @@ struct intel_context
+    driOptionCache optionCache;
+ };
+ 
++#if defined(__sun)
++#include <stdlib.h>
++#define __progname getexecname()
++#else
+ extern char *__progname;
+-
++#endif
+ 
+ #define SUBPIXEL_X 0.125
+ #define SUBPIXEL_Y 0.125
+@@ -364,7 +368,7 @@ do {						\
+  * than COPY_DWORDS would:
+  * XXX Put this in src/mesa/main/imports.h ???
+  */
+-#if defined(i386) || defined(__i386__)
++#if (defined(i386) || defined(__i386__)) && !(defined(__SOLARIS__) || defined(sun))
+ static INLINE void * __memcpy(void * to, const void * from, size_t n)
+ {
+    int d0, d1, d2;
diff --git a/graphics/MesaLib/patches/patch-src_mesa_drivers_dri_mach64_mach64__context.h b/graphics/MesaLib/patches/patch-src_mesa_drivers_dri_mach64_mach64__context.h
new file mode 100644
index 00000000000..f363c1c293d
--- /dev/null
+++ b/graphics/MesaLib/patches/patch-src_mesa_drivers_dri_mach64_mach64__context.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_mesa_drivers_dri_mach64_mach64__context.h,v 1.1 2013/05/16 05:22:02 richard Exp $
+
+--- src/mesa/drivers/dri/mach64/mach64_context.h.orig	2011-10-15 00:43:58.000000000 +0000
++++ src/mesa/drivers/dri/mach64/mach64_context.h
+@@ -37,7 +37,7 @@
+ #include "mach64_drm.h"
+ 
+ #include "main/mtypes.h"
+-
++#include "main/macros.h"
+ #include "mach64_reg.h"
+ 
+ #include "texmem.h"
diff --git a/graphics/MesaLib/patches/patch-src_mesa_main_compiler.h b/graphics/MesaLib/patches/patch-src_mesa_main_compiler.h
new file mode 100644
index 00000000000..52c14c5a08b
--- /dev/null
+++ b/graphics/MesaLib/patches/patch-src_mesa_main_compiler.h
@@ -0,0 +1,27 @@
+$NetBSD: patch-src_mesa_main_compiler.h,v 1.1 2013/05/16 05:22:02 richard Exp $
+
+--- src/mesa/main/compiler.h.orig	2011-11-23 01:09:52.000000000 +0000
++++ src/mesa/main/compiler.h
+@@ -248,7 +248,11 @@ extern "C" {
+  * Try to use a runtime test instead.
+  * For now, only used by some DRI hardware drivers for color/texel packing.
+  */
+-#if defined(BYTE_ORDER) && defined(BIG_ENDIAN) && BYTE_ORDER == BIG_ENDIAN
++#ifdef __sun
++#include <sys/isa_defs.h>
++#endif
++
++#if (defined(BYTE_ORDER) && defined(BIG_ENDIAN) && BYTE_ORDER == BIG_ENDIAN) || defined(_BIG_ENDIAN)
+ #if defined(__linux__)
+ #include <byteswap.h>
+ #define CPU_TO_LE32( x )	bswap_32( x )
+@@ -263,6 +267,9 @@ static INLINE GLuint CPU_TO_LE32(GLuint
+            ((x & 0x00ff0000) >>  8) |
+            ((x & 0xff000000) >> 24));
+ }
++#elif defined(__sun)
++#include <sys/byteorder.h>
++#define CPU_TO_LE32( x )        BSWAP_32( x )
+ #else /*__linux__ */
+ #include <sys/endian.h>
+ #define CPU_TO_LE32( x )	bswap32( x )
diff --git a/graphics/MesaLib/patches/patch-src_mesa_main_imports.c b/graphics/MesaLib/patches/patch-src_mesa_main_imports.c
new file mode 100644
index 00000000000..aee10dba04c
--- /dev/null
+++ b/graphics/MesaLib/patches/patch-src_mesa_main_imports.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_mesa_main_imports.c,v 1.1 2013/05/16 05:22:02 richard Exp $
+
+--- src/mesa/main/imports.c.orig	2011-10-15 00:43:58.000000000 +0000
++++ src/mesa/main/imports.c
+@@ -514,7 +514,7 @@ _mesa_ffsll(int64_t val)
+ #endif
+ 
+ #if !defined(__GNUC__) ||\
+-   ((_GNUC__ == 3 && __GNUC_MINOR__ < 4) && __GNUC__ < 4)
++   ((__GNUC__ == 3 && __GNUC_MINOR__ < 4) && __GNUC__ < 4)
+ /**
+  * Return number of bits set in given GLuint.
+  */
diff --git a/graphics/MesaLib/patches/patch-src_mesa_main_imports.h b/graphics/MesaLib/patches/patch-src_mesa_main_imports.h
new file mode 100644
index 00000000000..21b1466206a
--- /dev/null
+++ b/graphics/MesaLib/patches/patch-src_mesa_main_imports.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_mesa_main_imports.h,v 1.1 2013/05/16 05:22:02 richard Exp $
+
+--- src/mesa/main/imports.h.orig	2011-10-15 00:43:58.000000000 +0000
++++ src/mesa/main/imports.h
+@@ -570,7 +570,7 @@ _mesa_init_sqrt_table(void);
+ #define _mesa_ffs(i)  ffs(i)
+ #define _mesa_ffsll(i)  ffsll(i)
+ 
+-#if ((_GNUC__ == 3 && __GNUC_MINOR__ >= 4) || __GNUC__ >= 4)
++#if ((__GNUC__ == 3 && __GNUC_MINOR__ >= 4) || __GNUC__ >= 4)
+ #define _mesa_bitcount(i) __builtin_popcount(i)
+ #else
+ extern unsigned int
author	richard <richard@pkgsrc.org>	2013-05-16 05:22:02 +0000
committer	richard <richard@pkgsrc.org>	2013-05-16 05:22:02 +0000
commit	53523cefe4b3c3623d86a3be7a75b062dfc9c80d (patch)
tree	a9ab59272c2f6b0cbb8397af320167dcbd235f03 /graphics
parent	9a92a3b230e369a619ed3910ac4eb3266a2cef94 (diff)
download	pkgsrc-53523cefe4b3c3623d86a3be7a75b062dfc9c80d.tar.gz