diff options
| author | jschauma <jschauma@pkgsrc.org> | 2003-03-09 19:46:51 +0000 |
|---|---|---|
| committer | jschauma <jschauma@pkgsrc.org> | 2003-03-09 19:46:51 +0000 |
| commit | 75b50e11df8dea33daaa08715473a0eaca393e13 (patch) | |
| tree | e0df3922504cc2cdaa78eb3dff75ab1c054ef11f /games/battalion | |
| parent | e7c1762bd099b15e25bfbfa9e763b31bf040b846 (diff) | |
| download | pkgsrc-75b50e11df8dea33daaa08715473a0eaca393e13.tar.gz | |
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.
Diffstat (limited to 'games/battalion')
| -rw-r--r-- | games/battalion/Makefile | 6 | ||||
| -rw-r--r-- | games/battalion/distinfo | 4 | ||||
| -rw-r--r-- | games/battalion/patches/patch-aa | 6 |
3 files changed, 9 insertions, 7 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 ... |