3 files changed, 18 insertions, 9 deletions

diff --git a/games/linux-savage/Makefile b/games/linux-savage/Makefile
index ee2005964767..2329573eca38 100644
--- a/games/linux-savage/Makefile
+++ b/games/linux-savage/Makefile
@@ -7,12 +7,14 @@
 
 PORTNAME=	savage
 PORTVERSION=	2.00e
+PORTREVISION=	1
 CATEGORIES=	games linux
 MASTER_SITES=	http://www.happypuppy.com/s2games/:full \
 		http://www.notforidiots.com/autoupdater/:patch
 PKGNAMEPREFIX=	linux-
 DISTFILES=	${PORTNAME:S/s/S/}_with_sep3t.run:full \
-		SEP-3T_3T+-r2.tar.gz:patch
+		SEP-3T_3T+-r2.tar.gz:patch \
+		SEP-3T+-Crash-Hotfix-Linux.tar.gz:patch
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	acm@FreeBSD.org
@@ -28,20 +30,21 @@ 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
+SUB_FILES=	pkg-message savage savage_editor savage_server
 PLIST_SUB+=	SAVAGEDIR="${SAVAGEDIR}"
 SUB_LIST+=	SAVAGEDIR="${PREFIX}/${SAVAGEDIR}"
 
-OPTIONS=	NVIDIA	"Install support for nvidia"	off
+OPTIONS=	NVIDIA_GL	"Install support for nvidia"	off
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_NVIDIA)
-.	if !exists(${LINUXBASE}/usr/lib/libGL.so.1)
-RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver
+.if defined(WITH_NVIDIA_GL)
+.	if !exists(${LINUXBASE}/usr/X11R6/lib/libGL.so.1)
+RUN_DEPENDS+=	${LINUXBASE}/usr/lib/libGL.so.1:${PORTSDIR}/x11/nvidia-driver \
+		${LINUXBASE}/usr/X11R6/lib/libGLU.so.1:${PORTSDIR}/graphics/linux-libGLU
 .	endif
 .else
-.	if !exists(${LINUXBASE}/usr/X11R6/lib/libGL.so.1)
+.	if !exists(${LINUXBASE}/usr/lib/libGL.so.1)
 RUN_DEPENDS+=	${LINUXBASE}/usr/X11R6/lib/libGL.so.1:${PORTSDIR}/graphics/linux_dri
 .	endif
 .endif
@@ -62,6 +65,7 @@ do-extract:
 
 # 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}
 
 do-install:
 	@${MKDIR} ${PREFIX}/${SAVAGEDIR}
@@ -78,11 +82,11 @@ do-install:
 	@cd ${WRKSRC}/libs && \
 		${FIND} * -type f -exec ${INSTALL_PROGRAM} "{}" "${PREFIX}/${SAVAGEDIR}/libs/{}" \;
 
-.for FILE in silverback.bin update
+.for FILE in silverback.bin sep_dedicated.bin update
 	${INSTALL_PROGRAM} ${WRKSRC}/${FILE} ${PREFIX}/${SAVAGEDIR}
 .endfor
 
-.for FILE in savage savage_editor
+.for FILE in savage savage_editor savage_server
 	${INSTALL_SCRIPT} ${WRKDIR}/${FILE} ${PREFIX}/bin/${PKGNAMEPREFIX}${FILE}
 .endfor
 
diff --git a/games/linux-savage/distinfo b/games/linux-savage/distinfo
index 889a57a0cf9b..ab6810da7d33 100644
--- a/games/linux-savage/distinfo
+++ b/games/linux-savage/distinfo
@@ -4,3 +4,6 @@ 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
diff --git a/games/linux-savage/pkg-plist b/games/linux-savage/pkg-plist
index c0fcf9d2b6ac..1b044cce0cd1 100644
--- a/games/linux-savage/pkg-plist
+++ b/games/linux-savage/pkg-plist
@@ -1,5 +1,6 @@
 bin/linux-savage
 bin/linux-savage_editor
+bin/linux-savage_server
 %%SAVAGEDIR%%/agp_error.txt
 %%SAVAGEDIR%%/eula.txt
 %%SAVAGEDIR%%/game/CTF.cfg
@@ -302,6 +303,7 @@ bin/linux-savage_editor
 %%SAVAGEDIR%%/logo.png
 %%SAVAGEDIR%%/scripts.log
 %%SAVAGEDIR%%/silverback.bin
+%%SAVAGEDIR%%/sep_dedicated.bin
 %%SAVAGEDIR%%/update
 %%SAVAGEDIR%%/updater/lastpatch.txt
 %%SAVAGEDIR%%/updater/patchindex.txt