- Update to version 0.122u8.

- Remove BROKEN for sparc64 to see if new version builds (if it doesn't then
  NOT_FOR_ARCHS will be used instead).

4 files changed, 38 insertions, 45 deletions

diff --git a/emulators/mame/Makefile b/emulators/mame/Makefile
index 599dafc0adf6..24f2cd7889ea 100644
--- a/emulators/mame/Makefile
+++ b/emulators/mame/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sdlmame
-PORTVERSION=	0.120u2
+PORTVERSION=	0.122u8
 CATEGORIES=	emulators
 MASTER_SITES=	ftp://ftp.alepulver.com.ar/distfiles/
 DISTNAME=	${PORTNAME}${PORTVERSION:S/.//}
@@ -17,6 +17,7 @@ COMMENT=	SDL port of the popular MAME (Multi Arcade Machine Emulator)
 USE_ZIP=	yes
 USE_GL=		yes
 USE_GMAKE=	yes
+MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}"
 USE_SDL=	sdl
 MAKEFILE=	makefile
 
@@ -25,8 +26,8 @@ SUB_FILES=	${PORTNAME} pkg-message
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin
 	${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
+.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/sdlmame
 .endfor
 	${MKDIR} ${DATADIR}
@@ -52,8 +53,4 @@ post-install:
 USE_GCC=	4.2+
 .endif
 
-.if ${ARCH} == "sparc64"
-BROKEN=		Does not compile
-.endif
-
 .include <bsd.port.post.mk>
diff --git a/emulators/mame/distinfo b/emulators/mame/distinfo
index 6cc3d1e63270..e7c0687f58f0 100644
--- a/emulators/mame/distinfo
+++ b/emulators/mame/distinfo
@@ -1,3 +1,3 @@
-MD5 (sdlmame0120u2.zip) = fc1ef0c683f15af8ab5bbd4c66081924
-SHA256 (sdlmame0120u2.zip) = c71dfcb8f37a700eb131c9eeff88c8c63609ecc55c7d28adcd7655d287120a29
-SIZE (sdlmame0120u2.zip) = 15955929
+MD5 (sdlmame0122u8.zip) = 4a53bd51bd201edec6250dfe50d61089
+SHA256 (sdlmame0122u8.zip) = 5a5deca3d5637be9251057d5fefe4b840902626d26577bd0dbeab555753230bd
+SIZE (sdlmame0122u8.zip) = 16145751
diff --git a/emulators/mame/files/patch-makefile b/emulators/mame/files/patch-makefile
index 590d221401d8..a8b005dca0a4 100644
--- a/emulators/mame/files/patch-makefile
+++ b/emulators/mame/files/patch-makefile
@@ -1,6 +1,6 @@
---- makefile.orig	Sat Oct 20 16:33:18 2007
-+++ makefile	Wed Nov  7 18:22:11 2007
-@@ -72,11 +72,13 @@
+--- ./makefile.orig	Thu Jan 10 01:29:44 2008
++++ ./makefile	Mon Feb  4 13:08:08 2008
+@@ -99,11 +99,13 @@
  # uncomment next line to include the internal profiler
  # PROFILER = 1
  
@@ -12,10 +12,10 @@
  X86_PPC_DRC = 1
 +endif
  
- # uncomment next line to use DRC Voodoo rasterizers
- # X86_VOODOO_DRC = 1
-@@ -99,7 +101,9 @@
- # CELL = 1
+ # 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 @@
+ #-------------------------------------------------
  
  # uncomment next line if you are building for a 64-bit target
 -# PTR64 = 1
@@ -23,9 +23,9 @@
 +PTR64 = 1
 +endif
  
- # uncomment next line to build expat as part of MAME build
- BUILD_EXPAT = 1
-@@ -168,8 +172,8 @@
+ # uncomment next line if you are building for a big-endian target
+ # BIGENDIAN = 1
+@@ -189,8 +193,8 @@
  
  # compiler, linker and utilities
  AR = @ar
@@ -36,39 +36,34 @@
  MD = -mkdir$(EXE)
  RM = @rm -f
  
-@@ -248,7 +252,7 @@
+@@ -214,7 +218,7 @@
  endif
  
- # fullname is prefix+name+suffix
--FULLNAME = $(PREFIX)$(NAME)$(SUFFIX)
+ # fullname is prefix+name+suffix+debugsuffix
+-FULLNAME = $(PREFIX)$(NAME)$(SUFFIX)$(DEBUGSUFFIX)
 +FULLNAME = $(NAME)
  
  # add an EXE suffix to get the final emulator name
  EMULATOR = $(FULLNAME)$(EXE)
-@@ -318,7 +322,7 @@
+@@ -279,7 +283,7 @@
  #-------------------------------------------------
  
  # we compile to C89 standard with GNU extensions
 -CFLAGS = -std=gnu89
 +CFLAGS += -std=gnu89
  
- # add -g if we need symbols
- ifdef SYMBOLS
-@@ -352,11 +356,11 @@
+ # 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
  # and make all errors into warnings
  ifneq ($(OPTIMIZE),0)
--CFLAGS += $(ARCH) -fno-strict-aliasing
-+CFLAGS += -fno-strict-aliasing
- 
- # only -Werror if not PTR64 and not DEBUG
- ifndef DEBUG
--CFLAGS += $(ARCH) -fno-strict-aliasing
-+CFLAGS += -fno-strict-aliasing
- endif	# !DEBUG
- endif	# neq OPTIMIZE
+-CFLAGS += -Werror $(ARCHOPTS) -fno-strict-aliasing
++CFLAGS += $(ARCHOPTS) -fno-strict-aliasing
+ #CFLAGS += $(ARCHOPTS) -fno-strict-aliasing
+ endif
  
-@@ -376,6 +380,7 @@
+@@ -342,6 +346,7 @@
  	-I$(SRC)/lib/util \
  	-I$(SRC)/osd \
  	-I$(SRC)/osd/$(OSD) \
@@ -76,12 +71,12 @@
  
  
  
-@@ -385,7 +390,7 @@
- 
+@@ -352,7 +357,7 @@
  # LDFLAGS are used generally; LDFLAGSEMULATOR are additional
  # flags only used when linking the core emulator
--LDFLAGS = 
-+LDFLAGS += -L$(LOCALBASE)/lib
- LDFLAGSEMULATOR =
- 
- # add profiling information for the linker
+ ifneq ($(TARGETOS),macosx)
+-LDFLAGS = -Wl,--warn-common
++LDFLAGS = -Wl,--warn-common $(PTHREAD_LIBS) -L$(LOCALBASE)/lib
+ else
+ LDFLAGS = 
+ endif
diff --git a/emulators/mame/pkg-plist b/emulators/mame/pkg-plist
index d38051d262da..8bd782cd03f8 100644
--- a/emulators/mame/pkg-plist
+++ b/emulators/mame/pkg-plist
@@ -16,12 +16,13 @@ libexec/sdlmame/testkeys
 %%PORTDOCS%%%%DOCSDIR%%/docs/windows.txt
 %%PORTDOCS%%%%DOCSDIR%%/docs/config.txt
 %%PORTDOCS%%%%DOCSDIR%%/whatsnew.txt
-%%PORTDOCS%%%%DOCSDIR%%/whatsnew_0120u2.txt
+%%PORTDOCS%%%%DOCSDIR%%/whatsnew_0122u8.txt
 %%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
 %%DATADIR%%/ui.bdf
 @dirrm %%DATADIR%%/keymaps
 @dirrm %%DATADIR%%