emulators/{catapult,openmsx}: update to 18.0

ChangeLog:
https://raw.githubusercontent.com/openMSX/openMSX/RELEASE_18_0/doc/release-notes.txt

PR:	264702
Reported by:	dmenelkir@gmail.com
MFH:	2022Q2	(bugfix release)

(cherry picked from commit 9a977dacf7c5cfb34907170d78327cc6deb41e69)

5 files changed, 56 insertions, 14 deletions

diff --git a/emulators/catapult/Makefile b/emulators/catapult/Makefile
index f08343631289..3bfcb71ae497 100644
--- a/emulators/catapult/Makefile
+++ b/emulators/catapult/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	catapult
-PORTVERSION=	17.0
-PORTREVISION=	2
+PORTVERSION=	18.0
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	https://github.com/openMSX/openMSX/releases/download/RELEASE_${PORTVERSION:S/./_/g}/
 DISTNAME=	openmsx-${PORTNAME}-${PORTVERSION}
diff --git a/emulators/catapult/distinfo b/emulators/catapult/distinfo
index a79a6e2e17fa..6eb90127e3dd 100644
--- a/emulators/catapult/distinfo
+++ b/emulators/catapult/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1629146501
-SHA256 (openmsx-catapult-17.0.tar.gz) = e8b53765292b9692e4047247ee2726236c2eab7d9a9e5338bc316542501df871
-SIZE (openmsx-catapult-17.0.tar.gz) = 1196727
+TIMESTAMP = 1655361025
+SHA256 (openmsx-catapult-18.0.tar.gz) = 2503bd761e05e5ddefc93261e091bb37a4b36228230b01d7741f16911a22c371
+SIZE (openmsx-catapult-18.0.tar.gz) = 1196649
diff --git a/emulators/openmsx/Makefile b/emulators/openmsx/Makefile
index 5d03a98c485d..d38d5421f61f 100644
--- a/emulators/openmsx/Makefile
+++ b/emulators/openmsx/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	openmsx
-DISTVERSION=	17.0
+DISTVERSION=	18.0
 CATEGORIES=	emulators
 
 MAINTAINER=	dmenelkir@gmail.com
@@ -24,9 +24,7 @@ USE_SDL=	sdl2 ttf2
 USE_GITHUB=	yes
 GH_ACCOUNT=	openMSX
 GH_PROJECT=	openMSX
-GH_TAGNAME=	RELEASE_17_0
-
-BINARY_ALIAS=	python3=${PYTHON_CMD}
+GH_TAGNAME=	RELEASE_18_0
 
 MAKEFILE=	GNUmakefile
 MAKE_ARGS=	INSTALL_BINARY_DIR=${PREFIX}/bin \
@@ -35,6 +33,8 @@ MAKE_ARGS=	INSTALL_BINARY_DIR=${PREFIX}/bin \
 		OPENMSX_CXX=${CXX} \
 		CXXFLAGS="${CXXFLAGS}"
 
+BINARY_ALIAS=	python3=${PYTHON_CMD}
+
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.mk>
diff --git a/emulators/openmsx/distinfo b/emulators/openmsx/distinfo
index aa0277a25ff6..bf491f231297 100644
--- a/emulators/openmsx/distinfo
+++ b/emulators/openmsx/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1623319557
-SHA256 (openMSX-openMSX-17.0-RELEASE_17_0_GH0.tar.gz) = 4ce06b8ad478603dc820472d82e3bcd0cb6d2a259740acfaff0af5ade6ff7087
-SIZE (openMSX-openMSX-17.0-RELEASE_17_0_GH0.tar.gz) = 5654216
+TIMESTAMP = 1655359729
+SHA256 (openMSX-openMSX-18.0-RELEASE_18_0_GH0.tar.gz) = 46af192daa55360e8ebbd260abde9973323ba7c150caa4eaa58cc9068218a903
+SIZE (openMSX-openMSX-18.0-RELEASE_18_0_GH0.tar.gz) = 5759586
diff --git a/emulators/openmsx/pkg-plist b/emulators/openmsx/pkg-plist
index d7935f097243..5937f05fc3f1 100644
--- a/emulators/openmsx/pkg-plist
+++ b/emulators/openmsx/pkg-plist
@@ -16,6 +16,7 @@ bin/openmsx
 %%PORTDOCS%%%%DOCSDIR%%/manual/user.html
 %%PORTDOCS%%%%DOCSDIR%%/release-history.txt
 %%PORTDOCS%%%%DOCSDIR%%/release-notes.txt
+%%DATADIR%%/extensions/2nd_PSG.xml
 %%DATADIR%%/extensions/ASCII_Japanese_MSX-Write.xml
 %%DATADIR%%/extensions/ASCII_Japanese_MSX-Write_II.xml
 %%DATADIR%%/extensions/ASCII_MSX-DOS2.xml
@@ -36,6 +37,7 @@ bin/openmsx
 %%DATADIR%%/extensions/Gouda_SCSI.xml
 %%DATADIR%%/extensions/Gradiente_CT-80E.xml
 %%DATADIR%%/extensions/JVC_MSX_MIDI.xml
+%%DATADIR%%/extensions/Konami_EC-701.xml
 %%DATADIR%%/extensions/Konami_EC-702.xml
 %%DATADIR%%/extensions/Konami_SD-Snatcher_Sound_Cartridge.xml
 %%DATADIR%%/extensions/Konami_Snatcher_Sound_Cartridge.xml
@@ -58,6 +60,7 @@ bin/openmsx
 %%DATADIR%%/extensions/OPL3Cartridge2_stereo.xml
 %%DATADIR%%/extensions/Panasonic_FS-CA1.xml
 %%DATADIR%%/extensions/Panasonic_FS-FD1A.xml
+%%DATADIR%%/extensions/Panasonic_FS-PW1.xml
 %%DATADIR%%/extensions/Password_Cartridge.xml
 %%DATADIR%%/extensions/Philips_NMS_1200.xml
 %%DATADIR%%/extensions/Philips_NMS_1205.xml
@@ -71,6 +74,7 @@ bin/openmsx
 %%DATADIR%%/extensions/SensorKid.xml
 %%DATADIR%%/extensions/Sharp_HB-3600.xml
 %%DATADIR%%/extensions/Sharp_HB-4000.xml
+%%DATADIR%%/extensions/Sony_HBD-20W.xml
 %%DATADIR%%/extensions/Sony_HBD-50.xml
 %%DATADIR%%/extensions/Sony_HBD-F1.xml
 %%DATADIR%%/extensions/Sony_HBI-232.xml
@@ -79,6 +83,7 @@ bin/openmsx
 %%DATADIR%%/extensions/Sony_HBK-30.xml
 %%DATADIR%%/extensions/Spectravideo_SVI-707.xml
 %%DATADIR%%/extensions/Talent_DPF-550.xml
+%%DATADIR%%/extensions/Talent_TDC-600.xml
 %%DATADIR%%/extensions/Tecall_MSX_RAMFILE_TM220.xml
 %%DATADIR%%/extensions/Toshiba_HX-F101PE.xml
 %%DATADIR%%/extensions/Toshiba_HX-MU900.xml
@@ -152,8 +157,10 @@ bin/openmsx
 %%DATADIR%%/machines/Canon_V-20.xml
 %%DATADIR%%/machines/Canon_V-20_JP.xml
 %%DATADIR%%/machines/Canon_V-25.xml
+%%DATADIR%%/machines/Canon_V-30F.xml
 %%DATADIR%%/machines/Canon_V-8.xml
 %%DATADIR%%/machines/Casio_MX-10.xml
+%%DATADIR%%/machines/Casio_MX-15.xml
 %%DATADIR%%/machines/Casio_PV-16.xml
 %%DATADIR%%/machines/Casio_PV-7.xml
 %%DATADIR%%/machines/ColecoVision.xml
@@ -166,6 +173,7 @@ bin/openmsx
 %%DATADIR%%/machines/Daewoo_DPC-100.xml
 %%DATADIR%%/machines/Daewoo_DPC-180.xml
 %%DATADIR%%/machines/Daewoo_DPC-200.xml
+%%DATADIR%%/machines/Daewoo_DPC-200_FR.xml
 %%DATADIR%%/machines/Eurohard_Dragon_MSX.xml
 %%DATADIR%%/machines/Fenner_SPC-800.xml
 %%DATADIR%%/machines/Frael_Bruc_100_1.xml
@@ -182,12 +190,15 @@ bin/openmsx
 %%DATADIR%%/machines/Hitachi_MB-H3.xml
 %%DATADIR%%/machines/Hitachi_MB-H50.xml
 %%DATADIR%%/machines/JVC_HC-7GB.xml
+%%DATADIR%%/machines/Mitsubishi_ML-8000.xml
 %%DATADIR%%/machines/Mitsubishi_ML-F110.xml
 %%DATADIR%%/machines/Mitsubishi_ML-F120.xml
 %%DATADIR%%/machines/Mitsubishi_ML-F80.xml
 %%DATADIR%%/machines/Mitsubishi_ML-FX1.xml
 %%DATADIR%%/machines/Mitsubishi_ML-G10.xml
 %%DATADIR%%/machines/Mitsubishi_ML-G1_ES.xml
+%%DATADIR%%/machines/Mitsubishi_ML-G30_model_1.xml
+%%DATADIR%%/machines/Mitsubishi_ML-G30_model_2.xml
 %%DATADIR%%/machines/Mitsubishi_ML-G3_ES.xml
 %%DATADIR%%/machines/National_CF-1200.xml
 %%DATADIR%%/machines/National_CF-2000.xml
@@ -204,6 +215,7 @@ bin/openmsx
 %%DATADIR%%/machines/National_FS-5500F2.xml
 %%DATADIR%%/machines/Olympia_PHC-2.xml
 %%DATADIR%%/machines/Panasonic_CF-2700_DE.xml
+%%DATADIR%%/machines/Panasonic_CF-2700_GB.xml
 %%DATADIR%%/machines/Panasonic_FS-A1.xml
 %%DATADIR%%/machines/Panasonic_FS-A1F.xml
 %%DATADIR%%/machines/Panasonic_FS-A1FM.xml
@@ -216,6 +228,7 @@ bin/openmsx
 %%DATADIR%%/machines/Philips_NMS_801.xml
 %%DATADIR%%/machines/Philips_NMS_8220.xml
 %%DATADIR%%/machines/Philips_NMS_8245.xml
+%%DATADIR%%/machines/Philips_NMS_8250-16.xml
 %%DATADIR%%/machines/Philips_NMS_8250-19.xml
 %%DATADIR%%/machines/Philips_NMS_8250.xml
 %%DATADIR%%/machines/Philips_NMS_8255.xml
@@ -226,7 +239,9 @@ bin/openmsx
 %%DATADIR%%/machines/Philips_VG_8020.xml
 %%DATADIR%%/machines/Philips_VG_8020F.xml
 %%DATADIR%%/machines/Philips_VG_8230.xml
-%%DATADIR%%/machines/Philips_VG_8235.xml
+%%DATADIR%%/machines/Philips_VG_8235-00.xml
+%%DATADIR%%/machines/Philips_VG_8235-20.xml
+%%DATADIR%%/machines/Philips_VG_8235-39.xml
 %%DATADIR%%/machines/Pioneer_PX-7.xml
 %%DATADIR%%/machines/Pioneer_PX-7UK.xml
 %%DATADIR%%/machines/Pioneer_PX-V60.xml
@@ -236,6 +251,7 @@ bin/openmsx
 %%DATADIR%%/machines/Sanyo_MPC-100.xml
 %%DATADIR%%/machines/Sanyo_MPC-2.xml
 %%DATADIR%%/machines/Sanyo_MPC-25FD.xml
+%%DATADIR%%/machines/Sanyo_MPC-25FS.xml
 %%DATADIR%%/machines/Sanyo_MPC-3.xml
 %%DATADIR%%/machines/Sanyo_MPC-6.xml
 %%DATADIR%%/machines/Sanyo_PHC-23.xml
@@ -251,6 +267,7 @@ bin/openmsx
 %%DATADIR%%/machines/Sanyo_PHC-70FD2.xml
 %%DATADIR%%/machines/Sanyo_PHC-77.xml
 %%DATADIR%%/machines/Sanyo_PHC-SPC.xml
+%%DATADIR%%/machines/Sega_SG-1000.xml
 %%DATADIR%%/machines/Sharp_HB-8000_1.1.xml
 %%DATADIR%%/machines/Sharp_HB-8000_1.2.xml
 %%DATADIR%%/machines/Sony_HB-10.xml
@@ -269,6 +286,7 @@ bin/openmsx
 %%DATADIR%%/machines/Sony_HB-F1II.xml
 %%DATADIR%%/machines/Sony_HB-F1XD.xml
 %%DATADIR%%/machines/Sony_HB-F1XDJ.xml
+%%DATADIR%%/machines/Sony_HB-F1XDmk2.xml
 %%DATADIR%%/machines/Sony_HB-F1XV.xml
 %%DATADIR%%/machines/Sony_HB-F5.xml
 %%DATADIR%%/machines/Sony_HB-F500.xml
@@ -277,6 +295,7 @@ bin/openmsx
 %%DATADIR%%/machines/Sony_HB-F700D.xml
 %%DATADIR%%/machines/Sony_HB-F700F.xml
 %%DATADIR%%/machines/Sony_HB-F700P.xml
+%%DATADIR%%/machines/Sony_HB-F700S.xml
 %%DATADIR%%/machines/Sony_HB-F900.xml
 %%DATADIR%%/machines/Sony_HB-F9P.xml
 %%DATADIR%%/machines/Sony_HB-F9P_Russian.xml
@@ -289,7 +308,9 @@ bin/openmsx
 %%DATADIR%%/machines/Spectravideo_SVI-328_superexpanded.xml
 %%DATADIR%%/machines/Spectravideo_SVI-728.xml
 %%DATADIR%%/machines/Spectravideo_SVI-728_ES.xml
+%%DATADIR%%/machines/Spectravideo_SVI-728_SE.xml
 %%DATADIR%%/machines/Spectravideo_SVI-738.xml
+%%DATADIR%%/machines/Spectravideo_SVI-738_SE.xml
 %%DATADIR%%/machines/Talent_DPC-200.xml
 %%DATADIR%%/machines/Talent_TPC-310.xml
 %%DATADIR%%/machines/Toshiba_FS-TM1.xml
@@ -310,6 +331,7 @@ bin/openmsx
 %%DATADIR%%/machines/Victor_HC-95A.xml
 %%DATADIR%%/machines/WIP_Mitsubishi_ML-TS2.xml
 %%DATADIR%%/machines/Yamaha_AX150.xml
+%%DATADIR%%/machines/Yamaha_AX200.xml
 %%DATADIR%%/machines/Yamaha_AX350II.xml
 %%DATADIR%%/machines/Yamaha_AX350IIF.xml
 %%DATADIR%%/machines/Yamaha_AX500.xml
@@ -396,6 +418,7 @@ bin/openmsx
 %%DATADIR%%/scripts/_psg_log.tcl
 %%DATADIR%%/scripts/_psg_profile.tcl
 %%DATADIR%%/scripts/_quitmenu.tcl
+%%DATADIR%%/scripts/_raster_view.tcl
 %%DATADIR%%/scripts/_record_channels.tcl
 %%DATADIR%%/scripts/_record_chunks.tcl
 %%DATADIR%%/scripts/_reg_log.tcl
@@ -656,9 +679,25 @@ bin/openmsx
 %%DATADIR%%/systemroms/cbios-old/e8ab07d341539c40bd97666fad63e7bda8961eff.cbios_main_msx2_jp.rom.gz
 %%DATADIR%%/systemroms/cbios-old/ea405e0937035271528df13f6bf4a893ace8c644.cbios_logo_msx2+.rom.gz
 %%DATADIR%%/systemroms/cbios-old/f41b26357bac1b75a3cfba933763764187b365f0.cbios_main_msx1.rom.gz
+%%DATADIR%%/unicodemaps/character_set_mappings/MSXVID.TXT
+%%DATADIR%%/unicodemaps/character_set_mappings/MSXVIDAE.TXT
+%%DATADIR%%/unicodemaps/character_set_mappings/MSXVIDAR.TXT
+%%DATADIR%%/unicodemaps/character_set_mappings/MSXVIDBG.TXT
+%%DATADIR%%/unicodemaps/character_set_mappings/MSXVIDBH.TXT
+%%DATADIR%%/unicodemaps/character_set_mappings/MSXVIDBR.TXT
+%%DATADIR%%/unicodemaps/character_set_mappings/MSXVIDJP.TXT
+%%DATADIR%%/unicodemaps/character_set_mappings/MSXVIDKR.TXT
+%%DATADIR%%/unicodemaps/character_set_mappings/MSXVIDRU.TXT
+%%DATADIR%%/unicodemaps/character_set_mappings/ReadMe.txt
+%%DATADIR%%/unicodemaps/character_set_mappings/SVI328.TXT
+%%DATADIR%%/unicodemaps/character_set_mappings/readme.openMSX
+%%DATADIR%%/unicodemaps/unicodemap.ar
+%%DATADIR%%/unicodemaps/unicodemap.ar_eu
+%%DATADIR%%/unicodemaps/unicodemap.ar_fr
 %%DATADIR%%/unicodemaps/unicodemap.br_gradiente_1_0
 %%DATADIR%%/unicodemaps/unicodemap.br_gradiente_1_1
-%%DATADIR%%/unicodemaps/unicodemap.br_hotbit
+%%DATADIR%%/unicodemaps/unicodemap.br_hotbit_1_1
+%%DATADIR%%/unicodemaps/unicodemap.br_hotbit_1_2
 %%DATADIR%%/unicodemaps/unicodemap.cvjoy
 %%DATADIR%%/unicodemaps/unicodemap.de
 %%DATADIR%%/unicodemaps/unicodemap.es
@@ -671,4 +710,7 @@ bin/openmsx
 %%DATADIR%%/unicodemaps/unicodemap.proto_fr
 %%DATADIR%%/unicodemaps/unicodemap.proto_int
 %%DATADIR%%/unicodemaps/unicodemap.ru
+%%DATADIR%%/unicodemaps/unicodemap.se
+%%DATADIR%%/unicodemaps/unicodemap.sega_int
+%%DATADIR%%/unicodemaps/unicodemap.sega_jp
 %%DATADIR%%/unicodemaps/unicodemap.svi