Bump PKGREVISION due to upgrade of Mesa and friends.

Only include Mesa/buildlink2.mk if the package requires all three of
MesaLib, glu and glut - else only include the necessary buildlink2s.

7 files changed, 24 insertions, 12 deletions

diff --git a/graphics/aqsis/Makefile b/graphics/aqsis/Makefile
index ae6dcc2346c..4733ef3c620 100644
--- a/graphics/aqsis/Makefile
+++ b/graphics/aqsis/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/10/28 15:12:36 agc Exp $
+# $NetBSD: Makefile,v 1.2 2003/03/09 19:17:55 jschauma Exp $
 #
 
 DISTNAME=		aqsis-0.6.4
+PKGREVISION=		1
 CATEGORIES=		graphics
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=aqsis/}
 
diff --git a/graphics/clanlib/Makefile b/graphics/clanlib/Makefile
index 2aa12944452..e65c6367f92 100644
--- a/graphics/clanlib/Makefile
+++ b/graphics/clanlib/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.29 2002/09/21 12:49:55 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2003/03/09 19:17:55 jschauma Exp $
 
 DISTNAME=		ClanLib-0.4.4
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		graphics games devel x11
 MASTER_SITES=		http://dark.x.dtu.dk/~mbn/clanlib/download/
 
@@ -33,12 +33,15 @@ CONFIGURE_ARGS+=	--disable-vidmode
 CONFIGURE_ENV+=		LOCALBASE="${LOCALBASE}"
 MAKE_ENV+=		X11BASE="${X11BASE}"
 
+.include "../../mk/bsd.prefs.mk"
+
 post-patch:
 	${CHMOD} +x ${WRKSRC}/configure
 
 .include "../../graphics/hermes/buildlink2.mk"
 .include "../../graphics/png/buildlink2.mk"
-.include "../../graphics/Mesa/buildlink2.mk"
+.include "../../graphics/MesaLib/buildlink2.mk"
+.include "../../graphics/glu/buildlink2.mk"
 .include "../../mk/pthread.buildlink2.mk"
 .include "../../mk/ossaudio.buildlink2.mk"
 
diff --git a/graphics/dx/Makefile b/graphics/dx/Makefile
index 7655fcbe38b..165cf795e7c 100644
--- a/graphics/dx/Makefile
+++ b/graphics/dx/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2002/12/05 21:44:30 drochner Exp $
+# $NetBSD: Makefile,v 1.19 2003/03/09 19:17:56 jschauma Exp $
 
 DISTNAME=	dx-4.2.0
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.research.ibm.com/dx/srcDownload/srcArchive/
 
@@ -25,7 +26,8 @@ MAKE_ENV+=		ARCH=""
 CONFIGURE_ENV+=		ARCH=""
 
 .include "../../devel/netcdf/buildlink2.mk"
-.include "../../graphics/Mesa/buildlink2.mk"
+.include "../../graphics/MesaLib/buildlink2.mk"
+.include "../../graphics/glu/buildlink2.mk"
 .include "../../graphics/freetype-lib/buildlink2.mk"
 .include "../../graphics/jpeg/buildlink2.mk"
 .include "../../graphics/png/buildlink2.mk"
diff --git a/graphics/geomview/Makefile b/graphics/geomview/Makefile
index e160c25e5c0..57529d95178 100644
--- a/graphics/geomview/Makefile
+++ b/graphics/geomview/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2002/09/22 00:18:25 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2003/03/09 19:17:56 jschauma Exp $
 
 DISTNAME=		geomview-1.8.1
+PKGREVISION=		1
 CATEGORIES=		graphics math
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=geomview/}
 
@@ -41,7 +42,8 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/html/pix/*			\
 	${PREFIX}/share/doc/html/geomview/pix
 
-.include "../../graphics/Mesa/buildlink2.mk"
+.include "../../graphics/MesaLib/buildlink2.mk"
+.include "../../graphics/glu/buildlink2.mk"
 .include "../../mk/motif.buildlink2.mk"
 
 .include "../../mk/texinfo.mk"
diff --git a/graphics/giram/Makefile b/graphics/giram/Makefile
index 6d9e22c349b..83ee14797c3 100644
--- a/graphics/giram/Makefile
+++ b/graphics/giram/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2003/03/08 22:25:30 jmc Exp $
+# $NetBSD: Makefile,v 1.25 2003/03/09 19:17:56 jschauma Exp $
 
 DISTNAME=	giram-0.3.4
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.giram.org/downloads/
 
@@ -33,6 +34,7 @@ CONF_FILES+=	${PREFIX}/share/examples/giram/gtkrc_user	\
 CONF_FILES+=	${PREFIX}/share/examples/giram/ps-menurc	\
 		${PKG_SYSCONFDIR}/ps-menurc
 
-.include "../../graphics/Mesa/buildlink2.mk"
+.include "../../graphics/MesaLib/buildlink2.mk"
+.include "../../graphics/glu/buildlink2.mk"
 .include "../../x11/gtk2/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/lib3ds/Makefile b/graphics/lib3ds/Makefile
index 2f53758f286..e721359e13f 100644
--- a/graphics/lib3ds/Makefile
+++ b/graphics/lib3ds/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2002/10/20 13:24:27 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/09 19:17:56 jschauma Exp $
 #
 
 DISTNAME=		lib3ds-1.2.0
+PKGREVISION=		1
 CATEGORIES=		graphics devel
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=lib3ds/}
 
diff --git a/graphics/ruby-opengl/Makefile b/graphics/ruby-opengl/Makefile
index 47f8c88487a..e415b054e51 100644
--- a/graphics/ruby-opengl/Makefile
+++ b/graphics/ruby-opengl/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2002/10/20 13:28:38 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2003/03/09 19:17:57 jschauma Exp $
 # FreeBSD: ports/graphics/ruby-opengl/Makefile,v 1.4 2000/09/26 08:01:58 knu Exp
 
 DISTNAME=	rbogl-${VERSION}
 PKGNAME=	${RUBY_PKGNAMEPREFIX}opengl-${VERSION:S/b$/.2/}
+PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www2.giganet.net/~yoshi/
 EXTRACT_SUFX=	.tgz