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.

5 files changed, 23 insertions, 27 deletions

diff --git a/graphics/glu/DESCR b/graphics/glu/DESCR
index 1c9542961f1..469c3f16fc2 100644
--- a/graphics/glu/DESCR
+++ b/graphics/glu/DESCR
@@ -1,11 +1,7 @@
-This is the GLU polygon tessellation facility for Mesa implemented by Bogdan
-Sikorski.  The tessellation module is provided under the same terms as the
-Mesa package.
-
-This software tries to be fully compliant with the OpenGL routines. By
-"tries" I mean that up to my knowledge it behaves as OpenGL tessellation
-routines.  However, the author makes no claim that Mesa is in any way a
+Mesa is a 3-D graphics library with an API which is very similar to that
+of OpenGL*.  To the extent that Mesa utilizes the OpenGL command syntax
+or state machine, it is being used with authorization from Silicon Graphics,
+Inc.  However, the author makes no claim that Mesa is in any way a
 compatible replacement for OpenGL or associated with Silicon Graphics, Inc.
-Those who want a licensed implementation of OpenGL should contact a licensed
-vendor.  This software is distributed under the terms of the GNU Library
-General Public License, see the LICENSE file for details.
+
+This is the GLUT part of the MesaDemos distribution.
diff --git a/graphics/glu/Makefile b/graphics/glu/Makefile
index 72c146cc652..53c78da9e60 100644
--- a/graphics/glu/Makefile
+++ b/graphics/glu/Makefile
@@ -1,27 +1,19 @@
-# $NetBSD: Makefile,v 1.50 2007/08/13 11:18:48 seb Exp $
+# $NetBSD: Makefile,v 1.51 2008/04/24 07:40:23 bjs Exp $
 
-PKGNAME=	glu-${MESA_VERSION}
+PKGNAME=	glu-${MESA_PKGVERSION}
 COMMENT=	GLU polygon tessellation facility for Mesa
 
 CONFLICTS+=	Mesa-glx-[0-9]*
 CONFLICTS+=	Mesa<3.2.1
 
-.include "../../graphics/Mesa/Makefile.lib"
+MESA_HEADERS=	glu.h glu_mangle.h
 
-INSTLIBS=	${WRKSRC}/src/glu/sgi/libGLU.la
+.include "../../graphics/Mesa/Makefile.lib"
 
 BUILDLINK_API_DEPENDS.MesaLib+=	MesaLib>=${MESA_VERSION}
 .include "../../graphics/MesaLib/buildlink3.mk"
 
 pre-build:
-	cd ${WRKSRC} && ${RM} -fr src/mesa src/glut src/glw progs
-
-do-install:
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include/GL
-	cd ${WRKSRC}/include/GL; for hdr in				\
-		glu.h glu_mangle.h;					\
-	do								\
-		${INSTALL_DATA} $${hdr} ${DESTDIR}${PREFIX}/include/GL;	\
-	done
+	cd ${WRKSRC} && ${RM} -fr src/glx src/mesa src/glut src/glw progs
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/glu/PLIST b/graphics/glu/PLIST
index 5f58e4a4f14..552e37c8791 100644
--- a/graphics/glu/PLIST
+++ b/graphics/glu/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.13 2004/09/22 08:09:33 jlam Exp $
+@comment $NetBSD: PLIST,v 1.14 2008/04/24 07:40:23 bjs Exp $
 include/GL/glu.h
 include/GL/glu_mangle.h
 lib/libGLU.la
-@unexec ${RMDIR} %D/include/GL >/dev/null 2>&1 || ${TRUE}
+lib/pkgconfig/glu.pc
+@comment in graphics/MesaLib: @dirrm include/GL
diff --git a/graphics/glu/buildlink3.mk b/graphics/glu/buildlink3.mk
index 1d9d3bd8b3d..254ec529095 100644
--- a/graphics/glu/buildlink3.mk
+++ b/graphics/glu/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.31 2006/07/08 23:10:51 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.32 2008/04/24 07:40:23 bjs Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GLU_BUILDLINK3_MK:=	${GLU_BUILDLINK3_MK}+
@@ -12,8 +12,9 @@ BUILDLINK_PACKAGES+=	glu
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}glu
 
 .if !empty(GLU_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.glu+=		glu>=3.4.2
+BUILDLINK_API_DEPENDS.glu+=	glu>=3.4.2
 BUILDLINK_ABI_DEPENDS.glu+=	glu>=6.4.1nb1
+BUILDLINK_ABI_DEPENDS.glu+=	glu>=7.0.3
 BUILDLINK_PKGSRCDIR.glu?=	../../graphics/glu
 .endif	# GLU_BUILDLINK3_MK
 
diff --git a/graphics/glu/hacks.mk b/graphics/glu/hacks.mk
new file mode 100644
index 00000000000..48306f4ee64
--- /dev/null
+++ b/graphics/glu/hacks.mk
@@ -0,0 +1,6 @@
+# $NetBSD: hacks.mk,v 1.1 2008/04/24 07:40:24 bjs Exp $
+#
+.if !defined(GLU_HACKS_MK)
+GLU_HACKS_MK=	# defined
+.  include "../../graphics/MesaLib/hacks.mk"
+.endif