Fix Build on Current

Submitted by:	Stefan Farfeleder <e0026813@stud3.tuwien.ac.at>

10 files changed, 78 insertions, 0 deletions

diff --git a/games/bzflag/files/patch-BzfString.h b/games/bzflag/files/patch-BzfString.h
new file mode 100644
index 000000000000..b58380f6dafb
--- /dev/null
+++ b/games/bzflag/files/patch-BzfString.h
@@ -0,0 +1,18 @@
+--- include/BzfString.h.orig	Sat Nov 23 15:04:54 2002
++++ include/BzfString.h	Sat Nov 23 15:05:16 2002
+@@ -39,12 +39,14 @@
+ 
+ #include "common.h"
+ 
+-#if defined(sun) || defined(__MWERKS__)
++#if 1
+ // solaris compiler doesn't like declaration of ostream
+ #include "bzfio.h"
+ #else
+ class ostream;
+ #endif
++
++using std::ostream;
+ 
+ class BzfString {
+   public:
diff --git a/games/bzflag/files/patch-BzfString.h.orig b/games/bzflag/files/patch-BzfString.h.orig
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/games/bzflag/files/patch-BzfString.h.orig
diff --git a/games/bzflag/files/patch-bzfio.h b/games/bzflag/files/patch-bzfio.h
new file mode 100644
index 000000000000..59b7e5675165
--- /dev/null
+++ b/games/bzflag/files/patch-bzfio.h
@@ -0,0 +1,11 @@
+--- include/bzfio.h.orig	Sat Nov 23 15:06:09 2002
++++ include/bzfio.h	Sat Nov 23 15:06:17 2002
+@@ -23,7 +23,7 @@
+ #endif
+ #define NULL 0
+ 
+-#include <iostream.h>
++#include <iostream>
+ 
+ #endif
+ 
diff --git a/games/bzflag/files/patch-bzfio.h.orig b/games/bzflag/files/patch-bzfio.h.orig
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/games/bzflag/files/patch-bzfio.h.orig
diff --git a/games/bzflag/files/patch-bzflag.cxx b/games/bzflag/files/patch-bzflag.cxx
new file mode 100644
index 000000000000..c4df65d4d5f3
--- /dev/null
+++ b/games/bzflag/files/patch-bzflag.cxx
@@ -0,0 +1,20 @@
+--- src/bzflag/bzflag.cxx.orig	Sat Nov 23 15:16:44 2002
++++ src/bzflag/bzflag.cxx	Sat Nov 23 15:17:53 2002
+@@ -756,7 +756,7 @@
+ 
+   // read resources
+   {
+-    #ifdef __MWERKS__
++    #if 1
+ 	ifstream resourceStream(getConfigFileName(), ios::in);
+      #else
+     ifstream resourceStream(getConfigFileName(), ios::in | ios::nocreate);
+@@ -768,7 +768,7 @@
+ 
+ #if !defined(_WIN32) & !defined(macintosh)
+     else {
+-      ifstream resourceStream2(getConfigFileName2(), ios::in | ios::nocreate);
++      ifstream resourceStream2(getConfigFileName2(), ios::in);
+       if (resourceStream2) {
+ 	startupInfo.hasConfiguration = True;
+ 	resourceStream2 >> db;
diff --git a/games/bzflag/files/patch-bzflag.cxx.orig b/games/bzflag/files/patch-bzflag.cxx.orig
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/games/bzflag/files/patch-bzflag.cxx.orig
diff --git a/games/bzflag/files/patch-bzfs.cxx b/games/bzflag/files/patch-bzfs.cxx
new file mode 100644
index 000000000000..2ffe611b4616
--- /dev/null
+++ b/games/bzflag/files/patch-bzfs.cxx
@@ -0,0 +1,11 @@
+--- src/bzfs/bzfs.cxx.orig	Sat Nov 23 15:03:31 2002
++++ src/bzfs/bzfs.cxx	Sat Nov 23 15:03:45 2002
+@@ -2805,7 +2805,7 @@
+ static WorldInfo *defineWorldFromFile(const char *filename)
+ {
+   // open file
+-  ifstream input(filename, ios::in | ios::nocreate);
++  ifstream input(filename, ios::in);
+   if (!input) {
+     cerr << "could not find bzflag world file : " << filename << endl;
+     return NULL;
diff --git a/games/bzflag/files/patch-bzfs.cxx.orig b/games/bzflag/files/patch-bzfs.cxx.orig
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/games/bzflag/files/patch-bzfs.cxx.orig
diff --git a/games/bzflag/files/patch-resources.h b/games/bzflag/files/patch-resources.h
new file mode 100644
index 000000000000..b2ba567920a8
--- /dev/null
+++ b/games/bzflag/files/patch-resources.h
@@ -0,0 +1,18 @@
+--- src/bzflag/resources.h.orig	Sat Nov 23 15:18:38 2002
++++ src/bzflag/resources.h	Sat Nov 23 15:18:59 2002
+@@ -20,12 +20,13 @@
+ #include "common.h"
+ #include "BzfString.h"
+ 
+-#if defined(sun) || defined(macintosh)
+-// solaris compiler doesn't like declaration of istream
++#if 1
+ #include "bzfio.h"
+ #else
+ class istream;
+ #endif
++
++using namespace std;
+ 
+ class ResourceDatabase {
+   public:
diff --git a/games/bzflag/files/patch-resources.h.orig b/games/bzflag/files/patch-resources.h.orig
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/games/bzflag/files/patch-resources.h.orig