- Update to version 0.117.

16 files changed, 212 insertions, 444 deletions

diff --git a/emulators/mame-devel/Makefile b/emulators/mame-devel/Makefile
index 8c47e7fc3188..d52f864b8595 100644
--- a/emulators/mame-devel/Makefile
+++ b/emulators/mame-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sdlmame
-PORTVERSION=	0.115u2
+PORTVERSION=	0.117
 CATEGORIES=	emulators
 MASTER_SITES=	http://rbelmont.mameworld.info/
 DISTNAME=	${PORTNAME}${PORTVERSION:S/.//}
@@ -25,8 +25,8 @@ SUB_FILES=	${PORTNAME} pkg-message
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin
 	${MKDIR} ${PREFIX}/libexec/${PORTNAME}
-.for f in obj/mame/file2str obj/mame/png2bdc mame testkeys romcmp chdman \
-	  jedutil makemeta regrep srcclean
+.for f in obj/sdl/mame/file2str obj/sdl/mame/png2bdc mame testkeys romcmp \
+	  chdman jedutil makemeta regrep srcclean
 	${INSTALL_PROGRAM} ${WRKSRC}/${f} ${PREFIX}/libexec/${PORTNAME}
 .endfor
 	${MKDIR} ${DATADIR}
diff --git a/emulators/mame-devel/distinfo b/emulators/mame-devel/distinfo
index b11ca8199490..0aa39dcafb8c 100644
--- a/emulators/mame-devel/distinfo
+++ b/emulators/mame-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (sdlmame0115u2.zip) = bcd9c225e248d0a629c4c50178f5d7fd
-SHA256 (sdlmame0115u2.zip) = 66d2e7e61aeab2cd352d6f89dcc355bf30f668296cd4e25d671f8cd9a048e229
-SIZE (sdlmame0115u2.zip) = 15362091
+MD5 (sdlmame0117.zip) = dfda8c92853c72e7a6bbae8e686e8cf6
+SHA256 (sdlmame0117.zip) = 083cbac7b8b906431e675933473ce10da654ad5c8a380ca8d5be920f32394526
+SIZE (sdlmame0117.zip) = 15453659
diff --git a/emulators/mame-devel/files/patch-makefile b/emulators/mame-devel/files/patch-makefile
index d839b1ec02ca..beaf875a55c4 100644
--- a/emulators/mame-devel/files/patch-makefile
+++ b/emulators/mame-devel/files/patch-makefile
@@ -1,20 +1,19 @@
---- makefile.orig	Thu Apr 12 22:01:33 2007
-+++ makefile	Sat Apr 21 13:20:41 2007
-@@ -63,11 +63,13 @@
- # uncomment next line to include the debugger
- # DEBUG = 1    
-  
-+ifeq ($(ARCH),i386)
+--- makefile.orig	Thu Jun 28 14:55:46 2007
++++ makefile	Fri Jul 20 14:47:57 2007
+@@ -70,10 +70,12 @@
+ # DEBUG = 1
+ 
  # uncomment next line to use DRC MIPS3 engine
++ifeq ($(ARCH),i386)
  X86_MIPS3_DRC = 1
  
  # uncomment next line to use DRC PowerPC engine
  X86_PPC_DRC = 1
 +endif
  
- #-------------------------------------------------
- # specify build options; see each option below 
-@@ -174,8 +176,8 @@
+ # uncomment next line to use DRC Voodoo rasterizers
+ # X86_VOODOO_DRC = 1
+@@ -157,8 +159,8 @@
  
  # compiler, linker and utilities
  AR = @ar
@@ -22,111 +21,55 @@
 -LD = @gcc
 +CC := @$(CC)
 +LD = @$(CC)
- MD = -mkdir
+ MD = -mkdir$(EXE)
  RM = @rm -f
  
-@@ -191,53 +193,12 @@
+@@ -237,7 +239,7 @@
  endif
  
- # by default, don't compile for a specific target CPU
--NAME = $(PREFIX)$(TARGET)
--ARCH = 
--
--# architecture-specific builds get extra options
--ifdef ATHLON
--NAME = $(PREFIX)$(TARGET)at
--ARCH = -march=athlon
--endif
--
--ifdef I686
--NAME = $(PREFIX)$(TARGET)pp
--ARCH = -march=pentiumpro
--endif
--
--ifdef P4
--NAME = $(PREFIX)$(TARGET)p4
--ARCH = -march=pentium4
--endif
--
--ifdef AMD64
--NAME = $(PREFIX)$(TARGET)64
--ARCH = -march=athlon64
--endif
--
--ifdef PM
--NAME = $(PREFIX)$(TARGET)pm
--ARCH = -march=pentium3 -msse2
--endif
--
--ifdef G4
--NAME = $(PREFIX)$(TARGET)g4
--ARCH = -mcpu=G4
--endif
--
--ifdef G5
--NAME = $(PREFIX)$(TARGET)g5
--ARCH = -mcpu=G5
--endif
--
--ifdef CELL
--NAME = $(PREFIX)$(TARGET)cbe
-+NAME = $(TARGET)
- ARCH = 
--endif
+ # fullname is prefix+name+suffix
+-FULLNAME = $(PREFIX)$(NAME)$(SUFFIX)
++FULLNAME = $(NAME)$(SUFFIX)
  
- # debug builds just get the 'd' suffix and nothing more
- ifdef DEBUG
--NAME = $(PREFIX)$(TARGET)d
-+NAME = $(TARGET)d
- endif
- 
- EMULATOR = $(NAME)$(EXE)
-@@ -275,7 +236,7 @@
- # compile and linking flags
+ # add an EXE suffix to get the final emulator name
+ EMULATOR = $(FULLNAME)$(EXE)
+@@ -302,7 +304,7 @@
  #-------------------------------------------------
  
--CFLAGS = \
-+CFLAGS += \
- 	$(OPT_FLAGS) \
- 	-std=gnu89 \
- 	-I$(SRC)/$(TARGET) \
-@@ -287,6 +248,7 @@
- 	-I$(SRC)/lib/util \
- 	-I$(SRC)/osd \
- 	-I$(SRC)/osd/$(MAMEOS) \
-+	-I$(LOCALBASE)/include -I$(X11BASE)/include
+ # we compile to C89 standard with GNU extensions
+-CFLAGS = -std=gnu89
++CFLAGS += -std=gnu89
  
- ifdef MESS
- CFLAGS += \
-@@ -305,7 +267,7 @@
- endif	# PPC
- endif	# SYMBOLS
+ # add -g if we need symbols
+ ifdef SYMBOLS
+@@ -333,12 +335,11 @@
+ # 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
  
--CFLAGS += $(ARCH) \
-+CFLAGS += \
- 	-Wall \
- 	-Wpointer-arith \
- 	-Wbad-function-cast \
-@@ -317,7 +279,7 @@
- 	-Wdeclaration-after-statement
+ # only -Werror if not PTR64 and not DEBUG
+ ifndef PTR64
+ ifndef DEBUG
+-CFLAGS += -Werror
+ endif	# !DEBUG
+ endif	# !PTR64
+ endif	# neq OPTIMIZE
+@@ -358,6 +359,7 @@
+ 	-I$(SRC)/lib/util \
+ 	-I$(SRC)/osd \
+ 	-I$(SRC)/osd/$(OSD) \
++	-I$(LOCALBASE)/include
  
- ifneq ($(OPTIMIZE),0)
--CFLAGS += -DNDEBUG $(ARCH) -fno-strict-aliasing
-+CFLAGS += -DNDEBUG -fno-strict-aliasing
- endif
  
- CFLAGS += -O$(OPTIMIZE)
-@@ -325,11 +287,9 @@
- # extra options needed *only* for the osd files
- CFLAGSOSDEPEND = $(CFLAGS)
  
--LDFLAGS = -WO
-+LDFLAGS += -WO -L$(LOCALBASE)/lib -L$(X11BASE)/lib
+@@ -367,7 +369,7 @@
  
--ifdef SYMBOLS
+ # LDFLAGS are used generally; LDFLAGSEMULATOR are additional
+ # flags only used when linking the core emulator
 -LDFLAGS = 
--else
-+ifndef SYMBOLS
- LDFLAGS += -s
- endif
++LDFLAGS += -L$(LOCALBASE)/lib
+ LDFLAGSEMULATOR =
  
+ # strip symbols and other metadata in non-symbols builds
diff --git a/emulators/mame-devel/pkg-plist b/emulators/mame-devel/pkg-plist
index 22bc5799ac81..38001c5dee05 100644
--- a/emulators/mame-devel/pkg-plist
+++ b/emulators/mame-devel/pkg-plist
@@ -10,14 +10,13 @@ libexec/sdlmame/romcmp
 libexec/sdlmame/srcclean
 libexec/sdlmame/testkeys
 %%PORTDOCS%%%%DOCSDIR%%/SDLMAME.txt
-%%PORTDOCS%%%%DOCSDIR%%/cheats.txt
 %%PORTDOCS%%%%DOCSDIR%%/docs/license.txt
 %%PORTDOCS%%%%DOCSDIR%%/docs/mame.txt
 %%PORTDOCS%%%%DOCSDIR%%/docs/newvideo.txt
 %%PORTDOCS%%%%DOCSDIR%%/docs/windows.txt
 %%PORTDOCS%%%%DOCSDIR%%/whatsnew.txt
-%%PORTDOCS%%%%DOCSDIR%%/whatsnew_0115u2.txt
 %%DATADIR%%/keymaps/km-ch.txt
+%%DATADIR%%/keymaps/km-de.txt
 %%DATADIR%%/keymaps/km-fr-OSX.txt
 %%DATADIR%%/keymaps/km-fr.txt
 %%DATADIR%%/ui.bdf
diff --git a/emulators/mame/Makefile b/emulators/mame/Makefile
index 8c47e7fc3188..d52f864b8595 100644
--- a/emulators/mame/Makefile
+++ b/emulators/mame/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sdlmame
-PORTVERSION=	0.115u2
+PORTVERSION=	0.117
 CATEGORIES=	emulators
 MASTER_SITES=	http://rbelmont.mameworld.info/
 DISTNAME=	${PORTNAME}${PORTVERSION:S/.//}
@@ -25,8 +25,8 @@ SUB_FILES=	${PORTNAME} pkg-message
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin
 	${MKDIR} ${PREFIX}/libexec/${PORTNAME}
-.for f in obj/mame/file2str obj/mame/png2bdc mame testkeys romcmp chdman \
-	  jedutil makemeta regrep srcclean
+.for f in obj/sdl/mame/file2str obj/sdl/mame/png2bdc mame testkeys romcmp \
+	  chdman jedutil makemeta regrep srcclean
 	${INSTALL_PROGRAM} ${WRKSRC}/${f} ${PREFIX}/libexec/${PORTNAME}
 .endfor
 	${MKDIR} ${DATADIR}
diff --git a/emulators/mame/distinfo b/emulators/mame/distinfo
index b11ca8199490..0aa39dcafb8c 100644
--- a/emulators/mame/distinfo
+++ b/emulators/mame/distinfo
@@ -1,3 +1,3 @@
-MD5 (sdlmame0115u2.zip) = bcd9c225e248d0a629c4c50178f5d7fd
-SHA256 (sdlmame0115u2.zip) = 66d2e7e61aeab2cd352d6f89dcc355bf30f668296cd4e25d671f8cd9a048e229
-SIZE (sdlmame0115u2.zip) = 15362091
+MD5 (sdlmame0117.zip) = dfda8c92853c72e7a6bbae8e686e8cf6
+SHA256 (sdlmame0117.zip) = 083cbac7b8b906431e675933473ce10da654ad5c8a380ca8d5be920f32394526
+SIZE (sdlmame0117.zip) = 15453659
diff --git a/emulators/mame/files/patch-makefile b/emulators/mame/files/patch-makefile
index d839b1ec02ca..beaf875a55c4 100644
--- a/emulators/mame/files/patch-makefile
+++ b/emulators/mame/files/patch-makefile
@@ -1,20 +1,19 @@
---- makefile.orig	Thu Apr 12 22:01:33 2007
-+++ makefile	Sat Apr 21 13:20:41 2007
-@@ -63,11 +63,13 @@
- # uncomment next line to include the debugger
- # DEBUG = 1    
-  
-+ifeq ($(ARCH),i386)
+--- makefile.orig	Thu Jun 28 14:55:46 2007
++++ makefile	Fri Jul 20 14:47:57 2007
+@@ -70,10 +70,12 @@
+ # DEBUG = 1
+ 
  # uncomment next line to use DRC MIPS3 engine
++ifeq ($(ARCH),i386)
  X86_MIPS3_DRC = 1
  
  # uncomment next line to use DRC PowerPC engine
  X86_PPC_DRC = 1
 +endif
  
- #-------------------------------------------------
- # specify build options; see each option below 
-@@ -174,8 +176,8 @@
+ # uncomment next line to use DRC Voodoo rasterizers
+ # X86_VOODOO_DRC = 1
+@@ -157,8 +159,8 @@
  
  # compiler, linker and utilities
  AR = @ar
@@ -22,111 +21,55 @@
 -LD = @gcc
 +CC := @$(CC)
 +LD = @$(CC)
- MD = -mkdir
+ MD = -mkdir$(EXE)
  RM = @rm -f
  
-@@ -191,53 +193,12 @@
+@@ -237,7 +239,7 @@
  endif
  
- # by default, don't compile for a specific target CPU
--NAME = $(PREFIX)$(TARGET)
--ARCH = 
--
--# architecture-specific builds get extra options
--ifdef ATHLON
--NAME = $(PREFIX)$(TARGET)at
--ARCH = -march=athlon
--endif
--
--ifdef I686
--NAME = $(PREFIX)$(TARGET)pp
--ARCH = -march=pentiumpro
--endif
--
--ifdef P4
--NAME = $(PREFIX)$(TARGET)p4
--ARCH = -march=pentium4
--endif
--
--ifdef AMD64
--NAME = $(PREFIX)$(TARGET)64
--ARCH = -march=athlon64
--endif
--
--ifdef PM
--NAME = $(PREFIX)$(TARGET)pm
--ARCH = -march=pentium3 -msse2
--endif
--
--ifdef G4
--NAME = $(PREFIX)$(TARGET)g4
--ARCH = -mcpu=G4
--endif
--
--ifdef G5
--NAME = $(PREFIX)$(TARGET)g5
--ARCH = -mcpu=G5
--endif
--
--ifdef CELL
--NAME = $(PREFIX)$(TARGET)cbe
-+NAME = $(TARGET)
- ARCH = 
--endif
+ # fullname is prefix+name+suffix
+-FULLNAME = $(PREFIX)$(NAME)$(SUFFIX)
++FULLNAME = $(NAME)$(SUFFIX)
  
- # debug builds just get the 'd' suffix and nothing more
- ifdef DEBUG
--NAME = $(PREFIX)$(TARGET)d
-+NAME = $(TARGET)d
- endif
- 
- EMULATOR = $(NAME)$(EXE)
-@@ -275,7 +236,7 @@
- # compile and linking flags
+ # add an EXE suffix to get the final emulator name
+ EMULATOR = $(FULLNAME)$(EXE)
+@@ -302,7 +304,7 @@
  #-------------------------------------------------
  
--CFLAGS = \
-+CFLAGS += \
- 	$(OPT_FLAGS) \
- 	-std=gnu89 \
- 	-I$(SRC)/$(TARGET) \
-@@ -287,6 +248,7 @@
- 	-I$(SRC)/lib/util \
- 	-I$(SRC)/osd \
- 	-I$(SRC)/osd/$(MAMEOS) \
-+	-I$(LOCALBASE)/include -I$(X11BASE)/include
+ # we compile to C89 standard with GNU extensions
+-CFLAGS = -std=gnu89
++CFLAGS += -std=gnu89
  
- ifdef MESS
- CFLAGS += \
-@@ -305,7 +267,7 @@
- endif	# PPC
- endif	# SYMBOLS
+ # add -g if we need symbols
+ ifdef SYMBOLS
+@@ -333,12 +335,11 @@
+ # 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
  
--CFLAGS += $(ARCH) \
-+CFLAGS += \
- 	-Wall \
- 	-Wpointer-arith \
- 	-Wbad-function-cast \
-@@ -317,7 +279,7 @@
- 	-Wdeclaration-after-statement
+ # only -Werror if not PTR64 and not DEBUG
+ ifndef PTR64
+ ifndef DEBUG
+-CFLAGS += -Werror
+ endif	# !DEBUG
+ endif	# !PTR64
+ endif	# neq OPTIMIZE
+@@ -358,6 +359,7 @@
+ 	-I$(SRC)/lib/util \
+ 	-I$(SRC)/osd \
+ 	-I$(SRC)/osd/$(OSD) \
++	-I$(LOCALBASE)/include
  
- ifneq ($(OPTIMIZE),0)
--CFLAGS += -DNDEBUG $(ARCH) -fno-strict-aliasing
-+CFLAGS += -DNDEBUG -fno-strict-aliasing
- endif
  
- CFLAGS += -O$(OPTIMIZE)
-@@ -325,11 +287,9 @@
- # extra options needed *only* for the osd files
- CFLAGSOSDEPEND = $(CFLAGS)
  
--LDFLAGS = -WO
-+LDFLAGS += -WO -L$(LOCALBASE)/lib -L$(X11BASE)/lib
+@@ -367,7 +369,7 @@
  
--ifdef SYMBOLS
+ # LDFLAGS are used generally; LDFLAGSEMULATOR are additional
+ # flags only used when linking the core emulator
 -LDFLAGS = 
--else
-+ifndef SYMBOLS
- LDFLAGS += -s
- endif
++LDFLAGS += -L$(LOCALBASE)/lib
+ LDFLAGSEMULATOR =
  
+ # strip symbols and other metadata in non-symbols builds
diff --git a/emulators/mame/pkg-plist b/emulators/mame/pkg-plist
index 22bc5799ac81..38001c5dee05 100644
--- a/emulators/mame/pkg-plist
+++ b/emulators/mame/pkg-plist
@@ -10,14 +10,13 @@ libexec/sdlmame/romcmp
 libexec/sdlmame/srcclean
 libexec/sdlmame/testkeys
 %%PORTDOCS%%%%DOCSDIR%%/SDLMAME.txt
-%%PORTDOCS%%%%DOCSDIR%%/cheats.txt
 %%PORTDOCS%%%%DOCSDIR%%/docs/license.txt
 %%PORTDOCS%%%%DOCSDIR%%/docs/mame.txt
 %%PORTDOCS%%%%DOCSDIR%%/docs/newvideo.txt
 %%PORTDOCS%%%%DOCSDIR%%/docs/windows.txt
 %%PORTDOCS%%%%DOCSDIR%%/whatsnew.txt
-%%PORTDOCS%%%%DOCSDIR%%/whatsnew_0115u2.txt
 %%DATADIR%%/keymaps/km-ch.txt
+%%DATADIR%%/keymaps/km-de.txt
 %%DATADIR%%/keymaps/km-fr-OSX.txt
 %%DATADIR%%/keymaps/km-fr.txt
 %%DATADIR%%/ui.bdf
diff --git a/emulators/sdlmame-devel/Makefile b/emulators/sdlmame-devel/Makefile
index 8c47e7fc3188..d52f864b8595 100644
--- a/emulators/sdlmame-devel/Makefile
+++ b/emulators/sdlmame-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sdlmame
-PORTVERSION=	0.115u2
+PORTVERSION=	0.117
 CATEGORIES=	emulators
 MASTER_SITES=	http://rbelmont.mameworld.info/
 DISTNAME=	${PORTNAME}${PORTVERSION:S/.//}
@@ -25,8 +25,8 @@ SUB_FILES=	${PORTNAME} pkg-message
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin
 	${MKDIR} ${PREFIX}/libexec/${PORTNAME}
-.for f in obj/mame/file2str obj/mame/png2bdc mame testkeys romcmp chdman \
-	  jedutil makemeta regrep srcclean
+.for f in obj/sdl/mame/file2str obj/sdl/mame/png2bdc mame testkeys romcmp \
+	  chdman jedutil makemeta regrep srcclean
 	${INSTALL_PROGRAM} ${WRKSRC}/${f} ${PREFIX}/libexec/${PORTNAME}
 .endfor
 	${MKDIR} ${DATADIR}
diff --git a/emulators/sdlmame-devel/distinfo b/emulators/sdlmame-devel/distinfo
index b11ca8199490..0aa39dcafb8c 100644
--- a/emulators/sdlmame-devel/distinfo
+++ b/emulators/sdlmame-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (sdlmame0115u2.zip) = bcd9c225e248d0a629c4c50178f5d7fd
-SHA256 (sdlmame0115u2.zip) = 66d2e7e61aeab2cd352d6f89dcc355bf30f668296cd4e25d671f8cd9a048e229
-SIZE (sdlmame0115u2.zip) = 15362091
+MD5 (sdlmame0117.zip) = dfda8c92853c72e7a6bbae8e686e8cf6
+SHA256 (sdlmame0117.zip) = 083cbac7b8b906431e675933473ce10da654ad5c8a380ca8d5be920f32394526
+SIZE (sdlmame0117.zip) = 15453659
diff --git a/emulators/sdlmame-devel/files/patch-makefile b/emulators/sdlmame-devel/files/patch-makefile
index d839b1ec02ca..beaf875a55c4 100644
--- a/emulators/sdlmame-devel/files/patch-makefile
+++ b/emulators/sdlmame-devel/files/patch-makefile
@@ -1,20 +1,19 @@
---- makefile.orig	Thu Apr 12 22:01:33 2007
-+++ makefile	Sat Apr 21 13:20:41 2007
-@@ -63,11 +63,13 @@
- # uncomment next line to include the debugger
- # DEBUG = 1    
-  
-+ifeq ($(ARCH),i386)
+--- makefile.orig	Thu Jun 28 14:55:46 2007
++++ makefile	Fri Jul 20 14:47:57 2007
+@@ -70,10 +70,12 @@
+ # DEBUG = 1
+ 
  # uncomment next line to use DRC MIPS3 engine
++ifeq ($(ARCH),i386)
  X86_MIPS3_DRC = 1
  
  # uncomment next line to use DRC PowerPC engine
  X86_PPC_DRC = 1
 +endif
  
- #-------------------------------------------------
- # specify build options; see each option below 
-@@ -174,8 +176,8 @@
+ # uncomment next line to use DRC Voodoo rasterizers
+ # X86_VOODOO_DRC = 1
+@@ -157,8 +159,8 @@
  
  # compiler, linker and utilities
  AR = @ar
@@ -22,111 +21,55 @@
 -LD = @gcc
 +CC := @$(CC)
 +LD = @$(CC)
- MD = -mkdir
+ MD = -mkdir$(EXE)
  RM = @rm -f
  
-@@ -191,53 +193,12 @@
+@@ -237,7 +239,7 @@
  endif
  
- # by default, don't compile for a specific target CPU
--NAME = $(PREFIX)$(TARGET)
--ARCH = 
--
--# architecture-specific builds get extra options
--ifdef ATHLON
--NAME = $(PREFIX)$(TARGET)at
--ARCH = -march=athlon
--endif
--
--ifdef I686
--NAME = $(PREFIX)$(TARGET)pp
--ARCH = -march=pentiumpro
--endif
--
--ifdef P4
--NAME = $(PREFIX)$(TARGET)p4
--ARCH = -march=pentium4
--endif
--
--ifdef AMD64
--NAME = $(PREFIX)$(TARGET)64
--ARCH = -march=athlon64
--endif
--
--ifdef PM
--NAME = $(PREFIX)$(TARGET)pm
--ARCH = -march=pentium3 -msse2
--endif
--
--ifdef G4
--NAME = $(PREFIX)$(TARGET)g4
--ARCH = -mcpu=G4
--endif
--
--ifdef G5
--NAME = $(PREFIX)$(TARGET)g5
--ARCH = -mcpu=G5
--endif
--
--ifdef CELL
--NAME = $(PREFIX)$(TARGET)cbe
-+NAME = $(TARGET)
- ARCH = 
--endif
+ # fullname is prefix+name+suffix
+-FULLNAME = $(PREFIX)$(NAME)$(SUFFIX)
++FULLNAME = $(NAME)$(SUFFIX)
  
- # debug builds just get the 'd' suffix and nothing more
- ifdef DEBUG
--NAME = $(PREFIX)$(TARGET)d
-+NAME = $(TARGET)d
- endif
- 
- EMULATOR = $(NAME)$(EXE)
-@@ -275,7 +236,7 @@
- # compile and linking flags
+ # add an EXE suffix to get the final emulator name
+ EMULATOR = $(FULLNAME)$(EXE)
+@@ -302,7 +304,7 @@
  #-------------------------------------------------
  
--CFLAGS = \
-+CFLAGS += \
- 	$(OPT_FLAGS) \
- 	-std=gnu89 \
- 	-I$(SRC)/$(TARGET) \
-@@ -287,6 +248,7 @@
- 	-I$(SRC)/lib/util \
- 	-I$(SRC)/osd \
- 	-I$(SRC)/osd/$(MAMEOS) \
-+	-I$(LOCALBASE)/include -I$(X11BASE)/include
+ # we compile to C89 standard with GNU extensions
+-CFLAGS = -std=gnu89
++CFLAGS += -std=gnu89
  
- ifdef MESS
- CFLAGS += \
-@@ -305,7 +267,7 @@
- endif	# PPC
- endif	# SYMBOLS
+ # add -g if we need symbols
+ ifdef SYMBOLS
+@@ -333,12 +335,11 @@
+ # 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
  
--CFLAGS += $(ARCH) \
-+CFLAGS += \
- 	-Wall \
- 	-Wpointer-arith \
- 	-Wbad-function-cast \
-@@ -317,7 +279,7 @@
- 	-Wdeclaration-after-statement
+ # only -Werror if not PTR64 and not DEBUG
+ ifndef PTR64
+ ifndef DEBUG
+-CFLAGS += -Werror
+ endif	# !DEBUG
+ endif	# !PTR64
+ endif	# neq OPTIMIZE
+@@ -358,6 +359,7 @@
+ 	-I$(SRC)/lib/util \
+ 	-I$(SRC)/osd \
+ 	-I$(SRC)/osd/$(OSD) \
++	-I$(LOCALBASE)/include
  
- ifneq ($(OPTIMIZE),0)
--CFLAGS += -DNDEBUG $(ARCH) -fno-strict-aliasing
-+CFLAGS += -DNDEBUG -fno-strict-aliasing
- endif
  
- CFLAGS += -O$(OPTIMIZE)
-@@ -325,11 +287,9 @@
- # extra options needed *only* for the osd files
- CFLAGSOSDEPEND = $(CFLAGS)
  
--LDFLAGS = -WO
-+LDFLAGS += -WO -L$(LOCALBASE)/lib -L$(X11BASE)/lib
+@@ -367,7 +369,7 @@
  
--ifdef SYMBOLS
+ # LDFLAGS are used generally; LDFLAGSEMULATOR are additional
+ # flags only used when linking the core emulator
 -LDFLAGS = 
--else
-+ifndef SYMBOLS
- LDFLAGS += -s
- endif
++LDFLAGS += -L$(LOCALBASE)/lib
+ LDFLAGSEMULATOR =
  
+ # strip symbols and other metadata in non-symbols builds
diff --git a/emulators/sdlmame-devel/pkg-plist b/emulators/sdlmame-devel/pkg-plist
index 22bc5799ac81..38001c5dee05 100644
--- a/emulators/sdlmame-devel/pkg-plist
+++ b/emulators/sdlmame-devel/pkg-plist
@@ -10,14 +10,13 @@ libexec/sdlmame/romcmp
 libexec/sdlmame/srcclean
 libexec/sdlmame/testkeys
 %%PORTDOCS%%%%DOCSDIR%%/SDLMAME.txt
-%%PORTDOCS%%%%DOCSDIR%%/cheats.txt
 %%PORTDOCS%%%%DOCSDIR%%/docs/license.txt
 %%PORTDOCS%%%%DOCSDIR%%/docs/mame.txt
 %%PORTDOCS%%%%DOCSDIR%%/docs/newvideo.txt
 %%PORTDOCS%%%%DOCSDIR%%/docs/windows.txt
 %%PORTDOCS%%%%DOCSDIR%%/whatsnew.txt
-%%PORTDOCS%%%%DOCSDIR%%/whatsnew_0115u2.txt
 %%DATADIR%%/keymaps/km-ch.txt
+%%DATADIR%%/keymaps/km-de.txt
 %%DATADIR%%/keymaps/km-fr-OSX.txt
 %%DATADIR%%/keymaps/km-fr.txt
 %%DATADIR%%/ui.bdf
diff --git a/emulators/sdlmame/Makefile b/emulators/sdlmame/Makefile
index 8c47e7fc3188..d52f864b8595 100644
--- a/emulators/sdlmame/Makefile
+++ b/emulators/sdlmame/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sdlmame
-PORTVERSION=	0.115u2
+PORTVERSION=	0.117
 CATEGORIES=	emulators
 MASTER_SITES=	http://rbelmont.mameworld.info/
 DISTNAME=	${PORTNAME}${PORTVERSION:S/.//}
@@ -25,8 +25,8 @@ SUB_FILES=	${PORTNAME} pkg-message
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin
 	${MKDIR} ${PREFIX}/libexec/${PORTNAME}
-.for f in obj/mame/file2str obj/mame/png2bdc mame testkeys romcmp chdman \
-	  jedutil makemeta regrep srcclean
+.for f in obj/sdl/mame/file2str obj/sdl/mame/png2bdc mame testkeys romcmp \
+	  chdman jedutil makemeta regrep srcclean
 	${INSTALL_PROGRAM} ${WRKSRC}/${f} ${PREFIX}/libexec/${PORTNAME}
 .endfor
 	${MKDIR} ${DATADIR}
diff --git a/emulators/sdlmame/distinfo b/emulators/sdlmame/distinfo
index b11ca8199490..0aa39dcafb8c 100644
--- a/emulators/sdlmame/distinfo
+++ b/emulators/sdlmame/distinfo
@@ -1,3 +1,3 @@
-MD5 (sdlmame0115u2.zip) = bcd9c225e248d0a629c4c50178f5d7fd
-SHA256 (sdlmame0115u2.zip) = 66d2e7e61aeab2cd352d6f89dcc355bf30f668296cd4e25d671f8cd9a048e229
-SIZE (sdlmame0115u2.zip) = 15362091
+MD5 (sdlmame0117.zip) = dfda8c92853c72e7a6bbae8e686e8cf6
+SHA256 (sdlmame0117.zip) = 083cbac7b8b906431e675933473ce10da654ad5c8a380ca8d5be920f32394526
+SIZE (sdlmame0117.zip) = 15453659
diff --git a/emulators/sdlmame/files/patch-makefile b/emulators/sdlmame/files/patch-makefile
index d839b1ec02ca..beaf875a55c4 100644
--- a/emulators/sdlmame/files/patch-makefile
+++ b/emulators/sdlmame/files/patch-makefile
@@ -1,20 +1,19 @@
---- makefile.orig	Thu Apr 12 22:01:33 2007
-+++ makefile	Sat Apr 21 13:20:41 2007
-@@ -63,11 +63,13 @@
- # uncomment next line to include the debugger
- # DEBUG = 1    
-  
-+ifeq ($(ARCH),i386)
+--- makefile.orig	Thu Jun 28 14:55:46 2007
++++ makefile	Fri Jul 20 14:47:57 2007
+@@ -70,10 +70,12 @@
+ # DEBUG = 1
+ 
  # uncomment next line to use DRC MIPS3 engine
++ifeq ($(ARCH),i386)
  X86_MIPS3_DRC = 1
  
  # uncomment next line to use DRC PowerPC engine
  X86_PPC_DRC = 1
 +endif
  
- #-------------------------------------------------
- # specify build options; see each option below 
-@@ -174,8 +176,8 @@
+ # uncomment next line to use DRC Voodoo rasterizers
+ # X86_VOODOO_DRC = 1
+@@ -157,8 +159,8 @@
  
  # compiler, linker and utilities
  AR = @ar
@@ -22,111 +21,55 @@
 -LD = @gcc
 +CC := @$(CC)
 +LD = @$(CC)
- MD = -mkdir
+ MD = -mkdir$(EXE)
  RM = @rm -f
  
-@@ -191,53 +193,12 @@
+@@ -237,7 +239,7 @@
  endif
  
- # by default, don't compile for a specific target CPU
--NAME = $(PREFIX)$(TARGET)
--ARCH = 
--
--# architecture-specific builds get extra options
--ifdef ATHLON
--NAME = $(PREFIX)$(TARGET)at
--ARCH = -march=athlon
--endif
--
--ifdef I686
--NAME = $(PREFIX)$(TARGET)pp
--ARCH = -march=pentiumpro
--endif
--
--ifdef P4
--NAME = $(PREFIX)$(TARGET)p4
--ARCH = -march=pentium4
--endif
--
--ifdef AMD64
--NAME = $(PREFIX)$(TARGET)64
--ARCH = -march=athlon64
--endif
--
--ifdef PM
--NAME = $(PREFIX)$(TARGET)pm
--ARCH = -march=pentium3 -msse2
--endif
--
--ifdef G4
--NAME = $(PREFIX)$(TARGET)g4
--ARCH = -mcpu=G4
--endif
--
--ifdef G5
--NAME = $(PREFIX)$(TARGET)g5
--ARCH = -mcpu=G5
--endif
--
--ifdef CELL
--NAME = $(PREFIX)$(TARGET)cbe
-+NAME = $(TARGET)
- ARCH = 
--endif
+ # fullname is prefix+name+suffix
+-FULLNAME = $(PREFIX)$(NAME)$(SUFFIX)
++FULLNAME = $(NAME)$(SUFFIX)
  
- # debug builds just get the 'd' suffix and nothing more
- ifdef DEBUG
--NAME = $(PREFIX)$(TARGET)d
-+NAME = $(TARGET)d
- endif
- 
- EMULATOR = $(NAME)$(EXE)
-@@ -275,7 +236,7 @@
- # compile and linking flags
+ # add an EXE suffix to get the final emulator name
+ EMULATOR = $(FULLNAME)$(EXE)
+@@ -302,7 +304,7 @@
  #-------------------------------------------------
  
--CFLAGS = \
-+CFLAGS += \
- 	$(OPT_FLAGS) \
- 	-std=gnu89 \
- 	-I$(SRC)/$(TARGET) \
-@@ -287,6 +248,7 @@
- 	-I$(SRC)/lib/util \
- 	-I$(SRC)/osd \
- 	-I$(SRC)/osd/$(MAMEOS) \
-+	-I$(LOCALBASE)/include -I$(X11BASE)/include
+ # we compile to C89 standard with GNU extensions
+-CFLAGS = -std=gnu89
++CFLAGS += -std=gnu89
  
- ifdef MESS
- CFLAGS += \
-@@ -305,7 +267,7 @@
- endif	# PPC
- endif	# SYMBOLS
+ # add -g if we need symbols
+ ifdef SYMBOLS
+@@ -333,12 +335,11 @@
+ # 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
  
--CFLAGS += $(ARCH) \
-+CFLAGS += \
- 	-Wall \
- 	-Wpointer-arith \
- 	-Wbad-function-cast \
-@@ -317,7 +279,7 @@
- 	-Wdeclaration-after-statement
+ # only -Werror if not PTR64 and not DEBUG
+ ifndef PTR64
+ ifndef DEBUG
+-CFLAGS += -Werror
+ endif	# !DEBUG
+ endif	# !PTR64
+ endif	# neq OPTIMIZE
+@@ -358,6 +359,7 @@
+ 	-I$(SRC)/lib/util \
+ 	-I$(SRC)/osd \
+ 	-I$(SRC)/osd/$(OSD) \
++	-I$(LOCALBASE)/include
  
- ifneq ($(OPTIMIZE),0)
--CFLAGS += -DNDEBUG $(ARCH) -fno-strict-aliasing
-+CFLAGS += -DNDEBUG -fno-strict-aliasing
- endif
  
- CFLAGS += -O$(OPTIMIZE)
-@@ -325,11 +287,9 @@
- # extra options needed *only* for the osd files
- CFLAGSOSDEPEND = $(CFLAGS)
  
--LDFLAGS = -WO
-+LDFLAGS += -WO -L$(LOCALBASE)/lib -L$(X11BASE)/lib
+@@ -367,7 +369,7 @@
  
--ifdef SYMBOLS
+ # LDFLAGS are used generally; LDFLAGSEMULATOR are additional
+ # flags only used when linking the core emulator
 -LDFLAGS = 
--else
-+ifndef SYMBOLS
- LDFLAGS += -s
- endif
++LDFLAGS += -L$(LOCALBASE)/lib
+ LDFLAGSEMULATOR =
  
+ # strip symbols and other metadata in non-symbols builds
diff --git a/emulators/sdlmame/pkg-plist b/emulators/sdlmame/pkg-plist
index 22bc5799ac81..38001c5dee05 100644
--- a/emulators/sdlmame/pkg-plist
+++ b/emulators/sdlmame/pkg-plist
@@ -10,14 +10,13 @@ libexec/sdlmame/romcmp
 libexec/sdlmame/srcclean
 libexec/sdlmame/testkeys
 %%PORTDOCS%%%%DOCSDIR%%/SDLMAME.txt
-%%PORTDOCS%%%%DOCSDIR%%/cheats.txt
 %%PORTDOCS%%%%DOCSDIR%%/docs/license.txt
 %%PORTDOCS%%%%DOCSDIR%%/docs/mame.txt
 %%PORTDOCS%%%%DOCSDIR%%/docs/newvideo.txt
 %%PORTDOCS%%%%DOCSDIR%%/docs/windows.txt
 %%PORTDOCS%%%%DOCSDIR%%/whatsnew.txt
-%%PORTDOCS%%%%DOCSDIR%%/whatsnew_0115u2.txt
 %%DATADIR%%/keymaps/km-ch.txt
+%%DATADIR%%/keymaps/km-de.txt
 %%DATADIR%%/keymaps/km-fr-OSX.txt
 %%DATADIR%%/keymaps/km-fr.txt
 %%DATADIR%%/ui.bdf