Welcome to Mesa-7.0.3.

Changes from 6.4.2 are (obviously) far too numerous to mention!  This
package brings with it support for the Direct Rendering Infrastructure
(DRI) on NetBSD-current; the kernel DRM was committed approximately
one year ago.  Patches for NetBSD 4.0 are available in the mailing list
archives (I think), but are _not supported_.

Developers and other interested parties are encouraged to read the TODO
file, as well as my remarks in options.mk.  There is still a significant
amount of work to be done.  Users of NetBSD/i386 (-current) shouldn't
have much trouble getting mainstream cards (Intel i915 and Radeon 9600-
R430 are by far the most tested) to work.

I have taken great pains to ensure that this works properly, but inevitably
there will be problems--especially on heretofore untested (read: non-x86)
hardware.  Your questions, comments, problem reports, and of course
bug fixes are welcome.

NOTE: There are currently problems (on NetBSD, at least) linking some
executables, e.g. compiz, due to unresolved symbols for libpthread
functions.  This is due to libX11's thread stubs, which should not
be enabled on NetBSD >= 2.0; see the TODO For more information
and the URL of an interim patch.

3 files changed, 79 insertions, 31 deletions

diff --git a/graphics/Mesa/Makefile b/graphics/Mesa/Makefile
index b081ba077d2..8e8b080efa6 100644
--- a/graphics/Mesa/Makefile
+++ b/graphics/Mesa/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.68 2007/10/25 22:00:45 jlam Exp $
+# $NetBSD: Makefile,v 1.69 2008/04/24 07:40:23 bjs Exp $
 
-PKGNAME=	Mesa-${MESA_VERSION}
+PKGNAME=	Mesa-${MESA_PKGVERSION}
 MASTER_SITES=	# empty
 DISTFILES=	# empty
 
@@ -9,10 +9,12 @@ COMMENT=	Graphics library meta package, similar to SGI's OpenGL
 
 CONFLICTS=	Mesa-glx-[0-9]*
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_LANGUAGES=		# empty
 NO_CHECKSUM=		yes
-NO_CONFIGURE=		yes
 NO_BUILD=		yes
+NO_CONFIGURE=		yes
 EXTRACT_ONLY=		# empty
 PLIST_SRC=		# empty (meta-package)
 
diff --git a/graphics/Mesa/Makefile.common b/graphics/Mesa/Makefile.common
index 4d8db85a33b..81110c53575 100644
--- a/graphics/Mesa/Makefile.common
+++ b/graphics/Mesa/Makefile.common
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile.common,v 1.57 2007/08/13 11:18:29 seb Exp $
+# $NetBSD: Makefile.common,v 1.58 2008/04/24 07:40:23 bjs Exp $
 #
 # This Makefile fragment is included either directly or indirectly (through
 # Makefile.lib) by all packages that are built from the Mesa sources.
 #
+# used by graphics/Mesa/Makefile.lib
 
 DISTNAME?=	MesaLib-${MESA_VERSION}
+EXTRACT_SUFX=	.tar.bz2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=mesa3d/}
-EXTRACT_SUFX=	.tar.bz2
 
 # When changing this version, please run "make distinfo" in the following
 # package directories:
@@ -16,17 +17,18 @@ EXTRACT_SUFX=	.tar.bz2
 #	graphics/MesaDemos
 #	graphics/glx-utils
 #
-MESA_VERSION=	6.4.2
+MESA_VERSION=		7.0.3
+MESA_PKGVERSION=	${MESA_VERSION:S/-rc/rc/}
 
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.mesa3d.org/
+MAINTAINER=		bjs@NetBSD.org
+HOMEPAGE=		http://www.mesa3d.org/
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-WRKSRC=		${WRKDIR}/Mesa-${MESA_VERSION}
-BUILDING_MESA=	yes
-NO_CONFIGURE=	yes
-DIST_SUBDIR=	Mesa-${MESA_VERSION}
+WRKSRC=			${WRKDIR}/Mesa-${MESA_VERSION}
+BUILDING_MESA=		yes
+NO_CONFIGURE=		yes
+DIST_SUBDIR=		Mesa-${MESA_VERSION}
 
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
diff --git a/graphics/Mesa/Makefile.lib b/graphics/Mesa/Makefile.lib
index faa1df6cc3e..2e97e54c9d0 100644
--- a/graphics/Mesa/Makefile.lib
+++ b/graphics/Mesa/Makefile.lib
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.lib,v 1.6 2007/08/13 11:18:30 seb Exp $
+# $NetBSD: Makefile.lib,v 1.7 2008/04/24 07:40:23 bjs Exp $
 #
 # This Makefile fragment is included by all packages that build libraries
 # from the Mesa sources.
@@ -14,18 +14,43 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
-USE_TOOLS+=		makedepend
-MAKE_JOBS_SAFE=		no
+USE_TOOLS+=		gmake makedepend pkg-config
 
 PATCHDIR=		${.CURDIR}/../MesaLib/patches
 DISTINFO_FILE=		${.CURDIR}/../MesaLib/distinfo
 
-INSTALLATION_DIRS+=	lib
+COPTS?= 	 	# empty
+COPTS+= 	 	-prefer-pic 	# Make sure to build PIC libraries.
+
+MAKE_ENV+=		MAKE=${GMAKE:Q}
+MAKE_ENV+=		COPTS=${COPTS:M*:Q}
+
+#.if ${X11_TYPE} == "modular"
+#.  if defined(PKG_BUILD_OPTIONS.libX11) && \
+#	!empty(PKG_BUILD_OPTIONS.libX11:Mxcb)
+#MAKE_ENV+=		USE_XCB=yes
+#.  endif
+#.endif
+
+#.if empty(MAKE_ENV:MUSE_XCB=*)
+MAKE_ENV+=		USE_XCB=no
+#.endif
 
 .include "../../mk/compiler.mk"
-.include "../../mk/bsd.prefs.mk"
 
-# Mesa has proper support for Solaris and SunPro, use it.
+MESA_HZ?=	100
+MAKE_ENV+=	MESA_HZ=${MESA_HZ:Q}
+.if ${OPSYS} == "NetBSD" && exists(/sbin/sysctl)
+tmphz=\
+	${sysctl kern.clockrate || ${TRUE}\
+	:L:sh:ts,:S/,//gW:C/([^[0-9]]*)(=|[^ hz])*([^[0-9])//g:M[0-9]*}
+.  if !empty(tmphz) && (${tmphz} > 50) && (${tmphz} < 2001)
+MESA_HZ=	${tmphz}
+.  endif
+.endif
+###
+### XXX do we still want this?
+###
 .if ${OPSYS} == "SunOS"
 .  if ${MACHINE_ARCH} == "sparc"
 .    if !empty(PKGSRC_COMPILER:Msunpro)
@@ -33,22 +58,41 @@ BUILD_TARGET=		sunos5
 .    else
 BUILD_TARGET=		sunos5-gcc
 .    endif
-.  else	# i386
-BUILD_TARGET=		pkgsrc
+.  else
+BUILD_TARGET?=		pkgsrc
 .  endif
 .elif ${OPSYS} == "Interix"
 BUILD_TARGET=		interix3
 .else
-BUILD_TARGET=		pkgsrc
+BUILD_TARGET?=		pkgsrc
 .endif
 
-.PHONY: Mesa-install-libs
-pre-install: Mesa-install-libs
-Mesa-install-libs:
-	@${TEST} -z ${INSTLIBS:M*:Q}"" || ${ECHO_MSG} "Installing libraries."
-	@for lib in "" ${INSTLIBS}; do					\
-		${TEST} -n "$$lib" || continue;				\
-		${SETENV} ${MAKE_ENV}					\
-		${LIBTOOL} --mode=install ${INSTALL_LIB}		\
-			$$lib ${DESTDIR}${PREFIX}/lib;			\
-	done
+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 \
+		${RM} -f ${WRKSRC}/$${fn}/*.orig; \
+	 done
+
+post-patch:
+	${CP} ${.CURDIR}/../MesaLib/files/configs/[a-z]* ${WRKSRC}/configs
+
+post-install: install-headers
+
+.PHONY: install-headers
+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; \
+	fi;
+.endfor
+
+SUBST_CLASSES+=                 fix-paths
+SUBST_STAGE.fix-paths=          pre-configure
+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'