5 files changed, 41 insertions, 18 deletions

diff --git a/games/netpanzer/files/patch-Jamconfig.in b/games/netpanzer/files/patch-Jamconfig.in
deleted file mode 100644
index 04ceb7a155b3..000000000000
--- a/games/netpanzer/files/patch-Jamconfig.in
+++ /dev/null
@@ -1,7 +0,0 @@
---- Jamconfig.in.orig	Mon Feb 21 21:40:27 2005
-+++ Jamconfig.in	Mon Feb 21 21:41:05 2005
-@@ -98,3 +98,4 @@
- LTLIBOBJS ?= "@LTLIBOBJS@" ;
- INSTALL ?= "@INSTALL@" ;
- JAMCONFIG_READ = yes ;
-+fbsdocdir = "##DOCSDIR##" ;
diff --git a/games/netpanzer/files/patch-SConstruct b/games/netpanzer/files/patch-SConstruct
new file mode 100644
index 000000000000..5e2f83c7bced
--- /dev/null
+++ b/games/netpanzer/files/patch-SConstruct
@@ -0,0 +1,19 @@
+--- SConstruct.orig	2011-12-22 19:32:06.000000000 +0100
++++ SConstruct	2012-04-24 23:49:38.000000000 +0200
+@@ -69,7 +69,7 @@
+     ('crossmingwsdlconfig','sets the sdl-config full path for mingw cross compiler', 'sdl-config')
+ )
+ 
+-env = Environment(ENV = os.environ, options = opts)
++env = Environment(ENV = os.environ, options = opts, CC = os.environ['CC'], CXX = os.environ['CXX'])
+ Help(opts.GenerateHelpText(env))
+ 
+ ################################################################
+@@ -240,6 +240,7 @@
+     SetupSpawn(env)
+ else:
+     env.ParseConfig(env['sdlconfig'] + ' --cflags --libs')
++    env.Append( _LIBFLAGS = [ '-L%%LOCALBASE%%/lib' ] )
+     env.Append( NPLIBS = [ 'SDL_mixer' ] )
+ 
+ # for crossmingw platform
diff --git a/games/netpanzer/files/patch-mk-jam-install.jam b/games/netpanzer/files/patch-mk-jam-install.jam
deleted file mode 100644
index a4c29e11690c..000000000000
--- a/games/netpanzer/files/patch-mk-jam-install.jam
+++ /dev/null
@@ -1,11 +0,0 @@
---- mk/jam/install.jam.orig	Mon Feb 21 19:58:28 2005
-+++ mk/jam/install.jam	Mon Feb 21 20:02:05 2005
-@@ -11,7 +11,7 @@
- 
- # set some paths
- appdatadir ?= [ ConcatDirs $(datadir) $(PACKAGE_NAME) ] ;
--appdocdir ?= [ ConcatDirs $(datadir) doc $(PACKAGE_NAME)-$(PACKAGE_VERSION) ] ;
-+appdocdir ?= $(fbsdocdir) ;
- appconfdir ?= [ ConcatDirs $(sysconfdir) $(PACKAGE_NAME) ] ;
- plugindir ?= [ ConcatDirs $(libdir) $(PACKAGE_NAME) ] ;
- 
diff --git a/games/netpanzer/files/patch-src_Lib_ArrayUtil_QueueTemplate.hpp b/games/netpanzer/files/patch-src_Lib_ArrayUtil_QueueTemplate.hpp
new file mode 100644
index 000000000000..4063a78da49b
--- /dev/null
+++ b/games/netpanzer/files/patch-src_Lib_ArrayUtil_QueueTemplate.hpp
@@ -0,0 +1,11 @@
+--- src/Lib/ArrayUtil/QueueTemplate.hpp.orig	2012-04-24 23:51:05.000000000 +0200
++++ src/Lib/ArrayUtil/QueueTemplate.hpp	2012-04-24 23:51:15.000000000 +0200
+@@ -42,7 +42,7 @@
+ 
+     bool enqueue(const TYPE& object )
+     {
+-        add( object, (rear + 1) % this->size );
++        this->add( object, (rear + 1) % this->size );
+         rear = (rear + 1) % this->size;
+ 
+         if ( front == rear )
diff --git a/games/netpanzer/files/patch-src_Lib_Network_Address.hpp b/games/netpanzer/files/patch-src_Lib_Network_Address.hpp
new file mode 100644
index 000000000000..28e7e1810bcc
--- /dev/null
+++ b/games/netpanzer/files/patch-src_Lib_Network_Address.hpp
@@ -0,0 +1,11 @@
+--- src/Lib/Network/Address.hpp.orig	2010-01-19 17:08:17.000000000 +0100
++++ src/Lib/Network/Address.hpp	2012-04-20 17:34:26.306480287 +0200
+@@ -47,7 +47,7 @@
+     struct sockaddr * getSockaddr() const { return (struct sockaddr *)&ss; };
+     socklen_t getSockaddrLen() const
+     {
+-#ifdef __APPLE__
++#if defined(__APPLE__) || defined(__FreeBSD__)
+         return sizeof(sockaddr_in); 
+ #else
+         return ss_len;