- Move ports/branches/xorg-dev to ports/trunk/xorg-dev

git-svn-id: https://trillian.chruetertee.ch/svn/ports/branches/xorg-dev@388 058c260c-8361-11dd-a0ac-aa2bafec7d09

43 files changed, 0 insertions, 1018 deletions

diff --git a/graphics/dri/Makefile b/graphics/dri/Makefile
deleted file mode 100644
index 922c37e..0000000
--- a/graphics/dri/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# New ports collection makefile for:    dri
-# Date created:		8 Nov 2003
-# Whom:			anholt@FreeBSD.org
-#
-# $FreeBSD$
-#
-
-PORTNAME=	dri
-PORTVERSION=	${MESAVERSION}
-PORTEPOCH=	2
-CATEGORIES=	graphics
-
-COMMENT=	OpenGL hardware acceleration drivers for the DRI
-
-LIB_DEPENDS=	drm:${PORTSDIR}/graphics/libdrm \
-		expat.6:${PORTSDIR}/textproc/expat2
-
-USE_XORG=	glproto x11 xext xxf86vm xdamage xfixes dri2proto
-
-do-install:
-	cd ${WRKSRC}/src/mesa; ${GMAKE} install-dri
-
-.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "ia64"
-BROKEN=		Does not install on ia64
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/graphics/dri/distinfo b/graphics/dri/distinfo
deleted file mode 100644
index 106ab0b..0000000
--- a/graphics/dri/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-SHA256 (MesaLib-7.6.1.tar.bz2) = 701f0e4cb85d6298181651b780d1c0a439fadd02aad29ee6623fc05588bb8d44
-SIZE (MesaLib-7.6.1.tar.bz2) = 4886995
-SHA256 (MesaLib-7.11.2.tar.bz2) = 57746aa8c60bc6f5596ec6c6c7274de40fa12edce5ec33fe899e704fa00b5357
-SIZE (MesaLib-7.11.2.tar.bz2) = 6257280
diff --git a/graphics/dri/pkg-descr b/graphics/dri/pkg-descr
deleted file mode 100644
index 776a52a..0000000
--- a/graphics/dri/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-This package contains the current stable release of the client drivers for the
-DRI.  With an X Server configured for the DRI they allow direct rendering of
-hardware-accelerated OpenGL.
-
-WWW: http://dri.sourceforge.net/
diff --git a/graphics/dri/pkg-plist b/graphics/dri/pkg-plist
deleted file mode 100644
index 0025383..0000000
--- a/graphics/dri/pkg-plist
+++ /dev/null
@@ -1,21 +0,0 @@
-include/GL/internal/dri_interface.h
-lib/dri/i810_dri.so
-lib/dri/i915_dri.so
-lib/dri/i965_dri.so
-lib/dri/mach64_dri.so
-lib/dri/mga_dri.so
-%%NEW%%lib/dri/nouveau_vieux_dri.so
-lib/dri/r128_dri.so
-lib/dri/r200_dri.so
-lib/dri/r300_dri.so
-lib/dri/r600_dri.so
-lib/dri/radeon_dri.so
-lib/dri/savage_dri.so
-lib/dri/sis_dri.so
-lib/dri/swrast_dri.so
-lib/dri/tdfx_dri.so
-lib/dri/unichrome_dri.so
-libdata/pkgconfig/dri.pc
-@dirrm lib/dri
-@dirrmtry include/GL/internal
-@dirrmtry include/GL
diff --git a/graphics/libGL/Makefile b/graphics/libGL/Makefile
deleted file mode 100644
index f3f054a..0000000
--- a/graphics/libGL/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# New ports collection makefile for:    xorg-server
-# Date created:		7 May 2004
-# Whom:			anholt@FreeBSD.org
-#
-# $FreeBSD$
-#
-
-PORTNAME=	libGL
-PORTVERSION=	${MESAVERSION}
-CATEGORIES=	graphics
-
-COMMENT=	OpenGL library that renders using GLX or DRI
-
-LIB_DEPENDS+=	drm:${PORTSDIR}/graphics/libdrm \
-		expat.6:${PORTSDIR}/textproc/expat2
-
-USE_XORG=	glproto x11 xext xxf86vm xdamage xfixes dri2proto:both
-
-do-install:
-	${RM} -f ${WRKSRC}/include/GL/glu*.h
-	cd ${WRKSRC}/src/mesa; ${GMAKE} install-libgl
-
-.include "${.CURDIR}/bsd.mesalib.mk"
-.include <bsd.port.mk>
diff --git a/graphics/libGL/bsd.mesalib.mk b/graphics/libGL/bsd.mesalib.mk
deleted file mode 100644
index c01d7f4..0000000
--- a/graphics/libGL/bsd.mesalib.mk
+++ /dev/null
@@ -1,114 +0,0 @@
-#-*- mode: Fundamental; tab-width: 4; -*-
-# ex:ts=4
-#
-# bsd.mesa.mk - an attempt to refactor MesaLib ports.
-#
-# Created by: Florent Thoumie <flz@FreeBSD.org>
-#
-# !!! Here be dragons !!! (they seem to be everywhere these days)
-#
-# Remember to upgrade the following ports everytime you bump MESAVERSION:
-#
-#    - graphics/libGL
-#    - graphics/libGLU
-#    - graphics/libGLw
-#    - graphics/libglut
-#    - graphics/dri
-#
-# $FreeBSD$
-#
-
-MESAVERSION=	${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/}
-MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/}
-
-.if defined(WITH_NEW_XORG)
-MESABASEVERSION=	7.11.2
-# if there is a subversion, include the '-' between 7.11-rc2 for example.
-MESASUBVERSION=		
-PLIST_SUB+=	OLD="@comment " NEW=""
-.else
-MESABASEVERSION=	7.6.1
-MESASUBVERSION=		
-PLIST_SUB+=	OLD="" NEW="@comment "
-.endif
-
-MASTER_SITES=	ftp://ftp.freedesktop.org/pub/mesa/${MESABASEVERSION}/:mesa,glut
-DISTFILES=	MesaLib-${MESADISTVERSION}${EXTRACT_SUFX}:mesa
-MAINTAINER?=	x11@FreeBSD.org
-
-BUILD_DEPENDS+=	makedepend:${PORTSDIR}/devel/makedepend \
-		${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2
-
-USE_BISON=	build
-USE_PYTHON_BUILD=yes
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_LDCONFIG=	yes
-GNU_CONFIGURE=	yes
-MAKE_JOBS_SAFE=	yes
-
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ARGS+=--enable-gallium-llvm=no --without-gallium-drivers \
-		--disable-egl
-
-.if defined(WITH_NEW_XORG)
-EXTRA_PATCHES+=	${PATCHDIR}/extra-mach64_context.h \
-		${PATCHDIR}/extra-sis_context.h \
-		${PATCHDIR}/extra-src-glsl_ir_constant_expression.cpp
-.else
-EXTRA_PATCHES+=	${PATCHDIR}/extra-src__mesa__x86-64__glapi_x86-64.S \
-		${PATCHDIR}/extra-src__mesa__x86-64__xform4.S \
-		${PATCHDIR}/extra-src__mesa__x86__glapi_x86.S \
-		${PATCHDIR}/extra-src__mesa__x86__read_rgba_span_x86.S
-.endif
-
-ALL_TARGET=		default
-
-PATCHDIR=		${.CURDIR}/../../graphics/libGL/files
-WRKSRC=			${WRKDIR}/Mesa-${MESABASEVERSION}${MESASUBVERSION}
-
-.if !defined(ARCH)
-ARCH!=			uname -p
-.endif
-
-COMPONENT=		${PORTNAME:L:C/^lib//:C/mesa-//}
-
-.if ${COMPONENT:Mglut} == ""
-. if ${COMPONENT:Mglu} == ""
-CONFIGURE_ARGS+=	--disable-glu --disable-glut
-. else
-CONFIGURE_ARGS+=	--disable-glut
-. endif
-.else
-DISTFILES+=		MesaGLUT-${MESADISTVERSION}${EXTRACT_SUFX}:glut
-.endif
-
-.if ${COMPONENT:Mglw} == ""
-CONFIGURE_ARGS+=	--disable-glw
-.else
-CONFIGURE_ARGS+=	--enable-motif
-.endif
-
-.if ${COMPONENT:Mdri} == ""
-CONFIGURE_ARGS+=	--with-dri-drivers=no
-.endif
-
-.if defined(WITHOUT_XCB)
-CONFIGURE_ARGS+=	--disable-xcb
-.else
-CONFIGURE_ARGS+=	--enable-xcb
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|-ffast-math|${FAST_MATH}|' -e 's|x86_64|amd64|' \
-		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|[$$](INSTALL_LIB_DIR)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
-		${WRKSRC}/src/glu/Makefile \
-		${WRKSRC}/src/glw/Makefile \
-		${WRKSRC}/src/mesa/Makefile \
-		${WRKSRC}/src/mesa/drivers/dri/Makefile
-.if ${COMPONENT:Mglut} != ""
-	@${REINPLACE_CMD} -e 's|[$$](INSTALL_LIB_DIR)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
-		${WRKSRC}/src/glut/glx/Makefile
-.endif
diff --git a/graphics/libGL/distinfo b/graphics/libGL/distinfo
deleted file mode 100644
index 106ab0b..0000000
--- a/graphics/libGL/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-SHA256 (MesaLib-7.6.1.tar.bz2) = 701f0e4cb85d6298181651b780d1c0a439fadd02aad29ee6623fc05588bb8d44
-SIZE (MesaLib-7.6.1.tar.bz2) = 4886995
-SHA256 (MesaLib-7.11.2.tar.bz2) = 57746aa8c60bc6f5596ec6c6c7274de40fa12edce5ec33fe899e704fa00b5357
-SIZE (MesaLib-7.11.2.tar.bz2) = 6257280
diff --git a/graphics/libGL/files/extra-mach64_context.h b/graphics/libGL/files/extra-mach64_context.h
deleted file mode 100644
index f844599..0000000
--- a/graphics/libGL/files/extra-mach64_context.h
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/mesa/drivers/dri/mach64/mach64_context.h.orig	2011-05-13 01:47:18.000000000 +0200
-+++ src/mesa/drivers/dri/mach64/mach64_context.h	2011-07-27 09:59:53.000000000 +0200
-@@ -289,7 +289,7 @@
- /* ================================================================
-  * Byte ordering
-  */
--#if MESA_LITTLE_ENDIAN == 1
-+#if defined(MESA_LITTLE_ENDIAN) && MESA_LITTLE_ENDIAN == 1
- #define LE32_IN( x )		( *(GLuint *)(x) )
- #define LE32_IN_FLOAT( x )	( *(GLfloat *)(x) )
- #define LE32_OUT( x, y )	do { *(GLuint *)(x) = (y); } while (0)
-@@ -298,6 +298,9 @@
- #if defined(__OpenBSD__) || defined(__NetBSD__)
- #include <machine/endian.h>
- #define bswap_32 bswap32
-+#elif defined(__FreeBSD__)
-+#include <sys/endian.h>
-+#define bswap_32 bswap32
- #else
- #include <byteswap.h>
- #endif
diff --git a/graphics/libGL/files/extra-sis_context.h b/graphics/libGL/files/extra-sis_context.h
deleted file mode 100644
index 0e16f51..0000000
--- a/graphics/libGL/files/extra-sis_context.h
+++ /dev/null
@@ -1,22 +0,0 @@
---- src/mesa/drivers/dri/sis/sis_context.h.orig	2010-12-14 22:43:15.000000000 +0100
-+++ src/mesa/drivers/dri/sis/sis_context.h	2011-07-27 09:58:22.000000000 +0200
-@@ -400,10 +400,18 @@
- #define MMIO_READ(reg) *(volatile GLint *)(smesa->IOBase + (reg))
- #define MMIO_READf(reg) *(volatile GLfloat *)(smesa->IOBase + (reg))
- 
--#if defined(__i386__) || defined(__x86_64__)
-+#if defined(__i386__) || defined(__x86_64__) || defined(__amd64__)
- #define MMIO_WMB()	__asm __volatile("" : : : "memory")
- #elif defined(__ia64__)
- #define MMIO_WMB()	__asm __volatile("mf" : : : "memory")
-+#elif defined(__powerpc__)
-+#define MMIO_WMB()	__asm __volatile("eieio" : : : "memory")
-+#elif defined(__sparc64__)
-+/*
-+ * #StoreStore probably would be sufficient for this driver at the
-+ * time of this writing but we use #Sync for safety.
-+ */
-+#define MMIO_WMB()	__asm __volatile("membar #Sync" : : : "memory")
- #else
- #error platform needs WMB
- #endif
diff --git a/graphics/libGL/files/extra-src-glsl_ir_constant_expression.cpp b/graphics/libGL/files/extra-src-glsl_ir_constant_expression.cpp
deleted file mode 100644
index 8df4043..0000000
--- a/graphics/libGL/files/extra-src-glsl_ir_constant_expression.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/glsl/ir_constant_expression.cpp.orig	2011-07-23 15:08:44.000000000 +0200
-+++ src/glsl/ir_constant_expression.cpp	2011-07-23 15:09:03.000000000 +0200
-@@ -39,6 +39,11 @@
- #include "ir_visitor.h"
- #include "glsl_types.h"
- 
-+#include <sys/param.h>
-+#if __FreeBSD_version <= 704100 || (__FreeBSD_version >= 800000 && __FreeBSD_version < 802502) || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900027)
-+#define log2(x) (log(x) / log(2))
-+#endif
-+
- static float
- dot(ir_constant *op0, ir_constant *op1)
- {
diff --git a/graphics/libGL/files/extra-src__mesa__x86-64__glapi_x86-64.S b/graphics/libGL/files/extra-src__mesa__x86-64__glapi_x86-64.S
deleted file mode 100644
index 908a6fe..0000000
--- a/graphics/libGL/files/extra-src__mesa__x86-64__glapi_x86-64.S
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./src/mesa/x86-64/glapi_x86-64.S.orig	2009-03-13 04:28:49.000000000 +0100
-+++ ./src/mesa/x86-64/glapi_x86-64.S	2011-01-28 18:12:18.000000000 +0100
-@@ -73,7 +73,8 @@ _x86_64_get_dispatch:
- 
- 	.p2align	4,,15
- _x86_64_get_dispatch:
--	movq	_gl_DispatchTSD(%rip), %rdi
-+	movq	_gl_DispatchTSD@GOTPCREL(%rip), %rax
-+	movl	(%rax), %edi
- 	jmp	pthread_getspecific@PLT
- 
- #elif defined(THREADS)
diff --git a/graphics/libGL/files/extra-src__mesa__x86-64__xform4.S b/graphics/libGL/files/extra-src__mesa__x86-64__xform4.S
deleted file mode 100644
index 193e6cc..0000000
--- a/graphics/libGL/files/extra-src__mesa__x86-64__xform4.S
+++ /dev/null
@@ -1,74 +0,0 @@
---- src/mesa/x86-64/xform4.S.orig	2009-01-22 18:38:35.000000000 +0100
-+++ src/mesa/x86-64/xform4.S	2011-05-09 21:26:00.000000000 +0200
-@@ -53,7 +53,7 @@ _mesa_x86_64_transform_points4_general:
-  *	rdx = source
-  */
- 	movl V4F_COUNT(%rdx), %ecx	/* count */
--	movzx V4F_STRIDE(%rdx), %eax	/* stride */
-+	movzbl V4F_STRIDE(%rdx), %eax	/* stride */
- 
- 	movl %ecx, V4F_COUNT(%rdi)	/* set dest count */
- 	movl $4, V4F_SIZE(%rdi)		/* set dest size */
-@@ -116,7 +116,7 @@ p4_constants:
- .byte  0x00, 0x00, 0x00, 0x00
- .byte  0x00, 0x00, 0x00, 0x00
- .byte  0x00, 0x00, 0x00, 0x00
--.float 0f+1.0
-+.float 1.0
- 
- .text
- .align 16
-@@ -135,7 +135,7 @@ _mesa_x86_64_transform_points4_3d:
- 	movaps 16(%rax), %xmm10
- 
- 	movl V4F_COUNT(%rdx), %ecx	/* count */
--	movzx V4F_STRIDE(%rdx), %eax	/* stride */
-+	movzbl V4F_STRIDE(%rdx), %eax	/* stride */
- 
- 	movl %ecx, V4F_COUNT(%rdi)	/* set dest count */
- 	movl $4, V4F_SIZE(%rdi)		/* set dest size */
-@@ -195,7 +195,7 @@ p4_3d_done:
- _mesa_x86_64_transform_points4_identity:
- 
- 	movl V4F_COUNT(%rdx), %ecx	/* count */
--	movzx V4F_STRIDE(%rdx), %eax	/* stride */
-+	movzbl V4F_STRIDE(%rdx), %eax	/* stride */
- 
- 	movl %ecx, V4F_COUNT(%rdi)	/* set dest count */
- 	movl $4, V4F_SIZE(%rdi)		/* set dest size */
-@@ -223,7 +223,7 @@ p4_identity_done:
- _mesa_3dnow_transform_points4_3d_no_rot:
- 
- 	movl V4F_COUNT(%rdx), %ecx	/* count */
--	movzx V4F_STRIDE(%rdx), %eax	/* stride */
-+	movzbl V4F_STRIDE(%rdx), %eax	/* stride */
- 
- 	movl %ecx, V4F_COUNT(%rdi)	/* set dest count */
- 	movl $4, V4F_SIZE(%rdi)		/* set dest size */
-@@ -287,7 +287,7 @@ p4_3d_no_rot_done:
- _mesa_3dnow_transform_points4_perspective:
- 
- 	movl V4F_COUNT(%rdx), %ecx	/* count */
--	movzx V4F_STRIDE(%rdx), %eax	/* stride */
-+	movzbl V4F_STRIDE(%rdx), %eax	/* stride */
- 
- 	movl %ecx, V4F_COUNT(%rdi)	/* set dest count */
- 	movl $4, V4F_SIZE(%rdi)		/* set dest size */
-@@ -353,7 +353,7 @@ p4_perspective_done:
- _mesa_3dnow_transform_points4_2d_no_rot:
- 
- 	movl V4F_COUNT(%rdx), %ecx	/* count */
--	movzx V4F_STRIDE(%rdx), %eax	/* stride */
-+	movzbl V4F_STRIDE(%rdx), %eax	/* stride */
- 
- 	movl %ecx, V4F_COUNT(%rdi)	/* set dest count */
- 	movl $4, V4F_SIZE(%rdi)		/* set dest size */
-@@ -408,7 +408,7 @@ p4_2d_no_rot_done:
- _mesa_3dnow_transform_points4_2d:
- 
- 	movl V4F_COUNT(%rdx), %ecx	/* count */
--	movzx V4F_STRIDE(%rdx), %eax	/* stride */
-+	movzbl V4F_STRIDE(%rdx), %eax	/* stride */
- 
- 	movl %ecx, V4F_COUNT(%rdi)	/* set dest count */
- 	movl $4, V4F_SIZE(%rdi)		/* set dest size */
diff --git a/graphics/libGL/files/extra-src__mesa__x86__glapi_x86.S b/graphics/libGL/files/extra-src__mesa__x86__glapi_x86.S
deleted file mode 100644
index 71da78c..0000000
--- a/graphics/libGL/files/extra-src__mesa__x86__glapi_x86.S
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/mesa/x86/glapi_x86.S.orig	2009-03-13 04:28:49.000000000 +0100
-+++ ./src/mesa/x86/glapi_x86.S	2011-01-28 18:11:56.000000000 +0100
-@@ -47,7 +47,7 @@
- #define GL_OFFSET(x) CODEPTR(REGOFF(4 * x, EAX))
- 
- #if defined(GNU_ASSEMBLER) && !defined(__DJGPP__) && !defined(__MINGW32__)
--#define GLOBL_FN(x) GLOBL x ; .type x, function
-+#define GLOBL_FN(x) GLOBL x ; .type x, @function
- #else
- #define GLOBL_FN(x) GLOBL x
- #endif
diff --git a/graphics/libGL/files/extra-src__mesa__x86__read_rgba_span_x86.S b/graphics/libGL/files/extra-src__mesa__x86__read_rgba_span_x86.S
deleted file mode 100644
index 37b08d1..0000000
--- a/graphics/libGL/files/extra-src__mesa__x86__read_rgba_span_x86.S
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/mesa/x86/read_rgba_span_x86.S.orig	2008-08-25 16:46:47.000000000 +0200
-+++ ./src/mesa/x86/read_rgba_span_x86.S	2011-01-28 18:10:06.000000000 +0100
-@@ -648,7 +648,7 @@ _generic_read_RGBA_span_RGB565_MMX:
- 	testl	$0x01, %ecx
- 	je	.L01
- 
--	movzxw	(%eax), %ecx
-+	movzwl	(%eax), %ecx
- 	movd	%ecx, %mm4
- 
- 	pshufw	$0x00, %mm4, %mm0
diff --git a/graphics/libGL/pkg-descr b/graphics/libGL/pkg-descr
deleted file mode 100644
index eeba293..0000000
--- a/graphics/libGL/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-This package contains the OpenGL library, which can perform rendering over GLX
-or using the Direct Rendering Infrastructure.
-
-WWW: http://www.freedesktop.org/Software/xorg
diff --git a/graphics/libGL/pkg-plist b/graphics/libGL/pkg-plist
deleted file mode 100644
index 4125f74..0000000
--- a/graphics/libGL/pkg-plist
+++ /dev/null
@@ -1,20 +0,0 @@
-%%OLD%%include/GL/dmesa.h
-%%OLD%%include/GL/ggimesa.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/mesa_wgl.h
-%%OLD%%include/GL/mglmesa.h
-include/GL/osmesa.h
-%%OLD%%include/GL/svgamesa.h
-include/GL/vms_x_fix.h
-include/GL/wglext.h
-include/GL/wmesa.h
-lib/libGL.so
-lib/libGL.so.1
-libdata/pkgconfig/gl.pc
-@dirrmtry include/GL
diff --git a/graphics/libGLU/Makefile b/graphics/libGLU/Makefile
deleted file mode 100644
index 0a19926..0000000
--- a/graphics/libGLU/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# New ports collection makefile for:    libGLU
-# Date created:		7 May 2004
-# Whom:			anholt@FreeBSD.org
-#
-# $FreeBSD$
-#
-
-PORTNAME=	libGLU
-PORTVERSION=	${MESAVERSION}
-CATEGORIES=	graphics
-
-COMMENT=	OpenGL utility library
-
-USE_GL=		gl
-USE_XORG=	glproto x11 xext xxf86vm xdamage xfixes dri2proto
-
-do-install:
-	@${MKDIR} ${PREFIX}/include/GL/
-	cd ${WRKSRC}/src/glu; ${GMAKE} install
-	${INSTALL_DATA} ${WRKSRC}/include/GL/glu*.h ${PREFIX}/include/GL/
-	cd ${WRKSRC}/src/glu; ${GMAKE} install
-
-.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
-.include <bsd.port.mk>
diff --git a/graphics/libGLU/distinfo b/graphics/libGLU/distinfo
deleted file mode 100644
index 106ab0b..0000000
--- a/graphics/libGLU/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-SHA256 (MesaLib-7.6.1.tar.bz2) = 701f0e4cb85d6298181651b780d1c0a439fadd02aad29ee6623fc05588bb8d44
-SIZE (MesaLib-7.6.1.tar.bz2) = 4886995
-SHA256 (MesaLib-7.11.2.tar.bz2) = 57746aa8c60bc6f5596ec6c6c7274de40fa12edce5ec33fe899e704fa00b5357
-SIZE (MesaLib-7.11.2.tar.bz2) = 6257280
diff --git a/graphics/libGLU/pkg-descr b/graphics/libGLU/pkg-descr
deleted file mode 100644
index 3a7d2e7..0000000
--- a/graphics/libGLU/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This package contains the OpenGL utility library.
-
-WWW: http://www.freedesktop.org/Software/xorg
diff --git a/graphics/libGLU/pkg-plist b/graphics/libGLU/pkg-plist
deleted file mode 100644
index 330c54e..0000000
--- a/graphics/libGLU/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-include/GL/glu.h
-include/GL/glu_mangle.h
-lib/libGLU.so
-lib/libGLU.so.1
-libdata/pkgconfig/glu.pc
diff --git a/graphics/libGLw/Makefile b/graphics/libGLw/Makefile
deleted file mode 100644
index 4c9f14d..0000000
--- a/graphics/libGLw/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# New ports collection makefile for:    libGLw
-# Date created:		7 May 2004
-# Whom:			anholt@FreeBSD.org
-#
-# $FreeBSD$
-#
-
-PORTNAME=	libGLw
-PORTVERSION=	${MESAVERSION}
-CATEGORIES=	graphics
-
-COMMENT=	OpenGL widgets library
-
-USE_GL=		gl
-USE_MOTIF=	yes
-USE_XORG=	glproto xt x11 xext xxf86vm xdamage xfixes dri2proto
-
-do-install:
-	cd ${WRKSRC}/src/glw; ${GMAKE} install
-
-.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
-.include <bsd.port.mk>
diff --git a/graphics/libGLw/distinfo b/graphics/libGLw/distinfo
deleted file mode 100644
index 106ab0b..0000000
--- a/graphics/libGLw/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-SHA256 (MesaLib-7.6.1.tar.bz2) = 701f0e4cb85d6298181651b780d1c0a439fadd02aad29ee6623fc05588bb8d44
-SIZE (MesaLib-7.6.1.tar.bz2) = 4886995
-SHA256 (MesaLib-7.11.2.tar.bz2) = 57746aa8c60bc6f5596ec6c6c7274de40fa12edce5ec33fe899e704fa00b5357
-SIZE (MesaLib-7.11.2.tar.bz2) = 6257280
diff --git a/graphics/libGLw/pkg-descr b/graphics/libGLw/pkg-descr
deleted file mode 100644
index d3a7ea7..0000000
--- a/graphics/libGLw/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-This package contains the OpenGL widgets library.
-
-WWW: http://www.mesa3d.org/
diff --git a/graphics/libGLw/pkg-plist b/graphics/libGLw/pkg-plist
deleted file mode 100644
index 211b586..0000000
--- a/graphics/libGLw/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-include/GL/GLwDrawA.h
-include/GL/GLwDrawAP.h
-include/GL/GLwMDrawA.h
-include/GL/GLwMDrawAP.h
-lib/libGLw.so
-lib/libGLw.so.1
-libdata/pkgconfig/glw.pc
-@dirrmtry include/GL
diff --git a/graphics/libdrm/Makefile b/graphics/libdrm/Makefile
deleted file mode 100644
index 8d859d2..0000000
--- a/graphics/libdrm/Makefile
+++ /dev/null
@@ -1,57 +0,0 @@
-# New ports collection makefile for:	libdrm
-# Date created:				29 Dec 2005
-# Whom:					lesi@FreeBSD.org
-#
-# $FreeBSD$
-#
-
-PORTNAME=	libdrm
-PORTVERSION=	${LIBDRM_VERSION}
-PORTREVISION=	${LIBDRM_REVISION}
-CATEGORIES=	graphics x11
-MASTER_SITES=	http://dri.freedesktop.org/libdrm/
-
-MAINTAINER=	x11@FreeBSD.org
-COMMENT=	Userspace interface to kernel Direct Rendering Module services
-
-BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:${PORTSDIR}/devel/libpthread-stubs
-LIB_DEPENDS=	pciaccess.0:${PORTSDIR}/devel/libpciaccess \
-		pthread-stubs.0:${PORTSDIR}/devel/libpthread-stubs
-RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:${PORTSDIR}/devel/libpthread-stubs
-
-USE_BZIP2=	yes
-GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
-
-CONFIGURE_ARGS=	--enable-nouveau-experimental-api
-
-MAKE_JOBS_SAFE=	yes
-
-.if defined(WITH_NEW_XORG)
-
-OPTIONS=	KMS "Enable KMS support (very experimental)" off
-
-.include <bsd.port.options.mk>
-
-.if defined(WITH_KMS)
-CONFIGURE_ARGS+=--enable-libkms
-EXTRA_PATCHES+=	${FILESDIR}/extra-xf86drmMode.c
-PLIST_SUB+=	KMS=""
-.else
-PLIST_SUB+=	KMS="@comment "
-.endif
-
-LIBDRM_VERSION=	2.4.30
-LIBDRM_REVISION=1
-PLIST_SUB+=	OLD="@comment " NEW=""
-.else
-LIBDRM_VERSION=	2.4.17
-LIBDRM_REVISION=0
-PLIST_SUB+=	OLD="" NEW="@comment "
-.endif
-
-pre-patch:
-	@${REINPLACE_CMD} 's|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig|g' \
-	    ${WRKSRC}/configure
-
-.include <bsd.port.mk>
diff --git a/graphics/libdrm/distinfo b/graphics/libdrm/distinfo
deleted file mode 100644
index 86810e9..0000000
--- a/graphics/libdrm/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-SHA256 (libdrm-2.4.17.tar.bz2) = b8a4e7c610b0e970546d791c06e28882857a49d34698633a89292d7ae142316a
-SIZE (libdrm-2.4.17.tar.bz2) = 408882
-SHA256 (libdrm-2.4.30.tar.bz2) = cacea9c157ec824ad278a06f4910659b2f3ae69686518ece8d6967843cddcd56
-SIZE (libdrm-2.4.30.tar.bz2) = 547931
diff --git a/graphics/libdrm/files/extra-xf86drmMode.c b/graphics/libdrm/files/extra-xf86drmMode.c
deleted file mode 100644
index d91a923..0000000
--- a/graphics/libdrm/files/extra-xf86drmMode.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- xf86drmMode.c.orig	2010-09-08 14:23:39.000000000 +0200
-+++ xf86drmMode.c	2011-07-18 18:59:11.000000000 +0200
-@@ -54,7 +54,7 @@
- 
- static inline DRM_IOCTL(int fd, int cmd, void *arg)
- {
--	int ret = drmIoctl(fd, cmd, arg);
-+	int ret = drmIoctl(fd, (unsigned)cmd, arg);
- 	return ret < 0 ? -errno : ret;
- }
- 
-@@ -659,7 +659,7 @@
- */
- int drmCheckModesettingSupported(const char *busid)
- {
--#ifdef __linux__
-+#if defined (__linux__)
- 	char pci_dev_dir[1024];
- 	int domain, bus, dev, func;
- 	DIR *sysdir;
-@@ -709,6 +709,8 @@
- 	closedir(sysdir);
- 	if (found)
- 		return 0;
-+#elif defined(__FreeBSD__)
-+	return 0;
- #endif
- 	return -ENOSYS;
- 
diff --git a/graphics/libdrm/pkg-descr b/graphics/libdrm/pkg-descr
deleted file mode 100644
index 2258459..0000000
--- a/graphics/libdrm/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Userspace interface to kernel DRM (Direct Rendering Module) services.
-
-WWW: http://dri.freedesktop.org
diff --git a/graphics/libdrm/pkg-plist b/graphics/libdrm/pkg-plist
deleted file mode 100644
index 75af57d..0000000
--- a/graphics/libdrm/pkg-plist
+++ /dev/null
@@ -1,74 +0,0 @@
-%%OLD%%include/drm/drm.h
-%%OLD%%include/drm/drm_mode.h
-%%OLD%%include/drm/drm_sarea.h
-%%OLD%%include/drm/i915_drm.h
-%%OLD%%include/drm/mach64_drm.h
-%%OLD%%include/drm/mga_drm.h
-%%OLD%%include/drm/nouveau_drm.h
-%%OLD%%include/drm/nouveau_drmif.h
-%%OLD%%include/drm/r128_drm.h
-%%OLD%%include/drm/radeon_drm.h
-%%OLD%%include/drm/savage_drm.h
-%%OLD%%include/drm/sis_drm.h
-%%OLD%%include/drm/via_drm.h
-%%OLD%%include/intel_bufmgr.h
-%%NEW%%include/libdrm/drm.h
-%%NEW%%include/libdrm/drm_fourcc.h
-%%NEW%%include/libdrm/drm_mode.h
-%%NEW%%include/libdrm/drm_sarea.h
-%%NEW%%include/libdrm/i915_drm.h
-%%NEW%%include/libdrm/intel_bufmgr.h
-%%NEW%%include/libdrm/intel_debug.h
-%%NEW%%include/libdrm/mach64_drm.h
-%%NEW%%include/libdrm/mga_drm.h
-%%NEW%%include/libdrm/nouveau_drm.h
-%%NEW%%include/libdrm/nouveau_drmif.h
-%%NEW%%include/libdrm/r128_drm.h
-%%NEW%%include/libdrm/radeon_bo.h
-%%NEW%%include/libdrm/radeon_bo_gem.h
-%%NEW%%include/libdrm/radeon_bo_int.h
-%%NEW%%include/libdrm/radeon_cs.h
-%%NEW%%include/libdrm/radeon_cs_gem.h
-%%NEW%%include/libdrm/radeon_cs_int.h
-%%NEW%%include/libdrm/radeon_drm.h
-%%NEW%%include/libdrm/savage_drm.h
-%%NEW%%include/libdrm/sis_drm.h
-%%NEW%%include/libdrm/via_drm.h
-%%NEW%%%%KMS%%include/libkms/libkms.h
-include/nouveau/nouveau_bo.h
-include/nouveau/nouveau_channel.h
-%%OLD%%include/nouveau/nouveau_class.h
-include/nouveau/nouveau_device.h
-include/nouveau/nouveau_grobj.h
-include/nouveau/nouveau_notifier.h
-include/nouveau/nouveau_pushbuf.h
-%%NEW%%include/nouveau/nouveau_reloc.h
-include/nouveau/nouveau_resource.h
-%%NEW%%include/nouveau/nv04_pushbuf.h
-%%NEW%%include/nouveau/nvc0_pushbuf.h
-include/xf86drm.h
-include/xf86drmMode.h
-lib/libdrm.la
-lib/libdrm.so
-lib/libdrm.so.2
-lib/libdrm_intel.la
-lib/libdrm_intel.so
-lib/libdrm_intel.so.1
-lib/libdrm_nouveau.la
-lib/libdrm_nouveau.so
-lib/libdrm_nouveau.so.1
-%%NEW%%lib/libdrm_radeon.la
-%%NEW%%lib/libdrm_radeon.so
-%%NEW%%lib/libdrm_radeon.so.1
-%%NEW%%%%KMS%%lib/libkms.la
-%%NEW%%%%KMS%%lib/libkms.so
-%%NEW%%%%KMS%%lib/libkms.so.1
-libdata/pkgconfig/libdrm.pc
-libdata/pkgconfig/libdrm_intel.pc
-libdata/pkgconfig/libdrm_nouveau.pc
-%%NEW%%libdata/pkgconfig/libdrm_radeon.pc
-%%NEW%%%%KMS%%libdata/pkgconfig/libkms.pc
-@dirrm include/nouveau
-%%NEW%%%%KMS%%@dirrm include/libkms
-%%NEW%%@dirrm include/libdrm
-%%OLD%%@dirrm include/drm
diff --git a/graphics/libglut/Makefile b/graphics/libglut/Makefile
deleted file mode 100644
index 1d55cf4..0000000
--- a/graphics/libglut/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-# New ports collection makefile for:    libglut
-# Date created:         Tue Feb  7 12:02:49  1995
-# Whom:                 anholt
-#
-# $FreeBSD$
-#
-
-PORTNAME=	libglut
-PORTVERSION=	${MESAVERSION}
-CATEGORIES=	graphics
-
-MAINTAINER=	x11@FreeBSD.org
-COMMENT=	OpenGL utility toolkit
-
-USE_GL=		glu
-USE_XORG=	glproto x11 xext xxf86vm xdamage xfixes xi xmu dri2proto
-
-do-install:
-	cd ${WRKSRC}/src/glut/glx; ${GMAKE} install
-		${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \
-		${WRKSRC}/include/GL/glutf90.h \
-		${PREFIX}/include/GL
-
-.include "${.CURDIR}/../../graphics/libGL/bsd.mesalib.mk"
-.include <bsd.port.mk>
diff --git a/graphics/libglut/distinfo b/graphics/libglut/distinfo
deleted file mode 100644
index 6726d9c..0000000
--- a/graphics/libglut/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-SHA256 (MesaLib-7.6.1.tar.bz2) = 701f0e4cb85d6298181651b780d1c0a439fadd02aad29ee6623fc05588bb8d44
-SIZE (MesaLib-7.6.1.tar.bz2) = 4886995
-SHA256 (MesaGLUT-7.6.1.tar.bz2) = c828f572a4e5c521e87ef265c5d2f1f02ba99ea2307e6323aa8165b152e4eb9d
-SIZE (MesaGLUT-7.6.1.tar.bz2) = 321756
-SHA256 (MesaLib-7.11.2.tar.bz2) = 57746aa8c60bc6f5596ec6c6c7274de40fa12edce5ec33fe899e704fa00b5357
-SIZE (MesaLib-7.11.2.tar.bz2) = 6257280
-SHA256 (MesaGLUT-7.11.2.tar.bz2) = 46b9fd1c261cbbd090a71ae1db328c37d2ff5118b83c38b8ebc8f150484e94f7
-SIZE (MesaGLUT-7.11.2.tar.bz2) = 201575
diff --git a/graphics/libglut/pkg-descr b/graphics/libglut/pkg-descr
deleted file mode 100644
index e5a5452..0000000
--- a/graphics/libglut/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-libglut is a library provided with Mesa which provides an interface for creating
-windows containing OpenGL contexts on a wide variety of platforms and handling
-user interaction.
-
-WWW: http://www.mesa3d.org/
diff --git a/graphics/libglut/pkg-plist b/graphics/libglut/pkg-plist
deleted file mode 100644
index 382dca6..0000000
--- a/graphics/libglut/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-include/GL/glut.h
-include/GL/glutf90.h
-lib/libglut.so
-lib/libglut.so.3
-libdata/pkgconfig/glut.pc
-@dirrmtry include/GL
diff --git a/graphics/mesa-demos/Makefile b/graphics/mesa-demos/Makefile
deleted file mode 100644
index 1bceb96..0000000
--- a/graphics/mesa-demos/Makefile
+++ /dev/null
@@ -1,87 +0,0 @@
-# New ports collection makefile for:    mesa-demos
-# Date created:         7 Nov 2003
-# Whom:                 anholt@FreeBSD.org
-#
-# $FreeBSD$
-#
-
-PORTNAME=	mesa-demos
-PORTVERSION=	7.6.1
-CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.freedesktop.org/pub/mesa/${PORTVERSION}/
-DISTFILES=	MesaLib-${PORTVERSION}${EXTRACT_SUFX} \
-		MesaDemos-${PORTVERSION}${EXTRACT_SUFX}
-
-MAINTAINER=	x11@FreeBSD.org
-COMMENT=	OpenGL demos distributed with Mesa
-
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_LDCONFIG=	yes
-GNU_CONFIGURE=	yes
-MAKE_JOBS_SAFE=	yes
-USE_GL=		glu glut
-USE_XORG=	glproto x11 xext xxf86vm xdamage xfixes dri2proto
-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
-CONFIGURE_ARGS=	--disable-gallium --with-demos=demos,xdemos
-
-#ALL_TARGET=	yes
-
-WRKSRC=		${WRKDIR}/Mesa-${PORTVERSION}/
-
-DATADIR=	${PREFIX}/share/${PKGNAMEPREFIX}${PORTNAME}
-
-OPTIONS=	NVIDIA_GL	"Use NVIDIA's libraries"	off
-
-.if defined(WITHOUT_XCB)
-CONFIGURE_ARGS+=	--disable-xcb
-.else
-CONFIGURE_ARGS+=	--enable-xcb
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|-ffast-math|${FAST_MATH}|' -e 's|x86_64|amd64|' \
-		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|[$$](INSTALL_LIB_DIR)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
-		${WRKSRC}/src/glu/Makefile \
-		${WRKSRC}/src/glw/Makefile \
-		${WRKSRC}/src/mesa/Makefile \
-		${WRKSRC}/src/mesa/drivers/dri/Makefile
-	@${REINPLACE_CMD} -e 's|../images/|${DATADIR}/images/|g' \
-		-e 's|geartrain.dat|${DATADIR}/data/geartrain.dat|g' \
-		-e 's|terrain.dat|${DATADIR}/data/terrain.dat|g' \
-		-e 's|isosurf.dat|${DATADIR}/data/isosurf.dat|g' \
-			${WRKSRC}/progs/demos/*.c ${WRKSRC}/progs/xdemos/*.c
-
-do-install:
-	@for i in demos xdemos; do \
-		cd ${WRKSRC}/progs/$$i; \
-		for j in `${MAKE} -V PROGS`; do \
-			${ECHO_CMD} ${INSTALL_PROGRAM} $$j ${PREFIX}/bin; \
-			${INSTALL_PROGRAM} $$j ${PREFIX}/bin; \
-		done; \
-	done
-	${MKDIR} ${DATADIR}/images ${DATADIR}/data
-	@cd ${WRKSRC}/progs/images; \
-		for i in `ls *.rgb*`; do \
-			${ECHO_CMD} ${INSTALL_DATA} $$i ${DATADIR}/images; \
-			${INSTALL_DATA} $$i ${DATADIR}/images; \
-		done
-	@cd ${WRKSRC}/progs/demos; \
-		for i in `ls *.dat`; do \
-			${ECHO_CMD} ${INSTALL_DATA} $$i ${DATADIR}/data; \
-			${INSTALL_DATA} $$i ${DATADIR}/data; \
-		done
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_NVIDIA_GL)
-CFLAGS+=	-DWITH_NVIDIA_GL=1
-.endif
-
-.if !defined(ARCH)
-ARCH!=		uname -p
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/graphics/mesa-demos/distinfo b/graphics/mesa-demos/distinfo
deleted file mode 100644
index 738047a..0000000
--- a/graphics/mesa-demos/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-SHA256 (MesaLib-7.6.1.tar.bz2) = 701f0e4cb85d6298181651b780d1c0a439fadd02aad29ee6623fc05588bb8d44
-SIZE (MesaLib-7.6.1.tar.bz2) = 4886995
-SHA256 (MesaDemos-7.6.1.tar.bz2) = d2368fc86d032dc6478df70f99b114abdf6c0c1da57bf1d3927ab179876f9c4b
-SIZE (MesaDemos-7.6.1.tar.bz2) = 1547790
diff --git a/graphics/mesa-demos/files/patch-progs-xdemos-glxpixmap.c b/graphics/mesa-demos/files/patch-progs-xdemos-glxpixmap.c
deleted file mode 100644
index 1dfc2c4..0000000
--- a/graphics/mesa-demos/files/patch-progs-xdemos-glxpixmap.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- progs/xdemos/glxpixmap.c.orig	Fri Apr  6 22:29:09 2007
-+++ progs/xdemos/glxpixmap.c	Fri Apr  6 22:38:33 2007
-@@ -105,7 +105,7 @@
-     *   to render correctly.  This is because Mesa allows RGB rendering
-     *   into any kind of visual, not just TrueColor or DirectColor.
-     */
--#ifdef GLX_MESA_pixmap_colormap
-+#if defined(GLX_MESA_pixmap_colormap) && !defined(WITH_NVIDIA_GL)
-    if (strstr(glXQueryExtensionsString(dpy, 0), "GLX_MESA_pixmap_colormap")) {
-       /* stand-alone Mesa, specify the colormap */
-       glxpm = glXCreateGLXPixmapMESA( dpy, visinfo, pm, attr.colormap );
diff --git a/graphics/mesa-demos/files/patch-progs-xdemos-yuvrect_client.c b/graphics/mesa-demos/files/patch-progs-xdemos-yuvrect_client.c
deleted file mode 100644
index 1dbf8e3..0000000
--- a/graphics/mesa-demos/files/patch-progs-xdemos-yuvrect_client.c
+++ /dev/null
@@ -1,28 +0,0 @@
---- progs/xdemos/yuvrect_client.c.orig	Fri Apr  6 22:42:30 2007
-+++ progs/xdemos/yuvrect_client.c	Fri Apr  6 22:48:05 2007
-@@ -140,7 +140,11 @@
-       exit(0);
-    }
-    
--   glx_memory = glXAllocateMemoryMESA(dpy, screen, ImgWidth * ImgHeight * 2, 0, 0 ,0);
-+   #ifdef WITH_NVIDIA_GL
-+   	glx_memory = glXAllocateMemoryNV(ImgWidth * ImgHeight * 2, 0, 0 ,0);
-+   #else
-+   	glx_memory = glXAllocateMemoryMESA(dpy, screen, ImgWidth * ImgHeight * 2, 0, 0 ,0);
-+   #endif
-    if (!glx_memory)
-    {
-      fprintf(stderr,"Failed to allocate MESA memory\n");
-@@ -317,7 +321,11 @@
-    glXSwapBuffers(dpy, win);
-    event_loop(dpy, win);
- 
--   glXFreeMemoryMESA(dpy, DefaultScreen(dpy), glx_memory);
-+   #ifdef WITH_NVIDIA_GL
-+      glXFreeMemoryNV(glx_memory);
-+   #else
-+      glXFreeMemoryMESA(dpy, DefaultScreen(dpy), glx_memory);
-+   #endif
-    glXDestroyContext(dpy, ctx);
-    XDestroyWindow(dpy, win);
-    XCloseDisplay(dpy);
diff --git a/graphics/mesa-demos/files/patch-src__mesa__x86-64__glapi_x86-64.S b/graphics/mesa-demos/files/patch-src__mesa__x86-64__glapi_x86-64.S
deleted file mode 100644
index 908a6fe..0000000
--- a/graphics/mesa-demos/files/patch-src__mesa__x86-64__glapi_x86-64.S
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./src/mesa/x86-64/glapi_x86-64.S.orig	2009-03-13 04:28:49.000000000 +0100
-+++ ./src/mesa/x86-64/glapi_x86-64.S	2011-01-28 18:12:18.000000000 +0100
-@@ -73,7 +73,8 @@ _x86_64_get_dispatch:
- 
- 	.p2align	4,,15
- _x86_64_get_dispatch:
--	movq	_gl_DispatchTSD(%rip), %rdi
-+	movq	_gl_DispatchTSD@GOTPCREL(%rip), %rax
-+	movl	(%rax), %edi
- 	jmp	pthread_getspecific@PLT
- 
- #elif defined(THREADS)
diff --git a/graphics/mesa-demos/files/patch-src__mesa__x86-64__xform4.S b/graphics/mesa-demos/files/patch-src__mesa__x86-64__xform4.S
deleted file mode 100644
index 193e6cc..0000000
--- a/graphics/mesa-demos/files/patch-src__mesa__x86-64__xform4.S
+++ /dev/null
@@ -1,74 +0,0 @@
---- src/mesa/x86-64/xform4.S.orig	2009-01-22 18:38:35.000000000 +0100
-+++ src/mesa/x86-64/xform4.S	2011-05-09 21:26:00.000000000 +0200
-@@ -53,7 +53,7 @@ _mesa_x86_64_transform_points4_general:
-  *	rdx = source
-  */
- 	movl V4F_COUNT(%rdx), %ecx	/* count */
--	movzx V4F_STRIDE(%rdx), %eax	/* stride */
-+	movzbl V4F_STRIDE(%rdx), %eax	/* stride */
- 
- 	movl %ecx, V4F_COUNT(%rdi)	/* set dest count */
- 	movl $4, V4F_SIZE(%rdi)		/* set dest size */
-@@ -116,7 +116,7 @@ p4_constants:
- .byte  0x00, 0x00, 0x00, 0x00
- .byte  0x00, 0x00, 0x00, 0x00
- .byte  0x00, 0x00, 0x00, 0x00
--.float 0f+1.0
-+.float 1.0
- 
- .text
- .align 16
-@@ -135,7 +135,7 @@ _mesa_x86_64_transform_points4_3d:
- 	movaps 16(%rax), %xmm10
- 
- 	movl V4F_COUNT(%rdx), %ecx	/* count */
--	movzx V4F_STRIDE(%rdx), %eax	/* stride */
-+	movzbl V4F_STRIDE(%rdx), %eax	/* stride */
- 
- 	movl %ecx, V4F_COUNT(%rdi)	/* set dest count */
- 	movl $4, V4F_SIZE(%rdi)		/* set dest size */
-@@ -195,7 +195,7 @@ p4_3d_done:
- _mesa_x86_64_transform_points4_identity:
- 
- 	movl V4F_COUNT(%rdx), %ecx	/* count */
--	movzx V4F_STRIDE(%rdx), %eax	/* stride */
-+	movzbl V4F_STRIDE(%rdx), %eax	/* stride */
- 
- 	movl %ecx, V4F_COUNT(%rdi)	/* set dest count */
- 	movl $4, V4F_SIZE(%rdi)		/* set dest size */
-@@ -223,7 +223,7 @@ p4_identity_done:
- _mesa_3dnow_transform_points4_3d_no_rot:
- 
- 	movl V4F_COUNT(%rdx), %ecx	/* count */
--	movzx V4F_STRIDE(%rdx), %eax	/* stride */
-+	movzbl V4F_STRIDE(%rdx), %eax	/* stride */
- 
- 	movl %ecx, V4F_COUNT(%rdi)	/* set dest count */
- 	movl $4, V4F_SIZE(%rdi)		/* set dest size */
-@@ -287,7 +287,7 @@ p4_3d_no_rot_done:
- _mesa_3dnow_transform_points4_perspective:
- 
- 	movl V4F_COUNT(%rdx), %ecx	/* count */
--	movzx V4F_STRIDE(%rdx), %eax	/* stride */
-+	movzbl V4F_STRIDE(%rdx), %eax	/* stride */
- 
- 	movl %ecx, V4F_COUNT(%rdi)	/* set dest count */
- 	movl $4, V4F_SIZE(%rdi)		/* set dest size */
-@@ -353,7 +353,7 @@ p4_perspective_done:
- _mesa_3dnow_transform_points4_2d_no_rot:
- 
- 	movl V4F_COUNT(%rdx), %ecx	/* count */
--	movzx V4F_STRIDE(%rdx), %eax	/* stride */
-+	movzbl V4F_STRIDE(%rdx), %eax	/* stride */
- 
- 	movl %ecx, V4F_COUNT(%rdi)	/* set dest count */
- 	movl $4, V4F_SIZE(%rdi)		/* set dest size */
-@@ -408,7 +408,7 @@ p4_2d_no_rot_done:
- _mesa_3dnow_transform_points4_2d:
- 
- 	movl V4F_COUNT(%rdx), %ecx	/* count */
--	movzx V4F_STRIDE(%rdx), %eax	/* stride */
-+	movzbl V4F_STRIDE(%rdx), %eax	/* stride */
- 
- 	movl %ecx, V4F_COUNT(%rdi)	/* set dest count */
- 	movl $4, V4F_SIZE(%rdi)		/* set dest size */
diff --git a/graphics/mesa-demos/files/patch-src__mesa__x86__glapi_x86.S b/graphics/mesa-demos/files/patch-src__mesa__x86__glapi_x86.S
deleted file mode 100644
index 71da78c..0000000
--- a/graphics/mesa-demos/files/patch-src__mesa__x86__glapi_x86.S
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/mesa/x86/glapi_x86.S.orig	2009-03-13 04:28:49.000000000 +0100
-+++ ./src/mesa/x86/glapi_x86.S	2011-01-28 18:11:56.000000000 +0100
-@@ -47,7 +47,7 @@
- #define GL_OFFSET(x) CODEPTR(REGOFF(4 * x, EAX))
- 
- #if defined(GNU_ASSEMBLER) && !defined(__DJGPP__) && !defined(__MINGW32__)
--#define GLOBL_FN(x) GLOBL x ; .type x, function
-+#define GLOBL_FN(x) GLOBL x ; .type x, @function
- #else
- #define GLOBL_FN(x) GLOBL x
- #endif
diff --git a/graphics/mesa-demos/files/patch-src__mesa__x86__read_rgba_span_x86.S b/graphics/mesa-demos/files/patch-src__mesa__x86__read_rgba_span_x86.S
deleted file mode 100644
index 37b08d1..0000000
--- a/graphics/mesa-demos/files/patch-src__mesa__x86__read_rgba_span_x86.S
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/mesa/x86/read_rgba_span_x86.S.orig	2008-08-25 16:46:47.000000000 +0200
-+++ ./src/mesa/x86/read_rgba_span_x86.S	2011-01-28 18:10:06.000000000 +0100
-@@ -648,7 +648,7 @@ _generic_read_RGBA_span_RGB565_MMX:
- 	testl	$0x01, %ecx
- 	je	.L01
- 
--	movzxw	(%eax), %ecx
-+	movzwl	(%eax), %ecx
- 	movd	%ecx, %mm4
- 
- 	pshufw	$0x00, %mm4, %mm0
diff --git a/graphics/mesa-demos/pkg-descr b/graphics/mesa-demos/pkg-descr
deleted file mode 100644
index 2d69b2e..0000000
--- a/graphics/mesa-demos/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-Mesa is a 3-D graphics library with an API which is very similar to that
-of OpenGL*.  To the extent that Mesa utilizes the OpenGL command syntax
-or state machine, it is being used with authorization from Silicon Graphics,
-Inc.  However, the author makes no claim that Mesa is in any way a
-compatible replacement for OpenGL or associated with Silicon Graphics, Inc.
-Those who want a licensed implementation of OpenGL should contact a licensed
-vendor.  This software is distributed under the terms of the GNU Library
-General Public License, see the LICENSE file for details.
-
-WWW: http://www.mesa3d.org/
diff --git a/graphics/mesa-demos/pkg-plist b/graphics/mesa-demos/pkg-plist
deleted file mode 100644
index e4cbf2e..0000000
--- a/graphics/mesa-demos/pkg-plist
+++ /dev/null
@@ -1,94 +0,0 @@
-bin/arbfplight
-bin/arbfslight
-bin/arbocclude
-bin/bounce
-bin/clearspd
-bin/copypix
-bin/corender
-bin/cubemap
-bin/dinoshade
-bin/drawpix
-bin/engine
-bin/fbo_firecube
-bin/fbotexture
-bin/fire
-bin/fogcoord
-bin/fplight
-bin/fslight
-bin/gamma
-bin/gearbox
-bin/gears
-bin/geartrain
-bin/glinfo
-bin/gloss
-bin/glsync
-bin/gltestperf
-bin/glthreads
-bin/glxcontexts
-bin/glxdemo
-bin/glxgears
-bin/glxgears_fbconfig
-bin/glxgears_pixmap
-bin/glxheads
-bin/glxinfo
-bin/glxpbdemo
-bin/glxpixmap
-bin/glxsnoop
-bin/glxswapcontrol
-bin/ipers
-bin/isosurf
-bin/lodbias
-bin/manywin
-bin/morph3d
-bin/multiarb
-bin/multictx
-bin/offset
-bin/overlay
-bin/paltex
-bin/pbdemo
-bin/pbinfo
-bin/pointblast
-bin/projtex
-bin/rain
-bin/ray
-bin/readpix
-bin/reflect
-bin/renormal
-bin/shadowtex
-bin/sharedtex
-bin/sharedtex_mt
-bin/singlebuffer
-bin/spectex
-bin/spriteblast
-bin/stex3d
-bin/teapot
-bin/terrain
-bin/tessdemo
-bin/texcyl
-bin/texenv
-bin/texture_from_pixmap
-bin/textures
-bin/trispd
-bin/tunnel
-bin/tunnel2
-bin/vao_demo
-bin/wincopy
-bin/winpos
-bin/xfont
-bin/xrotfontdemo
-%%DATADIR%%/data/geartrain.dat
-%%DATADIR%%/data/isosurf.dat
-%%DATADIR%%/data/terrain.dat
-%%DATADIR%%/images/arch.rgb
-%%DATADIR%%/images/bw.rgb
-%%DATADIR%%/images/girl.rgb
-%%DATADIR%%/images/girl2.rgb
-%%DATADIR%%/images/reflect.rgb
-%%DATADIR%%/images/s128.rgb
-%%DATADIR%%/images/tile.rgb
-%%DATADIR%%/images/tree2.rgba
-%%DATADIR%%/images/tree3.rgb
-%%DATADIR%%/images/wrs_logo.rgb
-@dirrm %%DATADIR%%/images
-@dirrm %%DATADIR%%/data
-@dirrm %%DATADIR%%