Update mame+mess to 0.154. Share more information between packages.

Changes: the usual, better emulation for more systems.

8 files changed, 59 insertions, 29 deletions

diff --git a/emulators/mame/Makefile b/emulators/mame/Makefile
index 3eac61127ae..a90f91d4d5d 100644
--- a/emulators/mame/Makefile
+++ b/emulators/mame/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2014/06/09 14:18:07 ryoon Exp $
+# $NetBSD: Makefile,v 1.32 2014/07/25 15:28:56 wiz Exp $
 
-DISTNAME=	mame0153s
+DISTNAME=	mame0154s
 PKGNAME=	${DISTNAME:S/0/-0./:S/s$//}
-PKGREVISION=	2
 MASTER_SITES=	http://mamedev.org/downloader.php?file=releases/
 
 COMMENT=	Multiple Arcade Machine Emulator
@@ -12,11 +11,6 @@ CONFLICTS=		xmame-[0-9]* sdlmame-[0-9]*
 DOCDIR=			share/doc/mame
 INSTALLATION_DIRS=	bin ${DOCDIR} ${PKGMANDIR}/man1 ${PKGMANDIR}/man6
 
-# mame source is double-zipped
-post-extract:
-	cd ${WRKDIR} && ${.CURDIR}/../../mk/extract/extract mame.zip
-	rm ${WRKDIR}/mame.zip
-
 # not installed, because not found necessary so far:
 # regrep, split, src2html, srcclean, testkeys
 do-install:
diff --git a/emulators/mame/Makefile.common b/emulators/mame/Makefile.common
index 0298c05d6a3..e1ffc16b751 100644
--- a/emulators/mame/Makefile.common
+++ b/emulators/mame/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2014/05/09 07:37:04 wiz Exp $
+# $NetBSD: Makefile.common,v 1.16 2014/07/25 15:28:56 wiz Exp $
 #
 # used by emulators/mame/Makefile
 # used by emulators/mess/Makefile
@@ -18,9 +18,8 @@ DEPENDS+=		liberation-ttf-[0-9]*:../../fonts/liberation-ttf
 
 WRKSRC=			${WRKDIR}
 
-# separate distinfos though, so don't forget 'make mdi' when
-# adding or changing patches
-#PATCHDIR=		${.CURDIR}/../../emulators/mame/patches
+PATCHDIR=		${.CURDIR}/../../emulators/mame/patches
+DISTINFO_FILE=		${.CURDIR}/../../emulators/mame/distinfo
 
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		gmake pkg-config
@@ -61,6 +60,11 @@ SUBST_MESSAGE.exe=	Fixing executable name.
 PYTHON_FOR_BUILD_ONLY=	yes
 PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # not yet ported as of 0.151
 
+# mame source is double-zipped
+post-extract:
+	cd ${WRKDIR} && ${.CURDIR}/../../mk/extract/extract mame.zip
+	rm ${WRKDIR}/mame.zip
+
 .include "../../lang/python/application.mk"
 .include "../../devel/GConf/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
diff --git a/emulators/mame/distinfo b/emulators/mame/distinfo
index 8756a2957dd..09db1bc8926 100644
--- a/emulators/mame/distinfo
+++ b/emulators/mame/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.20 2014/04/17 11:56:11 wiz Exp $
+$NetBSD: distinfo,v 1.21 2014/07/25 15:28:56 wiz Exp $
 
-SHA1 (mame0153s.zip) = aff24a7f76fe2bdd3948fbc15c9c6527f63d3c94
-RMD160 (mame0153s.zip) = a381c9790281a1da835604f1ffad0d3bd56c5e14
-Size (mame0153s.zip) = 37829714 bytes
+SHA1 (mame0154s.zip) = b5273ef2bfaf9bdf747af34eb3b1346b30f99047
+RMD160 (mame0154s.zip) = 9d26953fcae65f3f95c1999ce7c96fa440de2f64
+Size (mame0154s.zip) = 39697095 bytes
+SHA1 (patch-src_lib_web_mongoose.c) = 32b807a6a38d7b3314a820278eaadbbe1bb3ca4c
+SHA1 (patch-src_osd_osdcore.h) = 4dbc233a613d1743f97d3cb9c6526fb56ca7b6d6
diff --git a/emulators/mame/patches/patch-src_lib_web_mongoose.c b/emulators/mame/patches/patch-src_lib_web_mongoose.c
new file mode 100644
index 00000000000..2c98710e195
--- /dev/null
+++ b/emulators/mame/patches/patch-src_lib_web_mongoose.c
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_lib_web_mongoose.c,v 1.1 2014/07/25 15:28:56 wiz Exp $
+
+If _XOPEN_SOURCE is defined to 600, NetBSD does not provide strtoll
+and other stuff.
+
+--- src/lib/web/mongoose.c.orig	2014-07-22 08:14:56.000000000 +0000
++++ src/lib/web/mongoose.c
+@@ -46,7 +46,7 @@
+ #define _INTEGRAL_MAX_BITS 64   // Enable _stati64() on Windows
+ #define _CRT_SECURE_NO_WARNINGS // Disable deprecation warning in VS2005+
+ #undef WIN32_LEAN_AND_MEAN      // Let windows.h always include winsock2.h
+-#define _XOPEN_SOURCE 600       // For flockfile() on Linux
++//#define _XOPEN_SOURCE 600       // For flockfile() on Linux
+ #define __STDC_FORMAT_MACROS    // <inttypes.h> wants this for C++
+ #define __STDC_LIMIT_MACROS     // C++ wants that for INT64_MAX
+ #define _LARGEFILE_SOURCE       // Enable fseeko() and ftello() functions
diff --git a/emulators/mame/patches/patch-src_osd_osdcore.h b/emulators/mame/patches/patch-src_osd_osdcore.h
new file mode 100644
index 00000000000..ee77d6acebc
--- /dev/null
+++ b/emulators/mame/patches/patch-src_osd_osdcore.h
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_osd_osdcore.h,v 1.1 2014/07/25 15:28:56 wiz Exp $
+
+Include stdarg.h for va_list.
+
+--- src/osd/osdcore.h.orig	2014-04-25 09:31:28.000000000 +0000
++++ src/osd/osdcore.h
+@@ -19,6 +19,7 @@
+ #ifndef __OSDCORE_H__
+ #define __OSDCORE_H__
+ 
++#include <stdarg.h>
+ #include "osdcomm.h"
+ #include "delegate.h"
+ 
diff --git a/emulators/mess/Makefile b/emulators/mess/Makefile
index 5bb3162d0e0..31b7ff0b39a 100644
--- a/emulators/mess/Makefile
+++ b/emulators/mess/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.33 2014/04/17 12:09:05 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2014/07/25 15:28:56 wiz Exp $
 
-DISTNAME=	mame0153s
+DISTNAME=	mame0154s
 PKGNAME=	${DISTNAME:S/mame0/mess-0./:S/s$//}
 MASTER_SITES=	http://mamedev.org/downloader.php?file=releases/
 
@@ -12,11 +12,6 @@ DOCDIR=			share/doc/mess
 SHAREDIR=		share/mess
 INSTALLATION_DIRS=	bin ${DOCDIR} ${SHAREDIR}/artwork ${SHAREDIR}/hash
 
-# mame source is double-zipped
-post-extract:
-	cd ${WRKDIR} && ${.CURDIR}/../../mk/extract/extract mame.zip
-	rm ${WRKDIR}/mame.zip
-
 # to build mess, not mame
 MAKE_FLAGS=		TARGET=mess
 
diff --git a/emulators/mess/PLIST b/emulators/mess/PLIST
index 106f578b63d..ac5ffe57792 100644
--- a/emulators/mess/PLIST
+++ b/emulators/mess/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2014/04/17 12:09:05 wiz Exp $
+@comment $NetBSD: PLIST,v 1.17 2014/07/25 15:28:56 wiz Exp $
 bin/castool
 bin/floptool
 bin/imgtool
@@ -74,6 +74,7 @@ share/mess/hash/cbm2_cart.xml
 share/mess/hash/cbm2_flop.xml
 share/mess/hash/cbm8096_flop.xml
 share/mess/hash/cbm8296_flop.xml
+share/mess/hash/cc40_cart.xml
 share/mess/hash/cd32.xml
 share/mess/hash/cdi.xml
 share/mess/hash/cdtv.xml
@@ -112,10 +113,14 @@ share/mess/hash/gbcolor.xml
 share/mess/hash/genius.xml
 share/mess/hash/gl2000.xml
 share/mess/hash/gl6000sl.xml
+share/mess/hash/glcolor.xml
 share/mess/hash/gmaster.xml
 share/mess/hash/gp32.xml
 share/mess/hash/gx4000.xml
 share/mess/hash/horizon.xml
+share/mess/hash/hp9835a_rom.xml
+share/mess/hash/hp9845a_rom.xml
+share/mess/hash/hp9845b_rom.xml
 share/mess/hash/hx20_flop.xml
 share/mess/hash/ibm5140.xml
 share/mess/hash/ibm5150.xml
@@ -147,6 +152,7 @@ share/mess/hash/m20.xml
 share/mess/hash/m5.xml
 share/mess/hash/mac_flop.xml
 share/mess/hash/mac_hdd.xml
+share/mess/hash/mbc200.xml
 share/mess/hash/mbc55x.xml
 share/mess/hash/mc1502_flop.xml
 share/mess/hash/megacd.xml
@@ -167,6 +173,7 @@ share/mess/hash/msx1_cass.xml
 share/mess/hash/msx1_flop.xml
 share/mess/hash/msx2.hsi
 share/mess/hash/msx2_cart.xml
+share/mess/hash/msx2_flop.xml
 share/mess/hash/myvision.xml
 share/mess/hash/mz2000_cass.xml
 share/mess/hash/mz2000_flop.xml
@@ -195,6 +202,7 @@ share/mess/hash/orion_cass.xml
 share/mess/hash/orion_flop.xml
 share/mess/hash/orionpro_flop.xml
 share/mess/hash/osborne1.xml
+share/mess/hash/osborne2.xml
 share/mess/hash/p500_flop.xml
 share/mess/hash/partner_cass.xml
 share/mess/hash/partner_flop.xml
@@ -245,6 +253,8 @@ share/mess/hash/samcoupe_flop.xml
 share/mess/hash/sat_cart.xml
 share/mess/hash/saturn.xml
 share/mess/hash/sawatte.xml
+share/mess/hash/sc3000_cart.xml
+share/mess/hash/sc3000_cass.xml
 share/mess/hash/scv.xml
 share/mess/hash/segacd.xml
 share/mess/hash/sf7000.xml
diff --git a/emulators/mess/distinfo b/emulators/mess/distinfo
deleted file mode 100644
index 9302ecb2d0d..00000000000
--- a/emulators/mess/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.19 2014/04/17 12:09:05 wiz Exp $
-
-SHA1 (mame0153s.zip) = aff24a7f76fe2bdd3948fbc15c9c6527f63d3c94
-RMD160 (mame0153s.zip) = a381c9790281a1da835604f1ffad0d3bd56c5e14
-Size (mame0153s.zip) = 37829714 bytes