6 files changed, 94 insertions, 106 deletions

diff --git a/graphics/dri-devel/Makefile b/graphics/dri-devel/Makefile
index 235efd0f4b5d..4e4accb957c2 100644
--- a/graphics/dri-devel/Makefile
+++ b/graphics/dri-devel/Makefile
@@ -6,51 +6,66 @@
 #
 
 PORTNAME=	dri
-PORTVERSION=	6.1.p20040507
+PORTVERSION=	6.2.20050419
 PORTEPOCH=	1
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	anholt/dri-devel
-DISTFILES=	dri-20040507.tar.bz2	\
-		Mesa-20040507.tar.bz2	\
-		drm-20040507.tar.bz2
+MASTER_SITES=	${MASTER_SITE_LOCAL} \
+		http://people.freebsd.org/~anholt/dri/
+MASTER_SITE_SUBDIR=	anholt
+DISTFILES=	Mesa-20050419.tar.bz2	\
+		drm-20050419.tar.bz2
 
 MAINTAINER=	anholt@FreeBSD.org
-COMMENT=	OpenGL hardware acceleration drivers snapshot for XFree86
+COMMENT=	DRI OpenGL drivers snapshot
 
-WRKSRC=		${WRKDIR}/xc
-BUILD_WRKSRC=	${WRKSRC}/lib/GL
-INSTALL_WRKSRC=	${WRKSRC}/lib/GL/mesa/drivers/dri
-USE_BZIP2=	yes
+BUILD_DEPENDS=	makedepend:${X_IMAKE_PORT}
+
+CONFLICTS=	xfree86-dri-* dri-6.2_*
+
+WRKSRC=		${WRKDIR}/Mesa
 USE_X_PREFIX=	yes
-MAKE_ENV=	FBSDCFLAGS="${CFLAGS}" FBSDCC="${CC}" FBSDCXX="${CXX}"
+USE_BZIP2=	yes
+USE_GMAKE=	yes
 LATEST_LINK=	${PORTNAME}-devel
+MAKE_ENV+=	FBSDCC="${CC}" FBSDCXX="${CXX}" \
+		FBSDCFLAGS="${CFLAGS}" FBSDCXXFLAGS="${CXXFLAGS}" \
+		PTHREAD_LIBS=${PTHREAD_LIBS}
 
-ONLY_FOR_ARCHS=	alpha i386
+ONLY_FOR_ARCHS=	i386 alpha amd64
 
-IGNORE=		is currently older than graphics/dri. Please use that one instead
+DRIMODDIR=	${PREFIX}/lib/modules/dri
 
-do-configure:
-	@${RM} -f ${WRKSRC}/config/cf/projectroot.def
-	@${ECHO} "#define ProjectRoot ${X11BASE}" > ${WRKSRC}/config/cf/projectroot.def
-	@${RM} -f  ${WRKSRC}/config/cf/version.def
-	@${RM} -f  ${WRKSRC}/config/cf/date.def
-	@${TOUCH} ${WRKSRC}/config/cf/version.def
-	@${TOUCH} ${WRKSRC}/config/cf/date.def
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} Makefile.boot
-.for target in VerifyOS version.def Makefiles includes depend
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} -f xmakefile ${target}
-.endfor
+.include <bsd.port.pre.mk>
 
-pre-build:
-	cd ${WRKSRC}/config && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} \
-		${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}
+do-install:
+.if ${ARCH} == i386
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/i810_dri.so ${DRIMODDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/i830_dri.so ${DRIMODDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/i915_dri.so ${DRIMODDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/unichrome_dri.so ${DRIMODDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/tdfx_dri.so ${DRIMODDIR}
+.elif ${ARCH} == amd64
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/i915_dri.so ${DRIMODDIR}
+.endif
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/mach64_dri.so ${DRIMODDIR}
+	${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/radeon_dri.so ${DRIMODDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/savage_dri.so ${DRIMODDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/sis_dri.so ${DRIMODDIR}
 
-.include <bsd.port.pre.mk>
 .if ${ARCH} == i386
 PLIST_SUB+=	I386=""
+PLIST_SUB+=	I386_AMD64=""
+ALL_TARGET=	freebsd-dri-x86
+.elif ${ARCH} == amd64
+PLIST_SUB+=	I386="@comment "
+PLIST_SUB+=	I386_AMD64=""
+ALL_TARGET=	freebsd-dri
 .else
 PLIST_SUB+=	I386="@comment "
+PLIST_SUB+=	I386_AMD64="@comment "
+ALL_TARGET=	freebsd-dri
 .endif
-
 .include <bsd.port.post.mk>
diff --git a/graphics/dri-devel/distinfo b/graphics/dri-devel/distinfo
index d514023d2b44..398eca69740a 100644
--- a/graphics/dri-devel/distinfo
+++ b/graphics/dri-devel/distinfo
@@ -1,6 +1,4 @@
-MD5 (dri-20040507.tar.bz2) = afe7a89d0a3d1af7b5c97bde907299c1
-SIZE (dri-20040507.tar.bz2) = 11944635
-MD5 (Mesa-20040507.tar.bz2) = dbced63f1c7193120271f8324505f86e
-SIZE (Mesa-20040507.tar.bz2) = 3975988
-MD5 (drm-20040507.tar.bz2) = 4787712ca544ba16a273d9d7f3f07158
-SIZE (drm-20040507.tar.bz2) = 246769
+MD5 (Mesa-20050419.tar.bz2) = cfab0106bf4828353dc8883a9f9fbb45
+SIZE (Mesa-20050419.tar.bz2) = 4797357
+MD5 (drm-20050419.tar.bz2) = 3d9b9585eea95009ea1e8b6bdc54358b
+SIZE (drm-20050419.tar.bz2) = 520707
diff --git a/graphics/dri-devel/files/patch-GL-Imakefile b/graphics/dri-devel/files/patch-GL-Imakefile
deleted file mode 100644
index 7871661f0879..000000000000
--- a/graphics/dri-devel/files/patch-GL-Imakefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/GL/Imakefile.orig	Tue Nov 11 18:00:25 2003
-+++ lib/GL/Imakefile	Tue Nov 11 18:00:26 2003
-@@ -110,7 +110,7 @@
- #if BuildXF86DRI && GlxUseBuiltInDRIDriver
- SUBDIRS = $(MESADIRS) $(DRIDIRS) $(DRIVERDIRS) $(GLXDIRS) $(LIBGLBUILDDIR) $(OSMESADIRS)
- #else
--SUBDIRS = $(MESADIRS) $(GLXDIRS) $(DRIDIRS) $(LIBGLBUILDDIR) $(OSMESADIRS) $(DRIVERDIRS)
-+SUBDIRS = $(MESADIRS) $(GLXDIRS) $(DRIDIRS) $(DRIVERDIRS)
- #endif
- 
- MakeSubdirs($(SUBDIRS))
diff --git a/graphics/dri-devel/files/patch-freebsd-dri b/graphics/dri-devel/files/patch-freebsd-dri
new file mode 100644
index 000000000000..664afaaaa4e4
--- /dev/null
+++ b/graphics/dri-devel/files/patch-freebsd-dri
@@ -0,0 +1,39 @@
+--- configs/freebsd-dri.orig	Tue Apr 19 18:46:31 2005
++++ configs/freebsd-dri	Tue Apr 19 19:51:06 2005
+@@ -6,28 +6,29 @@
+ CONFIG_NAME = freebsd-dri
+ 
+ # Compiler and flags
+-CC = gcc
+-CXX = g++
++CC = $(FBSDCC)
++CXX = $(FBSDCXX)
+ WARN_FLAGS = -Wall
+-OPT_FLAGS = -O
++OPT_FLAGS = $(FBSDCFLAGS)
+ 
+ X11_INCLUDES = -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions
+ DEFINES = -DDRI_NEW_INTERFACE_ONLY 
+-CFLAGS = $(DEFINES) -Wmissing-prototypes -g -std=c99  -Wundef -fPIC -ffast-math -I/usr/local/include $(X11_INCLUDES)
++CFLAGS = $(FBSDCFLAGS) $(DEFINES) -Wmissing-prototypes -g -std=c99  -Wundef \
++	-fPIC -ffast-math -I/usr/local/include $(X11_INCLUDES)
+ CXXFLAGS = $(DEFINES) -Wall -g -ansi -pedantic -fPIC
+ 
+ ASM_SOURCES = 
+ 
+ # Library/program dependencies
+-DRI_LIB_DEPS = -L/usr/local/lib -lm -lpthread -lexpat
+-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -pthread
++DRI_LIB_DEPS = -L/usr/local/lib -lm -lexpat ${PTHREAD_LIBS}
++GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm ${PTHREAD_LIBS}
+ 
+ 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
+ 
+ 
+ # Directories
+-SRC_DIRS = mesa glu glut/glx glw glx/x11
++SRC_DIRS = mesa
+ DRIVER_DIRS = dri
+ PROGRAM_DIRS = 
+ WINDOW_SYSTEM=dri
diff --git a/graphics/dri-devel/files/patch-host.def b/graphics/dri-devel/files/patch-host.def
deleted file mode 100644
index 258ca8d83ddf..000000000000
--- a/graphics/dri-devel/files/patch-host.def
+++ /dev/null
@@ -1,55 +0,0 @@
---- config/cf/host.def.orig	Fri May  7 20:22:03 2004
-+++ config/cf/host.def	Wed May 12 21:58:55 2004
-@@ -5,8 +5,8 @@
- #define XFree86CustomVersion "DRI trunk"
- 
- /* You need this now */
--#define MesaSrcDir /X11R6/SourceForge/Mesanew/Mesa
--#define DRMSrcDir /X11R6/SourceForge/DRI-freedesktop/drm
-+#define MesaSrcDir $(TOP)/../Mesa
-+#define DRMSrcDir $(TOP)/../drm
- 
- 
- /* Don't use any special flags by default, but leave this here commented out
-@@ -25,6 +25,13 @@
- #endif
- */
- 
-+#define DefaultGcc2AxpOpt ${FBSDCFLAGS}
-+#define DefaultGcc2PpcOpt ${FBSDCFLAGS}
-+#define DefaultGcc2i386Opt ${FBSDCFLAGS}
-+#define LibraryCDebugFlags ${FBSDCFLAGS}
-+
-+#define CcCmd ${FBSDCC}
-+#define CplusplusCmd ${FBSDCXX}
- 
- #define BuildXFree86ConfigTools YES
- 
-@@ -52,15 +59,17 @@
- 
- #if defined(FreeBSDArchitecture) && defined(HasGcc3) && HasGcc3
- #define NoSystemWarn		-Wno-system-headers
-+#define AliasingArg		-fno-strict-aliasing
- #else
- #define NoSystemWarn
-+#define AliasingArg
- #endif
- 
- #define GccWarningOptions -Wall -Wpointer-arith -Wstrict-prototypes \
-                           -Wmissing-prototypes -Wmissing-declarations \
-                           -Wredundant-decls -Wnested-externs -Wundef \
- 			  NoSystemWarn
--#define DefaultCCOptions -ansi -pedantic GccWarningOptions -pipe -g
-+#define DefaultCCOptions AliasingArg GccWarningOptions
- 
- #define NormalLibGlx NO
- 
-@@ -87,7 +96,7 @@
- /* Optionally turn this on to change the place where you install the build.
-  * Warning: trailing blanks will cause build failures.
-  */
--/* #define ProjectRoot /usr/X11R6-DRI */
-+#include "projectroot.def"
- 
- /* #define UsrLibDir /usr/X11R6/lib */
- 
diff --git a/graphics/dri-devel/pkg-plist b/graphics/dri-devel/pkg-plist
index 863e3c81130c..e75ba433e57a 100644
--- a/graphics/dri-devel/pkg-plist
+++ b/graphics/dri-devel/pkg-plist
@@ -1,10 +1,12 @@
-lib/modules/dri/ffb_dri.so
-lib/modules/dri/gamma_dri.so
 %%I386%%lib/modules/dri/i810_dri.so
 %%I386%%lib/modules/dri/i830_dri.so
+%%I386_AMD64%%lib/modules/dri/i915_dri.so
+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/radeon_dri.so
-%%I386%%lib/modules/dri/sis_dri.so
-lib/modules/dri/tdfx_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