diff options
| author | snj <snj> | 2004-04-17 20:40:45 +0000 |
|---|---|---|
| committer | snj <snj> | 2004-04-17 20:40:45 +0000 |
| commit | bce574d114c93cde459c12be0b23ba4ed4b71830 (patch) | |
| tree | 61611843ecaa29da88e312e9bd8b1eb502e519c9 /games/battleball | |
| parent | 8e68e720f8841ae97a6920a719920af0a2075821 (diff) | |
| download | pkgsrc-bce574d114c93cde459c12be0b23ba4ed4b71830.tar.gz | |
Convert to buildlink3. While here, fix build with gcc3.
Diffstat (limited to 'games/battleball')
| -rw-r--r-- | games/battleball/Makefile | 6 | ||||
| -rw-r--r-- | games/battleball/distinfo | 4 | ||||
| -rw-r--r-- | games/battleball/patches/patch-ac | 16 | ||||
| -rw-r--r-- | games/battleball/patches/patch-ad | 12 |
4 files changed, 34 insertions, 4 deletions
diff --git a/games/battleball/Makefile b/games/battleball/Makefile index 943e0bc3d09..5207d154c32 100644 --- a/games/battleball/Makefile +++ b/games/battleball/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2004/01/20 12:15:39 agc Exp $ +# $NetBSD: Makefile,v 1.14 2004/04/17 20:40:45 snj Exp $ DISTNAME= battleball.21.src PKGNAME= battleball-2.1 @@ -11,7 +11,7 @@ HOMEPAGE= http://www.cs.utexas.edu/users/pahardin/bb.html COMMENT= 3d game of soccer, with tanks WRKSRC= ${WRKDIR}/battleball-2.1-src -USE_BUILDLINK2= YES +USE_BUILDLINK3= YES USE_X11= YES USE_GCC_SHLIB= YES @@ -27,7 +27,7 @@ do-install: .include "../../mk/bsd.prefs.mk" .if defined(BATTLEBALL_USE_MESA) -.include "../../graphics/MesaLib/buildlink2.mk" +.include "../../graphics/MesaLib/buildlink3.mk" .else CPPFLAGS+= -DNO_OPENGL SED_CMDS+= -e '/^GLINCS/s|^|\#|' -e '/^GLLIBS/s|^|\#|' diff --git a/games/battleball/distinfo b/games/battleball/distinfo index 6426b54c89f..5823ba43839 100644 --- a/games/battleball/distinfo +++ b/games/battleball/distinfo @@ -1,6 +1,8 @@ -$NetBSD: distinfo,v 1.3 2002/10/20 12:59:07 wiz Exp $ +$NetBSD: distinfo,v 1.4 2004/04/17 20:40:45 snj Exp $ SHA1 (battleball.21.src.tar.gz) = 5bc651d513d378d449c117488ef54af5f3381072 Size (battleball.21.src.tar.gz) = 102001 bytes SHA1 (patch-aa) = 96728a9548fb46fcc84e75ed57a074613a1e81d2 SHA1 (patch-ab) = 477a8860a8f65a10b163846f184c39e7916712ff +SHA1 (patch-ac) = 2c192f32eb0d732ad88d934e68321ee21a90ae4f +SHA1 (patch-ad) = 6257ea75af46d4ff29e9c4f1532470c3808c78fa diff --git a/games/battleball/patches/patch-ac b/games/battleball/patches/patch-ac new file mode 100644 index 00000000000..c52a25bca7e --- /dev/null +++ b/games/battleball/patches/patch-ac @@ -0,0 +1,16 @@ +$NetBSD: patch-ac,v 1.3 2004/04/17 20:40:45 snj Exp $ + +--- lib3d/general.h.orig 2004-04-17 13:31:57.000000000 -0700 ++++ lib3d/general.h 2004-04-17 13:33:01.000000000 -0700 +@@ -25,9 +25,11 @@ typedef unsigned char uchar; + typedef unsigned int uint; + typedef unsigned long ulong; + ++#if defined(__GNUC__) && __GNUC__ < 3 + #define and && + #define or || + #define not ! ++#endif + + #define forii(limit) for (int i= 0; i <limit; i++) + #define forij(limit) for (int j= 0; j <limit; j++) diff --git a/games/battleball/patches/patch-ad b/games/battleball/patches/patch-ad new file mode 100644 index 00000000000..57e80cd7eaa --- /dev/null +++ b/games/battleball/patches/patch-ad @@ -0,0 +1,12 @@ +$NetBSD: patch-ad,v 1.3 2004/04/17 20:40:45 snj Exp $ + +--- lib3d/xform.h.orig 2004-04-17 13:33:48.000000000 -0700 ++++ lib3d/xform.h 2004-04-17 13:35:07.000000000 -0700 +@@ -64,6 +64,7 @@ class tcomp { + + //=========================================================================== + class tmtrx { ++ friend struct player; + typedef double fourby3[4][3]; + fourby3 m; + |