- Update to 0.134u4

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

12 files changed, 52 insertions, 50 deletions

diff --git a/emulators/mame-devel/Makefile b/emulators/mame-devel/Makefile
index 87df17752d40..d59ded9e49fe 100644
--- a/emulators/mame-devel/Makefile
+++ b/emulators/mame-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sdlmame-devel
-PORTVERSION=	0.133u2
+PORTVERSION=	0.134u4
 CATEGORIES=	emulators
 MASTER_SITES=	ftp://ftp.arcadebsd.org/pub/ArcadeBSD/ports/distfiles/ \
 		http://rbelmont.mameworld.info/
diff --git a/emulators/mame-devel/distinfo b/emulators/mame-devel/distinfo
index 1fc5321dbda7..2d6afca693be 100644
--- a/emulators/mame-devel/distinfo
+++ b/emulators/mame-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (sdlmame0133u2.zip) = 1d35b9ca41115be0614669f23d7b7aed
-SHA256 (sdlmame0133u2.zip) = c4a6562c975e3011ccd563d3f13c92491be132d52f7923ee438efcebc2138fd9
-SIZE (sdlmame0133u2.zip) = 18084780
+MD5 (sdlmame0134u4.zip) = d9687aa3716e63cfc4539ec023467ed3
+SHA256 (sdlmame0134u4.zip) = 8a66f1573b9ec23211bb8039301b39404f6fb1fe7388d68478f57532c60d5102
+SIZE (sdlmame0134u4.zip) = 18451392
diff --git a/emulators/mame-devel/files/patch-makefile b/emulators/mame-devel/files/patch-makefile
index 096591cadf0c..48eb2cc00fc9 100644
--- a/emulators/mame-devel/files/patch-makefile
+++ b/emulators/mame-devel/files/patch-makefile
@@ -1,5 +1,5 @@
---- makefile.orig	2009-08-14 00:29:05.000000000 +0200
-+++ makefile	2009-08-14 00:31:28.000000000 +0200
+--- makefile.orig	2009-11-01 01:19:01.000000000 +0100
++++ makefile	2009-11-01 01:21:41.000000000 +0100
 @@ -59,7 +59,7 @@
  ifeq ($(OSD),windows)
  TARGETOS = win32
@@ -47,20 +47,21 @@
  else
  endif
  else
-@@ -382,6 +382,7 @@
+@@ -382,7 +382,7 @@
  	-I$(SRC)/lib/util \
  	-I$(SRC)/osd \
  	-I$(SRC)/osd/$(OSD) \
+-
 +	-I$(LOCALBASE)/include \
  
  
- 
-@@ -395,7 +396,7 @@
+ #-------------------------------------------------
+@@ -395,7 +395,7 @@
  ifneq ($(TARGETOS),macosx)
  ifneq ($(TARGETOS),os2)
  ifneq ($(TARGETOS),solaris)
 -LDFLAGS = -Wl,--warn-common
-+LDFLAGS = -Wl,--warn-common $(PTHREAD_LIBS) -L$(LOCALBASE)/lib
++LDFLAGS = -Wl,--warn-common -L$(LOCALBASE)/lib
  endif
  endif
  endif
diff --git a/emulators/mame-devel/files/patch-sdlmain.c b/emulators/mame-devel/files/patch-sdlmain.c
index bddfcc3e3a7d..4e026a9d909c 100644
--- a/emulators/mame-devel/files/patch-sdlmain.c
+++ b/emulators/mame-devel/files/patch-sdlmain.c
@@ -1,11 +1,11 @@
---- src/osd/sdl/sdlmain.c.orig	2009-03-25 05:55:00.000000000 +0100
-+++ src/osd/sdl/sdlmain.c	2009-03-25 05:56:04.000000000 +0100
-@@ -82,7 +82,7 @@
+--- src/osd/sdl/sdlmain.c.orig	2009-11-01 01:22:48.000000000 +0100
++++ src/osd/sdl/sdlmain.c	2009-11-01 01:23:26.000000000 +0100
+@@ -78,7 +78,7 @@
  #ifdef MESS
- 	{ "inipath",                              "$HOME/.mess;.;ini",     0,     "path to ini files" },
+ 	#define INI_PATH "$HOME/.mess;.;ini"
  #else
--	{ SDLOPTION_INIPATH,                     "$HOME/.mame;.;ini",     0,     "path to ini files" },
-+	{ SDLOPTION_INIPATH,                     "$HOME/.mame-devel;.;ini",     0,     "path to ini files" },
+-	#define INI_PATH "$HOME/.mame;.;ini"
++	#define INI_PATH "$HOME/.mame-devel;.;ini"
  #endif // MESS
- #endif // INI_PATH
  #endif // MACOSX
+ #endif // INI_PATH
diff --git a/emulators/mame-devel/files/sdl.mak.patch b/emulators/mame-devel/files/sdl.mak.patch
index 63a6f480c890..a883d54e0c88 100644
--- a/emulators/mame-devel/files/sdl.mak.patch
+++ b/emulators/mame-devel/files/sdl.mak.patch
@@ -1,15 +1,14 @@
---- 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 @@
- 
+--- src/osd/sdl/sdl.mak.orig	2009-10-25 16:43:25.000000000 +0100
++++ src/osd/sdl/sdl.mak	2009-11-01 02:07:41.000000000 +0100
+@@ -142,6 +142,7 @@
  ifeq ($(TARGETOS),freebsd)
  TARGETOS = unix
--DEFS += -DNO_THREAD_COOPERATIVE
-+DEFS += -DNO_THREAD_COOPERATIVE -DNO_DEBUGGER
+ SYNC_IMPLEMENTATION = ntc
++DEFS += -DNO_DEBUGGER
  endif
  
  ifeq ($(TARGETOS),openbsd)
-@@ -269,10 +269,10 @@
+@@ -288,10 +289,11 @@
  # the new debugger relies on GTK+ in addition to the base SDLMAME needs
  # Non-X11 builds can not use the debugger
  ifndef NO_X11
@@ -18,6 +17,7 @@
 -LIBS += `pkg-config --libs gtk+-2.0` `pkg-config --libs gconf-2.0`
 -CFLAGS += -DGTK_DISABLE_DEPRECATED
 +OSDCOREOBJS += $(SDLOBJ)/debugwin.o
++#OSDCOREOBJS += $(SDLOBJ)/debugwin.o $(SDLOBJ)/dview.o $(SDLOBJ)/debug-sup.o $(SDLOBJ)/debug-intf.o
 +#CFLAGS += `pkg-config --cflags gtk+-2.0` `pkg-config --cflags gconf-2.0` 
 +#LIBS += `pkg-config --libs gtk+-2.0` `pkg-config --libs gconf-2.0`
 +#CFLAGS += -DGTK_DISABLE_DEPRECATED
diff --git a/emulators/mame-devel/pkg-plist b/emulators/mame-devel/pkg-plist
index 3f494af36213..0d4ce6fe3620 100644
--- a/emulators/mame-devel/pkg-plist
+++ b/emulators/mame-devel/pkg-plist
@@ -10,7 +10,7 @@ libexec/sdlmame-devel/testkeys
 %%PORTDOCS%%%%DOCSDIR%%/docs/windows.txt
 %%PORTDOCS%%%%DOCSDIR%%/docs/config.txt
 %%PORTDOCS%%%%DOCSDIR%%/whatsnew.txt
-%%PORTDOCS%%%%DOCSDIR%%/whatsnew_0133u2.txt
+%%PORTDOCS%%%%DOCSDIR%%/whatsnew_0134u4.txt
 %%DATADIR%%/ui.bdf
 %%DATADIR%%/keymaps/km-be.txt
 %%DATADIR%%/keymaps/km-ch.txt
diff --git a/emulators/sdlmame-devel/Makefile b/emulators/sdlmame-devel/Makefile
index 87df17752d40..d59ded9e49fe 100644
--- a/emulators/sdlmame-devel/Makefile
+++ b/emulators/sdlmame-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sdlmame-devel
-PORTVERSION=	0.133u2
+PORTVERSION=	0.134u4
 CATEGORIES=	emulators
 MASTER_SITES=	ftp://ftp.arcadebsd.org/pub/ArcadeBSD/ports/distfiles/ \
 		http://rbelmont.mameworld.info/
diff --git a/emulators/sdlmame-devel/distinfo b/emulators/sdlmame-devel/distinfo
index 1fc5321dbda7..2d6afca693be 100644
--- a/emulators/sdlmame-devel/distinfo
+++ b/emulators/sdlmame-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (sdlmame0133u2.zip) = 1d35b9ca41115be0614669f23d7b7aed
-SHA256 (sdlmame0133u2.zip) = c4a6562c975e3011ccd563d3f13c92491be132d52f7923ee438efcebc2138fd9
-SIZE (sdlmame0133u2.zip) = 18084780
+MD5 (sdlmame0134u4.zip) = d9687aa3716e63cfc4539ec023467ed3
+SHA256 (sdlmame0134u4.zip) = 8a66f1573b9ec23211bb8039301b39404f6fb1fe7388d68478f57532c60d5102
+SIZE (sdlmame0134u4.zip) = 18451392
diff --git a/emulators/sdlmame-devel/files/patch-makefile b/emulators/sdlmame-devel/files/patch-makefile
index 096591cadf0c..48eb2cc00fc9 100644
--- a/emulators/sdlmame-devel/files/patch-makefile
+++ b/emulators/sdlmame-devel/files/patch-makefile
@@ -1,5 +1,5 @@
---- makefile.orig	2009-08-14 00:29:05.000000000 +0200
-+++ makefile	2009-08-14 00:31:28.000000000 +0200
+--- makefile.orig	2009-11-01 01:19:01.000000000 +0100
++++ makefile	2009-11-01 01:21:41.000000000 +0100
 @@ -59,7 +59,7 @@
  ifeq ($(OSD),windows)
  TARGETOS = win32
@@ -47,20 +47,21 @@
  else
  endif
  else
-@@ -382,6 +382,7 @@
+@@ -382,7 +382,7 @@
  	-I$(SRC)/lib/util \
  	-I$(SRC)/osd \
  	-I$(SRC)/osd/$(OSD) \
+-
 +	-I$(LOCALBASE)/include \
  
  
- 
-@@ -395,7 +396,7 @@
+ #-------------------------------------------------
+@@ -395,7 +395,7 @@
  ifneq ($(TARGETOS),macosx)
  ifneq ($(TARGETOS),os2)
  ifneq ($(TARGETOS),solaris)
 -LDFLAGS = -Wl,--warn-common
-+LDFLAGS = -Wl,--warn-common $(PTHREAD_LIBS) -L$(LOCALBASE)/lib
++LDFLAGS = -Wl,--warn-common -L$(LOCALBASE)/lib
  endif
  endif
  endif
diff --git a/emulators/sdlmame-devel/files/patch-sdlmain.c b/emulators/sdlmame-devel/files/patch-sdlmain.c
index bddfcc3e3a7d..4e026a9d909c 100644
--- a/emulators/sdlmame-devel/files/patch-sdlmain.c
+++ b/emulators/sdlmame-devel/files/patch-sdlmain.c
@@ -1,11 +1,11 @@
---- src/osd/sdl/sdlmain.c.orig	2009-03-25 05:55:00.000000000 +0100
-+++ src/osd/sdl/sdlmain.c	2009-03-25 05:56:04.000000000 +0100
-@@ -82,7 +82,7 @@
+--- src/osd/sdl/sdlmain.c.orig	2009-11-01 01:22:48.000000000 +0100
++++ src/osd/sdl/sdlmain.c	2009-11-01 01:23:26.000000000 +0100
+@@ -78,7 +78,7 @@
  #ifdef MESS
- 	{ "inipath",                              "$HOME/.mess;.;ini",     0,     "path to ini files" },
+ 	#define INI_PATH "$HOME/.mess;.;ini"
  #else
--	{ SDLOPTION_INIPATH,                     "$HOME/.mame;.;ini",     0,     "path to ini files" },
-+	{ SDLOPTION_INIPATH,                     "$HOME/.mame-devel;.;ini",     0,     "path to ini files" },
+-	#define INI_PATH "$HOME/.mame;.;ini"
++	#define INI_PATH "$HOME/.mame-devel;.;ini"
  #endif // MESS
- #endif // INI_PATH
  #endif // MACOSX
+ #endif // INI_PATH
diff --git a/emulators/sdlmame-devel/files/sdl.mak.patch b/emulators/sdlmame-devel/files/sdl.mak.patch
index 63a6f480c890..a883d54e0c88 100644
--- a/emulators/sdlmame-devel/files/sdl.mak.patch
+++ b/emulators/sdlmame-devel/files/sdl.mak.patch
@@ -1,15 +1,14 @@
---- 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 @@
- 
+--- src/osd/sdl/sdl.mak.orig	2009-10-25 16:43:25.000000000 +0100
++++ src/osd/sdl/sdl.mak	2009-11-01 02:07:41.000000000 +0100
+@@ -142,6 +142,7 @@
  ifeq ($(TARGETOS),freebsd)
  TARGETOS = unix
--DEFS += -DNO_THREAD_COOPERATIVE
-+DEFS += -DNO_THREAD_COOPERATIVE -DNO_DEBUGGER
+ SYNC_IMPLEMENTATION = ntc
++DEFS += -DNO_DEBUGGER
  endif
  
  ifeq ($(TARGETOS),openbsd)
-@@ -269,10 +269,10 @@
+@@ -288,10 +289,11 @@
  # the new debugger relies on GTK+ in addition to the base SDLMAME needs
  # Non-X11 builds can not use the debugger
  ifndef NO_X11
@@ -18,6 +17,7 @@
 -LIBS += `pkg-config --libs gtk+-2.0` `pkg-config --libs gconf-2.0`
 -CFLAGS += -DGTK_DISABLE_DEPRECATED
 +OSDCOREOBJS += $(SDLOBJ)/debugwin.o
++#OSDCOREOBJS += $(SDLOBJ)/debugwin.o $(SDLOBJ)/dview.o $(SDLOBJ)/debug-sup.o $(SDLOBJ)/debug-intf.o
 +#CFLAGS += `pkg-config --cflags gtk+-2.0` `pkg-config --cflags gconf-2.0` 
 +#LIBS += `pkg-config --libs gtk+-2.0` `pkg-config --libs gconf-2.0`
 +#CFLAGS += -DGTK_DISABLE_DEPRECATED
diff --git a/emulators/sdlmame-devel/pkg-plist b/emulators/sdlmame-devel/pkg-plist
index 3f494af36213..0d4ce6fe3620 100644
--- a/emulators/sdlmame-devel/pkg-plist
+++ b/emulators/sdlmame-devel/pkg-plist
@@ -10,7 +10,7 @@ libexec/sdlmame-devel/testkeys
 %%PORTDOCS%%%%DOCSDIR%%/docs/windows.txt
 %%PORTDOCS%%%%DOCSDIR%%/docs/config.txt
 %%PORTDOCS%%%%DOCSDIR%%/whatsnew.txt
-%%PORTDOCS%%%%DOCSDIR%%/whatsnew_0133u2.txt
+%%PORTDOCS%%%%DOCSDIR%%/whatsnew_0134u4.txt
 %%DATADIR%%/ui.bdf
 %%DATADIR%%/keymaps/km-be.txt
 %%DATADIR%%/keymaps/km-ch.txt