4 files changed, 23 insertions, 24 deletions

diff --git a/emulators/mame/Makefile b/emulators/mame/Makefile
index dae36d7da3da..1be57e0d3130 100644
--- a/emulators/mame/Makefile
+++ b/emulators/mame/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	sdlmame
-PORTVERSION=	0.122u8
-PORTREVISION=	1
+PORTVERSION=	0.124
 CATEGORIES=	emulators
 MASTER_SITES=	ftp://ftp.alepulver.com.ar/distfiles/
 DISTNAME=	${PORTNAME}${PORTVERSION:S/.//}
diff --git a/emulators/mame/distinfo b/emulators/mame/distinfo
index e7c0687f58f0..61dd51b0fd87 100644
--- a/emulators/mame/distinfo
+++ b/emulators/mame/distinfo
@@ -1,3 +1,3 @@
-MD5 (sdlmame0122u8.zip) = 4a53bd51bd201edec6250dfe50d61089
-SHA256 (sdlmame0122u8.zip) = 5a5deca3d5637be9251057d5fefe4b840902626d26577bd0dbeab555753230bd
-SIZE (sdlmame0122u8.zip) = 16145751
+MD5 (sdlmame0124.zip) = f436c418afd98d2c666cd27856f9902e
+SHA256 (sdlmame0124.zip) = b0f993878b7ad72fa8905701a40ce631a6500774b11011711003c4101ab2ed54
+SIZE (sdlmame0124.zip) = 16248845
diff --git a/emulators/mame/files/patch-makefile b/emulators/mame/files/patch-makefile
index a8b005dca0a4..9305af94f296 100644
--- a/emulators/mame/files/patch-makefile
+++ b/emulators/mame/files/patch-makefile
@@ -1,6 +1,6 @@
---- ./makefile.orig	Thu Jan 10 01:29:44 2008
-+++ ./makefile	Mon Feb  4 13:08:08 2008
-@@ -99,11 +99,13 @@
+--- ./makefile.orig	2008-02-28 12:45:21.000000000 -0200
++++ ./makefile	2008-04-21 16:24:53.000000000 -0300
+@@ -104,11 +104,13 @@
  # uncomment next line to include the internal profiler
  # PROFILER = 1
  
@@ -14,7 +14,7 @@
  
  # uncomment next line to build using unix-style libsdl on Mac OS X
  # (vs. the native framework port).  Normal users should not enable this.
-@@ -116,7 +118,9 @@
+@@ -121,7 +123,9 @@
  #-------------------------------------------------
  
  # uncomment next line if you are building for a 64-bit target
@@ -25,7 +25,7 @@
  
  # uncomment next line if you are building for a big-endian target
  # BIGENDIAN = 1
-@@ -189,8 +193,8 @@
+@@ -198,8 +202,8 @@
  
  # compiler, linker and utilities
  AR = @ar
@@ -36,7 +36,7 @@
  MD = -mkdir$(EXE)
  RM = @rm -f
  
-@@ -214,7 +218,7 @@
+@@ -223,7 +227,7 @@
  endif
  
  # fullname is prefix+name+suffix+debugsuffix
@@ -45,7 +45,7 @@
  
  # add an EXE suffix to get the final emulator name
  EMULATOR = $(FULLNAME)$(EXE)
-@@ -279,7 +283,7 @@
+@@ -293,7 +297,7 @@
  #-------------------------------------------------
  
  # we compile to C89 standard with GNU extensions
@@ -54,16 +54,17 @@
  
  # this speeds it up a bit by piping between the preprocessor/compiler/assembler
  CFLAGS += -pipe
-@@ -316,7 +320,7 @@
- # if we are optimizing, include optimization options
+@@ -331,9 +335,6 @@
  # and make all errors into warnings
  ifneq ($(OPTIMIZE),0)
--CFLAGS += -Werror $(ARCHOPTS) -fno-strict-aliasing
-+CFLAGS += $(ARCHOPTS) -fno-strict-aliasing
- #CFLAGS += $(ARCHOPTS) -fno-strict-aliasing
+ CFLAGS += $(ARCHOPTS) -fno-strict-aliasing
+-ifneq ($(TARGETOS),os2)
+-CFLAGS += -Werror
+-endif
  endif
  
-@@ -342,6 +346,7 @@
+ # 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) \
@@ -71,12 +72,12 @@
  
  
  
-@@ -352,7 +357,7 @@
- # LDFLAGS are used generally; LDFLAGSEMULATOR are additional
- # flags only used when linking the core emulator
+@@ -370,7 +372,7 @@
+ LDFLAGS =
  ifneq ($(TARGETOS),macosx)
+ ifneq ($(TARGETOS),os2)
 -LDFLAGS = -Wl,--warn-common
 +LDFLAGS = -Wl,--warn-common $(PTHREAD_LIBS) -L$(LOCALBASE)/lib
- else
- LDFLAGS = 
  endif
+ endif
+ LDFLAGSEMULATOR =
diff --git a/emulators/mame/pkg-plist b/emulators/mame/pkg-plist
index 8bd782cd03f8..911e73cc58b2 100644
--- a/emulators/mame/pkg-plist
+++ b/emulators/mame/pkg-plist
@@ -16,7 +16,6 @@ libexec/sdlmame/testkeys
 %%PORTDOCS%%%%DOCSDIR%%/docs/windows.txt
 %%PORTDOCS%%%%DOCSDIR%%/docs/config.txt
 %%PORTDOCS%%%%DOCSDIR%%/whatsnew.txt
-%%PORTDOCS%%%%DOCSDIR%%/whatsnew_0122u8.txt
 %%DATADIR%%/keymaps/km-be.txt
 %%DATADIR%%/keymaps/km-ch.txt
 %%DATADIR%%/keymaps/km-de.txt