- Update to 0.130.

- Remove useless wrapper script, sdlmess uses ~/.mess by default.
- Submitter takes maintainership.

PR:		ports/128559
Submitted by:	Emmanuel Vadot <elbarto@arcadebsd.org>

9 files changed, 407 insertions, 139 deletions

diff --git a/emulators/mess/Makefile b/emulators/mess/Makefile
index 0fb4b32c41e8..35844a03e9b8 100644
--- a/emulators/mess/Makefile
+++ b/emulators/mess/Makefile
@@ -6,46 +6,66 @@
 #
 
 PORTNAME=	sdlmess
-PORTVERSION=	0.124
+PORTVERSION=	0.130
 CATEGORIES=	emulators
-MASTER_SITES=	ftp://ftp.alepulver.com.ar/distfiles/
+MASTER_SITES=	ftp://ftp.arcadebsd.org/pub/FreeBSD/ports/distfiles/ \
+		http://rbelmont.mameworld.info/
 DISTNAME=	${PORTNAME}${PORTVERSION:S/.//}
 
-MAINTAINER=	alepulver@FreeBSD.org
-COMMENT=	SDL port of MESS (Multiple Emulator Super System)
+MAINTAINER=	elbarto@ArcadeBSD.org
+COMMENT=	SDL port of the popular MESS (Multiple Emulator Super System)
 
+FETCH_ENV=	HTTP_USER_AGENT=defined
 USE_ZIP=	yes
-USE_GL=		gl
 USE_XORG=	xext xrender xinerama xi
+USE_GL=		gl
+USE_GNOME?=	gtk20 gconf2
 USE_GMAKE=	yes
+MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}"
 USE_SDL=	sdl
 MAKEFILE=	makefile.sdl
+ONLY_FOR_ARCH=	i386 amd64
+SUB_FILES=	pkg-message
 
-SUB_FILES=	${PORTNAME} pkg-message
+OPTIONS=	DEBUG "Build sdlmess debugger" off
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "sparc64"
-BROKEN=		Does not compile on sparc64
+.if defined(WITH_DEBUG)
+EXTRA_PATCHES+=		${FILESDIR}/sdl.mak.patch-debug
+.else
+USE_GNOME=		#
+EXTRA_PATCHES+=		${FILESDIR}/sdl.mak.patch
+.endif
+
+.if ${ARCH} == "amd64"
+MAKE_ENV+=	PTR64=1
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e "s|ui.bdf|${DATADIR}/ui.bdf|g" ${WRKSRC}/src/emu/ui.c
+
 do-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/
 	${MKDIR} ${PREFIX}/libexec/sdlmess
-.for f in obj/sdl/mess/build/file2str obj/sdl/mess/build/png2bdc mess \
-	testkeys dat2html messtest imgtool romcmp chdman jedutil makemeta \
-	regrep srcclean src2html
-	${INSTALL_PROGRAM} ${WRKSRC}/${f} ${PREFIX}/libexec/sdlmess
-.endfor
-	${MKDIR} ${DATADIR}
-.for f in artwork hash keymaps sysinfo.dat
-	${CP} -R ${WRKSRC}/${f} ${DATADIR}
-.endfor
+	${INSTALL_PROGRAM} ${WRKSRC}/chdman ${PREFIX}/libexec/sdlmess
+	${INSTALL_PROGRAM} ${WRKSRC}/ldresample ${PREFIX}/libexec/sdlmess
+	${INSTALL_PROGRAM} ${WRKSRC}/ldverify ${PREFIX}/libexec/sdlmess
+	${INSTALL_PROGRAM} ${WRKSRC}/testkeys ${PREFIX}/libexec/sdlmess
+	${INSTALL_PROGRAM} ${WRKSRC}/imgtool ${PREFIX}/libexec/sdlmess
+	${INSTALL_PROGRAM} ${WRKSRC}/jedutil ${PREFIX}/libexec/sdlmess
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.txt ${DOCSDIR}
 	${CP} -R ${WRKSRC}/docs ${DOCSDIR}
 .endif
+	${MKDIR} ${DATADIR}
+	${CP} ${WRKSRC}/ui.bdf ${DATADIR}/
+	${CP} -R ${WRKSRC}/keymaps ${DATADIR}/
+	${CP} -R ${WRKSRC}/hash ${DATADIR}/
+	${CP} -R ${WRKSRC}/artwork ${DATADIR}/
+	${MKDIR} ${EXAMPLESDIR}
+	${CP} ${FILESDIR}/mess.ini ${EXAMPLESDIR}
 
 post-install:
 	@${ECHO_CMD}
diff --git a/emulators/mess/distinfo b/emulators/mess/distinfo
index 2a468f72503e..505cacb803da 100644
--- a/emulators/mess/distinfo
+++ b/emulators/mess/distinfo
@@ -1,3 +1,3 @@
-MD5 (sdlmess0124.zip) = a727c374da2b72c21e7373fb95de4472
-SHA256 (sdlmess0124.zip) = a1dc328f66c2818f0ac5deea74a57501310ea354f0683576333c0868537c9caa
-SIZE (sdlmess0124.zip) = 29192593
+MD5 (sdlmess0130.zip) = 31767c04dd3b1ee9e8c8ffe603928e7a
+SHA256 (sdlmess0130.zip) = f8bafa155daa6cc435118e44ca9158f3dd1555b7c0c30e9671908014fc76192f
+SIZE (sdlmess0130.zip) = 31636461
diff --git a/emulators/mess/files/mess.ini b/emulators/mess/files/mess.ini
new file mode 100644
index 000000000000..18dba73a33de
--- /dev/null
+++ b/emulators/mess/files/mess.ini
@@ -0,0 +1,270 @@
+<UNADORNED0>              
+
+#
+# CORE CONFIGURATION OPTIONS
+#
+readconfig                1
+
+#
+# CORE SEARCH PATH OPTIONS
+#
+rompath                   $HOME/.mess/roms
+hashpath                  $HOME/.mess/hash;/usr/local/share/sdlmess/hash/
+samplepath                $HOME/.mess/samples
+artpath                   $HOME/.mess/artwork;/usr/local/share/sdlmess/artwork/
+ctrlrpath                 $HOME/.mess/ctrlr
+inipath                   $HOME/.mess;.;ini
+fontpath                  $HOME/.mess/font;/usr/local/share/sdlmess/
+cheatpath                 $HOME/.mess/cheat
+
+#
+# CORE OUTPUT DIRECTORY OPTIONS
+#
+cfg_directory             $HOME/.mess/cfg
+nvram_directory           $HOME/.mess/nvram
+memcard_directory         $HOME/.mess/memcard
+input_directory           $HOME/.mess/inp
+state_directory           $HOME/.mess/sta
+snapshot_directory        $HOME/.mess/snap
+diff_directory            $HOME/.mess/diff
+comment_directory         $HOME/.mess/comments
+
+#
+# CORE STATE/PLAYBACK OPTIONS
+#
+state                     
+autosave                  0
+playback                  
+record                    
+mngwrite                  
+aviwrite                  
+wavwrite                  
+snapname                  %g/%i
+snapsize                  auto
+snapview                  internal
+
+#
+# CORE PERFORMANCE OPTIONS
+#
+autoframeskip             0
+frameskip                 0
+seconds_to_run            0
+throttle                  1
+sleep                     1
+speed                     1.0
+refreshspeed              0
+
+#
+# CORE ROTATION OPTIONS
+#
+rotate                    1
+ror                       0
+rol                       0
+autoror                   0
+autorol                   0
+flipx                     0
+flipy                     0
+
+#
+# CORE ARTWORK OPTIONS
+#
+artwork_crop              0
+use_backdrops             1
+use_overlays              1
+use_bezels                1
+
+#
+# CORE SCREEN OPTIONS
+#
+brightness                1.0
+contrast                  1.0
+gamma                     1.0
+pause_brightness          0.65
+
+#
+# CORE VECTOR OPTIONS
+#
+antialias                 1
+beam                      1.0
+flicker                   0
+
+#
+# CORE SOUND OPTIONS
+#
+sound                     1
+samplerate                48000
+samples                   1
+volume                    0
+
+#
+# CORE INPUT OPTIONS
+#
+coin_lockout              1
+ctrlr                     
+mouse                     0
+joystick                  1
+lightgun                  0
+multikeyboard             0
+multimouse                0
+steadykey                 0
+offscreen_reload          0
+joystick_map              auto
+joystick_deadzone         0.3
+joystick_saturation       0.85
+
+#
+# CORE INPUT AUTOMATIC ENABLE OPTIONS
+#
+paddle_device             keyboard
+adstick_device            keyboard
+pedal_device              keyboard
+dial_device               keyboard
+trackball_device          keyboard
+lightgun_device           keyboard
+positional_device         keyboard
+mouse_device              mouse
+
+#
+# CORE DEBUGGING OPTIONS
+#
+log                       0
+verbose                   0
+update_in_pause           0
+debug                     0
+debugscript               
+
+#
+# CORE MISC OPTIONS
+#
+bios                      
+cheat                     0
+skip_gameinfo             0
+
+#
+# DEBUGGING OPTIONS
+#
+oslog                     0
+
+#
+# PERFORMANCE OPTIONS
+#
+multithreading            0
+sdlvideofps               0
+
+#
+# VIDEO OPTIONS
+#
+video                     soft
+numscreens                1
+window                    0
+maximize                  1
+keepaspect                1
+unevenstretch             1
+effect                    none
+centerh                   1
+centerv                   1
+waitvsync                 0
+scalemode                 none
+
+#
+# OpenGL-SPECIFIC OPTIONS
+#
+filter                    1
+prescale                  1
+gl_forcepow2texture       0
+gl_notexturerect          0
+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_screen0       none
+glsl_shader_screen1       none
+glsl_shader_screen2       none
+glsl_shader_screen3       none
+glsl_shader_screen4       none
+glsl_shader_screen5       none
+glsl_shader_screen6       none
+glsl_shader_screen7       none
+glsl_shader_screen8       none
+glsl_shader_screen9       none
+gl_glsl_vid_attr          1
+
+#
+# PER-WINDOW VIDEO OPTIONS
+#
+screen                    auto
+aspect                    auto
+resolution                auto
+view                      auto
+screen0                   auto
+aspect0                   auto
+resolution0               auto
+view0                     auto
+screen1                   auto
+aspect1                   auto
+resolution1               auto
+view1                     auto
+screen2                   auto
+aspect2                   auto
+resolution2               auto
+view2                     auto
+screen3                   auto
+aspect3                   auto
+resolution3               auto
+view3                     auto
+
+#
+# FULL SCREEN OPTIONS
+#
+switchres                 0
+useallheads               0
+
+#
+# SOUND OPTIONS
+#
+audio_latency             3
+
+#
+# SDL KEYBOARD MAPPING
+#
+keymap                    0
+keymap_file               keymap.dat
+uimodekey                 ITEM_ID_SCRLOCK
+
+#
+# SDL JOYSTICK MAPPING
+#
+joy_idx1                  auto
+joy_idx2                  auto
+joy_idx3                  auto
+joy_idx4                  auto
+joy_idx5                  auto
+joy_idx6                  auto
+joy_idx7                  auto
+joy_idx8                  auto
+sixaxis                   0
+
+#
+# SDL LOWLEVEL DRIVER OPTIONS
+#
+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-makefile.sdl b/emulators/mess/files/patch-makefile.sdl
index da3e09121c14..c81e9d469692 100644
--- a/emulators/mess/files/patch-makefile.sdl
+++ b/emulators/mess/files/patch-makefile.sdl
@@ -1,83 +1,49 @@
---- ./makefile.sdl.orig	2008-03-26 20:35:31.000000000 -0300
-+++ ./makefile.sdl	2008-04-21 16:26:24.000000000 -0300
-@@ -104,11 +104,13 @@
- # uncomment next line to include the internal profiler
- # PROFILER = 1
- 
-+ifeq ($(ARCH),i386)
- # uncomment next line to use DRC MIPS3 engine
- X86_MIPS3_DRC = 1
- 
- # uncomment next line to use DRC PowerPC engine
- X86_PPC_DRC = 1
-+endif
- 
- # uncomment next line to build using unix-style libsdl on Mac OS X
- # (vs. the native framework port).  Normal users should not enable this.
-@@ -121,7 +123,9 @@
- #-------------------------------------------------
- 
- # uncomment next line if you are building for a 64-bit target
--# PTR64 = 1
-+ifeq ($(ARCH),amd64)
-+PTR64 = 1
-+endif
+--- makefile.sdl.orig	2009-03-13 16:53:53.000000000 +0000
++++ makefile.sdl	2009-03-17 23:44:38.000000000 +0000
+@@ -59,7 +59,7 @@
+ ifeq ($(OSD),windows)
+ TARGETOS = win32
+ else
+-TARGETOS = unix
++TARGETOS = freebsd
+ endif
+ endif
  
- # uncomment next line if you are building for a big-endian target
- # BIGENDIAN = 1
-@@ -198,8 +202,8 @@
+@@ -197,8 +197,8 @@
  
  # compiler, linker and utilities
  AR = @ar
 -CC = @gcc
 -LD = @gcc
 +CC := @$(CC)
-+LD := @$(CC)
++LD = @$(CC)
  MD = -mkdir$(EXE)
  RM = @rm -f
  
-@@ -223,7 +227,7 @@
+@@ -227,7 +227,7 @@
  endif
  
  # fullname is prefix+name+suffix+debugsuffix
--FULLNAME = $(PREFIX)$(NAME)$(SUFFIX)$(DEBUGSUFFIX)
-+FULLNAME = $(NAME)
+-FULLNAME = $(PREFIX)$(NAME)$(CPPSUFFIX)$(SUFFIX)$(DEBUGSUFFIX)
++FULLNAME = sdl$(NAME)$(CPPSUFFIX)$(SUFFIX)$(DEBUGSUFFIX)
  
  # add an EXE suffix to get the final emulator name
  EMULATOR = $(FULLNAME)$(EXE)
-@@ -293,7 +297,7 @@
- #-------------------------------------------------
- 
- # we compile to C89 standard with GNU extensions
--CFLAGS = -std=gnu89
-+CFLAGS += -std=gnu89
- 
- # this speeds it up a bit by piping between the preprocessor/compiler/assembler
- CFLAGS += -pipe
-@@ -331,9 +335,6 @@
+@@ -337,7 +337,7 @@
  # and make all errors into warnings
  ifneq ($(OPTIMIZE),0)
- CFLAGS += $(ARCHOPTS) -fno-strict-aliasing
--ifneq ($(TARGETOS),os2)
--CFLAGS += -Werror
--endif
+ ifneq ($(TARGETOS),os2)
+-CCOMFLAGS += -Werror -fno-strict-aliasing $(ARCHOPTS)
++CCOMFLAGS += -fno-strict-aliasing $(ARCHOPTS)
+ else
+ CCOMFLAGS += -fno-strict-aliasing $(ARCHOPTS)
  endif
- 
- # if symbols are on, make sure we have frame pointers
-@@ -358,6 +359,7 @@
- 	-I$(SRC)/lib/util \
- 	-I$(SRC)/osd \
- 	-I$(SRC)/osd/$(OSD) \
-+        -I$(LOCALBASE)/include
- 
- 
- 
-@@ -370,7 +372,7 @@
- LDFLAGS =
+@@ -392,7 +392,7 @@
  ifneq ($(TARGETOS),macosx)
  ifneq ($(TARGETOS),os2)
+ ifneq ($(TARGETOS),solaris)
 -LDFLAGS = -Wl,--warn-common
-+LDFLAGS = -Wl,--warn-common -L$(LOCALBASE)/lib
++LDFLAGS = -Wl,--warn-common $(PTHREAD_LIBS) -L$(LOCALBASE)/lib
+ endif
  endif
  endif
- LDFLAGSEMULATOR =
diff --git a/emulators/mess/files/pkg-message.in b/emulators/mess/files/pkg-message.in
index 07020956f626..5884f2340888 100644
--- a/emulators/mess/files/pkg-message.in
+++ b/emulators/mess/files/pkg-message.in
@@ -2,12 +2,12 @@
 
 SDLMESS has been installed.
 
-The MESS tools are installed in "%%PREFIX%%/libexec/sdlmess"
-to avoid conflicting with other MESS ports.
+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.
 
-A wrapper script "sdlmess" has been installed. It creates a "~/.sdlmess"
-directory mirroring the directory tree under "%%DATADIR%%"
-when you run it for the first time, and starts the program from there. So
-place all MESS files (e.g. ROMs, cheats, etc.) in "~/.sdlmess".
+If you have a non-qwerty keyboard, you should put in your mame.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
new file mode 100644
index 000000000000..36fd61624130
--- /dev/null
+++ b/emulators/mess/files/sdl.mak.patch
@@ -0,0 +1,17 @@
+--- src/osd/sdl/sdl.mak.orig	2009-03-05 20:03:50.000000000 +0100
++++ src/osd/sdl/sdl.mak	2009-03-05 20:06:22.000000000 +0100
+@@ -264,10 +264,10 @@
+ # the new debugger relies on GTK+ in addition to the base SDLMAME needs
+ # Non-X11 builds can not use the debugger
+ ifndef NO_X11
+-OSDCOREOBJS += $(SDLOBJ)/debugwin.o $(SDLOBJ)/dview.o $(SDLOBJ)/debug-sup.o $(SDLOBJ)/debug-intf.o
+-CFLAGS += `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`
+-CFLAGS += -DGTK_DISABLE_DEPRECATED
++OSDCOREOBJS += $(SDLOBJ)/debugwin.o
++#CFLAGS += `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`
++#CFLAGS += -DGTK_DISABLE_DEPRECATED
+ else
+ OSDCOREOBJS += $(SDLOBJ)/debugwin.o
+ endif # NO_X11
diff --git a/emulators/mess/files/sdlmess.in b/emulators/mess/files/sdlmess.in
deleted file mode 100644
index f0d97316d6f3..000000000000
--- a/emulators/mess/files/sdlmess.in
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-#
-# The executable needs to be run from its data directory, and needs to store
-# configuration in it. We therefore mirror the data directory hierarchy in
-# ~/.sdlmess, and create symlinks to the data files.
-#
-
-if [ ! -d ~/.sdlmess ]
-then
-	cd %%DATADIR%% || exit 1
-	find * -type d -exec mkdir -p ~/.sdlmess/{} \;
-	find * -type f -exec ln -s %%DATADIR%%/{} ~/.sdlmess/{} \; 2>/dev/null
-fi
-
-cd ~/.sdlmess || exit 1
-exec %%PREFIX%%/libexec/sdlmess/mess "$@"
diff --git a/emulators/mess/pkg-descr b/emulators/mess/pkg-descr
index c0bb806b0137..b297a4b68fa9 100644
--- a/emulators/mess/pkg-descr
+++ b/emulators/mess/pkg-descr
@@ -1,17 +1,17 @@
-SDLMESS is a port of the popular MESS. There are a few principles that guide
+SDLMAME is a port of the popular MAME. There are a few principles that guide
 it's development:
 
 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, 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 MESS, you already know how
-   to use SDLMESS on any platform you may encounter it on.
+   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.
 
-2) MESS developers are important. By keeping quickly up to date, we make it
+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 MESS code, and we offer native implementations of MESS's multi-window
+   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
diff --git a/emulators/mess/pkg-plist b/emulators/mess/pkg-plist
index 7135d4b5bf55..8af6eadfd800 100644
--- a/emulators/mess/pkg-plist
+++ b/emulators/mess/pkg-plist
@@ -1,56 +1,60 @@
 bin/sdlmess
 libexec/sdlmess/chdman
-libexec/sdlmess/dat2html
-libexec/sdlmess/file2str
-libexec/sdlmess/png2bdc
+libexec/sdlmess/ldresample
+libexec/sdlmess/ldverify
+libexec/sdlmess/testkeys
 libexec/sdlmess/imgtool
 libexec/sdlmess/jedutil
-libexec/sdlmess/makemeta
-libexec/sdlmess/mess
-libexec/sdlmess/messtest
-libexec/sdlmess/regrep
-libexec/sdlmess/romcmp
-libexec/sdlmess/srcclean
-libexec/sdlmess/src2html
-libexec/sdlmess/testkeys
 %%PORTDOCS%%%%DOCSDIR%%/SDLMESS.txt
 %%PORTDOCS%%%%DOCSDIR%%/whatsnew.txt
+%%PORTDOCS%%%%DOCSDIR%%/docs/config.txt
 %%PORTDOCS%%%%DOCSDIR%%/docs/credits.htm
 %%PORTDOCS%%%%DOCSDIR%%/docs/faq.htm
-%%PORTDOCS%%%%DOCSDIR%%/docs/images/logo.gif
 %%PORTDOCS%%%%DOCSDIR%%/docs/imgtool.txt
 %%PORTDOCS%%%%DOCSDIR%%/docs/license.txt
 %%PORTDOCS%%%%DOCSDIR%%/docs/mame.txt
 %%PORTDOCS%%%%DOCSDIR%%/docs/messnew.txt
-%%PORTDOCS%%%%DOCSDIR%%/docs/config.txt
 %%PORTDOCS%%%%DOCSDIR%%/docs/newvideo.txt
 %%PORTDOCS%%%%DOCSDIR%%/docs/windows.txt
+%%PORTDOCS%%%%DOCSDIR%%/docs/wintoc.xml
+%%PORTDOCS%%%%DOCSDIR%%/docs/images/logo.gif
 %%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/instbios.htm
+%%PORTDOCS%%%%DOCSDIR%%/docs/windows/instroms.htm
+%%PORTDOCS%%%%DOCSDIR%%/docs/windows/main.htm
+%%PORTDOCS%%%%DOCSDIR%%/docs/windows/mgebios.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/install.htm
-%%PORTDOCS%%%%DOCSDIR%%/docs/windows/instbios.htm
-%%PORTDOCS%%%%DOCSDIR%%/docs/windows/main.htm
-%%PORTDOCS%%%%DOCSDIR%%/docs/windows/mgebios.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/wintoc.xml
+%%PORTDOCS%%%%DOCSDIR%%/docs/windows/images/tree.gif
+%%DATADIR%%/artwork/aim65.zip
 %%DATADIR%%/artwork/amsterd.zip
 %%DATADIR%%/artwork/avigo.zip
 %%DATADIR%%/artwork/dallas.zip
@@ -60,8 +64,12 @@ libexec/sdlmess/testkeys
 %%DATADIR%%/artwork/floppyr.png
 %%DATADIR%%/artwork/floppyw.png
 %%DATADIR%%/artwork/glasgow.zip
+%%DATADIR%%/artwork/hp48g.zip
+%%DATADIR%%/artwork/hp48gp.zip
+%%DATADIR%%/artwork/hp48gx.zip
+%%DATADIR%%/artwork/hp48s.zip
+%%DATADIR%%/artwork/hp48sx.zip
 %%DATADIR%%/artwork/kim1.zip
-%%DATADIR%%/artwork/aim65.zip
 %%DATADIR%%/artwork/ledoff.png
 %%DATADIR%%/artwork/ledon.png
 %%DATADIR%%/artwork/mk1.zip
@@ -138,8 +146,10 @@ libexec/sdlmess/testkeys
 %%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
@@ -159,14 +169,15 @@ libexec/sdlmess/testkeys
 %%DATADIR%%/keymaps/km-fr-OSX.txt
 %%DATADIR%%/keymaps/km-fr.txt
 %%DATADIR%%/keymaps/km_it.txt
-%%DATADIR%%/sysinfo.dat
-@dirrm %%DATADIR%%/keymaps
-@dirrm %%DATADIR%%/hash
+%%DATADIR%%/ui.bdf
+%%EXAMPLESDIR%%/mess.ini
 @dirrm %%DATADIR%%/artwork
+@dirrm %%DATADIR%%/hash
+@dirrm %%DATADIR%%/keymaps
 @dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/images
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/windows/images
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/windows
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs/images
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/docs
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm libexec/sdlmess
+@dirrm %%EXAMPLESDIR%%