- Update to 0.131

PR:		ports/133953
Submitted by:	Emmanuel Vadot <elbarto@arcadebsd.org> (maintainer)

8 files changed, 34 insertions, 44 deletions

diff --git a/emulators/mame/Makefile b/emulators/mame/Makefile
index b08dccff1688..3ccb21121063 100644
--- a/emulators/mame/Makefile
+++ b/emulators/mame/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	sdlmame
-PORTVERSION=	0.130
-PORTREVISION=	1
+PORTVERSION=	0.131
 CATEGORIES=	emulators
 MASTER_SITES=	ftp://ftp.arcadebsd.org/pub/FreeBSD/ports/distfiles/ \
 		http://rbelmont.mameworld.info/
@@ -32,9 +31,7 @@ OPTIONS=	DEBUG "Build sdlmame debugger" off
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_DEBUG)
-EXTRA_PATCHES+=		${FILESDIR}/sdl.mak.patch-debug
-.else
+.if !defined(WITH_DEBUG)
 USE_GNOME=		#
 EXTRA_PATCHES+=		${FILESDIR}/sdl.mak.patch
 .endif
diff --git a/emulators/mame/distinfo b/emulators/mame/distinfo
index 6eeaeeb73f42..80b0c8946d5a 100644
--- a/emulators/mame/distinfo
+++ b/emulators/mame/distinfo
@@ -1,3 +1,3 @@
-MD5 (sdlmame0130.zip) = 1195da0b6ae762eeebb21f500509d62d
-SHA256 (sdlmame0130.zip) = d6f25291ec79583dceb300a721f76a10d1839ad13890e51d9ed47b5236363de8
-SIZE (sdlmame0130.zip) = 17681979
+MD5 (sdlmame0131.zip) = d4891999ec2ee11cb0d75a1596e17060
+SHA256 (sdlmame0131.zip) = 03f0643294a673237169f915ee722b52b03d910b87d096b071e144f6f07e6621
+SIZE (sdlmame0131.zip) = 17663209
diff --git a/emulators/mame/files/sdl.mak.patch b/emulators/mame/files/sdl.mak.patch
index 36fd61624130..63a6f480c890 100644
--- a/emulators/mame/files/sdl.mak.patch
+++ b/emulators/mame/files/sdl.mak.patch
@@ -1,6 +1,15 @@
---- src/osd/sdl/sdl.mak.orig	2009-03-05 20:03:50.000000000 +0100
-+++ src/osd/sdl/sdl.mak	2009-03-05 20:06:22.000000000 +0100
-@@ -264,10 +264,10 @@
+--- src/osd/sdl/sdl.mak.orig	2009-03-19 14:09:23.000000000 +0100
++++ src/osd/sdl/sdl.mak	2009-03-25 05:32:18.000000000 +0100
+@@ -127,7 +127,7 @@
+ 
+ ifeq ($(TARGETOS),freebsd)
+ TARGETOS = unix
+-DEFS += -DNO_THREAD_COOPERATIVE
++DEFS += -DNO_THREAD_COOPERATIVE -DNO_DEBUGGER
+ endif
+ 
+ ifeq ($(TARGETOS),openbsd)
+@@ -269,10 +269,10 @@
  # the new debugger relies on GTK+ in addition to the base SDLMAME needs
  # Non-X11 builds can not use the debugger
  ifndef NO_X11
diff --git a/emulators/mame/files/sdl.mak.patch-debug b/emulators/mame/files/sdl.mak.patch-debug
deleted file mode 100644
index 66573868cdc2..000000000000
--- a/emulators/mame/files/sdl.mak.patch-debug
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/osd/sdl/sdl.mak.orig	2009-03-05 21:41:13.000000000 +0100
-+++ src/osd/sdl/sdl.mak	2009-03-05 21:41:25.000000000 +0100
-@@ -127,7 +127,7 @@
- 
- ifeq ($(TARGETOS),freebsd)
- TARGETOS = unix
--DEFS += -DNO_THREAD_COOPERATIVE -DNO_DEBUGGER
-+DEFS += -DNO_THREAD_COOPERATIVE
- endif
- 
- ifeq ($(TARGETOS),unix)
diff --git a/emulators/sdlmame/Makefile b/emulators/sdlmame/Makefile
index b08dccff1688..3ccb21121063 100644
--- a/emulators/sdlmame/Makefile
+++ b/emulators/sdlmame/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	sdlmame
-PORTVERSION=	0.130
-PORTREVISION=	1
+PORTVERSION=	0.131
 CATEGORIES=	emulators
 MASTER_SITES=	ftp://ftp.arcadebsd.org/pub/FreeBSD/ports/distfiles/ \
 		http://rbelmont.mameworld.info/
@@ -32,9 +31,7 @@ OPTIONS=	DEBUG "Build sdlmame debugger" off
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_DEBUG)
-EXTRA_PATCHES+=		${FILESDIR}/sdl.mak.patch-debug
-.else
+.if !defined(WITH_DEBUG)
 USE_GNOME=		#
 EXTRA_PATCHES+=		${FILESDIR}/sdl.mak.patch
 .endif
diff --git a/emulators/sdlmame/distinfo b/emulators/sdlmame/distinfo
index 6eeaeeb73f42..80b0c8946d5a 100644
--- a/emulators/sdlmame/distinfo
+++ b/emulators/sdlmame/distinfo
@@ -1,3 +1,3 @@
-MD5 (sdlmame0130.zip) = 1195da0b6ae762eeebb21f500509d62d
-SHA256 (sdlmame0130.zip) = d6f25291ec79583dceb300a721f76a10d1839ad13890e51d9ed47b5236363de8
-SIZE (sdlmame0130.zip) = 17681979
+MD5 (sdlmame0131.zip) = d4891999ec2ee11cb0d75a1596e17060
+SHA256 (sdlmame0131.zip) = 03f0643294a673237169f915ee722b52b03d910b87d096b071e144f6f07e6621
+SIZE (sdlmame0131.zip) = 17663209
diff --git a/emulators/sdlmame/files/sdl.mak.patch b/emulators/sdlmame/files/sdl.mak.patch
index 36fd61624130..63a6f480c890 100644
--- a/emulators/sdlmame/files/sdl.mak.patch
+++ b/emulators/sdlmame/files/sdl.mak.patch
@@ -1,6 +1,15 @@
---- src/osd/sdl/sdl.mak.orig	2009-03-05 20:03:50.000000000 +0100
-+++ src/osd/sdl/sdl.mak	2009-03-05 20:06:22.000000000 +0100
-@@ -264,10 +264,10 @@
+--- src/osd/sdl/sdl.mak.orig	2009-03-19 14:09:23.000000000 +0100
++++ src/osd/sdl/sdl.mak	2009-03-25 05:32:18.000000000 +0100
+@@ -127,7 +127,7 @@
+ 
+ ifeq ($(TARGETOS),freebsd)
+ TARGETOS = unix
+-DEFS += -DNO_THREAD_COOPERATIVE
++DEFS += -DNO_THREAD_COOPERATIVE -DNO_DEBUGGER
+ endif
+ 
+ ifeq ($(TARGETOS),openbsd)
+@@ -269,10 +269,10 @@
  # the new debugger relies on GTK+ in addition to the base SDLMAME needs
  # Non-X11 builds can not use the debugger
  ifndef NO_X11
diff --git a/emulators/sdlmame/files/sdl.mak.patch-debug b/emulators/sdlmame/files/sdl.mak.patch-debug
deleted file mode 100644
index 66573868cdc2..000000000000
--- a/emulators/sdlmame/files/sdl.mak.patch-debug
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/osd/sdl/sdl.mak.orig	2009-03-05 21:41:13.000000000 +0100
-+++ src/osd/sdl/sdl.mak	2009-03-05 21:41:25.000000000 +0100
-@@ -127,7 +127,7 @@
- 
- ifeq ($(TARGETOS),freebsd)
- TARGETOS = unix
--DEFS += -DNO_THREAD_COOPERATIVE -DNO_DEBUGGER
-+DEFS += -DNO_THREAD_COOPERATIVE
- endif
- 
- ifeq ($(TARGETOS),unix)