diff options
| -rw-r--r-- | games/battleball/Makefile | 6 | ||||
| -rw-r--r-- | games/battleball/distinfo | 5 | ||||
| -rw-r--r-- | games/battleball/patches/patch-aa | 8 | ||||
| -rw-r--r-- | games/battleball/patches/patch-ab | 13 | ||||
| -rw-r--r-- | games/plib/Makefile | 7 | ||||
| -rw-r--r-- | games/quake/Makefile | 8 |
6 files changed, 31 insertions, 16 deletions
diff --git a/games/battleball/Makefile b/games/battleball/Makefile index 95d79226c42..228c6dd5718 100644 --- a/games/battleball/Makefile +++ b/games/battleball/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/02/16 15:10:43 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2002/10/20 12:59:07 wiz Exp $ DISTNAME= battleball.21.src PKGNAME= battleball-2.1 @@ -9,11 +9,10 @@ MAINTAINER= root@garbled.net HOMEPAGE= http://www.cs.utexas.edu/users/pahardin/bb.html COMMENT= 3d game of soccer, with tanks +USE_BUILDLINK2= YES USE_X11= YES -CHECK_MESA= YES WRKSRC= ${WRKDIR}/battleball-2.1-src -CPPFLAGS+= -I${X11BASE}/include SED_CMDS= -e '/^INCS/s|$$|${CPPFLAGS}|' -e '/^LIBS/s|$$|${LDFLAGS}|' do-configure: @@ -32,4 +31,5 @@ CPPFLAGS+= -DNO_OPENGL SED_CMDS+= -e '/^GLINCS/s|^|\#|' -e '/^GLLIBS/s|^|\#|' .endif +.include "../../graphics/Mesa/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/battleball/distinfo b/games/battleball/distinfo index dd09be5d784..6426b54c89f 100644 --- a/games/battleball/distinfo +++ b/games/battleball/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.2 2001/04/21 02:08:18 wiz Exp $ +$NetBSD: distinfo,v 1.3 2002/10/20 12:59:07 wiz Exp $ SHA1 (battleball.21.src.tar.gz) = 5bc651d513d378d449c117488ef54af5f3381072 Size (battleball.21.src.tar.gz) = 102001 bytes -SHA1 (patch-aa) = 645b753a5be8f1bba80181da92df878546a04fb1 +SHA1 (patch-aa) = 96728a9548fb46fcc84e75ed57a074613a1e81d2 +SHA1 (patch-ab) = 477a8860a8f65a10b163846f184c39e7916712ff diff --git a/games/battleball/patches/patch-aa b/games/battleball/patches/patch-aa index 6c0e98ebd46..130095dd397 100644 --- a/games/battleball/patches/patch-aa +++ b/games/battleball/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.3 2000/01/06 08:46:33 fredb Exp $ +$NetBSD: patch-aa,v 1.4 2002/10/20 12:59:08 wiz Exp $ ---- lib3d/gfxtarget.h.orig Thu Sep 2 21:25:19 1999 -+++ lib3d/gfxtarget.h Thu Jan 6 02:05:27 2000 -@@ -72,7 +72,14 @@ +--- lib3d/gfxtarget.h.orig Fri Sep 3 04:25:19 1999 ++++ lib3d/gfxtarget.h +@@ -72,7 +72,14 @@ struct gfxTarget { XFillRectangle(disp,win,gc,(int)p.x,(int)p.y,(int)sz.x,(int)sz.y); } void ResizeWindow(const pt2d& sz) { diff --git a/games/battleball/patches/patch-ab b/games/battleball/patches/patch-ab new file mode 100644 index 00000000000..147186bea30 --- /dev/null +++ b/games/battleball/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.3 2002/10/20 12:59:08 wiz Exp $ + +--- Makefile.orig Fri Sep 3 04:25:18 1999 ++++ Makefile +@@ -11,7 +11,7 @@ XLIBS = -L/usr/X11R6/lib -lX11 + LIBS = -lm $(XLIBS) + + GLINCS = -I/usr/local/X11/include +-GLLIBS = -lXi -lXmu -lXext -L/usr/local/X11/lib -lMesaGL ++GLLIBS = -lXi -lXmu -lXext -L/usr/local/X11/lib -lGL + #GLLIBS = + + BSPOBJS = bsp/brep.o bsp/bsp.o bsp/polygon.o diff --git a/games/plib/Makefile b/games/plib/Makefile index 055678bfe65..9d7032c9ebd 100644 --- a/games/plib/Makefile +++ b/games/plib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/06/11 06:34:33 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2002/10/20 13:03:27 wiz Exp $ # DISTNAME= plib-1.2.0 @@ -9,9 +9,10 @@ MAINTAINER= rh@netbsd.org HOMEPAGE= http://plib.sourceforge.net/ COMMENT= libraries for writing portable games/realtime interactive apps +USE_BUILDLINK2= YES USE_X11= YES -USE_MESA= YES GNU_CONFIGURE= YES -CPPFLAGS+= -Dunix=1 -I${X11PREFIX}/include -I${X11BASE}/include +CPPFLAGS+= -Dunix=1 +.include "../../graphics/Mesa/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/games/quake/Makefile b/games/quake/Makefile index b03f2aca3f8..5ab45299c9c 100644 --- a/games/quake/Makefile +++ b/games/quake/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2002/06/27 20:18:41 tron Exp $ +# $NetBSD: Makefile,v 1.19 2002/10/20 13:14:03 wiz Exp $ DISTNAME= q1source PKGNAME= quake-2.30 @@ -15,15 +15,14 @@ DEPENDS+= quakedata-[0-9]*:../../games/quakedata ONLY_FOR_PLATFORM= *-*-i386 +USE_BUILDLINK2= yes USE_GMAKE= yes MAKE_ENV+= MAINDIR=${WRKSRC} WRKSRC= ${WRKDIR} USE_X11BASE= yes -USE_MESA= yes -EVAL_PREFIX+= MESA_DIR=Mesa -MAKE_ENV+= MESA_DIR=${MESA_DIR} +MAKE_ENV+= MESA_DIR=${BUILDLINK_PREFIX.Mesa} MAKE_ENV+= X11BASE=${X11BASE} do-configure: @@ -56,4 +55,5 @@ post-install: @ ${ECHO} by running \'quake.x11\'. @ ${ECHO} ===================================================================== +.include "../../graphics/Mesa/buildlink2.mk" .include "../../mk/bsd.pkg.mk" |