5 files changed, 95 insertions, 64 deletions

diff --git a/games/scorched3d/Makefile b/games/scorched3d/Makefile
index 3efdce71361c..b58ad725319d 100644
--- a/games/scorched3d/Makefile
+++ b/games/scorched3d/Makefile
@@ -7,9 +7,8 @@
 
 PORTNAME=		scorched3d
 PORTVERSION=		0.${SCORCH_VERSION}${SCORCH_REVISION}
-PORTREVISION=		2
 CATEGORIES=		games
-MASTER_SITES=		SF/${PORTNAME}/${PORTNAME}/Build%2041.3
+MASTER_SITES=		SF/${PORTNAME}/${PORTNAME}/Version%20${SCORCH_VERSION}/
 DISTNAME=		Scorched3D-${SCORCH_VERSION}-src
 
 MAINTAINER=		ports@FreeBSD.org
@@ -23,7 +22,7 @@ LIB_DEPENDS=		alut.1:${PORTSDIR}/audio/freealut \
 			jpeg:${PORTSDIR}/graphics/jpeg \
 			png:${PORTSDIR}/graphics/png
 
-SCORCH_VERSION=		41.3
+SCORCH_VERSION=		42.1
 
 .if defined(WITH_MYSQL)
 USE_MYSQL=		yes
@@ -36,6 +35,7 @@ USE_AUTOTOOLS=	automake:15 autoconf:262
 USE_PERL5=	yes
 USE_WX=		2.4+
 WX_CONF_ARGS=	absolute
+USE_DOS2UNIX=	mkinstalldirs
 
 WRKSRC=			${WRKDIR}/scorched
 AUTOMAKE_ARGS=		--foreign
diff --git a/games/scorched3d/distinfo b/games/scorched3d/distinfo
index 4000ef9b4063..15539357bf7f 100644
--- a/games/scorched3d/distinfo
+++ b/games/scorched3d/distinfo
@@ -1,3 +1,3 @@
-MD5 (Scorched3D-41.3-src.tar.gz) = 6bb47045abccaca1f775ff4cde8b3b5d
-SHA256 (Scorched3D-41.3-src.tar.gz) = a606cc93674cb2acd55389e7c54b5389408c288369077d4270bd785e430b2b03
-SIZE (Scorched3D-41.3-src.tar.gz) = 60672892
+MD5 (Scorched3D-42.1-src.tar.gz) = e24867615568ef541a291a4813fcbdae
+SHA256 (Scorched3D-42.1-src.tar.gz) = 884eccfed5fda58c140c4a593806c0c366a695660c47cdd4ea8d96189189106e
+SIZE (Scorched3D-42.1-src.tar.gz) = 64491145
diff --git a/games/scorched3d/files/patch-src-client-client-SecureID.cpp b/games/scorched3d/files/patch-src-client-client-SecureID.cpp
new file mode 100644
index 000000000000..5701b71b4221
--- /dev/null
+++ b/games/scorched3d/files/patch-src-client-client-SecureID.cpp
@@ -0,0 +1,50 @@
+--- src/client/client/SecureID.cpp.orig	2008-03-03 00:47:36.000000000 +0600
++++ src/client/client/SecureID.cpp	2009-09-29 14:13:58.000000000 +0700
+@@ -34,6 +34,47 @@
+ 	return "0:0:0:0:0:0";

+ }

+ 

++#elif defined(__FreeBSD__)
++
++#include <sys/types.h>
++#include <sys/socket.h>
++#include <net/if_dl.h>
++#include <ifaddrs.h>
++
++std::string SecureID::GetPrivateKey(void)
++{
++       std::string Key;
++       struct ifaddrs* ifaphead;
++
++       if (getifaddrs(&ifaphead) != 0)
++       {
++               return "";
++       }
++
++       for (struct ifaddrs* ifap = ifaphead; ifap; ifap = ifap->ifa_next)
++       {
++               if (ifap->ifa_addr->sa_family == AF_LINK)
++               {
++                       if (strncmp(ifap->ifa_name, "lo", 2) != 0)
++                       {
++                               struct sockaddr_dl* sdl =
++                                       (struct sockaddr_dl *)ifap->ifa_addr;
++                               unsigned char* if_mac = (unsigned char*)LLADDR(sdl);
++                               char buf[18];
++                               snprintf(buf, 18,
++                                       "%02x:%02x:%02x:%02x:%02x:%02x",
++                                       if_mac[0], if_mac[1], if_mac[2],
++                                       if_mac[3], if_mac[4], if_mac[5]);
++                               Key = buf;
++                               break;
++                       }
++               }
++       }
++
++       freeifaddrs(ifaphead);
++       return Key;
++}
++
+ #else

+ 

+ #include <sys/ioctl.h>

diff --git a/games/scorched3d/files/patch-src-net-SecureID.cpp b/games/scorched3d/files/patch-src-net-SecureID.cpp
deleted file mode 100644
index 43b3910712b9..000000000000
--- a/games/scorched3d/files/patch-src-net-SecureID.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
---- src/net/SecureID.cpp.orig	2008-03-31 00:52:26.000000000 -0600
-+++ src/net/SecureID.cpp	2008-03-31 22:04:44.000000000 -0600
-@@ -34,6 +34,47 @@
- 	return "0:0:0:0:0:0";
- }
- 
-+#elif defined(__FreeBSD__)
-+
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+#include <net/if_dl.h>
-+#include <ifaddrs.h>
-+
-+std::string SecureID::GetPrivateKey(void)
-+{
-+	std::string Key;
-+	struct ifaddrs* ifaphead;
-+
-+	if (getifaddrs(&ifaphead) != 0)
-+	{
-+		return "";
-+	}
-+
-+	for (struct ifaddrs* ifap = ifaphead; ifap; ifap = ifap->ifa_next)
-+	{
-+		if (ifap->ifa_addr->sa_family == AF_LINK)
-+		{
-+			if (strncmp(ifap->ifa_name, "lo", 2) != 0)
-+			{
-+				struct sockaddr_dl* sdl =
-+					(struct sockaddr_dl *)ifap->ifa_addr;
-+				unsigned char* if_mac = (unsigned char*)LLADDR(sdl);
-+				char buf[18];
-+				snprintf(buf, 18,
-+					"%02x:%02x:%02x:%02x:%02x:%02x",
-+					if_mac[0], if_mac[1], if_mac[2],
-+					if_mac[3], if_mac[4], if_mac[5]);
-+				Key = buf;
-+				break;	
-+			}
-+		}
-+	}
-+
-+	freeifaddrs(ifaphead);
-+	return Key;
-+}
-+
- #else
- 
- #include <sys/ioctl.h>
diff --git a/games/scorched3d/pkg-plist b/games/scorched3d/pkg-plist
index 303a36a7023b..232aee446050 100644
--- a/games/scorched3d/pkg-plist
+++ b/games/scorched3d/pkg-plist
@@ -136,10 +136,9 @@ games/scorched3d/data/avatars/web.png
 games/scorched3d/data/avatars/yoda.png
 games/scorched3d/data/custominfo.xml
 games/scorched3d/data/fastestdisplay.xml
-games/scorched3d/data/fonts/VERA-COPYRIGHT.TXT
-games/scorched3d/data/fonts/test.ttf
-games/scorched3d/data/fonts/vera.ttf
-games/scorched3d/data/fonts/veramobd.ttf
+games/scorched3d/data/fonts/dejavusans.ttf
+games/scorched3d/data/fonts/dejavusconbd.ttf
+games/scorched3d/data/fonts/dejavusmobd.ttf
 games/scorched3d/data/globalmods/apoc/authors.txt
 games/scorched3d/data/globalmods/apoc/data/accessories.xml
 games/scorched3d/data/globalmods/apoc/data/accessories/black.bmp
@@ -623,6 +622,8 @@ games/scorched3d/data/globalmods/apoc/license.txt
 games/scorched3d/data/globalmods/apoc/readme-nexus.txt
 games/scorched3d/data/globalmods/apoc/readme.txt
 games/scorched3d/data/globalmods/globalmods.txt
+games/scorched3d/data/html/server/account.html
+games/scorched3d/data/html/server/adminmenu.html
 games/scorched3d/data/html/server/applet.html
 games/scorched3d/data/html/server/banned.html
 games/scorched3d/data/html/server/binary/Applet.jar
@@ -660,20 +661,30 @@ games/scorched3d/data/landscapes/ambientsoundtrees.xml
 games/scorched3d/data/landscapes/ambientsoundwaves.xml
 games/scorched3d/data/landscapes/ascencion-pic.bmp
 games/scorched3d/data/landscapes/ascencion.bmp
+games/scorched3d/data/landscapes/ascencion2.bmp
 games/scorched3d/data/landscapes/boidsah64.xml
 games/scorched3d/data/landscapes/boidsbats.xml
 games/scorched3d/data/landscapes/boidsf16.xml
 games/scorched3d/data/landscapes/boidsf18.xml
 games/scorched3d/data/landscapes/boidsgulls.xml
+games/scorched3d/data/landscapes/boidslargenumber.xml
 games/scorched3d/data/landscapes/boidsparrot.xml
 games/scorched3d/data/landscapes/canyon-pic.bmp
 games/scorched3d/data/landscapes/canyon.bmp
 games/scorched3d/data/landscapes/cavern-pic.bmp
+games/scorched3d/data/landscapes/circle.bmp
 games/scorched3d/data/landscapes/defnascencion.xml
+games/scorched3d/data/landscapes/defnascencion2.xml
 games/scorched3d/data/landscapes/defncanyon.xml
+games/scorched3d/data/landscapes/defncanyon2.xml
 games/scorched3d/data/landscapes/defncavern.xml
+games/scorched3d/data/landscapes/defncavern2.xml
 games/scorched3d/data/landscapes/defndenali.xml
+games/scorched3d/data/landscapes/defndenali2.xml
+games/scorched3d/data/landscapes/defndenali3.xml
 games/scorched3d/data/landscapes/defnglaciation.xml
+games/scorched3d/data/landscapes/defnglaciation2.xml
+games/scorched3d/data/landscapes/defnglaciation3.xml
 games/scorched3d/data/landscapes/defnhalfed.xml
 games/scorched3d/data/landscapes/defnhilly.xml
 games/scorched3d/data/landscapes/defnicebergs2.xml
@@ -681,17 +692,23 @@ games/scorched3d/data/landscapes/defnicebergs3.xml
 games/scorched3d/data/landscapes/defnislands.xml
 games/scorched3d/data/landscapes/defnlowlands.xml
 games/scorched3d/data/landscapes/defnoldstyle.xml
+games/scorched3d/data/landscapes/defnoldstyleerrosion.xml
 games/scorched3d/data/landscapes/defnridge.xml
 games/scorched3d/data/landscapes/defnspike.xml
 games/scorched3d/data/landscapes/defntest.xml
 games/scorched3d/data/landscapes/defnvalley.xml
 games/scorched3d/data/landscapes/denali-pic.bmp
 games/scorched3d/data/landscapes/denali.bmp
+games/scorched3d/data/landscapes/denali2.bmp
+games/scorched3d/data/landscapes/denali3.bmp
 games/scorched3d/data/landscapes/eventslightning.xml
 games/scorched3d/data/landscapes/eventsmeteor.xml
 games/scorched3d/data/landscapes/eventstest.xml
+games/scorched3d/data/landscapes/fjords.bmp
 games/scorched3d/data/landscapes/glaciation-pic.bmp
 games/scorched3d/data/landscapes/glaciation.bmp
+games/scorched3d/data/landscapes/glaciation2.bmp
+games/scorched3d/data/landscapes/glaciation3.bmp
 games/scorched3d/data/landscapes/half-mask-start.bmp
 games/scorched3d/data/landscapes/half-mask.bmp
 games/scorched3d/data/landscapes/halfed-pic.bmp
@@ -720,6 +737,7 @@ games/scorched3d/data/landscapes/placepalm.xml
 games/scorched3d/data/landscapes/placepalm2.xml
 games/scorched3d/data/landscapes/placepine.xml
 games/scorched3d/data/landscapes/placepine2.xml
+games/scorched3d/data/landscapes/placepinelargenumber.xml
 games/scorched3d/data/landscapes/placepingu.xml
 games/scorched3d/data/landscapes/placesnowpine.xml
 games/scorched3d/data/landscapes/placetest.xml
@@ -744,6 +762,7 @@ games/scorched3d/data/landscapes/texcavern.xml
 games/scorched3d/data/landscapes/texchina.xml
 games/scorched3d/data/landscapes/texdefault.xml
 games/scorched3d/data/landscapes/texdenali.xml
+games/scorched3d/data/landscapes/texdenalilandperf.xml
 games/scorched3d/data/landscapes/texhell.xml
 games/scorched3d/data/landscapes/texice.xml
 games/scorched3d/data/landscapes/texnight.xml
@@ -757,6 +776,8 @@ games/scorched3d/data/landscapes/textuscan.xml
 games/scorched3d/data/landscapes/texvulcano.xml
 games/scorched3d/data/landscapes/valley-mask.bmp
 games/scorched3d/data/landscapes/valley-pic.bmp
+games/scorched3d/data/lang/lang.resource
+games/scorched3d/data/lua/accessories/test.lua
 games/scorched3d/data/mediumdisplay.xml
 games/scorched3d/data/meshes/ah64d/ah64.bmp
 games/scorched3d/data/meshes/ah64d/ah64d.txt
@@ -809,11 +830,14 @@ games/scorched3d/data/prunetables.sql
 games/scorched3d/data/random.no
 games/scorched3d/data/safedisplay.xml
 games/scorched3d/data/server.xml
+games/scorched3d/data/shaders/land-splat.fshader
 games/scorched3d/data/shaders/land.fshader
 games/scorched3d/data/shaders/land.vshader
 games/scorched3d/data/shaders/water.fshader
 games/scorched3d/data/shaders/water.license
 games/scorched3d/data/shaders/water.vshader
+games/scorched3d/data/shaders/watersimple.fshader
+games/scorched3d/data/shaders/watersimple.vshader
 games/scorched3d/data/singlecustom.xml
 games/scorched3d/data/singleeasy.xml
 games/scorched3d/data/singlehard.xml
@@ -832,8 +856,6 @@ games/scorched3d/data/talk/talk2.txt
 games/scorched3d/data/tankais.xml
 games/scorched3d/data/tankaiweaponsets.xml
 games/scorched3d/data/tanks.xml
-games/scorched3d/data/tanks/CF-104/104.bmp
-games/scorched3d/data/tanks/CF-104/104.txt
 games/scorched3d/data/tanks/a7v.ase
 games/scorched3d/data/tanks/a7v.bmp
 games/scorched3d/data/tanks/aat.ase
@@ -871,6 +893,8 @@ games/scorched3d/data/tanks/cannont/gun.bmp
 games/scorched3d/data/tanks/cannont/side.bmp
 games/scorched3d/data/tanks/cannont/side2.bmp
 games/scorched3d/data/tanks/cannont/top.bmp
+games/scorched3d/data/tanks/cf-104/104.bmp
+games/scorched3d/data/tanks/cf-104/104.txt
 games/scorched3d/data/tanks/death/black.bmp
 games/scorched3d/data/tanks/death/chrome.bmp
 games/scorched3d/data/tanks/death/death.txt
@@ -1066,6 +1090,9 @@ 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/circle.bmp
+games/scorched3d/data/textures/circlem.bmp
+games/scorched3d/data/textures/circlew.bmp
 games/scorched3d/data/textures/clearsky.bmp
 games/scorched3d/data/textures/explode/explosion0/exp0004.bmp
 games/scorched3d/data/textures/explode/explosion0/exp0008.bmp
@@ -1248,7 +1275,6 @@ games/scorched3d/data/textures/landscape/china/shore.bmp
 games/scorched3d/data/textures/landscape/china/texture0.bmp
 games/scorched3d/data/textures/landscape/china/texture1.bmp
 games/scorched3d/data/textures/landscape/china/texture2.bmp
-games/scorched3d/data/textures/landscape/china/texture2.jpg
 games/scorched3d/data/textures/landscape/china/texture3.bmp
 games/scorched3d/data/textures/landscape/china/texture4.bmp
 games/scorched3d/data/textures/landscape/china/water.bmp
@@ -1590,6 +1616,8 @@ games/scorched3d/data/windows/mask.bmp
 games/scorched3d/data/windows/move.bmp
 games/scorched3d/data/windows/noentry.bmp
 games/scorched3d/data/windows/ok.bmp
+games/scorched3d/data/windows/perf.bmp
+games/scorched3d/data/windows/perfa.bmp
 games/scorched3d/data/windows/plan.bmp
 games/scorched3d/data/windows/plana.bmp
 games/scorched3d/data/windows/planaa.bmp
@@ -1709,13 +1737,13 @@ games/scorched3d/documentation/README-zlib.txt
 @dirrm games/scorched3d/data/tanks/guntower
 @dirrm games/scorched3d/data/tanks/gorilla
 @dirrm games/scorched3d/data/tanks/death
+@dirrm games/scorched3d/data/tanks/cf-104
 @dirrm games/scorched3d/data/tanks/cannont
 @dirrm games/scorched3d/data/tanks/cannon
 @dirrm games/scorched3d/data/tanks/bradley2
 @dirrm games/scorched3d/data/tanks/bm13
 @dirrm games/scorched3d/data/tanks/bender
 @dirrm games/scorched3d/data/tanks/battleship
-@dirrm games/scorched3d/data/tanks/CF-104
 @dirrm games/scorched3d/data/tanks
 @dirrm games/scorched3d/data/talk/polish
 @dirrm games/scorched3d/data/talk/german
@@ -1737,6 +1765,9 @@ games/scorched3d/documentation/README-zlib.txt
 @dirrm games/scorched3d/data/meshes/arara
 @dirrm games/scorched3d/data/meshes/ah64d
 @dirrm games/scorched3d/data/meshes
+@dirrm games/scorched3d/data/lua/accessories
+@dirrm games/scorched3d/data/lua
+@dirrm games/scorched3d/data/lang
 @dirrm games/scorched3d/data/landscapes
 @dirrm games/scorched3d/data/html/server/binary
 @dirrm games/scorched3d/data/html/server