From 75b50e11df8dea33daaa08715473a0eaca393e13 Mon Sep 17 00:00:00 2001 From: jschauma Date: Sun, 9 Mar 2003 19:46:51 +0000 Subject: 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. --- games/battalion/Makefile | 6 ++++-- games/battalion/distinfo | 4 ++-- games/battalion/patches/patch-aa | 6 +++--- games/battleball/Makefile | 5 +++-- games/knightcap/Makefile | 4 ++-- games/plib/Makefile | 3 ++- games/quake/Makefile | 5 +++-- games/quake/distinfo | 6 +++--- games/quake/patches/patch-ae | 10 +++++----- games/quake/patches/patch-ai | 12 ++++++------ games/quake6/Makefile | 4 ++-- games/xracer/Makefile | 3 ++- 12 files changed, 37 insertions(+), 31 deletions(-) diff --git a/games/battalion/Makefile b/games/battalion/Makefile index ad5fac4da2d..595744e9467 100644 --- a/games/battalion/Makefile +++ b/games/battalion/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.20 2002/10/20 11:15:17 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2003/03/09 19:46:51 jschauma Exp $ # DISTNAME= battalion PKGNAME= battalion-1.4 +PKGREVISION= 1 WRKSRC= ${WRKDIR}/battalionSource CATEGORIES= games x11 MASTER_SITES= http://www.evl.uic.edu/aej/ @@ -39,5 +40,6 @@ do-install: pre-clean: @${RM} -rf ${WRKDIR}/battalionSUN4 -.include "../../graphics/Mesa/buildlink2.mk" +.include "../../graphics/MesaLib/buildlink2.mk" +.include "../../graphics/glu/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/battalion/distinfo b/games/battalion/distinfo index 9648e256570..329c0ec3f88 100644 --- a/games/battalion/distinfo +++ b/games/battalion/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.2 2001/04/21 02:08:18 wiz Exp $ +$NetBSD: distinfo,v 1.3 2003/03/09 19:46:51 jschauma Exp $ SHA1 (battalionSource1.4.tar.Z) = 50891668a9b6745fcb4e070805c085487a5176d8 Size (battalionSource1.4.tar.Z) = 186221 bytes SHA1 (battalionSUN4.tar.gz) = 5cc314e192320a7505dddf730bbcccaef212ff4a Size (battalionSUN4.tar.gz) = 1593265 bytes -SHA1 (patch-aa) = acd9eab9a631e816bc3145433dc3de203031fe1a +SHA1 (patch-aa) = 351f783154a992de348d29c039b670d7ef324507 SHA1 (patch-ab) = a47c5be93d82555b4fed23f5d5e71169859ebb49 diff --git a/games/battalion/patches/patch-aa b/games/battalion/patches/patch-aa index be59692c019..133761287a4 100644 --- a/games/battalion/patches/patch-aa +++ b/games/battalion/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.7 2000/09/03 10:05:28 wiz Exp $ +$NetBSD: patch-aa,v 1.8 2003/03/09 19:46:52 jschauma Exp $ --- Makefile.orig Thu Jan 16 17:31:58 1997 +++ Makefile Wed Apr 12 21:03:39 2000 @@ -23,7 +23,7 @@ @@ -36,7 +36,7 @@ $NetBSD: patch-aa,v 1.7 2000/09/03 10:05:28 wiz Exp $ # ------------------------------------------------------------ -CFLAGS = -O -I/usr/local/X11/include -I/usr/demo/SOUND/ -I./. - -+CFLAGS = -O $(DEFS) -I$(X11BASE)/include -I./. ++CFLAGS += -O $(DEFS) -I$(X11BASE)/include -I./. +DATADIR = $(PREFIX)/share/battalion/ +VARDIR = /var/games/ +DEFS = -DDATADIR=\"$(DATADIR)\" -DVARDIR=\"$(VARDIR)\" @@ -45,7 +45,7 @@ $NetBSD: patch-aa,v 1.7 2000/09/03 10:05:28 wiz Exp $ # (USEFUL TO POINT TO WHERE THE MESA LIBRARIES RESIDE) # ------------------------------------------------------------ -LIBFLAGS = -+LIBFLAGS = -Wl,-R$(X11BASE)/lib -L$(X11BASE)/lib -lcompat ++LIBFLAGS = ${LDFLAGS} -L$(X11BASE)/lib -lcompat # you should now be able to type 'make' and everything should be fine ... diff --git a/games/battleball/Makefile b/games/battleball/Makefile index 957bdfcf4b4..23ea5eda23d 100644 --- a/games/battleball/Makefile +++ b/games/battleball/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.9 2002/10/21 00:55:26 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2003/03/09 19:46:52 jschauma Exp $ DISTNAME= battleball.21.src PKGNAME= battleball-2.1 +PKGREVISION= 1 CATEGORIES= games x11 MASTER_SITES= http://linuxberg.prover.com.br/files/x11/entertain/ @@ -25,7 +26,7 @@ do-install: .include "../../mk/bsd.prefs.mk" .if defined(BATTLEBALL_USE_MESA) -.include "../../graphics/Mesa/buildlink2.mk" +.include "../../graphics/MesaLib/buildlink2.mk" .else CPPFLAGS+= -DNO_OPENGL SED_CMDS+= -e '/^GLINCS/s|^|\#|' -e '/^GLLIBS/s|^|\#|' diff --git a/games/knightcap/Makefile b/games/knightcap/Makefile index c4cb7809128..3ce1b6d655a 100644 --- a/games/knightcap/Makefile +++ b/games/knightcap/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.6 2002/09/23 10:03:03 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2003/03/09 19:46:53 jschauma Exp $ DISTNAME= KnightCap-3.6 PKGNAME= knightcap-3.6 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= games MASTER_SITES= ftp://samba.anu.edu.au/pub/KnightCap/ diff --git a/games/plib/Makefile b/games/plib/Makefile index 9d7032c9ebd..b7b10c4c90b 100644 --- a/games/plib/Makefile +++ b/games/plib/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.6 2002/10/20 13:03:27 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2003/03/09 19:46:53 jschauma Exp $ # DISTNAME= plib-1.2.0 +PKGREVISION= 1 CATEGORIES= games x11 MASTER_SITES= http://plib.sourceforge.net/dist/ diff --git a/games/quake/Makefile b/games/quake/Makefile index 5ab45299c9c..1b0aac20202 100644 --- a/games/quake/Makefile +++ b/games/quake/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.19 2002/10/20 13:14:03 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2003/03/09 19:46:53 jschauma Exp $ DISTNAME= q1source PKGNAME= quake-2.30 +PKGREVISION= 1 CATEGORIES= games x11 MASTER_SITES= ftp://ftp.fu-berlin.de/pc/msdos/games/idgames/idstuff/source/ \ ftp://ftp.idsoftware.com/idstuff/source/ @@ -55,5 +56,5 @@ post-install: @ ${ECHO} by running \'quake.x11\'. @ ${ECHO} ===================================================================== -.include "../../graphics/Mesa/buildlink2.mk" +.include "../../graphics/MesaLib/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/quake/distinfo b/games/quake/distinfo index dfd6a83b11f..4a8dbf16bc6 100644 --- a/games/quake/distinfo +++ b/games/quake/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2002/01/08 15:47:47 wiz Exp $ +$NetBSD: distinfo,v 1.5 2003/03/09 19:46:53 jschauma Exp $ SHA1 (q1source.zip) = 1f607e549c6aa3921797e51b7d2038e95116c989 Size (q1source.zip) = 3211531 bytes @@ -6,11 +6,11 @@ SHA1 (patch-aa) = 99fd7868c2968bb0214282c35a865119cc33721c SHA1 (patch-ab) = b459f48703568180445a35e74290bacf87fea170 SHA1 (patch-ac) = 595e319415fe22e8115170415a6bd69c9da9d1be SHA1 (patch-ad) = 84349e4164ee0b2bc4cffd420e9520ce2619495d -SHA1 (patch-ae) = 9efe7e9ca9f61b142662f82f1602690b471581a5 +SHA1 (patch-ae) = bd25b97449be7e755cdb307b6204f518e28ba598 SHA1 (patch-af) = ff7a770648efdbf4bf9f91b4502ad5ca93840bbc SHA1 (patch-ag) = 56e3b11afe9d2cccf3136b3cd78419d00c8f7487 SHA1 (patch-ah) = 23501badb57bf8d11bf75105c1dffb7adf19a64d -SHA1 (patch-ai) = 6d11cc9c1afe25a34a9a106608293e8c6c053a68 +SHA1 (patch-ai) = 0f0ba110c3656c68c91d4141607dd0091f5a5956 SHA1 (patch-aj) = 50446164a7ad9085a2e191047f60483885d043c3 SHA1 (patch-ak) = b7b22a7b01a86522f3dfd510bf31a44c468279b9 SHA1 (patch-al) = ca76927f36ad4f5f14ec64600bb4d40f0a758b71 diff --git a/games/quake/patches/patch-ae b/games/quake/patches/patch-ae index 3836ca064c9..44687a8cca4 100644 --- a/games/quake/patches/patch-ae +++ b/games/quake/patches/patch-ae @@ -1,4 +1,4 @@ -$NetBSD: patch-ae,v 1.6 2002/01/02 10:01:35 hubertf Exp $ +$NetBSD: patch-ae,v 1.7 2003/03/09 19:46:53 jschauma Exp $ --- qw/makefile.linux.orig Wed Apr 21 20:16:24 1999 +++ qw/makefile.linux @@ -42,14 +42,14 @@ $NetBSD: patch-ae,v 1.6 2002/01/02 10:01:35 hubertf Exp $ +GLCFLAGS=-DGLQUAKE -I${MESA_DIR}/include -I/usr/include/glide -LDFLAGS=-lm -+LDFLAGS=-lm -lossaudio ++LDFLAGS+=-lm -lossaudio SVGALDFLAGS=-lvga -XLDFLAGS=-L/usr/X11R6/lib -lX11 -lXext -GL_SVGA_LDFLAGS=-L/usr/X11/lib -L/usr/local/src/Mesa-3.0/lib -lm -lMesaGL -lglide2x -lX11 -lXext -lvga -GL_X11_LDFLAGS=-L/usr/X11/lib -L/usr/local/src/Mesa-3.0/lib -lm -lGL -lX11 -lXext -+XLDFLAGS=-L${X11BASE}/lib -Wl,-rpath -Wl,${X11BASE}/lib -lX11 -lXext -+GL_SVGA_LDFLAGS=-L${X11BASE}/lib -Wl,-rpath -Wl,${X11BASE}/lib -L${MESA_DIR}/lib -Wl,-rpath -Wl,${MESA_DIR}/lib -lm -lMesaGL -lglide2x -lX11 -lXext -lvga -+GL_X11_LDFLAGS=-L${X11BASE}/lib -Wl,-rpath -Wl,${X11BASE}/lib -L${MESA_DIR}/lib -Wl,-rpath -Wl,${MESA_DIR}/lib -lm -lGL -lX11 -lXext ++XLDFLAGS=-L${X11BASE}/lib ${LDFLAGS} -lX11 -lXext ++GL_SVGA_LDFLAGS=-L${X11BASE}/lib ${LDFLAGS} -L${MESA_DIR}/lib -lm -lMesaGL -lglide2x -lX11 -lXext -lvga ++GL_X11_LDFLAGS=-L${X11BASE}/lib ${LDFLAGS} -L${MESA_DIR}/lib -lm -lGL -lX11 -lXext DO_CC=$(CC) $(CFLAGS) -o $@ -c $< -DO_O_CC=$(CC) -O $(CFLAGS) -o $@ -c $< diff --git a/games/quake/patches/patch-ai b/games/quake/patches/patch-ai index 0d3181d07df..3cfd74b5eba 100644 --- a/games/quake/patches/patch-ai +++ b/games/quake/patches/patch-ai @@ -1,4 +1,4 @@ -$NetBSD: patch-ai,v 1.5 2002/01/02 10:01:36 hubertf Exp $ +$NetBSD: patch-ai,v 1.6 2003/03/09 19:46:53 jschauma Exp $ --- winquake/makefile.linuxi386.orig Tue Apr 27 17:51:18 1999 +++ winquake/makefile.linuxi386 @@ -25,23 +25,23 @@ $NetBSD: patch-ai,v 1.5 2002/01/02 10:01:36 hubertf Exp $ +#CC=$(EGCS) -BASE_CFLAGS=-Dstricmp=strcasecmp -+BASE_CFLAGS=-Dstricmp=strcasecmp -I${X11BASE}/include ++BASE_CFLAGS=-Dstricmp=strcasecmp -I${X11BASE}/include ${CFLAGS} RELEASE_CFLAGS=$(BASE_CFLAGS) -g -mpentiumpro -O6 -ffast-math -funroll-loops \ -fomit-frame-pointer -fexpensive-optimizations DEBUG_CFLAGS=$(BASE_CFLAGS) -g -LDFLAGS=-lm -+LDFLAGS=-lm -lossaudio ++LDFLAGS+=-lm -lossaudio SVGALDFLAGS=-lvga -XLDFLAGS=-L/usr/X11R6/lib -lX11 -lXext -lXxf86dga -XCFLAGS=-DX11 -+XLDFLAGS=-L/usr/X11R6/lib -Wl,-rpath -Wl,${X11BASE}/lib -lX11 -lXext -lXxf86dga -+XCFLAGS=-DX11 -I${X11BASE}/include ++XLDFLAGS=-L/usr/X11R6/lib ${LDFLAGS} -lX11 -lXext -lXxf86dga ++XCFLAGS=-DX11 -I${X11BASE}/include ${CFLAGS} -MESAGLLDFLAGS=-L/usr/X11/lib -L/usr/local/lib -L$(MESA_DIR)/lib -lMesaGL -lglide2x -lX11 -lXext -ldl +MESAGLLDFLAGS=-L${X11BASE}/lib -L${LOCALBASE}/lib -L$(MESA_DIR)/lib -lMesaGL -lX11 -lXext TDFXGLLDFLAGS=-L$(TDFXGL_DIR)/release$(ARCH)$(GLIBC) -l3dfxgl -lglide2x -ldl -GLLDFLAGS=-L/usr/X11/lib -L/usr/local/lib -lGL -lX11 -lXext -ldl -lXxf86dga -lXxf86vm -lm -+GLLDFLAGS=-L${X11BASE}/lib -Wl,-rpath -Wl,${X11BASE}/lib -L${MESA_DIR}/lib -Wl,-rpath -Wl,${MESA_DIR}/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm -lm ++GLLDFLAGS=-L${X11BASE}/lib ${LDFLAGS} -L${MESA_DIR}/lib -lGL -lX11 -lXext -lXxf86dga -lXxf86vm -lm GLCFLAGS=-DGLQUAKE -I$(MESA_DIR)/include -I/usr/include/glide DO_CC=$(CC) $(CFLAGS) -o $@ -c $< diff --git a/games/quake6/Makefile b/games/quake6/Makefile index 147f4fc50f0..d928e762a34 100644 --- a/games/quake6/Makefile +++ b/games/quake6/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2002/12/07 02:38:55 schmonz Exp $ +# $NetBSD: Makefile,v 1.19 2003/03/09 19:46:54 jschauma Exp $ DISTNAME= quake-v6-bsd-kame PKGNAME= quake6-0.0 @@ -33,5 +33,5 @@ PKG_FAIL_REASON= "${PKGNAME} requires IPv6 support" # "bindir" setting is very non-standard for GNU autoconf CONFIGURE_ARGS+=--disable-asmopt --bindir=/bin -.include "../../graphics/Mesa/buildlink2.mk" +.include "../../graphics/MesaLib/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/xracer/Makefile b/games/xracer/Makefile index e6df80d3f9c..8122fc320f0 100644 --- a/games/xracer/Makefile +++ b/games/xracer/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.24 2003/03/08 20:23:20 jmc Exp $ +# $NetBSD: Makefile,v 1.25 2003/03/09 19:46:54 jschauma Exp $ # DISTNAME= xracer-0.96.9 +PKGREVISION= 1 CATEGORIES= games x11 MASTER_SITES= http://xracer.annexia.org/files/ -- cgit v1.2.3