9 files changed, 291 insertions, 0 deletions

diff --git a/games/ssc/files/patch-configure b/games/ssc/files/patch-configure
new file mode 100644
index 000000000000..9bb91b9486b3
--- /dev/null
+++ b/games/ssc/files/patch-configure
@@ -0,0 +1,177 @@
+--- configure.orig	Fri Oct 10 17:07:07 2003
++++ configure	Sat Jan 17 16:57:07 2004
+@@ -4196,163 +4196,6 @@
+ 
+ 
+ 
+-CPU_NAME="unknown"
+-CPU_TYPE="unknown"
+-if test -e "/proc/cpuinfo" ; then
+-        intel[30]="-march=i386"
+-        intel[32]="-march=i386"
+-        intel[34]="-march=i386"
+-        intel[40]="-march=i486"
+-        intel[41]="-march=i486"
+-        intel[42]="-march=i486"
+-        intel[43]="-march=i486"
+-        intel[44]="-march=i486"
+-        intel[45]="-march=i486"
+-        intel[47]="-march=i486"
+-        intel[48]="-march=i486"
+-        intel[51]="-march=pentium"
+-        intel[52]="-march=pentium"
+-        intel[54]="-march=pentium-mmx"
+-        intel[61]="-march=pentiumpro"
+-        intel[63]="-march=pentium2"
+-        intel[65]="-march=pentium2"
+-        intel[66]="-march=pentium2"
+-        intel[67]="-march=pentium3"
+-        intel[68]="-march=pentium3"
+-        intel[610]="-march=pentium3"
+-        intel[611]="-march=pentium3"
+-        intel[150]="-march=pentium4"
+-        intel[151]="-march=pentium4"
+-        intel[152]="-march=pentium4"
+-        amd[50]="-march=i586"
+-        amd[51]="-march=i586"
+-        amd[52]="-march=i586"
+-        amd[53]="-march=i586"
+-        amd[56]="-march=k6"
+-        amd[57]="-march=k6"
+-        amd[58]="-march=k6-2"
+-        amd[59]="-march=k6-3"
+-        amd[61]="-march=athlon"
+-        amd[62]="-march=athlon"
+-        amd[63]="-march=athlon"
+-        amd[64]="-march=athlon"
+-        amd[66]="-march=athlon-xp"
+-        amd[67]="-march=athlon"
+-        amd[68]="-march=athlon"
+-        CPU_TYPE="known"
+-        CPU_FAMILY=`cat /proc/cpuinfo | grep "cpu family"`
+-        CPU_MODEL=`cat /proc/cpuinfo | grep model[^\ ]`
+-        CPU_NAME=`cat /proc/cpuinfo | grep "model name"`
+-        CPU_FLAGS=`cat /proc/cpuinfo | grep "flags"`
+-        CPU_VENDOR=`cat /proc/cpuinfo | grep "vendor_id"`
+-        CPU_FAMILY=${CPU_FAMILY#'cpu family        : '}
+-        CPU_MODEL=${CPU_MODEL#'model                : '}
+-        CPU_NAME=${CPU_NAME#'model name        : '}
+-        CPU_FLAGS=${CPU_FLAGS#'flags                : '}
+-        CPU_VENDOR=${CPU_VENDOR#'vendor_id        : '}
+-        if test "x${CPU_VENDOR}" = "xGenuineIntel" ; then
+-                CPU_OPTIONS=${intel[$CPU_FAMILY$CPU_MODEL]}
+-        fi
+-        if test "x${CPU_VENDOR}" = "xAuthenticAMD" ; then
+-                CPU_OPTIONS=${amd[$CPU_FAMILY$CPU_MODEL]}
+-        fi
+-        if test "x${CPU_OPTIONS}" = "x" ; then
+-                CPU_TYPE="unknown"
+-        fi
+-        CPU_EXT=""
+-        for i in $CPU_FLAGS ; do
+-                case $i in
+-                fpu)
+-                        CPU_FPU="-mfpmath=387"
+-                        ;;
+-                mmx)
+-                        CPU_EXT="$CPU_EXT -mmmx"
+-                        ;;
+-                sse)
+-                        CPU_FPU="-mfpmath=sse -msse"
+-                        ;;
+-                sse2)
+-                        CPU_FPU="-mfpmath=sse -msse2"
+-                        ;;
+-                3dnow)
+-                        CPU_EXT="$CPU_EXT -m3dnow"
+-                        ;;
+-                esac
+-        done
+-        CPU_OPTIONS="$CPU_OPTIONS $CPU_FPU $CPU_EXT"
+-fi
+-if test "x${CPU_TYPE}" = "xunknown"; then
+-        CPU_TYPE=`( uname -p ) 2>&1`
+-        case $CPU_TYPE in
+-        i386)
+-                CPU_OPTIONS="-march=i386"
+-                ;;
+-        i486)
+-                CPU_OPTIONS="-march=i486"
+-                ;;
+-	athlon)
+-		CPU_OPTIONS="-march=athlon-xp"
+-		;;
+-        Pentium2)
+-                CPU_OPTIONS="-march=pentium2"
+-                ;;
+-        Pentiumpro)
+-                CPU_OPTIONS="-march=pentiumpro"
+-                ;;
+-        Pentium*)
+-                CPU_OPTIONS="-march=pentium"
+-                ;;
+-        k6)
+-                CPU_OPTIONS="-march=k6"
+-                ;;
+-        k6-2)
+-                CPU_OPTIONS="-march=k6-2"
+-                ;;
+-        k6-3)
+-                CPU_OPTIONS="-march=k6-3"
+-                ;;
+-        *)
+-                CPU_OPTIONS=""
+-                CPU_TYPE="unknown"
+-                ;;
+-        esac
+-        if test "x${CPU_TYPE}" = "xunknown"; then
+-                CPU_TYPE=`( uname -m ) 2>&1`
+-                case $CPU_TYPE in
+-                i386)
+-                        CPU_OPTIONS="-march=i386"
+-                        ;;
+-                i486)
+-                        CPU_OPTIONS="-march=i486"
+-                        ;;
+-                i586)
+-                        CPU_OPTIONS="-march=i586"
+-                        ;;
+-                i686)
+-                        CPU_OPTIONS="-march=i686"
+-                        ;;
+-                Pentium2)
+-                        CPU_OPTIONS="-march=pentium2"
+-                        ;;
+-                Pentiumpro)
+-                        CPU_OPTIONS="-march=pentiumpro"
+-                        ;;
+-                k6)
+-                        CPU_OPTIONS="-march=k6"
+-                        ;;
+-                k6-2)
+-                        CPU_OPTIONS="-march=k6-2"
+-                        ;;
+-                k6-3)
+-                        CPU_OPTIONS="-march=k6-3"
+-                        ;;
+-                *)
+-                        CPU_OPTIONS=""
+-                        ;;
+-                esac
+-        fi
+-fi
+-echo "Detected CPU:`echo $CPU_NAME | sed -e 's/.*://'`"
+ COMPILER=$CXX
+ for I in "$TMPDIR" "$TEMPDIR" "/tmp" ; do
+         test "$I" && break
+@@ -4375,8 +4218,8 @@
+ 
+ 
+ DBG_CXXFLAGS="$UNAME_DEFS  -g -Wall -Werror"
+-OPT_CXXFLAGS="$UNAME_DEFS  -O3 -pipe -finline-functions -falign-functions=4 -ffast-math -fno-rtti -fno-exceptions -mfancy-math-387 -fomit-frame-pointer  $CPU_OPTIONS  -Wall -Werror"
+-PRF_CXXFLAGS="$UNAME_DEFS  -O3 -pipe -finline-functions -falign-functions=4 -mfancy-math-387 -pg $CPU_OPTIONS  -Wall -Werror"
++OPT_CXXFLAGS="$UNAME_DEFS  -O3 -pipe -finline-functions -ffast-math -fno-rtti -fno-exceptions -mfancy-math-387 -fomit-frame-pointer -Wall -Werror"
++PRF_CXXFLAGS="$UNAME_DEFS  -O3 -pipe -finline-functions -mfancy-math-387 -pg -Wall -Werror"
+ 
+ CXXFLAGS=$OPT_CXXFLAGS
+ 
diff --git a/games/ssc/files/patch-src-Makefile.in b/games/ssc/files/patch-src-Makefile.in
new file mode 100644
index 000000000000..6c8dec6d2c5a
--- /dev/null
+++ b/games/ssc/files/patch-src-Makefile.in
@@ -0,0 +1,25 @@
+--- src/Makefile.in.orig	Sat Jan 17 16:40:15 2004
++++ src/Makefile.in	Sat Jan 17 16:41:53 2004
+@@ -68,9 +68,9 @@
+ 
+ LIBS = \
+ 	../support/ode/lib/libode.a \
+-	`freetype-config --libs` \
++	`${LOCALBASE}/bin/freetype-config --libs` \
+ 	-lGLU -lGL -lSDL_mixer \
+-	`sdl-config --libs` \
++	`${SDL_CONFIG} --libs` \
+ 	-lpng -lz
+ 
+ LTLIBOBJS = @LTLIBOBJS@
+@@ -118,8 +118,8 @@
+ target_alias = @target_alias@
+ INCLUDES = \
+ 	-I../support/ode/include \
+-	`freetype-config --cflags` \
+-	`sdl-config --cflags`
++	`${LOCALBASE}/bin/freetype-config --cflags` \
++	`${SDL_CONFIG} --cflags`
+ 
+ 
+ bin_PROGRAMS = ssc
diff --git a/games/ssc/files/patch-src-asteroid.cc b/games/ssc/files/patch-src-asteroid.cc
new file mode 100644
index 000000000000..e3ff565888d9
--- /dev/null
+++ b/games/ssc/files/patch-src-asteroid.cc
@@ -0,0 +1,13 @@
+--- src/asteroid.cc.orig	Sat Jan 17 17:27:37 2004
++++ src/asteroid.cc	Sat Jan 17 17:27:56 2004
+@@ -84,8 +84,8 @@
+ 
+ 	mp = (p0 + p1) / 2;
+ 
+-	float r = (distance(p0, bc) + distance(p1, bc)) / 2; // radius
+-	float l = distance(p0, p1); // edge length
++	float r = (dist(p0, bc) + dist(p1, bc)) / 2; // radius
++	float l = dist(p0, p1); // edge length
+ 	l *= strength;
+ 	srand48(seed + p0.hash() + p1.hash());
+ 	float d = drand48() - 0.5;
diff --git a/games/ssc/files/patch-src-coord.h b/games/ssc/files/patch-src-coord.h
new file mode 100644
index 000000000000..84ea9905bc92
--- /dev/null
+++ b/games/ssc/files/patch-src-coord.h
@@ -0,0 +1,11 @@
+--- src/coord.h.orig	Sat Jan 17 17:26:46 2004
++++ src/coord.h	Sat Jan 17 17:26:59 2004
+@@ -319,7 +319,7 @@
+ };
+ 
+ 
+-inline double distance(Coord3<double> &a, Coord3<double> &b)
++inline double dist(Coord3<double> &a, Coord3<double> &b)
+ {
+ 	Coord3<double> tmp;
+ 	tmp = a - b;
diff --git a/games/ssc/files/patch-src-damage.cc b/games/ssc/files/patch-src-damage.cc
new file mode 100644
index 000000000000..4ad5d51cbc24
--- /dev/null
+++ b/games/ssc/files/patch-src-damage.cc
@@ -0,0 +1,11 @@
+--- src/damage.cc.orig	Sat Jan 17 17:31:55 2004
++++ src/damage.cc	Sat Jan 17 17:32:04 2004
+@@ -44,7 +44,7 @@
+ {
+ 	if (obj.mFlocking)
+ 	{
+-		double d = distance(mPosition, obj.mPosition);
++		double d = dist(mPosition, obj.mPosition);
+ 		if (d > 0 && d < 50) interact(obj);
+ 	}
+ 
diff --git a/games/ssc/files/patch-src-font.cc b/games/ssc/files/patch-src-font.cc
new file mode 100644
index 000000000000..9d28e270ec50
--- /dev/null
+++ b/games/ssc/files/patch-src-font.cc
@@ -0,0 +1,10 @@
+--- src/font.cc.orig	Sat Jan 17 17:00:00 2004
++++ src/font.cc	Sat Jan 17 17:00:22 2004
+@@ -22,6 +22,7 @@
+ 
+ #include <iostream>
+ #include <iomanip>
++#include <math.h>
+ #include "font.h"
+ 
+ namespace OGLFT {
diff --git a/games/ssc/files/patch-src-nnwork.cc b/games/ssc/files/patch-src-nnwork.cc
new file mode 100644
index 000000000000..f0a7f01ab9f4
--- /dev/null
+++ b/games/ssc/files/patch-src-nnwork.cc
@@ -0,0 +1,10 @@
+--- src/nnwork.cc.orig	Sat Jan 17 17:30:41 2004
++++ src/nnwork.cc	Sat Jan 17 17:31:00 2004
+@@ -29,6 +29,7 @@
+ #include <fstream>
+ #include <cassert>
+ #include <cstring>
++#include <stdio.h>
+ 
+ // This class implements a simple three-layer backpropagation network.
+ 
diff --git a/games/ssc/files/patch-support-Makefile.in b/games/ssc/files/patch-support-Makefile.in
new file mode 100644
index 000000000000..91c411b0310e
--- /dev/null
+++ b/games/ssc/files/patch-support-Makefile.in
@@ -0,0 +1,19 @@
+--- support/Makefile.in.orig	Sat Jan 17 16:24:05 2004
++++ support/Makefile.in	Sat Jan 17 16:24:25 2004
+@@ -264,13 +264,13 @@
+ # Targets
+ 
+ all: ode
+-	(cd ode && make configure ode-lib)
++	(cd ode && ${MAKE} configure ode-lib)
+ 
+ clean: ode
+-	(cd ode && make clean)
++	(cd ode && ${MAKE} clean)
+ 
+ distclean: ode
+-	(cd ode && make clean)
++	(cd ode && ${MAKE} clean)
+ 
+ dist-hook: clean
+ 	for dir in $(ODE_CLEAN); do $(RM) -rf $(ODE_DIR)/$$dir; done
diff --git a/games/ssc/files/patch-support-ode-0.039-configurator.c b/games/ssc/files/patch-support-ode-0.039-configurator.c
new file mode 100644
index 000000000000..a2079c522229
--- /dev/null
+++ b/games/ssc/files/patch-support-ode-0.039-configurator.c
@@ -0,0 +1,15 @@
+--- support/ode-0.039/configurator.c.orig	Sat Jan 17 16:34:29 2004
++++ support/ode-0.039/configurator.c	Sat Jan 17 16:35:46 2004
+@@ -249,7 +249,11 @@
+ #define NUM_HEADERS 8
+ char *header_files[NUM_HEADERS] = {
+   "stdio.h", "stdlib.h", "math.h", "string.h",
+-  "stdarg.h", "malloc.h", "alloca.h",
++  "stdarg.h",
++#ifndef __FreeBSD__ 
++  "malloc.h",
++#endif
++  "alloca.h",
+   "ieeefp.h"		// Solaris needs this apparently
+ };
+ int header_used[NUM_HEADERS];