Update to Mesa-7.0.4 (the head of the 7.0 branch in GIT). Basically,

lots of bug fixes; the intent of my update was mostly to fix
problems with i915 and r300 dri drivers and to provide the best environment
possible for the xorg server update to the 1.4 branch.

Morever, many of our patches from pkgsrc, i.e. those removed in this commit,
are now included upstream.

Additionally, MesaDemos now builds.

NOTES:

 - MesaLib now requires xf86driproto 2.0.4, as earlier versions install
   dri_interface.h, which is not correct.

 - glu now exports its symbols via libtool's -export-symfile.
   The symfile is generated pre-build--see glu/Makefile.

 - glxinfo/glxgears do not seem to need to be linked to libpthread, and this
   seems to cause problems on NetBSD with the new drm code.  If I am wrong
   about this, please let me know.  The only program that seems to need
   libpthread is glthreads in MesaDemos.

2 files changed, 23 insertions, 16 deletions

diff --git a/graphics/Mesa/Makefile.common b/graphics/Mesa/Makefile.common
index c516da2bc51..75293941042 100644
--- a/graphics/Mesa/Makefile.common
+++ b/graphics/Mesa/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.65 2008/06/16 15:28:56 tnn Exp $
+# $NetBSD: Makefile.common,v 1.66 2008/07/27 00:03:42 bjs Exp $
 #
 # This Makefile fragment is included either directly or indirectly (through
 # Makefile.lib) by all packages that are built from the Mesa sources.
@@ -8,23 +8,22 @@
 DISTNAME?=	MesaLib-${MESA_VERSION}
 EXTRACT_SUFX=	.tar.bz2
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mesa3d/}
+MASTER_SITES=	${MASTER_SITE_LOCAL}
 
 # When changing this version, please run "make distinfo" in the following
 # package directories:
 #
 #	graphics/MesaLib
-#	graphics/MesaDemos
 #	graphics/glx-utils
 #
-MESA_VERSION=		7.0.3
+MESA_VERSION=		7.0.4
 MESA_PKGVERSION=	${MESA_VERSION}${MESA_PATCHLEVEL}
-MESA_PATCHFILES=	001 002 003
-MESA_PATCHLEVEL=	.3
+#MESA_PATCHFILES=	001 002 003
+MESA_PATCHLEVEL=	.0
 
-PATCHFILES=		${MESA_PATCHFILES:@.p.@Mesa-${MESA_VERSION}-${.p.}@}
-PATCH_SITES=		ftp://ftp.NetBSD.org/pub/NetBSD/misc/bjs/patchfiles/
-PATCH_DIST_STRIP=	-p1
+#PATCHFILES=		${MESA_PATCHFILES:@.p.@Mesa-${MESA_VERSION}-${.p.}@}
+#PATCH_SITES=		ftp://ftp.NetBSD.org/pub/NetBSD/misc/bjs/patchfiles/
+#PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=		bjs@NetBSD.org
 HOMEPAGE=		http://www.mesa3d.org/
diff --git a/graphics/Mesa/Makefile.lib b/graphics/Mesa/Makefile.lib
index ccaf5ce0578..22d056ef4ee 100644
--- a/graphics/Mesa/Makefile.lib
+++ b/graphics/Mesa/Makefile.lib
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.lib,v 1.12 2008/05/29 12:43:39 tnn Exp $
+# $NetBSD: Makefile.lib,v 1.13 2008/07/27 00:03:42 bjs Exp $
 #
 # This Makefile fragment is included by all packages that build libraries
 # from the Mesa sources.
@@ -15,7 +15,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 LIBTOOL=		${PKG_SHLIBTOOL}
-USE_TOOLS+=		gmake makedepend pkg-config
+USE_TOOLS+=		gmake pkg-config
 
 PATCHDIR=		${.CURDIR}/../MesaLib/patches
 DISTINFO_FILE=		${.CURDIR}/../MesaLib/distinfo
@@ -25,6 +25,7 @@ COPTS+= 	 	-prefer-pic 	# Make sure to build PIC libraries.
 
 MAKE_ENV+=		MAKE=${GMAKE:Q}
 MAKE_ENV+=		COPTS=${COPTS:M*:Q}
+MAKE_ENV+=		MKDEP=${TRUE:Q}
 
 #.if ${X11_TYPE} == "modular"
 #.  if defined(PKG_BUILD_OPTIONS.libX11) && \
@@ -65,24 +66,32 @@ BUILD_TARGET?=		pkgsrc
 RM_PATCH_BACKUP_DIRS= 	docs src/mesa src/glut/glx \
  	 	 	progs/demos progs/xdemos progs/glsl
 pre-patch:
-	@ for fn in ${RM_PATCH_BACKUP_DIRS}; do \
+	for fn in ${RM_PATCH_BACKUP_DIRS}; do \
 		${RM} -f ${WRKSRC}/$${fn}/*.orig; \
-	 done
+	done
 
 post-patch:
 	${CP} ${.CURDIR}/../MesaLib/files/configs/[d-z]* ${WRKSRC}/configs
 
 post-install: install-headers
-
+###
+### XXX MesaLib installs headers into GL/internal, and this directory is
+###	created there by the pre-install target.  TODO: unify these targets.
+###
 .PHONY: install-headers
+.if empty(PKGNAME:M*MesaDemos*)
 install-headers:
 	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include/GL
 .for hdr in ${MESA_HEADERS}
 	if [ -f ${WRKSRC}/include/GL/${hdr:Q} ]; then \
 	    ${INSTALL_DATA} ${WRKSRC}/include/GL/${hdr:Q} \
-	    ${DESTDIR}${PREFIX}/include/GL; \
+	    ${DESTDIR}${PREFIX}/include/GL/${hdr:Q}; \
 	fi;
 .endfor
+.else
+install-headers:
+	@${DO_NADA}
+.endif
 
 SUBST_CLASSES+=                 fix-paths
 SUBST_STAGE.fix-paths=          pre-configure
@@ -90,4 +99,3 @@ SUBST_MESSAGE.fix-paths=        Fixing absolute paths.
 SUBST_FILES.fix-paths=          src/*.c
 SUBST_FILES.fix-paths+=         scripts/*.sh
 SUBST_SED.fix-paths=            -e 's,"/usr/local,"${PREFIX},g'
-SUBST_SED.fix-paths+=           -e 's,"/var/log,"${VARBASE}/log,g'