From cd565440d43d651da15cdfc1aedf5123ac67bd56 Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Fri, 28 Apr 2006 16:19:08 +0000
Subject: Fix isnan() and finite() detection, at least the former is supposed
 to be a macro. Don't ever copy FILEs, bail out silently if stderr can't be
 reopened. Bump revision.

---
 games/tuxracer/Makefile         |  4 ++--
 games/tuxracer/distinfo         |  4 +++-
 games/tuxracer/patches/patch-ac | 34 ++++++++++++++++++++++++++++++++++
 games/tuxracer/patches/patch-ad | 23 +++++++++++++++++++++++
 4 files changed, 62 insertions(+), 3 deletions(-)
 create mode 100644 games/tuxracer/patches/patch-ac
 create mode 100644 games/tuxracer/patches/patch-ad

diff --git a/games/tuxracer/Makefile b/games/tuxracer/Makefile
index ea965cf3226..70c619fb04e 100644
--- a/games/tuxracer/Makefile
+++ b/games/tuxracer/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2006/02/05 23:09:23 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2006/04/28 16:19:08 joerg Exp $
 #
 
 DISTNAME=	tuxracer-0.61
-PKGREVISION=	10
+PKGREVISION=	11
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tuxracer/}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
diff --git a/games/tuxracer/distinfo b/games/tuxracer/distinfo
index 03ffba35e79..daea5d5fa44 100644
--- a/games/tuxracer/distinfo
+++ b/games/tuxracer/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 23:12:03 agc Exp $
+$NetBSD: distinfo,v 1.5 2006/04/28 16:19:08 joerg Exp $
 
 SHA1 (tuxracer-0.61.tar.gz) = e1b98209f99400cd6aa660f6c1c8bd2ab17d5cea
 RMD160 (tuxracer-0.61.tar.gz) = 9dc7263521db98eb0d460c57fd20524015dcf13b
@@ -8,3 +8,5 @@ RMD160 (tuxracer-data-0.61.tar.gz) = 67cc0a4cbebd203e2743932995108b113f358609
 Size (tuxracer-data-0.61.tar.gz) = 7402317 bytes
 SHA1 (patch-aa) = 834c16cb60690a2b3199dbe10e3350f67860e924
 SHA1 (patch-ab) = 907c072d787221c1fa8b9135034b5751361895d5
+SHA1 (patch-ac) = 088562cd400265a2d782eddf8de24dfbadd261e5
+SHA1 (patch-ad) = d9dd5f7a99e538ffeadbfc2f01a558f5a915ddb5
diff --git a/games/tuxracer/patches/patch-ac b/games/tuxracer/patches/patch-ac
new file mode 100644
index 00000000000..4e2add73ebb
--- /dev/null
+++ b/games/tuxracer/patches/patch-ac
@@ -0,0 +1,34 @@
+$NetBSD: patch-ac,v 1.1 2006/04/28 16:19:08 joerg Exp $
+
+--- configure.orig	2006-04-28 15:48:21.000000000 +0000
++++ configure
+@@ -1655,24 +1655,13 @@ else
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+-#include <assert.h>
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-/* We use char because int might match the return type of a gcc2
+-    builtin and then its argument prototype would still apply.  */
+-char $ac_func();
++#include <math.h>
+ 
+-int main() {
+-
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+-choke me
+-#else
+-$ac_func();
+-#endif
++double foo;
+ 
+-; return 0; }
++int main() {
++	return $ac_func(foo);
++}
+ EOF
+ if { (eval echo configure:1678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
diff --git a/games/tuxracer/patches/patch-ad b/games/tuxracer/patches/patch-ad
new file mode 100644
index 00000000000..c73a0c3371e
--- /dev/null
+++ b/games/tuxracer/patches/patch-ad
@@ -0,0 +1,23 @@
+$NetBSD: patch-ad,v 1.1 2006/04/28 16:19:08 joerg Exp $
+
+--- src/debug.c.orig	2001-01-13 22:09:50.000000000 +0000
++++ src/debug.c
+@@ -165,16 +165,8 @@ void setup_diagnostic_log()
+     /* Redirect stderr to file; taken from SDL_main.c, which is in the 
+        public domain */
+     newfp = freopen(BUGREPORT_FILE, "w", stderr);
+-    if ( newfp == NULL ) {	/* This happens on NT */
+-#if !defined(stderr)
+-	stderr = fopen(BUGREPORT_FILE, "w");
+-#else
+-	newfp = fopen(BUGREPORT_FILE, "w");
+-	if ( newfp ) {
+-	    *stderr = *newfp;
+-	}
+-#endif
+-    }
++    if ( newfp == NULL )
++	    exit(1);
+ 
+     /* Write bug report header */
+     fprintf( stderr, "Tux Racer Diagnostic Log\n\n" );
-- 
cgit v1.2.3