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.

6 files changed, 17 insertions, 13 deletions

diff --git a/audio/xmms/Makefile b/audio/xmms/Makefile
index ffb397979b3..da12d0c3a17 100644
--- a/audio/xmms/Makefile
+++ b/audio/xmms/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.40 2002/12/20 21:34:25 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2003/03/09 20:13:04 jschauma Exp $
 #
 
 DISTNAME=	xmms-1.2.7
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.xmms.org/xmms/1.2.x/ \
 		ftp://ftp.sunet.se/pub/multimedia/xmms/1.2.x/
diff --git a/games/bzflag/Makefile b/games/bzflag/Makefile
index df815823fbe..cf07eec6046 100644
--- a/games/bzflag/Makefile
+++ b/games/bzflag/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2002/12/08 13:07:42 cjep Exp $
+# $NetBSD: Makefile,v 1.4 2003/03/09 20:05:08 jschauma Exp $
 
 DISTNAME=	bzflag-1.7e6
 PKGNAME=	${DISTNAME:S/e/.5./}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	games x11
 MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE:=bzflag/}
 EXTRACT_SUFX=   .tgz
@@ -30,5 +30,6 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/bzflag
 	${CP} ${WRKSRC}/data/* ${PREFIX}/share/bzflag
 
-.include "../../graphics/Mesa/buildlink2.mk"
+.include "../../graphics/MesaLib/buildlink2.mk"
+.include "../../graphics/glu/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/copter-commander/Makefile b/games/copter-commander/Makefile
index c47d5a68e2d..3ac2dd82ee7 100644
--- a/games/copter-commander/Makefile
+++ b/games/copter-commander/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2002/10/09 10:46:09 agc Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/09 20:05:09 jschauma Exp $
 #
 
 DISTNAME=	copter-commander-1.8
+PKGREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=coco/}
 EXTRACT_SUFX=	.tar.bz2
@@ -19,7 +20,7 @@ MAKE_ENV+=	ESDDIR=${BUILDLINK_PREFIX.esound}
 
 USE_BUILDLINK2=	yes
 
-.include "../../graphics/Mesa/buildlink2.mk"
+.include "../../graphics/MesaLib/buildlink2.mk"
 .include "../../x11/gnome-libs/buildlink2.mk"
 .include "../../x11/gtkglarea/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/copter-commander/distinfo b/games/copter-commander/distinfo
index b643ff31c6f..b82f681dc68 100644
--- a/games/copter-commander/distinfo
+++ b/games/copter-commander/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2002/10/09 10:46:09 agc Exp $
+$NetBSD: distinfo,v 1.4 2003/03/09 20:05:09 jschauma Exp $
 
 SHA1 (copter-commander-1.8.tar.bz2) = 5ad2818193ffb7567fc318c9e2b19e0cb9a71b7a
 Size (copter-commander-1.8.tar.bz2) = 1415285 bytes
-SHA1 (patch-aa) = 5194cf2f4762909a6903c26c1e83fa8df96f0a80
+SHA1 (patch-aa) = 77297def026266803ed9cab13f84c8a7eba83f95
 SHA1 (patch-ab) = 229a2e2e49ad5f9bb5e9bfcce98a63be34ab4f5f
 SHA1 (patch-ac) = 6a64b0ff837f55e6ee73709113e2607de8cb9441
 SHA1 (patch-ad) = e7a8f56c48adc230204177d98a2ba4a7954b1c10
diff --git a/games/copter-commander/patches/patch-aa b/games/copter-commander/patches/patch-aa
index bf12dbcf1d9..1e0d1a3d2b7 100644
--- a/games/copter-commander/patches/patch-aa
+++ b/games/copter-commander/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2002/10/09 10:46:10 agc Exp $
+$NetBSD: patch-aa,v 1.4 2003/03/09 20:05:09 jschauma Exp $
 
 --- Makefile.orig	Fri Feb  8 22:12:31 2002
 +++ Makefile	Wed Jul 17 16:03:20 2002
@@ -59,7 +59,7 @@ $NetBSD: patch-aa,v 1.3 2002/10/09 10:46:10 agc Exp $
  CFLAGS_UNANSI=-Wall ${COCO_OPTIMIZATION_FLAGS}
  # While everything else uses CFLAGS.
 -CFLAGS=-ansi -pedantic ${CFLAGS_UNANSI}
-+CFLAGS=${CFLAGS_UNANSI}
++CFLAGS+=${CFLAGS_UNANSI}
  # CFLAGS=${CFLAGS_UNANSI}
  
  # COMMON LISP COMPILER
diff --git a/games/glchess/Makefile b/games/glchess/Makefile
index 489baba5259..3d294875dd8 100644
--- a/games/glchess/Makefile
+++ b/games/glchess/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2002/10/12 07:32:22 rh Exp $
+# $NetBSD: Makefile,v 1.3 2003/03/09 20:05:09 jschauma Exp $
 #
 
 DISTNAME=	glchess-0.4.7
+PKGREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=glchess/}
 
@@ -31,7 +32,8 @@ post-install:
 		${INSTALL_DATA} ${WRKSRC}/glchessrc			\
 			${PREFIX}/etc/glchessrc.default
 
-.include "../../graphics/Mesa/buildlink2.mk"
+.include "../../graphics/MesaLib/buildlink2.mk"
+.include "../../graphics/glu/buildlink2.mk"
 .include "../../x11/gtkglarea/buildlink2.mk"
 .include "../../x11/gtk/buildlink2.mk"
 .include "../../mk/automake.mk"