Update to build 35.

66 files changed, 1322 insertions, 258 deletions

diff --git a/games/scorched3d-devel/Makefile b/games/scorched3d-devel/Makefile
index 107624a83adc..8a05783f41e8 100644
--- a/games/scorched3d-devel/Makefile
+++ b/games/scorched3d-devel/Makefile
@@ -5,34 +5,45 @@
 #
 # $FreeBSD$
 
-PORTNAME=	scorched3d
-PORTVERSION=	0.32.0
-CATEGORIES=	games
-MASTER_SITES=	http://users.pandora.be/redzebra/
-PKGNAMESUFFIX=	devel
-DISTNAME=	scorched3d-${PORTVERSION}
-
-PATCH_SITES=	ftp://ftp.jurai.net/users/winter/patches/
-PATCHFILES=	scorched3d-0.32.0-FreeBSD.patch.0.gz
-
-MAINTAINER=	mdodd@FreeBSD.org
-COMMENT=	Scorched is a game based loosely on the classic DOS game
-
-LIB_DEPENDS=	SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer \
-		SDL_image.10:${PORTSDIR}/graphics/sdl_image
-
-SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
-
-USE_MESA=	yes
-HAS_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS=		--prefix=${PREFIX}/games
+PORTNAME=		scorched3d
+PORTVERSION=		0.${SCORCH_VERSION}
+CATEGORIES=		games
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	scorched3d
+DISTNAME=		Scorched3D-${SCORCH_VERSION}-src
+
+MAINTAINER=		mdodd@FreeBSD.org
+COMMENT=		Scorched is a game based loosely on the classic DOS game
+
+LIB_DEPENDS=		SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
+			SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer \
+			SDL_net.0:${PORTSDIR}/net/sdl_net \
+			wx_gtk.2:${PORTSDIR}/x11-toolkits/wxgtk-devel
+
+SCORCH_VERSION=		35
+WRKSRC=			${WRKDIR}/scorched
+SDL_CONFIG?=		${LOCALBASE}/bin/sdl11-config
+GNU_CONFIGURE= 		yes
+USE_MESA=		yes
+USE_GMAKE=		yes
+USE_AUTOMAKE_VER=	15
+USE_AUTOCONF_VER=	253
+
+AUTOMAKE_ARGS=		--foreign
+CONFIGURE_ARGS=		--with-wx-config=${X11BASE}/bin/wx-config
 CONFIGURE_ENV=		CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
 			SDL_CONFIG="${LOCALBASE}/bin/sdl11-config"
 MAKE_ENV=		SDL_CONFIG="${LOCALBASE}/bin/sdl11-config"
+MAKE_ARGS=		ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" \
+			AUTOMAKE="${TRUE}" AUTOHEADER="${TRUE}"
+
+pre-configure:
+	@cd ${WRKSRC}/scripts && ${PERL} createAMMakefile.pl
+	@cd ${WRKSRC} && aclocal
 
 pre-install:
-	@mkdir -p ${PREFIX}/games
+	@mkdir -p ${PREFIX}/games/scorched3d
+
 post-install:
 	@ln -fs ${PREFIX}/games/scorched3d/scorched3d ${PREFIX}/bin/scorched3d
 
diff --git a/games/scorched3d-devel/distinfo b/games/scorched3d-devel/distinfo
index 9ddab2834208..f04b8212b00f 100644
--- a/games/scorched3d-devel/distinfo
+++ b/games/scorched3d-devel/distinfo
@@ -1,2 +1 @@
-MD5 (scorched3d-0.32.0-FreeBSD.patch.0.gz) = 0a3133cd4267d3adbed6c8d8db1fc163
-MD5 (scorched3d-0.32.0.tar.gz) = 81fd0ba6f8f12718b462a1ed2fb84545
+MD5 (Scorched3D-35-src.tar.gz) = c43507e805b482cc0a37b8cd37a3a26b
diff --git a/games/scorched3d-devel/files/patch-Makefile.am b/games/scorched3d-devel/files/patch-Makefile.am
new file mode 100644
index 000000000000..c86896f703dd
--- /dev/null
+++ b/games/scorched3d-devel/files/patch-Makefile.am
@@ -0,0 +1,10 @@
+--- Makefile.am.orig	Sun Aug  3 20:12:01 2003
++++ Makefile.am	Sun Aug  3 20:11:43 2003
+@@ -1,6 +1,6 @@
+ ## Process with automake to produce Makefile.in
+ 
+-pkgdir = $(prefix)/@PACKAGE@
++pkgdir = $(prefix)/games/@PACKAGE@
+ 
+ SUBDIRS = src
+ 
diff --git a/games/scorched3d-devel/files/patch-configure.ac b/games/scorched3d-devel/files/patch-configure.ac
new file mode 100644
index 000000000000..d0204c5943f0
--- /dev/null
+++ b/games/scorched3d-devel/files/patch-configure.ac
@@ -0,0 +1,55 @@
+--- configure.ac.orig	Wed Jul 30 17:44:18 2003
++++ configure.ac	Sun Aug  3 10:15:54 2003
+@@ -13,6 +13,9 @@
+ AC_PROG_INSTALL
+ AC_PROG_RANLIB
+ 
++CFLAGS="$CFLAGS -I/usr/X11R6/include"
++LIBS="$LIBS -L/usr/X11R6/lib"
++
+ dnl Check for SDL
+ SDL_VERSION=1.0.1
+ AM_PATH_SDL($SDL_VERSION,
+@@ -28,8 +31,8 @@
+ have_SDLmixer=no
+ have_opengl=no  
+ AC_TRY_COMPILE([
+-   	#include <SDL/SDL.h>
+-	#include <SDL/SDL_mixer.h>
++   	#include <SDL11/SDL.h>
++	#include <SDL11/SDL_mixer.h>
+ ],[
+ ],[
+ have_SDLmixer=yes
+@@ -44,8 +47,8 @@
+ have_SDLnet=no
+ have_opengl=no  
+ AC_TRY_COMPILE([
+-   	#include <SDL/SDL.h>
+-	#include <SDL/SDL_net.h>
++   	#include <SDL11/SDL.h>
++	#include <SDL11/SDL_net.h>
+ ],[
+ ],[
+ have_SDLnet=yes
+@@ -72,7 +75,7 @@
+     AC_MSG_ERROR([*** Can't find the OpenGL library Try: http://www.opengl.org])
+ fi
+ 
+-OPENGL_LIBS="-lGL -lGLU -lpthread"
++OPENGL_LIBS="-lGL -lGLU"
+ LIBS="$LIBS $OPENGL_LIBS"
+ 
+ dnl Check for wxwindows
+@@ -97,9 +100,9 @@
+ 
+ dnl Define install prefix 
+ if test x$prefix = xNONE; then
+-	prefix=/usr/local/games
++	prefix=/usr/local
+ fi
+-AC_DEFINE_UNQUOTED(PKGDIR, "$prefix/$PACKAGE/", [install directory])
++AC_DEFINE_UNQUOTED(PKGDIR, "$prefix/games/$PACKAGE/", [install directory])
+ 
+ # extra fixed flags
+ CFLAGS="$CFLAGS -DdDOUBLE -D_NO_SERVER_ASE_"
diff --git a/games/scorched3d-devel/files/patch-src-GLEXT-GLBitmap.cpp b/games/scorched3d-devel/files/patch-src-GLEXT-GLBitmap.cpp
new file mode 100644
index 000000000000..5a5f63d292c1
--- /dev/null
+++ b/games/scorched3d-devel/files/patch-src-GLEXT-GLBitmap.cpp
@@ -0,0 +1,16 @@
+--- src/GLEXT/GLBitmap.cpp.orig	Wed Jul 30 17:41:26 2003
++++ src/GLEXT/GLBitmap.cpp	Sun Aug  3 09:07:12 2003
+@@ -24,11 +24,11 @@
+ //////////////////////////////////////////////////////////////////////
+ 
+ #include <stdio.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <math.h>
+ #include <GLEXT/GLState.h>
+ #include <GLEXT/GLBitmap.h>
+-#include <SDL/SDL.h>
++#include <SDL11/SDL.h>
+ 
+ //////////////////////////////////////////////////////////////////////
+ // Construction/Destruction
diff --git a/games/scorched3d-devel/files/patch-src-GLEXT-GLLuminance.cpp b/games/scorched3d-devel/files/patch-src-GLEXT-GLLuminance.cpp
new file mode 100644
index 000000000000..c6ae73b18cae
--- /dev/null
+++ b/games/scorched3d-devel/files/patch-src-GLEXT-GLLuminance.cpp
@@ -0,0 +1,11 @@
+--- src/GLEXT/GLLuminance.cpp.orig	Wed Jul 30 17:41:26 2003
++++ src/GLEXT/GLLuminance.cpp	Sun Aug  3 09:07:13 2003
+@@ -24,7 +24,7 @@
+ //////////////////////////////////////////////////////////////////////
+ 
+ #include <GLEXT/GLLuminance.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ 
+ //////////////////////////////////////////////////////////////////////
+ // Construction/Destruction
diff --git a/games/scorched3d-devel/files/patch-src-GLEXT-GLState.h b/games/scorched3d-devel/files/patch-src-GLEXT-GLState.h
new file mode 100644
index 000000000000..b78a8d5c817a
--- /dev/null
+++ b/games/scorched3d-devel/files/patch-src-GLEXT-GLState.h
@@ -0,0 +1,11 @@
+--- src/GLEXT/GLState.h.orig	Wed Jul 30 17:41:29 2003
++++ src/GLEXT/GLState.h	Sun Aug  3 09:07:13 2003
+@@ -27,7 +27,7 @@
+ #define AFX_GLSTATE_H__32B0E2D0_566D_4438_94E4_B12FE82430B1__INCLUDED_
+ 
+ #define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers
+-#include <SDL/SDL_opengl.h>
++#include <SDL11/SDL_opengl.h>
+ #include <common/Defines.h>
+ 
+ class GLState  
diff --git a/games/scorched3d-devel/files/patch-src-GLEXT-GLStateExtension.cpp b/games/scorched3d-devel/files/patch-src-GLEXT-GLStateExtension.cpp
new file mode 100644
index 000000000000..7b7a970748a4
--- /dev/null
+++ b/games/scorched3d-devel/files/patch-src-GLEXT-GLStateExtension.cpp
@@ -0,0 +1,11 @@
+--- src/GLEXT/GLStateExtension.cpp.orig	Wed Jul 30 17:41:26 2003
++++ src/GLEXT/GLStateExtension.cpp	Sun Aug  3 09:07:13 2003
+@@ -20,7 +20,7 @@
+ 
+ 
+ #include <GLEXT/GLStateExtension.h>
+-#include <SDL/SDL.h>
++#include <SDL11/SDL.h>
+ #include <string.h>
+ 
+ bool GLStateExtension::noExtensions_ = false;
diff --git a/games/scorched3d-devel/files/patch-src-client-ClientMain.cpp b/games/scorched3d-devel/files/patch-src-client-ClientMain.cpp
new file mode 100644
index 000000000000..152cfc2296ec
--- /dev/null
+++ b/games/scorched3d-devel/files/patch-src-client-ClientMain.cpp
@@ -0,0 +1,11 @@
+--- src/client/ClientMain.cpp.orig	Wed Jul 30 17:41:23 2003
++++ src/client/ClientMain.cpp	Sun Aug  3 09:07:11 2003
+@@ -35,7 +35,7 @@
+ #include <coms/NetClient.h>
+ #include <engine/MainLoop.h>
+ #include <engine/GameState.h>
+-#include <SDL/SDL.h>
++#include <SDL11/SDL.h>
+ 
+ void clientCleanup()
+ {
diff --git a/games/scorched3d-devel/files/patch-src-client-GLSetup.cpp b/games/scorched3d-devel/files/patch-src-client-GLSetup.cpp
new file mode 100644
index 000000000000..bafac21645a5
--- /dev/null
+++ b/games/scorched3d-devel/files/patch-src-client-GLSetup.cpp
@@ -0,0 +1,11 @@
+--- src/client/GLSetup.cpp.orig	Wed Jul 30 17:41:24 2003
++++ src/client/GLSetup.cpp	Sun Aug  3 09:07:11 2003
+@@ -25,7 +25,7 @@
+ 
+ #include <client/GLSetup.h>
+ #include <GLEXT/GLStateExtension.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ 
+ void GLSetup::setup()
+ {
diff --git a/games/scorched3d-devel/files/patch-src-common-Display.h b/games/scorched3d-devel/files/patch-src-common-Display.h
new file mode 100644
index 000000000000..46e62eef2bab
--- /dev/null
+++ b/games/scorched3d-devel/files/patch-src-common-Display.h
@@ -0,0 +1,11 @@
+--- src/common/Display.h.orig	Wed Jul 30 17:41:28 2003
++++ src/common/Display.h	Sun Aug  3 09:07:11 2003
+@@ -27,7 +27,7 @@
+ //////////////////////////////////////////////////////////////////////
+ 
+ #include <stdlib.h>
+-#include <SDL/SDL.h>
++#include <SDL11/SDL.h>
+ 
+ class Display  
+ {
diff --git a/games/scorched3d-devel/files/patch-src-common-Gamma.cpp b/games/scorched3d-devel/files/patch-src-common-Gamma.cpp
new file mode 100644
index 000000000000..72258e753748
--- /dev/null
+++ b/games/scorched3d-devel/files/patch-src-common-Gamma.cpp
@@ -0,0 +1,11 @@
+--- src/common/Gamma.cpp.orig	Wed Jul 30 17:41:24 2003
++++ src/common/Gamma.cpp	Sun Aug  3 09:07:11 2003
+@@ -27,7 +27,7 @@
+ #include <common/Gamma.h>
+ #include <common/Defines.h>
+ #include <math.h>
+-#include <SDL/SDL.h>
++#include <SDL11/SDL.h>
+ 
+ //////////////////////////////////////////////////////////////////////
+ // Construction/Destruction
diff --git a/games/scorched3d-devel/files/patch-src-common-Gamma.h b/games/scorched3d-devel/files/patch-src-common-Gamma.h
new file mode 100644
index 000000000000..2342ab615b77
--- /dev/null
+++ b/games/scorched3d-devel/files/patch-src-common-Gamma.h
@@ -0,0 +1,11 @@
+--- src/common/Gamma.h.orig	Wed Jul 30 17:41:28 2003
++++ src/common/Gamma.h	Sun Aug  3 09:07:12 2003
+@@ -26,7 +26,7 @@
+ //
+ //////////////////////////////////////////////////////////////////////
+ 
+-#include <SDL/SDL.h>
++#include <SDL11/SDL.h>
+ 
+ struct GammaSettings
+ {
diff --git a/games/scorched3d-devel/files/patch-src-common-KeyboardHistory.h b/games/scorched3d-devel/files/patch-src-common-KeyboardHistory.h
new file mode 100644
index 000000000000..c6724cc127c5
--- /dev/null
+++ b/games/scorched3d-devel/files/patch-src-common-KeyboardHistory.h
@@ -0,0 +1,11 @@
+--- src/common/KeyboardHistory.h.orig	Wed Jul 30 17:41:28 2003
++++ src/common/KeyboardHistory.h	Sun Aug  3 09:07:12 2003
+@@ -26,7 +26,7 @@
+ #if !defined(AFX_HISTORY_H__EFFEAE97_E779_4737_8DB4_B76AD9431BBC__INCLUDED_)
+ #define AFX_HISTORY_H__EFFEAE97_E779_4737_8DB4_B76AD9431BBC__INCLUDED_
+ 
+-#include <SDL/SDL.h>
++#include <SDL11/SDL.h>
+ 
+ namespace KeyboardHistory
+ {
diff --git a/games/scorched3d-devel/files/patch-src-common-Mouse.h b/games/scorched3d-devel/files/patch-src-common-Mouse.h
new file mode 100644
index 000000000000..c37d4faefa3a
--- /dev/null
+++ b/games/scorched3d-devel/files/patch-src-common-Mouse.h
@@ -0,0 +1,11 @@
+--- src/common/Mouse.h.orig	Wed Jul 30 17:41:28 2003
++++ src/common/Mouse.h	Sun Aug  3 09:07:12 2003
+@@ -23,7 +23,7 @@
+ #define _MOUSE_H_
+ 
+ 
+-#include <SDL/SDL.h>
++#include <SDL11/SDL.h>
+ 
+ // Mouse.h: interface for the Mouse class.
+ //
diff --git a/games/scorched3d-devel/files/patch-src-common-RandomGenerator.cpp b/games/scorched3d-devel/files/patch-src-common-RandomGenerator.cpp
new file mode 100644
index 000000000000..8ea2dc8b8022
--- /dev/null
+++ b/games/scorched3d-devel/files/patch-src-common-RandomGenerator.cpp
@@ -0,0 +1,11 @@
+--- src/common/RandomGenerator.cpp.orig	Wed Jul 30 17:41:24 2003
++++ src/common/RandomGenerator.cpp	Sun Aug  3 09:07:12 2003
+@@ -20,7 +20,7 @@
+ 
+ #include <common/RandomGenerator.h>
+ #include <common/Defines.h>
+-#include <SDL/SDL_net.h>
++#include <SDL11/SDL_net.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <limits.h>
diff --git a/games/scorched3d-devel/files/patch-src-common-Sound.h b/games/scorched3d-devel/files/patch-src-common-Sound.h
new file mode 100644
index 000000000000..dd61fac1ab78
--- /dev/null
+++ b/games/scorched3d-devel/files/patch-src-common-Sound.h
@@ -0,0 +1,11 @@
+--- src/common/Sound.h.orig	Wed Jul 30 17:41:28 2003
++++ src/common/Sound.h	Sun Aug  3 09:07:12 2003
+@@ -26,7 +26,7 @@
+ //////////////////////////////////////////////////////////////////////
+ 
+ #include <list>
+-#include <SDL/SDL_mixer.h>
++#include <SDL11/SDL_mixer.h>
+ 
+ class SoundBuffer;
+ 
diff --git a/games/scorched3d-devel/files/patch-src-common-SoundStore.h b/games/scorched3d-devel/files/patch-src-common-SoundStore.h
new file mode 100644
index 000000000000..148c097f7839
--- /dev/null
+++ b/games/scorched3d-devel/files/patch-src-common-SoundStore.h
@@ -0,0 +1,11 @@
+--- src/common/SoundStore.h.orig	Wed Jul 30 17:41:28 2003
++++ src/common/SoundStore.h	Sun Aug  3 09:07:12 2003
+@@ -29,7 +29,7 @@
+ #include <string>
+ 
+ #define CACHE_SOUND(var, filename) 										\
+-		static SoundBuffer* ##var = SoundStore::instance()->fetchOrCreateBuffer(##filename);
++		static SoundBuffer* var = SoundStore::instance()->fetchOrCreateBuffer(filename);
+ 
+ class SoundStore
+ {
diff --git a/games/scorched3d-devel/files/patch-src-common-Timer.cpp b/games/scorched3d-devel/files/patch-src-common-Timer.cpp
new file mode 100644
index 000000000000..4f145ba31045
--- /dev/null
+++ b/games/scorched3d-devel/files/patch-src-common-Timer.cpp
@@ -0,0 +1,11 @@
+--- src/common/Timer.cpp.orig	Wed Jul 30 17:41:24 2003
++++ src/common/Timer.cpp	Sun Aug  3 09:07:12 2003
+@@ -25,7 +25,7 @@
+ 
+ #include <common/Defines.h>
+ #include <common/Timer.h>
+-#include <SDL/SDL.h>
++#include <SDL11/SDL.h>
+ 
+ //////////////////////////////////////////////////////////////////////
+ // Construction/Destruction
diff --git a/games/scorched3d-devel/files/patch-src-commonLogger.cpp b/games/scorched3d-devel/files/patch-src-commonLogger.cpp
new file mode 100644
index 000000000000..d2df36ffecc7
--- /dev/null
+++ b/games/scorched3d-devel/files/patch-src-commonLogger.cpp
@@ -0,0 +1,11 @@
+--- src/common/Logger.cpp.orig	Wed Jul 30 17:41:24 2003
++++ src/common/Logger.cpp	Sun Aug  3 09:07:12 2003
+@@ -21,7 +21,7 @@
+ #include <common/Defines.h>
+ #include <common/Logger.h>
+ #include <tank/TankContainer.h>
+-#include <SDL/SDL.h>
++#include <SDL11/SDL.h>
+ #include <time.h>
+ #include <stdio.h>
+ #include <stdarg.h>
diff --git a/games/scorched3d-devel/files/patch-src-coms-NetBuffer.cpp b/games/scorched3d-devel/files/patch-src-coms-NetBuffer.cpp
new file mode 100644
index 000000000000..a2fab8cfd972
--- /dev/null
+++ b/games/scorched3d-devel/files/patch-src-coms-NetBuffer.cpp
@@ -0,0 +1,11 @@
+--- src/coms/NetBuffer.cpp.orig	Wed Jul 30 17:41:25 2003
++++ src/coms/NetBuffer.cpp	Sun Aug  3 09:07:12 2003
+@@ -20,7 +20,7 @@
+ 
+ 
+ #include <coms/NetBuffer.h>
+-#include <SDL/SDL_net.h>
++#include <SDL11/SDL_net.h>
+ #include <string.h>
+ 
+ NetBuffer NetBufferDefault::defaultBuffer;
diff --git a/games/scorched3d-devel/files/patch-src-coms-NetBuffer.h b/games/scorched3d-devel/files/patch-src-coms-NetBuffer.h
new file mode 100644
index 000000000000..5689ad84e008
--- /dev/null
+++ b/games/scorched3d-devel/files/patch-src-coms-NetBuffer.h
@@ -0,0 +1,13 @@
+--- src/coms/NetBuffer.h.orig	Wed Jul 30 17:41:28 2003
++++ src/coms/NetBuffer.h	Sun Aug  3 09:07:12 2003
+@@ -23,8 +23,8 @@
+ #define _NETBUFFER_H_
+ 
+ #include <string>
+-#include <SDL/SDL.h>
+-#include <SDL/SDL_net.h>
++#include <SDL11/SDL.h>
++#include <SDL11/SDL_net.h>
+ 
+ typedef TCPsocket NetPlayerID;
+ 
diff --git a/games/scorched3d-devel/files/patch-src-coms-NetClient.cpp b/games/scorched3d-devel/files/patch-src-coms-NetClient.cpp
new file mode 100644
index 000000000000..0b27e2f40e73
--- /dev/null
+++ b/games/scorched3d-devel/files/patch-src-coms-NetClient.cpp
@@ -0,0 +1,11 @@
+--- src/coms/NetClient.cpp.orig	Wed Jul 30 17:41:25 2003
++++ src/coms/NetClient.cpp	Sun Aug  3 09:07:12 2003
+@@ -24,7 +24,7 @@
+ #include <coms/NetMessageHandler.h>
+ #include <coms/NetMessagePool.h>
+ #include <common/Logger.h>
+-#include <SDL/SDL_thread.h>
++#include <SDL11/SDL_thread.h>
+ 
+ NetClient *NetClient::instance_ = 0;
+ 
diff --git a/games/scorched3d-devel/files/patch-src-coms-NetMessageHandler.h b/games/scorched3d-devel/files/patch-src-coms-NetMessageHandler.h
new file mode 100644
index 000000000000..6187b25974e0
--- /dev/null
+++ b/games/scorched3d-devel/files/patch-src-coms-NetMessageHandler.h
@@ -0,0 +1,11 @@
+--- src/coms/NetMessageHandler.h.orig	Wed Jul 30 17:41:28 2003
++++ src/coms/NetMessageHandler.h	Sun Aug  3 09:07:12 2003
+@@ -23,7 +23,7 @@
+ #define __INCLUDE_NetMessageHandlerh_INCLUDE__
+ 
+ #include <coms/NetMessage.h>
+-#include <SDL/SDL_thread.h>
++#include <SDL11/SDL_thread.h>
+ #include <list>
+ 
+ class NetMessageHandlerI
diff --git a/games/scorched3d-devel/files/patch-src-coms-NetMessagePool.h b/games/scorched3d-devel/files/patch-src-coms-NetMessagePool.h
new file mode 100644
index 000000000000..65ef15fc471c
--- /dev/null
+++ b/games/scorched3d-devel/files/patch-src-coms-NetMessagePool.h
@@ -0,0 +1,11 @@
+--- src/coms/NetMessagePool.h.orig	Wed Jul 30 17:41:28 2003
++++ src/coms/NetMessagePool.h	Sun Aug  3 09:07:12 2003
+@@ -24,7 +24,7 @@
+ 
+ #include <coms/NetMessage.h>
+ #include <list>
+-#include <SDL/SDL_thread.h>
++#include <SDL11/SDL_thread.h>
+ 
+ class NetMessagePool
+ {
diff --git a/games/scorched3d-devel/files/patch-src-engine-ActionMeta.h b/games/scorched3d-devel/files/patch-src-engine-ActionMeta.h
new file mode 100644
index 000000000000..5b3ef2fe98e6
--- /dev/null
+++ b/games/scorched3d-devel/files/patch-src-engine-ActionMeta.h
@@ -0,0 +1,11 @@
+--- src/engine/ActionMeta.h.orig	Wed Jul 30 17:41:29 2003
++++ src/engine/ActionMeta.h	Sun Aug  3 09:07:12 2003
+@@ -29,7 +29,7 @@
+ 
+ #define REGISTER_ACTION_HEADER(x) \
+ 	virtual const char *getActionName() { return #x ; } \
+-	##x *getActionCopy() { return new x ; } \
++	x *getActionCopy() { return new x ; } \
+ 	virtual bool getReferenced() { return true; }
+ #define REGISTER_ACTION_SOURCE(x) \
+ 	struct META_##x { META_##x() { ActionMetaRegistration::addMap(#x , new x ); } }; \
diff --git a/games/scorched3d-devel/files/patch-src-engine-MainLoop.cpp b/games/scorched3d-devel/files/patch-src-engine-MainLoop.cpp
new file mode 100644
index 000000000000..279c87435635
--- /dev/null
+++ b/games/scorched3d-devel/files/patch-src-engine-MainLoop.cpp
@@ -0,0 +1,11 @@
+--- src/engine/MainLoop.cpp.orig	Wed Jul 30 17:41:26 2003
++++ src/engine/MainLoop.cpp	Sun Aug  3 09:07:12 2003
+@@ -28,7 +28,7 @@
+ #include <common/Defines.h>
+ #include <common/Timer.h>
+ #include <GLEXT/GLState.h>
+-#include <SDL/SDL.h>
++#include <SDL11/SDL.h>
+ 
+ //////////////////////////////////////////////////////////////////////
+ // Construction/Destruction
diff --git a/games/scorched3d-devel/files/patch-src-ode-common.h b/games/scorched3d-devel/files/patch-src-ode-common.h
new file mode 100644
index 000000000000..7f17caf18bf4
--- /dev/null
+++ b/games/scorched3d-devel/files/patch-src-ode-common.h
@@ -0,0 +1,11 @@
+--- src/ode/common.h.orig	Wed Jul 30 17:41:29 2003
++++ src/ode/common.h	Sun Aug  3 09:07:13 2003
+@@ -25,7 +25,7 @@
+ 
+ #include <ode/config.h>
+ #include <ode/error.h>
+-#ifndef WIN32
++#if !defined(WIN32) && !defined(__FreeBSD__)
+ #include <alloca.h>
+ #endif
+ #include <stdlib.h>
diff --git a/games/scorched3d-devel/files/patch-src-ode-config.h b/games/scorched3d-devel/files/patch-src-ode-config.h
new file mode 100644
index 000000000000..c30d3ec4e9e0
--- /dev/null
+++ b/games/scorched3d-devel/files/patch-src-ode-config.h
@@ -0,0 +1,11 @@
+--- src/ode/config.h.orig	Wed Jul 30 17:41:29 2003
++++ src/ode/config.h	Sun Aug  3 09:07:13 2003
+@@ -31,7 +31,7 @@
+ 
+ #include <stdio.h>
+ #include <stdarg.h>
+-#include <malloc.h>		// for alloca under windows
++#include <stdlib.h>		// for alloca under windows
+ #include <string.h>
+ #include <math.h>
+ 
diff --git a/games/scorched3d-devel/files/patch-src-scorched-main.cpp b/games/scorched3d-devel/files/patch-src-scorched-main.cpp
new file mode 100644
index 000000000000..f786738cf0c8
--- /dev/null
+++ b/games/scorched3d-devel/files/patch-src-scorched-main.cpp
@@ -0,0 +1,11 @@
+--- src/scorched/main.cpp.orig	Wed Jul 30 17:41:27 2003
++++ src/scorched/main.cpp	Sun Aug  3 09:07:13 2003
+@@ -20,7 +20,7 @@
+ 
+ 
+ #include <wx/wx.h>
+-#include <SDL/SDL.h>
++#include <SDL11/SDL.h>
+ #include <client/ClientMain.h>
+ #include <common/OptionsDisplay.h>
+ #include <common/OptionsParam.h>
diff --git a/games/scorched3d-devel/files/patch-src-server-ServerMain.cpp b/games/scorched3d-devel/files/patch-src-server-ServerMain.cpp
new file mode 100644
index 000000000000..1e1884d5f7d0
--- /dev/null
+++ b/games/scorched3d-devel/files/patch-src-server-ServerMain.cpp
@@ -0,0 +1,11 @@
+--- src/server/ServerMain.cpp.orig	Wed Jul 30 17:41:27 2003
++++ src/server/ServerMain.cpp	Sun Aug  3 09:07:13 2003
+@@ -46,7 +46,7 @@
+ #include <server/ServerBuyAccessoryHandler.h>
+ #include <server/ServerConnectHandler.h>
+ #include <server/ServerState.h>
+-#include <SDL/SDL.h>
++#include <SDL11/SDL.h>
+ 
+ Timer serverTimer;
+ 
diff --git a/games/scorched3d-devel/pkg-descr b/games/scorched3d-devel/pkg-descr
index b675f0428d71..cade5199432e 100644
--- a/games/scorched3d-devel/pkg-descr
+++ b/games/scorched3d-devel/pkg-descr
@@ -12,11 +12,6 @@ to recreate the simple yet addictive game play of the original game,
 adding amongst other new features a 3D island environment and LAN and
 internet play.
 
-NOTE:
-
-	This is a work in progress port of the Win32 game by
-	Gavin C. <gcamp@cisco.com>.  The port is done by
-	red.zebra@pandora.be for Linux.  Network play does
-	not work yet.
+You must run X11 in 16bpp mode in order for the game to run.
 
 WWW: http://www.scorched3d.co.uk/
diff --git a/games/scorched3d-devel/pkg-plist b/games/scorched3d-devel/pkg-plist
index 176526a562a6..b0c78a48803a 100644
--- a/games/scorched3d-devel/pkg-plist
+++ b/games/scorched3d-devel/pkg-plist
@@ -1,83 +1,207 @@
 bin/scorched3d
 games/scorched3d/scorched3d
-games/scorched3d/data/talk/talk2.cfg
-games/scorched3d/data/talk/talk1.cfg
+games/scorched3d/data/meshes/rock1.ase
+games/scorched3d/data/meshes/rock2.ase
 games/scorched3d/data/meshes/wind.ase
-games/scorched3d/data/help/help.txt
-games/scorched3d/data/fonts/font.bmp
-games/scorched3d/data/fonts/font.bmp.new
-games/scorched3d/data/fonts/font.bmp.orig
-games/scorched3d/data/windows/scorched.bmp
-games/scorched3d/data/windows/logotiled.bmp
-games/scorched3d/data/maps/Wide Area.bmp
-games/scorched3d/data/maps/coolLevel.bmp
-games/scorched3d/data/maps/Four_Big_Mountains.bmp
-games/scorched3d/data/maps/heightmap1.bmp
-games/scorched3d/data/maps/Land_of_Shadows.bmp
-games/scorched3d/data/maps/Little_River.bmp
-games/scorched3d/data/maps/port.bmp
-games/scorched3d/data/maps/River_One.bmp
-games/scorched3d/data/maps/River_Two.bmp
-games/scorched3d/data/maps/Rocks_and_Water.bmp
-games/scorched3d/data/maps/Rough_Hill.bmp
-games/scorched3d/data/maps/The_Big_One.bmp
-games/scorched3d/data/maps/The_Island.bmp
-games/scorched3d/data/maps/The_Island2.bmp
-games/scorched3d/data/maps/The_Three_Isles.bmp
-games/scorched3d/data/maps/Two_Big_Mountains.bmp
-games/scorched3d/data/maps/1st_Nice_Mountain.bmp
+games/scorched3d/data/talk/polish/talk1.txt
+games/scorched3d/data/talk/polish/talk2.txt
+games/scorched3d/data/talk/talk1.txt
+games/scorched3d/data/talk/talk2.txt
+games/scorched3d/data/tanks/wespe.bmp
+games/scorched3d/data/tanks/apache-long.bmp
+games/scorched3d/data/tanks/apache.ase
+games/scorched3d/data/tanks/apache.bmp
+games/scorched3d/data/tanks/bm13.ase
+games/scorched3d/data/tanks/bm13.bmp
+games/scorched3d/data/tanks/bradley.ase
+games/scorched3d/data/tanks/bradley.bmp
+games/scorched3d/data/tanks/bradleyb.bmp
+games/scorched3d/data/tanks/hawk.ase
+games/scorched3d/data/tanks/hawk.bmp
+games/scorched3d/data/tanks/hind.ase
+games/scorched3d/data/tanks/hind.bmp
+games/scorched3d/data/tanks/howitzer.ase
+games/scorched3d/data/tanks/howitzer.bmp
+games/scorched3d/data/tanks/hummermlrs.ase
+games/scorched3d/data/tanks/hummermlrs.bmp
+games/scorched3d/data/tanks/hummersam.ase
+games/scorched3d/data/tanks/hummersam.bmp
+games/scorched3d/data/tanks/hummertow.ase
+games/scorched3d/data/tanks/hummertow.bmp
+games/scorched3d/data/tanks/m110.ase
+games/scorched3d/data/tanks/m110.bmp
+games/scorched3d/data/tanks/m198.ase
+games/scorched3d/data/tanks/m198.bmp
+games/scorched3d/data/tanks/m1a1.ase
+games/scorched3d/data/tanks/m1a1.bmp
+games/scorched3d/data/tanks/m7priest.ase
+games/scorched3d/data/tanks/m7priest.bmp
+games/scorched3d/data/tanks/paladin.ase
+games/scorched3d/data/tanks/paladin.bmp
+games/scorched3d/data/tanks/patriot.ase
+games/scorched3d/data/tanks/patriot.bmp
+games/scorched3d/data/tanks/question.ase
+games/scorched3d/data/tanks/question.bmp
+games/scorched3d/data/tanks/sa6.ase
+games/scorched3d/data/tanks/sa6.bmp
+games/scorched3d/data/tanks/scud.ase
+games/scorched3d/data/tanks/scud.bmp
+games/scorched3d/data/tanks/t55.ase
+games/scorched3d/data/tanks/t55.bmp
+games/scorched3d/data/tanks/t55b.bmp
+games/scorched3d/data/tanks/t74.ase
+games/scorched3d/data/tanks/t74.bmp
+games/scorched3d/data/tanks/t74b.bmp
+games/scorched3d/data/tanks/tank2.ase
+games/scorched3d/data/tanks/tank2.bmp
+games/scorched3d/data/tanks/tank3.ase
+games/scorched3d/data/tanks/tank3.bmp
+games/scorched3d/data/tanks/tank4.ase
+games/scorched3d/data/tanks/tank4.bmp
+games/scorched3d/data/tanks/tank5.ase
+games/scorched3d/data/tanks/tank5.bmp
+games/scorched3d/data/tanks/tank5a.bmp
+games/scorched3d/data/tanks/tank6.ase
+games/scorched3d/data/tanks/tank6.bmp
+games/scorched3d/data/tanks/tank6a.bmp
+games/scorched3d/data/tanks/tank6b.bmp
+games/scorched3d/data/tanks/tos1.ase
+games/scorched3d/data/tanks/tos1.bmp
+games/scorched3d/data/tanks/towedartillery.ase
+games/scorched3d/data/tanks/towedartillery.bmp
+games/scorched3d/data/tanks/towedartilleryb.bmp
+games/scorched3d/data/tanks/wespe.ase
+games/scorched3d/data/tanks/apache-long.ase
+games/scorched3d/data/fonts/data.bmp
+games/scorched3d/data/fonts/datainv.bmp
 games/scorched3d/data/textures/bordershield/grid.bmp
 games/scorched3d/data/textures/bordershield/grid2.bmp
 games/scorched3d/data/textures/bordershield/grid22.bmp
 games/scorched3d/data/textures/bordershield/hit.bmp
-games/scorched3d/data/textures/surround/spheremap1.bmp
-games/scorched3d/data/textures/surround/spheremap2.bmp
-games/scorched3d/data/textures/surround/spheremap3.bmp
-games/scorched3d/data/textures/surround/spheremap4.bmp
-games/scorched3d/data/textures/explode/explode_fire_9.bmp
-games/scorched3d/data/textures/explode/explode_fire_1.bmp
-games/scorched3d/data/textures/explode/explode_fire_10.bmp
-games/scorched3d/data/textures/explode/explode_fire_11.bmp
-games/scorched3d/data/textures/explode/explode_fire_12.bmp
-games/scorched3d/data/textures/explode/explode_fire_13.bmp
-games/scorched3d/data/textures/explode/explode_fire_14.bmp
-games/scorched3d/data/textures/explode/explode_fire_2.bmp
-games/scorched3d/data/textures/explode/explode_fire_3.bmp
-games/scorched3d/data/textures/explode/explode_fire_4.bmp
-games/scorched3d/data/textures/explode/explode_fire_5.bmp
-games/scorched3d/data/textures/explode/explode_fire_6.bmp
-games/scorched3d/data/textures/explode/explode_fire_7.bmp
-games/scorched3d/data/textures/explode/explode_fire_8.bmp
-games/scorched3d/data/textures/explode/explode_fire_0.bmp
-games/scorched3d/data/textures/ground/Texture4.bmp
-games/scorched3d/data/textures/ground/magma.bmp
-games/scorched3d/data/textures/ground/rockside.bmp
-games/scorched3d/data/textures/ground/scorch.bmp
-games/scorched3d/data/textures/ground/shore.bmp
-games/scorched3d/data/textures/ground/Texture0.bmp
-games/scorched3d/data/textures/ground/Texture1.bmp
-games/scorched3d/data/textures/ground/Texture2.bmp
-games/scorched3d/data/textures/ground/Texture3.bmp
-games/scorched3d/data/textures/ground/magma-small.bmp
-games/scorched3d/data/textures/lensflare/Shine9.bw
-games/scorched3d/data/textures/lensflare/Flare1.bw
-games/scorched3d/data/textures/lensflare/Flare2.bw
-games/scorched3d/data/textures/lensflare/Flare3.bw
-games/scorched3d/data/textures/lensflare/Flare4.bw
-games/scorched3d/data/textures/lensflare/Flare5.bw
-games/scorched3d/data/textures/lensflare/Shine0.bw
-games/scorched3d/data/textures/lensflare/Shine1.bw
-games/scorched3d/data/textures/lensflare/Shine2.bw
-games/scorched3d/data/textures/lensflare/Shine3.bw
-games/scorched3d/data/textures/lensflare/Shine4.bw
-games/scorched3d/data/textures/lensflare/Shine5.bw
-games/scorched3d/data/textures/lensflare/Shine6.bw
-games/scorched3d/data/textures/lensflare/Shine7.bw
-games/scorched3d/data/textures/lensflare/Shine8.bw
-games/scorched3d/data/textures/lensflare/Flare0.bw
+games/scorched3d/data/textures/explode/exp05_7.bmp
+games/scorched3d/data/textures/explode/exp00_10.bmp
+games/scorched3d/data/textures/explode/exp00_2.bmp
+games/scorched3d/data/textures/explode/exp00_3.bmp
+games/scorched3d/data/textures/explode/exp00_4.bmp
+games/scorched3d/data/textures/explode/exp00_5.bmp
+games/scorched3d/data/textures/explode/exp00_6.bmp
+games/scorched3d/data/textures/explode/exp00_7.bmp
+games/scorched3d/data/textures/explode/exp00_8.bmp
+games/scorched3d/data/textures/explode/exp00_9.bmp
+games/scorched3d/data/textures/explode/exp01_1.bmp
+games/scorched3d/data/textures/explode/exp01_2.bmp
+games/scorched3d/data/textures/explode/exp01_3.bmp
+games/scorched3d/data/textures/explode/exp02_1.bmp
+games/scorched3d/data/textures/explode/exp02_2.bmp
+games/scorched3d/data/textures/explode/exp02_3.bmp
+games/scorched3d/data/textures/explode/exp03_1.bmp
+games/scorched3d/data/textures/explode/exp03_2.bmp
+games/scorched3d/data/textures/explode/exp03_3.bmp
+games/scorched3d/data/textures/explode/exp04_1.bmp
+games/scorched3d/data/textures/explode/exp04_2.bmp
+games/scorched3d/data/textures/explode/exp04_3.bmp
+games/scorched3d/data/textures/explode/exp05_1.bmp
+games/scorched3d/data/textures/explode/exp05_2.bmp
+games/scorched3d/data/textures/explode/exp05_3.bmp
+games/scorched3d/data/textures/explode/exp05_4.bmp
+games/scorched3d/data/textures/explode/exp05_5.bmp
+games/scorched3d/data/textures/explode/exp05_6.bmp
+games/scorched3d/data/textures/explode/exp00_1.bmp
+games/scorched3d/data/textures/flame/flame33.bmp
+games/scorched3d/data/textures/flame/flame02.bmp
+games/scorched3d/data/textures/flame/flame03.bmp
+games/scorched3d/data/textures/flame/flame04.bmp
+games/scorched3d/data/textures/flame/flame05.bmp
+games/scorched3d/data/textures/flame/flame06.bmp
+games/scorched3d/data/textures/flame/flame07.bmp
+games/scorched3d/data/textures/flame/flame08.bmp
+games/scorched3d/data/textures/flame/flame09.bmp
+games/scorched3d/data/textures/flame/flame10.bmp
+games/scorched3d/data/textures/flame/flame11.bmp
+games/scorched3d/data/textures/flame/flame12.bmp
+games/scorched3d/data/textures/flame/flame13.bmp
+games/scorched3d/data/textures/flame/flame14.bmp
+games/scorched3d/data/textures/flame/flame15.bmp
+games/scorched3d/data/textures/flame/flame16.bmp
+games/scorched3d/data/textures/flame/flame17.bmp
+games/scorched3d/data/textures/flame/flame18.bmp
+games/scorched3d/data/textures/flame/flame19.bmp
+games/scorched3d/data/textures/flame/flame20.bmp
+games/scorched3d/data/textures/flame/flame21.bmp
+games/scorched3d/data/textures/flame/flame22.bmp
+games/scorched3d/data/textures/flame/flame23.bmp
+games/scorched3d/data/textures/flame/flame24.bmp
+games/scorched3d/data/textures/flame/flame25.bmp
+games/scorched3d/data/textures/flame/flame26.bmp
+games/scorched3d/data/textures/flame/flame27.bmp
+games/scorched3d/data/textures/flame/flame28.bmp
+games/scorched3d/data/textures/flame/flame29.bmp
+games/scorched3d/data/textures/flame/flame30.bmp
+games/scorched3d/data/textures/flame/flame31.bmp
+games/scorched3d/data/textures/flame/flame32.bmp
+games/scorched3d/data/textures/flame/flame01.bmp
+games/scorched3d/data/textures/lensflare/shine9.bw
+games/scorched3d/data/textures/lensflare/flare1.bw
+games/scorched3d/data/textures/lensflare/flare2.bw
+games/scorched3d/data/textures/lensflare/flare3.bw
+games/scorched3d/data/textures/lensflare/flare4.bw
+games/scorched3d/data/textures/lensflare/flare5.bw
+games/scorched3d/data/textures/lensflare/shine0.bw
+games/scorched3d/data/textures/lensflare/shine1.bw
+games/scorched3d/data/textures/lensflare/shine2.bw
+games/scorched3d/data/textures/lensflare/shine3.bw
+games/scorched3d/data/textures/lensflare/shine4.bw
+games/scorched3d/data/textures/lensflare/shine5.bw
+games/scorched3d/data/textures/lensflare/shine6.bw
+games/scorched3d/data/textures/lensflare/shine7.bw
+games/scorched3d/data/textures/lensflare/shine8.bw
+games/scorched3d/data/textures/lensflare/flare0.bw
+games/scorched3d/data/textures/landscape/default/texture4.bmp
+games/scorched3d/data/textures/landscape/default/cubemap.bmp
+games/scorched3d/data/textures/landscape/default/magma-small.bmp
+games/scorched3d/data/textures/landscape/default/rockside.bmp
+games/scorched3d/data/textures/landscape/default/scorch.bmp
+games/scorched3d/data/textures/landscape/default/shore.bmp
+games/scorched3d/data/textures/landscape/default/texture0.bmp
+games/scorched3d/data/textures/landscape/default/texture1.bmp
+games/scorched3d/data/textures/landscape/default/texture2.bmp
+games/scorched3d/data/textures/landscape/default/texture3.bmp
+games/scorched3d/data/textures/landscape/default/cloud1.bmp
+games/scorched3d/data/textures/landscape/hell/texture4.bmp
+games/scorched3d/data/textures/landscape/hell/cubemap.bmp
+games/scorched3d/data/textures/landscape/hell/rockside.bmp
+games/scorched3d/data/textures/landscape/hell/scorch.bmp
+games/scorched3d/data/textures/landscape/hell/shore.bmp
+games/scorched3d/data/textures/landscape/hell/texture0.bmp
+games/scorched3d/data/textures/landscape/hell/texture1.bmp
+games/scorched3d/data/textures/landscape/hell/texture2.bmp
+games/scorched3d/data/textures/landscape/hell/texture3.bmp
+games/scorched3d/data/textures/landscape/hell/cloud1.bmp
+games/scorched3d/data/textures/landscape/sand/texture4.bmp
+games/scorched3d/data/textures/landscape/sand/cubemap.bmp
+games/scorched3d/data/textures/landscape/sand/rockside.bmp
+games/scorched3d/data/textures/landscape/sand/scorch.bmp
+games/scorched3d/data/textures/landscape/sand/shore.bmp
+games/scorched3d/data/textures/landscape/sand/texture0.bmp
+games/scorched3d/data/textures/landscape/sand/texture1.bmp
+games/scorched3d/data/textures/landscape/sand/texture2.bmp
+games/scorched3d/data/textures/landscape/sand/texture3.bmp
+games/scorched3d/data/textures/landscape/sand/cloud1.bmp
+games/scorched3d/data/textures/landscape/snow/texture4.bmp
+games/scorched3d/data/textures/landscape/snow/cubemap.bmp
+games/scorched3d/data/textures/landscape/snow/rockside.bmp
+games/scorched3d/data/textures/landscape/snow/scorch.bmp
+games/scorched3d/data/textures/landscape/snow/shore.bmp
+games/scorched3d/data/textures/landscape/snow/texture0.bmp
+games/scorched3d/data/textures/landscape/snow/texture1.bmp
+games/scorched3d/data/textures/landscape/snow/texture2.bmp
+games/scorched3d/data/textures/landscape/snow/texture3.bmp
+games/scorched3d/data/textures/landscape/snow/cloud1.bmp
+games/scorched3d/data/textures/landscape/textures.txt
+games/scorched3d/data/textures/glow1.bmp
 games/scorched3d/data/textures/smoke01.bmp
-games/scorched3d/data/textures/cubemap.bmp
 games/scorched3d/data/textures/talk.bmp
+games/scorched3d/data/wav/battery/battery.wav
 games/scorched3d/data/wav/explosions/medium.wav
 games/scorched3d/data/wav/explosions/gloop.wav
 games/scorched3d/data/wav/explosions/large.wav
@@ -85,6 +209,9 @@ games/scorched3d/data/wav/explosions/crunch.wav
 games/scorched3d/data/wav/explosions/small.wav
 games/scorched3d/data/wav/explosions/tank.wav
 games/scorched3d/data/wav/explosions/xlarge.wav
+games/scorched3d/data/wav/misc/camera.wav
+games/scorched3d/data/wav/misc/para.wav
+games/scorched3d/data/wav/misc/play.wav
 games/scorched3d/data/wav/misc/splash.wav
 games/scorched3d/data/wav/movement/elevate.wav
 games/scorched3d/data/wav/movement/movement.wav
@@ -100,37 +227,68 @@ games/scorched3d/data/wav/shoot/flare.wav
 games/scorched3d/data/wav/shoot/small.wav
 games/scorched3d/data/wav/shoot/tracer.wav
 games/scorched3d/data/wav/shoot/xlarge.wav
-games/scorched3d/data/tanks/tank2.ase
-games/scorched3d/data/tanks/tank3.ase
-games/scorched3d/data/tanks/tank4.ase
-games/scorched3d/data/tanks/tank3.bmp
-games/scorched3d/data/tanks/tank5.ase
-games/scorched3d/data/tanks/tank4.bmp
-games/scorched3d/data/tanks/tank5.bmp
-games/scorched3d/data/tanks/tank5a.bmp
-games/scorched3d/data/tanks/tank6.ase
-games/scorched3d/data/tanks/tank6.bmp
-games/scorched3d/data/tanks/tank2.bmp
-games/scorched3d/data/svrlist.txt
+games/scorched3d/data/windows/tank2.ico
+games/scorched3d/data/windows/display.bmp
+games/scorched3d/data/windows/eye1.bmp
+games/scorched3d/data/windows/island.bmp
+games/scorched3d/data/windows/island.ico
+games/scorched3d/data/windows/logotiled.bmp
+games/scorched3d/data/windows/scorched.bmp
+games/scorched3d/data/windows/scorcheds.bmp
+games/scorched3d/data/windows/server.bmp
+games/scorched3d/data/windows/tank-easy.bmp
+games/scorched3d/data/windows/tank-hard.bmp
+games/scorched3d/data/windows/tank-med.bmp
+games/scorched3d/data/windows/tank2.bmp
+games/scorched3d/data/windows/client.bmp
+games/scorched3d/data/server.xml
+games/scorched3d/data/ainames.txt
+games/scorched3d/data/singleeasy.xml
+games/scorched3d/data/singlehard.xml
+games/scorched3d/data/singlenormal.xml
+games/scorched3d/data/tanks.xml
+games/scorched3d/data/singlecustom.xml
+games/scorched3d/data/autoexec.xml
+games/scorched3d/data/display.xml
 games/scorched3d/data/motd.txt
+games/scorched3d/data/playernames.txt
+games/scorched3d/data/random.no
+games/scorched3d/data/resource.xml
+games/scorched3d/README
+games/scorched3d/documentation/Scorched3D.hlp
+games/scorched3d/documentation/mehrspieler.txt
+games/scorched3d/documentation/multiplayer.txt
+games/scorched3d/documentation/README-EXPAT.txt
+games/scorched3d/documentation/README-ODE.txt
+games/scorched3d/documentation/README-SDL.txt
+games/scorched3d/documentation/README-SDLMIXER.txt
+games/scorched3d/documentation/README-SDLNET.txt
+games/scorched3d/documentation/README-wxwindows.txt
+games/scorched3d/documentation/README-zlib.txt
+games/scorched3d/documentation/liesmich.txt
+@dirrm games/scorched3d/data/meshes
+@dirrm games/scorched3d/data/talk/polish
+@dirrm games/scorched3d/data/talk
 @dirrm games/scorched3d/data/tanks
-@dirrm games/scorched3d/data/wav/shoot
-@dirrm games/scorched3d/data/wav/shield
-@dirrm games/scorched3d/data/wav/movement
-@dirrm games/scorched3d/data/wav/misc
-@dirrm games/scorched3d/data/wav/explosions
-@dirrm games/scorched3d/data/wav
-@dirrm games/scorched3d/data/textures/lensflare
-@dirrm games/scorched3d/data/textures/ground
-@dirrm games/scorched3d/data/textures/explode
-@dirrm games/scorched3d/data/textures/surround
+@dirrm games/scorched3d/data/fonts
 @dirrm games/scorched3d/data/textures/bordershield
+@dirrm games/scorched3d/data/textures/explode
+@dirrm games/scorched3d/data/textures/flame
+@dirrm games/scorched3d/data/textures/lensflare
+@dirrm games/scorched3d/data/textures/landscape/default
+@dirrm games/scorched3d/data/textures/landscape/hell
+@dirrm games/scorched3d/data/textures/landscape/sand
+@dirrm games/scorched3d/data/textures/landscape/snow
+@dirrm games/scorched3d/data/textures/landscape
 @dirrm games/scorched3d/data/textures
-@dirrm games/scorched3d/data/maps
+@dirrm games/scorched3d/data/wav/battery
+@dirrm games/scorched3d/data/wav/explosions
+@dirrm games/scorched3d/data/wav/misc
+@dirrm games/scorched3d/data/wav/movement
+@dirrm games/scorched3d/data/wav/shield
+@dirrm games/scorched3d/data/wav/shoot
 @dirrm games/scorched3d/data/windows
-@dirrm games/scorched3d/data/fonts
-@dirrm games/scorched3d/data/help
-@dirrm games/scorched3d/data/meshes
-@dirrm games/scorched3d/data/talk
+@dirrm games/scorched3d/data/wav
 @dirrm games/scorched3d/data
+@dirrm games/scorched3d/documentation
 @dirrm games/scorched3d
diff --git a/games/scorched3d/Makefile b/games/scorched3d/Makefile
index 107624a83adc..8a05783f41e8 100644
--- a/games/scorched3d/Makefile
+++ b/games/scorched3d/Makefile
@@ -5,34 +5,45 @@
 #
 # $FreeBSD$
 
-PORTNAME=	scorched3d
-PORTVERSION=	0.32.0
-CATEGORIES=	games
-MASTER_SITES=	http://users.pandora.be/redzebra/
-PKGNAMESUFFIX=	devel
-DISTNAME=	scorched3d-${PORTVERSION}
-
-PATCH_SITES=	ftp://ftp.jurai.net/users/winter/patches/
-PATCHFILES=	scorched3d-0.32.0-FreeBSD.patch.0.gz
-
-MAINTAINER=	mdodd@FreeBSD.org
-COMMENT=	Scorched is a game based loosely on the classic DOS game
-
-LIB_DEPENDS=	SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer \
-		SDL_image.10:${PORTSDIR}/graphics/sdl_image
-
-SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
-
-USE_MESA=	yes
-HAS_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS=		--prefix=${PREFIX}/games
+PORTNAME=		scorched3d
+PORTVERSION=		0.${SCORCH_VERSION}
+CATEGORIES=		games
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	scorched3d
+DISTNAME=		Scorched3D-${SCORCH_VERSION}-src
+
+MAINTAINER=		mdodd@FreeBSD.org
+COMMENT=		Scorched is a game based loosely on the classic DOS game
+
+LIB_DEPENDS=		SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
+			SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer \
+			SDL_net.0:${PORTSDIR}/net/sdl_net \
+			wx_gtk.2:${PORTSDIR}/x11-toolkits/wxgtk-devel
+
+SCORCH_VERSION=		35
+WRKSRC=			${WRKDIR}/scorched
+SDL_CONFIG?=		${LOCALBASE}/bin/sdl11-config
+GNU_CONFIGURE= 		yes
+USE_MESA=		yes
+USE_GMAKE=		yes
+USE_AUTOMAKE_VER=	15
+USE_AUTOCONF_VER=	253
+
+AUTOMAKE_ARGS=		--foreign
+CONFIGURE_ARGS=		--with-wx-config=${X11BASE}/bin/wx-config
 CONFIGURE_ENV=		CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
 			SDL_CONFIG="${LOCALBASE}/bin/sdl11-config"
 MAKE_ENV=		SDL_CONFIG="${LOCALBASE}/bin/sdl11-config"
+MAKE_ARGS=		ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" \
+			AUTOMAKE="${TRUE}" AUTOHEADER="${TRUE}"
+
+pre-configure:
+	@cd ${WRKSRC}/scripts && ${PERL} createAMMakefile.pl
+	@cd ${WRKSRC} && aclocal
 
 pre-install:
-	@mkdir -p ${PREFIX}/games
+	@mkdir -p ${PREFIX}/games/scorched3d
+
 post-install:
 	@ln -fs ${PREFIX}/games/scorched3d/scorched3d ${PREFIX}/bin/scorched3d
 
diff --git a/games/scorched3d/distinfo b/games/scorched3d/distinfo
index 9ddab2834208..f04b8212b00f 100644
--- a/games/scorched3d/distinfo
+++ b/games/scorched3d/distinfo
@@ -1,2 +1 @@
-MD5 (scorched3d-0.32.0-FreeBSD.patch.0.gz) = 0a3133cd4267d3adbed6c8d8db1fc163
-MD5 (scorched3d-0.32.0.tar.gz) = 81fd0ba6f8f12718b462a1ed2fb84545
+MD5 (Scorched3D-35-src.tar.gz) = c43507e805b482cc0a37b8cd37a3a26b
diff --git a/games/scorched3d/files/patch-Makefile.am b/games/scorched3d/files/patch-Makefile.am
new file mode 100644
index 000000000000..c86896f703dd
--- /dev/null
+++ b/games/scorched3d/files/patch-Makefile.am
@@ -0,0 +1,10 @@
+--- Makefile.am.orig	Sun Aug  3 20:12:01 2003
++++ Makefile.am	Sun Aug  3 20:11:43 2003
+@@ -1,6 +1,6 @@
+ ## Process with automake to produce Makefile.in
+ 
+-pkgdir = $(prefix)/@PACKAGE@
++pkgdir = $(prefix)/games/@PACKAGE@
+ 
+ SUBDIRS = src
+ 
diff --git a/games/scorched3d/files/patch-configure.ac b/games/scorched3d/files/patch-configure.ac
new file mode 100644
index 000000000000..d0204c5943f0
--- /dev/null
+++ b/games/scorched3d/files/patch-configure.ac
@@ -0,0 +1,55 @@
+--- configure.ac.orig	Wed Jul 30 17:44:18 2003
++++ configure.ac	Sun Aug  3 10:15:54 2003
+@@ -13,6 +13,9 @@
+ AC_PROG_INSTALL
+ AC_PROG_RANLIB
+ 
++CFLAGS="$CFLAGS -I/usr/X11R6/include"
++LIBS="$LIBS -L/usr/X11R6/lib"
++
+ dnl Check for SDL
+ SDL_VERSION=1.0.1
+ AM_PATH_SDL($SDL_VERSION,
+@@ -28,8 +31,8 @@
+ have_SDLmixer=no
+ have_opengl=no  
+ AC_TRY_COMPILE([
+-   	#include <SDL/SDL.h>
+-	#include <SDL/SDL_mixer.h>
++   	#include <SDL11/SDL.h>
++	#include <SDL11/SDL_mixer.h>
+ ],[
+ ],[
+ have_SDLmixer=yes
+@@ -44,8 +47,8 @@
+ have_SDLnet=no
+ have_opengl=no  
+ AC_TRY_COMPILE([
+-   	#include <SDL/SDL.h>
+-	#include <SDL/SDL_net.h>
++   	#include <SDL11/SDL.h>
++	#include <SDL11/SDL_net.h>
+ ],[
+ ],[
+ have_SDLnet=yes
+@@ -72,7 +75,7 @@
+     AC_MSG_ERROR([*** Can't find the OpenGL library Try: http://www.opengl.org])
+ fi
+ 
+-OPENGL_LIBS="-lGL -lGLU -lpthread"
++OPENGL_LIBS="-lGL -lGLU"
+ LIBS="$LIBS $OPENGL_LIBS"
+ 
+ dnl Check for wxwindows
+@@ -97,9 +100,9 @@
+ 
+ dnl Define install prefix 
+ if test x$prefix = xNONE; then
+-	prefix=/usr/local/games
++	prefix=/usr/local
+ fi
+-AC_DEFINE_UNQUOTED(PKGDIR, "$prefix/$PACKAGE/", [install directory])
++AC_DEFINE_UNQUOTED(PKGDIR, "$prefix/games/$PACKAGE/", [install directory])
+ 
+ # extra fixed flags
+ CFLAGS="$CFLAGS -DdDOUBLE -D_NO_SERVER_ASE_"
diff --git a/games/scorched3d/files/patch-src-GLEXT-GLBitmap.cpp b/games/scorched3d/files/patch-src-GLEXT-GLBitmap.cpp
new file mode 100644
index 000000000000..5a5f63d292c1
--- /dev/null
+++ b/games/scorched3d/files/patch-src-GLEXT-GLBitmap.cpp
@@ -0,0 +1,16 @@
+--- src/GLEXT/GLBitmap.cpp.orig	Wed Jul 30 17:41:26 2003
++++ src/GLEXT/GLBitmap.cpp	Sun Aug  3 09:07:12 2003
+@@ -24,11 +24,11 @@
+ //////////////////////////////////////////////////////////////////////
+ 
+ #include <stdio.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <math.h>
+ #include <GLEXT/GLState.h>
+ #include <GLEXT/GLBitmap.h>
+-#include <SDL/SDL.h>
++#include <SDL11/SDL.h>
+ 
+ //////////////////////////////////////////////////////////////////////
+ // Construction/Destruction
diff --git a/games/scorched3d/files/patch-src-GLEXT-GLLuminance.cpp b/games/scorched3d/files/patch-src-GLEXT-GLLuminance.cpp
new file mode 100644
index 000000000000..c6ae73b18cae
--- /dev/null
+++ b/games/scorched3d/files/patch-src-GLEXT-GLLuminance.cpp
@@ -0,0 +1,11 @@
+--- src/GLEXT/GLLuminance.cpp.orig	Wed Jul 30 17:41:26 2003
++++ src/GLEXT/GLLuminance.cpp	Sun Aug  3 09:07:13 2003
+@@ -24,7 +24,7 @@
+ //////////////////////////////////////////////////////////////////////
+ 
+ #include <GLEXT/GLLuminance.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ 
+ //////////////////////////////////////////////////////////////////////
+ // Construction/Destruction
diff --git a/games/scorched3d/files/patch-src-GLEXT-GLState.h b/games/scorched3d/files/patch-src-GLEXT-GLState.h
new file mode 100644
index 000000000000..b78a8d5c817a
--- /dev/null
+++ b/games/scorched3d/files/patch-src-GLEXT-GLState.h
@@ -0,0 +1,11 @@
+--- src/GLEXT/GLState.h.orig	Wed Jul 30 17:41:29 2003
++++ src/GLEXT/GLState.h	Sun Aug  3 09:07:13 2003
+@@ -27,7 +27,7 @@
+ #define AFX_GLSTATE_H__32B0E2D0_566D_4438_94E4_B12FE82430B1__INCLUDED_
+ 
+ #define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers
+-#include <SDL/SDL_opengl.h>
++#include <SDL11/SDL_opengl.h>
+ #include <common/Defines.h>
+ 
+ class GLState  
diff --git a/games/scorched3d/files/patch-src-GLEXT-GLStateExtension.cpp b/games/scorched3d/files/patch-src-GLEXT-GLStateExtension.cpp
new file mode 100644
index 000000000000..7b7a970748a4
--- /dev/null
+++ b/games/scorched3d/files/patch-src-GLEXT-GLStateExtension.cpp
@@ -0,0 +1,11 @@
+--- src/GLEXT/GLStateExtension.cpp.orig	Wed Jul 30 17:41:26 2003
++++ src/GLEXT/GLStateExtension.cpp	Sun Aug  3 09:07:13 2003
+@@ -20,7 +20,7 @@
+ 
+ 
+ #include <GLEXT/GLStateExtension.h>
+-#include <SDL/SDL.h>
++#include <SDL11/SDL.h>
+ #include <string.h>
+ 
+ bool GLStateExtension::noExtensions_ = false;
diff --git a/games/scorched3d/files/patch-src-client-ClientMain.cpp b/games/scorched3d/files/patch-src-client-ClientMain.cpp
new file mode 100644
index 000000000000..152cfc2296ec
--- /dev/null
+++ b/games/scorched3d/files/patch-src-client-ClientMain.cpp
@@ -0,0 +1,11 @@
+--- src/client/ClientMain.cpp.orig	Wed Jul 30 17:41:23 2003
++++ src/client/ClientMain.cpp	Sun Aug  3 09:07:11 2003
+@@ -35,7 +35,7 @@
+ #include <coms/NetClient.h>
+ #include <engine/MainLoop.h>
+ #include <engine/GameState.h>
+-#include <SDL/SDL.h>
++#include <SDL11/SDL.h>
+ 
+ void clientCleanup()
+ {
diff --git a/games/scorched3d/files/patch-src-client-GLSetup.cpp b/games/scorched3d/files/patch-src-client-GLSetup.cpp
new file mode 100644
index 000000000000..bafac21645a5
--- /dev/null
+++ b/games/scorched3d/files/patch-src-client-GLSetup.cpp
@@ -0,0 +1,11 @@
+--- src/client/GLSetup.cpp.orig	Wed Jul 30 17:41:24 2003
++++ src/client/GLSetup.cpp	Sun Aug  3 09:07:11 2003
+@@ -25,7 +25,7 @@
+ 
+ #include <client/GLSetup.h>
+ #include <GLEXT/GLStateExtension.h>
+-#include <malloc.h>
++#include <stdlib.h>
+ 
+ void GLSetup::setup()
+ {
diff --git a/games/scorched3d/files/patch-src-common-Display.h b/games/scorched3d/files/patch-src-common-Display.h
new file mode 100644
index 000000000000..46e62eef2bab
--- /dev/null
+++ b/games/scorched3d/files/patch-src-common-Display.h
@@ -0,0 +1,11 @@
+--- src/common/Display.h.orig	Wed Jul 30 17:41:28 2003
++++ src/common/Display.h	Sun Aug  3 09:07:11 2003
+@@ -27,7 +27,7 @@
+ //////////////////////////////////////////////////////////////////////
+ 
+ #include <stdlib.h>
+-#include <SDL/SDL.h>
++#include <SDL11/SDL.h>
+ 
+ class Display  
+ {
diff --git a/games/scorched3d/files/patch-src-common-Gamma.cpp b/games/scorched3d/files/patch-src-common-Gamma.cpp
new file mode 100644
index 000000000000..72258e753748
--- /dev/null
+++ b/games/scorched3d/files/patch-src-common-Gamma.cpp
@@ -0,0 +1,11 @@
+--- src/common/Gamma.cpp.orig	Wed Jul 30 17:41:24 2003
++++ src/common/Gamma.cpp	Sun Aug  3 09:07:11 2003
+@@ -27,7 +27,7 @@
+ #include <common/Gamma.h>
+ #include <common/Defines.h>
+ #include <math.h>
+-#include <SDL/SDL.h>
++#include <SDL11/SDL.h>
+ 
+ //////////////////////////////////////////////////////////////////////
+ // Construction/Destruction
diff --git a/games/scorched3d/files/patch-src-common-Gamma.h b/games/scorched3d/files/patch-src-common-Gamma.h
new file mode 100644
index 000000000000..2342ab615b77
--- /dev/null
+++ b/games/scorched3d/files/patch-src-common-Gamma.h
@@ -0,0 +1,11 @@
+--- src/common/Gamma.h.orig	Wed Jul 30 17:41:28 2003
++++ src/common/Gamma.h	Sun Aug  3 09:07:12 2003
+@@ -26,7 +26,7 @@
+ //
+ //////////////////////////////////////////////////////////////////////
+ 
+-#include <SDL/SDL.h>
++#include <SDL11/SDL.h>
+ 
+ struct GammaSettings
+ {
diff --git a/games/scorched3d/files/patch-src-common-KeyboardHistory.h b/games/scorched3d/files/patch-src-common-KeyboardHistory.h
new file mode 100644
index 000000000000..c6724cc127c5
--- /dev/null
+++ b/games/scorched3d/files/patch-src-common-KeyboardHistory.h
@@ -0,0 +1,11 @@
+--- src/common/KeyboardHistory.h.orig	Wed Jul 30 17:41:28 2003
++++ src/common/KeyboardHistory.h	Sun Aug  3 09:07:12 2003
+@@ -26,7 +26,7 @@
+ #if !defined(AFX_HISTORY_H__EFFEAE97_E779_4737_8DB4_B76AD9431BBC__INCLUDED_)
+ #define AFX_HISTORY_H__EFFEAE97_E779_4737_8DB4_B76AD9431BBC__INCLUDED_
+ 
+-#include <SDL/SDL.h>
++#include <SDL11/SDL.h>
+ 
+ namespace KeyboardHistory
+ {
diff --git a/games/scorched3d/files/patch-src-common-Mouse.h b/games/scorched3d/files/patch-src-common-Mouse.h
new file mode 100644
index 000000000000..c37d4faefa3a
--- /dev/null
+++ b/games/scorched3d/files/patch-src-common-Mouse.h
@@ -0,0 +1,11 @@
+--- src/common/Mouse.h.orig	Wed Jul 30 17:41:28 2003
++++ src/common/Mouse.h	Sun Aug  3 09:07:12 2003
+@@ -23,7 +23,7 @@
+ #define _MOUSE_H_
+ 
+ 
+-#include <SDL/SDL.h>
++#include <SDL11/SDL.h>
+ 
+ // Mouse.h: interface for the Mouse class.
+ //
diff --git a/games/scorched3d/files/patch-src-common-RandomGenerator.cpp b/games/scorched3d/files/patch-src-common-RandomGenerator.cpp
new file mode 100644
index 000000000000..8ea2dc8b8022
--- /dev/null
+++ b/games/scorched3d/files/patch-src-common-RandomGenerator.cpp
@@ -0,0 +1,11 @@
+--- src/common/RandomGenerator.cpp.orig	Wed Jul 30 17:41:24 2003
++++ src/common/RandomGenerator.cpp	Sun Aug  3 09:07:12 2003
+@@ -20,7 +20,7 @@
+ 
+ #include <common/RandomGenerator.h>
+ #include <common/Defines.h>
+-#include <SDL/SDL_net.h>
++#include <SDL11/SDL_net.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <limits.h>
diff --git a/games/scorched3d/files/patch-src-common-Sound.h b/games/scorched3d/files/patch-src-common-Sound.h
new file mode 100644
index 000000000000..dd61fac1ab78
--- /dev/null
+++ b/games/scorched3d/files/patch-src-common-Sound.h
@@ -0,0 +1,11 @@
+--- src/common/Sound.h.orig	Wed Jul 30 17:41:28 2003
++++ src/common/Sound.h	Sun Aug  3 09:07:12 2003
+@@ -26,7 +26,7 @@
+ //////////////////////////////////////////////////////////////////////
+ 
+ #include <list>
+-#include <SDL/SDL_mixer.h>
++#include <SDL11/SDL_mixer.h>
+ 
+ class SoundBuffer;
+ 
diff --git a/games/scorched3d/files/patch-src-common-SoundStore.h b/games/scorched3d/files/patch-src-common-SoundStore.h
new file mode 100644
index 000000000000..148c097f7839
--- /dev/null
+++ b/games/scorched3d/files/patch-src-common-SoundStore.h
@@ -0,0 +1,11 @@
+--- src/common/SoundStore.h.orig	Wed Jul 30 17:41:28 2003
++++ src/common/SoundStore.h	Sun Aug  3 09:07:12 2003
+@@ -29,7 +29,7 @@
+ #include <string>
+ 
+ #define CACHE_SOUND(var, filename) 										\
+-		static SoundBuffer* ##var = SoundStore::instance()->fetchOrCreateBuffer(##filename);
++		static SoundBuffer* var = SoundStore::instance()->fetchOrCreateBuffer(filename);
+ 
+ class SoundStore
+ {
diff --git a/games/scorched3d/files/patch-src-common-Timer.cpp b/games/scorched3d/files/patch-src-common-Timer.cpp
new file mode 100644
index 000000000000..4f145ba31045
--- /dev/null
+++ b/games/scorched3d/files/patch-src-common-Timer.cpp
@@ -0,0 +1,11 @@
+--- src/common/Timer.cpp.orig	Wed Jul 30 17:41:24 2003
++++ src/common/Timer.cpp	Sun Aug  3 09:07:12 2003
+@@ -25,7 +25,7 @@
+ 
+ #include <common/Defines.h>
+ #include <common/Timer.h>
+-#include <SDL/SDL.h>
++#include <SDL11/SDL.h>
+ 
+ //////////////////////////////////////////////////////////////////////
+ // Construction/Destruction
diff --git a/games/scorched3d/files/patch-src-commonLogger.cpp b/games/scorched3d/files/patch-src-commonLogger.cpp
new file mode 100644
index 000000000000..d2df36ffecc7
--- /dev/null
+++ b/games/scorched3d/files/patch-src-commonLogger.cpp
@@ -0,0 +1,11 @@
+--- src/common/Logger.cpp.orig	Wed Jul 30 17:41:24 2003
++++ src/common/Logger.cpp	Sun Aug  3 09:07:12 2003
+@@ -21,7 +21,7 @@
+ #include <common/Defines.h>
+ #include <common/Logger.h>
+ #include <tank/TankContainer.h>
+-#include <SDL/SDL.h>
++#include <SDL11/SDL.h>
+ #include <time.h>
+ #include <stdio.h>
+ #include <stdarg.h>
diff --git a/games/scorched3d/files/patch-src-coms-NetBuffer.cpp b/games/scorched3d/files/patch-src-coms-NetBuffer.cpp
new file mode 100644
index 000000000000..a2fab8cfd972
--- /dev/null
+++ b/games/scorched3d/files/patch-src-coms-NetBuffer.cpp
@@ -0,0 +1,11 @@
+--- src/coms/NetBuffer.cpp.orig	Wed Jul 30 17:41:25 2003
++++ src/coms/NetBuffer.cpp	Sun Aug  3 09:07:12 2003
+@@ -20,7 +20,7 @@
+ 
+ 
+ #include <coms/NetBuffer.h>
+-#include <SDL/SDL_net.h>
++#include <SDL11/SDL_net.h>
+ #include <string.h>
+ 
+ NetBuffer NetBufferDefault::defaultBuffer;
diff --git a/games/scorched3d/files/patch-src-coms-NetBuffer.h b/games/scorched3d/files/patch-src-coms-NetBuffer.h
new file mode 100644
index 000000000000..5689ad84e008
--- /dev/null
+++ b/games/scorched3d/files/patch-src-coms-NetBuffer.h
@@ -0,0 +1,13 @@
+--- src/coms/NetBuffer.h.orig	Wed Jul 30 17:41:28 2003
++++ src/coms/NetBuffer.h	Sun Aug  3 09:07:12 2003
+@@ -23,8 +23,8 @@
+ #define _NETBUFFER_H_
+ 
+ #include <string>
+-#include <SDL/SDL.h>
+-#include <SDL/SDL_net.h>
++#include <SDL11/SDL.h>
++#include <SDL11/SDL_net.h>
+ 
+ typedef TCPsocket NetPlayerID;
+ 
diff --git a/games/scorched3d/files/patch-src-coms-NetClient.cpp b/games/scorched3d/files/patch-src-coms-NetClient.cpp
new file mode 100644
index 000000000000..0b27e2f40e73
--- /dev/null
+++ b/games/scorched3d/files/patch-src-coms-NetClient.cpp
@@ -0,0 +1,11 @@
+--- src/coms/NetClient.cpp.orig	Wed Jul 30 17:41:25 2003
++++ src/coms/NetClient.cpp	Sun Aug  3 09:07:12 2003
+@@ -24,7 +24,7 @@
+ #include <coms/NetMessageHandler.h>
+ #include <coms/NetMessagePool.h>
+ #include <common/Logger.h>
+-#include <SDL/SDL_thread.h>
++#include <SDL11/SDL_thread.h>
+ 
+ NetClient *NetClient::instance_ = 0;
+ 
diff --git a/games/scorched3d/files/patch-src-coms-NetMessageHandler.h b/games/scorched3d/files/patch-src-coms-NetMessageHandler.h
new file mode 100644
index 000000000000..6187b25974e0
--- /dev/null
+++ b/games/scorched3d/files/patch-src-coms-NetMessageHandler.h
@@ -0,0 +1,11 @@
+--- src/coms/NetMessageHandler.h.orig	Wed Jul 30 17:41:28 2003
++++ src/coms/NetMessageHandler.h	Sun Aug  3 09:07:12 2003
+@@ -23,7 +23,7 @@
+ #define __INCLUDE_NetMessageHandlerh_INCLUDE__
+ 
+ #include <coms/NetMessage.h>
+-#include <SDL/SDL_thread.h>
++#include <SDL11/SDL_thread.h>
+ #include <list>
+ 
+ class NetMessageHandlerI
diff --git a/games/scorched3d/files/patch-src-coms-NetMessagePool.h b/games/scorched3d/files/patch-src-coms-NetMessagePool.h
new file mode 100644
index 000000000000..65ef15fc471c
--- /dev/null
+++ b/games/scorched3d/files/patch-src-coms-NetMessagePool.h
@@ -0,0 +1,11 @@
+--- src/coms/NetMessagePool.h.orig	Wed Jul 30 17:41:28 2003
++++ src/coms/NetMessagePool.h	Sun Aug  3 09:07:12 2003
+@@ -24,7 +24,7 @@
+ 
+ #include <coms/NetMessage.h>
+ #include <list>
+-#include <SDL/SDL_thread.h>
++#include <SDL11/SDL_thread.h>
+ 
+ class NetMessagePool
+ {
diff --git a/games/scorched3d/files/patch-src-engine-ActionMeta.h b/games/scorched3d/files/patch-src-engine-ActionMeta.h
new file mode 100644
index 000000000000..5b3ef2fe98e6
--- /dev/null
+++ b/games/scorched3d/files/patch-src-engine-ActionMeta.h
@@ -0,0 +1,11 @@
+--- src/engine/ActionMeta.h.orig	Wed Jul 30 17:41:29 2003
++++ src/engine/ActionMeta.h	Sun Aug  3 09:07:12 2003
+@@ -29,7 +29,7 @@
+ 
+ #define REGISTER_ACTION_HEADER(x) \
+ 	virtual const char *getActionName() { return #x ; } \
+-	##x *getActionCopy() { return new x ; } \
++	x *getActionCopy() { return new x ; } \
+ 	virtual bool getReferenced() { return true; }
+ #define REGISTER_ACTION_SOURCE(x) \
+ 	struct META_##x { META_##x() { ActionMetaRegistration::addMap(#x , new x ); } }; \
diff --git a/games/scorched3d/files/patch-src-engine-MainLoop.cpp b/games/scorched3d/files/patch-src-engine-MainLoop.cpp
new file mode 100644
index 000000000000..279c87435635
--- /dev/null
+++ b/games/scorched3d/files/patch-src-engine-MainLoop.cpp
@@ -0,0 +1,11 @@
+--- src/engine/MainLoop.cpp.orig	Wed Jul 30 17:41:26 2003
++++ src/engine/MainLoop.cpp	Sun Aug  3 09:07:12 2003
+@@ -28,7 +28,7 @@
+ #include <common/Defines.h>
+ #include <common/Timer.h>
+ #include <GLEXT/GLState.h>
+-#include <SDL/SDL.h>
++#include <SDL11/SDL.h>
+ 
+ //////////////////////////////////////////////////////////////////////
+ // Construction/Destruction
diff --git a/games/scorched3d/files/patch-src-ode-common.h b/games/scorched3d/files/patch-src-ode-common.h
new file mode 100644
index 000000000000..7f17caf18bf4
--- /dev/null
+++ b/games/scorched3d/files/patch-src-ode-common.h
@@ -0,0 +1,11 @@
+--- src/ode/common.h.orig	Wed Jul 30 17:41:29 2003
++++ src/ode/common.h	Sun Aug  3 09:07:13 2003
+@@ -25,7 +25,7 @@
+ 
+ #include <ode/config.h>
+ #include <ode/error.h>
+-#ifndef WIN32
++#if !defined(WIN32) && !defined(__FreeBSD__)
+ #include <alloca.h>
+ #endif
+ #include <stdlib.h>
diff --git a/games/scorched3d/files/patch-src-ode-config.h b/games/scorched3d/files/patch-src-ode-config.h
new file mode 100644
index 000000000000..c30d3ec4e9e0
--- /dev/null
+++ b/games/scorched3d/files/patch-src-ode-config.h
@@ -0,0 +1,11 @@
+--- src/ode/config.h.orig	Wed Jul 30 17:41:29 2003
++++ src/ode/config.h	Sun Aug  3 09:07:13 2003
+@@ -31,7 +31,7 @@
+ 
+ #include <stdio.h>
+ #include <stdarg.h>
+-#include <malloc.h>		// for alloca under windows
++#include <stdlib.h>		// for alloca under windows
+ #include <string.h>
+ #include <math.h>
+ 
diff --git a/games/scorched3d/files/patch-src-scorched-main.cpp b/games/scorched3d/files/patch-src-scorched-main.cpp
new file mode 100644
index 000000000000..f786738cf0c8
--- /dev/null
+++ b/games/scorched3d/files/patch-src-scorched-main.cpp
@@ -0,0 +1,11 @@
+--- src/scorched/main.cpp.orig	Wed Jul 30 17:41:27 2003
++++ src/scorched/main.cpp	Sun Aug  3 09:07:13 2003
+@@ -20,7 +20,7 @@
+ 
+ 
+ #include <wx/wx.h>
+-#include <SDL/SDL.h>
++#include <SDL11/SDL.h>
+ #include <client/ClientMain.h>
+ #include <common/OptionsDisplay.h>
+ #include <common/OptionsParam.h>
diff --git a/games/scorched3d/files/patch-src-server-ServerMain.cpp b/games/scorched3d/files/patch-src-server-ServerMain.cpp
new file mode 100644
index 000000000000..1e1884d5f7d0
--- /dev/null
+++ b/games/scorched3d/files/patch-src-server-ServerMain.cpp
@@ -0,0 +1,11 @@
+--- src/server/ServerMain.cpp.orig	Wed Jul 30 17:41:27 2003
++++ src/server/ServerMain.cpp	Sun Aug  3 09:07:13 2003
+@@ -46,7 +46,7 @@
+ #include <server/ServerBuyAccessoryHandler.h>
+ #include <server/ServerConnectHandler.h>
+ #include <server/ServerState.h>
+-#include <SDL/SDL.h>
++#include <SDL11/SDL.h>
+ 
+ Timer serverTimer;
+ 
diff --git a/games/scorched3d/pkg-descr b/games/scorched3d/pkg-descr
index b675f0428d71..cade5199432e 100644
--- a/games/scorched3d/pkg-descr
+++ b/games/scorched3d/pkg-descr
@@ -12,11 +12,6 @@ to recreate the simple yet addictive game play of the original game,
 adding amongst other new features a 3D island environment and LAN and
 internet play.
 
-NOTE:
-
-	This is a work in progress port of the Win32 game by
-	Gavin C. <gcamp@cisco.com>.  The port is done by
-	red.zebra@pandora.be for Linux.  Network play does
-	not work yet.
+You must run X11 in 16bpp mode in order for the game to run.
 
 WWW: http://www.scorched3d.co.uk/
diff --git a/games/scorched3d/pkg-plist b/games/scorched3d/pkg-plist
index 176526a562a6..b0c78a48803a 100644
--- a/games/scorched3d/pkg-plist
+++ b/games/scorched3d/pkg-plist
@@ -1,83 +1,207 @@
 bin/scorched3d
 games/scorched3d/scorched3d
-games/scorched3d/data/talk/talk2.cfg
-games/scorched3d/data/talk/talk1.cfg
+games/scorched3d/data/meshes/rock1.ase
+games/scorched3d/data/meshes/rock2.ase
 games/scorched3d/data/meshes/wind.ase
-games/scorched3d/data/help/help.txt
-games/scorched3d/data/fonts/font.bmp
-games/scorched3d/data/fonts/font.bmp.new
-games/scorched3d/data/fonts/font.bmp.orig
-games/scorched3d/data/windows/scorched.bmp
-games/scorched3d/data/windows/logotiled.bmp
-games/scorched3d/data/maps/Wide Area.bmp
-games/scorched3d/data/maps/coolLevel.bmp
-games/scorched3d/data/maps/Four_Big_Mountains.bmp
-games/scorched3d/data/maps/heightmap1.bmp
-games/scorched3d/data/maps/Land_of_Shadows.bmp
-games/scorched3d/data/maps/Little_River.bmp
-games/scorched3d/data/maps/port.bmp
-games/scorched3d/data/maps/River_One.bmp
-games/scorched3d/data/maps/River_Two.bmp
-games/scorched3d/data/maps/Rocks_and_Water.bmp
-games/scorched3d/data/maps/Rough_Hill.bmp
-games/scorched3d/data/maps/The_Big_One.bmp
-games/scorched3d/data/maps/The_Island.bmp
-games/scorched3d/data/maps/The_Island2.bmp
-games/scorched3d/data/maps/The_Three_Isles.bmp
-games/scorched3d/data/maps/Two_Big_Mountains.bmp
-games/scorched3d/data/maps/1st_Nice_Mountain.bmp
+games/scorched3d/data/talk/polish/talk1.txt
+games/scorched3d/data/talk/polish/talk2.txt
+games/scorched3d/data/talk/talk1.txt
+games/scorched3d/data/talk/talk2.txt
+games/scorched3d/data/tanks/wespe.bmp
+games/scorched3d/data/tanks/apache-long.bmp
+games/scorched3d/data/tanks/apache.ase
+games/scorched3d/data/tanks/apache.bmp
+games/scorched3d/data/tanks/bm13.ase
+games/scorched3d/data/tanks/bm13.bmp
+games/scorched3d/data/tanks/bradley.ase
+games/scorched3d/data/tanks/bradley.bmp
+games/scorched3d/data/tanks/bradleyb.bmp
+games/scorched3d/data/tanks/hawk.ase
+games/scorched3d/data/tanks/hawk.bmp
+games/scorched3d/data/tanks/hind.ase
+games/scorched3d/data/tanks/hind.bmp
+games/scorched3d/data/tanks/howitzer.ase
+games/scorched3d/data/tanks/howitzer.bmp
+games/scorched3d/data/tanks/hummermlrs.ase
+games/scorched3d/data/tanks/hummermlrs.bmp
+games/scorched3d/data/tanks/hummersam.ase
+games/scorched3d/data/tanks/hummersam.bmp
+games/scorched3d/data/tanks/hummertow.ase
+games/scorched3d/data/tanks/hummertow.bmp
+games/scorched3d/data/tanks/m110.ase
+games/scorched3d/data/tanks/m110.bmp
+games/scorched3d/data/tanks/m198.ase
+games/scorched3d/data/tanks/m198.bmp
+games/scorched3d/data/tanks/m1a1.ase
+games/scorched3d/data/tanks/m1a1.bmp
+games/scorched3d/data/tanks/m7priest.ase
+games/scorched3d/data/tanks/m7priest.bmp
+games/scorched3d/data/tanks/paladin.ase
+games/scorched3d/data/tanks/paladin.bmp
+games/scorched3d/data/tanks/patriot.ase
+games/scorched3d/data/tanks/patriot.bmp
+games/scorched3d/data/tanks/question.ase
+games/scorched3d/data/tanks/question.bmp
+games/scorched3d/data/tanks/sa6.ase
+games/scorched3d/data/tanks/sa6.bmp
+games/scorched3d/data/tanks/scud.ase
+games/scorched3d/data/tanks/scud.bmp
+games/scorched3d/data/tanks/t55.ase
+games/scorched3d/data/tanks/t55.bmp
+games/scorched3d/data/tanks/t55b.bmp
+games/scorched3d/data/tanks/t74.ase
+games/scorched3d/data/tanks/t74.bmp
+games/scorched3d/data/tanks/t74b.bmp
+games/scorched3d/data/tanks/tank2.ase
+games/scorched3d/data/tanks/tank2.bmp
+games/scorched3d/data/tanks/tank3.ase
+games/scorched3d/data/tanks/tank3.bmp
+games/scorched3d/data/tanks/tank4.ase
+games/scorched3d/data/tanks/tank4.bmp
+games/scorched3d/data/tanks/tank5.ase
+games/scorched3d/data/tanks/tank5.bmp
+games/scorched3d/data/tanks/tank5a.bmp
+games/scorched3d/data/tanks/tank6.ase
+games/scorched3d/data/tanks/tank6.bmp
+games/scorched3d/data/tanks/tank6a.bmp
+games/scorched3d/data/tanks/tank6b.bmp
+games/scorched3d/data/tanks/tos1.ase
+games/scorched3d/data/tanks/tos1.bmp
+games/scorched3d/data/tanks/towedartillery.ase
+games/scorched3d/data/tanks/towedartillery.bmp
+games/scorched3d/data/tanks/towedartilleryb.bmp
+games/scorched3d/data/tanks/wespe.ase
+games/scorched3d/data/tanks/apache-long.ase
+games/scorched3d/data/fonts/data.bmp
+games/scorched3d/data/fonts/datainv.bmp
 games/scorched3d/data/textures/bordershield/grid.bmp
 games/scorched3d/data/textures/bordershield/grid2.bmp
 games/scorched3d/data/textures/bordershield/grid22.bmp
 games/scorched3d/data/textures/bordershield/hit.bmp
-games/scorched3d/data/textures/surround/spheremap1.bmp
-games/scorched3d/data/textures/surround/spheremap2.bmp
-games/scorched3d/data/textures/surround/spheremap3.bmp
-games/scorched3d/data/textures/surround/spheremap4.bmp
-games/scorched3d/data/textures/explode/explode_fire_9.bmp
-games/scorched3d/data/textures/explode/explode_fire_1.bmp
-games/scorched3d/data/textures/explode/explode_fire_10.bmp
-games/scorched3d/data/textures/explode/explode_fire_11.bmp
-games/scorched3d/data/textures/explode/explode_fire_12.bmp
-games/scorched3d/data/textures/explode/explode_fire_13.bmp
-games/scorched3d/data/textures/explode/explode_fire_14.bmp
-games/scorched3d/data/textures/explode/explode_fire_2.bmp
-games/scorched3d/data/textures/explode/explode_fire_3.bmp
-games/scorched3d/data/textures/explode/explode_fire_4.bmp
-games/scorched3d/data/textures/explode/explode_fire_5.bmp
-games/scorched3d/data/textures/explode/explode_fire_6.bmp
-games/scorched3d/data/textures/explode/explode_fire_7.bmp
-games/scorched3d/data/textures/explode/explode_fire_8.bmp
-games/scorched3d/data/textures/explode/explode_fire_0.bmp
-games/scorched3d/data/textures/ground/Texture4.bmp
-games/scorched3d/data/textures/ground/magma.bmp
-games/scorched3d/data/textures/ground/rockside.bmp
-games/scorched3d/data/textures/ground/scorch.bmp
-games/scorched3d/data/textures/ground/shore.bmp
-games/scorched3d/data/textures/ground/Texture0.bmp
-games/scorched3d/data/textures/ground/Texture1.bmp
-games/scorched3d/data/textures/ground/Texture2.bmp
-games/scorched3d/data/textures/ground/Texture3.bmp
-games/scorched3d/data/textures/ground/magma-small.bmp
-games/scorched3d/data/textures/lensflare/Shine9.bw
-games/scorched3d/data/textures/lensflare/Flare1.bw
-games/scorched3d/data/textures/lensflare/Flare2.bw
-games/scorched3d/data/textures/lensflare/Flare3.bw
-games/scorched3d/data/textures/lensflare/Flare4.bw
-games/scorched3d/data/textures/lensflare/Flare5.bw
-games/scorched3d/data/textures/lensflare/Shine0.bw
-games/scorched3d/data/textures/lensflare/Shine1.bw
-games/scorched3d/data/textures/lensflare/Shine2.bw
-games/scorched3d/data/textures/lensflare/Shine3.bw
-games/scorched3d/data/textures/lensflare/Shine4.bw
-games/scorched3d/data/textures/lensflare/Shine5.bw
-games/scorched3d/data/textures/lensflare/Shine6.bw
-games/scorched3d/data/textures/lensflare/Shine7.bw
-games/scorched3d/data/textures/lensflare/Shine8.bw
-games/scorched3d/data/textures/lensflare/Flare0.bw
+games/scorched3d/data/textures/explode/exp05_7.bmp
+games/scorched3d/data/textures/explode/exp00_10.bmp
+games/scorched3d/data/textures/explode/exp00_2.bmp
+games/scorched3d/data/textures/explode/exp00_3.bmp
+games/scorched3d/data/textures/explode/exp00_4.bmp
+games/scorched3d/data/textures/explode/exp00_5.bmp
+games/scorched3d/data/textures/explode/exp00_6.bmp
+games/scorched3d/data/textures/explode/exp00_7.bmp
+games/scorched3d/data/textures/explode/exp00_8.bmp
+games/scorched3d/data/textures/explode/exp00_9.bmp
+games/scorched3d/data/textures/explode/exp01_1.bmp
+games/scorched3d/data/textures/explode/exp01_2.bmp
+games/scorched3d/data/textures/explode/exp01_3.bmp
+games/scorched3d/data/textures/explode/exp02_1.bmp
+games/scorched3d/data/textures/explode/exp02_2.bmp
+games/scorched3d/data/textures/explode/exp02_3.bmp
+games/scorched3d/data/textures/explode/exp03_1.bmp
+games/scorched3d/data/textures/explode/exp03_2.bmp
+games/scorched3d/data/textures/explode/exp03_3.bmp
+games/scorched3d/data/textures/explode/exp04_1.bmp
+games/scorched3d/data/textures/explode/exp04_2.bmp
+games/scorched3d/data/textures/explode/exp04_3.bmp
+games/scorched3d/data/textures/explode/exp05_1.bmp
+games/scorched3d/data/textures/explode/exp05_2.bmp
+games/scorched3d/data/textures/explode/exp05_3.bmp
+games/scorched3d/data/textures/explode/exp05_4.bmp
+games/scorched3d/data/textures/explode/exp05_5.bmp
+games/scorched3d/data/textures/explode/exp05_6.bmp
+games/scorched3d/data/textures/explode/exp00_1.bmp
+games/scorched3d/data/textures/flame/flame33.bmp
+games/scorched3d/data/textures/flame/flame02.bmp
+games/scorched3d/data/textures/flame/flame03.bmp
+games/scorched3d/data/textures/flame/flame04.bmp
+games/scorched3d/data/textures/flame/flame05.bmp
+games/scorched3d/data/textures/flame/flame06.bmp
+games/scorched3d/data/textures/flame/flame07.bmp
+games/scorched3d/data/textures/flame/flame08.bmp
+games/scorched3d/data/textures/flame/flame09.bmp
+games/scorched3d/data/textures/flame/flame10.bmp
+games/scorched3d/data/textures/flame/flame11.bmp
+games/scorched3d/data/textures/flame/flame12.bmp
+games/scorched3d/data/textures/flame/flame13.bmp
+games/scorched3d/data/textures/flame/flame14.bmp
+games/scorched3d/data/textures/flame/flame15.bmp
+games/scorched3d/data/textures/flame/flame16.bmp
+games/scorched3d/data/textures/flame/flame17.bmp
+games/scorched3d/data/textures/flame/flame18.bmp
+games/scorched3d/data/textures/flame/flame19.bmp
+games/scorched3d/data/textures/flame/flame20.bmp
+games/scorched3d/data/textures/flame/flame21.bmp
+games/scorched3d/data/textures/flame/flame22.bmp
+games/scorched3d/data/textures/flame/flame23.bmp
+games/scorched3d/data/textures/flame/flame24.bmp
+games/scorched3d/data/textures/flame/flame25.bmp
+games/scorched3d/data/textures/flame/flame26.bmp
+games/scorched3d/data/textures/flame/flame27.bmp
+games/scorched3d/data/textures/flame/flame28.bmp
+games/scorched3d/data/textures/flame/flame29.bmp
+games/scorched3d/data/textures/flame/flame30.bmp
+games/scorched3d/data/textures/flame/flame31.bmp
+games/scorched3d/data/textures/flame/flame32.bmp
+games/scorched3d/data/textures/flame/flame01.bmp
+games/scorched3d/data/textures/lensflare/shine9.bw
+games/scorched3d/data/textures/lensflare/flare1.bw
+games/scorched3d/data/textures/lensflare/flare2.bw
+games/scorched3d/data/textures/lensflare/flare3.bw
+games/scorched3d/data/textures/lensflare/flare4.bw
+games/scorched3d/data/textures/lensflare/flare5.bw
+games/scorched3d/data/textures/lensflare/shine0.bw
+games/scorched3d/data/textures/lensflare/shine1.bw
+games/scorched3d/data/textures/lensflare/shine2.bw
+games/scorched3d/data/textures/lensflare/shine3.bw
+games/scorched3d/data/textures/lensflare/shine4.bw
+games/scorched3d/data/textures/lensflare/shine5.bw
+games/scorched3d/data/textures/lensflare/shine6.bw
+games/scorched3d/data/textures/lensflare/shine7.bw
+games/scorched3d/data/textures/lensflare/shine8.bw
+games/scorched3d/data/textures/lensflare/flare0.bw
+games/scorched3d/data/textures/landscape/default/texture4.bmp
+games/scorched3d/data/textures/landscape/default/cubemap.bmp
+games/scorched3d/data/textures/landscape/default/magma-small.bmp
+games/scorched3d/data/textures/landscape/default/rockside.bmp
+games/scorched3d/data/textures/landscape/default/scorch.bmp
+games/scorched3d/data/textures/landscape/default/shore.bmp
+games/scorched3d/data/textures/landscape/default/texture0.bmp
+games/scorched3d/data/textures/landscape/default/texture1.bmp
+games/scorched3d/data/textures/landscape/default/texture2.bmp
+games/scorched3d/data/textures/landscape/default/texture3.bmp
+games/scorched3d/data/textures/landscape/default/cloud1.bmp
+games/scorched3d/data/textures/landscape/hell/texture4.bmp
+games/scorched3d/data/textures/landscape/hell/cubemap.bmp
+games/scorched3d/data/textures/landscape/hell/rockside.bmp
+games/scorched3d/data/textures/landscape/hell/scorch.bmp
+games/scorched3d/data/textures/landscape/hell/shore.bmp
+games/scorched3d/data/textures/landscape/hell/texture0.bmp
+games/scorched3d/data/textures/landscape/hell/texture1.bmp
+games/scorched3d/data/textures/landscape/hell/texture2.bmp
+games/scorched3d/data/textures/landscape/hell/texture3.bmp
+games/scorched3d/data/textures/landscape/hell/cloud1.bmp
+games/scorched3d/data/textures/landscape/sand/texture4.bmp
+games/scorched3d/data/textures/landscape/sand/cubemap.bmp
+games/scorched3d/data/textures/landscape/sand/rockside.bmp
+games/scorched3d/data/textures/landscape/sand/scorch.bmp
+games/scorched3d/data/textures/landscape/sand/shore.bmp
+games/scorched3d/data/textures/landscape/sand/texture0.bmp
+games/scorched3d/data/textures/landscape/sand/texture1.bmp
+games/scorched3d/data/textures/landscape/sand/texture2.bmp
+games/scorched3d/data/textures/landscape/sand/texture3.bmp
+games/scorched3d/data/textures/landscape/sand/cloud1.bmp
+games/scorched3d/data/textures/landscape/snow/texture4.bmp
+games/scorched3d/data/textures/landscape/snow/cubemap.bmp
+games/scorched3d/data/textures/landscape/snow/rockside.bmp
+games/scorched3d/data/textures/landscape/snow/scorch.bmp
+games/scorched3d/data/textures/landscape/snow/shore.bmp
+games/scorched3d/data/textures/landscape/snow/texture0.bmp
+games/scorched3d/data/textures/landscape/snow/texture1.bmp
+games/scorched3d/data/textures/landscape/snow/texture2.bmp
+games/scorched3d/data/textures/landscape/snow/texture3.bmp
+games/scorched3d/data/textures/landscape/snow/cloud1.bmp
+games/scorched3d/data/textures/landscape/textures.txt
+games/scorched3d/data/textures/glow1.bmp
 games/scorched3d/data/textures/smoke01.bmp
-games/scorched3d/data/textures/cubemap.bmp
 games/scorched3d/data/textures/talk.bmp
+games/scorched3d/data/wav/battery/battery.wav
 games/scorched3d/data/wav/explosions/medium.wav
 games/scorched3d/data/wav/explosions/gloop.wav
 games/scorched3d/data/wav/explosions/large.wav
@@ -85,6 +209,9 @@ games/scorched3d/data/wav/explosions/crunch.wav
 games/scorched3d/data/wav/explosions/small.wav
 games/scorched3d/data/wav/explosions/tank.wav
 games/scorched3d/data/wav/explosions/xlarge.wav
+games/scorched3d/data/wav/misc/camera.wav
+games/scorched3d/data/wav/misc/para.wav
+games/scorched3d/data/wav/misc/play.wav
 games/scorched3d/data/wav/misc/splash.wav
 games/scorched3d/data/wav/movement/elevate.wav
 games/scorched3d/data/wav/movement/movement.wav
@@ -100,37 +227,68 @@ games/scorched3d/data/wav/shoot/flare.wav
 games/scorched3d/data/wav/shoot/small.wav
 games/scorched3d/data/wav/shoot/tracer.wav
 games/scorched3d/data/wav/shoot/xlarge.wav
-games/scorched3d/data/tanks/tank2.ase
-games/scorched3d/data/tanks/tank3.ase
-games/scorched3d/data/tanks/tank4.ase
-games/scorched3d/data/tanks/tank3.bmp
-games/scorched3d/data/tanks/tank5.ase
-games/scorched3d/data/tanks/tank4.bmp
-games/scorched3d/data/tanks/tank5.bmp
-games/scorched3d/data/tanks/tank5a.bmp
-games/scorched3d/data/tanks/tank6.ase
-games/scorched3d/data/tanks/tank6.bmp
-games/scorched3d/data/tanks/tank2.bmp
-games/scorched3d/data/svrlist.txt
+games/scorched3d/data/windows/tank2.ico
+games/scorched3d/data/windows/display.bmp
+games/scorched3d/data/windows/eye1.bmp
+games/scorched3d/data/windows/island.bmp
+games/scorched3d/data/windows/island.ico
+games/scorched3d/data/windows/logotiled.bmp
+games/scorched3d/data/windows/scorched.bmp
+games/scorched3d/data/windows/scorcheds.bmp
+games/scorched3d/data/windows/server.bmp
+games/scorched3d/data/windows/tank-easy.bmp
+games/scorched3d/data/windows/tank-hard.bmp
+games/scorched3d/data/windows/tank-med.bmp
+games/scorched3d/data/windows/tank2.bmp
+games/scorched3d/data/windows/client.bmp
+games/scorched3d/data/server.xml
+games/scorched3d/data/ainames.txt
+games/scorched3d/data/singleeasy.xml
+games/scorched3d/data/singlehard.xml
+games/scorched3d/data/singlenormal.xml
+games/scorched3d/data/tanks.xml
+games/scorched3d/data/singlecustom.xml
+games/scorched3d/data/autoexec.xml
+games/scorched3d/data/display.xml
 games/scorched3d/data/motd.txt
+games/scorched3d/data/playernames.txt
+games/scorched3d/data/random.no
+games/scorched3d/data/resource.xml
+games/scorched3d/README
+games/scorched3d/documentation/Scorched3D.hlp
+games/scorched3d/documentation/mehrspieler.txt
+games/scorched3d/documentation/multiplayer.txt
+games/scorched3d/documentation/README-EXPAT.txt
+games/scorched3d/documentation/README-ODE.txt
+games/scorched3d/documentation/README-SDL.txt
+games/scorched3d/documentation/README-SDLMIXER.txt
+games/scorched3d/documentation/README-SDLNET.txt
+games/scorched3d/documentation/README-wxwindows.txt
+games/scorched3d/documentation/README-zlib.txt
+games/scorched3d/documentation/liesmich.txt
+@dirrm games/scorched3d/data/meshes
+@dirrm games/scorched3d/data/talk/polish
+@dirrm games/scorched3d/data/talk
 @dirrm games/scorched3d/data/tanks
-@dirrm games/scorched3d/data/wav/shoot
-@dirrm games/scorched3d/data/wav/shield
-@dirrm games/scorched3d/data/wav/movement
-@dirrm games/scorched3d/data/wav/misc
-@dirrm games/scorched3d/data/wav/explosions
-@dirrm games/scorched3d/data/wav
-@dirrm games/scorched3d/data/textures/lensflare
-@dirrm games/scorched3d/data/textures/ground
-@dirrm games/scorched3d/data/textures/explode
-@dirrm games/scorched3d/data/textures/surround
+@dirrm games/scorched3d/data/fonts
 @dirrm games/scorched3d/data/textures/bordershield
+@dirrm games/scorched3d/data/textures/explode
+@dirrm games/scorched3d/data/textures/flame
+@dirrm games/scorched3d/data/textures/lensflare
+@dirrm games/scorched3d/data/textures/landscape/default
+@dirrm games/scorched3d/data/textures/landscape/hell
+@dirrm games/scorched3d/data/textures/landscape/sand
+@dirrm games/scorched3d/data/textures/landscape/snow
+@dirrm games/scorched3d/data/textures/landscape
 @dirrm games/scorched3d/data/textures
-@dirrm games/scorched3d/data/maps
+@dirrm games/scorched3d/data/wav/battery
+@dirrm games/scorched3d/data/wav/explosions
+@dirrm games/scorched3d/data/wav/misc
+@dirrm games/scorched3d/data/wav/movement
+@dirrm games/scorched3d/data/wav/shield
+@dirrm games/scorched3d/data/wav/shoot
 @dirrm games/scorched3d/data/windows
-@dirrm games/scorched3d/data/fonts
-@dirrm games/scorched3d/data/help
-@dirrm games/scorched3d/data/meshes
-@dirrm games/scorched3d/data/talk
+@dirrm games/scorched3d/data/wav
 @dirrm games/scorched3d/data
+@dirrm games/scorched3d/documentation
 @dirrm games/scorched3d