4 files changed, 101 insertions, 55 deletions

diff --git a/games/linux-quake4/Makefile b/games/linux-quake4/Makefile
index 2f48cc3f293b..7bdc0d9a7773 100644
--- a/games/linux-quake4/Makefile
+++ b/games/linux-quake4/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	quake4
-PORTVERSION=	1.1
+PORTVERSION=	1.2.1
 PORTEPOCH=	1
 CATEGORIES=	games linux
-MASTER_SITES=	${MASTER_SITE_IDSOFTWARE:S|$|quake4/linux/old/|} \
-		${MASTER_SITE_GENTOO}
-MASTER_SITE_SUBDIR=	distfiles
+MASTER_SITES=	${MASTER_SITE_IDSOFTWARE:S|$|quake4/linux/|} \
+		${MASTER_SITE_GENTOO:S|$|distfiles/|}
 PKGNAMEPREFIX=	linux-
 DISTNAME=	${PORTNAME}-${PKGNAMEPREFIX}${PORTVERSION}.x86
 EXTRACT_SUFX=	.run
@@ -25,10 +24,22 @@ ONLY_FOR_ARCHS=	i386 amd64
 USE_X_PREFIX=	yes
 USE_LINUX=	yes
 NO_WRKSUBDIR=	yes
-Q4DIR=		lib/${PORTNAME}/
-PLIST_SUB+=	Q4DIR="${Q4DIR}"
+Q4DIR=		lib/${PORTNAME}
+PLIST_SUB+=	Q4DIR="${Q4DIR}" \
+		LINUXBASE="${LINUXBASE}"
 SUB_FILES=	pkg-message
 
+OPTIONS=	SMP	"Install threaded version"	on \
+		GERMANY	"Germany version"	off
+
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_SMP)
+PLIST_SUB+=	SMP=""
+.else
+PLIST_SUB+=	SMP="@comment "
+.endif
+
 do-extract:
 	@${RM} -rf ${WRKDIR}
 	@${MKDIR} ${WRKDIR}
@@ -36,24 +47,34 @@ do-extract:
 		${TAR} zxf -
 
 do-build:
-.for i in quake4 q4ded
-	${BRANDELF} -t Linux ${WRKSRC}/bin/FreeBSD/x86/$i.x86
+.for FILE in quake4 q4ded quake4smp
+	${BRANDELF} -t Linux ${WRKSRC}/bin/FreeBSD/x86/${FILE}.x86
 
 	# Startup scripts
 	@${SED} \
 		-e 's|@Q4DIR@|${PREFIX}/${Q4DIR}|' \
-		-e 's|@APP@|$i.x86|' \
-		${FILESDIR}/run.sh.in > ${WRKSRC}/$i.sh
+		-e 's|@APP@|${FILE}.x86|' \
+		${FILESDIR}/run.sh.in > ${WRKSRC}/${FILE}.sh
 .endfor
 
 do-install:
 	# Executables
 	@${MKDIR} ${PREFIX}/${Q4DIR}
-.for i in quake4 q4ded
-	${INSTALL_SCRIPT} ${WRKSRC}/$i.sh ${PREFIX}/bin/$i
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/FreeBSD/x86/$i.x86 ${PREFIX}/${Q4DIR}/
+.for FILE in quake4 q4ded
+	${INSTALL_SCRIPT} ${WRKSRC}/${FILE}.sh ${PREFIX}/bin/${FILE}
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/FreeBSD/x86/${FILE}.x86 ${PREFIX}/${Q4DIR}
 .endfor
 
+.if !defined(WITHOUT_SMP)
+	${INSTALL_SCRIPT} ${WRKSRC}/quake4smp.sh ${PREFIX}/bin/quake4smp
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/FreeBSD/x86/quake4smp.x86 ${PREFIX}/${Q4DIR}
+.endif
+	# Libraries
+.for FILE in libSDL-1.2.id.so.0 libstdc++.so.6
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/FreeBSD/x86/${FILE} ${PREFIX}/${Q4DIR}
+.endfor
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/FreeBSD/x86/libgcc_s.so.1  ${PREFIX}/${Q4DIR}
+
 	# Punkbuster
 	@${MKDIR} ${PREFIX}/${Q4DIR}/pb/htm
 	@${MKDIR} ${PREFIX}/${Q4DIR}/q4base
@@ -67,6 +88,17 @@ do-install:
 		${FIND} -E q4base -type f -iregex ".*\.(cfg|scriptcfg|pk4)" \
 			-exec ${INSTALL_DATA} "{}" "${PREFIX}/${Q4DIR}/{}" \;
 
+	# All version (except germany) or only germany version
+.if defined(WITH_GERMANY)
+	@cd ${WRKSRC}/germany && \
+		${FIND} -E q4base -type f -iregex ".*\.(pk4)" \
+			-exec ${INSTALL_DATA} "{}" "${PREFIX}/${Q4DIR}/{}" \;
+.else
+	@cd ${WRKSRC}/us && \
+		${FIND} -E q4base -type f -iregex ".*\.(pk4)" \
+			-exec ${INSTALL_DATA} "{}" "${PREFIX}/${Q4DIR}/{}" \;
+.endif
+
 	# Documentation
 .if !defined (NOPORTDOCS)
 	@cd ${WRKSRC}/Docs && \
@@ -80,4 +112,4 @@ do-install:
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/games/linux-quake4/distinfo b/games/linux-quake4/distinfo
index 4653f3c945ea..51645fcec8d7 100644
--- a/games/linux-quake4/distinfo
+++ b/games/linux-quake4/distinfo
@@ -1,3 +1,3 @@
-MD5 (quake4-linux-1.1.x86.run) = 33c94890738d251042bd4b71e1370ba7
-SHA256 (quake4-linux-1.1.x86.run) = 2dd920b8415fb6cf538960eafe3cb30cbb0cd7f2807c54652a5edc93854a979b
-SIZE (quake4-linux-1.1.x86.run) = 120035724
+MD5 (quake4-linux-1.2.1.x86.run) = ed9ecbddf8d3e5cf4e7d5330303c3610
+SHA256 (quake4-linux-1.2.1.x86.run) = 1e23a3f509a3d3ce86519c3ad0a29677eb05e2cc28f773dca1971ad025032622
+SIZE (quake4-linux-1.2.1.x86.run) = 123174709
diff --git a/games/linux-quake4/files/run.sh.in b/games/linux-quake4/files/run.sh.in
index 64fd225b0e5f..be4338723c58 100644
--- a/games/linux-quake4/files/run.sh.in
+++ b/games/linux-quake4/files/run.sh.in
@@ -1,4 +1,10 @@
 #!/bin/sh
 
+if [ -n "$LD_LIBRARY_PATH" ]; then
+    export LD_LIBRARY_PATH="@Q4DIR@:$LD_LIBRARY_PATH"
+else
+    export LD_LIBRARY_PATH="@Q4DIR@"
+fi
+
 cd @Q4DIR@ || exit 1
 exec @Q4DIR@/@APP@ "$@"
diff --git a/games/linux-quake4/pkg-plist b/games/linux-quake4/pkg-plist
index cf25bd29ec6d..a0b504ab1689 100644
--- a/games/linux-quake4/pkg-plist
+++ b/games/linux-quake4/pkg-plist
@@ -1,40 +1,48 @@
+%%SMP%%bin/quake4smp
 bin/q4ded
 bin/quake4
-%%Q4DIR%%pb/htm/la001307.htm
-%%Q4DIR%%pb/htm/lc001095.htm
-%%Q4DIR%%pb/htm/ma001307.htm
-%%Q4DIR%%pb/htm/mc001095.htm
-%%Q4DIR%%pb/htm/wa001307.htm
-%%Q4DIR%%pb/htm/wc001095.htm
-%%Q4DIR%%pb/pbag.so
-%%Q4DIR%%pb/pbags.so
-%%Q4DIR%%pb/pbcl.so
-%%Q4DIR%%pb/pbcls.so
-%%Q4DIR%%pb/pbsv.so
-%%Q4DIR%%q4base/arena_ctf.cfg
-%%Q4DIR%%q4base/ctf.cfg
-%%Q4DIR%%q4base/dm.cfg
-%%Q4DIR%%q4base/game000.pk4
-%%Q4DIR%%q4base/game100.pk4
-%%Q4DIR%%q4base/game200.pk4
-%%Q4DIR%%q4base/mapcycle-mp1.scriptcfg
-%%Q4DIR%%q4base/mapcycle-mp2.scriptcfg
-%%Q4DIR%%q4base/mapcycle.scriptcfg
-%%Q4DIR%%q4base/pak013.pk4
-%%Q4DIR%%q4base/pak014.pk4
-%%Q4DIR%%q4base/pak016.pk4
-%%Q4DIR%%q4base/teamdm.cfg
-%%Q4DIR%%q4base/tourney.cfg
-%%Q4DIR%%q4base/zpak_english_01.pk4
-%%Q4DIR%%q4base/zpak_english_02.pk4
-%%Q4DIR%%q4base/zpak_french_01.pk4
-%%Q4DIR%%q4base/zpak_french_02.pk4
-%%Q4DIR%%q4base/zpak_italian_01.pk4
-%%Q4DIR%%q4base/zpak_italian_02.pk4
-%%Q4DIR%%q4base/zpak_spanish_01.pk4
-%%Q4DIR%%q4base/zpak_spanish_02.pk4
-%%Q4DIR%%q4ded.x86
-%%Q4DIR%%quake4.x86
+%%Q4DIR%%/pb/htm/la001307.htm
+%%Q4DIR%%/pb/htm/lc001095.htm
+%%Q4DIR%%/pb/htm/ma001307.htm
+%%Q4DIR%%/pb/htm/mc001095.htm
+%%Q4DIR%%/pb/htm/wa001307.htm
+%%Q4DIR%%/pb/htm/wc001095.htm
+%%Q4DIR%%/pb/pbag.so
+%%Q4DIR%%/pb/pbags.so
+%%Q4DIR%%/pb/pbcl.so
+%%Q4DIR%%/pb/pbcls.so
+%%Q4DIR%%/pb/pbsv.so
+%%Q4DIR%%/q4base/arena_ctf.cfg
+%%Q4DIR%%/q4base/ctf.cfg
+%%Q4DIR%%/q4base/dm.cfg
+%%Q4DIR%%/q4base/game000.pk4
+%%Q4DIR%%/q4base/game100.pk4
+%%Q4DIR%%/q4base/game200.pk4
+%%Q4DIR%%/q4base/mapcycle-mp1.scriptcfg
+%%Q4DIR%%/q4base/mapcycle-mp2.scriptcfg
+%%Q4DIR%%/q4base/mapcycle.scriptcfg
+%%Q4DIR%%/q4base/pak013.pk4
+%%Q4DIR%%/q4base/pak014.pk4
+%%Q4DIR%%/q4base/pak015.pk4
+%%Q4DIR%%/q4base/pak016.pk4
+%%Q4DIR%%/q4base/pak017.pk4
+%%Q4DIR%%/q4base/pak018.pk4
+%%Q4DIR%%/q4base/teamdm.cfg
+%%Q4DIR%%/q4base/tourney.cfg
+%%Q4DIR%%/q4base/zpak_english_01.pk4
+%%Q4DIR%%/q4base/zpak_english_02.pk4
+%%Q4DIR%%/q4base/zpak_french_01.pk4
+%%Q4DIR%%/q4base/zpak_french_02.pk4
+%%Q4DIR%%/q4base/zpak_italian_01.pk4
+%%Q4DIR%%/q4base/zpak_italian_02.pk4
+%%Q4DIR%%/q4base/zpak_spanish_01.pk4
+%%Q4DIR%%/q4base/zpak_spanish_02.pk4
+%%SMP%%%%Q4DIR%%/quake4smp.x86
+%%Q4DIR%%/q4ded.x86
+%%Q4DIR%%/quake4.x86
+%%Q4DIR%%/libSDL-1.2.id.so.0
+%%Q4DIR%%/libstdc++.so.6
+%%Q4DIR%%/libgcc_s.so.1
 %%PORTDOCS%%%%DOCSDIR%%/ENG/License.txt
 %%PORTDOCS%%%%DOCSDIR%%/ENG/MSR.txt
 %%PORTDOCS%%%%DOCSDIR%%/ENG/PBEULA.txt
@@ -388,9 +396,9 @@ bin/quake4
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/PBEULA
 %%PORTDOCS%%%%DOCSDIR%%/README
-@dirrm %%Q4DIR%%pb/htm
-@dirrm %%Q4DIR%%pb
-@dirrmtry %%Q4DIR%%q4base
+@dirrm %%Q4DIR%%/pb/htm
+@dirrm %%Q4DIR%%/pb
+@dirrmtry %%Q4DIR%%/q4base
 @unexec rmdir %D/%%Q4DIR%% 2>/dev/null || echo "Note: %D/%%Q4DIR%% not empty -- not deleted!"
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/ENG/htm
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/ENG/images