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.

11 files changed, 38 insertions, 25 deletions

diff --git a/net/xtraceroute/Makefile b/net/xtraceroute/Makefile
index 9a401df24d7..6520b977a56 100644
--- a/net/xtraceroute/Makefile
+++ b/net/xtraceroute/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2002/10/21 15:18:13 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2003/03/09 19:23:09 jschauma Exp $
 #
 
 DISTNAME=	xtraceroute-0.8.14
+PKGREVISION=	1
 CATEGORIES=	net x11
 MASTER_SITES=	http://www.dtek.chalmers.se/~d3august/xt/dl/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
@@ -31,7 +32,8 @@ post-install:
 
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../graphics/tiff/buildlink2.mk"
-.include "../../graphics/Mesa/buildlink2.mk"
+.include "../../graphics/MesaLib/buildlink2.mk"
+.include "../../graphics/glu/buildlink2.mk"
 .include "../../x11/gtk/buildlink2.mk"
 .include "../../x11/gtkglarea/buildlink2.mk"
 
diff --git a/time/glclock/Makefile b/time/glclock/Makefile
index 772f6759a4f..68bb31756aa 100644
--- a/time/glclock/Makefile
+++ b/time/glclock/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2002/08/25 21:51:23 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2003/03/09 19:23:54 jschauma Exp $
 #
 
 DISTNAME=		glclock-6.0b6.0
+PKGREVISION=		1
 CATEGORIES=		x11 graphics time
 MASTER_SITES=		http://www.daionet.gr.jp/~masa/archives/
 
diff --git a/x11/fltk/Makefile b/x11/fltk/Makefile
index 7c21e54d56b..6d4016a47e4 100644
--- a/x11/fltk/Makefile
+++ b/x11/fltk/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.27 2003/02/28 11:57:06 jmmv Exp $
+# $NetBSD: Makefile,v 1.28 2003/03/09 19:28:15 jschauma Exp $
 #
 
 DISTNAME=	fltk-1.0.11-source
 PKGNAME=	${DISTNAME:S/-source//}
-PKGREVISION=	1
+PKGREVISION=	2
 VERS=		${DISTNAME:S/fltk-//:S/-source//}
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-source//}
 CATEGORIES=	x11
@@ -28,5 +28,6 @@ TEST_TARGET=		test
 GNU_CONFIGURE=		# defined
 CONFIGURE_ARGS+=	--enable-libtool=${PKGLIBTOOL}
 
-.include "../../graphics/Mesa/buildlink2.mk"
+.include "../../graphics/MesaLib/buildlink2.mk"
+.include "../../graphics/glu/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/fox/Makefile b/x11/fox/Makefile
index 706a06a9529..05437dbfc58 100644
--- a/x11/fox/Makefile
+++ b/x11/fox/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2002/10/09 13:57:13 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2003/03/09 19:28:16 jschauma Exp $
 # FreeBSD Id: ports/x11-toolkits/fox/Makefile,v 1.14 2001/02/23 19:00:05 knu Exp
 
 DISTNAME=	fox-0.99.174
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.cfdrc.com/pub/FOX/ \
 		ftp://SunSITE.Informatik.RWTH-Aachen.DE/pub/Linux/fox/
@@ -36,5 +36,6 @@ CONFIGURE_ARGS+=--with-opengl=mesa --with-x --with-shm=yes --enable-release
 
 .include "../../graphics/jpeg/buildlink2.mk"
 .include "../../graphics/png/buildlink2.mk"
-.include "../../graphics/Mesa/buildlink2.mk"
+.include "../../graphics/MesaLib/buildlink2.mk"
+.include "../../graphics/glu/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gtkglarea/Makefile b/x11/gtkglarea/Makefile
index da02f428d89..9d56fa7dc7f 100644
--- a/x11/gtkglarea/Makefile
+++ b/x11/gtkglarea/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2002/10/20 13:36:17 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2003/03/09 19:28:16 jschauma Exp $
 
 DISTNAME=		gtkglarea-1.2.2
+PKGREVISION=		1
 CATEGORIES=		x11 graphics
 MASTER_SITES=		http://www.student.oulu.fi/~jlof/gtkglarea/download/
 
@@ -15,7 +16,7 @@ LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--with-gtk-prefix="${BUILDLINK_PREFIX.gtk}"
-CONFIGURE_ARGS+=	--with-GL-prefix="${BUILDLINK_PREFIX.Mesa}"
+CONFIGURE_ARGS+=	--with-GL-prefix="${BUILDLINK_PREFIX.MesaLib}"
 CONFIGURE_ARGS+=	--with-lib-MesaGL
 
 PLIST_SUBST+=		LOCALBASE=${LOCALBASE}
@@ -30,6 +31,8 @@ post-install:
 	${LN} -fs ${PREFIX}/share/aclocal/gtkgl.m4 \
 		${LOCALBASE}/share/aclocal/gtkgl.m4
 
-.include "../../graphics/Mesa/buildlink2.mk"
+.include "../../graphics/MesaLib/buildlink2.mk"
+.include "../../graphics/glu/buildlink2.mk"
 .include "../../x11/gtk/buildlink2.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/kdebase/Makefile b/x11/kdebase/Makefile
index 5734c8e09cc..7bd6cf51a99 100644
--- a/x11/kdebase/Makefile
+++ b/x11/kdebase/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.86 2002/10/20 14:30:03 wiz Exp $
+# $NetBSD: Makefile,v 1.87 2003/03/09 19:28:17 jschauma Exp $
 # FreeBSD Id: Makefile,v 1.6 1997/11/27 00:35:27 se Exp
 
 DISTNAME=	kdebase-1.1.2
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_LOCAL}/kde1
 EXTRACT_SUFX=	.tar.bz2
@@ -94,7 +94,8 @@ post-install:
 # kdebase doesn't manipulate GIFs, but KDE packages depending on kdebase
 # often do, so put the dependency here.
 .include "../../graphics/libungif/buildlink2.mk"
-.include "../../graphics/Mesa/buildlink2.mk"
+.include "../../graphics/MesaLib/buildlink2.mk"
+.include "../../graphics/glu/buildlink2.mk"
 .include "../../graphics/xpm/buildlink2.mk"
 .include "../../x11/kdelibs/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/qt2-libs/Makefile b/x11/qt2-libs/Makefile
index 6321876a4b8..a04bc9ef656 100644
--- a/x11/qt2-libs/Makefile
+++ b/x11/qt2-libs/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2003/02/05 23:13:10 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.20 2003/03/09 19:28:17 jschauma Exp $
 
 PKGNAME=	qt2-libs-${QTVERSION}
-PKGREVISION=	2
+PKGREVISION=	3
 COMMENT=	C++ X GUI toolkit
 
 USE_BUILDLINK2=	yes
@@ -27,7 +27,8 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/include/* ${QTPREFIX}/include
 
 .include "../../devel/zlib/buildlink2.mk"
-.include "../../graphics/Mesa/buildlink2.mk"
+.include "../../graphics/MesaLib/buildlink2.mk"
+.include "../../graphics/glu/buildlink2.mk"
 .include "../../graphics/jpeg/buildlink2.mk"
 .include "../../graphics/mng/buildlink2.mk"
 .include "../../graphics/png/buildlink2.mk"
diff --git a/x11/qt3-libs/Makefile b/x11/qt3-libs/Makefile
index f71143805ab..058ee91bc52 100644
--- a/x11/qt3-libs/Makefile
+++ b/x11/qt3-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2003/02/18 19:16:53 drochner Exp $
+# $NetBSD: Makefile,v 1.15 2003/03/09 19:28:18 jschauma Exp $
 #
 
 LIBQT=			${WRKSRC}/lib/libqt-mt.la
@@ -36,7 +36,8 @@ do-install:
 
 .include "../../devel/zlib/buildlink2.mk"
 .include "../../graphics/jpeg/buildlink2.mk"
-.include "../../graphics/Mesa/buildlink2.mk"
+.include "../../graphics/MesaLib/buildlink2.mk"
+.include "../../graphics/glu/buildlink2.mk"
 .include "../../graphics/mng/buildlink2.mk"
 .include "../../graphics/png/buildlink2.mk"
 .include "../../graphics/freetype2/buildlink2.mk"
diff --git a/x11/ssystem/Makefile b/x11/ssystem/Makefile
index 9bfbf69d351..e192a899777 100644
--- a/x11/ssystem/Makefile
+++ b/x11/ssystem/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2002/10/20 13:29:17 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2003/03/09 19:28:18 jschauma Exp $
 #
 
 DISTNAME=	ssystem-1.6
+PKGREVISION=	1
 CATEGORIES=	x11 graphics
 MASTER_SITES=	${HOMEPAGE}			# ${HOMEPAGE}/hires/
 
diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile
index fae5f3be7b5..2b1218909e7 100644
--- a/x11/xlockmore/Makefile
+++ b/x11/xlockmore/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.52 2002/12/05 00:45:53 hubertf Exp $
+# $NetBSD: Makefile,v 1.53 2003/03/09 19:28:18 jschauma Exp $
 # FreeBSD Id: Makefile,v 1.23 1997/10/10 09:24:38 tg Exp
 #
 
 DISTNAME=       xlockmore-5.06
 CATEGORIES=	x11
+PKGREVISION=	1
 MASTER_SITES=	ftp://ftp.tux.org/pub/tux/bagleyd/xlockmore/ \
 		${MASTER_SITE_XCONTRIB:=applications/}
 EXTRACT_SUFX=	.tar.bz2
@@ -21,7 +22,7 @@ CONFIGURE_ARGS+=--without-gltt --without-ttf --without-opengl --without-mesa \
 		--without-xpm # --without-cxx XXX doesn't work
 CONFIGURE_ENV+= CXX="${CC}"	# no dependency on libstdc++
 .else
-.include "../../graphics/Mesa/buildlink2.mk"
+.include "../../graphics/MesaLib/buildlink2.mk"
 .include "../../graphics/xpm/buildlink2.mk"
 CONFIGURE_ARGS+= --with-mesagl
 .endif
diff --git a/x11/xplanet/Makefile b/x11/xplanet/Makefile
index 66ce586f6b7..832dfee0ccb 100644
--- a/x11/xplanet/Makefile
+++ b/x11/xplanet/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2002/12/24 06:10:36 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2003/03/09 19:28:19 jschauma Exp $
 #
 
 DISTNAME=		xplanet-0.93
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		x11
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=xplanet/}