emulators/mame: revert r500456 and reapply with fixes

PR:		236621
Reported by:	Remko C. <sirdice@gmail.com>
Pointy hat to:	pi

10 files changed, 279 insertions, 69 deletions

diff --git a/emulators/mame/Makefile b/emulators/mame/Makefile
index 58bc96f8b6af..377f51564c5a 100644
--- a/emulators/mame/Makefile
+++ b/emulators/mame/Makefile
@@ -2,7 +2,8 @@
 # $FreeBSD$
 
 PORTNAME?=	mame
-PORTVERSION=	0.209
+PORTVERSION=	0.200
+PORTREVISION=	3
 CATEGORIES=	emulators
 
 MAINTAINER=	ports@FreeBSD.org
@@ -93,8 +94,6 @@ post-patch:
 		${WRKSRC}/scripts/genie.lua
 	@${GREP} -rl '"png.h"' ${WRKSRC}/src | ${XARGS} ${REINPLACE_CMD} \
 		-e 's|"png.h"|"localpng.h"|'
-	@${REINPLACE_CMD} -e 's|"util/png.h"|"util/localpng.h"|' \
-		${WRKSRC}/src/frontend/mame/ui/icorender.cpp
 	@${MV} ${WRKSRC}/src/lib/util/png.h ${WRKSRC}/src/lib/util/localpng.h
 
 do-install:
diff --git a/emulators/mame/distinfo b/emulators/mame/distinfo
index d38e39559fab..8e8444c68950 100644
--- a/emulators/mame/distinfo
+++ b/emulators/mame/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1556369525
-SHA256 (mamedev-mame-0.209-mame0209_GH0.tar.gz) = 9442e88bd87cfe407eb093a2ecb42a3850cabe31cd52c4efdef1bf7f584a8eab
-SIZE (mamedev-mame-0.209-mame0209_GH0.tar.gz) = 146403114
+TIMESTAMP = 1533314360
+SHA256 (mamedev-mame-0.200-mame0200_GH0.tar.gz) = a6c43323e120f55b32c072726bdda357aa221a599070989b6e3406ee4e3983fe
+SIZE (mamedev-mame-0.200-mame0200_GH0.tar.gz) = 127378126
diff --git a/emulators/mame/files/patch-3rdparty_asio_include_asio_detail_config.hpp b/emulators/mame/files/patch-3rdparty_asio_include_asio_detail_config.hpp
deleted file mode 100644
index 6753a6a76f4b..000000000000
--- a/emulators/mame/files/patch-3rdparty_asio_include_asio_detail_config.hpp
+++ /dev/null
@@ -1,18 +0,0 @@
---- 3rdparty/asio/include/asio/detail/config.hpp.orig	2019-04-27 21:28:19.371524000 +0200
-+++ 3rdparty/asio/include/asio/detail/config.hpp	2019-04-27 21:30:20.875504000 +0200
-@@ -713,14 +713,12 @@
- #      define ASIO_HAS_STD_STRING_VIEW 1
- #     endif
- #    endif
--#    if !defined(ASIO_HAS_STD_STRING_VIEW) && __has_include(<experimental/string_view>)
-+#    if !defined(ASIO_HAS_STD_STRING_VIEW) && __has_include(<string_view>)
- #     define ASIO_HAS_STD_STRING_VIEW 1
- #     if defined(__APPLE__)
- #      if ((__clang_major__ < 10) || ((__clang_major__ == 10) && (__clang_minor__ == 0) && (__clang_patchlevel__ < 1)))
- #        define ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW 1
- #       endif // clang < 10.0.1
--#      else // for non-Xcode Clang
--#        define ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW 1
- #      endif
- #    endif // __has_include(<experimental/string_view>)
- #   endif // (__cplusplus >= 201103)
diff --git a/emulators/mame/files/patch-asio-libc++7 b/emulators/mame/files/patch-asio-libc++7
new file mode 100644
index 000000000000..9ab9c5afa577
--- /dev/null
+++ b/emulators/mame/files/patch-asio-libc++7
@@ -0,0 +1,15 @@
+https://github.com/boostorg/asio/commit/b5b17a67f0aa29f5156324d5e8a73dd8669a5a51
+
+--- 3rdparty/asio/include/asio/detail/config.hpp.orig	2018-07-24 19:45:05 UTC
++++ 3rdparty/asio/include/asio/detail/config.hpp
+@@ -708,8 +708,9 @@
+ # if !defined(ASIO_DISABLE_STD_STRING_VIEW)
+ #  if defined(__clang__)
+ #   if (__cplusplus >= 201103)
+-#    if __has_include(<experimental/string_view>)
++#    if __has_include(<string_view>)
+ #     define ASIO_HAS_STD_STRING_VIEW 1
++#    elif __has_include(<experimental/string_view>)
+ #     define ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW 1
+ #    endif // __has_include(<experimental/string_view>)
+ #   endif // (__cplusplus >= 201103)
diff --git a/emulators/mame/files/patch-scripts_toolchain.lua b/emulators/mame/files/patch-scripts_toolchain.lua
new file mode 100644
index 000000000000..6324872c164d
--- /dev/null
+++ b/emulators/mame/files/patch-scripts_toolchain.lua
@@ -0,0 +1,21 @@
+--- scripts/toolchain.lua.orig	2018-02-27 15:59:06 UTC
++++ scripts/toolchain.lua
+@@ -23,6 +23,7 @@ newoption {
+ 		{ "android-x64",   "Android - x64"          },
+ 		{ "asmjs",         "Emscripten/asm.js"      },
+ 		{ "freebsd",       "FreeBSD"                },
++		{ "freebsd-clang", "FreeBSD (Clang)"        },
+ 		{ "linux-gcc",     "Linux (GCC compiler)"   },
+ 		{ "linux-clang",   "Linux (Clang compiler)" },
+ 		{ "ios-arm",       "iOS - ARM"              },
+@@ -168,6 +169,10 @@ function toolchain(_buildDir, _subDir)
+ 			location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-freebsd")
+ 		end
+ 
++		if "freebsd-clang" == _OPTIONS["gcc"] then
++			location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-freebsd-clang")
++		end
++
+ 		if "netbsd" == _OPTIONS["gcc"] then
+ 			location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-netbsd")
+ 		end
diff --git a/emulators/mame/files/patch-src__osd__eigccx86.h b/emulators/mame/files/patch-src__osd__eigccx86.h
new file mode 100644
index 000000000000..88dd86dfbe35
--- /dev/null
+++ b/emulators/mame/files/patch-src__osd__eigccx86.h
@@ -0,0 +1,110 @@
+--- src/osd/eigccx86.h.orig	2018-02-27 15:59:06 UTC
++++ src/osd/eigccx86.h
+@@ -31,7 +31,7 @@
+     multiply and return the full 64 bit result
+ -------------------------------------------------*/
+ 
+-#ifndef __x86_64__
++#if !defined(__amd64__) && !defined(__x86_64__)
+ #define mul_32x32 _mul_32x32
+ inline int64_t ATTR_CONST ATTR_FORCE_INLINE
+ _mul_32x32(int32_t a, int32_t b)
+@@ -55,7 +55,7 @@ _mul_32x32(int32_t a, int32_t b)
+     result
+ -------------------------------------------------*/
+ 
+-#ifndef __x86_64__
++#if !defined(__amd64__) && !defined(__x86_64__)
+ #define mulu_32x32 _mulu_32x32
+ inline uint64_t ATTR_CONST ATTR_FORCE_INLINE
+ _mulu_32x32(uint32_t a, uint32_t b)
+@@ -126,7 +126,7 @@ _mulu_32x32_hi(uint32_t a, uint32_t b)
+     result to 32 bits
+ -------------------------------------------------*/
+ 
+-#ifndef __x86_64__
++#if !defined(__amd64__) && !defined(__x86_64__)
+ #define mul_32x32_shift _mul_32x32_shift
+ inline int32_t ATTR_CONST ATTR_FORCE_INLINE
+ _mul_32x32_shift(int32_t a, int32_t b, uint8_t shift)
+@@ -156,7 +156,7 @@ _mul_32x32_shift(int32_t a, int32_t b, u
+     result to 32 bits
+ -------------------------------------------------*/
+ 
+-#ifndef __x86_64__
++#if !defined(__amd64__) && !defined(__x86_64__)
+ #define mulu_32x32_shift _mulu_32x32_shift
+ inline uint32_t ATTR_CONST ATTR_FORCE_INLINE
+ _mulu_32x32_shift(uint32_t a, uint32_t b, uint8_t shift)
+@@ -184,7 +184,7 @@ _mulu_32x32_shift(uint32_t a, uint32_t b
+     divide and return the 32 bit quotient
+ -------------------------------------------------*/
+ 
+-#ifndef __x86_64__
++#if !defined(__amd64__) && !defined(__x86_64__)
+ #define div_64x32 _div_64x32
+ inline int32_t ATTR_CONST ATTR_FORCE_INLINE
+ _div_64x32(int64_t a, int32_t b)
+@@ -211,7 +211,7 @@ _div_64x32(int64_t a, int32_t b)
+     divide and return the 32 bit quotient
+ -------------------------------------------------*/
+ 
+-#ifndef __x86_64__
++#if !defined(__amd64__) && !defined(__x86_64__)
+ #define divu_64x32 _divu_64x32
+ inline uint32_t ATTR_CONST ATTR_FORCE_INLINE
+ _divu_64x32(uint64_t a, uint32_t b)
+@@ -244,7 +244,7 @@ inline int32_t ATTR_FORCE_INLINE
+ _div_64x32_rem(int64_t dividend, int32_t divisor, int32_t *remainder)
+ {
+ 	int32_t quotient;
+-#ifndef __x86_64__
++#if !defined(__amd64__) && !defined(__x86_64__)
+ 
+ 	// Throws arithmetic exception if result doesn't fit in 32 bits
+ 	__asm__ (
+@@ -287,7 +287,7 @@ inline uint32_t ATTR_FORCE_INLINE
+ _divu_64x32_rem(uint64_t dividend, uint32_t divisor, uint32_t *remainder)
+ {
+ 	uint32_t quotient;
+-#ifndef __x86_64__
++#if !defined(__amd64__) && !defined(__x86_64__)
+ 
+ 	// Throws arithmetic exception if result doesn't fit in 32 bits
+ 	__asm__ (
+@@ -325,7 +325,7 @@ _divu_64x32_rem(uint64_t dividend, uint3
+     division, and returning the 32 bit quotient
+ -------------------------------------------------*/
+ 
+-#ifndef __x86_64__
++#if !defined(__amd64__) && !defined(__x86_64__)
+ #define div_32x32_shift _div_32x32_shift
+ inline int32_t ATTR_CONST ATTR_FORCE_INLINE
+ _div_32x32_shift(int32_t a, int32_t b, uint8_t shift)
+@@ -357,7 +357,7 @@ _div_32x32_shift(int32_t a, int32_t b, u
+     division, and returning the 32 bit quotient
+ -------------------------------------------------*/
+ 
+-#ifndef __x86_64__
++#if !defined(__amd64__) && !defined(__x86_64__)
+ #define divu_32x32_shift _divu_32x32_shift
+ inline uint32_t ATTR_CONST ATTR_FORCE_INLINE
+ _divu_32x32_shift(uint32_t a, uint32_t b, uint8_t shift)
+@@ -388,7 +388,7 @@ _divu_32x32_shift(uint32_t a, uint32_t b
+     divide and return the 32 bit remainder
+ -------------------------------------------------*/
+ 
+-#ifndef __x86_64__
++#if !defined(__amd64__) && !defined(__x86_64__)
+ #define mod_64x32 _mod_64x32
+ inline int32_t ATTR_CONST ATTR_FORCE_INLINE
+ _mod_64x32(int64_t a, int32_t b)
+@@ -415,7 +415,7 @@ _mod_64x32(int64_t a, int32_t b)
+     divide and return the 32 bit remainder
+ -------------------------------------------------*/
+ 
+-#ifndef __x86_64__
++#if !defined(__amd64__) && !defined(__x86_64__)
+ #define modu_64x32 _modu_64x32
+ inline uint32_t ATTR_CONST ATTR_FORCE_INLINE
+ _modu_64x32(uint64_t a, uint32_t b)
diff --git a/emulators/mame/files/patch-src__osd__eminline.h b/emulators/mame/files/patch-src__osd__eminline.h
new file mode 100644
index 000000000000..ca0f71526adf
--- /dev/null
+++ b/emulators/mame/files/patch-src__osd__eminline.h
@@ -0,0 +1,11 @@
+--- src/osd/eminline.h.orig	2018-02-27 15:59:06 UTC
++++ src/osd/eminline.h
+@@ -21,7 +21,7 @@
+ 
+ #if defined(__GNUC__)
+ 
+-#if defined(__i386__) || defined(__x86_64__)
++#if defined(__i386__) || defined(__x86_64__) || defined(__amd64__)
+ #include "eigccx86.h"
+ #elif defined(__ppc__) || defined (__PPC__) || defined(__ppc64__) || defined(__PPC64__)
+ #include "eigccppc.h"
diff --git a/emulators/mame/files/patch-src_lib_netlist_plib_pparser.cpp b/emulators/mame/files/patch-src_lib_netlist_plib_pparser.cpp
new file mode 100644
index 000000000000..4791a05e6db1
--- /dev/null
+++ b/emulators/mame/files/patch-src_lib_netlist_plib_pparser.cpp
@@ -0,0 +1,102 @@
+--- src/lib/netlist/plib/pparser.cpp.orig	2018-02-27 15:59:06 UTC
++++ src/lib/netlist/plib/pparser.cpp
+@@ -34,22 +34,22 @@ pstring ptokenizer::currentline_str()
+ 
+ void ptokenizer::skipeol()
+ {
+-	pstring::code_t c = getc();
++	pstring::code_t c = mame_getc();
+ 	while (c)
+ 	{
+ 		if (c == 10)
+ 		{
+-			c = getc();
++			c = mame_getc();
+ 			if (c != 13)
+-				ungetc(c);
++				mame_ungetc(c);
+ 			return;
+ 		}
+-		c = getc();
++		c = mame_getc();
+ 	}
+ }
+ 
+ 
+-pstring::code_t ptokenizer::getc()
++pstring::code_t ptokenizer::mame_getc()
+ {
+ 	if (m_unget != 0)
+ 	{
+@@ -70,7 +70,7 @@ pstring::code_t ptokenizer::getc()
+ 	return c;
+ }
+ 
+-void ptokenizer::ungetc(pstring::code_t c)
++void ptokenizer::mame_ungetc(pstring::code_t c)
+ {
+ 	m_unget = c;
+ }
+@@ -182,10 +182,10 @@ ptokenizer::token_t ptokenizer::get_toke
+ ptokenizer::token_t ptokenizer::get_token_internal()
+ {
+ 	/* skip ws */
+-	pstring::code_t c = getc();
++	pstring::code_t c = mame_getc();
+ 	while (m_whitespace.find(c) != pstring::npos)
+ 	{
+-		c = getc();
++		c = mame_getc();
+ 		if (eof())
+ 		{
+ 			return token_t(ENDOFFILE);
+@@ -205,9 +205,9 @@ ptokenizer::token_t ptokenizer::get_toke
+ 			else if (m_number_chars.find(c) == pstring::npos)
+ 				break;
+ 			tokstr += c;
+-			c = getc();
++			c = mame_getc();
+ 		}
+-		ungetc(c);
++		mame_ungetc(c);
+ 		return token_t(ret, tokstr);
+ 	}
+ 	else if (m_identifier_chars.find(c) != pstring::npos)
+@@ -217,9 +217,9 @@ ptokenizer::token_t ptokenizer::get_toke
+ 		while (m_identifier_chars.find(c) != pstring::npos)
+ 		{
+ 			tokstr += c;
+-			c = getc();
++			c = mame_getc();
+ 		}
+-		ungetc(c);
++		mame_ungetc(c);
+ 		auto id = m_tokens.find(tokstr);
+ 		if (id != m_tokens.end())
+ 			return token_t(id->second, tokstr);
+@@ -229,11 +229,11 @@ ptokenizer::token_t ptokenizer::get_toke
+ 	else if (c == m_string)
+ 	{
+ 		pstring tokstr = "";
+-		c = getc();
++		c = mame_getc();
+ 		while (c != m_string)
+ 		{
+ 			tokstr += c;
+-			c = getc();
++			c = mame_getc();
+ 		}
+ 		return token_t(STRING, tokstr);
+ 	}
+@@ -251,9 +251,9 @@ ptokenizer::token_t ptokenizer::get_toke
+ 				if (id != m_tokens.end())
+ 					return token_t(id->second, tokstr);
+ 			}
+-			c = getc();
++			c = mame_getc();
+ 		}
+-		ungetc(c);
++		mame_ungetc(c);
+ 		auto id = m_tokens.find(tokstr);
+ 		if (id != m_tokens.end())
+ 			return token_t(id->second, tokstr);
diff --git a/emulators/mame/files/patch-src_lib_netlist_plib_pparser.h b/emulators/mame/files/patch-src_lib_netlist_plib_pparser.h
new file mode 100644
index 000000000000..37f3c5ac96ee
--- /dev/null
+++ b/emulators/mame/files/patch-src_lib_netlist_plib_pparser.h
@@ -0,0 +1,13 @@
+--- src/lib/netlist/plib/pparser.h.orig	2018-02-27 15:59:06 UTC
++++ src/lib/netlist/plib/pparser.h
+@@ -118,8 +118,8 @@ protected:
+ private:
+ 	void skipeol();
+ 
+-	pstring::code_t getc();
+-	void ungetc(pstring::code_t c);
++	pstring::code_t mame_getc();
++	void mame_ungetc(pstring::code_t c);
+ 
+ 	bool eof() { return m_strm.eof(); }
+ 
diff --git a/emulators/mame/pkg-plist b/emulators/mame/pkg-plist
index 18a61bf1bfe1..1c6a4e3847a1 100644
--- a/emulators/mame/pkg-plist
+++ b/emulators/mame/pkg-plist
@@ -86,15 +86,12 @@ libexec/mame/unidasm
 %%DATADIR%%/hash/apogee.xml
 %%DATADIR%%/hash/apollo_ctape.xml
 %%DATADIR%%/hash/apple1.xml
+%%DATADIR%%/hash/apple2.xml
 %%DATADIR%%/hash/apple2_cass.xml
-%%DATADIR%%/hash/apple2_flop_clcracked.xml
-%%DATADIR%%/hash/apple2_flop_misc.xml
-%%DATADIR%%/hash/apple2_flop_orig.xml
 %%DATADIR%%/hash/apple2gs.xml
 %%DATADIR%%/hash/apple3.xml
 %%DATADIR%%/hash/apricot_flop.xml
 %%DATADIR%%/hash/aquarius.xml
-%%DATADIR%%/hash/arb.xml
 %%DATADIR%%/hash/arcadia.xml
 %%DATADIR%%/hash/archimedes.xml
 %%DATADIR%%/hash/astrocde.xml
@@ -111,7 +108,6 @@ libexec/mame/unidasm
 %%DATADIR%%/hash/bbc_flop_arm.xml
 %%DATADIR%%/hash/bbc_flop_torch.xml
 %%DATADIR%%/hash/bbc_flop_z80.xml
-%%DATADIR%%/hash/bbc_rom.xml
 %%DATADIR%%/hash/bbca_cass.xml
 %%DATADIR%%/hash/bbcb_cass.xml
 %%DATADIR%%/hash/bbcb_cass_de.xml
@@ -132,7 +128,6 @@ libexec/mame/unidasm
 %%DATADIR%%/hash/c128_cart.xml
 %%DATADIR%%/hash/c128_flop.xml
 %%DATADIR%%/hash/c128_rom.xml
-%%DATADIR%%/hash/c2color_cart.xml
 %%DATADIR%%/hash/c64_cart.xml
 %%DATADIR%%/hash/c64_cass.xml
 %%DATADIR%%/hash/c64_flop.xml
@@ -152,7 +147,6 @@ libexec/mame/unidasm
 %%DATADIR%%/hash/cgenie_flop_rom.xml
 %%DATADIR%%/hash/channelf.xml
 %%DATADIR%%/hash/chessmstdm.xml
-%%DATADIR%%/hash/clickstart_cart.xml
 %%DATADIR%%/hash/coco_cart.xml
 %%DATADIR%%/hash/coco_flop.xml
 %%DATADIR%%/hash/coleco.xml
@@ -180,20 +174,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_bh.xml
-%%DATADIR%%/hash/ekara_japan_d.xml
-%%DATADIR%%/hash/ekara_japan_en.xml
-%%DATADIR%%/hash/ekara_japan_g.xml
-%%DATADIR%%/hash/ekara_japan_gk.xml
-%%DATADIR%%/hash/ekara_japan_m.xml
-%%DATADIR%%/hash/ekara_japan_p.xml
-%%DATADIR%%/hash/ekara_japan_s.xml
-%%DATADIR%%/hash/ekara_japan_sp.xml
-%%DATADIR%%/hash/ekara_japan_web.xml
-%%DATADIR%%/hash/ekara_pal.xml
-%%DATADIR%%/hash/ekara_us.xml
 %%DATADIR%%/hash/electron_cart.xml
 %%DATADIR%%/hash/electron_cass.xml
 %%DATADIR%%/hash/electron_flop.xml
@@ -206,7 +186,6 @@ libexec/mame/unidasm
 %%DATADIR%%/hash/exl100.xml
 %%DATADIR%%/hash/famicom_cass.xml
 %%DATADIR%%/hash/famicom_flop.xml
-%%DATADIR%%/hash/fidel_sc6.xml
 %%DATADIR%%/hash/fidel_scc.xml
 %%DATADIR%%/hash/fm77av.xml
 %%DATADIR%%/hash/fm7_cass.xml
@@ -226,7 +205,6 @@ libexec/mame/unidasm
 %%DATADIR%%/hash/gba_ereader.xml
 %%DATADIR%%/hash/gbcolor.xml
 %%DATADIR%%/hash/genius.xml
-%%DATADIR%%/hash/ggm.xml
 %%DATADIR%%/hash/gimix.xml
 %%DATADIR%%/hash/gjmovie.xml
 %%DATADIR%%/hash/gl2000.xml
@@ -256,9 +234,6 @@ libexec/mame/unidasm
 %%DATADIR%%/hash/ibm6580.xml
 %%DATADIR%%/hash/ibmpcjr_cart.xml
 %%DATADIR%%/hash/ibmpcjr_flop.xml
-%%DATADIR%%/hash/icanguit.xml
-%%DATADIR%%/hash/icanpian.xml
-%%DATADIR%%/hash/intellect02.xml
 %%DATADIR%%/hash/interact.xml
 %%DATADIR%%/hash/interpro.xml
 %%DATADIR%%/hash/intv.hsi
@@ -268,13 +243,6 @@ libexec/mame/unidasm
 %%DATADIR%%/hash/iq151_cart.xml
 %%DATADIR%%/hash/iq151_flop.xml
 %%DATADIR%%/hash/jaguar.xml
-%%DATADIR%%/hash/jakks_gamekey_dp.xml
-%%DATADIR%%/hash/jakks_gamekey_dy.xml
-%%DATADIR%%/hash/jakks_gamekey_mv.xml
-%%DATADIR%%/hash/jakks_gamekey_nk.xml
-%%DATADIR%%/hash/jakks_gamekey_nm.xml
-%%DATADIR%%/hash/jakks_gamekey_sw.xml
-%%DATADIR%%/hash/jpopira_jp.xml
 %%DATADIR%%/hash/juicebox.xml
 %%DATADIR%%/hash/jupace_cass.xml
 %%DATADIR%%/hash/k28m2.xml
@@ -286,8 +254,6 @@ libexec/mame/unidasm
 %%DATADIR%%/hash/korvet_flop.xml
 %%DATADIR%%/hash/lantutor.xml
 %%DATADIR%%/hash/laser2001_cart.xml
-%%DATADIR%%/hash/leapfrog_leappad_cart.xml
-%%DATADIR%%/hash/leapfrog_mfleappad_cart.xml
 %%DATADIR%%/hash/leapster.xml
 %%DATADIR%%/hash/lisa.xml
 %%DATADIR%%/hash/lisa2.xml
@@ -299,7 +265,6 @@ libexec/mame/unidasm
 %%DATADIR%%/hash/m5_flop.xml
 %%DATADIR%%/hash/mac_flop.xml
 %%DATADIR%%/hash/mac_hdd.xml
-%%DATADIR%%/hash/mac_hdflop.xml
 %%DATADIR%%/hash/mbc200.xml
 %%DATADIR%%/hash/mbc55x.xml
 %%DATADIR%%/hash/mc10.xml
@@ -324,7 +289,6 @@ libexec/mame/unidasm
 %%DATADIR%%/hash/mo5_qd.xml
 %%DATADIR%%/hash/mo6_cass.xml
 %%DATADIR%%/hash/mo6_flop.xml
-%%DATADIR%%/hash/monon_color.xml
 %%DATADIR%%/hash/mpu1000.xml
 %%DATADIR%%/hash/mpz80.xml
 %%DATADIR%%/hash/msx.hsi
@@ -339,7 +303,6 @@ libexec/mame/unidasm
 %%DATADIR%%/hash/msxr_flop.xml
 %%DATADIR%%/hash/mtx_cart.xml
 %%DATADIR%%/hash/mtx_cass.xml
-%%DATADIR%%/hash/mtx_flop.xml
 %%DATADIR%%/hash/mtx_rom.xml
 %%DATADIR%%/hash/myvision.xml
 %%DATADIR%%/hash/mz2000_cass.xml
@@ -350,7 +313,6 @@ libexec/mame/unidasm
 %%DATADIR%%/hash/n64.xml
 %%DATADIR%%/hash/n64dd.xml
 %%DATADIR%%/hash/nascom_flop.xml
-%%DATADIR%%/hash/nascom_snap.xml
 %%DATADIR%%/hash/nascom_socket.xml
 %%DATADIR%%/hash/neocd.xml
 %%DATADIR%%/hash/neogeo.xml
@@ -396,7 +358,6 @@ libexec/mame/unidasm
 %%DATADIR%%/hash/pcfx.xml
 %%DATADIR%%/hash/pcw.xml
 %%DATADIR%%/hash/pcw16.xml
-%%DATADIR%%/hash/pcx_flop.xml
 %%DATADIR%%/hash/pecom_cass.xml
 %%DATADIR%%/hash/pegasus_cart.xml
 %%DATADIR%%/hash/pencil2.xml
@@ -459,7 +420,6 @@ libexec/mame/unidasm
 %%DATADIR%%/hash/sc3000_cart.xml
 %%DATADIR%%/hash/sc3000_cass.xml
 %%DATADIR%%/hash/scv.xml
-%%DATADIR%%/hash/sega_beena_cart.xml
 %%DATADIR%%/hash/segacd.xml
 %%DATADIR%%/hash/sf7000.xml
 %%DATADIR%%/hash/sg1000.xml
@@ -489,7 +449,6 @@ libexec/mame/unidasm
 %%DATADIR%%/hash/specpls3_flop.xml
 %%DATADIR%%/hash/spectrum_cart.xml
 %%DATADIR%%/hash/spectrum_cass.xml
-%%DATADIR%%/hash/spectrum_flop_opus.xml
 %%DATADIR%%/hash/squale_cart.xml
 %%DATADIR%%/hash/st_cart.xml
 %%DATADIR%%/hash/st_flop.xml
@@ -534,7 +493,6 @@ libexec/mame/unidasm
 %%DATADIR%%/hash/tvc_cart.xml
 %%DATADIR%%/hash/tvc_cass.xml
 %%DATADIR%%/hash/tvc_flop.xml
-%%DATADIR%%/hash/tvgogo.xml
 %%DATADIR%%/hash/unichamp.xml
 %%DATADIR%%/hash/ut88.xml
 %%DATADIR%%/hash/uzebox.xml
@@ -546,7 +504,6 @@ libexec/mame/unidasm
 %%DATADIR%%/hash/vector06_flop.xml
 %%DATADIR%%/hash/vectrex.xml
 %%DATADIR%%/hash/vg5k.xml
-%%DATADIR%%/hash/vgmplay.xml
 %%DATADIR%%/hash/vic10.xml
 %%DATADIR%%/hash/vic1001_cart.xml
 %%DATADIR%%/hash/vic1001_cass.xml
@@ -557,11 +514,11 @@ libexec/mame/unidasm
 %%DATADIR%%/hash/vip.xml
 %%DATADIR%%/hash/visicom.xml
 %%DATADIR%%/hash/vixen.xml
+%%DATADIR%%/hash/vreader.xml
 %%DATADIR%%/hash/vsmile_cart.xml
 %%DATADIR%%/hash/vsmile_cd.xml
 %%DATADIR%%/hash/vsmileb_cart.xml
 %%DATADIR%%/hash/vsmilem_cart.xml
-%%DATADIR%%/hash/vtech_storio_cart.xml
 %%DATADIR%%/hash/vz_cass.xml
 %%DATADIR%%/hash/wangpc.xml
 %%DATADIR%%/hash/waveterm.xml