- Update to version 0.118u3.

- The wrapper script additional output has been removed so programs that parse the output do not get unexpected data. Submitted by: nikow <madleser@gmx.de> (private e-mail)
svn path=/head/; revision=198874
2007-09-05 22:38:15 +00:00 · 2007-09-05 22:38:15 +00:00 · d6ebd6c6f8 · 2021-03-31 03:12:20 +00:00
commit d6ebd6c6f8
parent 018f022d33
24 changed files with 156 additions and 152 deletions
--- a/emulators/mame-devel/Makefile
+++ b/emulators/mame-devel/Makefile
@ -6,7 +6,7 @@
 #

 PORTNAME=	sdlmame
-PORTVERSION=	0.117
+PORTVERSION=	0.118u3
 CATEGORIES=	emulators
 MASTER_SITES=	http://rbelmont.mameworld.info/
 DISTNAME=	${PORTNAME}${PORTVERSION:S/.//}
@ -24,10 +24,10 @@ SUB_FILES=	${PORTNAME} pkg-message

 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin
-	${MKDIR} ${PREFIX}/libexec/${PORTNAME}
-.for f in obj/sdl/mame/file2str obj/sdl/mame/png2bdc mame testkeys romcmp \
+	${MKDIR} ${PREFIX}/libexec/sdlmame
+.for f in obj/sdl/mame/build/file2str obj/sdl/mame/build/png2bdc mame testkeys romcmp \
 	  chdman jedutil makemeta regrep srcclean
-	${INSTALL_PROGRAM} ${WRKSRC}/${f} ${PREFIX}/libexec/${PORTNAME}
+	${INSTALL_PROGRAM} ${WRKSRC}/${f} ${PREFIX}/libexec/sdlmame
 .endfor
 	${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/ui.bdf ${DATADIR}
--- a/emulators/mame-devel/distinfo
+++ b/emulators/mame-devel/distinfo
@ -1,3 +1,3 @@
-MD5 (sdlmame0117.zip) = dfda8c92853c72e7a6bbae8e686e8cf6
-SHA256 (sdlmame0117.zip) = 083cbac7b8b906431e675933473ce10da654ad5c8a380ca8d5be920f32394526
-SIZE (sdlmame0117.zip) = 15453659
+MD5 (sdlmame0118u3.zip) = c2cd6045b57c2ae2f74c128e3a464e84
+SHA256 (sdlmame0118u3.zip) = ca10d1a28c39131dc4b29d26f9a14e37ac1332ddda21937e47bae0214498f5e5
+SIZE (sdlmame0118u3.zip) = 15636259
--- a/emulators/mame-devel/files/patch-makefile
+++ b/emulators/mame-devel/files/patch-makefile
@ -1,10 +1,11 @@
--- makefile.orig	Thu Jun 28 14:55:46 2007
-+++ makefile	Fri Jul 20 14:47:57 2007
-@@ -70,10 +70,12 @@
+--- makefile.orig	Thu Aug 30 23:22:34 2007
+++ makefile	Fri Aug 31 11:13:31 2007
+@@ -69,11 +69,13 @@
+ # uncomment next line to include the debugger
 # DEBUG = 1
 
- # uncomment next line to use DRC MIPS3 engine
 +ifeq ($(ARCH),i386)
+ # uncomment next line to use DRC MIPS3 engine
 X86_MIPS3_DRC = 1
 
 # uncomment next line to use DRC PowerPC engine
@ -13,7 +14,18 @@
 
 # uncomment next line to use DRC Voodoo rasterizers
 # X86_VOODOO_DRC = 1
-@@ -157,8 +159,8 @@
+@@ -96,7 +98,9 @@
+ # CELL = 1
+ 
+ # uncomment next line if you are building for a 64-bit target
+-# PTR64 = 1
+ifeq ($(ARCH),amd64)
+PTR64 = 1
+endif
+ 
+ # uncomment next line to build expat as part of MAME build
+ BUILD_EXPAT = 1
+@@ -160,8 +164,8 @@
 
 # compiler, linker and utilities
 AR = @ar
@ -24,16 +36,16 @@
 MD = -mkdir$(EXE)
 RM = @rm -f
 
-@@ -237,7 +239,7 @@
+@@ -240,7 +244,7 @@
 endif
 
 # fullname is prefix+name+suffix
 -FULLNAME = $(PREFIX)$(NAME)$(SUFFIX)
-+FULLNAME = $(NAME)$(SUFFIX)
+FULLNAME = $(NAME)
 
 # add an EXE suffix to get the final emulator name
 EMULATOR = $(FULLNAME)$(EXE)
-@@ -302,7 +304,7 @@
+@@ -305,7 +309,7 @@
 #-------------------------------------------------
 
 # we compile to C89 standard with GNU extensions
@ -42,21 +54,22 @@
 
 # add -g if we need symbols
 ifdef SYMBOLS
-@@ -333,12 +335,11 @@
+@@ -340,12 +344,12 @@
+ # if we are optimizing, include optimization options
 # and make all errors into warnings
- # but not on 64-bit or debug builds
 ifneq ($(OPTIMIZE),0)
 -CFLAGS += $(ARCH) -fno-strict-aliasing
 +CFLAGS += -fno-strict-aliasing
 
 # only -Werror if not PTR64 and not DEBUG
- ifndef PTR64
 ifndef DEBUG
-CFLAGS += -Werror
+ ifndef PTR64
+-CFLAGS += -Werror $(ARCH) -fno-strict-aliasing
+#CFLAGS += -Werror $(ARCH) -fno-strict-aliasing
 endif	# !DEBUG
 endif	# !PTR64
 endif	# neq OPTIMIZE
-@@ -358,6 +359,7 @@
+@@ -366,6 +370,7 @@
 	-I$(SRC)/lib/util \
 	-I$(SRC)/osd \
 	-I$(SRC)/osd/$(OSD) \
@ -64,7 +77,7 @@
 
 
 
-@@ -367,7 +369,7 @@
+@@ -375,7 +380,7 @@
 
 # LDFLAGS are used generally; LDFLAGSEMULATOR are additional
 # flags only used when linking the core emulator
@ -72,4 +85,4 @@
 +LDFLAGS += -L$(LOCALBASE)/lib
 LDFLAGSEMULATOR =
 
- # strip symbols and other metadata in non-symbols builds
+ # add profiling information for the linker
--- a/emulators/mame-devel/files/patch-srcosdsdl__sdltime.c
+++ b/emulators/mame-devel/files/patch-srcosdsdl__sdltime.c
@ -1,11 +0,0 @@
--- ./src/osd/sdl/sdltime.c.orig	Tue Jul 10 13:43:47 2007
-+++ ./src/osd/sdl/sdltime.c	Wed Aug 29 00:49:36 2007
-@@ -34,7 +34,7 @@
- 
- 
- // cheez until u3
-#if defined(LSB_FIRST) && !defined(PTR64)
-+#ifdef __i386__
- #define X86_ASM
- #endif
- 
--- a/emulators/mame-devel/files/sdlmame.in
+++ b/emulators/mame-devel/files/sdlmame.in
@ -2,14 +2,11 @@
 #
 # 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
-# ~/.cube, and create symlinks to the data files.
+# ~/.sdlmame, and create symlinks to the data files.
 #

-if [ -d ~/.sdlmame ]
+if [ ! -d ~/.sdlmame ]
 then
-	echo "Using existing ~/.sdlmame directory."
-else
-	echo "Creating ~/.sdlmame directory."
 	cd %%DATADIR%% || exit 1
 	find * -type d -exec mkdir -p ~/.sdlmame/{} \;
 	find * -type f -exec ln -s %%DATADIR%%/{} ~/.sdlmame/{} \; 2>/dev/null
--- a/emulators/mame-devel/pkg-plist
+++ b/emulators/mame-devel/pkg-plist
@ -14,6 +14,8 @@ libexec/sdlmame/testkeys
 %%PORTDOCS%%%%DOCSDIR%%/docs/mame.txt
 %%PORTDOCS%%%%DOCSDIR%%/docs/newvideo.txt
 %%PORTDOCS%%%%DOCSDIR%%/docs/windows.txt
+%%PORTDOCS%%%%DOCSDIR%%/docs/config.txt
+%%PORTDOCS%%%%DOCSDIR%%/whatsnew_0118u3.txt
 %%PORTDOCS%%%%DOCSDIR%%/whatsnew.txt
 %%DATADIR%%/keymaps/km-ch.txt
 %%DATADIR%%/keymaps/km-de.txt
--- a/emulators/mame/Makefile
+++ b/emulators/mame/Makefile
@ -6,7 +6,7 @@
 #

 PORTNAME=	sdlmame
-PORTVERSION=	0.117
+PORTVERSION=	0.118u3
 CATEGORIES=	emulators
 MASTER_SITES=	http://rbelmont.mameworld.info/
 DISTNAME=	${PORTNAME}${PORTVERSION:S/.//}
@ -24,10 +24,10 @@ SUB_FILES=	${PORTNAME} pkg-message

 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin
-	${MKDIR} ${PREFIX}/libexec/${PORTNAME}
-.for f in obj/sdl/mame/file2str obj/sdl/mame/png2bdc mame testkeys romcmp \
+	${MKDIR} ${PREFIX}/libexec/sdlmame
+.for f in obj/sdl/mame/build/file2str obj/sdl/mame/build/png2bdc mame testkeys romcmp \
 	  chdman jedutil makemeta regrep srcclean
-	${INSTALL_PROGRAM} ${WRKSRC}/${f} ${PREFIX}/libexec/${PORTNAME}
+	${INSTALL_PROGRAM} ${WRKSRC}/${f} ${PREFIX}/libexec/sdlmame
 .endfor
 	${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/ui.bdf ${DATADIR}
--- a/emulators/mame/distinfo
+++ b/emulators/mame/distinfo
@ -1,3 +1,3 @@
-MD5 (sdlmame0117.zip) = dfda8c92853c72e7a6bbae8e686e8cf6
-SHA256 (sdlmame0117.zip) = 083cbac7b8b906431e675933473ce10da654ad5c8a380ca8d5be920f32394526
-SIZE (sdlmame0117.zip) = 15453659
+MD5 (sdlmame0118u3.zip) = c2cd6045b57c2ae2f74c128e3a464e84
+SHA256 (sdlmame0118u3.zip) = ca10d1a28c39131dc4b29d26f9a14e37ac1332ddda21937e47bae0214498f5e5
+SIZE (sdlmame0118u3.zip) = 15636259
--- a/emulators/mame/files/patch-makefile
+++ b/emulators/mame/files/patch-makefile
@ -1,10 +1,11 @@
--- makefile.orig	Thu Jun 28 14:55:46 2007
-+++ makefile	Fri Jul 20 14:47:57 2007
-@@ -70,10 +70,12 @@
+--- makefile.orig	Thu Aug 30 23:22:34 2007
+++ makefile	Fri Aug 31 11:13:31 2007
+@@ -69,11 +69,13 @@
+ # uncomment next line to include the debugger
 # DEBUG = 1
 
- # uncomment next line to use DRC MIPS3 engine
 +ifeq ($(ARCH),i386)
+ # uncomment next line to use DRC MIPS3 engine
 X86_MIPS3_DRC = 1
 
 # uncomment next line to use DRC PowerPC engine
@ -13,7 +14,18 @@
 
 # uncomment next line to use DRC Voodoo rasterizers
 # X86_VOODOO_DRC = 1
-@@ -157,8 +159,8 @@
+@@ -96,7 +98,9 @@
+ # CELL = 1
+ 
+ # uncomment next line if you are building for a 64-bit target
+-# PTR64 = 1
+ifeq ($(ARCH),amd64)
+PTR64 = 1
+endif
+ 
+ # uncomment next line to build expat as part of MAME build
+ BUILD_EXPAT = 1
+@@ -160,8 +164,8 @@
 
 # compiler, linker and utilities
 AR = @ar
@ -24,16 +36,16 @@
 MD = -mkdir$(EXE)
 RM = @rm -f
 
-@@ -237,7 +239,7 @@
+@@ -240,7 +244,7 @@
 endif
 
 # fullname is prefix+name+suffix
 -FULLNAME = $(PREFIX)$(NAME)$(SUFFIX)
-+FULLNAME = $(NAME)$(SUFFIX)
+FULLNAME = $(NAME)
 
 # add an EXE suffix to get the final emulator name
 EMULATOR = $(FULLNAME)$(EXE)
-@@ -302,7 +304,7 @@
+@@ -305,7 +309,7 @@
 #-------------------------------------------------
 
 # we compile to C89 standard with GNU extensions
@ -42,21 +54,22 @@
 
 # add -g if we need symbols
 ifdef SYMBOLS
-@@ -333,12 +335,11 @@
+@@ -340,12 +344,12 @@
+ # if we are optimizing, include optimization options
 # and make all errors into warnings
- # but not on 64-bit or debug builds
 ifneq ($(OPTIMIZE),0)
 -CFLAGS += $(ARCH) -fno-strict-aliasing
 +CFLAGS += -fno-strict-aliasing
 
 # only -Werror if not PTR64 and not DEBUG
- ifndef PTR64
 ifndef DEBUG
-CFLAGS += -Werror
+ ifndef PTR64
+-CFLAGS += -Werror $(ARCH) -fno-strict-aliasing
+#CFLAGS += -Werror $(ARCH) -fno-strict-aliasing
 endif	# !DEBUG
 endif	# !PTR64
 endif	# neq OPTIMIZE
-@@ -358,6 +359,7 @@
+@@ -366,6 +370,7 @@
 	-I$(SRC)/lib/util \
 	-I$(SRC)/osd \
 	-I$(SRC)/osd/$(OSD) \
@ -64,7 +77,7 @@
 
 
 
-@@ -367,7 +369,7 @@
+@@ -375,7 +380,7 @@
 
 # LDFLAGS are used generally; LDFLAGSEMULATOR are additional
 # flags only used when linking the core emulator
@ -72,4 +85,4 @@
 +LDFLAGS += -L$(LOCALBASE)/lib
 LDFLAGSEMULATOR =
 
- # strip symbols and other metadata in non-symbols builds
+ # add profiling information for the linker
--- a/emulators/mame/files/patch-srcosdsdl__sdltime.c
+++ b/emulators/mame/files/patch-srcosdsdl__sdltime.c
@ -1,11 +0,0 @@
--- ./src/osd/sdl/sdltime.c.orig	Tue Jul 10 13:43:47 2007
-+++ ./src/osd/sdl/sdltime.c	Wed Aug 29 00:49:36 2007
-@@ -34,7 +34,7 @@
- 
- 
- // cheez until u3
-#if defined(LSB_FIRST) && !defined(PTR64)
-+#ifdef __i386__
- #define X86_ASM
- #endif
- 
--- a/emulators/mame/files/sdlmame.in
+++ b/emulators/mame/files/sdlmame.in
@ -2,14 +2,11 @@
 #
 # 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
-# ~/.cube, and create symlinks to the data files.
+# ~/.sdlmame, and create symlinks to the data files.
 #

-if [ -d ~/.sdlmame ]
+if [ ! -d ~/.sdlmame ]
 then
-	echo "Using existing ~/.sdlmame directory."
-else
-	echo "Creating ~/.sdlmame directory."
 	cd %%DATADIR%% || exit 1
 	find * -type d -exec mkdir -p ~/.sdlmame/{} \;
 	find * -type f -exec ln -s %%DATADIR%%/{} ~/.sdlmame/{} \; 2>/dev/null
--- a/emulators/mame/pkg-plist
+++ b/emulators/mame/pkg-plist
@ -14,6 +14,8 @@ libexec/sdlmame/testkeys
 %%PORTDOCS%%%%DOCSDIR%%/docs/mame.txt
 %%PORTDOCS%%%%DOCSDIR%%/docs/newvideo.txt
 %%PORTDOCS%%%%DOCSDIR%%/docs/windows.txt
+%%PORTDOCS%%%%DOCSDIR%%/docs/config.txt
+%%PORTDOCS%%%%DOCSDIR%%/whatsnew_0118u3.txt
 %%PORTDOCS%%%%DOCSDIR%%/whatsnew.txt
 %%DATADIR%%/keymaps/km-ch.txt
 %%DATADIR%%/keymaps/km-de.txt
--- a/emulators/sdlmame-devel/Makefile
+++ b/emulators/sdlmame-devel/Makefile
@ -6,7 +6,7 @@
 #

 PORTNAME=	sdlmame
-PORTVERSION=	0.117
+PORTVERSION=	0.118u3
 CATEGORIES=	emulators
 MASTER_SITES=	http://rbelmont.mameworld.info/
 DISTNAME=	${PORTNAME}${PORTVERSION:S/.//}
@ -24,10 +24,10 @@ SUB_FILES=	${PORTNAME} pkg-message

 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin
-	${MKDIR} ${PREFIX}/libexec/${PORTNAME}
-.for f in obj/sdl/mame/file2str obj/sdl/mame/png2bdc mame testkeys romcmp \
+	${MKDIR} ${PREFIX}/libexec/sdlmame
+.for f in obj/sdl/mame/build/file2str obj/sdl/mame/build/png2bdc mame testkeys romcmp \
 	  chdman jedutil makemeta regrep srcclean
-	${INSTALL_PROGRAM} ${WRKSRC}/${f} ${PREFIX}/libexec/${PORTNAME}
+	${INSTALL_PROGRAM} ${WRKSRC}/${f} ${PREFIX}/libexec/sdlmame
 .endfor
 	${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/ui.bdf ${DATADIR}
--- a/emulators/sdlmame-devel/distinfo
+++ b/emulators/sdlmame-devel/distinfo
@ -1,3 +1,3 @@
-MD5 (sdlmame0117.zip) = dfda8c92853c72e7a6bbae8e686e8cf6
-SHA256 (sdlmame0117.zip) = 083cbac7b8b906431e675933473ce10da654ad5c8a380ca8d5be920f32394526
-SIZE (sdlmame0117.zip) = 15453659
+MD5 (sdlmame0118u3.zip) = c2cd6045b57c2ae2f74c128e3a464e84
+SHA256 (sdlmame0118u3.zip) = ca10d1a28c39131dc4b29d26f9a14e37ac1332ddda21937e47bae0214498f5e5
+SIZE (sdlmame0118u3.zip) = 15636259
--- a/emulators/sdlmame-devel/files/patch-makefile
+++ b/emulators/sdlmame-devel/files/patch-makefile
@ -1,10 +1,11 @@
--- makefile.orig	Thu Jun 28 14:55:46 2007
-+++ makefile	Fri Jul 20 14:47:57 2007
-@@ -70,10 +70,12 @@
+--- makefile.orig	Thu Aug 30 23:22:34 2007
+++ makefile	Fri Aug 31 11:13:31 2007
+@@ -69,11 +69,13 @@
+ # uncomment next line to include the debugger
 # DEBUG = 1
 
- # uncomment next line to use DRC MIPS3 engine
 +ifeq ($(ARCH),i386)
+ # uncomment next line to use DRC MIPS3 engine
 X86_MIPS3_DRC = 1
 
 # uncomment next line to use DRC PowerPC engine
@ -13,7 +14,18 @@
 
 # uncomment next line to use DRC Voodoo rasterizers
 # X86_VOODOO_DRC = 1
-@@ -157,8 +159,8 @@
+@@ -96,7 +98,9 @@
+ # CELL = 1
+ 
+ # uncomment next line if you are building for a 64-bit target
+-# PTR64 = 1
+ifeq ($(ARCH),amd64)
+PTR64 = 1
+endif
+ 
+ # uncomment next line to build expat as part of MAME build
+ BUILD_EXPAT = 1
+@@ -160,8 +164,8 @@
 
 # compiler, linker and utilities
 AR = @ar
@ -24,16 +36,16 @@
 MD = -mkdir$(EXE)
 RM = @rm -f
 
-@@ -237,7 +239,7 @@
+@@ -240,7 +244,7 @@
 endif
 
 # fullname is prefix+name+suffix
 -FULLNAME = $(PREFIX)$(NAME)$(SUFFIX)
-+FULLNAME = $(NAME)$(SUFFIX)
+FULLNAME = $(NAME)
 
 # add an EXE suffix to get the final emulator name
 EMULATOR = $(FULLNAME)$(EXE)
-@@ -302,7 +304,7 @@
+@@ -305,7 +309,7 @@
 #-------------------------------------------------
 
 # we compile to C89 standard with GNU extensions
@ -42,21 +54,22 @@
 
 # add -g if we need symbols
 ifdef SYMBOLS
-@@ -333,12 +335,11 @@
+@@ -340,12 +344,12 @@
+ # if we are optimizing, include optimization options
 # and make all errors into warnings
- # but not on 64-bit or debug builds
 ifneq ($(OPTIMIZE),0)
 -CFLAGS += $(ARCH) -fno-strict-aliasing
 +CFLAGS += -fno-strict-aliasing
 
 # only -Werror if not PTR64 and not DEBUG
- ifndef PTR64
 ifndef DEBUG
-CFLAGS += -Werror
+ ifndef PTR64
+-CFLAGS += -Werror $(ARCH) -fno-strict-aliasing
+#CFLAGS += -Werror $(ARCH) -fno-strict-aliasing
 endif	# !DEBUG
 endif	# !PTR64
 endif	# neq OPTIMIZE
-@@ -358,6 +359,7 @@
+@@ -366,6 +370,7 @@
 	-I$(SRC)/lib/util \
 	-I$(SRC)/osd \
 	-I$(SRC)/osd/$(OSD) \
@ -64,7 +77,7 @@
 
 
 
-@@ -367,7 +369,7 @@
+@@ -375,7 +380,7 @@
 
 # LDFLAGS are used generally; LDFLAGSEMULATOR are additional
 # flags only used when linking the core emulator
@ -72,4 +85,4 @@
 +LDFLAGS += -L$(LOCALBASE)/lib
 LDFLAGSEMULATOR =
 
- # strip symbols and other metadata in non-symbols builds
+ # add profiling information for the linker
--- a/emulators/sdlmame-devel/files/patch-srcosdsdl__sdltime.c
+++ b/emulators/sdlmame-devel/files/patch-srcosdsdl__sdltime.c
@ -1,11 +0,0 @@
--- ./src/osd/sdl/sdltime.c.orig	Tue Jul 10 13:43:47 2007
-+++ ./src/osd/sdl/sdltime.c	Wed Aug 29 00:49:36 2007
-@@ -34,7 +34,7 @@
- 
- 
- // cheez until u3
-#if defined(LSB_FIRST) && !defined(PTR64)
-+#ifdef __i386__
- #define X86_ASM
- #endif
- 
--- a/emulators/sdlmame-devel/files/sdlmame.in
+++ b/emulators/sdlmame-devel/files/sdlmame.in
@ -2,14 +2,11 @@
 #
 # 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
-# ~/.cube, and create symlinks to the data files.
+# ~/.sdlmame, and create symlinks to the data files.
 #

-if [ -d ~/.sdlmame ]
+if [ ! -d ~/.sdlmame ]
 then
-	echo "Using existing ~/.sdlmame directory."
-else
-	echo "Creating ~/.sdlmame directory."
 	cd %%DATADIR%% || exit 1
 	find * -type d -exec mkdir -p ~/.sdlmame/{} \;
 	find * -type f -exec ln -s %%DATADIR%%/{} ~/.sdlmame/{} \; 2>/dev/null
--- a/emulators/sdlmame-devel/pkg-plist
+++ b/emulators/sdlmame-devel/pkg-plist
@ -14,6 +14,8 @@ libexec/sdlmame/testkeys
 %%PORTDOCS%%%%DOCSDIR%%/docs/mame.txt
 %%PORTDOCS%%%%DOCSDIR%%/docs/newvideo.txt
 %%PORTDOCS%%%%DOCSDIR%%/docs/windows.txt
+%%PORTDOCS%%%%DOCSDIR%%/docs/config.txt
+%%PORTDOCS%%%%DOCSDIR%%/whatsnew_0118u3.txt
 %%PORTDOCS%%%%DOCSDIR%%/whatsnew.txt
 %%DATADIR%%/keymaps/km-ch.txt
 %%DATADIR%%/keymaps/km-de.txt
--- a/emulators/sdlmame/Makefile
+++ b/emulators/sdlmame/Makefile
@ -6,7 +6,7 @@
 #

 PORTNAME=	sdlmame
-PORTVERSION=	0.117
+PORTVERSION=	0.118u3
 CATEGORIES=	emulators
 MASTER_SITES=	http://rbelmont.mameworld.info/
 DISTNAME=	${PORTNAME}${PORTVERSION:S/.//}
@ -24,10 +24,10 @@ SUB_FILES=	${PORTNAME} pkg-message

 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin
-	${MKDIR} ${PREFIX}/libexec/${PORTNAME}
-.for f in obj/sdl/mame/file2str obj/sdl/mame/png2bdc mame testkeys romcmp \
+	${MKDIR} ${PREFIX}/libexec/sdlmame
+.for f in obj/sdl/mame/build/file2str obj/sdl/mame/build/png2bdc mame testkeys romcmp \
 	  chdman jedutil makemeta regrep srcclean
-	${INSTALL_PROGRAM} ${WRKSRC}/${f} ${PREFIX}/libexec/${PORTNAME}
+	${INSTALL_PROGRAM} ${WRKSRC}/${f} ${PREFIX}/libexec/sdlmame
 .endfor
 	${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/ui.bdf ${DATADIR}
--- a/emulators/sdlmame/distinfo
+++ b/emulators/sdlmame/distinfo
@ -1,3 +1,3 @@
-MD5 (sdlmame0117.zip) = dfda8c92853c72e7a6bbae8e686e8cf6
-SHA256 (sdlmame0117.zip) = 083cbac7b8b906431e675933473ce10da654ad5c8a380ca8d5be920f32394526
-SIZE (sdlmame0117.zip) = 15453659
+MD5 (sdlmame0118u3.zip) = c2cd6045b57c2ae2f74c128e3a464e84
+SHA256 (sdlmame0118u3.zip) = ca10d1a28c39131dc4b29d26f9a14e37ac1332ddda21937e47bae0214498f5e5
+SIZE (sdlmame0118u3.zip) = 15636259
--- a/emulators/sdlmame/files/patch-makefile
+++ b/emulators/sdlmame/files/patch-makefile
@ -1,10 +1,11 @@
--- makefile.orig	Thu Jun 28 14:55:46 2007
-+++ makefile	Fri Jul 20 14:47:57 2007
-@@ -70,10 +70,12 @@
+--- makefile.orig	Thu Aug 30 23:22:34 2007
+++ makefile	Fri Aug 31 11:13:31 2007
+@@ -69,11 +69,13 @@
+ # uncomment next line to include the debugger
 # DEBUG = 1
 
- # uncomment next line to use DRC MIPS3 engine
 +ifeq ($(ARCH),i386)
+ # uncomment next line to use DRC MIPS3 engine
 X86_MIPS3_DRC = 1
 
 # uncomment next line to use DRC PowerPC engine
@ -13,7 +14,18 @@
 
 # uncomment next line to use DRC Voodoo rasterizers
 # X86_VOODOO_DRC = 1
-@@ -157,8 +159,8 @@
+@@ -96,7 +98,9 @@
+ # CELL = 1
+ 
+ # uncomment next line if you are building for a 64-bit target
+-# PTR64 = 1
+ifeq ($(ARCH),amd64)
+PTR64 = 1
+endif
+ 
+ # uncomment next line to build expat as part of MAME build
+ BUILD_EXPAT = 1
+@@ -160,8 +164,8 @@
 
 # compiler, linker and utilities
 AR = @ar
@ -24,16 +36,16 @@
 MD = -mkdir$(EXE)
 RM = @rm -f
 
-@@ -237,7 +239,7 @@
+@@ -240,7 +244,7 @@
 endif
 
 # fullname is prefix+name+suffix
 -FULLNAME = $(PREFIX)$(NAME)$(SUFFIX)
-+FULLNAME = $(NAME)$(SUFFIX)
+FULLNAME = $(NAME)
 
 # add an EXE suffix to get the final emulator name
 EMULATOR = $(FULLNAME)$(EXE)
-@@ -302,7 +304,7 @@
+@@ -305,7 +309,7 @@
 #-------------------------------------------------
 
 # we compile to C89 standard with GNU extensions
@ -42,21 +54,22 @@
 
 # add -g if we need symbols
 ifdef SYMBOLS
-@@ -333,12 +335,11 @@
+@@ -340,12 +344,12 @@
+ # if we are optimizing, include optimization options
 # and make all errors into warnings
- # but not on 64-bit or debug builds
 ifneq ($(OPTIMIZE),0)
 -CFLAGS += $(ARCH) -fno-strict-aliasing
 +CFLAGS += -fno-strict-aliasing
 
 # only -Werror if not PTR64 and not DEBUG
- ifndef PTR64
 ifndef DEBUG
-CFLAGS += -Werror
+ ifndef PTR64
+-CFLAGS += -Werror $(ARCH) -fno-strict-aliasing
+#CFLAGS += -Werror $(ARCH) -fno-strict-aliasing
 endif	# !DEBUG
 endif	# !PTR64
 endif	# neq OPTIMIZE
-@@ -358,6 +359,7 @@
+@@ -366,6 +370,7 @@
 	-I$(SRC)/lib/util \
 	-I$(SRC)/osd \
 	-I$(SRC)/osd/$(OSD) \
@ -64,7 +77,7 @@
 
 
 
-@@ -367,7 +369,7 @@
+@@ -375,7 +380,7 @@
 
 # LDFLAGS are used generally; LDFLAGSEMULATOR are additional
 # flags only used when linking the core emulator
@ -72,4 +85,4 @@
 +LDFLAGS += -L$(LOCALBASE)/lib
 LDFLAGSEMULATOR =
 
- # strip symbols and other metadata in non-symbols builds
+ # add profiling information for the linker
--- a/emulators/sdlmame/files/patch-srcosdsdl__sdltime.c
+++ b/emulators/sdlmame/files/patch-srcosdsdl__sdltime.c
@ -1,11 +0,0 @@
--- ./src/osd/sdl/sdltime.c.orig	Tue Jul 10 13:43:47 2007
-+++ ./src/osd/sdl/sdltime.c	Wed Aug 29 00:49:36 2007
-@@ -34,7 +34,7 @@
- 
- 
- // cheez until u3
-#if defined(LSB_FIRST) && !defined(PTR64)
-+#ifdef __i386__
- #define X86_ASM
- #endif
- 
--- a/emulators/sdlmame/files/sdlmame.in
+++ b/emulators/sdlmame/files/sdlmame.in
@ -2,14 +2,11 @@
 #
 # 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
-# ~/.cube, and create symlinks to the data files.
+# ~/.sdlmame, and create symlinks to the data files.
 #

-if [ -d ~/.sdlmame ]
+if [ ! -d ~/.sdlmame ]
 then
-	echo "Using existing ~/.sdlmame directory."
-else
-	echo "Creating ~/.sdlmame directory."
 	cd %%DATADIR%% || exit 1
 	find * -type d -exec mkdir -p ~/.sdlmame/{} \;
 	find * -type f -exec ln -s %%DATADIR%%/{} ~/.sdlmame/{} \; 2>/dev/null
--- a/emulators/sdlmame/pkg-plist
+++ b/emulators/sdlmame/pkg-plist
@ -14,6 +14,8 @@ libexec/sdlmame/testkeys
 %%PORTDOCS%%%%DOCSDIR%%/docs/mame.txt
 %%PORTDOCS%%%%DOCSDIR%%/docs/newvideo.txt
 %%PORTDOCS%%%%DOCSDIR%%/docs/windows.txt
+%%PORTDOCS%%%%DOCSDIR%%/docs/config.txt
+%%PORTDOCS%%%%DOCSDIR%%/whatsnew_0118u3.txt
 %%PORTDOCS%%%%DOCSDIR%%/whatsnew.txt
 %%DATADIR%%/keymaps/km-ch.txt
 %%DATADIR%%/keymaps/km-de.txt