Index: head/graphics/dri/Makefile
===================================================================
--- head/graphics/dri/Makefile	(revision 403055)
+++ head/graphics/dri/Makefile	(revision 403056)
@@ -1,39 +1,39 @@
 # Created by: Eric Anholt <anholt@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	dri
 PORTVERSION=	${MESAVERSION}
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	graphics
 
 COMMENT=	OpenGL hardware acceleration drivers for the DRI
 
 LIB_DEPENDS=	libdrm.so:${PORTSDIR}/graphics/libdrm \
 		libexpat.so:${PORTSDIR}/textproc/expat2
 
 USE_XORG=	glproto x11 xext xxf86vm xdamage xfixes dri2proto \
 		presentproto xvmc xshmfence
 
 OPTIONS_DEFINE=	TEXTURE
 OPTIONS_DEFAULT=TEXTURE
 
 TEXTURE_DESC=	Enable texture-float support (patent encumbered)
 VDPAU_DESC=	VDPAU (GPU video acceleration) support (needs Gallium)
 
 PKGHELP=	${.CURDIR}/pkg-help
 
 .include <bsd.port.options.mk>
 
 .include "${.CURDIR}/../../graphics/libGL/Makefile.common"
 
 #src/mesa/libmesagallium.la
 #MESA_BUILD_WRKSRC=	src/util src/gallium
 #MESA_INSTALL_WRKSRC=	src/gallium
 
 .include "${.CURDIR}/../../graphics/libGL/Makefile.targets"
 
 post-install:
 	@${RM} -rf ${STAGEDIR}/etc/OpenCL
 
 .include <bsd.port.mk>
Index: head/graphics/libGL/files/patch-include__GL__internal__dri_interface.h
===================================================================
--- head/graphics/libGL/files/patch-include__GL__internal__dri_interface.h	(nonexistent)
+++ head/graphics/libGL/files/patch-include__GL__internal__dri_interface.h	(revision 403056)
@@ -0,0 +1,19 @@
+GCC on 9.x doesn't allow types to be overwritten, these types are defined
+in drm.h also, which causes build issues in xorg-server.
+
+--- include/GL/internal/dri_interface.h.orig	2015-12-05 10:55:50.545108000 +0100
++++ include/GL/internal/dri_interface.h	2015-12-05 10:56:03.408589000 +0100
+@@ -40,13 +40,7 @@
+ #ifndef DRI_INTERFACE_H
+ #define DRI_INTERFACE_H
+ 
+-#ifdef HAVE_LIBDRM
+ #include <drm.h>
+-#else
+-typedef unsigned int drm_context_t;
+-typedef unsigned int drm_drawable_t;
+-typedef struct drm_clip_rect drm_clip_rect_t;
+-#endif
+ 
+ /**
+  * \name DRI interface structures

Property changes on: head/graphics/libGL/files/patch-include__GL__internal__dri_interface.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property