Date: Sun, 15 Feb 2004 21:56:04 +0100 (CET) From: Thierry Thomas <thierry@pompo.net> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/62887: games/torcs: unbreaking on -CURRENT. Message-ID: <20040215205604.AD1AB22B9E1@ws90bj.pompo.net> Resent-Message-ID: <200402152100.i1FL0a4w045293@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 62887
>Category: ports
>Synopsis: games/torcs: unbreaking on -CURRENT.
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sun Feb 15 13:00:36 PST 2004
>Closed-Date:
>Last-Modified:
>Originator: Thierry Thomas
>Release: FreeBSD 5.2-RELEASE i386
>Organization:
Kabbale Eros
>Environment:
System: FreeBSD ws90bj.pompo.net 5.2-RELEASE FreeBSD 5.2-RELEASE #0: Mon Jan 19 20:52:58 CET 2004 thierry@ws90bj.pompo.net:/usr/obj/usr/src/sys/WS90BJ-040102 i386
>Description:
Torcs has been marked BROKEN for ${OSVERSION} >= 502000
=> unbreak it.
>How-To-Repeat:
See logs on Bento: strstream.h does not exist.
<http://bento.freebsd.org/errorlogs/i386-5-full-logs/torcs-1.2.1_2.log>.
>Fix:
Please apply the following patch:
(Remark: files/patch-src::drivers::K1999::K1999.cpp is a new file)
--- torcs.diff begins here ---
diff -urN games/torcs.orig/Makefile games/torcs/Makefile
--- games/torcs.orig/Makefile Wed Feb 11 22:23:28 2004
+++ games/torcs/Makefile Wed Feb 11 23:38:24 2004
@@ -73,10 +73,6 @@
BASH2FIX= src/modules/telemetry/telemetry.sh src/tools/launcher/torcs.in \
Make-default.mk robotgen \
-.if ${OSVERSION} >= 502000
-BROKEN= "Does not compile"
-.endif
-
pre-everything::
@${ECHO_MSG} ""
@${ECHO_MSG} " You might define these options:"
diff -urN games/torcs.orig/files/patch-src::drivers::K1999::K1999.cpp games/torcs/files/patch-src::drivers::K1999::K1999.cpp
--- games/torcs.orig/files/patch-src::drivers::K1999::K1999.cpp Thu Jan 1 01:00:00 1970
+++ games/torcs/files/patch-src::drivers::K1999::K1999.cpp Sun Feb 15 21:33:32 2004
@@ -0,0 +1,28 @@
+--- src/drivers/K1999/K1999.cpp.orig Sat Apr 19 11:48:14 2003
++++ src/drivers/K1999/K1999.cpp Sun Feb 15 21:32:27 2004
+@@ -14,8 +14,15 @@
+ ////////////////////////////////////////////////////////////////////////////
+ #include <iostream.h>
+ #ifndef WIN32
++
++#if defined(__GNUC__) && __GNUC__ > 2
++#include <strstream>
++#else
+ #include <strstream.h>
+-#endif
++#endif // __GNUC__
++
++#endif // WIN32
++
+ #include <iomanip.h>
+ #include <math.h>
+ #include <stdlib.h>
+@@ -515,7 +522,7 @@
+ OUTPUT("initTrack(" << index << ")");
+ char szSettings[100];
+ #ifndef WIN32
+- ostrstream os(szSettings, sizeof(szSettings));
++ std::ostrstream os(szSettings, sizeof(szSettings));
+ os << "drivers/K1999/" << index << "/settings.xml" << ends;
+ #else
+ sprintf(szSettings, "drivers/K1999/%d/settings.xml", index);
--- torcs.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040215205604.AD1AB22B9E1>