Update xmame and xmess to 0.106:

0.106:

- Everything from MAME 0.106 and MESS 0.106
- Fixed a link error for messtest. (Arnaud G. Gibert)
- Fixed an alignment bug in the OpenGL driver which caused Defender,
  and possibly other 16bpp games, to be skewed.
- The mouse is no longer automatically grabbed in fullscreen
  mode. Bugzilla bug 877.
- Replaced fuzzy game name comparison with the method used by MAME for
  Windows, which lists approximate matches when an exact match isn't
  found.
- A BadMatch error should no longer occur for the OpenGL target in
  some cases, such as when 16bpp mode is used with recent releases of
  the binary NVIDIA driver.

0.105:

- Everything from MAME 0.105 and MESS 0.105.
- Fixed "-frames_to_run/-ftr" so that it works the same as on Windows.
- Fixed a memory leak in the plugin manager shutdown found by Valgrind.
  Bugzilla bug 850.
- The output of "-listroms (-lr)" now shows the correct driver name
  when it's run for all ROMs.
- Fixed a potential buffer overflow in the standard joystick driver.
  Bugzill bug 821. (Pierre Riteau)

4 files changed, 50 insertions, 52 deletions

diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile
index 03f7884a8f5..4796b6c8a8b 100644
--- a/emulators/xmame/Makefile
+++ b/emulators/xmame/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.145 2006/04/22 09:22:08 rillig Exp $
+# $NetBSD: Makefile,v 1.146 2006/06/15 11:40:00 dillo Exp $
 #
 
-DISTNAME=		xmame-0.104
+DISTNAME=		xmame-0.106
 CATEGORIES=		emulators games x11
 MASTER_SITES=		http://x.mame.net/download/
 EXTRACT_SUFX=		.tar.bz2
@@ -26,8 +26,6 @@ ROMPATH=		${PREFIX}/share/${TARGET}
 SPOOLDIR=		${VARBASE}/games/${TARGET}
 
 MAKE_FLAGS+=		TARGET="${TARGET:S/x//}"
-MAKE_FLAGS+=		LIBS="${LDFLAGS} ${LIBS}"
-MAKE_FLAGS+=		CFLAGS=${CFLAGS:M*:Q}
 MAKE_FLAGS+=		X11INC= X11LIB=
 
 # Network support is broken since xmame-0.85
@@ -110,7 +108,7 @@ do-install:
 # Pragma once is not needed, and case warnings/errors on gcc
 SUBST_CLASSES+=		pragma
 SUBST_STAGE.pragma=	pre-configure
-SUBST_FILES.pragma=	src/*.h
+SUBST_FILES.pragma=	src/*.h src/*/*.h
 SUBST_SED.pragma=	-e "s|\#pragma once||g"
 
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/emulators/xmame/distinfo b/emulators/xmame/distinfo
index e4bd8eb635a..803a2dbd1dc 100644
--- a/emulators/xmame/distinfo
+++ b/emulators/xmame/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.71 2006/03/09 20:51:43 kristerw Exp $
+$NetBSD: distinfo,v 1.72 2006/06/15 11:40:00 dillo Exp $
 
-SHA1 (xmame-0.104.tar.bz2) = d974cdc5edbdc1591eb276dadfc6c35ec4d10e43
-RMD160 (xmame-0.104.tar.bz2) = 5eda9ca4fcfe5cd76adcd0ab78104fd74acceb77
-Size (xmame-0.104.tar.bz2) = 16249286 bytes
-SHA1 (patch-aa) = c35437dfd80adbb6dd1423dfb6afec1537375af6
-SHA1 (patch-ab) = dd21329b7e1a05bc7ea12b5a98a05d502dc36656
+SHA1 (xmame-0.106.tar.bz2) = 7ae50f869067e101e053ca18e6f788297fcad9e2
+RMD160 (xmame-0.106.tar.bz2) = eab4fa232d59fce5b2216f942f8bc58a992f8d26
+Size (xmame-0.106.tar.bz2) = 17117298 bytes
+SHA1 (patch-aa) = dac212f76d671c622435bdb7fdf81f3c38330761
+SHA1 (patch-ab) = 04312e7fad1c39da40bdc9ec84074c676e8eb7e2
 SHA1 (patch-ac) = f4e0f614577924d19713e1862efa1e6d42e791c4
 SHA1 (patch-ad) = 087e162f8b05d894532e6d5091d8b0008c3f0e80
 SHA1 (patch-ae) = efd91447d33b6cb1246bbd2264f92b4ab9be44e0
diff --git a/emulators/xmame/patches/patch-aa b/emulators/xmame/patches/patch-aa
index 2aa869e4279..c555bcb0a48 100644
--- a/emulators/xmame/patches/patch-aa
+++ b/emulators/xmame/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.39 2006/03/09 20:51:43 kristerw Exp $
+$NetBSD: patch-aa,v 1.40 2006/06/15 11:40:00 dillo Exp $
 
---- makefile.unix.orig	2006-03-09 19:41:47.000000000 +0100
-+++ makefile.unix	2006-03-09 19:46:38.000000000 +0100
+--- makefile.unix.orig	2006-05-15 18:53:34.000000000 +0200
++++ makefile.unix
 @@ -33,7 +33,7 @@
  ###########################################################################
  
@@ -15,11 +15,11 @@ $NetBSD: patch-aa,v 1.39 2006/03/09 20:51:43 kristerw Exp $
  # just as well.  However, stay away from the `cc' Ultrix compiler if 
  # possible.
  
--CC	= gcc
-+# CC	= gcc
- # CC    = cc
- # CC	= icc
- # CC	= c89
+-CC	= @gcc
++# CC	= @gcc
+ # CC    = @cc
+ # CC	= @icc
+ # CC	= @c89
 @@ -118,7 +118,7 @@
  
  # If you want to use whatever CFLAGS are currently set in your 
@@ -38,7 +38,7 @@ $NetBSD: patch-aa,v 1.39 2006/03/09 20:51:43 kristerw Exp $
  
  # GCC on x86 with some optimizations
  # CFLAGS = -O2 -mtune=i686 -fomit-frame-pointer -fstrength-reduce -ffast-math
-@@ -183,13 +183,13 @@
+@@ -181,13 +181,13 @@
    #########################################################################
    
    # Check for C89 + GNU extensions compliance.
@@ -103,7 +103,7 @@ $NetBSD: patch-aa,v 1.39 2006/03/09 20:51:43 kristerw Exp $
    # Sparc only, uncomment to do loop restructuring optimizations
    # and speculative prefetch for v8plusa and above
 -  EXTRA_OPTS += -xdepend  -xsafe=mem
-+  #EXTRA_OPTS += -xdepend  -xsafe=mem
++  # EXTRA_OPTS += -xdepend  -xsafe=mem
  
    #################################################
    # Additional options for glx builds
@@ -113,20 +113,20 @@ $NetBSD: patch-aa,v 1.39 2006/03/09 20:51:43 kristerw Exp $
  
 -  CFLAGS= $(XOPT) $(XTARGET) $(XPARALLEL) $(EXTRA_OPTS)
 -  LDFLAGS=$(XOPT) $(XTARGET) $(XPARALLEL) $(EXTRA_OPTS)
-+  #CFLAGS= $(XOPT) $(XTARGET) $(XPARALLEL) $(EXTRA_OPTS)
-+  #LDFLAGS=$(XOPT) $(XTARGET) $(XPARALLEL) $(EXTRA_OPTS)
++  # CFLAGS= $(XOPT) $(XTARGET) $(XPARALLEL) $(EXTRA_OPTS)
++  # LDFLAGS=$(XOPT) $(XTARGET) $(XPARALLEL) $(EXTRA_OPTS)
  
    # uncomment for silence...
 -  CFLAGS += -erroff
-+  #CFLAGS += -erroff
-   # Tell xmame that we really are in fact elf.  If not supplied, SHARED_PREFIX 
-   # is set causing dlopen()'s to fail.
++  # CFLAGS += -erroff
+   # Tell xmame that we really are in fact elf.  If not supplied, 
+   # SHARED_PREFIX is set causing dlopen()'s to fail.
 -  CFLAGS += -D__ELF__ 
-+  #CFLAGS += -D__ELF__ 
++  # CFLAGS += -D__ELF__ 
  endif
  endif
  endif
-@@ -589,7 +589,7 @@
+@@ -614,7 +614,7 @@
  ###########################################################################
  
  # Linux 
@@ -135,7 +135,7 @@ $NetBSD: patch-aa,v 1.39 2006/03/09 20:51:43 kristerw Exp $
  
  # FreeBSD
  # ARCH  = freebsd
-@@ -701,7 +701,7 @@
+@@ -727,7 +727,7 @@
  # use SDL.
  
  # X11 (including Glide & OpenGL if enabled below)
@@ -144,7 +144,7 @@ $NetBSD: patch-aa,v 1.39 2006/03/09 20:51:43 kristerw Exp $
  
  # SDL library 
  # DISPLAY_METHOD = SDL
-@@ -732,7 +732,7 @@
+@@ -758,7 +758,7 @@
  X11_MITSHM = 1
  
  # Use Xv extension for hardware scaling.
@@ -153,7 +153,7 @@ $NetBSD: patch-aa,v 1.39 2006/03/09 20:51:43 kristerw Exp $
  
  # Enable XFree86 DGA.  This also causes "make install" to set the suid bit 
  # on the executable.
-@@ -756,8 +756,8 @@
+@@ -782,8 +782,8 @@
  # X11LIB		= -L/usr/lib/X11
  
  # Standard location for XFree86
diff --git a/emulators/xmame/patches/patch-ab b/emulators/xmame/patches/patch-ab
index e61711a4a18..9d47af99a39 100644
--- a/emulators/xmame/patches/patch-ab
+++ b/emulators/xmame/patches/patch-ab
@@ -1,32 +1,32 @@
-$NetBSD: patch-ab,v 1.31 2005/04/02 20:56:28 kristerw Exp $
+$NetBSD: patch-ab,v 1.32 2006/06/15 11:40:00 dillo Exp $
 
---- src/unix/unix.mak.orig	2005-04-02 20:38:46.000000000 +0200
-+++ src/unix/unix.mak	2005-04-02 20:50:17.000000000 +0200
-@@ -258,7 +258,7 @@
+--- src/unix/unix.mak.orig	2006-05-26 06:52:07.000000000 +0200
++++ src/unix/unix.mak
+@@ -242,7 +242,7 @@ CFLAGS += $(IL) $(CFLAGS.$(MY_CPU)) \
  	$(COREDEFS) $(SOUNDDEFS) $(CPUDEFS) $(ASMDEFS) \
  	$(INCLUDES) $(INCLUDE_PATH)
  
--MY_LIBS = $(LIBS) $(LIBS.$(ARCH)) $(LIBS.$(DISPLAY_METHOD)) -lz
-+MY_LIBS = $(LIBS.$(ARCH)) $(LIBS.$(DISPLAY_METHOD)) -lz -lexpat
+-LIBS += $(LIBS.$(ARCH)) $(LIBS.$(DISPLAY_METHOD))
++LIBS += $(LIBS.$(ARCH)) $(LIBS.$(DISPLAY_METHOD)) -lexpat
  
- ifdef SEPARATE_LIBM
- MY_LIBS += -lm
-@@ -578,15 +578,15 @@
+ ifdef DEBUG
+ CFLAGS += -DMAME_DEBUG
+@@ -559,15 +559,15 @@ xlistdev: src/unix/contrib/tools/xlistde
  
  romcmp: $(OBJ)/romcmp.o $(OBJ)/unzip.o $(ZLIB)
- 	$(CC_COMMENT) @echo 'Linking $@...'
--	$(CC_COMPILE) $(LD) $(LDFLAGS) $^ $(LIBS) -o $@
-+	$(CC_COMPILE) $(LD) $(LDFLAGS) $^ -lz -o $@
+ 	@echo 'Linking $@...'
+-	$(LD) $(LDFLAGS) $^ $(LIBS) -o $@
++	$(LD) $(LDFLAGS) $^ -lz -o $@
  
- chdman: $(OBJ)/chdman.o $(OBJ)/chd.o $(OBJ)/chdcd.o $(OBJ)/cdrom.o $(OBJ)/md5.o $(OBJ)/sha1.o $(OBJ)/version.o $(ZLIB)
- 	$(CC_COMMENT) @echo 'Linking $@...'
--	$(CC_COMPILE) $(LD) $(LDFLAGS) $^ $(LIBS) -o $@
-+	$(CC_COMPILE) $(LD) $(LDFLAGS) $^ -lz -o $@
+ chdman: $(OBJ)/chdman.o $(OBJ)/chd.o $(OBJ)/chdcd.o $(OBJ)/cdrom.o $(OBJ)/md5.o $(OBJ)/sha1.o $(OBJ)/version.o $(ZLIB) $(OSTOOLOBJS)
+ 	@echo 'Linking $@...'
+-	$(LD) $(LDFLAGS) $^ $(LIBS) -o $@
++	$(LD) $(LDFLAGS) $^ -lz -o $@
  
  xml2info: $(OBJ)/xml2info.o $(EXPAT)
- 	$(CC_COMMENT) @echo 'Linking $@...'
--	$(CC_COMPILE) $(LD) $(LDFLAGS) $^ $(LIBS) -o $@
-+	$(CC_COMPILE) $(LD) $(LDFLAGS) $^ -lexpat -lz -o $@
+ 	@echo 'Linking $@...'
+-	$(LD) $(LDFLAGS) $^ $(LIBS) -o $@
++	$(LD) $(LDFLAGS) $^ -lexpat -lz -o $@
  
- dat2html: $(DAT2HTML_OBJS)
- 	$(CC_COMMENT) @echo 'Compiling $@...'
+ jedutil: $(OBJ)/jedutil.o $(OBJ)/jedparse.o $(OSDBGOBJS)
+ 	@echo 'Linking $@...'