9 files changed, 301 insertions, 278 deletions

diff --git a/emulators/mess/Makefile b/emulators/mess/Makefile
index 30f94e5364ca..80e18840a80a 100644
--- a/emulators/mess/Makefile
+++ b/emulators/mess/Makefile
@@ -6,83 +6,94 @@
 #
 
 PORTNAME=	mess
-PORTVERSION=	0.139
-PORTREVISION=	1
+PORTVERSION=	0.145
 CATEGORIES=	emulators
-MASTER_SITES=	http://www.aarongiles.com/mirror/releases/:mame \
-		http://www.mess.org/files/:mess \
-		ftp://ftp.arcadebsd.org/pub/ArcadeBSD/ports/distfiles/
-DISTFILES=	mame${PORTVERSION:S/.//}s.zip:mame \
-		mess${PORTVERSION:S/.//}s.zip:mess
+MASTER_SITES=	http://www.mess.org/_media/downloads:/
+DISTNAME=	${PORTNAME}${PORTVERSION:S/.//}s
+DIST_SUBDIR=	mame
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The popular MESS (Multiple Emulator Super System)
 
-BROKEN=		does not compile
+LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2 \
+		fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
+RUN_DEPENDS=	liberation-fonts-ttf>=0:${PORTSDIR}/x11-fonts/liberation-fonts-ttf
+
+OPTIONS=	BUILTIN_DEBUGGER "Enable builtin debugger support" off
+
+ONLY_FOR_ARCHS=	i386 amd64
 
-USE_ZIP=	yes
 NO_WRKSUBDIR=	yes
-USE_XORG=	xext xrender xinerama xi
+
+USE_ZIP=	yes
+USE_XORG=	xext xi xinerama xrender
 USE_GL=		gl
-USE_GNOME?=	gtk20 gconf2
-USE_GMAKE=	yes
-MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}" TARGET=mess
-USE_SDL=	sdl
+USE_SDL=	sdl ttf
 USE_GCC=	4.4+
+USE_GMAKE=	yes
+MAKE_ENV=	NOWERROR=1 OPT_FLAGS="${CXXFLAGS}" GCC_LDFLAGS="${LDFLAGS}"
 MAKEFILE=	makefile
-ONLY_FOR_ARCHS=	i386 amd64
-SUB_FILES=	pkg-message
-USE_DOS2UNIX=	sdl.mak debugcpu.c makefile
+MAKE_JOBS_SAFE=	yes
 
-OPTIONS=	DEBUG "Build mess debugger" off
+CXXFLAGS+=	-fpermissive
 
-.include <bsd.port.pre.mk>
+SUB_FILES=	pkg-message
 
-.if !defined(WITH_DEBUG)
-USE_GNOME=		#
-EXTRA_PATCHES+=		${FILESDIR}/sdl.mak.patch
+.include <bsd.port.options.mk>
+
+.if defined(WITH_BUILTIN_DEBUGGER)
+USE_GNOME=	gtk20 gconf2
+MAKE_ENV+=	GTK_INCPATH="$$(pkg-config --cflags-only-I gtk+-2.0 gconf-2.0)" \
+		GTK_CCOMFLAGS="$$(pkg-config --cflags-only-other gtk+-2.0 gconf-2.0)" \
+		GTK_LIBS="$$(pkg-config --libs gtk+-2.0 gconf-2.0)"
+.else
+MAKE_ENV+=	NO_DEBUGGER=1 \
+		GTK_INCPATH="" \
+		GTK_CCOMFLAGS="" \
+		GTK_LIBS=""
 .endif
 
-MAKE_JOBS_SAFE=	yes
+.include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64"
 MAKE_ENV+=	PTR64=1
 .endif
-.if ${ARCH} == "sparc64"
-BROKEN=		Does not compile on sparc64
-.endif
-
-post-extract:
-	@${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${WRKDIR}/mame.zip ${EXTRACT_AFTER_ARGS}
-	@${RM} -f ${WRKDIR}/mame.zip
 
 post-patch:
-	@${REINPLACE_CMD} -e "s|ui.bdf|${DATADIR}/ui.bdf|g" ${WRKSRC}/src/emu/ui.c
+	@${REINPLACE_CMD} -e \
+		's|^BUILD_EXPAT|# BUILD_EXPAT| ; \
+		 s|^BUILD_ZLIB|# BUILD_ZLIB| ; \
+		 /--warn-common/s|= -Wl,|= $$(GCC_LDFLAGS) -Wl,| ; \
+		 s| = @gcc| := $$(CC)| ; \
+		 s| = @g++| := $$(CXX)| ; \
+		 s|^FULLNAME =.*|FULLNAME = $$(NAME)|' ${WRKSRC}/makefile
+	@${REINPLACE_CMD} -e \
+		'/-system/s|/usr/local/|${LOCALBASE}/| ; \
+		 /--cflags-only-I gtk+-2.0/s|=.*|= $$(GTK_INCPATH)| ; \
+		 /--cflags-only-other gtk+-2.0/s|=.*|= $$(GTK_CCOMFLAGS)| ; \
+		 /--libs gtk+-2.0/s|=.*|= $$(GTK_LIBS)| ; \
+		 /X11R6/s|^|#|' ${WRKSRC}/src/osd/sdl/sdl.mak
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/
-	${MKDIR} ${PREFIX}/libexec/${PORTNAME}
-	${INSTALL_PROGRAM} ${WRKSRC}/chdman ${PREFIX}/libexec/${PORTNAME}
-	${INSTALL_PROGRAM} ${WRKSRC}/imgtool ${PREFIX}/libexec/${PORTNAME}
-	${INSTALL_PROGRAM} ${WRKSRC}/jedutil ${PREFIX}/libexec/${PORTNAME}
-	${INSTALL_PROGRAM} ${WRKSRC}/ldresample ${PREFIX}/libexec/${PORTNAME}
-	${INSTALL_PROGRAM} ${WRKSRC}/ldverify ${PREFIX}/libexec/${PORTNAME}
-	${INSTALL_PROGRAM} ${WRKSRC}/testkeys ${PREFIX}/libexec/${PORTNAME}
-	${INSTALL_PROGRAM} ${WRKSRC}/unidasm ${PREFIX}/libexec/${PORTNAME}
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
+	@${MKDIR} ${PREFIX}/libexec/${PORTNAME}
+.for FILE in castool chdman imgtool jedutil ldresample ldverify romcmp \
+	testkeys unidasm
+	${INSTALL_PROGRAM} ${WRKSRC}/${FILE} ${PREFIX}/libexec/${PORTNAME}
+.endfor
+	@${MKDIR} ${DATADIR}
+	@(cd ${WRKSRC} && ${COPYTREE_SHARE} artwork ${DATADIR})
+	@(cd ${WRKSRC} && ${COPYTREE_SHARE} hash ${DATADIR})
+	@(cd ${WRKSRC}/src/osd/sdl && ${COPYTREE_SHARE} keymaps ${DATADIR})
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.txt ${DOCSDIR}
-	${CP} -R ${WRKSRC}/docs ${DOCSDIR}
+	@(cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${DOCSDIR})
+.endif
+.if !defined(NOPORTEXAMPLES)
+	@${MKDIR} ${EXAMPLESDIR}
+	${INSTALL_DATA} ${FILESDIR}/mess.ini ${EXAMPLESDIR}
 .endif
-	${MKDIR} ${DATADIR}
-	${CP} -R ${WRKSRC}/hash ${DATADIR}/
-	${CP} -R ${WRKSRC}/artwork ${DATADIR}/
-	${MKDIR} ${EXAMPLESDIR}
-	${CP} ${FILESDIR}/mess.ini ${EXAMPLESDIR}
-
-post-install:
-	@${ECHO_CMD}
 	@${CAT} ${PKGMESSAGE}
-	@${ECHO_CMD}
 
 .include <bsd.port.post.mk>
diff --git a/emulators/mess/distinfo b/emulators/mess/distinfo
index d18289a303bb..65a820046435 100644
--- a/emulators/mess/distinfo
+++ b/emulators/mess/distinfo
@@ -1,4 +1,2 @@
-SHA256 (mame0139s.zip) = e9dc268530b9a2b6fe17330af96dc5680dadba1b5e444bf7ef8fa1f15de7f3d6
-SIZE (mame0139s.zip) = 16706970
-SHA256 (mess0139s.zip) = def723e0e87c6b541c145c9a5c92d86187d530662fb88b186f0c596e1e1309ed
-SIZE (mess0139s.zip) = 18474426
+SHA256 (mame/mess0145s.zip) = 36f871148454e5113b8d7a04c2bd086f7e39f218ea4dc7c612bfc424ea406d4e
+SIZE (mame/mess0145s.zip) = 61648176
diff --git a/emulators/mess/files/mess.ini b/emulators/mess/files/mess.ini
index f40ce56853d5..e1bbab822520 100644
--- a/emulators/mess/files/mess.ini
+++ b/emulators/mess/files/mess.ini
@@ -4,17 +4,18 @@
 # CORE CONFIGURATION OPTIONS
 #
 readconfig                1
+writeconfig               0
 
 #
 # CORE SEARCH PATH OPTIONS
 #
 rompath                   $HOME/.mess/roms
-hashpath                  $HOME/.mess/hash;/usr/local/share/sdlmess/hash/
+hashpath                  $HOME/.mess/hash;/usr/local/share/mess/hash/
 samplepath                $HOME/.mess/samples
-artpath                   $HOME/.mess/artwork;/usr/local/share/sdlmess/artwork/
+artpath                   $HOME/.mess/artwork;/usr/local/share/mess/artwork/
 ctrlrpath                 $HOME/.mess/ctrlr
 inipath                   $HOME/.mess;.;ini
-fontpath                  $HOME/.mess/font;/usr/local/share/sdlmess/
+fontpath                  $HOME/.mess/font;/usr/local/share/mess/
 cheatpath                 $HOME/.mess/cheat
 crosshairpath             $HOME/.mess/crosshair
 
@@ -74,6 +75,8 @@ artwork_crop              0
 use_backdrops             1
 use_overlays              1
 use_bezels                1
+use_cpanels               1
+use_marquees              1
 
 #
 # CORE SCREEN OPTIONS
@@ -82,6 +85,7 @@ brightness                1.0
 contrast                  1.0
 gamma                     1.0
 pause_brightness          0.65
+effect                    none
 
 #
 # CORE VECTOR OPTIONS
@@ -113,6 +117,9 @@ offscreen_reload          0
 joystick_map              auto
 joystick_deadzone         0.3
 joystick_saturation       0.85
+natural                   0
+joystick_contradictory    0
+coin_impulse              0
 
 #
 # CORE INPUT AUTOMATIC ENABLE OPTIONS
@@ -134,6 +141,7 @@ verbose                   0
 update_in_pause           0
 debug                     0
 debugscript               
+debug_internal            0
 
 #
 # CORE MISC OPTIONS
@@ -141,17 +149,23 @@ debugscript
 bios                      
 cheat                     0
 skip_gameinfo             0
+uifont                    default
+ramsize                   
+confirm_quit              0
 
 #
 # DEBUGGING OPTIONS
 #
 oslog                     0
+watchdog                  0
 
 #
 # PERFORMANCE OPTIONS
 #
 multithreading            0
+numprocessors             auto
 sdlvideofps               0
+bench                     0
 
 #
 # VIDEO OPTIONS
@@ -162,10 +176,10 @@ window                    0
 maximize                  1
 keepaspect                1
 unevenstretch             1
-effect                    none
 centerh                   1
 centerv                   1
 waitvsync                 0
+syncrefresh               0
 scalemode                 none
 
 #
@@ -262,11 +276,3 @@ sixaxis                   0
 videodriver               auto
 audiodriver               auto
 gl_lib                    auto
-
-#
-# MESS SPECIFIC OPTIONS
-#
-ramsize                   
-writeconfig               0
-skip_warnings             0
-natural                   0
diff --git a/emulators/mess/files/patch-debugcpu.c b/emulators/mess/files/patch-debugcpu.c
deleted file mode 100644
index a1ae1edd89ed..000000000000
--- a/emulators/mess/files/patch-debugcpu.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/emu/debug/debugcpu.c.orig	2010-08-01 23:31:06.000000000 +0200
-+++ src/emu/debug/debugcpu.c	2010-08-01 23:31:23.000000000 +0200
-@@ -49,7 +49,9 @@
- #include "debugint/debugint.h"
- #include "uiinput.h"
- #include <ctype.h>
--
-+#ifdef __FreeBSD__
-+#undef tolower
-+#endif
- 
- 
- /***************************************************************************
diff --git a/emulators/mess/files/patch-makefile b/emulators/mess/files/patch-makefile
deleted file mode 100644
index f9d1b57ad89d..000000000000
--- a/emulators/mess/files/patch-makefile
+++ /dev/null
@@ -1,22 +0,0 @@
---- makefile.orig	2010-08-01 23:04:35.000000000 +0200
-+++ makefile	2010-08-01 23:04:58.000000000 +0200
-@@ -295,8 +295,8 @@
- 
- # compiler, linker and utilities
- AR = @ar
--CC = @gcc
--LD = @g++
-+CC:= @$(CC)
-+LD:= @$(CXX)
- MD = -mkdir$(EXE)
- RM = @rm -f
- OBJDUMP = @objdump
-@@ -344,7 +344,7 @@
- endif
- 
- # fullname is prefix+name+suffix+suffix64+suffixdebug
--FULLNAME = $(PREFIX)$(PREFIXSDL)$(NAME)$(SUFFIX)$(SUFFIX64)$(SUFFIXDEBUG)$(SUFFIXPROFILE)
-+FULLNAME = $(NAME)
- 
- # add an EXE suffix to get the final emulator name
- EMULATOR = $(FULLNAME)$(EXE)
diff --git a/emulators/mess/files/pkg-message.in b/emulators/mess/files/pkg-message.in
index 5884f2340888..13aa0794deb3 100644
--- a/emulators/mess/files/pkg-message.in
+++ b/emulators/mess/files/pkg-message.in
@@ -1,13 +1,14 @@
 ==============================================================================
 
-SDLMESS has been installed.
+MESS has been installed.
 
-A example configuration file has been installed in "%%EXAMPLESDIR%%/mess.ini"
+A example configuration file has been installed in
+"%%EXAMPLESDIR%%/mess.ini"
 Should you create a "~/.mess" directory and place it here or
-launch "sdlmess -createconfig" and place the mess.ini created instead.
+launch "mess -createconfig" and place the mess.ini created instead.
 
-If you have a non-qwerty keyboard, you should put in your mame.ini :
-keymap 	    1
+If you have a non-qwerty keyboard, you should put in your mess.ini :
+keymap      1
 keymap_file %%DATADIR%%/keymaps/km-XX.txt
 
 ==============================================================================
diff --git a/emulators/mess/files/sdl.mak.patch b/emulators/mess/files/sdl.mak.patch
deleted file mode 100644
index 182a912af4d3..000000000000
--- a/emulators/mess/files/sdl.mak.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- src/osd/sdl/sdl.mak.orig	2010-02-14 04:47:30.000000000 +0100
-+++ src/osd/sdl/sdl.mak	2010-08-02 11:50:12.000000000 +0200
-@@ -139,7 +139,8 @@
- ifeq ($(TARGETOS),freebsd)
- BASE_TARGETOS = unix
- SYNC_IMPLEMENTATION = tc
--DEFS += -DNO_AFFINITY_NP
-+DEFS += -DNO_AFFINITY_NP -DNO_DEBUGGER
-+NO_DEBUGGER=1
- # /usr/local/include is not considered a system include directory
- # on FreeBSD. GL.h resides there and throws warnings
- CCOMFLAGS += -isystem /usr/local/include
-@@ -304,7 +305,7 @@
- ifeq ($(BASE_TARGETOS),unix)
- 
- DEFS += -DSDLMAME_UNIX
--DEBUGOBJS = $(SDLOBJ)/debugwin.o $(SDLOBJ)/dview.o $(SDLOBJ)/debug-sup.o $(SDLOBJ)/debug-intf.o
-+DEBUGOBJS = $(SDLOBJ)/debugwin.o
- LIBGL = -lGL
- ifeq ($(NO_X11),1)
- NO_DEBUGGER = 1
-@@ -454,8 +455,8 @@
- 
- # the new debugger relies on GTK+ in addition to the base SDLMAME needs
- # Non-X11 builds can not use the debugger
--CCOMFLAGS += `pkg-config --cflags gtk+-2.0` `pkg-config --cflags gconf-2.0`
--LIBS += `pkg-config --libs gtk+-2.0` `pkg-config --libs gconf-2.0`
-+#CCOMFLAGS += `pkg-config --cflags gtk+-2.0` `pkg-config --cflags gconf-2.0`
-+#LIBS += `pkg-config --libs gtk+-2.0` `pkg-config --libs gconf-2.0`
- #CCOMFLAGS += -DGTK_DISABLE_DEPRECATED
- 
- # some systems still put important things in a different prefix
diff --git a/emulators/mess/pkg-descr b/emulators/mess/pkg-descr
index b297a4b68fa9..d3303c1fb516 100644
--- a/emulators/mess/pkg-descr
+++ b/emulators/mess/pkg-descr
@@ -1,17 +1,9 @@
-SDLMAME is a port of the popular MAME. There are a few principles that guide
-it's development:
+MESS is an acronym that stands for Multi Emulator Super System. MESS will
+more or less faithfully reproduce computer and console systems on a PC.
+MESS can currently emulate over 250 systems from the last 5 decades.
 
-1) Run on Linux/Unix, Mac OS X, and other SDL supported operating systems with
-   as few changes as possible to the base Win32 code. This means we can track
-   changes faster than larger more conventional ports such as MacMAME, and we
-   also maintain what I call "Firefox compatibilty" where learning a major app
-   only needs to be done once per application, and it then applies across many
-   operating systems. If you can use the command-line Win32 MAME, you already
-   know how to use SDLMAME on any platform you may encounter it on.
+MESS emulates the hardware of the systems and sometimes utilizes ROM
+images to load programs and games. Therefore, these systems are NOT
+simulations, but the actual emulations of the hardware.
 
-2) MAME developers are important. By keeping quickly up to date, we make it
-   easy for people on non-Windows platforms to make and submit changes to the
-   core MAME code, and we offer native implementations of MAME's multi-window
-   GUI debugger on both Linux/Unix and Mac OS X.
-
-WWW: http://rbelmont.mameworld.info/?page_id=163
+WWW: http://www.mess.org/
diff --git a/emulators/mess/pkg-plist b/emulators/mess/pkg-plist
index da0c180d4e22..8280af770b95 100644
--- a/emulators/mess/pkg-plist
+++ b/emulators/mess/pkg-plist
@@ -1,63 +1,43 @@
 bin/mess
+libexec/mess/castool
 libexec/mess/chdman
 libexec/mess/imgtool
 libexec/mess/jedutil
 libexec/mess/ldresample
 libexec/mess/ldverify
+libexec/mess/romcmp
 libexec/mess/testkeys
 libexec/mess/unidasm
-%%PORTDOCS%%%%DOCSDIR%%/whatsnew.txt
+%%PORTDOCS%%%%DOCSDIR%%/docs/compiling.htm
 %%PORTDOCS%%%%DOCSDIR%%/docs/config.txt
 %%PORTDOCS%%%%DOCSDIR%%/docs/credits.htm
 %%PORTDOCS%%%%DOCSDIR%%/docs/faq.htm
+%%PORTDOCS%%%%DOCSDIR%%/docs/hlsl.txt
+%%PORTDOCS%%%%DOCSDIR%%/docs/howto.htm
 %%PORTDOCS%%%%DOCSDIR%%/docs/imgtool.txt
 %%PORTDOCS%%%%DOCSDIR%%/docs/license.txt
 %%PORTDOCS%%%%DOCSDIR%%/docs/mame.txt
 %%PORTDOCS%%%%DOCSDIR%%/docs/messnew.txt
 %%PORTDOCS%%%%DOCSDIR%%/docs/newvideo.txt
 %%PORTDOCS%%%%DOCSDIR%%/docs/windows.txt
-%%PORTDOCS%%%%DOCSDIR%%/docs/wintoc.xml
-%%PORTDOCS%%%%DOCSDIR%%/docs/windows/choice.htm
-%%PORTDOCS%%%%DOCSDIR%%/docs/windows/compile.htm
-%%PORTDOCS%%%%DOCSDIR%%/docs/windows/config.htm
-%%PORTDOCS%%%%DOCSDIR%%/docs/windows/control.htm
-%%PORTDOCS%%%%DOCSDIR%%/docs/windows/guiconf.htm
-%%PORTDOCS%%%%DOCSDIR%%/docs/windows/guiuse.htm
-%%PORTDOCS%%%%DOCSDIR%%/docs/windows/install.htm
-%%PORTDOCS%%%%DOCSDIR%%/docs/windows/instroms.htm
-%%PORTDOCS%%%%DOCSDIR%%/docs/windows/main.htm
-%%PORTDOCS%%%%DOCSDIR%%/docs/windows/mgeroms.htm
-%%PORTDOCS%%%%DOCSDIR%%/docs/windows/osmenu.htm
-%%PORTDOCS%%%%DOCSDIR%%/docs/windows/runsw.htm
-%%PORTDOCS%%%%DOCSDIR%%/docs/windows/suppsys.htm
-%%PORTDOCS%%%%DOCSDIR%%/docs/windows/update.htm
-%%PORTDOCS%%%%DOCSDIR%%/docs/windows/win32cmd.htm
-%%PORTDOCS%%%%DOCSDIR%%/docs/windows/images/command.gif
-%%PORTDOCS%%%%DOCSDIR%%/docs/windows/images/frog.gif
-%%PORTDOCS%%%%DOCSDIR%%/docs/windows/images/gui.gif
-%%PORTDOCS%%%%DOCSDIR%%/docs/windows/images/guiaudit.gif
-%%PORTDOCS%%%%DOCSDIR%%/docs/windows/images/iniicon.gif
-%%PORTDOCS%%%%DOCSDIR%%/docs/windows/images/keybcnt.gif
-%%PORTDOCS%%%%DOCSDIR%%/docs/windows/images/logo.gif
-%%PORTDOCS%%%%DOCSDIR%%/docs/windows/images/newmenu.gif
-%%PORTDOCS%%%%DOCSDIR%%/docs/windows/images/oldmenu.gif
-%%PORTDOCS%%%%DOCSDIR%%/docs/windows/images/prop.gif
-%%PORTDOCS%%%%DOCSDIR%%/docs/windows/images/propadv.gif
-%%PORTDOCS%%%%DOCSDIR%%/docs/windows/images/propctrlr.gif
-%%PORTDOCS%%%%DOCSDIR%%/docs/windows/images/propd3d.gif
-%%PORTDOCS%%%%DOCSDIR%%/docs/windows/images/propmisc.gif
-%%PORTDOCS%%%%DOCSDIR%%/docs/windows/images/props.gif
-%%PORTDOCS%%%%DOCSDIR%%/docs/windows/images/propsnd.gif
-%%PORTDOCS%%%%DOCSDIR%%/docs/windows/images/propvec.gif
-%%PORTDOCS%%%%DOCSDIR%%/docs/windows/images/startup.gif
-%%PORTDOCS%%%%DOCSDIR%%/docs/windows/images/tree.gif
+%%PORTDOCS%%%%DOCSDIR%%/whatsnew.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mess.ini
 %%DATADIR%%/artwork/4004clk.zip
+%%DATADIR%%/artwork/academy.zip
 %%DATADIR%%/artwork/aim65.zip
+%%DATADIR%%/artwork/alm16.zip
+%%DATADIR%%/artwork/alm32.zip
 %%DATADIR%%/artwork/amsterd.zip
+%%DATADIR%%/artwork/aperture.png
 %%DATADIR%%/artwork/avigo.zip
-%%DATADIR%%/artwork/dallas.zip
+%%DATADIR%%/artwork/berlinp.zip
+%%DATADIR%%/artwork/bpl32.zip
+%%DATADIR%%/artwork/ccmk1.zip
+%%DATADIR%%/artwork/ccmk2.zip
 %%DATADIR%%/artwork/dallas16.zip
-%%DATADIR%%/artwork/dallas32.zip
+%%DATADIR%%/artwork/gen32.zip
+%%DATADIR%%/artwork/gen32_41.zip
+%%DATADIR%%/artwork/gen32_oc.zip
 %%DATADIR%%/artwork/glasgow.zip
 %%DATADIR%%/artwork/hp48g.zip
 %%DATADIR%%/artwork/hp48gp.zip
@@ -66,106 +46,208 @@ libexec/mess/unidasm
 %%DATADIR%%/artwork/hp48sx.zip
 %%DATADIR%%/artwork/junior.zip
 %%DATADIR%%/artwork/kim1.zip
-%%DATADIR%%/artwork/mk1.zip
-%%DATADIR%%/artwork/mk2.zip
+%%DATADIR%%/artwork/lond020.zip
+%%DATADIR%%/artwork/lond030.zip
+%%DATADIR%%/artwork/lyon16.zip
+%%DATADIR%%/artwork/lyon32.zip
+%%DATADIR%%/artwork/milano.zip
 %%DATADIR%%/artwork/mm4.zip
-%%DATADIR%%/artwork/mm5.zip
-%%DATADIR%%/artwork/mm50.zip
+%%DATADIR%%/artwork/mo5.zip
+%%DATADIR%%/artwork/mo5nr.zip
+%%DATADIR%%/artwork/mo6.zip
+%%DATADIR%%/artwork/monteciv.zip
 %%DATADIR%%/artwork/mpf1.zip
 %%DATADIR%%/artwork/mpf1b.zip
 %%DATADIR%%/artwork/pc1401.zip
 %%DATADIR%%/artwork/pc1402.zip
 %%DATADIR%%/artwork/pc1403.zip
-%%DATADIR%%/artwork/rebel5.zip
-%%DATADIR%%/artwork/roma32.zip
+%%DATADIR%%/artwork/polgar.zip
+%%DATADIR%%/artwork/sexpertc.zip
 %%DATADIR%%/artwork/ssystem3.zip
-%%DATADIR%%/artwork/thomson.zip
-%%DATADIR%%/hash/a2600.hsi
+%%DATADIR%%/artwork/supercon.zip
+%%DATADIR%%/artwork/to7.zip
+%%DATADIR%%/artwork/to770.zip
+%%DATADIR%%/artwork/to8.zip
+%%DATADIR%%/artwork/to9.zip
+%%DATADIR%%/artwork/to9p.zip
+%%DATADIR%%/artwork/van16.zip
+%%DATADIR%%/artwork/van32.zip
+%%DATADIR%%/artwork/white.png
+%%DATADIR%%/hash/32x.xml
+%%DATADIR%%/hash/3do_m2.xml
+%%DATADIR%%/hash/a2600.xml
+%%DATADIR%%/hash/a2600_cass.xml
 %%DATADIR%%/hash/a5200.hsi
-%%DATADIR%%/hash/a7800.hsi
-%%DATADIR%%/hash/a800.hsi
-%%DATADIR%%/hash/a800xl.hsi
-%%DATADIR%%/hash/advision.hsi
-%%DATADIR%%/hash/aim65.hsi
-%%DATADIR%%/hash/apexc.hsi
-%%DATADIR%%/hash/apfm1000.hsi
-%%DATADIR%%/hash/apple1.hsi
-%%DATADIR%%/hash/apple2.hsi
-%%DATADIR%%/hash/aquarius.hsi
-%%DATADIR%%/hash/arcadia.hsi
-%%DATADIR%%/hash/astrocde.hsi
-%%DATADIR%%/hash/bbca.hsi
-%%DATADIR%%/hash/c128.hsi
-%%DATADIR%%/hash/c16.hsi
-%%DATADIR%%/hash/c64.hsi
-%%DATADIR%%/hash/cbm30.hsi
-%%DATADIR%%/hash/cbm40.hsi
-%%DATADIR%%/hash/cbm610.hsi
-%%DATADIR%%/hash/cbm80.hsi
-%%DATADIR%%/hash/cgenie.hsi
-%%DATADIR%%/hash/channelf.hsi
-%%DATADIR%%/hash/coco.hsi
-%%DATADIR%%/hash/coleco.hsi
-%%DATADIR%%/hash/cpc464.hsi
-%%DATADIR%%/hash/cpc6128.hsi
-%%DATADIR%%/hash/dragon64.hsi
-%%DATADIR%%/hash/ep128.hsi
-%%DATADIR%%/hash/exidy.hsi
-%%DATADIR%%/hash/gameboy.hsi
-%%DATADIR%%/hash/gamecom.hsi
-%%DATADIR%%/hash/gamegear.hsi
-%%DATADIR%%/hash/genesis.hsi
-%%DATADIR%%/hash/ibmpc.hsi
-%%DATADIR%%/hash/ibmpcjr.hsi
+%%DATADIR%%/hash/a5200.xml
+%%DATADIR%%/hash/a7800.xml
+%%DATADIR%%/hash/a800.xml
+%%DATADIR%%/hash/abc1600.xml
+%%DATADIR%%/hash/abc80.xml
+%%DATADIR%%/hash/abc800.xml
+%%DATADIR%%/hash/abc806.xml
+%%DATADIR%%/hash/advision.xml
+%%DATADIR%%/hash/alice32.xml
+%%DATADIR%%/hash/alice90.xml
+%%DATADIR%%/hash/apfm1000.xml
+%%DATADIR%%/hash/apple1.xml
+%%DATADIR%%/hash/apple2.xml
+%%DATADIR%%/hash/apple2gs.xml
+%%DATADIR%%/hash/aquarius.xml
+%%DATADIR%%/hash/arcadia.xml
+%%DATADIR%%/hash/astrocde.xml
+%%DATADIR%%/hash/atom.xml
+%%DATADIR%%/hash/bbcbc.xml
+%%DATADIR%%/hash/bw2.xml
+%%DATADIR%%/hash/c128_cart.xml
+%%DATADIR%%/hash/c128_flop.xml
+%%DATADIR%%/hash/c128_rom.xml
+%%DATADIR%%/hash/c64_cart.xml
+%%DATADIR%%/hash/c64_flop.xml
+%%DATADIR%%/hash/casloopy.xml
+%%DATADIR%%/hash/cbm700_cart.xml
+%%DATADIR%%/hash/cd32.xml
+%%DATADIR%%/hash/cdi.xml
+%%DATADIR%%/hash/cdtv.xml
+%%DATADIR%%/hash/channelf.xml
+%%DATADIR%%/hash/coco_cart.xml
+%%DATADIR%%/hash/coleco.xml
+%%DATADIR%%/hash/cpc_cass.xml
+%%DATADIR%%/hash/cpc_flop.xml
+%%DATADIR%%/hash/crvision.xml
+%%DATADIR%%/hash/dim68k.xml
+%%DATADIR%%/hash/einstein.xml
+%%DATADIR%%/hash/famicom_flop.xml
+%%DATADIR%%/hash/fm77av.xml
+%%DATADIR%%/hash/fm7_cass.xml
+%%DATADIR%%/hash/fm7_disk.xml
+%%DATADIR%%/hash/gameboy.xml
+%%DATADIR%%/hash/gamecom.xml
+%%DATADIR%%/hash/gamegear.xml
+%%DATADIR%%/hash/gamepock.xml
+%%DATADIR%%/hash/gba.xml
+%%DATADIR%%/hash/gbcolor.xml
+%%DATADIR%%/hash/gmaster.xml
+%%DATADIR%%/hash/gx4000.xml
+%%DATADIR%%/hash/ibm5140.xml
+%%DATADIR%%/hash/ibm5170.xml
+%%DATADIR%%/hash/ibmpcjr_cart.xml
+%%DATADIR%%/hash/ibmpcjr_flop.xml
 %%DATADIR%%/hash/intv.hsi
-%%DATADIR%%/hash/jaguar.hsi
-%%DATADIR%%/hash/jupiter.hsi
-%%DATADIR%%/hash/laser210.hsi
-%%DATADIR%%/hash/lisa2.hsi
-%%DATADIR%%/hash/lviv.hsi
-%%DATADIR%%/hash/lynx.hsi
-%%DATADIR%%/hash/max.hsi
-%%DATADIR%%/hash/mc10.hsi
-%%DATADIR%%/hash/megaduck.hsi
-%%DATADIR%%/hash/microtan.hsi
-%%DATADIR%%/hash/mo5.hsi
+%%DATADIR%%/hash/intv.xml
+%%DATADIR%%/hash/intvecs.xml
+%%DATADIR%%/hash/iq151_cart.xml
+%%DATADIR%%/hash/iq151_flop.xml
+%%DATADIR%%/hash/jaguar.xml
+%%DATADIR%%/hash/juicebox.xml
+%%DATADIR%%/hash/kc_cart.xml
+%%DATADIR%%/hash/kc_cass.xml
+%%DATADIR%%/hash/kc_flop.xml
+%%DATADIR%%/hash/lisa.xml
+%%DATADIR%%/hash/lisa2.xml
+%%DATADIR%%/hash/lynx.xml
+%%DATADIR%%/hash/m5.xml
+%%DATADIR%%/hash/mac_flop.xml
+%%DATADIR%%/hash/mac_hdd.xml
+%%DATADIR%%/hash/megacd.xml
+%%DATADIR%%/hash/megacdj.xml
+%%DATADIR%%/hash/megadriv.xml
+%%DATADIR%%/hash/megaduck.xml
+%%DATADIR%%/hash/megapc.xml
+%%DATADIR%%/hash/mpz80.xml
 %%DATADIR%%/hash/msx.hsi
+%%DATADIR%%/hash/msx1_cart.xml
 %%DATADIR%%/hash/msx2.hsi
-%%DATADIR%%/hash/mtx512.hsi
-%%DATADIR%%/hash/n64.hsi
-%%DATADIR%%/hash/nascom1.hsi
+%%DATADIR%%/hash/msx2_cart.xml
+%%DATADIR%%/hash/mz2500.xml
+%%DATADIR%%/hash/n64.xml
+%%DATADIR%%/hash/neogeo.xml
 %%DATADIR%%/hash/nes.hsi
-%%DATADIR%%/hash/odyssey2.hsi
-%%DATADIR%%/hash/oric.hsi
-%%DATADIR%%/hash/p2000t.hsi
-%%DATADIR%%/hash/pce.hsi
-%%DATADIR%%/hash/pdp1.hsi
-%%DATADIR%%/hash/pet.hsi
-%%DATADIR%%/hash/pico.hsi
-%%DATADIR%%/hash/pokemini.hsi
-%%DATADIR%%/hash/psx.hsi
-%%DATADIR%%/hash/samcoupe.hsi
-%%DATADIR%%/hash/sms.hsi
-%%DATADIR%%/hash/snes.hsi
-%%DATADIR%%/hash/sordm5.hsi
-%%DATADIR%%/hash/spectrum.hsi
-%%DATADIR%%/hash/studio2.hsi
-%%DATADIR%%/hash/svi318.hsi
-%%DATADIR%%/hash/svision.hsi
-%%DATADIR%%/hash/ti99_4a.hsi
-%%DATADIR%%/hash/ts2068.hsi
-%%DATADIR%%/hash/vboy.hsi
-%%DATADIR%%/hash/vc4000.hsi
-%%DATADIR%%/hash/vectrex.hsi
-%%DATADIR%%/hash/vic20.hsi
-%%DATADIR%%/hash/wswan.hsi
-%%EXAMPLESDIR%%/mess.ini
-@dirrm %%DATADIR%%/artwork
+%%DATADIR%%/hash/nes.xml
+%%DATADIR%%/hash/next.xml
+%%DATADIR%%/hash/ngp.xml
+%%DATADIR%%/hash/ngpc.xml
+%%DATADIR%%/hash/pasogo.xml
+%%DATADIR%%/hash/pb2000c.xml
+%%DATADIR%%/hash/pc1512.xml
+%%DATADIR%%/hash/pc1640.xml
+%%DATADIR%%/hash/pc8201.xml
+%%DATADIR%%/hash/pc8801_cass.xml
+%%DATADIR%%/hash/pc8801_flop.xml
+%%DATADIR%%/hash/pc88va.xml
+%%DATADIR%%/hash/pc98.xml
+%%DATADIR%%/hash/pce.xml
+%%DATADIR%%/hash/pcecd.xml
+%%DATADIR%%/hash/pico.xml
+%%DATADIR%%/hash/pippin.xml
+%%DATADIR%%/hash/pippin_flop.xml
+%%DATADIR%%/hash/plus4_cart.xml
+%%DATADIR%%/hash/plus4_flop.xml
+%%DATADIR%%/hash/pokemini.xml
+%%DATADIR%%/hash/psion.xml
+%%DATADIR%%/hash/psx.xml
+%%DATADIR%%/hash/pv1000.xml
+%%DATADIR%%/hash/pv2000.xml
+%%DATADIR%%/hash/ql.xml
+%%DATADIR%%/hash/rainbow.xml
+%%DATADIR%%/hash/rx78.xml
+%%DATADIR%%/hash/sage2.xml
+%%DATADIR%%/hash/sat_cart.xml
+%%DATADIR%%/hash/saturn.xml
+%%DATADIR%%/hash/scv.xml
+%%DATADIR%%/hash/segacd.xml
+%%DATADIR%%/hash/sg1000.xml
+%%DATADIR%%/hash/sgx.xml
+%%DATADIR%%/hash/smc777.xml
+%%DATADIR%%/hash/sms.xml
+%%DATADIR%%/hash/snes.xml
+%%DATADIR%%/hash/softwarelist.dtd
+%%DATADIR%%/hash/sorcerer_cart.xml
+%%DATADIR%%/hash/spectrum.xml
+%%DATADIR%%/hash/st.xml
+%%DATADIR%%/hash/studio2.xml
+%%DATADIR%%/hash/super6.xml
+%%DATADIR%%/hash/supracan.xml
+%%DATADIR%%/hash/svi318_cart.xml
+%%DATADIR%%/hash/svi318_cass.xml
+%%DATADIR%%/hash/svi318_flop.xml
+%%DATADIR%%/hash/svision.xml
+%%DATADIR%%/hash/tandy200.xml
+%%DATADIR%%/hash/tdv2324.xml
+%%DATADIR%%/hash/tg16.xml
+%%DATADIR%%/hash/tiki100.xml
+%%DATADIR%%/hash/trs80m2.xml
+%%DATADIR%%/hash/trsm100.xml
+%%DATADIR%%/hash/tutor.xml
+%%DATADIR%%/hash/uzebox.xml
+%%DATADIR%%/hash/v1050.xml
+%%DATADIR%%/hash/vboy.xml
+%%DATADIR%%/hash/vc4000.xml
+%%DATADIR%%/hash/vectrex.xml
+%%DATADIR%%/hash/vg5k.xml
+%%DATADIR%%/hash/vic10.xml
+%%DATADIR%%/hash/vic1001_cart.xml
+%%DATADIR%%/hash/vic1001_flop.xml
+%%DATADIR%%/hash/vidbrain.xml
+%%DATADIR%%/hash/vii.xml
+%%DATADIR%%/hash/vixen.xml
+%%DATADIR%%/hash/vsmile.xml
+%%DATADIR%%/hash/wscolor.xml
+%%DATADIR%%/hash/wswan.xml
+%%DATADIR%%/hash/x1_cass.xml
+%%DATADIR%%/hash/x1_flop.xml
+%%DATADIR%%/hash/x68k_flop.xml
+%%DATADIR%%/hash/xegs.xml
+%%DATADIR%%/keymaps/km-be.txt
+%%DATADIR%%/keymaps/km-ch.txt
+%%DATADIR%%/keymaps/km-de.txt
+%%DATADIR%%/keymaps/km-fr-OSX.txt
+%%DATADIR%%/keymaps/km-fr.txt
+%%DATADIR%%/keymaps/km_it.txt
+@dirrm %%DATADIR%%/keymaps
 @dirrm %%DATADIR%%/hash
+@dirrm %%DATADIR%%/artwork
 @dirrm %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/windows/images
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/windows
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/docs
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%EXAMPLESDIR%%
 @dirrm libexec/mess