Upgrade to X.Org 6.9.0 release.

Remove separate mtree file for X_WINDOW_SYSTEM=XOrg case. Both X11
distributions now use the one from /etc/mtree again.

6 files changed, 45 insertions, 49 deletions

diff --git a/graphics/dri/Makefile b/graphics/dri/Makefile
index e1d9e909f228..c214c7ce88a1 100644
--- a/graphics/dri/Makefile
+++ b/graphics/dri/Makefile
@@ -6,23 +6,22 @@
 #
 
 PORTNAME=	dri
-PORTVERSION=	6.2.1
+PORTVERSION=	6.4.1
 PORTEPOCH=	2
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_LOCAL} \
-		http://people.freebsd.org/~anholt/dri/
-MASTER_SITE_SUBDIR=	anholt
-DISTFILES=	Mesa-6.2.1-20050213.tar.bz2	\
-		drm-20050109.tar.bz2
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=mesa3d
+DISTNAME=	MesaLib-${PORTVERSION}
 
 MAINTAINER=	anholt@FreeBSD.org
 COMMENT=	OpenGL hardware acceleration drivers for the DRI
 
+LIB_DEPENDS=	drm:${PORTSDIR}/graphics/libdrm
 BUILD_DEPENDS=	makedepend:${X_IMAKE_PORT}
 
 CONFLICTS=	xfree86-dri-* dri-6.2.2005*
 
-WRKSRC=		${WRKDIR}/Mesa
+WRKSRC=		${WRKDIR}/Mesa-${PORTVERSION}
 USE_X_PREFIX=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
@@ -41,6 +40,7 @@ IGNORE=	requires libGL from X.Org.
 .endif
 
 do-install:
+	${MKDIR} ${DRIMODDIR}
 .if ${ARCH} == i386
 	${INSTALL_PROGRAM} ${WRKSRC}/lib/i810_dri.so ${DRIMODDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/lib/i830_dri.so ${DRIMODDIR}
@@ -54,6 +54,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/lib/mga_dri.so ${DRIMODDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/lib/r128_dri.so ${DRIMODDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/lib/r200_dri.so ${DRIMODDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/r300_dri.so ${DRIMODDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/lib/radeon_dri.so ${DRIMODDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/lib/savage_dri.so ${DRIMODDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/lib/sis_dri.so ${DRIMODDIR}
diff --git a/graphics/dri/distinfo b/graphics/dri/distinfo
index 28343c8a1c9c..9a6d42ae290c 100644
--- a/graphics/dri/distinfo
+++ b/graphics/dri/distinfo
@@ -1,4 +1,3 @@
-MD5 (Mesa-6.2.1-20050213.tar.bz2) = c6904904735489f728d79897c55260cb
-SIZE (Mesa-6.2.1-20050213.tar.bz2) = 4131581
-MD5 (drm-20050109.tar.bz2) = c16b1f51a589eb6cad8dc85c4db0e1ce
-SIZE (drm-20050109.tar.bz2) = 507130
+MD5 (MesaLib-6.4.1.tar.bz2) = ea148c828ec6f645526451db1b8556f1
+SHA256 (MesaLib-6.4.1.tar.bz2) = 2c1c8784cccab416a52ef9512e3539a0063b88dcc9b0abbcf1a407f9808758cf
+SIZE (MesaLib-6.4.1.tar.bz2) = 2913887
diff --git a/graphics/dri/files/patch-Makefile.template b/graphics/dri/files/patch-Makefile.template
deleted file mode 100644
index e89035351fa6..000000000000
--- a/graphics/dri/files/patch-Makefile.template
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/mesa/drivers/dri/Makefile.template.orig	Fri Dec 24 01:04:59 2004
-+++ src/mesa/drivers/dri/Makefile.template	Fri Dec 24 01:05:16 2004
-@@ -75,7 +75,7 @@
- 
- 
- $(LIB_DIR)/$(LIBNAME):  $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile $(TOP)/src/mesa/drivers/dri/Makefile.template
--	rm -f $@ && gcc -o $@ -shared $(OBJECTS) $(MESA_MODULES) $(WINOBJ) $(GL_LIB_DEPS)
-+	rm -f $@ && gcc -o $@ -shared $(OBJECTS) $(MESA_MODULES) $(WINOBJ) $(DRI_LIB_DEPS)
- 
- 
- 
diff --git a/graphics/dri/files/patch-freebsd-dri b/graphics/dri/files/patch-freebsd-dri
index c63cdf85ecf6..bd9cdbcb03b9 100644
--- a/graphics/dri/files/patch-freebsd-dri
+++ b/graphics/dri/files/patch-freebsd-dri
@@ -1,6 +1,6 @@
---- configs/freebsd-dri.orig	Tue Nov 23 22:59:05 2004
-+++ configs/freebsd-dri	Fri Dec 24 00:29:13 2004
-@@ -6,19 +6,22 @@
+--- configs/freebsd-dri.orig	Tue Oct 25 01:11:57 2005
++++ configs/freebsd-dri	Fri Dec 30 00:58:57 2005
+@@ -6,32 +6,32 @@
  CONFIG_NAME = freebsd-dri
  
  # Compiler and flags
@@ -12,21 +12,36 @@
 -OPT_FLAGS = -O
 +OPT_FLAGS = $(FBSDCFLAGS)
  
--CFLAGS = -DDRI_NEW_INTERFACE_ONLY -Wmissing-prototypes -g -std=c99  -Wundef -fPIC -ffast-math -I/usr/local/include -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions
--CXXFLAGS = -DDRI_NEW_INTERFACE_ONLY -Wall -g -ansi -pedantic -fPIC
-+CFLAGS = $(FBSDCFLAGS) -DDRI_NEW_INTERFACE_ONLY -Wmissing-prototypes -g \
-+	-std=c9x -Wundef -fPIC -I$(LOCALBASE)/include \
-+	-I$(X11BASE)/include -I$(X11BASE)/include/X11/extensions
-+CXXFLAGS = $(FBSDCXXFLAGS) -DDRI_NEW_INTERFACE_ONLY -Wall -g -ansi -pedantic \
-+	-fPIC
+-EXPAT_INCLUDES = -I/usr/local/include
+-X11_INCLUDES = -I/usr/X11R6/include
++EXPAT_INCLUDES = -I${LOCALBASE}/include
++X11_INCLUDES = -I${X11BASE}/include -I${X11BASE}/include/X11/extensions
+ DEFINES = -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \
+ 	-DGLX_DIRECT_RENDERING -DHAVE_ALIAS
+-CFLAGS = $(DEFINES) -Wmissing-prototypes -g -std=c99  -Wundef -fPIC \
+-	-ffast-math $(X11_INCLUDES)
++CFLAGS = $(FBSDCFLAGS) $(DEFINES) -Wmissing-prototypes -g -std=c99  -Wundef \
++	-fPIC -ffast-math $(X11_INCLUDES)
+ CXXFLAGS = $(DEFINES) -Wall -g -ansi -pedantic -fPIC
  
  ASM_SOURCES = 
  
  # Library/program dependencies
--DRI_LIB_DEPS = -lm -lpthread -lexpat
--GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -pthread
-+DRI_LIB_DEPS = -L$(LOCALBASE)/lib -lm -lexpat ${PTHREAD_LIBS}
-+GL_LIB_DEPS = -L$(X11BASE) -lX11 -lXext -lm ${PTHREAD_LIBS}
+ LIBDRM_LIB = `pkg-config --libs libdrm` -ldrm
+-DRI_LIB_DEPS = -L/usr/local/lib -lm -lpthread -lexpat $(LIBDRM_LIB)
+-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread $(LIBDRM_LIB)
++DRI_LIB_DEPS = -L${LOCALBASE}/lib -lm ${PTHREAD_LIBS} -lexpat $(LIBDRM_LIB)
++GL_LIB_DEPS = -L${X11BASE}/lib -lX11 -lXext -lm ${PTHREAD_LIBS} $(LIBDRM_LIB)
  
- GLUT_LIB_DEPS = -L$(LIB_DIR) -L/usr/X11R6/lib -lGLU -lGL -lX11 -lXmu -lXt -lXi -lm
- GLW_LIB_DEPS = -L$(LIB_DIR) -L/usr/X11R6/lib -lGL -lXt -lXm -lX11
+-GLUT_LIB_DEPS = -L$(LIB_DIR) -L/usr/X11R6/lib -lGLU -lGL -lX11 -lXmu -lXt -lXi -lm
+-GLW_LIB_DEPS = -L$(LIB_DIR) -L/usr/X11R6/lib -lGL -lXt -lXm -lX11
++GLUT_LIB_DEPS = -L$(LIB_DIR) -L${X11BASE}/lib -lGLU -lGL -lX11 -lXmu -lXt -lXi -lm
++GLW_LIB_DEPS = -L$(LIB_DIR) -L${X11BASE}/lib -lGL -lXt -lXm -lX11
+ 
+ 
+ # Directories
+-SRC_DIRS = glx/x11 mesa glu glut/glx glw
++SRC_DIRS = mesa
+ DRIVER_DIRS = dri
+ PROGRAM_DIRS = 
+ WINDOW_SYSTEM=dri
diff --git a/graphics/dri/files/patch-xf86drm.h b/graphics/dri/files/patch-xf86drm.h
deleted file mode 100644
index 89993ddaaa45..000000000000
--- a/graphics/dri/files/patch-xf86drm.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/mesa/drivers/dri/dri_client/imports/xf86drm.h.orig	Sun Feb 13 22:44:48 2005
-+++ src/mesa/drivers/dri/dri_client/imports/xf86drm.h	Sun Feb 13 22:44:55 2005
-@@ -285,7 +285,7 @@
- #define DRM_LOCK_CONT  0x40000000 /**< Hardware lock is contended */
- 
- #if defined(__GNUC__) && (__GNUC__ >= 2)
--# if defined(__i386) || defined(__AMD64__)
-+# if defined(__i386) || defined(__amd64__)
- 				/* Reflect changes here to drmP.h */
- #define DRM_CAS(lock,old,new,__ret)                                    \
- 	do {                                                           \
diff --git a/graphics/dri/pkg-plist b/graphics/dri/pkg-plist
index e75ba433e57a..962357ad8760 100644
--- a/graphics/dri/pkg-plist
+++ b/graphics/dri/pkg-plist
@@ -5,8 +5,11 @@ lib/modules/dri/mach64_dri.so
 lib/modules/dri/mga_dri.so
 lib/modules/dri/r128_dri.so
 lib/modules/dri/r200_dri.so
+lib/modules/dri/r300_dri.so
 lib/modules/dri/radeon_dri.so
 lib/modules/dri/savage_dri.so
 lib/modules/dri/sis_dri.so
 %%I386%%lib/modules/dri/tdfx_dri.so
 %%I386%%lib/modules/dri/unichrome_dri.so
+@dirrm lib/modules/dri
+@unexec rmdir %D/lib/modules 2>/dev/null || true