Convert to buildlink3 and fix build with gcc3. Patch stolen from FreeBSD.

3 files changed, 65 insertions, 7 deletions

diff --git a/games/tuxracer/Makefile b/games/tuxracer/Makefile
index 0ff43c7a80d..8ec74847220 100644
--- a/games/tuxracer/Makefile
+++ b/games/tuxracer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/03/08 19:52:51 minskim Exp $
+# $NetBSD: Makefile,v 1.11 2004/04/11 23:16:27 snj Exp $
 #
 
 DISTNAME=	tuxracer-0.61
@@ -12,7 +12,7 @@ MAINTAINER=	david@netbsd-fr.org
 HOMEPAGE=	http://tuxracer.sourceforge.net/
 COMMENT=	3D penguin racing game using OpenGL
 
-USE_BUILDLINK2=	YES
+USE_BUILDLINK3=	YES
 GNU_CONFIGURE=	YES
 
 CFLAGS+=	-DGLX_GLXEXT_PROTOTYPES
@@ -30,9 +30,9 @@ post-install:
 	cd ${PREFIX}/share/tuxracer && \
 		${FIND} . -type f -exec ${CHMOD} 444 {} \;
 
-.include "../../audio/SDL_mixer/buildlink2.mk"
-.include "../../graphics/glu/buildlink2.mk"
-.include "../../lang/tcl83/buildlink2.mk"
+.include "../../audio/SDL_mixer/buildlink3.mk"
+.include "../../graphics/glu/buildlink3.mk"
+.include "../../lang/tcl83/buildlink3.mk"
 
-.include "../../mk/pthread.buildlink2.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/tuxracer/distinfo b/games/tuxracer/distinfo
index a810531827e..6e745432605 100644
--- a/games/tuxracer/distinfo
+++ b/games/tuxracer/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/03/25 01:32:55 salo Exp $
+$NetBSD: distinfo,v 1.2 2004/04/11 23:16:27 snj Exp $
 
 SHA1 (tuxracer-0.61.tar.gz) = e1b98209f99400cd6aa660f6c1c8bd2ab17d5cea
 Size (tuxracer-0.61.tar.gz) = 636628 bytes
 SHA1 (tuxracer-data-0.61.tar.gz) = f8476530106bfc343e9196e2a8285b5a57f75d65
 Size (tuxracer-data-0.61.tar.gz) = 7402317 bytes
+SHA1 (patch-aa) = 834c16cb60690a2b3199dbe10e3350f67860e924
diff --git a/games/tuxracer/patches/patch-aa b/games/tuxracer/patches/patch-aa
new file mode 100644
index 00000000000..509d4f5d88f
--- /dev/null
+++ b/games/tuxracer/patches/patch-aa
@@ -0,0 +1,57 @@
+$NetBSD: patch-aa,v 1.1 2004/04/11 23:16:27 snj Exp $
+
+--- src/game_config.c.orig	Sun Aug 17 17:59:46 2003
++++ src/game_config.c	Sun Aug 17 18:02:15 2003
+@@ -114,26 +114,26 @@
+  */
+ 
+ #define INIT_PARAM( nam, val, typename, commnt ) \
+-   Params. ## nam ## .loaded = False; \
+-   Params. ## nam ## .name = #nam; \
+-   Params. ## nam ## .deflt. ## typename ## _val  = val; \
+-   Params. ## nam ## .comment = commnt;
++   Params.nam.loaded = False; \
++   Params.nam.name = #nam; \
++   Params.nam.deflt.typename ## _val  = val; \
++   Params.nam.comment = commnt;
+ 
+ #define INIT_PARAM_STRING( nam, val, commnt ) \
+    INIT_PARAM( nam, val, string, commnt ); \
+-   Params. ## nam ## .type = PARAM_STRING;
++   Params.nam.type = PARAM_STRING;
+ 
+ #define INIT_PARAM_CHAR( nam, val, commnt ) \
+    INIT_PARAM( nam, val, char, commnt ); \
+-   Params. ## nam ## .type = PARAM_CHAR;
++   Params.nam.type = PARAM_CHAR;
+ 
+ #define INIT_PARAM_INT( nam, val, commnt ) \
+    INIT_PARAM( nam, val, int, commnt ); \
+-   Params. ## nam ## .type = PARAM_INT;
++   Params.nam.type = PARAM_INT;
+ 
+ #define INIT_PARAM_BOOL( nam, val, commnt ) \
+    INIT_PARAM( nam, val, bool, commnt ); \
+-   Params. ## nam ## .type = PARAM_BOOL;
++   Params.nam.type = PARAM_BOOL;
+ 
+ 
+ /*
+@@ -310,13 +310,13 @@
+  */
+ #define FN_PARAM( name, typename, type ) \
+     type getparam_ ## name() { \
+-        if ( !Params. ## name ## .loaded ) { \
+-            fetch_param_ ## typename( &( Params. ## name ) ); \
++        if ( !Params.name.loaded ) { \
++            fetch_param_ ## typename( &( Params.name ) ); \
+         } \
+-        return Params. ## name ## .val. ## typename ## _val; \
++        return Params.name.val.typename ## _val; \
+     } \
+     void setparam_ ## name( type val) { \
+-        set_param_ ## typename( &( Params. ## name ), val ); } 
++        set_param_ ## typename( &( Params.name ), val ); } 
+ 
+ #define FN_PARAM_STRING( name ) \
+     FN_PARAM( name, string, char* )