2 files changed, 24 insertions, 20 deletions

diff --git a/games/simutrans/Makefile b/games/simutrans/Makefile
index 7351a23fcef7..e632805e3632 100644
--- a/games/simutrans/Makefile
+++ b/games/simutrans/Makefile
@@ -1,14 +1,13 @@
 # $FreeBSD$
 
 PORTNAME=	simutrans
-DISTVERSION=	112-3
-PORTREVISION=	1
+DISTVERSION=	120-0-1
 CATEGORIES=	games
 MASTER_SITES=	SF/simutrans/simutrans/${DISTVERSION} \
-		SF/simutrans/pak64/${PAK64_DISTVERSION}:pak64 \
+		SF/simutrans/pak64/${PAK64_SUBDIR}:pak64 \
 		SF/simutrans/pak128/pak128%20for%20${PAK128_SUBDIR}:pak128
 DISTFILES=	simutrans-src-${DISTVERSION}.zip \
-		simulinux-${DISTVERSION}.zip
+		simulinux-x64-${DISTVERSION}.zip
 
 MAINTAINER=	tijl@FreeBSD.org
 COMMENT=	Transport Simulator
@@ -17,9 +16,10 @@ LICENSE=	ART10
 LICENSE_FILE=	${WRKSRC}/simutrans/license.txt
 
 PAK64_DISTVERSION=	${DISTVERSION}
-PAK128_DISTVERSION=	2.3.0--112.2
-PAK128_SUBDIR=		112-2
-SIMUTRANS_REVISION=	6520
+PAK64_SUBDIR=		120-0
+PAK128_DISTVERSION=	2.5.2--RC_120
+PAK128_SUBDIR=		RC%20120%20%282.5.2%2C%20bugfixes%29
+SIMUTRANS_REVISION=	7373
 
 OPTIONS_DEFINE= 	DOCS
 OPTIONS_MULTI=		PAK
@@ -28,8 +28,11 @@ OPTIONS_DEFAULT=	PAK64
 PAK64_DESC=		Default graphics
 PAK128_DESC=		High resolution graphics
 
+# Threading disabled because FreeBSD does not have a static initializer
+# for recursive mutexes.
 MAKE_ARGS=	BACKEND=mixer_sdl \
 		COLOUR_DEPTH=16 \
+		MULTI_THREAD=0 \
 		OSTYPE=freebsd \
 		FLAGS="-DUSE_C -DREVISION=${SIMUTRANS_REVISION}" \
 		VERBOSE=1
@@ -37,7 +40,7 @@ NO_WRKSUBDIR=	yes
 USES=		gmake zip
 USE_SDL=	sdl mixer
 
-DESKTOP_ENTRIES=Simutrans "" "" simutrans "Game;Simulation;" "false"
+DESKTOP_ENTRIES=Simutrans "" "" simutrans "Game;Simulation;" false
 PLIST_FILES=	bin/simutrans bin/simutrans-bin
 PORTDATA=	*
 
@@ -56,13 +59,14 @@ post-patch:
 	@${REINPLACE_CMD} 's/simutrans/.simutrans/' ${WRKSRC}/simsys.cc
 
 do-install:
-	cd ${WRKSRC}/simutrans && ${COPYTREE_SHARE} \
-		"config font music script skin text" ${STAGEDIR}${DATADIR}
+	(cd ${WRKSRC}/simutrans && ${COPYTREE_SHARE} \
+		"config font music script text themes" ${STAGEDIR}${DATADIR})
 .if ${PORT_OPTIONS:MPAK64}
-	cd ${WRKSRC}/simutrans && ${COPYTREE_SHARE} pak ${STAGEDIR}${DATADIR}
+	(cd ${WRKSRC}/simutrans && ${COPYTREE_SHARE} \
+		pak ${STAGEDIR}${DATADIR})
 .endif
 .if ${PORT_OPTIONS:MPAK128}
-	cd ${WRKSRC}/simutrans && ${COPYTREE_SHARE} pak128 ${STAGEDIR}${DATADIR}
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} pak128 ${STAGEDIR}${DATADIR})
 .endif
 .if ${PORT_OPTIONS:MDOCS}
 	${INSTALL_DATA} ${WRKSRC}/simutrans/readme.txt ${STAGEDIR}${DATADIR}
diff --git a/games/simutrans/distinfo b/games/simutrans/distinfo
index d7518ffd2a21..d11d6cbf6fca 100644
--- a/games/simutrans/distinfo
+++ b/games/simutrans/distinfo
@@ -1,8 +1,8 @@
-SHA256 (simutrans-src-112-3.zip) = 8aa9ded7ac65587d65070b950b50f4094b7f77d33d263d1b821a0fe9f214b849
-SIZE (simutrans-src-112-3.zip) = 1677347
-SHA256 (simulinux-112-3.zip) = 2ca8375b44b433e7034dd17515d1f8319d4a04e18960d0d8c828cf7603199e92
-SIZE (simulinux-112-3.zip) = 3071766
-SHA256 (simupak64-112-3.zip) = dc443d9ddc1f36e10435f672a03f86d4ad83e33926045b14664f6d2580b56e8b
-SIZE (simupak64-112-3.zip) = 4117394
-SHA256 (pak128-2.3.0--112.2.zip) = ce3db7421cd717731eb5c30d4c99034b69e3c437cd4b1b60df776ba7aa719149
-SIZE (pak128-2.3.0--112.2.zip) = 87916059
+SHA256 (simutrans-src-120-0-1.zip) = 010a6e3765891e1821364e54f6bcdfb2911b627ffca3acae8350e06e53113683
+SIZE (simutrans-src-120-0-1.zip) = 3909005
+SHA256 (simulinux-x64-120-0-1.zip) = ce04df118bc320480fa40a1326cec13bb9dec6ac6c51fad7fcc1ab889602c0c0
+SIZE (simulinux-x64-120-0-1.zip) = 2845744
+SHA256 (simupak64-120-0-1.zip) = 02a709dfa4b0c22e0b463ebcbd9684548356de1c61566cff9c127a79990dbb78
+SIZE (simupak64-120-0-1.zip) = 4051769
+SHA256 (pak128-2.5.2--RC_120.zip) = eeefa54796f978216958ff9bc28f60a51da569a6e9c38c20703ed453853678aa
+SIZE (pak128-2.5.2--RC_120.zip) = 96081284