scorched3d: fix build with modern toolchains

update dependencies, mark unmaintained

scorched3d/.signature

@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3+fMAXGw9ypBKFaZ6P3cSECBZumXam+ZrVf++54LrQu4JcTIDZx0rP6lkQtU/FuMAKGL+P6fNZaQMa6Xf63idgk=
-SHA256 (Pkgfile) = 5fc44e8c57b296416c26547a9f8320aaf98146da266a935433c8629e984a4c70
-SHA256 (.footprint) = 12a2fb26ccd84016ab1d2e36cb7da54bd25364c7ebba0502c9e9c857fb0a68b7
-SHA256 (Scorched3D-43.3d-src.tar.gz) = a5e7bdc3810517ab142cfcb43951ca55d03c81252d00bc323f0f204deb62ef1c
+RWSagIOpLGJF3yOzA9Ef8Fx5soMW3FvMUJrQWeMYHTORSDJK5rpt31Ni28uwAZfqFdHOhuMTHTmoWh3OMIe1t0f8wszhTE9eQwY=
+SHA256 (Pkgfile) = 6116735fb8c0532b0318221ed191eb02fef2227a6ed819e6c035f95f706fe11d
+SHA256 (.footprint) = 940f5ce0cdb4df67a3d4990e5fb2fbb1df58ffae622f68a93a555077950183b0
+SHA256 (scorched3d-44-src.tar.gz) = a0b6d78a0f677e7e5eab78bf26596b1447ba411431bc59af84177001dd18be51

scorched3d/Pkgfile

@@ -1,44 +1,36 @@
 # Description: A 3D recreation of the classic DOS game Scorched Earth.
-# URL: http://www.scorched3d.co.uk/
-# Maintainer: Danny Rawlins, crux at romster dot me
-# Depends on: dos2unix fftw freealut glew sdl_mixer sdl_net wxgtk3
+# URL: https://github.com/jjaxse2017/scorched-earth-3d
+# Maintainer: UNMAINTAINED
+# Depends on: fftw freealut glew sdl_mixer sdl_net wxgtk3 p7zip
 
 name=scorched3d
 version=44
-release=1
-source=(https://sourceforge.net/projects/scorched3d/files/scorched3d/Version%2044/Scorched3D-$version-src.tar.gz
-	# https://gitweb.gentoo.org/repo/gentoo.git/tree/games-strategy/scorched3d/files
-	scorched3d-44-fix-c++14.patch scorched3d-44-fixups.patch scorched3d-44-freetype.patch
-	scorched3d-44-gcc43.patch scorched3d-44-jpeg9.patch scorched3d-44-odbc.patch scorched3d-44-win32.patch
-	scorched3d-44-wxgtk.patch)
+release=2
+source=(https://github.com/jjaxse2017/scorched-earth-3d/archive/x86_64_gcc_7/$name-$version-src.tar.gz)
 
 build() {
-	cd scorched
-	patch -Np1 -i $SRC/scorched3d-44-fixups.patch
-	patch -Np1 -i $SRC/scorched3d-44-gcc43.patch
-	patch -Np1 -i $SRC/scorched3d-44-odbc.patch
-	patch -Np1 -i $SRC/scorched3d-44-win32.patch
-	patch -Np1 -i $SRC/scorched3d-44-freetype.patch
-	patch -Np1 -i $SRC/scorched3d-44-jpeg9.patch
-	patch -Np1 -i $SRC/scorched3d-44-fix-c++14.patch
-	#patch -Np1 -i $SRC/scorched3d-44-wxgtk.patch
+	cd scorched-earth-3d-*/data/globalmods
+	7z x apoc.7z
+	7z x none.7z.001
+	cd ../..
 
-#	dos2unix \
-#		src/launcher/wxdialogs/SettingsDialog.cpp \
-#		src/launcher/wxdialogs/DisplayDialog.cpp \
-#		src/launcher/wxdialogs/Display.cpp \
-#		src/launcher/wxdialogs/KeyDialog.cpp
+	# accommodate the new wxgtk function signatures
+	sed -e '/SetTickFreq/s/4, 0/4/' \
+	    -i src/launcher/wxdialogs/DisplayDialog.cpp
+	
+	# update the version string, and respect the syntax expected by test
+	sed -e '/ VERSION=43/s/43/44/; /test/s/== /= /g' -i configure
 
-#	autoreconf -fvi --no-recursive
-
-CONFIG_SHELL=/bin/bash \
-	./configure \
+	# configure using pkgconf, not the deprecated freetype-config
+	FT2_CONFIG="/usr/bin/pkgconf freetype2" \
+		/bin/bash ./configure \
 		--prefix=/usr \
 		--datadir=/usr/share/scorched3d \
 		--with-wx-config=/usr/bin/wx-config-gtk3 \
 		--without-pgsql \
+		--disable-freetypetest \
 		--disable-dependency-tracking
-  SHELL=/bin/bash \
+
 	make
 	make DESTDIR=$PKG install
 	rm -r $PKG/usr/share/scorched3d/documentation

scorched3d/README

@@ -0,0 +1,10 @@
+# Scorched3D: known issues
+
+xorg-server is needed to play this game, but not to build it. Scorched3D is
+linked against libsdl 1.2, which unlike SDL2 does not support newer video
+protocols. A pure-Wayland desktop can launch the server (scorched3ds), but
+not the client (scorched3dc) which relies on an Xorg-compatible build of
+glew.
+
+It is normal to encounter WxGtk errors when first launching scorched3d.
+Click through, and you should be able to reach the settings menu.