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.

4 files changed, 20 insertions, 18 deletions

diff --git a/graphics/glut/Makefile b/graphics/glut/Makefile
index 4a34d9b819a..9e64f1b33e3 100644
--- a/graphics/glut/Makefile
+++ b/graphics/glut/Makefile
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.49 2007/08/13 11:18:48 seb Exp $
+# $NetBSD: Makefile,v 1.50 2008/04/24 07:40:24 bjs Exp $
 
-PKGNAME=	glut-${MESA_VERSION}
+PKGNAME=	glut-${MESA_PKGVERSION}
 COMMENT=	GLUT Graphics library similar to SGI's OpenGL
 
 CONFLICTS+=	Mesa-glx-[0-9]*
 CONFLICTS+=	Mesa<3.2.1
 
-.include "../../graphics/Mesa/Makefile.lib"
+MESA_HEADERS=	glut.h glutf90.h
 
-BUILDLINK_API_DEPENDS.MesaLib+=	MesaLib>=${MESA_VERSION}
-BUILDLINK_API_DEPENDS.glu+=	glu>=${MESA_VERSION}
+.include "../../graphics/Mesa/Makefile.lib"
 
-INSTLIBS=	${WRKSRC}/src/glut/glx/libglut.la
+BUILDLINK_API_DEPENDS.MesaLib+=	MesaLib>=${MESA_PKGVERSION}
+BUILDLINK_API_DEPENDS.glu+=	glu>=${MESA_PKGVERSION}
 
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../x11/libXmu/buildlink3.mk"
@@ -19,14 +19,8 @@ INSTLIBS=	${WRKSRC}/src/glut/glx/libglut.la
 .include "../../graphics/glu/buildlink3.mk"
 
 pre-build:
-	cd ${WRKSRC} && ${RM} -fr src/mesa src/glu src/glw progs
-
-do-install:
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include/GL
-	cd ${WRKSRC}/include/GL; for hdr in				\
-		glut.h glutf90.h;					\
-	do								\
-		${INSTALL_DATA} $${hdr} ${DESTDIR}${PREFIX}/include/GL;	\
-	done
+	cd ${WRKSRC} && ${RM} -fr src/mesa src/glu src/glx src/glw progs
+###	XXX why is this needed?
+	mkdir -p ${WRKSRC}/src/glut/lib
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/glut/PLIST b/graphics/glut/PLIST
index ad12bebf28f..c26054bec50 100644
--- a/graphics/glut/PLIST
+++ b/graphics/glut/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.11 2004/09/22 08:09:33 jlam Exp $
+@comment $NetBSD: PLIST,v 1.12 2008/04/24 07:40:24 bjs Exp $
 include/GL/glut.h
 include/GL/glutf90.h
 lib/libglut.la
-@unexec ${RMDIR} %D/include/GL >/dev/null 2>&1 || ${TRUE}
+lib/pkgconfig/glut.pc
+@comment in graphics/MesaLib: @dirrm include/GL
diff --git a/graphics/glut/buildlink3.mk b/graphics/glut/buildlink3.mk
index d2329e4e7a3..b2db4ebcc0d 100644
--- a/graphics/glut/buildlink3.mk
+++ b/graphics/glut/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2007/01/17 16:16:14 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2008/04/24 07:40:24 bjs Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GLUT_BUILDLINK3_MK:=	${GLUT_BUILDLINK3_MK}+
@@ -14,6 +14,7 @@ BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}glut
 .if !empty(GLUT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.glut+=	glut>=3.4.2
 BUILDLINK_ABI_DEPENDS.glut+=	glut>=6.4.1nb1
+BUILDLINK_ABI_DEPENDS.glut+=	glut>=7.0.3
 BUILDLINK_PKGSRCDIR.glut?=	../../graphics/glut
 .endif	# GLUT_BUILDLINK3_MK
 
diff --git a/graphics/glut/hacks.mk b/graphics/glut/hacks.mk
new file mode 100644
index 00000000000..de123b57334
--- /dev/null
+++ b/graphics/glut/hacks.mk
@@ -0,0 +1,6 @@
+# $NetBSD: hacks.mk,v 1.1 2008/04/24 07:40:24 bjs Exp $
+#
+.if !defined(GLUT_HACKS_MK)
+GLUT_HACKS_MK=	# defined
+.  include "../../graphics/MesaLib/hacks.mk"
+.endif