4 files changed, 34 insertions, 42 deletions

diff --git a/games/edge/files/patch-SConstruct b/games/edge/files/patch-SConstruct
deleted file mode 100644
index d30a717887aa..000000000000
--- a/games/edge/files/patch-SConstruct
+++ /dev/null
@@ -1,25 +0,0 @@
---- SConstruct.orig	2007-06-06 15:07:47.000000000 +0200
-+++ SConstruct	2010-03-12 11:00:55.000000000 +0100
-@@ -27,6 +27,14 @@
- if build_info['cross']:
-   base_env.Tool('crossmingw', toolpath=['build'])
- 
-+# Respect CC, CXX, CCFLAGS, CPPPATH and LIBPATH command-line parameters.
-+for key in ['CC', 'CXX']:
-+  if key in ARGUMENTS:
-+    base_env[key] = ARGUMENTS[key]
-+for key in ['CCFLAGS', 'CPPPATH', 'LIBPATH']:
-+  if key in ARGUMENTS:
-+    base_env[key] = Split(ARGUMENTS[key])
-+
- # warnings
- base_env.Append(CCFLAGS = ['-Wall'])
- 
-@@ -100,6 +108,7 @@
-     env.ParseConfig('#linux_lib/fltk-1.1.7/fltk-config --cflags')
-     env.Append(LIBPATH = ['#linux_lib/fltk-1.1.7/lib'])
-     env.Append(LIBS = ['fltk', 'fltk_images'])
-+    env.Append(LINKFLAGS = ['%%PTHREAD_LIBS%%'])
- 
- # HawkNL
- if 0:
diff --git a/games/edge/files/patch-src__e_main.cc b/games/edge/files/patch-src__e_main.cc
index 9d233fcc7448..409ac3d46f0c 100644
--- a/games/edge/files/patch-src__e_main.cc
+++ b/games/edge/files/patch-src__e_main.cc
@@ -1,11 +1,11 @@
---- ./src/e_main.cc.orig	Thu Jun 21 00:04:22 2007
-+++ ./src/e_main.cc	Wed Dec  5 23:35:20 2007
-@@ -1110,6 +1110,8 @@
+--- src/e_main.cc.orig	2008-08-23 18:00:36.000000000 +0900
++++ src/e_main.cc	2009-04-14 04:42:02.000000000 +0900
+@@ -936,6 +936,8 @@
  
-         if (s && epi::the_filesystem->IsDir(s))
-             iwad_dir.Set(s);
+         if (s && epi::FS_IsDir(s))
+             iwad_dir = std::string(s);
 +        else
-+            iwad_dir.Set("%%DMDIR%%");
++            iwad_dir = std::string("%%DMDIR%%");
      }
  
      // Should the IWAD directory not be set by now, then we
diff --git a/games/edge/files/patch-src__i_net.cc b/games/edge/files/patch-src__i_net.cc
new file mode 100644
index 000000000000..5def065f4f52
--- /dev/null
+++ b/games/edge/files/patch-src__i_net.cc
@@ -0,0 +1,11 @@
+--- src/i_net.cc.orig	2009-10-19 12:12:43.000000000 +0900
++++ src/i_net.cc	2011-07-29 02:27:29.000000000 +0900
+@@ -29,7 +29,7 @@
+ 
+ bool nonet = true;
+ 
+-#ifdef LINUX
++#ifdef __linux__
+ #include <linux/if.h>
+ #include <linux/sockios.h>
+ #endif
diff --git a/games/edge/files/patch-src__unx_net.cc b/games/edge/files/patch-src__unx_net.cc
index 2b057fccfcc5..d76e0faf8917 100644
--- a/games/edge/files/patch-src__unx_net.cc
+++ b/games/edge/files/patch-src__unx_net.cc
@@ -1,14 +1,20 @@
---- ./src/unx_net.cc.orig	Sat Nov 25 05:25:10 2006
-+++ ./src/unx_net.cc	Wed Dec  5 23:19:09 2007
-@@ -36,7 +36,11 @@
- #define htons  htons_FUCK
+--- src/unx_net.cc.orig	2009-10-19 12:14:58.000000000 +0900
++++ src/unx_net.cc	2011-07-29 02:18:56.000000000 +0900
+@@ -27,7 +27,7 @@
+ #include <sys/ioctl.h>
+ 
+ // -AJA- 2005/04/01: Yet another work-around for the huge pile of shit called C++
+-#ifndef MACOSX
++#ifdef __linux__
+ #define ntohl  ntohl_CRUD
+ #define ntohs  ntohs_CRUD
+ #define htonl  htonl_CRUD
+@@ -36,7 +36,7 @@
  
  #include <arpa/inet.h>
-+#ifdef __FreeBSD__
-+#include <net/if.h>
-+#else
- #include <linux/netdevice.h> 
-+#endif
  
- // possible: <linux/if.h>
- //           <linux/sockios.h>
+-#ifdef MACOSX
++#ifndef __linux__
+ #include <net/if.h>
+ #else
+ #include <linux/netdevice.h>