openttd-data: Update to 7.1

upstream changes:
-----------------
  * Update OpenGFX to 7.1
    [https://cdn.openttd.org/opengfx-releases/7.1/changelog.txt]
  * Update OpenMSX to 0.4.2
    [https://cdn.openttd.org/openmsx-releases/0.4.2/changelog.txt]
  * Update OpenSFX to 1.0.3
    [https://cdn.openttd.org/opensfx-releases/1.0.3/changelog.txt]

pkgsrc changes:
---------------
  * Update MASTER_SITES.
  * Add MSXVER and SFXVER to make easier future updates.

3 files changed, 29 insertions, 24 deletions

diff --git a/games/openttd-data/Makefile b/games/openttd-data/Makefile
index e31c9589da6..18de2e1e169 100644
--- a/games/openttd-data/Makefile
+++ b/games/openttd-data/Makefile
@@ -1,16 +1,19 @@
-# $NetBSD: Makefile,v 1.10 2020/04/05 14:43:05 nia Exp $
+# $NetBSD: Makefile,v 1.11 2022/05/08 12:06:34 triaxx Exp $
 
-GFXVER=		0.6.0
+GFXVER=		7.1
+MSXVER=		0.4.2
+SFXVER=		1.0.3
 PKGNAME=	openttd-data-${GFXVER}
 CATEGORIES=	games x11
-MASTER_SITES=	http://master.binaries.openttd.org/binaries/extra/openmsx/
+MASTER_SITES=	https://proxy.binaries.openttd.org/
 DISTFILES=	opengfx-${GFXVER}-all.zip
-DISTFILES+=	openmsx-0.3.1-all.zip
-DISTFILES+=	opensfx-0.2.3-all.zip
+DISTFILES+=	openmsx-${MSXVER}-all.zip
+DISTFILES+=	opensfx-${SFXVER}-all.zip
+EXTRACT_SUFX=	.zip
 
-SITES.opengfx-${GFXVER}-all.zip=	https://cdn.openttd.org/opengfx-releases/${GFXVER}/
-SITES.openmsx-0.3.1-all.zip=		${MASTER_SITES:Q}/openmsx/0.3.1/
-SITES.opensfx-0.2.3-all.zip=		${MASTER_SITES:Q}/opensfx/0.2.3/
+SITES.opengfx-${GFXVER}-all.zip=	${MASTER_SITES:Q}opengfx-releases/${GFXVER}/
+SITES.openmsx-${MSXVER}-all.zip=	${MASTER_SITES:Q}openmsx-releases/${MSXVER}/
+SITES.opensfx-${SFXVER}-all.zip=	${MASTER_SITES:Q}opensfx-releases/${SFXVER}/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://www.openttd.org/
@@ -27,19 +30,21 @@ USE_TOOLS+=	tar
 
 post-extract:
 	cd ${WRKDIR} && tar xvf opengfx-${GFXVER}.tar
+	cd ${WRKDIR} && tar xvf openmsx-${MSXVER}.tar
+	cd ${WRKDIR} && tar xvf opensfx-${SFXVER}.tar
 
 do-install:
 	${INSTALL_DATA} ${WRKDIR}/opengfx-${GFXVER}/*.grf \
 		${DESTDIR}${PREFIX}/share/openttd/data
 	${INSTALL_DATA} ${WRKDIR}/opengfx-${GFXVER}/*.obg \
 		${DESTDIR}${PREFIX}/share/openttd/data
-	${INSTALL_DATA} ${WRKDIR}/openmsx-0.3.1/*.mid \
+	${INSTALL_DATA} ${WRKDIR}/openmsx-${MSXVER}/*.mid \
 		${DESTDIR}${PREFIX}/share/openttd/gm
-	${INSTALL_DATA} ${WRKDIR}/openmsx-0.3.1/*.obm \
+	${INSTALL_DATA} ${WRKDIR}/openmsx-${MSXVER}/*.obm \
 		${DESTDIR}${PREFIX}/share/openttd/gm
-	${INSTALL_DATA} ${WRKDIR}/opensfx-0.2.3/*.cat \
+	${INSTALL_DATA} ${WRKDIR}/opensfx-${SFXVER}/*.cat \
 		${DESTDIR}${PREFIX}/share/openttd/data
-	${INSTALL_DATA} ${WRKDIR}/opensfx-0.2.3/*.obs \
+	${INSTALL_DATA} ${WRKDIR}/opensfx-${SFXVER}/*.obs \
 		${DESTDIR}${PREFIX}/share/openttd/data
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/openttd-data/PLIST b/games/openttd-data/PLIST
index 0ee1c4a572a..f76f155f16a 100644
--- a/games/openttd-data/PLIST
+++ b/games/openttd-data/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2010/12/08 17:49:40 adam Exp $
+@comment $NetBSD: PLIST,v 1.2 2022/05/08 12:06:34 triaxx Exp $
 share/openttd/data/ogfx1_base.grf
 share/openttd/data/ogfxc_arctic.grf
 share/openttd/data/ogfxe_extra.grf
@@ -10,7 +10,6 @@ share/openttd/data/opensfx.cat
 share/openttd/data/opensfx.obs
 share/openttd/gm/5432gone_redfarn.mid
 share/openttd/gm/be_sharp_bw_redfarn.mid
-share/openttd/gm/big_man_boogie_redfarn.mid
 share/openttd/gm/boogi_marabi_redfarn.mid
 share/openttd/gm/busy_schedule.mid
 share/openttd/gm/careless_perc_redfarn.mid
@@ -20,6 +19,7 @@ share/openttd/gm/city_blues_redfarn.mid
 share/openttd/gm/coconut_run2.mid
 share/openttd/gm/flying_scotsman.mid
 share/openttd/gm/harp_harmony.mid
+share/openttd/gm/keep_on_rolling.mid
 share/openttd/gm/linns_basket.mid
 share/openttd/gm/midnight_snow_run.mid
 share/openttd/gm/mighty_giant_run.mid
diff --git a/games/openttd-data/distinfo b/games/openttd-data/distinfo
index d46972ba05f..4a02325af91 100644
--- a/games/openttd-data/distinfo
+++ b/games/openttd-data/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.10 2021/10/26 10:44:18 nia Exp $
+$NetBSD: distinfo,v 1.11 2022/05/08 12:06:34 triaxx Exp $
 
-BLAKE2s (opengfx-0.6.0-all.zip) = fe304acd1ce97207802d76440f6acb769b4b6761ea79f88d5ebf7b4db8f9f4ef
-SHA512 (opengfx-0.6.0-all.zip) = 712812744b7d4dea4d704b179cc6d2078626f1582e73283ff8b512a1fbe46bdf4e293e8ed678965d280ad9fe3665d7cd291dc89b65212ee01451034f356f9d57
-Size (opengfx-0.6.0-all.zip) = 3551230 bytes
-BLAKE2s (openmsx-0.3.1-all.zip) = 93d80d04226d0e22109a59a5ca815c51d638aac9e0059807e238593b99232a65
-SHA512 (openmsx-0.3.1-all.zip) = d17856fc70796eadb798b133af8a987ff9887c7f0d736e48bd27e9451eb122935271779b65e098e061c1316def455f56da6caa1d448e2bf111ecf8c189d3fbc8
-Size (openmsx-0.3.1-all.zip) = 136981 bytes
-BLAKE2s (opensfx-0.2.3-all.zip) = f19230a7453c4222cc1b814df3244d495da9b197f00626fed295f3160187910d
-SHA512 (opensfx-0.2.3-all.zip) = ee4f4659201f1b6829fcea3c66416573d11e50988ef33452c2e9867bee8e68ddbf978ca805802b2b4188c624e814816300e69c8b78bb80c9604841be706c96cc
-Size (opensfx-0.2.3-all.zip) = 11359588 bytes
+BLAKE2s (opengfx-7.1-all.zip) = b8834b037ad68b89275d438f8c1da5d800daf7cf00ef8a6bb694fe6aedf8bd1c
+SHA512 (opengfx-7.1-all.zip) = 89dbb5cb45f3d720290d78904611ee3173617d97f4f49176fb10949b7d78bb0348b1aa7e12743c0cf3834b09ed73c1e161e04ae7532f2baffe4f1259bc8df04c
+Size (opengfx-7.1-all.zip) = 3547160 bytes
+BLAKE2s (openmsx-0.4.2-all.zip) = c6f1a41ec81a6b7cd013fb9a212ac40f4f47b0287a951118e30863eebbc8d3e1
+SHA512 (openmsx-0.4.2-all.zip) = 6fdcec91ffcfa68ef367ff1733011a472caeb53f26fe07623ac510db80890789475919192317e6d5cddd6f3acea5bd58d8b174c23d506efcbd868392e418ed2f
+Size (openmsx-0.4.2-all.zip) = 140204 bytes
+BLAKE2s (opensfx-1.0.3-all.zip) = a12b7ad2d9e51ce77e51f8aa425cd7c0393c47918df424071879295d5e0dfa8b
+SHA512 (opensfx-1.0.3-all.zip) = 4a3f0d19efe97729a1918101b8cb59a01a84aae43e432d697c9ca9af38296e1de0665b705dba0b3a29b8b04df6629c98eb8690534c7e70566f573ce72cab30b0
+Size (opensfx-1.0.3-all.zip) = 11566000 bytes