emulators/{mame,mess}: update to 0.226 and use Python 3.7 to build

This commit is earlier than the maintainer timeout but saves the port from being removed because Python 2.7 expires today. PR: 252158 Submitted by: sdalu@sdalu.com
svn path=/head/; revision=559715
2020-12-31 10:11:34 +00:00 · 2020-12-31 10:11:34 +00:00 · c29236271b · 2021-03-31 03:12:20 +00:00
commit c29236271b
parent c5eaf1b6b1
6 changed files with 163 additions and 182 deletions
--- a/emulators/mame/Makefile
+++ b/emulators/mame/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME?=	mame
-PORTVERSION=	0.223
+PORTVERSION=	0.226
 CATEGORIES=	emulators

 MAINTAINER=	manu@FreeBSD.org
@ -21,7 +21,7 @@ LIB_DEPENDS=	libFLAC.so:audio/flac \
 RUN_DEPENDS=	liberation-fonts-ttf>=0:x11-fonts/liberation-fonts-ttf

 USES=		compiler:c++14-lang gl gmake jpeg localbase pkgconfig \
-		python:2.7,build qt:5 sdl shebangfix xorg
+		python:3.7,build qt:5 sdl shebangfix xorg

 USE_GITHUB=	yes
 GH_ACCOUNT=	mamedev
--- a/emulators/mame/distinfo
+++ b/emulators/mame/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1596806121
-SHA256 (mamedev-mame-0.223-mame0223_GH0.tar.gz) = d94685aabe28e9bb2374162e3ca070949b67e3e97cc50eb25558baed5b8d3591
-SIZE (mamedev-mame-0.223-mame0223_GH0.tar.gz) = 195055583
+TIMESTAMP = 1608936229
+SHA256 (mamedev-mame-0.226-mame0226_GH0.tar.gz) = 7c4c9ec232ba988e65fd29665c9b8e40b5ac3aa9f561eeb107cebbf08ba94baf
+SIZE (mamedev-mame-0.226-mame0226_GH0.tar.gz) = 196379874
--- a/emulators/mame/files/patch-makefile
+++ b/emulators/mame/files/patch-makefile
@ -1,30 +1,6 @@
--- makefile.orig	2019-06-26 10:25:30 UTC
-+++ makefile
-@@ -195,19 +195,19 @@ GENIEOS := solaris
- endif
- ifeq ($(firstword $(filter FreeBSD,$(UNAME))),FreeBSD)
- OS := freebsd
-GENIEOS := freebsd
-+GENIEOS := bsd
- endif
- ifeq ($(firstword $(filter GNU/kFreeBSD,$(UNAME))),GNU/kFreeBSD)
- OS := freebsd
-GENIEOS := freebsd
-+GENIEOS := bsd
- endif
- ifeq ($(firstword $(filter NetBSD,$(UNAME))),NetBSD)
- OS := netbsd
-GENIEOS := freebsd
-+GENIEOS := bsd
- endif
- ifeq ($(firstword $(filter OpenBSD,$(UNAME))),OpenBSD)
- OS := openbsd
-GENIEOS := freebsd
-+GENIEOS := bsd
- endif
- ifeq ($(firstword $(filter Darwin,$(UNAME))),Darwin)
- OS := macosx
-@@ -396,13 +396,13 @@ endif
+--- makefile.orig	2020-10-27 02:00:36.000000000 +0100
+++ makefile	2020-12-26 00:03:58.094364000 +0100
+@@ -419,15 +419,15 @@
 endif # BIGENDIAN
 
 ifndef PYTHON_EXECUTABLE
@ -34,16 +10,18 @@
 -PYTHON := $(PYTHON_EXECUTABLE)
 +#PYTHON := $(PYTHON_EXECUTABLE)
 endif
+ 
+ ifneq ($(TARGETOS),asmjs)
 -CC := $(SILENT)gcc
 -LD := $(SILENT)g++
 -CXX:= $(SILENT)g++
 +#CC := $(SILENT)gcc
 +#LD := $(SILENT)g++
 +#CXX:= $(SILENT)g++
+ endif
 
 #-------------------------------------------------
- # specify OSD layer: windows, sdl, etc.
-@@ -532,19 +532,19 @@ endif
+@@ -558,19 +558,19 @@
 ifdef OVERRIDE_CC
 PARAMS += --CC='$(OVERRIDE_CC)'
 ifndef CROSS_BUILD
--- a/emulators/mame/files/patch-src_osd_modules_file_posixptty.cpp
+++ b/emulators/mame/files/patch-src_osd_modules_file_posixptty.cpp
@ -1,11 +0,0 @@
--- src/osd/modules/file/posixptty.cpp.orig	2019-04-24 05:00:38 UTC
-+++ src/osd/modules/file/posixptty.cpp
-@@ -19,7 +19,7 @@
- #include <unistd.h>
- #include <stdlib.h>
- 
-#if defined(__FreeBSD_kernel__) || defined(__DragonFly__)
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
- #include <termios.h>
- #include <libutil.h>
- #elif defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__)
--- a/emulators/mame/pkg-plist
+++ b/emulators/mame/pkg-plist
@ -5,70 +5,69 @@ libexec/mame/ldresample
 libexec/mame/ldverify
 libexec/mame/romcmp
 libexec/mame/unidasm
-%%DATADIR%%/artwork/shadow-mask.png
-%%DATADIR%%/artwork/aperture2x4rb.png
-%%DATADIR%%/artwork/README.md
-%%DATADIR%%/artwork/bgfx/border_blur/default.lay
-%%DATADIR%%/artwork/bgfx/chains/hq3x.png
-%%DATADIR%%/artwork/bgfx/chains/crt-geom/slot_2_5x4_bgr.png
-%%DATADIR%%/artwork/bgfx/chains/crt-geom/delta_1_4x1_rgb.png
-%%DATADIR%%/artwork/bgfx/chains/crt-geom/delta_1_2x1_bgr.png
-%%DATADIR%%/artwork/bgfx/chains/crt-geom/none.png
-%%DATADIR%%/artwork/bgfx/chains/crt-geom/slot_3_7x6_rgb.png
-%%DATADIR%%/artwork/bgfx/chains/crt-geom/slot_2_4x4_rgb.png
-%%DATADIR%%/artwork/bgfx/chains/crt-geom/aperture_1_2_bgr.png
-%%DATADIR%%/artwork/bgfx/chains/crt-geom/aperture_3_6_rgb.png
-%%DATADIR%%/artwork/bgfx/chains/crt-geom/delta_2_4x2_rgb.png
-%%DATADIR%%/artwork/bgfx/chains/crt-geom/aperture_2_4_rgb.png
-%%DATADIR%%/artwork/bgfx/chains/crt-geom/aperture_1_4_rgb.png
-%%DATADIR%%/artwork/bgfx/chains/crt-geom/delta_2_4x1_rgb.png
-%%DATADIR%%/artwork/bgfx/chains/crt-geom/aperture_2_5_bgr.png
-%%DATADIR%%/artwork/bgfx/chains/hq2x.png
-%%DATADIR%%/artwork/bgfx/chains/hq4x.png
-%%DATADIR%%/artwork/monochrome-matrix.png
-%%DATADIR%%/artwork/aperture1x3rb.png
-%%DATADIR%%/artwork/aperture4x6.png
-%%DATADIR%%/artwork/LICENSE
-%%DATADIR%%/artwork/aperture1x2rb.png
-%%DATADIR%%/artwork/dir.txt
-%%DATADIR%%/artwork/monochrome-chessboard.png
-%%DATADIR%%/artwork/scanlines.png
-%%DATADIR%%/artwork/chess/README.md
-%%DATADIR%%/artwork/chess/bn.png
-%%DATADIR%%/artwork/chess/br.png
-%%DATADIR%%/artwork/chess/wn.png
-%%DATADIR%%/artwork/chess/wr.png
-%%DATADIR%%/artwork/chess/wq.png
-%%DATADIR%%/artwork/chess/bq.png
-%%DATADIR%%/artwork/chess/wp.png
-%%DATADIR%%/artwork/chess/wk.png
-%%DATADIR%%/artwork/chess/wb.png
-%%DATADIR%%/artwork/chess/bp.png
-%%DATADIR%%/artwork/chess/bk.png
-%%DATADIR%%/artwork/chess/bb.png
-%%DATADIR%%/artwork/slot-mask.png
 %%DATADIR%%/artwork/aperture-grille.png
-%%DATADIR%%/artwork/white.png
-%%DATADIR%%/artwork/slot-mask-aligned.png
 %%DATADIR%%/artwork/aperture.png
+%%DATADIR%%/artwork/aperture1x2rb.png
+%%DATADIR%%/artwork/aperture1x3rb.png
 %%DATADIR%%/artwork/aperture2x4bg.png
+%%DATADIR%%/artwork/aperture2x4rb.png
+%%DATADIR%%/artwork/aperture4x6.png
+%%DATADIR%%/artwork/bgfx/border_blur/default.lay
+%%DATADIR%%/artwork/bgfx/chains/crt-geom/aperture_1_2_bgr.png
+%%DATADIR%%/artwork/bgfx/chains/crt-geom/aperture_1_4_rgb.png
+%%DATADIR%%/artwork/bgfx/chains/crt-geom/aperture_2_4_rgb.png
+%%DATADIR%%/artwork/bgfx/chains/crt-geom/aperture_2_5_bgr.png
+%%DATADIR%%/artwork/bgfx/chains/crt-geom/aperture_3_6_rgb.png
+%%DATADIR%%/artwork/bgfx/chains/crt-geom/delta_1_2x1_bgr.png
+%%DATADIR%%/artwork/bgfx/chains/crt-geom/delta_1_4x1_rgb.png
+%%DATADIR%%/artwork/bgfx/chains/crt-geom/delta_2_4x1_rgb.png
+%%DATADIR%%/artwork/bgfx/chains/crt-geom/delta_2_4x2_rgb.png
+%%DATADIR%%/artwork/bgfx/chains/crt-geom/none.png
+%%DATADIR%%/artwork/bgfx/chains/crt-geom/slot_2_4x4_rgb.png
+%%DATADIR%%/artwork/bgfx/chains/crt-geom/slot_2_5x4_bgr.png
+%%DATADIR%%/artwork/bgfx/chains/crt-geom/slot_3_7x6_rgb.png
+%%DATADIR%%/artwork/bgfx/chains/hq2x.png
+%%DATADIR%%/artwork/bgfx/chains/hq3x.png
+%%DATADIR%%/artwork/bgfx/chains/hq4x.png
+%%DATADIR%%/artwork/chess/bb.png
+%%DATADIR%%/artwork/chess/bk.png
+%%DATADIR%%/artwork/chess/bn.png
+%%DATADIR%%/artwork/chess/bp.png
+%%DATADIR%%/artwork/chess/bq.png
+%%DATADIR%%/artwork/chess/br.png
+%%DATADIR%%/artwork/chess/README.md
+%%DATADIR%%/artwork/chess/wb.png
+%%DATADIR%%/artwork/chess/wk.png
+%%DATADIR%%/artwork/chess/wn.png
+%%DATADIR%%/artwork/chess/wp.png
+%%DATADIR%%/artwork/chess/wq.png
+%%DATADIR%%/artwork/chess/wr.png
+%%DATADIR%%/artwork/dir.txt
+%%DATADIR%%/artwork/LICENSE
+%%DATADIR%%/artwork/monochrome-chessboard.png
+%%DATADIR%%/artwork/monochrome-matrix.png
+%%DATADIR%%/artwork/README.md
+%%DATADIR%%/artwork/scanlines.png
+%%DATADIR%%/artwork/shadow-mask.png
+%%DATADIR%%/artwork/slot-mask-aligned.png
+%%DATADIR%%/artwork/slot-mask.png
+%%DATADIR%%/artwork/white.png
 %%DATADIR%%/hash/32x.xml
 %%DATADIR%%/hash/3do_m2.xml
-%%DATADIR%%/hash/README.md
-%%DATADIR%%/hash/a2600.xml
 %%DATADIR%%/hash/a2600_cass.xml
+%%DATADIR%%/hash/a2600.xml
 %%DATADIR%%/hash/a5200.hsi
 %%DATADIR%%/hash/a5200.xml
 %%DATADIR%%/hash/a7800.xml
-%%DATADIR%%/hash/a800.xml
 %%DATADIR%%/hash/a800_cass.xml
 %%DATADIR%%/hash/a800_flop.xml
+%%DATADIR%%/hash/a800.xml
 %%DATADIR%%/hash/abc1600.xml
-%%DATADIR%%/hash/abc800.xml
-%%DATADIR%%/hash/abc800_hdd.xml
-%%DATADIR%%/hash/abc806.xml
 %%DATADIR%%/hash/abc80_cass.xml
 %%DATADIR%%/hash/abc80_flop.xml
+%%DATADIR%%/hash/abc800_hdd.xml
+%%DATADIR%%/hash/abc800.xml
+%%DATADIR%%/hash/abc806.xml
 %%DATADIR%%/hash/acrnsys_flop.xml
 %%DATADIR%%/hash/acrnsys_rom.xml
 %%DATADIR%%/hash/adam_cart.xml
@ -108,7 +107,8 @@ libexec/mame/unidasm
 %%DATADIR%%/hash/apple3.xml
 %%DATADIR%%/hash/applix_flop.xml
 %%DATADIR%%/hash/apricot_flop.xml
-%%DATADIR%%/hash/aquarius.xml
+%%DATADIR%%/hash/aquarius_cart.xml
+%%DATADIR%%/hash/aquarius_cass.xml
 %%DATADIR%%/hash/arb.xml
 %%DATADIR%%/hash/arcadia.xml
 %%DATADIR%%/hash/archimedes.xml
@ -125,13 +125,14 @@ libexec/mame/unidasm
 %%DATADIR%%/hash/bbc_flop_68000.xml
 %%DATADIR%%/hash/bbc_flop_80186.xml
 %%DATADIR%%/hash/bbc_flop_arm.xml
+%%DATADIR%%/hash/bbc_flop_hybrid.xml
 %%DATADIR%%/hash/bbc_flop_torch.xml
 %%DATADIR%%/hash/bbc_flop_z80.xml
 %%DATADIR%%/hash/bbc_hdd.xml
 %%DATADIR%%/hash/bbc_rom.xml
-%%DATADIR%%/hash/bbcb_flop.xml
 %%DATADIR%%/hash/bbcb_flop_orig.xml
 %%DATADIR%%/hash/bbcb_flop_us.xml
+%%DATADIR%%/hash/bbcb_flop.xml
 %%DATADIR%%/hash/bbcbc.xml
 %%DATADIR%%/hash/bbcm_cart.xml
 %%DATADIR%%/hash/bbcm_flop.xml
@ -152,7 +153,6 @@ libexec/mame/unidasm
 %%DATADIR%%/hash/c2color_cart.xml
 %%DATADIR%%/hash/c64_cart.xml
 %%DATADIR%%/hash/c64_cass.xml
-%%DATADIR%%/hash/c64_flop_clcracked.xml
 %%DATADIR%%/hash/c64_flop_misc.xml
 %%DATADIR%%/hash/c64_flop_orig.xml
 %%DATADIR%%/hash/c65_flop.xml
@ -174,6 +174,7 @@ libexec/mame/unidasm
 %%DATADIR%%/hash/channelf.xml
 %%DATADIR%%/hash/chessmstdm.xml
 %%DATADIR%%/hash/clickstart_cart.xml
+%%DATADIR%%/hash/clipper_flop.xml
 %%DATADIR%%/hash/coco_cart.xml
 %%DATADIR%%/hash/coco_flop.xml
 %%DATADIR%%/hash/coleco.xml
@ -203,7 +204,6 @@ libexec/mame/unidasm
 %%DATADIR%%/hash/e01_flop.xml
 %%DATADIR%%/hash/ec1841.xml
 %%DATADIR%%/hash/einstein.xml
-%%DATADIR%%/hash/ekara_japan.xml
 %%DATADIR%%/hash/ekara_japan_a.xml
 %%DATADIR%%/hash/ekara_japan_ac.xml
 %%DATADIR%%/hash/ekara_japan_bh.xml
@ -216,6 +216,7 @@ libexec/mame/unidasm
 %%DATADIR%%/hash/ekara_japan_s.xml
 %%DATADIR%%/hash/ekara_japan_sp.xml
 %%DATADIR%%/hash/ekara_japan_web.xml
+%%DATADIR%%/hash/ekara_japan.xml
 %%DATADIR%%/hash/ekara_pal.xml
 %%DATADIR%%/hash/ekara_us.xml
 %%DATADIR%%/hash/electron_cart.xml
@ -237,12 +238,11 @@ libexec/mame/unidasm
 %%DATADIR%%/hash/fidel_msc.xml
 %%DATADIR%%/hash/fidel_sc6.xml
 %%DATADIR%%/hash/fidel_scc.xml
-%%DATADIR%%/hash/fm77av.xml
 %%DATADIR%%/hash/fm7_cass.xml
 %%DATADIR%%/hash/fm7_disk.xml
+%%DATADIR%%/hash/fm77av.xml
 %%DATADIR%%/hash/fmtowns_cd.xml
 %%DATADIR%%/hash/fmtowns_flop.xml
-%%DATADIR%%/hash/g7400.xml
 %%DATADIR%%/hash/galaxy.xml
 %%DATADIR%%/hash/gamate.xml
 %%DATADIR%%/hash/gameboy.xml
@ -251,8 +251,8 @@ libexec/mame/unidasm
 %%DATADIR%%/hash/gameking.xml
 %%DATADIR%%/hash/gameking3.xml
 %%DATADIR%%/hash/gamepock.xml
-%%DATADIR%%/hash/gba.xml
 %%DATADIR%%/hash/gba_ereader.xml
+%%DATADIR%%/hash/gba.xml
 %%DATADIR%%/hash/gbcolor.xml
 %%DATADIR%%/hash/gcslottv.xml
 %%DATADIR%%/hash/ggm.xml
@ -273,24 +273,28 @@ libexec/mame/unidasm
 %%DATADIR%%/hash/gx4000.xml
 %%DATADIR%%/hash/h21.xml
 %%DATADIR%%/hash/horizon.xml
+%%DATADIR%%/hash/hp_ipc.xml
 %%DATADIR%%/hash/hp85_rom.xml
 %%DATADIR%%/hash/hp86_rom.xml
 %%DATADIR%%/hash/hp9825b_rom.xml
 %%DATADIR%%/hash/hp9835a_rom.xml
 %%DATADIR%%/hash/hp9845a_rom.xml
 %%DATADIR%%/hash/hp9845b_rom.xml
+%%DATADIR%%/hash/hp9k3xx_cdrom.xml
 %%DATADIR%%/hash/hp9k3xx_flop.xml
-%%DATADIR%%/hash/hp_ipc.xml
+%%DATADIR%%/hash/hp9k3xx_hdd.xml
 %%DATADIR%%/hash/ht68k.xml
 %%DATADIR%%/hash/hx20_rom.xml
-%%DATADIR%%/hash/hyperscan.xml
 %%DATADIR%%/hash/hyperscan_card.xml
+%%DATADIR%%/hash/hyperscan.xml
 %%DATADIR%%/hash/i7000_card.xml
 %%DATADIR%%/hash/ibm5140.xml
-%%DATADIR%%/hash/ibm5150.xml
 %%DATADIR%%/hash/ibm5150_cass.xml
-%%DATADIR%%/hash/ibm5170.xml
+%%DATADIR%%/hash/ibm5150_hdd.xml
+%%DATADIR%%/hash/ibm5150.xml
 %%DATADIR%%/hash/ibm5170_cdrom.xml
+%%DATADIR%%/hash/ibm5170_hdd.xml
+%%DATADIR%%/hash/ibm5170.xml
 %%DATADIR%%/hash/ibm6580.xml
 %%DATADIR%%/hash/ibmpcjr_cart.xml
 %%DATADIR%%/hash/ibmpcjr_flop.xml
@ -323,7 +327,7 @@ libexec/mame/unidasm
 %%DATADIR%%/hash/jupace_cass.xml
 %%DATADIR%%/hash/jupace_snap.xml
 %%DATADIR%%/hash/k28m2.xml
-%%DATADIR%%/hash/kayproii.xml
+%%DATADIR%%/hash/kaypro.xml
 %%DATADIR%%/hash/kc_cart.xml
 %%DATADIR%%/hash/kc_cass.xml
 %%DATADIR%%/hash/kc_flop.xml
@ -331,6 +335,7 @@ libexec/mame/unidasm
 %%DATADIR%%/hash/korvet_flop.xml
 %%DATADIR%%/hash/lantutor.xml
 %%DATADIR%%/hash/laser2001_cart.xml
+%%DATADIR%%/hash/laser2001_flop.xml
 %%DATADIR%%/hash/leapfrog_didj_cart.xml
 %%DATADIR%%/hash/leapfrog_leappad_cart.xml
 %%DATADIR%%/hash/leapfrog_ltleappad_cart.xml
@ -387,10 +392,10 @@ libexec/mame/unidasm
 %%DATADIR%%/hash/msx1_cart.xml
 %%DATADIR%%/hash/msx1_cass.xml
 %%DATADIR%%/hash/msx1_flop.xml
-%%DATADIR%%/hash/msx2.hsi
 %%DATADIR%%/hash/msx2_cart.xml
 %%DATADIR%%/hash/msx2_cass.xml
 %%DATADIR%%/hash/msx2_flop.xml
+%%DATADIR%%/hash/msx2.hsi
 %%DATADIR%%/hash/msx2p_flop.xml
 %%DATADIR%%/hash/msxr_flop.xml
 %%DATADIR%%/hash/mt65_cass.xml
@ -414,12 +419,12 @@ libexec/mame/unidasm
 %%DATADIR%%/hash/nascom_socket.xml
 %%DATADIR%%/hash/neocd.xml
 %%DATADIR%%/hash/neogeo.xml
-%%DATADIR%%/hash/nes.hsi
-%%DATADIR%%/hash/nes.xml
 %%DATADIR%%/hash/nes_ade.xml
 %%DATADIR%%/hash/nes_datach.xml
 %%DATADIR%%/hash/nes_kstudio.xml
 %%DATADIR%%/hash/nes_ntbrom.xml
+%%DATADIR%%/hash/nes.hsi
+%%DATADIR%%/hash/nes.xml
 %%DATADIR%%/hash/next.xml
 %%DATADIR%%/hash/ngp.xml
 %%DATADIR%%/hash/ngpc.xml
@ -427,7 +432,6 @@ libexec/mame/unidasm
 %%DATADIR%%/hash/novag_ssensor4.xml
 %%DATADIR%%/hash/nuon.xml
 %%DATADIR%%/hash/octopus.xml
-%%DATADIR%%/hash/odyssey2.xml
 %%DATADIR%%/hash/ondra.xml
 %%DATADIR%%/hash/orao.xml
 %%DATADIR%%/hash/orion_cart.xml
@ -451,11 +455,11 @@ libexec/mame/unidasm
 %%DATADIR%%/hash/pc8801_cass.xml
 %%DATADIR%%/hash/pc8801_flop.xml
 %%DATADIR%%/hash/pc88va.xml
-%%DATADIR%%/hash/pc98.xml
 %%DATADIR%%/hash/pc98_cd.xml
+%%DATADIR%%/hash/pc98.xml
 %%DATADIR%%/hash/pcd_flop.xml
-%%DATADIR%%/hash/pce.xml
 %%DATADIR%%/hash/pce_tourvision.xml
+%%DATADIR%%/hash/pce.xml
 %%DATADIR%%/hash/pcecd.xml
 %%DATADIR%%/hash/pcfx.xml
 %%DATADIR%%/hash/pcw.xml
@ -475,8 +479,8 @@ libexec/mame/unidasm
 %%DATADIR%%/hash/pi_storyreader_v2_cart.xml
 %%DATADIR%%/hash/picno.xml
 %%DATADIR%%/hash/pico.xml
-%%DATADIR%%/hash/pippin.xml
 %%DATADIR%%/hash/pippin_flop.xml
+%%DATADIR%%/hash/pippin.xml
 %%DATADIR%%/hash/plus4_cart.xml
 %%DATADIR%%/hash/plus4_cass.xml
 %%DATADIR%%/hash/plus4_flop.xml
@ -513,6 +517,7 @@ libexec/mame/unidasm
 %%DATADIR%%/hash/radio86_cart.xml
 %%DATADIR%%/hash/radio86_cass.xml
 %%DATADIR%%/hash/rainbow.xml
+%%DATADIR%%/hash/README.md
 %%DATADIR%%/hash/rwtrntcs.xml
 %%DATADIR%%/hash/rx78.xml
 %%DATADIR%%/hash/sage2.xml
@ -534,17 +539,17 @@ libexec/mame/unidasm
 %%DATADIR%%/hash/segacd.xml
 %%DATADIR%%/hash/sf7000.xml
 %%DATADIR%%/hash/sg1000.xml
-%%DATADIR%%/hash/sgi_mips.xml
 %%DATADIR%%/hash/sgi_mips_hdd.xml
+%%DATADIR%%/hash/sgi_mips.xml
 %%DATADIR%%/hash/sgx.xml
 %%DATADIR%%/hash/sitcom.xml
 %%DATADIR%%/hash/smarttv_cart.xml
 %%DATADIR%%/hash/smc777.xml
 %%DATADIR%%/hash/sms.xml
-%%DATADIR%%/hash/snes.xml
 %%DATADIR%%/hash/snes_bspack.xml
 %%DATADIR%%/hash/snes_strom.xml
 %%DATADIR%%/hash/snes_vkun.xml
+%%DATADIR%%/hash/snes.xml
 %%DATADIR%%/hash/snotec.xml
 %%DATADIR%%/hash/snread.xml
 %%DATADIR%%/hash/snspell.xml
@ -568,6 +573,7 @@ libexec/mame/unidasm
 %%DATADIR%%/hash/spectrum_microdrive.xml
 %%DATADIR%%/hash/spectrum_wafadrive.xml
 %%DATADIR%%/hash/squale_cart.xml
+%%DATADIR%%/hash/ssem_quik.xml
 %%DATADIR%%/hash/st_cart.xml
 %%DATADIR%%/hash/st_flop.xml
 %%DATADIR%%/hash/stepone_flop.xml
@ -600,14 +606,14 @@ libexec/mame/unidasm
 %%DATADIR%%/hash/timex_cass.xml
 %%DATADIR%%/hash/timex_dock.xml
 %%DATADIR%%/hash/tntell.xml
-%%DATADIR%%/hash/to770_cart.xml
-%%DATADIR%%/hash/to770a_cart.xml
+%%DATADIR%%/hash/to_flop.xml
 %%DATADIR%%/hash/to7_cart.xml
 %%DATADIR%%/hash/to7_cass.xml
 %%DATADIR%%/hash/to7_qd.xml
+%%DATADIR%%/hash/to770_cart.xml
+%%DATADIR%%/hash/to770a_cart.xml
 %%DATADIR%%/hash/to8_cass.xml
 %%DATADIR%%/hash/to8_qd.xml
-%%DATADIR%%/hash/to_flop.xml
 %%DATADIR%%/hash/trs80m2.xml
 %%DATADIR%%/hash/trsm100.xml
 %%DATADIR%%/hash/tutor.xml
@ -634,6 +640,7 @@ libexec/mame/unidasm
 %%DATADIR%%/hash/vic1001_flop.xml
 %%DATADIR%%/hash/victor9k_flop.xml
 %%DATADIR%%/hash/vidbrain.xml
+%%DATADIR%%/hash/videopac.xml
 %%DATADIR%%/hash/vii.xml
 %%DATADIR%%/hash/vip.xml
 %%DATADIR%%/hash/visicom.xml
--- a/emulators/mess/pkg-plist
+++ b/emulators/mess/pkg-plist
@ -14,70 +14,69 @@ libexec/mess/romcmp
 libexec/mess/split
 libexec/mess/srcclean
 libexec/mess/unidasm
-%%DATADIR%%/artwork/aperture4x6.png
-%%DATADIR%%/artwork/aperture2x4rb.png
-%%DATADIR%%/artwork/scanlines.png
+%%DATADIR%%/artwork/aperture-grille.png
 %%DATADIR%%/artwork/aperture.png
-%%DATADIR%%/artwork/slot-mask.png
-%%DATADIR%%/artwork/shadow-mask.png
-%%DATADIR%%/artwork/monochrome-chessboard.png
-%%DATADIR%%/artwork/aperture1x3rb.png
-%%DATADIR%%/artwork/LICENSE
-%%DATADIR%%/artwork/slot-mask-aligned.png
 %%DATADIR%%/artwork/aperture1x2rb.png
-%%DATADIR%%/artwork/bgfx/chains/hq3x.png
-%%DATADIR%%/artwork/bgfx/chains/crt-geom/aperture_2_5_bgr.png
-%%DATADIR%%/artwork/bgfx/chains/crt-geom/aperture_2_4_rgb.png
+%%DATADIR%%/artwork/aperture1x3rb.png
+%%DATADIR%%/artwork/aperture2x4bg.png
+%%DATADIR%%/artwork/aperture2x4rb.png
+%%DATADIR%%/artwork/aperture4x6.png
+%%DATADIR%%/artwork/bgfx/border_blur/default.lay
+%%DATADIR%%/artwork/bgfx/chains/crt-geom/aperture_1_2_bgr.png
 %%DATADIR%%/artwork/bgfx/chains/crt-geom/aperture_1_4_rgb.png
-%%DATADIR%%/artwork/bgfx/chains/crt-geom/delta_2_4x1_rgb.png
+%%DATADIR%%/artwork/bgfx/chains/crt-geom/aperture_2_4_rgb.png
+%%DATADIR%%/artwork/bgfx/chains/crt-geom/aperture_2_5_bgr.png
 %%DATADIR%%/artwork/bgfx/chains/crt-geom/aperture_3_6_rgb.png
 %%DATADIR%%/artwork/bgfx/chains/crt-geom/delta_1_2x1_bgr.png
 %%DATADIR%%/artwork/bgfx/chains/crt-geom/delta_1_4x1_rgb.png
-%%DATADIR%%/artwork/bgfx/chains/crt-geom/none.png
-%%DATADIR%%/artwork/bgfx/chains/crt-geom/aperture_1_2_bgr.png
+%%DATADIR%%/artwork/bgfx/chains/crt-geom/delta_2_4x1_rgb.png
 %%DATADIR%%/artwork/bgfx/chains/crt-geom/delta_2_4x2_rgb.png
+%%DATADIR%%/artwork/bgfx/chains/crt-geom/none.png
+%%DATADIR%%/artwork/bgfx/chains/crt-geom/slot_2_4x4_rgb.png
 %%DATADIR%%/artwork/bgfx/chains/crt-geom/slot_2_5x4_bgr.png
 %%DATADIR%%/artwork/bgfx/chains/crt-geom/slot_3_7x6_rgb.png
-%%DATADIR%%/artwork/bgfx/chains/crt-geom/slot_2_4x4_rgb.png
 %%DATADIR%%/artwork/bgfx/chains/hq2x.png
+%%DATADIR%%/artwork/bgfx/chains/hq3x.png
 %%DATADIR%%/artwork/bgfx/chains/hq4x.png
-%%DATADIR%%/artwork/bgfx/border_blur/default.lay
-%%DATADIR%%/artwork/README.md
-%%DATADIR%%/artwork/dir.txt
-%%DATADIR%%/artwork/white.png
-%%DATADIR%%/artwork/monochrome-matrix.png
-%%DATADIR%%/artwork/aperture-grille.png
-%%DATADIR%%/artwork/chess/br.png
-%%DATADIR%%/artwork/chess/bn.png
-%%DATADIR%%/artwork/chess/wr.png
-%%DATADIR%%/artwork/chess/wn.png
-%%DATADIR%%/artwork/chess/README.md
-%%DATADIR%%/artwork/chess/wk.png
-%%DATADIR%%/artwork/chess/wb.png
-%%DATADIR%%/artwork/chess/wp.png
-%%DATADIR%%/artwork/chess/bk.png
 %%DATADIR%%/artwork/chess/bb.png
+%%DATADIR%%/artwork/chess/bk.png
+%%DATADIR%%/artwork/chess/bn.png
 %%DATADIR%%/artwork/chess/bp.png
-%%DATADIR%%/artwork/chess/wq.png
 %%DATADIR%%/artwork/chess/bq.png
-%%DATADIR%%/artwork/aperture2x4bg.png
+%%DATADIR%%/artwork/chess/br.png
+%%DATADIR%%/artwork/chess/README.md
+%%DATADIR%%/artwork/chess/wb.png
+%%DATADIR%%/artwork/chess/wk.png
+%%DATADIR%%/artwork/chess/wn.png
+%%DATADIR%%/artwork/chess/wp.png
+%%DATADIR%%/artwork/chess/wq.png
+%%DATADIR%%/artwork/chess/wr.png
+%%DATADIR%%/artwork/dir.txt
+%%DATADIR%%/artwork/LICENSE
+%%DATADIR%%/artwork/monochrome-chessboard.png
+%%DATADIR%%/artwork/monochrome-matrix.png
+%%DATADIR%%/artwork/README.md
+%%DATADIR%%/artwork/scanlines.png
+%%DATADIR%%/artwork/shadow-mask.png
+%%DATADIR%%/artwork/slot-mask-aligned.png
+%%DATADIR%%/artwork/slot-mask.png
+%%DATADIR%%/artwork/white.png
 %%DATADIR%%/hash/32x.xml
 %%DATADIR%%/hash/3do_m2.xml
-%%DATADIR%%/hash/README.md
-%%DATADIR%%/hash/a2600.xml
 %%DATADIR%%/hash/a2600_cass.xml
+%%DATADIR%%/hash/a2600.xml
 %%DATADIR%%/hash/a5200.hsi
 %%DATADIR%%/hash/a5200.xml
 %%DATADIR%%/hash/a7800.xml
-%%DATADIR%%/hash/a800.xml
 %%DATADIR%%/hash/a800_cass.xml
 %%DATADIR%%/hash/a800_flop.xml
+%%DATADIR%%/hash/a800.xml
 %%DATADIR%%/hash/abc1600.xml
-%%DATADIR%%/hash/abc800.xml
-%%DATADIR%%/hash/abc800_hdd.xml
-%%DATADIR%%/hash/abc806.xml
 %%DATADIR%%/hash/abc80_cass.xml
 %%DATADIR%%/hash/abc80_flop.xml
+%%DATADIR%%/hash/abc800_hdd.xml
+%%DATADIR%%/hash/abc800.xml
+%%DATADIR%%/hash/abc806.xml
 %%DATADIR%%/hash/acrnsys_flop.xml
 %%DATADIR%%/hash/acrnsys_rom.xml
 %%DATADIR%%/hash/adam_cart.xml
@ -117,7 +116,8 @@ libexec/mess/unidasm
 %%DATADIR%%/hash/apple3.xml
 %%DATADIR%%/hash/applix_flop.xml
 %%DATADIR%%/hash/apricot_flop.xml
-%%DATADIR%%/hash/aquarius.xml
+%%DATADIR%%/hash/aquarius_cart.xml
+%%DATADIR%%/hash/aquarius_cass.xml
 %%DATADIR%%/hash/arb.xml
 %%DATADIR%%/hash/arcadia.xml
 %%DATADIR%%/hash/archimedes.xml
@ -134,13 +134,14 @@ libexec/mess/unidasm
 %%DATADIR%%/hash/bbc_flop_68000.xml
 %%DATADIR%%/hash/bbc_flop_80186.xml
 %%DATADIR%%/hash/bbc_flop_arm.xml
+%%DATADIR%%/hash/bbc_flop_hybrid.xml
 %%DATADIR%%/hash/bbc_flop_torch.xml
 %%DATADIR%%/hash/bbc_flop_z80.xml
 %%DATADIR%%/hash/bbc_hdd.xml
 %%DATADIR%%/hash/bbc_rom.xml
-%%DATADIR%%/hash/bbcb_flop.xml
 %%DATADIR%%/hash/bbcb_flop_orig.xml
 %%DATADIR%%/hash/bbcb_flop_us.xml
+%%DATADIR%%/hash/bbcb_flop.xml
 %%DATADIR%%/hash/bbcbc.xml
 %%DATADIR%%/hash/bbcm_cart.xml
 %%DATADIR%%/hash/bbcm_flop.xml
@ -161,7 +162,6 @@ libexec/mess/unidasm
 %%DATADIR%%/hash/c2color_cart.xml
 %%DATADIR%%/hash/c64_cart.xml
 %%DATADIR%%/hash/c64_cass.xml
-%%DATADIR%%/hash/c64_flop_clcracked.xml
 %%DATADIR%%/hash/c64_flop_misc.xml
 %%DATADIR%%/hash/c64_flop_orig.xml
 %%DATADIR%%/hash/c65_flop.xml
@ -183,6 +183,7 @@ libexec/mess/unidasm
 %%DATADIR%%/hash/channelf.xml
 %%DATADIR%%/hash/chessmstdm.xml
 %%DATADIR%%/hash/clickstart_cart.xml
+%%DATADIR%%/hash/clipper_flop.xml
 %%DATADIR%%/hash/coco_cart.xml
 %%DATADIR%%/hash/coco_flop.xml
 %%DATADIR%%/hash/coleco.xml
@ -212,7 +213,6 @@ libexec/mess/unidasm
 %%DATADIR%%/hash/e01_flop.xml
 %%DATADIR%%/hash/ec1841.xml
 %%DATADIR%%/hash/einstein.xml
-%%DATADIR%%/hash/ekara_japan.xml
 %%DATADIR%%/hash/ekara_japan_a.xml
 %%DATADIR%%/hash/ekara_japan_ac.xml
 %%DATADIR%%/hash/ekara_japan_bh.xml
@ -225,6 +225,7 @@ libexec/mess/unidasm
 %%DATADIR%%/hash/ekara_japan_s.xml
 %%DATADIR%%/hash/ekara_japan_sp.xml
 %%DATADIR%%/hash/ekara_japan_web.xml
+%%DATADIR%%/hash/ekara_japan.xml
 %%DATADIR%%/hash/ekara_pal.xml
 %%DATADIR%%/hash/ekara_us.xml
 %%DATADIR%%/hash/electron_cart.xml
@ -246,12 +247,11 @@ libexec/mess/unidasm
 %%DATADIR%%/hash/fidel_msc.xml
 %%DATADIR%%/hash/fidel_sc6.xml
 %%DATADIR%%/hash/fidel_scc.xml
-%%DATADIR%%/hash/fm77av.xml
 %%DATADIR%%/hash/fm7_cass.xml
 %%DATADIR%%/hash/fm7_disk.xml
+%%DATADIR%%/hash/fm77av.xml
 %%DATADIR%%/hash/fmtowns_cd.xml
 %%DATADIR%%/hash/fmtowns_flop.xml
-%%DATADIR%%/hash/g7400.xml
 %%DATADIR%%/hash/galaxy.xml
 %%DATADIR%%/hash/gamate.xml
 %%DATADIR%%/hash/gameboy.xml
@ -260,8 +260,8 @@ libexec/mess/unidasm
 %%DATADIR%%/hash/gameking.xml
 %%DATADIR%%/hash/gameking3.xml
 %%DATADIR%%/hash/gamepock.xml
-%%DATADIR%%/hash/gba.xml
 %%DATADIR%%/hash/gba_ereader.xml
+%%DATADIR%%/hash/gba.xml
 %%DATADIR%%/hash/gbcolor.xml
 %%DATADIR%%/hash/gcslottv.xml
 %%DATADIR%%/hash/ggm.xml
@ -282,24 +282,28 @@ libexec/mess/unidasm
 %%DATADIR%%/hash/gx4000.xml
 %%DATADIR%%/hash/h21.xml
 %%DATADIR%%/hash/horizon.xml
+%%DATADIR%%/hash/hp_ipc.xml
 %%DATADIR%%/hash/hp85_rom.xml
 %%DATADIR%%/hash/hp86_rom.xml
 %%DATADIR%%/hash/hp9825b_rom.xml
 %%DATADIR%%/hash/hp9835a_rom.xml
 %%DATADIR%%/hash/hp9845a_rom.xml
 %%DATADIR%%/hash/hp9845b_rom.xml
+%%DATADIR%%/hash/hp9k3xx_cdrom.xml
 %%DATADIR%%/hash/hp9k3xx_flop.xml
-%%DATADIR%%/hash/hp_ipc.xml
+%%DATADIR%%/hash/hp9k3xx_hdd.xml
 %%DATADIR%%/hash/ht68k.xml
 %%DATADIR%%/hash/hx20_rom.xml
-%%DATADIR%%/hash/hyperscan.xml
 %%DATADIR%%/hash/hyperscan_card.xml
+%%DATADIR%%/hash/hyperscan.xml
 %%DATADIR%%/hash/i7000_card.xml
 %%DATADIR%%/hash/ibm5140.xml
-%%DATADIR%%/hash/ibm5150.xml
 %%DATADIR%%/hash/ibm5150_cass.xml
-%%DATADIR%%/hash/ibm5170.xml
+%%DATADIR%%/hash/ibm5150_hdd.xml
+%%DATADIR%%/hash/ibm5150.xml
 %%DATADIR%%/hash/ibm5170_cdrom.xml
+%%DATADIR%%/hash/ibm5170_hdd.xml
+%%DATADIR%%/hash/ibm5170.xml
 %%DATADIR%%/hash/ibm6580.xml
 %%DATADIR%%/hash/ibmpcjr_cart.xml
 %%DATADIR%%/hash/ibmpcjr_flop.xml
@ -332,7 +336,7 @@ libexec/mess/unidasm
 %%DATADIR%%/hash/jupace_cass.xml
 %%DATADIR%%/hash/jupace_snap.xml
 %%DATADIR%%/hash/k28m2.xml
-%%DATADIR%%/hash/kayproii.xml
+%%DATADIR%%/hash/kaypro.xml
 %%DATADIR%%/hash/kc_cart.xml
 %%DATADIR%%/hash/kc_cass.xml
 %%DATADIR%%/hash/kc_flop.xml
@ -340,6 +344,7 @@ libexec/mess/unidasm
 %%DATADIR%%/hash/korvet_flop.xml
 %%DATADIR%%/hash/lantutor.xml
 %%DATADIR%%/hash/laser2001_cart.xml
+%%DATADIR%%/hash/laser2001_flop.xml
 %%DATADIR%%/hash/leapfrog_didj_cart.xml
 %%DATADIR%%/hash/leapfrog_leappad_cart.xml
 %%DATADIR%%/hash/leapfrog_ltleappad_cart.xml
@ -396,10 +401,10 @@ libexec/mess/unidasm
 %%DATADIR%%/hash/msx1_cart.xml
 %%DATADIR%%/hash/msx1_cass.xml
 %%DATADIR%%/hash/msx1_flop.xml
-%%DATADIR%%/hash/msx2.hsi
 %%DATADIR%%/hash/msx2_cart.xml
 %%DATADIR%%/hash/msx2_cass.xml
 %%DATADIR%%/hash/msx2_flop.xml
+%%DATADIR%%/hash/msx2.hsi
 %%DATADIR%%/hash/msx2p_flop.xml
 %%DATADIR%%/hash/msxr_flop.xml
 %%DATADIR%%/hash/mt65_cass.xml
@ -423,12 +428,12 @@ libexec/mess/unidasm
 %%DATADIR%%/hash/nascom_socket.xml
 %%DATADIR%%/hash/neocd.xml
 %%DATADIR%%/hash/neogeo.xml
-%%DATADIR%%/hash/nes.hsi
-%%DATADIR%%/hash/nes.xml
 %%DATADIR%%/hash/nes_ade.xml
 %%DATADIR%%/hash/nes_datach.xml
 %%DATADIR%%/hash/nes_kstudio.xml
 %%DATADIR%%/hash/nes_ntbrom.xml
+%%DATADIR%%/hash/nes.hsi
+%%DATADIR%%/hash/nes.xml
 %%DATADIR%%/hash/next.xml
 %%DATADIR%%/hash/ngp.xml
 %%DATADIR%%/hash/ngpc.xml
@ -436,7 +441,6 @@ libexec/mess/unidasm
 %%DATADIR%%/hash/novag_ssensor4.xml
 %%DATADIR%%/hash/nuon.xml
 %%DATADIR%%/hash/octopus.xml
-%%DATADIR%%/hash/odyssey2.xml
 %%DATADIR%%/hash/ondra.xml
 %%DATADIR%%/hash/orao.xml
 %%DATADIR%%/hash/orion_cart.xml
@ -460,11 +464,11 @@ libexec/mess/unidasm
 %%DATADIR%%/hash/pc8801_cass.xml
 %%DATADIR%%/hash/pc8801_flop.xml
 %%DATADIR%%/hash/pc88va.xml
-%%DATADIR%%/hash/pc98.xml
 %%DATADIR%%/hash/pc98_cd.xml
+%%DATADIR%%/hash/pc98.xml
 %%DATADIR%%/hash/pcd_flop.xml
-%%DATADIR%%/hash/pce.xml
 %%DATADIR%%/hash/pce_tourvision.xml
+%%DATADIR%%/hash/pce.xml
 %%DATADIR%%/hash/pcecd.xml
 %%DATADIR%%/hash/pcfx.xml
 %%DATADIR%%/hash/pcw.xml
@ -484,8 +488,8 @@ libexec/mess/unidasm
 %%DATADIR%%/hash/pi_storyreader_v2_cart.xml
 %%DATADIR%%/hash/picno.xml
 %%DATADIR%%/hash/pico.xml
-%%DATADIR%%/hash/pippin.xml
 %%DATADIR%%/hash/pippin_flop.xml
+%%DATADIR%%/hash/pippin.xml
 %%DATADIR%%/hash/plus4_cart.xml
 %%DATADIR%%/hash/plus4_cass.xml
 %%DATADIR%%/hash/plus4_flop.xml
@ -522,6 +526,7 @@ libexec/mess/unidasm
 %%DATADIR%%/hash/radio86_cart.xml
 %%DATADIR%%/hash/radio86_cass.xml
 %%DATADIR%%/hash/rainbow.xml
+%%DATADIR%%/hash/README.md
 %%DATADIR%%/hash/rwtrntcs.xml
 %%DATADIR%%/hash/rx78.xml
 %%DATADIR%%/hash/sage2.xml
@ -543,17 +548,17 @@ libexec/mess/unidasm
 %%DATADIR%%/hash/segacd.xml
 %%DATADIR%%/hash/sf7000.xml
 %%DATADIR%%/hash/sg1000.xml
-%%DATADIR%%/hash/sgi_mips.xml
 %%DATADIR%%/hash/sgi_mips_hdd.xml
+%%DATADIR%%/hash/sgi_mips.xml
 %%DATADIR%%/hash/sgx.xml
 %%DATADIR%%/hash/sitcom.xml
 %%DATADIR%%/hash/smarttv_cart.xml
 %%DATADIR%%/hash/smc777.xml
 %%DATADIR%%/hash/sms.xml
-%%DATADIR%%/hash/snes.xml
 %%DATADIR%%/hash/snes_bspack.xml
 %%DATADIR%%/hash/snes_strom.xml
 %%DATADIR%%/hash/snes_vkun.xml
+%%DATADIR%%/hash/snes.xml
 %%DATADIR%%/hash/snotec.xml
 %%DATADIR%%/hash/snread.xml
 %%DATADIR%%/hash/snspell.xml
@ -577,6 +582,7 @@ libexec/mess/unidasm
 %%DATADIR%%/hash/spectrum_microdrive.xml
 %%DATADIR%%/hash/spectrum_wafadrive.xml
 %%DATADIR%%/hash/squale_cart.xml
+%%DATADIR%%/hash/ssem_quik.xml
 %%DATADIR%%/hash/st_cart.xml
 %%DATADIR%%/hash/st_flop.xml
 %%DATADIR%%/hash/stepone_flop.xml
@ -609,14 +615,14 @@ libexec/mess/unidasm
 %%DATADIR%%/hash/timex_cass.xml
 %%DATADIR%%/hash/timex_dock.xml
 %%DATADIR%%/hash/tntell.xml
-%%DATADIR%%/hash/to770_cart.xml
-%%DATADIR%%/hash/to770a_cart.xml
+%%DATADIR%%/hash/to_flop.xml
 %%DATADIR%%/hash/to7_cart.xml
 %%DATADIR%%/hash/to7_cass.xml
 %%DATADIR%%/hash/to7_qd.xml
+%%DATADIR%%/hash/to770_cart.xml
+%%DATADIR%%/hash/to770a_cart.xml
 %%DATADIR%%/hash/to8_cass.xml
 %%DATADIR%%/hash/to8_qd.xml
-%%DATADIR%%/hash/to_flop.xml
 %%DATADIR%%/hash/trs80m2.xml
 %%DATADIR%%/hash/trsm100.xml
 %%DATADIR%%/hash/tutor.xml
@ -643,6 +649,7 @@ libexec/mess/unidasm
 %%DATADIR%%/hash/vic1001_flop.xml
 %%DATADIR%%/hash/victor9k_flop.xml
 %%DATADIR%%/hash/vidbrain.xml
+%%DATADIR%%/hash/videopac.xml
 %%DATADIR%%/hash/vii.xml
 %%DATADIR%%/hash/vip.xml
 %%DATADIR%%/hash/visicom.xml