Update to 0.156: The usual changes.

6 files changed, 49 insertions, 17 deletions

diff --git a/emulators/mame/Makefile b/emulators/mame/Makefile
index 5df2cdaa908..28fbaea83e4 100644
--- a/emulators/mame/Makefile
+++ b/emulators/mame/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.33 2014/10/26 09:36:08 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2014/11/27 12:46:59 wiz Exp $
 
-DISTNAME=	mame0155s
+DISTNAME=	mame0156s
 PKGNAME=	${DISTNAME:S/0/-0./:S/s$//}
 MASTER_SITES=	http://mamedev.org/downloader.php?file=releases/
 
diff --git a/emulators/mame/Makefile.common b/emulators/mame/Makefile.common
index 5e71d24d1ae..fef3a3fa855 100644
--- a/emulators/mame/Makefile.common
+++ b/emulators/mame/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.17 2014/09/24 20:33:31 wiz Exp $
+# $NetBSD: Makefile.common,v 1.18 2014/11/27 12:46:59 wiz Exp $
 #
 # used by emulators/mame/Makefile
 # used by emulators/mess/Makefile
@@ -73,9 +73,9 @@ post-extract:
 
 .include "../../lang/python/application.mk"
 .include "../../devel/GConf/buildlink3.mk"
-.include "../../devel/SDL/buildlink3.mk"
-.include "../../devel/SDL_ttf/buildlink3.mk"
+.include "../../devel/SDL2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../fonts/SDL2_ttf/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../x11/libXinerama/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/emulators/mame/distinfo b/emulators/mame/distinfo
index 3511d53e01d..bb5ceb7af7c 100644
--- a/emulators/mame/distinfo
+++ b/emulators/mame/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.24 2014/10/26 09:36:08 wiz Exp $
+$NetBSD: distinfo,v 1.25 2014/11/27 12:46:59 wiz Exp $
 
-SHA1 (mame0155s.zip) = 61da5d2977100eda89a8d5946f93edb1521810ac
-RMD160 (mame0155s.zip) = 65aa9827bf1ff8266839b9d7794e35e082415f31
-Size (mame0155s.zip) = 40065055 bytes
+SHA1 (mame0156s.zip) = 0889e28eca1c6d7730ae82b66ebdc1876c7d8518
+RMD160 (mame0156s.zip) = b4cafa39f33beca7e0ce9b3af2cee4e8ff61472f
+Size (mame0156s.zip) = 40477362 bytes
 SHA1 (patch-src_lib_web_mongoose.c) = 58ecfa92b254e915988781360d7d79a73d80e44b
 SHA1 (patch-src_osd_osdcore.h) = 4dbc233a613d1743f97d3cb9c6526fb56ca7b6d6
+SHA1 (patch-src_osd_sdl_sdl.mak) = 21fbc2902d66e913e0bc4cc4fab7cf78db33ac21
diff --git a/emulators/mame/patches/patch-src_osd_sdl_sdl.mak b/emulators/mame/patches/patch-src_osd_sdl_sdl.mak
new file mode 100644
index 00000000000..a3ef4203b57
--- /dev/null
+++ b/emulators/mame/patches/patch-src_osd_sdl_sdl.mak
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_osd_sdl_sdl.mak,v 1.3 2014/11/27 12:46:59 wiz Exp $
+
+Choose a network interface type for NetBSD to fix linking.
+
+--- src/osd/sdl/sdl.mak.orig	2014-11-26 10:37:58.000000000 +0000
++++ src/osd/sdl/sdl.mak
+@@ -235,6 +235,7 @@ BASE_TARGETOS = unix
+ SYNC_IMPLEMENTATION = ntc
+ LIBS += -lutil
+ NO_USE_MIDI = 1
++SDL_NETWORK = pcap
+ endif
+ 
+ ifeq ($(TARGETOS),solaris)
diff --git a/emulators/mess/Makefile b/emulators/mess/Makefile
index 9b5f118e848..2df1d3c09c7 100644
--- a/emulators/mess/Makefile
+++ b/emulators/mess/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.35 2014/10/26 09:36:08 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2014/11/27 12:46:59 wiz Exp $
 
-DISTNAME=	mame0155s
+DISTNAME=	mame0156s
 PKGNAME=	${DISTNAME:S/mame0/mess-0./:S/s$//}
 MASTER_SITES=	http://mamedev.org/downloader.php?file=releases/
 
diff --git a/emulators/mess/PLIST b/emulators/mess/PLIST
index 48c09b1c87a..2b88be86c84 100644
--- a/emulators/mess/PLIST
+++ b/emulators/mess/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2014/10/26 09:36:08 wiz Exp $
+@comment $NetBSD: PLIST,v 1.19 2014/11/27 12:46:59 wiz Exp $
 bin/castool
 bin/floptool
 bin/imgtool
@@ -41,6 +41,7 @@ share/mess/hash/amigaecs_flop.xml
 share/mess/hash/amigaocs_flop.xml
 share/mess/hash/ampro.xml
 share/mess/hash/apc.xml
+share/mess/hash/apfimag_cass.xml
 share/mess/hash/apfm1000.xml
 share/mess/hash/apogee.xml
 share/mess/hash/apple1.xml
@@ -78,6 +79,7 @@ share/mess/hash/cd32.xml
 share/mess/hash/cdi.xml
 share/mess/hash/cdtv.xml
 share/mess/hash/cgenie_cart.xml
+share/mess/hash/cgenie_cass.xml
 share/mess/hash/channelf.xml
 share/mess/hash/coco_cart.xml
 share/mess/hash/coco_flop.xml
@@ -89,6 +91,7 @@ share/mess/hash/copera.xml
 share/mess/hash/cpc_cass.xml
 share/mess/hash/cpc_flop.xml
 share/mess/hash/crvision.xml
+share/mess/hash/dai_cass.xml
 share/mess/hash/dim68k.xml
 share/mess/hash/dmv.xml
 share/mess/hash/dps1.xml
@@ -98,6 +101,7 @@ share/mess/hash/electron_cart.xml
 share/mess/hash/ep64_cart.xml
 share/mess/hash/ep64_cass.xml
 share/mess/hash/ep64_flop.xml
+share/mess/hash/epson_cpm.xml
 share/mess/hash/exl100.xml
 share/mess/hash/famicom_cass.xml
 share/mess/hash/famicom_flop.xml
@@ -107,6 +111,7 @@ share/mess/hash/fm7_disk.xml
 share/mess/hash/fmtowns_cd.xml
 share/mess/hash/g7400.xml
 share/mess/hash/galaxy.xml
+share/mess/hash/gamate.xml
 share/mess/hash/gameboy.xml
 share/mess/hash/gamecom.xml
 share/mess/hash/gamegear.xml
@@ -127,7 +132,6 @@ share/mess/hash/hp9835a_rom.xml
 share/mess/hash/hp9845a_rom.xml
 share/mess/hash/hp9845b_rom.xml
 share/mess/hash/ht68k.xml
-share/mess/hash/hx20_flop.xml
 share/mess/hash/ibm5140.xml
 share/mess/hash/ibm5150.xml
 share/mess/hash/ibm5150_cass.xml
@@ -145,21 +149,25 @@ share/mess/hash/iq151_cart.xml
 share/mess/hash/iq151_flop.xml
 share/mess/hash/jaguar.xml
 share/mess/hash/juicebox.xml
+share/mess/hash/jupace_cass.xml
 share/mess/hash/kayproii.xml
 share/mess/hash/kc_cart.xml
 share/mess/hash/kc_cass.xml
 share/mess/hash/kc_flop.xml
 share/mess/hash/korvet_flop.xml
+share/mess/hash/leapster.xml
 share/mess/hash/lisa.xml
 share/mess/hash/lisa2.xml
 share/mess/hash/lviv.xml
 share/mess/hash/lynx.xml
 share/mess/hash/m20.xml
-share/mess/hash/m5.xml
+share/mess/hash/m5_cart.xml
+share/mess/hash/m5_cass.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/mc10.xml
 share/mess/hash/mc1502_flop.xml
 share/mess/hash/megacd.xml
 share/mess/hash/megacdj.xml
@@ -168,7 +176,9 @@ share/mess/hash/megaduck.xml
 share/mess/hash/megapc.xml
 share/mess/hash/megatech.xml
 share/mess/hash/microvision.xml
+share/mess/hash/mikro80.xml
 share/mess/hash/mikrosha.xml
+share/mess/hash/mikrosha_cart.xml
 share/mess/hash/misterx.xml
 share/mess/hash/mm1_flop.xml
 share/mess/hash/mo5_cart.xml
@@ -239,10 +249,12 @@ share/mess/hash/pippin_flop.xml
 share/mess/hash/plus4_cart.xml
 share/mess/hash/plus4_cass.xml
 share/mess/hash/plus4_flop.xml
+share/mess/hash/pmd85_cass.xml
 share/mess/hash/pokemini.xml
 share/mess/hash/prof180.xml
 share/mess/hash/prof80.xml
-share/mess/hash/psion.xml
+share/mess/hash/psion1.xml
+share/mess/hash/psion2.xml
 share/mess/hash/psx.xml
 share/mess/hash/pt68k2.xml
 share/mess/hash/pv1000.xml
@@ -279,14 +291,16 @@ share/mess/hash/snes_vkun.xml
 share/mess/hash/socrates.xml
 share/mess/hash/softbox.xml
 share/mess/hash/softwarelist.dtd
+share/mess/hash/sol20_cass.xml
 share/mess/hash/sorcerer_cart.xml
 share/mess/hash/sorcerer_cass.xml
 share/mess/hash/sorcerer_flop.xml
+share/mess/hash/spc1000_cass.xml
 share/mess/hash/special_cass.xml
 share/mess/hash/special_flop.xml
-share/mess/hash/spectrum.xml
+share/mess/hash/specpls3_flop.xml
+share/mess/hash/spectrum_cart.xml
 share/mess/hash/spectrum_cass.xml
-share/mess/hash/spectrum_flop.xml
 share/mess/hash/st_cart.xml
 share/mess/hash/st_flop.xml
 share/mess/hash/studio2.xml
@@ -316,6 +330,7 @@ share/mess/hash/trs80m2.xml
 share/mess/hash/trsm100.xml
 share/mess/hash/tutor.xml
 share/mess/hash/tvc_cart.xml
+share/mess/hash/tvc_cass.xml
 share/mess/hash/ut88.xml
 share/mess/hash/uzebox.xml
 share/mess/hash/v1050_flop.xml
@@ -335,6 +350,7 @@ share/mess/hash/vii.xml
 share/mess/hash/vip.xml
 share/mess/hash/visicom.xml
 share/mess/hash/vixen.xml
+share/mess/hash/vreader.xml
 share/mess/hash/vsmile_cart.xml
 share/mess/hash/vsmile_cd.xml
 share/mess/hash/wangpc.xml
@@ -343,6 +359,7 @@ share/mess/hash/wmbullet.xml
 share/mess/hash/wscolor.xml
 share/mess/hash/wswan.xml
 share/mess/hash/x07_card.xml
+share/mess/hash/x07_cass.xml
 share/mess/hash/x1_cass.xml
 share/mess/hash/x1_flop.xml
 share/mess/hash/x68k_flop.xml