16 files changed, 222 insertions, 316 deletions

diff --git a/emulators/mame/Makefile b/emulators/mame/Makefile
index 65df05fd2cb1..c523d5b4f361 100644
--- a/emulators/mame/Makefile
+++ b/emulators/mame/Makefile
@@ -1,19 +1,13 @@
 # Created by: alepulver
 # $FreeBSD$
 
-PORTNAME=	mame
-PORTVERSION=	0.154${PATCHSUFFIX}
-PORTREVISION=	2
+PORTNAME?=	mame
+PORTVERSION=	0.161
+PORTREVISION?=	0
 CATEGORIES=	emulators
-MASTER_SITES=	http://mamedev.mameworld.info/releases/ \
-		http://emumovies.com/aarongiles/releases/ \
-		http://mamedev.org/updates/:patchsets
-DISTFILES=	mame${PORTVERSION:S/.//:C/p[0-9]*$//}s.zip \
-		${UPDATE_PATCHES:C/$/.zip:patchsets/}
-DIST_SUBDIR=	mame
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Multi Arcade Machine Emulator
+COMMENT?=	Multi Arcade Machine Emulator
 
 LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac \
 		libjpeg.so:${PORTSDIR}/graphics/jpeg \
@@ -23,108 +17,106 @@ RUN_DEPENDS=	liberation-fonts-ttf>=0:${PORTSDIR}/x11-fonts/liberation-fonts-ttf
 
 NOT_FOR_ARCHS=	ia64 powerpc sparc64
 
-USES=		dos2unix gmake pkgconfig python:2,build shebangfix
-DOS2UNIX_FILES=	src/lib/lib7z/CpuArch.h \
-		src/lib/lua/luaconf.h \
-		src/osd/eigccx86.h \
-		src/osd/eminline.h \
-		src/osd/osdcore.c \
-		src/osd/sdl/osinline.h \
-		src/osd/sdl/sdlsync_ntc.c \
-		src/osd/sdl/sdlsync_os2.c
+USE_GITHUB=	yes
+GH_ACCOUNT=	mamedev
+GH_PROJECT=	mame 				# explicit (master port)
+GH_TAGNAME=	mame${PORTVERSION:S/.//}
+
+# base clang fails with signal during build (!)
+USE_GCC=	yes
+
+USES=		gmake pkgconfig python:2,build shebangfix
 SHEBANG_FILES=	src/emu/cpu/m6502/m6502make.py \
 		src/emu/cpu/m6809/m6809make.py \
 		src/emu/cpu/mcs96/mcs96make.py \
-		src/emu/cpu/tms57002/tmsmake.py
-USE_XORG=	xext xi xinerama xrender
+		src/emu/cpu/tms57002/tmsmake.py \
+		src/build/*.py
+USE_XORG=	xext xi xinerama xrender x11
 USE_GL=		gl
-NO_WRKSUBDIR=	yes
+USE_SDL=	sdl2 ttf2
+USE_QT4=	gui moc_build qmake_build
+MTARGET?=	mame
+CFLAGS+=	-I${LOCALBASE}/include
 MAKE_ENV=	NOWERROR=1 USE_NETWORK=1 \
-		LD="${CXX}" PYTHON="${PYTHON_CMD}" \
+		LD="${CXX}" PYTHON="${PYTHON_CMD}" SDL_LIBVER="sdl2" \
 		OPT_FLAGS="${CXXFLAGS}" GCC_LDFLAGS="${LDFLAGS}" \
-		TARGET="mame" FULLNAME="mame" SDL_NETWORK="pcap"
-MAKE_ARGS=	TARGETOS=freebsd
+		TARGET="${MTARGET}" FULLNAME="mame" SDL_NETWORK="pcap"
+MAKE_ARGS=	TARGETOS=freebsd VERBOSE=1 TOOLS=1
 MAKEFILE=	makefile
+GENIE=		${WRKSRC}/3rdparty/genie
+PORTDOCS=	*
+PORTEXAMPLES=	${MTARGET}.ini
 
-SUB_FILES=	pkg-message
+SUB_FILES=	pkg-message target.ini
+SUB_LIST=	MTARGET=${MTARGET}
 
-OPTIONS_DEFINE=		BUILTIN_DEBUGGER DEBUG DOCS EXAMPLES SDL2
-
-BUILTIN_DEBUGGER_DESC=	Builtin debugger support
-BUILTIN_DEBUGGER_USE=	QT4=gui,moc_build,qmake_build
-BUILTIN_DEBUGGER_MAKE_ENV_OFF=\
-			NO_DEBUGGER=1 NO_USE_QTDEBUG=1
+OPTIONS_DEFINE=		DEBUG DOCS EXAMPLES
 DEBUG_MAKE_ENV=		DEBUG=1
-SDL2_DESC=		SDL2 libraries support
-SDL2_USE=		SDL=sdl2,ttf2
-SDL2_MAKE_ENV=		SDL_LIBVER="sdl2"
-
-PATCHLEVEL=	# none
-
-.if defined(PATCHLEVEL) && ${PATCHLEVEL}
-PATCHSUFFIX=	p${PATCHLEVEL}
-UPDATE_PATCHES!=	/usr/bin/jot -s " " \
-		-w ${PORTVERSION:S/.//:C/\.p[0-9]*$//}u%d_diff \
-		${PATCHLEVEL} 1 ${PATCHLEVEL}
-.endif
 
 .include <bsd.port.options.mk>
 
-.if empty(PORT_OPTIONS:MSDL2)
-USE_SDL=	sdl ttf
-.endif
-
 .if ${ARCH} == amd64
 MAKE_ARGS+=	PTR64=1
+EMULATOR=	${MTARGET}64
+.else
+EMULATOR=	${MTARGET}
 .endif
+PLIST_SUB=	EMULATOR=${EMULATOR}
 
-.if ${OPSYS} == DragonFly
-EXTRA_PATCHES=	${FILESDIR}/extra-patch-src_osd_osdcore.c
-.endif
-
-post-extract:
-	(cd ${WRKDIR} && ${TAR} -xf mame.zip)
-	@${RM} -f ${WRKDIR}/mame.zip
-# Use post-extract target to get in before dos2unix-isation
-.if defined(UPDATE_PATCHES)
-. for patch in ${UPDATE_PATCHES:S/_/./}
-	@${ECHO_MSG} -n "===> Applying upstream development patch ${patch}... "
-	${PATCH} ${PATCH_ARGS} < ${WRKSRC}/${patch}
-	@${ECHO_MSG} "[DONE]"
-. endfor
+.if ${OPSYS} == FreeBSD && ${OSREL:R} == 8
+BROKEN=		will not build on FreeBSD 8.x
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e \
-		's|^\(BUILD_EXPAT \)|#\1| ; \
-		 s|^\(BUILD_ZLIB \)|#\1| ; \
-		 s|^\(BUILD_FLAC \)|#\1| ; \
-		 s|^\(BUILD_JPEGLIB \)|#\1| ; \
-		 s|^\(CC \)|#\1| ; \
+		's|^\(CC \)|#\1| ; \
+		 s|^\(CXX \)|#\1| ; \
 		 s|^\(LD \)|#\1| ; \
 		 s|^\(PYTHON \)|#\1| ; \
-		 s|-O$$(OPTIMIZE)|| ; \
-		 /--warn-common/s|= -Wl,|= $$(GCC_LDFLAGS) -Wl,| ; \
-		 /LDFLAGS/s|-s|| ; \
-		 /LIBS/s|-lstdc++||' ${WRKSRC}/makefile
-	@${REINPLACE_CMD} -e \
-		'/-isystem/s|^|#| ; \
-		 /X11R6/s|^|#|' ${WRKSRC}/src/osd/sdl/sdl.mak
+		 s| .(ARCH)|| ; \
+		 s|FreeBSD|${OPSYS}|g' \
+		 ${WRKSRC}/makefile \
+		 ${GENIE}/build/gmake.bsd/genie.make
+	@${REINPLACE_CMD} -e 's|gcc|cc|; s|g++|c++|' \
+		${GENIE}/src/actions/codelite/codelite_project.lua \
+		${GENIE}/src/tools/gcc.lua \
+		${GENIE}/src/tools/snc.lua \
+		${GENIE}/tests/test_gmake_cpp.lua
+	@${REINPLACE_CMD} -e 's|= \"gcc|= \"cc|; s|= \"g++|= \"c++|' \
+		-e "s|'CXX =|'#CXX =|; s|'CC  =|'#CC  =|; s| .(ARCH)| |g" \
+		${GENIE}/src/host/scripts.c
+	# we can't fix two types of python shebangs, so do these manually
+	@${REINPLACE_CMD} -i "" -e "s|/usr/bin/env python|${PYTHON_CMD}|" \
+		${WRKSRC}/src/build/png*.py
+	@${REINPLACE_CMD} -e 's|"python"|"${PYTHON_CMD}"|' \
+		${WRKSRC}/scripts/genie.lua
+	@${GREP} -rl '"png.h"' ${WRKSRC}/src | ${XARGS} ${REINPLACE_CMD} \
+		-e 's|"png.h"|"localpng.h"|'
+	@${MV} ${WRKSRC}/src/lib/util/png.h ${WRKSRC}/src/lib/util/localpng.h
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR} \
 		${STAGEDIR}${DOCSDIR} \
 		${STAGEDIR}${EXAMPLESDIR} \
-		${STAGEDIR}${PREFIX}/libexec/mame
-	${INSTALL_PROGRAM} ${WRKSRC}/mame ${STAGEDIR}${PREFIX}/bin
+		${STAGEDIR}${PREFIX}/libexec/${MTARGET}
+	${INSTALL_PROGRAM} ${WRKSRC}/${EMULATOR} ${STAGEDIR}${PREFIX}/bin
+.if ${MTARGET:Mmame}
 	(cd ${WRKSRC} && \
 		${INSTALL_PROGRAM} chdman jedutil ldresample ldverify \
-		romcmp testkeys unidasm ${STAGEDIR}${PREFIX}/libexec/mame)
+		romcmp testkeys unidasm \
+		${STAGEDIR}${PREFIX}/libexec/mame)
+.endif
+.if ${MTARGET:Mmess}
+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} castool chdman imgtool jedutil \
+		ldresample ldverify romcmp testkeys unidasm \
+		${STAGEDIR}${PREFIX}/libexec/mess)
+.endif
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} artwork ${STAGEDIR}${DATADIR})
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} hash ${STAGEDIR}${DATADIR})
 	(cd ${WRKSRC}/src/osd/sdl && \
 		${COPYTREE_SHARE} keymaps ${STAGEDIR}${DATADIR})
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${STAGEDIR}${DOCSDIR})
-	${INSTALL_DATA} ${FILESDIR}/mame.ini ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKDIR}/target.ini \
+		${STAGEDIR}${EXAMPLESDIR}/${MTARGET}.ini
 
 .include <bsd.port.mk>
diff --git a/emulators/mame/distinfo b/emulators/mame/distinfo
index 571d8a60cb20..afc5aa81763c 100644
--- a/emulators/mame/distinfo
+++ b/emulators/mame/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mame/mame0154s.zip) = 522ba9275e9f633ab616dcd0ac0ab4fcd3b72690ed09915dcd4d0b627c696149
-SIZE (mame/mame0154s.zip) = 39697095
+SHA256 (mamedev-mame-0.161-mame0161_GH0.tar.gz) = f7db934676e90d0d7f2b678ccf32e580417c754dd33117ec683560956c2130b9
+SIZE (mamedev-mame-0.161-mame0161_GH0.tar.gz) = 86902164
diff --git a/emulators/mame/files/extra-patch-src_osd_osdcore.c b/emulators/mame/files/extra-patch-src_osd_osdcore.c
deleted file mode 100644
index 0892d35e5366..000000000000
--- a/emulators/mame/files/extra-patch-src_osd_osdcore.c
+++ /dev/null
@@ -1,63 +0,0 @@
---- src/osd/osdcore.c.orig	2014-10-05 09:30:10 UTC
-+++ src/osd/osdcore.c
-@@ -2,6 +2,10 @@
- #include "osdcore.h"
- #include "portmidi/portmidi.h"
- 
-+typedef struct __FILE_public FILEX;
-+FILEX dummyval;
-+FILEX * dummy = &dummyval;
-+
- bool g_print_verbose = false;
- 
- 
-@@ -10,9 +14,14 @@ bool g_print_verbose = false;
-     for file output
- -------------------------------------------------*/
- 
--void osd_file_output_callback(FILE *param, const char *format, va_list argptr)
-+void osd_file_std_output_callback(FILEX *param, const char *format, va_list argptr)
-+{
-+	vfprintf(stdout, format, argptr);
-+}
-+
-+void osd_file_err_output_callback(FILEX *param, const char *format, va_list argptr)
- {
--	vfprintf(param, format, argptr);
-+	vfprintf(stderr, format, argptr);
- }
- 
- 
-@@ -21,7 +30,7 @@ void osd_file_output_callback(FILE *para
-     for no output
- -------------------------------------------------*/
- 
--void osd_null_output_callback(FILE *param, const char *format, va_list argptr)
-+void osd_null_std_output_callback(FILEX *param, const char *format, va_list argptr)
- {
- }
- 
-@@ -30,16 +39,16 @@ void osd_null_output_callback(FILE *para
- /* output channels */
- static output_delegate output_cb[OSD_OUTPUT_CHANNEL_COUNT] =
- {
--	output_delegate(FUNC(osd_file_output_callback), stderr),   // OSD_OUTPUT_CHANNEL_ERROR
--	output_delegate(FUNC(osd_file_output_callback), stderr),   // OSD_OUTPUT_CHANNEL_WARNING
--	output_delegate(FUNC(osd_file_output_callback), stdout),   // OSD_OUTPUT_CHANNEL_INFO
-+	output_delegate(FUNC(osd_file_err_output_callback), dummy),   // OSD_OUTPUT_CHANNEL_ERROR
-+	output_delegate(FUNC(osd_file_err_output_callback), dummy),   // OSD_OUTPUT_CHANNEL_WARNING
-+	output_delegate(FUNC(osd_file_std_output_callback), dummy),   // OSD_OUTPUT_CHANNEL_INFO
- #ifdef MAME_DEBUG
--	output_delegate(FUNC(osd_file_output_callback), stdout),   // OSD_OUTPUT_CHANNEL_DEBUG
-+	output_delegate(FUNC(osd_file_std_output_callback), dummy),   // OSD_OUTPUT_CHANNEL_DEBUG
- #else
--	output_delegate(FUNC(osd_null_output_callback), stdout),   // OSD_OUTPUT_CHANNEL_DEBUG
-+	output_delegate(FUNC(osd_null_std_output_callback), dummy),   // OSD_OUTPUT_CHANNEL_DEBUG
- #endif
--	output_delegate(FUNC(osd_file_output_callback), stdout),   // OSD_OUTPUT_CHANNEL_VERBOSE
--	output_delegate(FUNC(osd_file_output_callback), stdout)    // OSD_OUTPUT_CHANNEL_LOG
-+	output_delegate(FUNC(osd_file_std_output_callback), dummy),   // OSD_OUTPUT_CHANNEL_VERBOSE
-+	output_delegate(FUNC(osd_file_std_output_callback), dummy)    // OSD_OUTPUT_CHANNEL_LOG
- };
- 
- 
diff --git a/emulators/mame/files/patch-3rdparty_bx_include_bx_platform.h b/emulators/mame/files/patch-3rdparty_bx_include_bx_platform.h
new file mode 100644
index 000000000000..3b6d79890a5d
--- /dev/null
+++ b/emulators/mame/files/patch-3rdparty_bx_include_bx_platform.h
@@ -0,0 +1,11 @@
+--- 3rdparty/bx/include/bx/platform.h.orig	2015-04-29 06:18:54 UTC
++++ 3rdparty/bx/include/bx/platform.h
+@@ -184,7 +184,7 @@
+ #elif defined(__QNX__)
+ #	undef  BX_PLATFORM_QNX
+ #	define BX_PLATFORM_QNX 1
+-#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__DragonFly__)
+ #	undef  BX_PLATFORM_FREEBSD
+ #	define BX_PLATFORM_FREEBSD 1
+ #else
diff --git a/emulators/mame/files/patch-3rdparty_lzma_C_CpuArch.h b/emulators/mame/files/patch-3rdparty_lzma_C_CpuArch.h
new file mode 100644
index 000000000000..d4a6acf8a2ed
--- /dev/null
+++ b/emulators/mame/files/patch-3rdparty_lzma_C_CpuArch.h
@@ -0,0 +1,11 @@
+--- 3rdparty/lzma/C/CpuArch.h.orig	2015-05-24 15:52:12 UTC
++++ 3rdparty/lzma/C/CpuArch.h
+@@ -16,7 +16,7 @@ MY_CPU_LE_UNALIGN means that CPU is LITT
+ If MY_CPU_LE_UNALIGN is not defined, we don't know about these properties of platform.
+ */
+ 
+-#if defined(_M_X64) || defined(_M_AMD64) || defined(__x86_64__)
++#if defined(_M_X64) || defined(_M_AMD64) || defined(__x86_64__) || defined(__amd64__)
+ #define MY_CPU_AMD64
+ #endif
+ 
diff --git a/emulators/mame/files/patch-src__lib__lib7z__CpuArch.h b/emulators/mame/files/patch-src__lib__lib7z__CpuArch.h
deleted file mode 100644
index 592b8de03fff..000000000000
--- a/emulators/mame/files/patch-src__lib__lib7z__CpuArch.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/lib/lib7z/CpuArch.h.orig
-+++ src/lib/lib7z/CpuArch.h
-@@ -16,7 +16,7 @@
- If MY_CPU_LE_UNALIGN is not defined, we don't know about these properties of platform.
- */
- 
--#if defined(_M_X64) || defined(_M_AMD64) || defined(__x86_64__)
-+#if defined(__amd64__) || defined(_M_X64) || defined(_M_AMD64) || defined(__x86_64__)
- #define MY_CPU_AMD64
- #endif
- 
diff --git a/emulators/mame/files/patch-src__lib__lua__luaconf.h b/emulators/mame/files/patch-src__lib__lua__luaconf.h
deleted file mode 100644
index deb447d3033a..000000000000
--- a/emulators/mame/files/patch-src__lib__lua__luaconf.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/lib/lua/luaconf.h.orig
-+++ src/lib/lua/luaconf.h
-@@ -514,7 +514,7 @@
- #define LUA_NANTRICK
- 
- /* pentium 64 bits? */
--#elif defined(__x86_64)                     /* }{ */
-+#elif defined(__amd64__) || defined(__x86_64__) || defined(__x86_64) /* }{ */
- 
- #define LUA_IEEE754TRICK
- #define LUA_IEEEENDIAN      0
diff --git a/emulators/mame/files/patch-src__osd__eigccx86.h b/emulators/mame/files/patch-src__osd__eigccx86.h
index 1a05d626aca7..5b86d06d333f 100644
--- a/emulators/mame/files/patch-src__osd__eigccx86.h
+++ b/emulators/mame/files/patch-src__osd__eigccx86.h
@@ -1,6 +1,6 @@
---- src/osd/eigccx86.h.orig
+--- src/osd/eigccx86.h.orig	2015-05-24 15:52:19 UTC
 +++ src/osd/eigccx86.h
-@@ -42,7 +42,7 @@
+@@ -42,7 +42,7 @@ union _x86_union
      multiply and return the full 64 bit result
  -------------------------------------------------*/
  
@@ -9,7 +9,7 @@
  #define mul_32x32 _mul_32x32
  INLINE INT64 ATTR_CONST ATTR_FORCE_INLINE
  _mul_32x32(INT32 a, INT32 b)
-@@ -68,7 +68,7 @@
+@@ -68,7 +68,7 @@ _mul_32x32(INT32 a, INT32 b)
      result
  -------------------------------------------------*/
  
@@ -18,7 +18,7 @@
  #define mulu_32x32 _mulu_32x32
  INLINE UINT64 ATTR_CONST ATTR_FORCE_INLINE
  _mulu_32x32(UINT32 a, UINT32 b)
-@@ -145,7 +145,7 @@
+@@ -145,7 +145,7 @@ _mulu_32x32_hi(UINT32 a, UINT32 b)
      result to 32 bits
  -------------------------------------------------*/
  
@@ -27,7 +27,7 @@
  #define mul_32x32_shift _mul_32x32_shift
  INLINE INT32 ATTR_CONST ATTR_FORCE_INLINE
  _mul_32x32_shift(INT32 a, INT32 b, UINT8 shift)
-@@ -175,7 +175,7 @@
+@@ -175,7 +175,7 @@ _mul_32x32_shift(INT32 a, INT32 b, UINT8
      result to 32 bits
  -------------------------------------------------*/
  
@@ -36,7 +36,7 @@
  #define mulu_32x32_shift _mulu_32x32_shift
  INLINE UINT32 ATTR_CONST ATTR_FORCE_INLINE
  _mulu_32x32_shift(UINT32 a, UINT32 b, UINT8 shift)
-@@ -203,7 +203,7 @@
+@@ -203,7 +203,7 @@ _mulu_32x32_shift(UINT32 a, UINT32 b, UI
      divide and return the 32 bit quotient
  -------------------------------------------------*/
  
@@ -45,7 +45,7 @@
  #define div_64x32 _div_64x32
  INLINE INT32 ATTR_CONST ATTR_FORCE_INLINE
  _div_64x32(INT64 a, INT32 b)
-@@ -230,7 +230,7 @@
+@@ -230,7 +230,7 @@ _div_64x32(INT64 a, INT32 b)
      divide and return the 32 bit quotient
  -------------------------------------------------*/
  
@@ -54,7 +54,7 @@
  #define divu_64x32 _divu_64x32
  INLINE UINT32 ATTR_CONST ATTR_FORCE_INLINE
  _divu_64x32(UINT64 a, UINT32 b)
-@@ -258,7 +258,7 @@
+@@ -258,7 +258,7 @@ _divu_64x32(UINT64 a, UINT32 b)
      32 bit remainder
  -------------------------------------------------*/
  
@@ -63,7 +63,7 @@
  #define div_64x32_rem _div_64x32_rem
  INLINE INT32 ATTR_FORCE_INLINE
  _div_64x32_rem(INT64 dividend, INT32 divisor, INT32 *remainder)
-@@ -286,7 +286,7 @@
+@@ -286,7 +286,7 @@ _div_64x32_rem(INT64 dividend, INT32 div
      and 32 bit remainder
  -------------------------------------------------*/
  
@@ -72,7 +72,7 @@
  #define divu_64x32_rem _divu_64x32_rem
  INLINE UINT32 ATTR_FORCE_INLINE
  _divu_64x32_rem(UINT64 dividend, UINT32 divisor, UINT32 *remainder)
-@@ -337,7 +337,7 @@
+@@ -337,7 +337,7 @@ _divu_64x32_rem(UINT64 dividend, UINT32 
      division, and returning the 32 bit quotient
  -------------------------------------------------*/
  
@@ -81,7 +81,7 @@
  #define div_32x32_shift _div_32x32_shift
  INLINE INT32 ATTR_CONST ATTR_FORCE_INLINE
  _div_32x32_shift(INT32 a, INT32 b, UINT8 shift)
-@@ -369,7 +369,7 @@
+@@ -369,7 +369,7 @@ _div_32x32_shift(INT32 a, INT32 b, UINT8
      division, and returning the 32 bit quotient
  -------------------------------------------------*/
  
@@ -90,7 +90,7 @@
  #define divu_32x32_shift _divu_32x32_shift
  INLINE UINT32 ATTR_CONST ATTR_FORCE_INLINE
  _divu_32x32_shift(UINT32 a, UINT32 b, UINT8 shift)
-@@ -400,7 +400,7 @@
+@@ -400,7 +400,7 @@ _divu_32x32_shift(UINT32 a, UINT32 b, UI
      divide and return the 32 bit remainder
  -------------------------------------------------*/
  
@@ -99,7 +99,7 @@
  #define mod_64x32 _mod_64x32
  INLINE INT32 ATTR_CONST ATTR_FORCE_INLINE
  _mod_64x32(INT64 a, INT32 b)
-@@ -427,7 +427,7 @@
+@@ -427,7 +427,7 @@ _mod_64x32(INT64 a, INT32 b)
      divide and return the 32 bit remainder
  -------------------------------------------------*/
  
@@ -108,7 +108,7 @@
  #define modu_64x32 _modu_64x32
  INLINE UINT32 ATTR_CONST ATTR_FORCE_INLINE
  _modu_64x32(UINT64 a, UINT32 b)
-@@ -563,7 +563,7 @@
+@@ -563,7 +563,7 @@ _compare_exchange32(INT32 volatile *ptr,
      return the previous value at 'ptr'.
  -------------------------------------------------*/
  
@@ -117,7 +117,7 @@
  #define compare_exchange64 _compare_exchange64
  INLINE INT64 ATTR_NONNULL(1) ATTR_FORCE_INLINE
  _compare_exchange64(INT64 volatile *ptr, INT64 compare, INT64 exchange)
-@@ -693,7 +693,7 @@
+@@ -693,7 +693,7 @@ _atomic_decrement32(INT32 volatile *ptr)
  
  #define get_profile_ticks _get_profile_ticks
  
diff --git a/emulators/mame/files/patch-src__osd__eminline.h b/emulators/mame/files/patch-src__osd__eminline.h
index a631047e8346..fc337de4036f 100644
--- a/emulators/mame/files/patch-src__osd__eminline.h
+++ b/emulators/mame/files/patch-src__osd__eminline.h
@@ -1,11 +1,11 @@
---- src/osd/eminline.h.orig
+--- src/osd/eminline.h.orig	2015-05-24 15:52:19 UTC
 +++ src/osd/eminline.h
-@@ -17,7 +17,7 @@
- /* we come with implementations for GCC x86 and PPC */
- #if defined(__GNUC__)
+@@ -88,7 +88,7 @@ _osd_exchange64(INT64 volatile *ptr, INT
+ 
+ #endif
  
 -#if defined(__i386__) || defined(__x86_64__)
-+#if defined(__i386__) || defined(__amd64__) || 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__osd__sdl__osinline.h b/emulators/mame/files/patch-src__osd__sdl__osinline.h
deleted file mode 100644
index 5fe71516d32d..000000000000
--- a/emulators/mame/files/patch-src__osd__sdl__osinline.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/osd/sdl/osinline.h.orig
-+++ src/osd/sdl/osinline.h
-@@ -14,7 +14,7 @@
- //  INLINE FUNCTIONS
- //============================================================
- 
--#if defined(__i386__) || defined(__x86_64__)
-+#if defined(__i386__) || defined(__amd64__) || defined(__x86_64__)
- 
- 
- INLINE void ATTR_FORCE_INLINE
diff --git a/emulators/mame/files/patch-src__osd__sdl__sdlsync_ntc.c b/emulators/mame/files/patch-src__osd__sdl__sdlsync_ntc.c
deleted file mode 100644
index a0b3a330bdc1..000000000000
--- a/emulators/mame/files/patch-src__osd__sdl__sdlsync_ntc.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/osd/sdl/sdlsync_ntc.c.orig
-+++ src/osd/sdl/sdlsync_ntc.c
-@@ -102,7 +102,7 @@
- {
- 	INT32 myslot = (atomic_increment32(&lock->nextindex) - 1) & (WORK_MAX_THREADS - 1);
- 
--#if defined(__i386__) || defined(__x86_64__)
-+#if defined(__i386__) || defined(__amd64__) || defined(__x86_64__)
- 	register INT32 tmp;
- 	__asm__ __volatile__ (
- 		"1: clr    %[tmp]             ;"
-@@ -157,7 +157,7 @@
- 
- void osd_scalable_lock_release(osd_scalable_lock *lock, INT32 myslot)
- {
--#if defined(__i386__) || defined(__x86_64__)
-+#if defined(__i386__) || defined(__amd64__) || defined(__x86_64__)
- 	register INT32 tmp = TRUE;
- 	__asm__ __volatile__ (
- 		" xchg   %[haslock], %[tmp] ;"
-@@ -230,7 +230,7 @@
- 		do {
- 			register INT32 spin = 10000; // Convenient spin count
- 			register pthread_t tmp;
--#if defined(__i386__) || defined(__x86_64__)
-+#if defined(__i386__) || defined(__amd64__) || defined(__x86_64__)
- 			__asm__ __volatile__ (
- 				"1: pause                    ;"
- 				"   mov    %[holder], %[tmp] ;"
diff --git a/emulators/mame/files/patch-src__osd__sdl__sdlsync_os2.c b/emulators/mame/files/patch-src__osd__sdl__sdlsync_os2.c
deleted file mode 100644
index 14096ed98976..000000000000
--- a/emulators/mame/files/patch-src__osd__sdl__sdlsync_os2.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/osd/sdl/sdlsync_os2.c.orig
-+++ src/osd/sdl/sdlsync_os2.c
-@@ -91,7 +91,7 @@
- {
- 	INT32 myslot = (atomic_increment32(&lock->nextindex) - 1) & (WORK_MAX_THREADS - 1);
- 
--#if defined(__i386__) || defined(__x86_64__)
-+#if defined(__i386__) || defined(__amd64__) || defined(__x86_64__)
- 	register INT32 tmp;
- 	__asm__ __volatile__ (
- 		"1: clr    %[tmp]             ;"
-@@ -146,7 +146,7 @@
- 
- void osd_scalable_lock_release(osd_scalable_lock *lock, INT32 myslot)
- {
--#if defined(__i386__) || defined(__x86_64__)
-+#if defined(__i386__) || defined(__amd64__) || defined(__x86_64__)
- 	register INT32 tmp = TRUE;
- 	__asm__ __volatile__ (
- 		" xchg   %[haslock], %[tmp] ;"
-@@ -219,7 +219,7 @@
- 		do {
- 			register INT32 spin = 10000; // Convenient spin count
- 			register pthread_t tmp;
--#if defined(__i386__) || defined(__x86_64__)
-+#if defined(__i386__) || defined(__amd64__) || defined(__x86_64__)
- 			__asm__ __volatile__ (
- 				"1: pause                    ;"
- 				"   mov    %[holder], %[tmp] ;"
diff --git a/emulators/mame/files/patch-src_osd_sdl_sdlprefix.h b/emulators/mame/files/patch-src_osd_sdl_sdlprefix.h
new file mode 100644
index 000000000000..98f67043a063
--- /dev/null
+++ b/emulators/mame/files/patch-src_osd_sdl_sdlprefix.h
@@ -0,0 +1,10 @@
+--- src/osd/sdl/sdlprefix.h.orig	2015-04-29 06:18:54 UTC
++++ src/osd/sdl/sdlprefix.h
+@@ -50,6 +50,7 @@
+ #define NO_AFFINITY_NP 1
+ #elif defined(__DragonFly__)
+ #define SDLMAME_DRAGONFLY 1
++#define NO_AFFINITY_NP 1
+ #elif defined(__OpenBSD__)
+ #define SDLMAME_OPENBSD 1
+ #elif defined(__NetBSD__)
diff --git a/emulators/mame/files/pkg-message.in b/emulators/mame/files/pkg-message.in
index fac59f218c70..40ae3480735f 100644
--- a/emulators/mame/files/pkg-message.in
+++ b/emulators/mame/files/pkg-message.in
@@ -1,13 +1,11 @@
 ==============================================================================
 
-MAME has been installed.
+An example configuration file has been installed in
+"%%EXAMPLESDIR%%/%%MTARGET%%.ini"
+Should you create a "~/.%%MTARGET%%" directory and place it here or
+launch "%%MTARGET%% -createconfig" and place the %%MTARGET%%.ini created instead.
 
-A example configuration file has been installed in
-"%%EXAMPLESDIR%%/mame.ini"
-Should you create a "~/.mame" directory and place it here or
-launch "mame -createconfig" and place the mame.ini created instead.
-
-If you have a non-qwerty keyboard, you should put in your mame.ini :
+If you have a non-qwerty keyboard, you should put in your %%MTARGET%%.ini :
 keymap      1
 keymap_file %%DATADIR%%/keymaps/km-XX.txt
 
diff --git a/emulators/mame/files/mame.ini b/emulators/mame/files/target.ini.in
index 5cef9c80f185..df1a88fbd17d 100644
--- a/emulators/mame/files/mame.ini
+++ b/emulators/mame/files/target.ini.in
@@ -9,27 +9,27 @@ writeconfig               0
 #
 # CORE SEARCH PATH OPTIONS
 #
-rompath                   $HOME/.mame/roms
-hashpath                  $HOME/.mame/hash;/usr/local/share/mame/hash/
-samplepath                $HOME/.mame/samples
-artpath                   $HOME/.mame/artwork;/usr/local/share/mame/artwork/
-ctrlrpath                 $HOME/.mame/ctrlr
-inipath                   $HOME/.mame;.;ini
-fontpath                  $HOME/.mame/font;/usr/local/share/mame/
-cheatpath                 $HOME/.mame/cheat
-crosshairpath             $HOME/.mame/crosshair
+rompath                   $HOME/.%%MTARGET%%/roms
+hashpath                  $HOME/.%%MTARGET%%/hash;/usr/local/share/%%MTARGET%%/hash/
+samplepath                $HOME/.%%MTARGET%%/samples
+artpath                   $HOME/.%%MTARGET%%/artwork;/usr/local/share/%%MTARGET%%/artwork/
+ctrlrpath                 $HOME/.%%MTARGET%%/ctrlr
+inipath                   $HOME/.%%MTARGET%%;.;ini
+fontpath                  $HOME/.%%MTARGET%%/font;/usr/local/share/%%MTARGET%%/
+cheatpath                 $HOME/.%%MTARGET%%/cheat
+crosshairpath             $HOME/.%%MTARGET%%/crosshair
 
 #
 # CORE OUTPUT DIRECTORY OPTIONS
 #
-cfg_directory             $HOME/.mame/cfg
-nvram_directory           $HOME/.mame/nvram
-memcard_directory         $HOME/.mame/memcard
-input_directory           $HOME/.mame/inp
-state_directory           $HOME/.mame/sta
-snapshot_directory        $HOME/.mame/snap
-diff_directory            $HOME/.mame/diff
-comment_directory         $HOME/.mame/comments
+cfg_directory             $HOME/.%%MTARGET%%/cfg
+nvram_directory           $HOME/.%%MTARGET%%/nvram
+memcard_directory         $HOME/.%%MTARGET%%/memcard
+input_directory           $HOME/.%%MTARGET%%/inp
+state_directory           $HOME/.%%MTARGET%%/sta
+snapshot_directory        $HOME/.%%MTARGET%%/snap
+diff_directory            $HOME/.%%MTARGET%%/diff
+comment_directory         $HOME/.%%MTARGET%%/comments
 
 #
 # CORE STATE/PLAYBACK OPTIONS
@@ -193,16 +193,16 @@ gl_vbo                    1
 gl_pbo                    1
 gl_glsl                   0
 gl_glsl_filter            1
-glsl_shader_mame0         none
-glsl_shader_mame1         none
-glsl_shader_mame2         none
-glsl_shader_mame3         none
-glsl_shader_mame4         none
-glsl_shader_mame5         none
-glsl_shader_mame6         none
-glsl_shader_mame7         none
-glsl_shader_mame8         none
-glsl_shader_mame9         none
+glsl_shader.%%MTARGET%%0         none
+glsl_shader.%%MTARGET%%1         none
+glsl_shader.%%MTARGET%%2         none
+glsl_shader.%%MTARGET%%3         none
+glsl_shader.%%MTARGET%%4         none
+glsl_shader.%%MTARGET%%5         none
+glsl_shader.%%MTARGET%%6         none
+glsl_shader.%%MTARGET%%7         none
+glsl_shader.%%MTARGET%%8         none
+glsl_shader.%%MTARGET%%9         none
 glsl_shader_screen0       none
 glsl_shader_screen1       none
 glsl_shader_screen2       none
diff --git a/emulators/mame/pkg-plist b/emulators/mame/pkg-plist
index f92e367b606c..d59cddda3ae2 100644
--- a/emulators/mame/pkg-plist
+++ b/emulators/mame/pkg-plist
@@ -1,4 +1,4 @@
-bin/mame
+bin/%%EMULATOR%%
 libexec/mame/chdman
 libexec/mame/jedutil
 libexec/mame/ldresample
@@ -6,19 +6,6 @@ libexec/mame/ldverify
 libexec/mame/romcmp
 libexec/mame/testkeys
 libexec/mame/unidasm
-%%PORTDOCS%%%%DOCSDIR%%/docs/SDL.txt
-%%PORTDOCS%%%%DOCSDIR%%/docs/config.txt
-%%PORTDOCS%%%%DOCSDIR%%/docs/floppy.txt
-%%PORTDOCS%%%%DOCSDIR%%/docs/hlsl.txt
-%%PORTDOCS%%%%DOCSDIR%%/docs/imgtool.txt
-%%PORTDOCS%%%%DOCSDIR%%/docs/license.txt
-%%PORTDOCS%%%%DOCSDIR%%/docs/licenseinfo.txt
-%%PORTDOCS%%%%DOCSDIR%%/docs/m6502.txt
-%%PORTDOCS%%%%DOCSDIR%%/docs/mame.txt
-%%PORTDOCS%%%%DOCSDIR%%/docs/newvideo.txt
-%%PORTDOCS%%%%DOCSDIR%%/docs/nscsi.txt
-%%PORTDOCS%%%%DOCSDIR%%/docs/windows.txt
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mame.ini
 %%DATADIR%%/artwork/aperture.png
 %%DATADIR%%/artwork/white.png
 %%DATADIR%%/hash/32x.xml
@@ -31,38 +18,44 @@ libexec/mame/unidasm
 %%DATADIR%%/hash/a800.xml
 %%DATADIR%%/hash/a800_flop.xml
 %%DATADIR%%/hash/abc1600.xml
-%%DATADIR%%/hash/abc80.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/adam_cart.xml
 %%DATADIR%%/hash/adam_cass.xml
 %%DATADIR%%/hash/adam_flop.xml
 %%DATADIR%%/hash/advantage.xml
 %%DATADIR%%/hash/advision.xml
 %%DATADIR%%/hash/aim65_cart.xml
+%%DATADIR%%/hash/aleste.xml
 %%DATADIR%%/hash/alice32.xml
 %%DATADIR%%/hash/alice90.xml
 %%DATADIR%%/hash/alphatro_flop.xml
-%%DATADIR%%/hash/amiga1000_flop.xml
-%%DATADIR%%/hash/amiga1200_flop.xml
-%%DATADIR%%/hash/amiga3000_flop.xml
-%%DATADIR%%/hash/amiga500_flop.xml
-%%DATADIR%%/hash/amiga500plus_flop.xml
-%%DATADIR%%/hash/amiga600_flop.xml
+%%DATADIR%%/hash/altos5.xml
+%%DATADIR%%/hash/amiga_a1000.xml
+%%DATADIR%%/hash/amiga_a3000.xml
+%%DATADIR%%/hash/amiga_apps.xml
 %%DATADIR%%/hash/amiga_flop.xml
+%%DATADIR%%/hash/amiga_hardware.xml
+%%DATADIR%%/hash/amiga_workbench.xml
 %%DATADIR%%/hash/amigaaga_flop.xml
 %%DATADIR%%/hash/amigaecs_flop.xml
 %%DATADIR%%/hash/amigaocs_flop.xml
 %%DATADIR%%/hash/ampro.xml
 %%DATADIR%%/hash/apc.xml
+%%DATADIR%%/hash/apfimag_cass.xml
 %%DATADIR%%/hash/apfm1000.xml
 %%DATADIR%%/hash/apogee.xml
+%%DATADIR%%/hash/apollo_ctape.xml
 %%DATADIR%%/hash/apple1.xml
 %%DATADIR%%/hash/apple2.xml
 %%DATADIR%%/hash/apple2gs.xml
+%%DATADIR%%/hash/apple3.xml
 %%DATADIR%%/hash/aquarius.xml
 %%DATADIR%%/hash/arcadia.xml
+%%DATADIR%%/hash/archimedes.xml
 %%DATADIR%%/hash/astrocde.xml
 %%DATADIR%%/hash/atom.xml
 %%DATADIR%%/hash/attache.xml
@@ -92,6 +85,8 @@ libexec/mame/unidasm
 %%DATADIR%%/hash/cd32.xml
 %%DATADIR%%/hash/cdi.xml
 %%DATADIR%%/hash/cdtv.xml
+%%DATADIR%%/hash/cgenie_cart.xml
+%%DATADIR%%/hash/cgenie_cass.xml
 %%DATADIR%%/hash/channelf.xml
 %%DATADIR%%/hash/coco_cart.xml
 %%DATADIR%%/hash/coco_flop.xml
@@ -103,7 +98,11 @@ libexec/mame/unidasm
 %%DATADIR%%/hash/cpc_cass.xml
 %%DATADIR%%/hash/cpc_flop.xml
 %%DATADIR%%/hash/crvision.xml
+%%DATADIR%%/hash/cx3000tc.xml
+%%DATADIR%%/hash/dai_cass.xml
+%%DATADIR%%/hash/database.xml
 %%DATADIR%%/hash/dim68k.xml
+%%DATADIR%%/hash/dmv.xml
 %%DATADIR%%/hash/dps1.xml
 %%DATADIR%%/hash/ec1841.xml
 %%DATADIR%%/hash/einstein.xml
@@ -111,20 +110,27 @@ libexec/mame/unidasm
 %%DATADIR%%/hash/ep64_cart.xml
 %%DATADIR%%/hash/ep64_cass.xml
 %%DATADIR%%/hash/ep64_flop.xml
+%%DATADIR%%/hash/epson_cpm.xml
+%%DATADIR%%/hash/exl100.xml
 %%DATADIR%%/hash/famicom_cass.xml
 %%DATADIR%%/hash/famicom_flop.xml
 %%DATADIR%%/hash/fm77av.xml
 %%DATADIR%%/hash/fm7_cass.xml
 %%DATADIR%%/hash/fm7_disk.xml
+%%DATADIR%%/hash/fmtowns_cd.xml
 %%DATADIR%%/hash/g7400.xml
 %%DATADIR%%/hash/galaxy.xml
+%%DATADIR%%/hash/gamate.xml
 %%DATADIR%%/hash/gameboy.xml
 %%DATADIR%%/hash/gamecom.xml
 %%DATADIR%%/hash/gamegear.xml
+%%DATADIR%%/hash/gameking.xml
 %%DATADIR%%/hash/gamepock.xml
 %%DATADIR%%/hash/gba.xml
 %%DATADIR%%/hash/gbcolor.xml
 %%DATADIR%%/hash/genius.xml
+%%DATADIR%%/hash/gimix.xml
+%%DATADIR%%/hash/gjmovie.xml
 %%DATADIR%%/hash/gl2000.xml
 %%DATADIR%%/hash/gl6000sl.xml
 %%DATADIR%%/hash/glcolor.xml
@@ -135,7 +141,7 @@ libexec/mame/unidasm
 %%DATADIR%%/hash/hp9835a_rom.xml
 %%DATADIR%%/hash/hp9845a_rom.xml
 %%DATADIR%%/hash/hp9845b_rom.xml
-%%DATADIR%%/hash/hx20_flop.xml
+%%DATADIR%%/hash/ht68k.xml
 %%DATADIR%%/hash/ibm5140.xml
 %%DATADIR%%/hash/ibm5150.xml
 %%DATADIR%%/hash/ibm5150_cass.xml
@@ -153,21 +159,27 @@ libexec/mame/unidasm
 %%DATADIR%%/hash/iq151_flop.xml
 %%DATADIR%%/hash/jaguar.xml
 %%DATADIR%%/hash/juicebox.xml
+%%DATADIR%%/hash/jupace_cass.xml
 %%DATADIR%%/hash/kayproii.xml
 %%DATADIR%%/hash/kc_cart.xml
 %%DATADIR%%/hash/kc_cass.xml
 %%DATADIR%%/hash/kc_flop.xml
 %%DATADIR%%/hash/korvet_flop.xml
+%%DATADIR%%/hash/lantutor.xml
+%%DATADIR%%/hash/leapster.xml
 %%DATADIR%%/hash/lisa.xml
 %%DATADIR%%/hash/lisa2.xml
 %%DATADIR%%/hash/lviv.xml
 %%DATADIR%%/hash/lynx.xml
 %%DATADIR%%/hash/m20.xml
-%%DATADIR%%/hash/m5.xml
+%%DATADIR%%/hash/m5_cart.xml
+%%DATADIR%%/hash/m5_cass.xml
 %%DATADIR%%/hash/mac_flop.xml
 %%DATADIR%%/hash/mac_hdd.xml
 %%DATADIR%%/hash/mbc200.xml
 %%DATADIR%%/hash/mbc55x.xml
+%%DATADIR%%/hash/mc10.xml
+%%DATADIR%%/hash/mc1000_cass.xml
 %%DATADIR%%/hash/mc1502_flop.xml
 %%DATADIR%%/hash/megacd.xml
 %%DATADIR%%/hash/megacdj.xml
@@ -176,10 +188,13 @@ libexec/mame/unidasm
 %%DATADIR%%/hash/megapc.xml
 %%DATADIR%%/hash/megatech.xml
 %%DATADIR%%/hash/microvision.xml
-%%DATADIR%%/hash/mikrosha.xml
+%%DATADIR%%/hash/mikro80.xml
+%%DATADIR%%/hash/mikrosha_cart.xml
+%%DATADIR%%/hash/mikrosha_cass.xml
 %%DATADIR%%/hash/misterx.xml
 %%DATADIR%%/hash/mm1_flop.xml
 %%DATADIR%%/hash/mo5_cart.xml
+%%DATADIR%%/hash/mpu1000.xml
 %%DATADIR%%/hash/mpz80.xml
 %%DATADIR%%/hash/msx.hsi
 %%DATADIR%%/hash/msx1_cart.xml
@@ -187,7 +202,11 @@ libexec/mame/unidasm
 %%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/msx2p_flop.xml
+%%DATADIR%%/hash/msxr_flop.xml
+%%DATADIR%%/hash/mtx_cass.xml
 %%DATADIR%%/hash/myvision.xml
 %%DATADIR%%/hash/mz2000_cass.xml
 %%DATADIR%%/hash/mz2000_flop.xml
@@ -234,6 +253,8 @@ libexec/mame/unidasm
 %%DATADIR%%/hash/pcw.xml
 %%DATADIR%%/hash/pcw16.xml
 %%DATADIR%%/hash/pecom_cass.xml
+%%DATADIR%%/hash/pegasus_cart.xml
+%%DATADIR%%/hash/pencil2.xml
 %%DATADIR%%/hash/pentagon_cass.xml
 %%DATADIR%%/hash/pet_cass.xml
 %%DATADIR%%/hash/pet_flop.xml
@@ -245,11 +266,14 @@ libexec/mame/unidasm
 %%DATADIR%%/hash/plus4_cart.xml
 %%DATADIR%%/hash/plus4_cass.xml
 %%DATADIR%%/hash/plus4_flop.xml
+%%DATADIR%%/hash/pmd85_cass.xml
 %%DATADIR%%/hash/pokemini.xml
 %%DATADIR%%/hash/prof180.xml
 %%DATADIR%%/hash/prof80.xml
-%%DATADIR%%/hash/psion.xml
+%%DATADIR%%/hash/psion1.xml
+%%DATADIR%%/hash/psion2.xml
 %%DATADIR%%/hash/psx.xml
+%%DATADIR%%/hash/pt68k2.xml
 %%DATADIR%%/hash/pv1000.xml
 %%DATADIR%%/hash/pv2000.xml
 %%DATADIR%%/hash/px4_cart.xml
@@ -258,8 +282,10 @@ libexec/mame/unidasm
 %%DATADIR%%/hash/ql_cass.xml
 %%DATADIR%%/hash/ql_flop.xml
 %%DATADIR%%/hash/qx10_flop.xml
-%%DATADIR%%/hash/radio86.xml
+%%DATADIR%%/hash/radio86_cart.xml
+%%DATADIR%%/hash/radio86_cass.xml
 %%DATADIR%%/hash/rainbow.xml
+%%DATADIR%%/hash/rwtrntcs.xml
 %%DATADIR%%/hash/rx78.xml
 %%DATADIR%%/hash/sage2.xml
 %%DATADIR%%/hash/samcoupe_cass.xml
@@ -280,17 +306,21 @@ libexec/mame/unidasm
 %%DATADIR%%/hash/snes_bspack.xml
 %%DATADIR%%/hash/snes_strom.xml
 %%DATADIR%%/hash/snes_vkun.xml
+%%DATADIR%%/hash/snread.xml
+%%DATADIR%%/hash/snspell.xml
 %%DATADIR%%/hash/socrates.xml
 %%DATADIR%%/hash/softbox.xml
 %%DATADIR%%/hash/softwarelist.dtd
+%%DATADIR%%/hash/sol20_cass.xml
 %%DATADIR%%/hash/sorcerer_cart.xml
 %%DATADIR%%/hash/sorcerer_cass.xml
 %%DATADIR%%/hash/sorcerer_flop.xml
+%%DATADIR%%/hash/spc1000_cass.xml
 %%DATADIR%%/hash/special_cass.xml
 %%DATADIR%%/hash/special_flop.xml
-%%DATADIR%%/hash/spectrum.xml
+%%DATADIR%%/hash/specpls3_flop.xml
+%%DATADIR%%/hash/spectrum_cart.xml
 %%DATADIR%%/hash/spectrum_cass.xml
-%%DATADIR%%/hash/spectrum_flop.xml
 %%DATADIR%%/hash/st_cart.xml
 %%DATADIR%%/hash/st_flop.xml
 %%DATADIR%%/hash/studio2.xml
@@ -310,20 +340,25 @@ libexec/mame/unidasm
 %%DATADIR%%/hash/tdv2324.xml
 %%DATADIR%%/hash/tek4052_cart.xml
 %%DATADIR%%/hash/tg16.xml
+%%DATADIR%%/hash/ti74_cart.xml
 %%DATADIR%%/hash/ti99_cart.xml
 %%DATADIR%%/hash/tiki100.xml
+%%DATADIR%%/hash/timex_dock.xml
 %%DATADIR%%/hash/to770_cart.xml
 %%DATADIR%%/hash/to7_cart.xml
 %%DATADIR%%/hash/trs80m2.xml
 %%DATADIR%%/hash/trsm100.xml
 %%DATADIR%%/hash/tutor.xml
 %%DATADIR%%/hash/tvc_cart.xml
+%%DATADIR%%/hash/tvc_cass.xml
+%%DATADIR%%/hash/tvc_flop.xml
 %%DATADIR%%/hash/ut88.xml
 %%DATADIR%%/hash/uzebox.xml
 %%DATADIR%%/hash/v1050_flop.xml
 %%DATADIR%%/hash/v1050_hdd.xml
 %%DATADIR%%/hash/vboy.xml
 %%DATADIR%%/hash/vc4000.xml
+%%DATADIR%%/hash/vector06_cart.xml
 %%DATADIR%%/hash/vectrex.xml
 %%DATADIR%%/hash/vg5k.xml
 %%DATADIR%%/hash/vic10.xml
@@ -336,14 +371,17 @@ 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/vz_cass.xml
 %%DATADIR%%/hash/wangpc.xml
 %%DATADIR%%/hash/wicat.xml
 %%DATADIR%%/hash/wmbullet.xml
 %%DATADIR%%/hash/wscolor.xml
 %%DATADIR%%/hash/wswan.xml
 %%DATADIR%%/hash/x07_card.xml
+%%DATADIR%%/hash/x07_cass.xml
 %%DATADIR%%/hash/x1_cass.xml
 %%DATADIR%%/hash/x1_flop.xml
 %%DATADIR%%/hash/x68k_flop.xml