- Update to SFE mod (It's the final version of previous SET mod)

- Remove savage_server support
- Add MASTER_SITES entries
- Bump PORTREVISION
- More information at http://www.notforidiots.com/SFE/

6 files changed, 54 insertions, 105 deletions

diff --git a/games/linux-savage/Makefile b/games/linux-savage/Makefile
index 2329573eca38..ae294bd8390d 100644
--- a/games/linux-savage/Makefile
+++ b/games/linux-savage/Makefile
@@ -7,14 +7,15 @@
 
 PORTNAME=	savage
 PORTVERSION=	2.00e
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games linux
-MASTER_SITES=	http://www.happypuppy.com/s2games/:full \
-		http://www.notforidiots.com/autoupdater/:patch
+MASTER_SITES=	http://www.notforidiots.com/SFE/ \
+		http://www.newerth.com/downloads/ \
+		http://newerth.downloads.groentjuh.eu/ \
+		http://guf.newerth.com/downloads/ \
+		http://mnky.newerth.com/
 PKGNAMEPREFIX=	linux-
-DISTFILES=	${PORTNAME:S/s/S/}_with_sep3t.run:full \
-		SEP-3T_3T+-r2.tar.gz:patch \
-		SEP-3T+-Crash-Hotfix-Linux.tar.gz:patch
+DISTFILES=	SFE-Standalone${EXTRACT_SUFX}
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	acm@FreeBSD.org
@@ -26,13 +27,14 @@ RUN_DEPENDS=	${LINUXBASE}/usr/lib/libvorbis.so.0:${PORTSDIR}/audio/linux-libvorb
 USE_LINUX=	yes
 NO_BUILD=	yes
 RESTRICTED=	Savage is freeware, but i am not sure of its license
-NO_PACKAGE=	Package will be 350MB, set FORCE_PACKAGE if you really want it
-WRKSRC=		${WRKDIR}/${PKGNAMEPREFIX}${PORTNAME}
-SAVAGEDIR=	lib/${PKGNAMEPREFIX}${PORTNAME}
-
-SUB_FILES=	pkg-message savage savage_editor savage_server
+NO_PACKAGE=	Package will be 150MB, set FORCE_PACKAGE if you really want it
 PLIST_SUB+=	SAVAGEDIR="${SAVAGEDIR}"
+SUB_FILES=	pkg-message savage savage_editor
 SUB_LIST+=	SAVAGEDIR="${PREFIX}/${SAVAGEDIR}"
+DOCSDIR=	share/doc/${PKGNAMEPREFIX}${PORTNAME}
+WRKSRC=		${WRKDIR}/${PKGNAMEPREFIX}${PORTNAME}
+
+SAVAGEDIR=	lib/${PKGNAMEPREFIX}${PORTNAME}
 
 OPTIONS=	NVIDIA_GL	"Install support for nvidia"	off
 
@@ -50,55 +52,35 @@ RUN_DEPENDS+=	${LINUXBASE}/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_d
 .endif
 
 do-extract:
-# Extract savage 2.00e
 	@${MKDIR} ${WRKSRC}
 	@cd ${WRKSRC} && \
-		${TAIL} +402 ${_DISTDIR}/${PORTNAME:S/s/S/}_with_sep3t.run | ${TAR} xf -
-.for FILE in graveyard savage
-	@${TAR} xfj ${WRKSRC}/${FILE}.tar.bz2 --directory ${WRKSRC}
-.endfor
-
-.for FILE in libcrypto libcurl libfmod libfreetype libglib libgssapi_krb5 libk5crypto \
-	libkrb5 libpng libssl libstdc++
-	@${RM} ${WRKSRC}/libs/${FILE}*
-.endfor
-
-# Extract SEP patch
-	@${TAR} xfz ${_DISTDIR}/SEP-3T_3T+-r2.tar.gz --directory ${WRKSRC}
-	@${TAR} xfz ${_DISTDIR}/SEP-3T+-Crash-Hotfix-Linux.tar.gz --directory ${WRKSRC}
+		${TAR} xfz ${_DISTDIR}/${DISTFILES} --directory ${WRKSRC}
 
 do-install:
 	@${MKDIR} ${PREFIX}/${SAVAGEDIR}
-.for DIRE in graveyard game updater
+.for DIRE in graveyard game
 	@${MKDIR} ${PREFIX}/${SAVAGEDIR}/${DIRE}
 	@cd ${WRKSRC}/${DIRE} && \
 		${FIND} * -type d -exec ${MKDIR} "${PREFIX}/${SAVAGEDIR}/${DIRE}/{}" \; && \
 			${FIND} * -type f -name "*.so" -exec ${INSTALL_PROGRAM} "{}" \
 				"${PREFIX}/${SAVAGEDIR}/${DIRE}/{}" \; && \
-				${FIND} -E * -type f -iregex ".*\.(bik|cfg|dat|db|tga|txt|ttf|s2g|s2z|ogg)" \
+				${FIND} -E * -type f -iregex ".*\.(cfg|dat|db|dll|jpg|mcfg|objgroup|ogg|tga|txt|ttf|s2g|s2z)" \
 					-exec ${INSTALL_DATA} "{}" "${PREFIX}/${SAVAGEDIR}/${DIRE}/{}" \;
 .endfor
 	@${MKDIR} ${PREFIX}/${SAVAGEDIR}/libs
 	@cd ${WRKSRC}/libs && \
 		${FIND} * -type f -exec ${INSTALL_PROGRAM} "{}" "${PREFIX}/${SAVAGEDIR}/libs/{}" \;
 
-.for FILE in silverback.bin sep_dedicated.bin update
-	${INSTALL_PROGRAM} ${WRKSRC}/${FILE} ${PREFIX}/${SAVAGEDIR}
-.endfor
+	${INSTALL_PROGRAM} ${WRKSRC}/silverback.bin ${PREFIX}/${SAVAGEDIR}
 
-.for FILE in savage savage_editor savage_server
+.for FILE in savage savage_editor
 	${INSTALL_SCRIPT} ${WRKDIR}/${FILE} ${PREFIX}/bin/${PKGNAMEPREFIX}${FILE}
 .endfor
-
-.for FILE in agp_error.txt icon.xpm logo.png eula.txt
-	${INSTALL_DATA} ${WRKSRC}/${FILE} ${PREFIX}/${SAVAGEDIR}
-.endfor
+	${LN} -s ${PREFIX}/${SAVAGEDIR}/libs/libfmod-3.75.so ${PREFIX}/${SAVAGEDIR}/libs/libfmod.so
 
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.	for FILE in README commander_controls.txt licenses.txt
-		${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
-.	endfor
+	@${MKDIR} ${PREFIX}/${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/licenses.txt ${PREFIX}/${DOCSDIR}
 .endif
 
 post-install:
diff --git a/games/linux-savage/distinfo b/games/linux-savage/distinfo
index ab6810da7d33..a0cb83fa6290 100644
--- a/games/linux-savage/distinfo
+++ b/games/linux-savage/distinfo
@@ -1,9 +1,3 @@
-MD5 (savage/Savage_with_sep3t.run) = 88d8a93e63c16ff5899430066ac29d21
-SHA256 (savage/Savage_with_sep3t.run) = e10c3b9163fad283dbd5118df7a780dfd22a66d2ac69847f67e141549dcc9849
-SIZE (savage/Savage_with_sep3t.run) = 397208452
-MD5 (savage/SEP-3T_3T+-r2.tar.gz) = 0019e98233ae99f4952cc48a2396b1d6
-SHA256 (savage/SEP-3T_3T+-r2.tar.gz) = 2dbd4e4fb8a48f13556f4970d46c76b54fec18d834e4c3fd6af067c17131647b
-SIZE (savage/SEP-3T_3T+-r2.tar.gz) = 3328787
-MD5 (savage/SEP-3T+-Crash-Hotfix-Linux.tar.gz) = 8224ff1dd335d3d309ed98f44b784826
-SHA256 (savage/SEP-3T+-Crash-Hotfix-Linux.tar.gz) = 9464ae92b3f1dcaa0242de21bbd2bd1660230ffd5fa615fd19f1fa6cdfff1702
-SIZE (savage/SEP-3T+-Crash-Hotfix-Linux.tar.gz) = 577253
+MD5 (savage/SFE-Standalone.tar.gz) = 3ce0c50e3d5e4ff6789122c5076fb66b
+SHA256 (savage/SFE-Standalone.tar.gz) = a6b12837b6d0c643aaa1aa58dcb1b2711b17547e355ba187308472f6e1f52c13
+SIZE (savage/SFE-Standalone.tar.gz) = 158803234
diff --git a/games/linux-savage/files/pkg-message.in b/games/linux-savage/files/pkg-message.in
index 2cdb844b94bc..7f6009028609 100644
--- a/games/linux-savage/files/pkg-message.in
+++ b/games/linux-savage/files/pkg-message.in
@@ -10,10 +10,6 @@ The Savage game (Linux version) was installed
 
    # linux-savage
 
-   Dedicated Server
-
-   # linux-savage_server
-
 2) The sound doesn't work by default, if you want to solve the problem, you must 
    to set the value of sound_softwareMode at:
 
diff --git a/games/linux-savage/files/savage_server.in b/games/linux-savage/files/savage_server.in
deleted file mode 100644
index 7d4755f4c7fb..000000000000
--- a/games/linux-savage/files/savage_server.in
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-cd %%SAVAGEDIR%% || exit 1
-export LD_LIBRARY_PATH=libs:$LD_LIBRARY_PATH
-exec ./sep_dedicated.bin "$@"
diff --git a/games/linux-savage/pkg-install b/games/linux-savage/pkg-install
index 0f6d9958b344..c73490f00ee4 100644
--- a/games/linux-savage/pkg-install
+++ b/games/linux-savage/pkg-install
@@ -11,5 +11,8 @@ if ! [ -e $scripts_file ]; then
 	chmod 666 $scripts_file
 fi
 
-chown root:wheel $startup_file 2>/dev/null
-chmod 666 $startup_file
+if ! [ -e $startup_file ]; then
+	touch $startup_file
+	chown root:wheel $startup_file 2>/dev/null
+	chmod 666 $startup_file
+fi
diff --git a/games/linux-savage/pkg-plist b/games/linux-savage/pkg-plist
index 1b044cce0cd1..610fa2579cd2 100644
--- a/games/linux-savage/pkg-plist
+++ b/games/linux-savage/pkg-plist
@@ -1,8 +1,5 @@
 bin/linux-savage
 bin/linux-savage_editor
-bin/linux-savage_server
-%%SAVAGEDIR%%/agp_error.txt
-%%SAVAGEDIR%%/eula.txt
 %%SAVAGEDIR%%/game/CTF.cfg
 %%SAVAGEDIR%%/game/DC.cfg
 %%SAVAGEDIR%%/game/DCM.cfg
@@ -16,6 +13,9 @@ bin/linux-savage_server
 %%SAVAGEDIR%%/game/TS_frenzy.cfg
 %%SAVAGEDIR%%/game/TS_normal.cfg
 %%SAVAGEDIR%%/game/autoexec.cfg
+%%SAVAGEDIR%%/game/banlist.cfg
+%%SAVAGEDIR%%/game/bans.cfg
+%%SAVAGEDIR%%/game/buddies.cfg
 %%SAVAGEDIR%%/game/commander_keys.cfg
 %%SAVAGEDIR%%/game/default.cfg
 %%SAVAGEDIR%%/game/demos/demos.txt
@@ -24,19 +24,6 @@ bin/linux-savage_server
 %%SAVAGEDIR%%/game/frenzy.cfg
 %%SAVAGEDIR%%/game/game.so
 %%SAVAGEDIR%%/game/gamefont.ttf
-%%SAVAGEDIR%%/game/gamelist_full.dat
-%%SAVAGEDIR%%/game/gui0.s2z
-%%SAVAGEDIR%%/game/gui1.s2z
-%%SAVAGEDIR%%/game/gui2.s2z
-%%SAVAGEDIR%%/game/gui3.s2z
-%%SAVAGEDIR%%/game/gui4.s2z
-%%SAVAGEDIR%%/game/gui5.s2z
-%%SAVAGEDIR%%/game/gui6.s2z
-%%SAVAGEDIR%%/game/images0.s2z
-%%SAVAGEDIR%%/game/images1.s2z
-%%SAVAGEDIR%%/game/images2.s2z
-%%SAVAGEDIR%%/game/intro.cfg
-%%SAVAGEDIR%%/game/latest_gamelist_packet.dat
 %%SAVAGEDIR%%/game/music/a_new_earth.ogg
 %%SAVAGEDIR%%/game/music/bg_test.ogg
 %%SAVAGEDIR%%/game/music/lost_hills.ogg
@@ -49,15 +36,7 @@ bin/linux-savage_server
 %%SAVAGEDIR%%/game/playerkeys.cfg
 %%SAVAGEDIR%%/game/rotation.cfg
 %%SAVAGEDIR%%/game/savage0.s2z
-%%SAVAGEDIR%%/game/savage1.s2z
-%%SAVAGEDIR%%/game/savage2.s2z
-%%SAVAGEDIR%%/game/savage3.s2z
-%%SAVAGEDIR%%/game/savage4.s2z
-%%SAVAGEDIR%%/game/savage5.s2z
-%%SAVAGEDIR%%/game/savage6.s2z
-%%SAVAGEDIR%%/game/savage7.s2z
-%%SAVAGEDIR%%/game/savage_intro.bik
-%%SAVAGEDIR%%/game/savage_intro.ogg
+%%SAVAGEDIR%%/game/savage9.s2z
 %%SAVAGEDIR%%/game/screenshots/screenshots.txt
 %%SAVAGEDIR%%/game/settings/commander_keys.cfg
 %%SAVAGEDIR%%/game/settings/current.cfg
@@ -75,22 +54,25 @@ bin/linux-savage_server
 %%SAVAGEDIR%%/game/settings/user_sound_options.cfg
 %%SAVAGEDIR%%/game/settings/user_tlgraphics_options.cfg
 %%SAVAGEDIR%%/game/settings/userkeys.cfg
-%%SAVAGEDIR%%/game/sounds0.s2z
-%%SAVAGEDIR%%/game/sounds1.s2z
 %%SAVAGEDIR%%/game/startup.cfg
 %%SAVAGEDIR%%/game/ui_game.cfg
 %%SAVAGEDIR%%/game/ui_main.cfg
 %%SAVAGEDIR%%/game/world/2castles.s2z
+%%SAVAGEDIR%%/game/world/2towers.s2z
+%%SAVAGEDIR%%/game/world/3Tiny_Beta.s2z
 %%SAVAGEDIR%%/game/world/3_addisabeba05.s2z
 %%SAVAGEDIR%%/game/world/3_junctionB.s2z
 %%SAVAGEDIR%%/game/world/3_kingdoms2.s2z
+%%SAVAGEDIR%%/game/world/3_mayhem2.mcfg
 %%SAVAGEDIR%%/game/world/3_mayhem2.s2z
+%%SAVAGEDIR%%/game/world/3_snowdeath.mcfg
 %%SAVAGEDIR%%/game/world/3_snowdeath.s2z
 %%SAVAGEDIR%%/game/world/3_torque_sep.s2z
 %%SAVAGEDIR%%/game/world/_undo_.s2z
 %%SAVAGEDIR%%/game/world/aftermath2_sep.s2z
 %%SAVAGEDIR%%/game/world/alpenglow.s2z
 %%SAVAGEDIR%%/game/world/alpenglow_b.s2z
+%%SAVAGEDIR%%/game/world/alpenglow_b_overhead.jpg
 %%SAVAGEDIR%%/game/world/alpenglow_overhead.tga
 %%SAVAGEDIR%%/game/world/alpinevalley.s2z
 %%SAVAGEDIR%%/game/world/alpinevalley_overhead.tga
@@ -119,8 +101,10 @@ bin/linux-savage_server
 %%SAVAGEDIR%%/game/world/duel_dj.s2z
 %%SAVAGEDIR%%/game/world/eden.s2z
 %%SAVAGEDIR%%/game/world/eden2.s2z
+%%SAVAGEDIR%%/game/world/eden2_overhead.s2g
 %%SAVAGEDIR%%/game/world/eden2_overhead.tga
 %%SAVAGEDIR%%/game/world/eden_overhead.tga
+%%SAVAGEDIR%%/game/world/edge_1a.s2z
 %%SAVAGEDIR%%/game/world/evening_sep.s2z
 %%SAVAGEDIR%%/game/world/evergreen2.s2z
 %%SAVAGEDIR%%/game/world/falls2.s2z
@@ -150,7 +134,10 @@ bin/linux-savage_server
 %%SAVAGEDIR%%/game/world/nohope.s2z
 %%SAVAGEDIR%%/game/world/oceanv5.s2z
 %%SAVAGEDIR%%/game/world/omo_sep.s2z
+%%SAVAGEDIR%%/game/world/omo_tehe_dero2.s2z
+%%SAVAGEDIR%%/game/world/omo_tehe_dero2_overhead.jpg
 %%SAVAGEDIR%%/game/world/pirate2_sep.s2z
+%%SAVAGEDIR%%/game/world/rainforest3.s2z
 %%SAVAGEDIR%%/game/world/redmeridian.s2z
 %%SAVAGEDIR%%/game/world/redwood_canyon_sep.s2z
 %%SAVAGEDIR%%/game/world/riverbend_sep.s2z
@@ -166,6 +153,8 @@ bin/linux-savage_server
 %%SAVAGEDIR%%/game/world/snowblind_overhead.tga
 %%SAVAGEDIR%%/game/world/standard.cfg
 %%SAVAGEDIR%%/game/world/tenshi.s2z
+%%SAVAGEDIR%%/game/world/the_gate_beta.s2z
+%%SAVAGEDIR%%/game/world/the_gate_beta_overhead.jpg
 %%SAVAGEDIR%%/game/world/thorn_sep.s2z
 %%SAVAGEDIR%%/game/world/tiny2_sep.s2z
 %%SAVAGEDIR%%/game/world/tropical.s2z
@@ -213,9 +202,15 @@ bin/linux-savage_server
 %%SAVAGEDIR%%/graveyard/brushes/standard/brush8.tga
 %%SAVAGEDIR%%/graveyard/brushes/standard/brush9.tga
 %%SAVAGEDIR%%/graveyard/buddies.cfg
+%%SAVAGEDIR%%/graveyard/game.dll
 %%SAVAGEDIR%%/graveyard/game.so
 %%SAVAGEDIR%%/graveyard/gamefont.ttf
-%%SAVAGEDIR%%/graveyard/gamelist_full.dat
+%%SAVAGEDIR%%/graveyard/groups/NPCs/Monkits.objgroup
+%%SAVAGEDIR%%/graveyard/groups/Water/Waterfall 1.objgroup
+%%SAVAGEDIR%%/graveyard/groups/Water/Waterfall 2.objgroup
+%%SAVAGEDIR%%/graveyard/groups/Water/Waterfall 3.objgroup
+%%SAVAGEDIR%%/graveyard/groups/Water/Waterfall 4.objgroup
+%%SAVAGEDIR%%/graveyard/groups/Water/Waterfall 5.objgroup
 %%SAVAGEDIR%%/graveyard/gui/graveyard/1_nl_selected120x16.tga
 %%SAVAGEDIR%%/graveyard/gui/graveyard/b_jesse.tga
 %%SAVAGEDIR%%/graveyard/gui/graveyard/bl_jesse.tga
@@ -270,8 +265,6 @@ bin/linux-savage_server
 %%SAVAGEDIR%%/graveyard/gui/graveyard/ui_texture_mode.cfg
 %%SAVAGEDIR%%/graveyard/gui/graveyard/ui_util.cfg
 %%SAVAGEDIR%%/graveyard/gui/graveyard/ui_util_mode.cfg
-%%SAVAGEDIR%%/graveyard/latest_gamelist_packet.dat
-%%SAVAGEDIR%%/graveyard/screenshots/Thumbs.db
 %%SAVAGEDIR%%/graveyard/startup.cfg
 %%SAVAGEDIR%%/graveyard/ui_game.cfg
 %%SAVAGEDIR%%/graveyard/ui_main.cfg
@@ -283,41 +276,28 @@ bin/linux-savage_server
 %%SAVAGEDIR%%/graveyard/world/blank512.s2z
 %%SAVAGEDIR%%/graveyard/world/blank64.s2z
 %%SAVAGEDIR%%/graveyard/world/blank96.s2z
-%%SAVAGEDIR%%/icon.xpm
-%%SAVAGEDIR%%/libs/libSDL-1.2.so.0
 %%SAVAGEDIR%%/libs/libcrypto.so.0.9.8
 %%SAVAGEDIR%%/libs/libcurl.so.3
+%%SAVAGEDIR%%/libs/libfmod-3.75.so
 %%SAVAGEDIR%%/libs/libfmod.so
-%%SAVAGEDIR%%/libs/libfreetype.so.6
-%%SAVAGEDIR%%/libs/libgcc_s.so.1
-%%SAVAGEDIR%%/libs/libglib-2.0.so.0
 %%SAVAGEDIR%%/libs/libgssapi_krb5.so.2
 %%SAVAGEDIR%%/libs/libidn.so.11
 %%SAVAGEDIR%%/libs/libk5crypto.so.3
 %%SAVAGEDIR%%/libs/libkrb5.so.3
 %%SAVAGEDIR%%/libs/libkrb5support.so.0
-%%SAVAGEDIR%%/libs/libmd5.so.0
 %%SAVAGEDIR%%/libs/libpng12.so.0
 %%SAVAGEDIR%%/libs/libssl.so.0.9.8
 %%SAVAGEDIR%%/libs/libstdc++.so.6
-%%SAVAGEDIR%%/logo.png
 %%SAVAGEDIR%%/scripts.log
 %%SAVAGEDIR%%/silverback.bin
-%%SAVAGEDIR%%/sep_dedicated.bin
-%%SAVAGEDIR%%/update
-%%SAVAGEDIR%%/updater/lastpatch.txt
-%%SAVAGEDIR%%/updater/patchindex.txt
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/commander_controls.txt
 %%PORTDOCS%%%%DOCSDIR%%/licenses.txt
 @dirrm %%SAVAGEDIR%%/graveyard/brushes/standard
 @dirrm %%SAVAGEDIR%%/graveyard/brushes
+@dirrm %%SAVAGEDIR%%/graveyard/groups/NPCs
 @dirrm %%SAVAGEDIR%%/graveyard/groups/Water
-@dirrm %%SAVAGEDIR%%/graveyard/groups/Buildings
 @dirrm %%SAVAGEDIR%%/graveyard/groups
 @dirrm %%SAVAGEDIR%%/graveyard/gui/graveyard
 @dirrm %%SAVAGEDIR%%/graveyard/gui
-@dirrm %%SAVAGEDIR%%/graveyard/screenshots
 @dirrm %%SAVAGEDIR%%/graveyard/world
 @dirrm %%SAVAGEDIR%%/graveyard
 @dirrm %%SAVAGEDIR%%/game/demos
@@ -329,7 +309,6 @@ bin/linux-savage_server
 @dirrm %%SAVAGEDIR%%/game/settings
 @dirrm %%SAVAGEDIR%%/game/world
 @dirrm %%SAVAGEDIR%%/game
-@dirrm %%SAVAGEDIR%%/updater
 @dirrm %%SAVAGEDIR%%/libs
 @dirrm %%SAVAGEDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%