Update to 0.130. Rename makefile.sdl in pre-patch phase and share

patches with sdlmame.

Changes: lots as usual, but the only documentation is the too long
ChangeLog.

6 files changed, 21 insertions, 195 deletions

diff --git a/emulators/sdlmess/Makefile b/emulators/sdlmess/Makefile
index bd51a55c319..643bee40777 100644
--- a/emulators/sdlmess/Makefile
+++ b/emulators/sdlmess/Makefile
@@ -1,20 +1,25 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/01/18 16:02:57 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2009/04/20 14:34:24 wiz Exp $
 #
 
-DISTNAME=		sdlmess0129
-PKGNAME=		sdlmess-0.129
+DISTNAME=		sdlmess0130
+PKGNAME=		sdlmess-0.130
 
 COMMENT=		Multi Emulator Super System, SDL port
 
 CONFLICTS=		xmess-[0-9]*
 
-MAKE_FILE=		makefile.sdl
+MAKE_FILE=		makefile
+
+PATCHDIR=		${.CURDIR}/../../emulators/sdlmame/patches
 
 DOCDIR=			share/doc/mess
 SHAREDIR=		share/mess
 INSTALLATION_DIRS=	bin ${DOCDIR}/sysinfo ${SHAREDIR}/artwork \
 			${SHAREDIR}/hash
 
+pre-patch:
+	cd ${WRKSRC} && mv makefile.sdl makefile
+
 post-build:
 	cd ${WRKSRC} && ./dat2html
 
diff --git a/emulators/sdlmess/PLIST b/emulators/sdlmess/PLIST
index 291914f8b97..2e7842de09e 100644
--- a/emulators/sdlmess/PLIST
+++ b/emulators/sdlmess/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/01/18 16:02:57 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/04/20 14:34:24 wiz Exp $
 bin/imgtool
 bin/mess
 share/doc/mess/sysinfo.htm
@@ -276,6 +276,11 @@ share/mess/artwork/dir.txt
 share/mess/artwork/floppyr.png
 share/mess/artwork/floppyw.png
 share/mess/artwork/glasgow.zip
+share/mess/artwork/hp48g.zip
+share/mess/artwork/hp48gp.zip
+share/mess/artwork/hp48gx.zip
+share/mess/artwork/hp48s.zip
+share/mess/artwork/hp48sx.zip
 share/mess/artwork/kim1.zip
 share/mess/artwork/ledoff.png
 share/mess/artwork/ledon.png
diff --git a/emulators/sdlmess/distinfo b/emulators/sdlmess/distinfo
index 9a0feaeb284..26bebb9fccb 100644
--- a/emulators/sdlmess/distinfo
+++ b/emulators/sdlmess/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.2 2009/04/19 09:50:06 hasso Exp $
+$NetBSD: distinfo,v 1.3 2009/04/20 14:34:24 wiz Exp $
 
-SHA1 (sdlmess0129.zip) = 5b48a5922647b51a96f1b302691d843b8153483d
-RMD160 (sdlmess0129.zip) = e6785a3f5a932187075fdf963200b7d9ac02614f
-Size (sdlmess0129.zip) = 31176249 bytes
-SHA1 (patch-aa) = 0b752651da139512c0dac7541f003805b805c140
+SHA1 (sdlmess0130.zip) = 730b1a3eaefccb785205e5d25e7a2281b42822d7
+RMD160 (sdlmess0130.zip) = 2b384fa349fdb1a60506583766821c5736ceba11
+Size (sdlmess0130.zip) = 31636461 bytes
+SHA1 (patch-aa) = 38c0eb8560fcc4d5721d6461c2966785d1e8abc7
 SHA1 (patch-ab) = c49551959d68aaad754121ce8dc874b936f3b4de
+SHA1 (patch-ae) = dbcf17c973733727a6e1cc7a18f879d2b90d7184
 SHA1 (patch-ah) = 6a8e0307a58114cfe59d066a4e5e6210895dcc9a
diff --git a/emulators/sdlmess/patches/patch-aa b/emulators/sdlmess/patches/patch-aa
deleted file mode 100644
index 7426d48c5dc..00000000000
--- a/emulators/sdlmess/patches/patch-aa
+++ /dev/null
@@ -1,120 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2009/01/18 16:02:57 wiz Exp $
-
---- makefile.sdl.orig	2009-01-07 05:41:45.000000000 +0100
-+++ makefile.sdl
-@@ -125,10 +125,10 @@ endif
- # BIGENDIAN = 1
- 
- # uncomment next line to build expat as part of MAME build
--BUILD_EXPAT = 1
-+# BUILD_EXPAT = 1
- 
- # uncomment next line to build zlib as part of MAME build
--BUILD_ZLIB = 1
-+# BUILD_ZLIB = 1
- 
- # uncomment next line to include the symbols
- # SYMBOLS = 1
-@@ -193,9 +193,9 @@ BUILD_EXE = $(EXE)
- endif
- 
- # compiler, linker and utilities
--AR = @ar
--CC = @gcc
--LD = @gcc
-+#AR = @ar
-+#CC = @gcc
-+#LD = @gcc
- MD = -mkdir$(EXE)
- RM = @rm -f
- 
-@@ -219,7 +219,8 @@ NAME = $(TARGET)$(SUBTARGET)
- endif
- 
- # fullname is prefix+name+suffix+debugsuffix
--FULLNAME = $(PREFIX)$(NAME)$(SUFFIX)$(DEBUGSUFFIX)
-+#FULLNAME = $(PREFIX)$(NAME)$(SUFFIX)$(DEBUGSUFFIX)
-+FULLNAME = $(NAME)$(SUFFIX)$(DEBUGSUFFIX)
- 
- # add an EXE suffix to get the final emulator name
- EMULATOR = $(FULLNAME)$(EXE)
-@@ -284,10 +285,10 @@ endif
- #-------------------------------------------------
- 
- # we compile to C89 standard with GNU extensions
--CFLAGS = -std=gnu89
-+#CFLAGS = -std=gnu89
- 
- # this speeds it up a bit by piping between the preprocessor/compiler/assembler
--CFLAGS += -pipe
-+#CFLAGS += -pipe
- 
- # add -g if we need symbols
- ifdef SYMBOLS
-@@ -321,14 +322,14 @@ CFLAGS += -Wdeclaration-after-statement
- endif
- 
- # add the optimization flag
--CFLAGS += -O$(OPTIMIZE)
-+#CFLAGS += -O$(OPTIMIZE)
- 
- # if we are optimizing, include optimization options
- # and make all errors into warnings
- ifneq ($(OPTIMIZE),0)
- CFLAGS += $(ARCHOPTS) -fno-strict-aliasing
- ifneq ($(TARGETOS),os2)
--CFLAGS += -Werror
-+#CFLAGS += -Werror
- endif
- endif
- 
-@@ -344,7 +345,7 @@ endif
- #-------------------------------------------------
- 
- # add core include paths
--CFLAGS += \
-+CFLAGS := \
- 	-I$(SRC)/$(TARGET) \
- 	-I$(SRC)/$(TARGET)/includes \
- 	-I$(OBJ)/$(TARGET)/layout \
-@@ -354,7 +355,7 @@ CFLAGS += \
- 	-I$(SRC)/lib/util \
- 	-I$(SRC)/osd \
- 	-I$(SRC)/osd/$(OSD) \
--
-+	$(CFLAGS)
- 
- 
- #-------------------------------------------------
-@@ -363,11 +364,11 @@ CFLAGS += \
- 
- # LDFLAGS are used generally; LDFLAGSEMULATOR are additional
- # flags only used when linking the core emulator
--LDFLAGS =
-+#LDFLAGS =
- ifneq ($(TARGETOS),macosx)
- ifneq ($(TARGETOS),os2)
- ifneq ($(TARGETOS),solaris)
--LDFLAGS = -Wl,--warn-common
-+#LDFLAGS = -Wl,--warn-common
- endif
- endif
- endif
-@@ -382,7 +383,7 @@ endif
- ifndef SYMBOLS
- ifndef PROFILE
- ifneq ($(TARGETOS),macosx)
--LDFLAGS += -s
-+#LDFLAGS += -s
- endif
- endif
- endif
-@@ -535,7 +536,7 @@ $(VERSIONOBJ): $(DRVLIBS) $(LIBOSD) $(LI
- 
- $(EMULATOR): $(VERSIONOBJ) $(DRVLIBS) $(LIBOSD) $(LIBEMU) $(LIBCPU) $(LIBSOUND) $(LIBUTIL) $(EXPAT) $(ZLIB) $(LIBOCORE) $(RESFILE)
- 	@echo Linking $@...
--	$(LD) $(LDFLAGS) $(LDFLAGSEMULATOR) $^ $(LIBS) -o $@
-+	$(CC) $(LDFLAGS) $(LDFLAGSEMULATOR) $^ $(LIBS) -o $@
- 
- endif
- 
diff --git a/emulators/sdlmess/patches/patch-ab b/emulators/sdlmess/patches/patch-ab
deleted file mode 100644
index 744f2ca5ad3..00000000000
--- a/emulators/sdlmess/patches/patch-ab
+++ /dev/null
@@ -1,52 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2009/04/19 09:50:06 hasso Exp $
-
---- src/osd/sdl/sdlsync.c.orig	2008-12-12 05:55:30 +0200
-+++ src/osd/sdl/sdlsync.c	2009-04-19 08:43:17 +0300
-@@ -586,15 +586,28 @@ int osd_thread_adjust_priority(osd_threa
- 
- int osd_thread_cpu_affinity(osd_thread *thread, UINT32 mask)
- {
--#if !defined(NO_THREAD_COOPERATIVE) && !defined(NO_AFFINITY_NP)
-+#if !defined(NO_THREAD_COOPERATIVE) && !defined(NO_AFFINITY_NP) && !defined(__DragonFly__)
-+#if defined(__NetBSD__)
-+	cpuset_t *cmask;
-+#else
- 	cpu_set_t	cmask;
-+#endif
- 	pthread_t	lthread;
- 	int			bitnum;
-+	int			ret;
- 
-+#if defined(__NetBSD__)
-+	cmask = cpuset_create(); /* initializes set as well */
-+#else
- 	CPU_ZERO(&cmask);
-+#endif
- 	for (bitnum=0; bitnum<32; bitnum++)
- 		if (mask & (1<<bitnum))
-+#if defined(__NetBSD__)
-+			cpuset_set(bitnum, cmask);
-+#else
- 			CPU_SET(bitnum, &cmask);
-+#endif
- 	
- 	if (thread == NULL)
- 		lthread = pthread_self();
-@@ -605,10 +618,15 @@ int osd_thread_cpu_affinity(osd_thread *
- 	{
- 		/* Not available during link in all targets */
- 		fprintf(stderr, "error %d setting cpu affinity to mask %08x", errno, mask);
--		return FALSE;
-+		ret = FALSE;
- 	}
- 	else
--		return TRUE;
-+		ret = TRUE;
-+
-+#if defined(__NetBSD__)
-+	cpuset_destroy(cmask);
-+#endif
-+	return ret;
- #else
- 	return TRUE;
- #endif
diff --git a/emulators/sdlmess/patches/patch-ah b/emulators/sdlmess/patches/patch-ah
deleted file mode 100644
index 978b3226313..00000000000
--- a/emulators/sdlmess/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.1.1.1 2009/01/18 16:02:57 wiz Exp $
-
---- src/osd/sdl/sdlprefix.h.orig	2008-02-05 21:09:55.000000000 +0000
-+++ src/osd/sdl/sdlprefix.h
-@@ -30,7 +30,7 @@
- #elif defined(__linux__)
- #define SDLMAME_LINUX 1
- 
--#elif defined(__FreeBSD__) || defined(__DragonFly__)
-+#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__)
- #define SDLMAME_FREEBSD 1
- #endif
-