Update to 0.147. The usual changes.

3 files changed, 35 insertions, 67 deletions

diff --git a/emulators/mess/Makefile b/emulators/mess/Makefile
index b175f44e572..1c358c30d5f 100644
--- a/emulators/mess/Makefile
+++ b/emulators/mess/Makefile
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2012/10/02 17:10:59 tron Exp $
+# $NetBSD: Makefile,v 1.19 2012/10/07 22:04:46 wiz Exp $
 #
 
-DISTNAME=		mess0146s
-PKGNAME=		${DISTNAME:S/0/-0./:S/s$//}
-PKGREVISION=		4
-# original master site on cookie/javascript/whatever site
-MASTER_SITES=		# http://www.mess.org/_media/downloads:
+DISTNAME=		mame0147s
+PKGNAME=		${DISTNAME:S/mame0/mess-0./:S/s$//}
+MASTER_SITES=		http://mamedev.org/downloader.php?file=releases/
 
 COMMENT=		Multi Emulator Super System
 
@@ -15,9 +13,10 @@ DOCDIR=			share/doc/mess
 SHAREDIR=		share/mess
 INSTALLATION_DIRS=	bin ${DOCDIR} ${SHAREDIR}/artwork ${SHAREDIR}/hash
 
-INTERACTIVE_STAGE=	fetch
-FETCH_MESSAGE=		"Distfile is on sendspace.com, please download manually." \
-			"Follow the link for \"MESS "${DISTNAME:S/mess//:S/s//:S/0/0./}" Source\" on http://www.mess.org/downloads"
+# 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
@@ -31,7 +30,7 @@ do-install:
 		${INSTALL_PROGRAM} ${WRKSRC}/"$$prg" ${DESTDIR}${PREFIX}/bin; \
 	done
 	set -e; \
-	for doc in credits.htm faq.htm howto.htm imgtool.txt license.txt; do \
+	for doc in imgtool.txt license.txt; do \
 		${INSTALL_DATA} ${WRKSRC}/docs/"$$doc" ${DESTDIR}${PREFIX}/${DOCDIR}; \
 	done
 	${INSTALL_DATA} ${WRKSRC}/artwork/* \
diff --git a/emulators/mess/PLIST b/emulators/mess/PLIST
index 3dcbf35316d..bddfe1b8dfc 100644
--- a/emulators/mess/PLIST
+++ b/emulators/mess/PLIST
@@ -1,63 +1,11 @@
-@comment $NetBSD: PLIST,v 1.9 2012/06/01 20:00:41 wiz Exp $
+@comment $NetBSD: PLIST,v 1.10 2012/10/07 22:04:46 wiz Exp $
 bin/castool
 bin/floptool
 bin/imgtool
 bin/mess
-share/doc/mess/credits.htm
-share/doc/mess/faq.htm
-share/doc/mess/howto.htm
 share/doc/mess/imgtool.txt
 share/doc/mess/license.txt
-share/mess/artwork/4004clk.zip
-share/mess/artwork/academy.zip
-share/mess/artwork/aim65.zip
-share/mess/artwork/alm16.zip
-share/mess/artwork/alm32.zip
-share/mess/artwork/amsterd.zip
 share/mess/artwork/aperture.png
-share/mess/artwork/avigo.zip
-share/mess/artwork/berlinp.zip
-share/mess/artwork/bpl32.zip
-share/mess/artwork/ccmk1.zip
-share/mess/artwork/ccmk2.zip
-share/mess/artwork/dallas16.zip
-share/mess/artwork/gen32.zip
-share/mess/artwork/gen32_41.zip
-share/mess/artwork/gen32_oc.zip
-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/junior.zip
-share/mess/artwork/kim1.zip
-share/mess/artwork/lond020.zip
-share/mess/artwork/lond030.zip
-share/mess/artwork/lyon16.zip
-share/mess/artwork/lyon32.zip
-share/mess/artwork/milano.zip
-share/mess/artwork/mm4.zip
-share/mess/artwork/mo5.zip
-share/mess/artwork/mo5nr.zip
-share/mess/artwork/mo6.zip
-share/mess/artwork/monteciv.zip
-share/mess/artwork/mpf1.zip
-share/mess/artwork/mpf1b.zip
-share/mess/artwork/pc1401.zip
-share/mess/artwork/pc1402.zip
-share/mess/artwork/pc1403.zip
-share/mess/artwork/polgar.zip
-share/mess/artwork/sexpertc.zip
-share/mess/artwork/ssystem3.zip
-share/mess/artwork/supercon.zip
-share/mess/artwork/to7.zip
-share/mess/artwork/to770.zip
-share/mess/artwork/to8.zip
-share/mess/artwork/to9.zip
-share/mess/artwork/to9p.zip
-share/mess/artwork/van16.zip
-share/mess/artwork/van32.zip
 share/mess/artwork/white.png
 share/mess/hash/32x.xml
 share/mess/hash/3do_m2.xml
@@ -82,7 +30,12 @@ share/mess/hash/aquarius.xml
 share/mess/hash/arcadia.xml
 share/mess/hash/astrocde.xml
 share/mess/hash/atom.xml
+share/mess/hash/bbca_cass.xml
+share/mess/hash/bbcb_cass.xml
 share/mess/hash/bbcbc.xml
+share/mess/hash/bbcm_cart.xml
+share/mess/hash/bbcm_cass.xml
+share/mess/hash/bw12.xml
 share/mess/hash/bw2.xml
 share/mess/hash/c128_cart.xml
 share/mess/hash/c128_flop.xml
@@ -97,11 +50,13 @@ share/mess/hash/cdtv.xml
 share/mess/hash/channelf.xml
 share/mess/hash/coco_cart.xml
 share/mess/hash/coleco.xml
+share/mess/hash/compis.xml
 share/mess/hash/cpc_cass.xml
 share/mess/hash/cpc_flop.xml
 share/mess/hash/crvision.xml
 share/mess/hash/dim68k.xml
 share/mess/hash/einstein.xml
+share/mess/hash/electron_cart.xml
 share/mess/hash/famicom_flop.xml
 share/mess/hash/fm77av.xml
 share/mess/hash/fm7_cass.xml
@@ -116,6 +71,7 @@ share/mess/hash/gmaster.xml
 share/mess/hash/gx4000.xml
 share/mess/hash/ibm5140.xml
 share/mess/hash/ibm5150.xml
+share/mess/hash/ibm5150_cass.xml
 share/mess/hash/ibm5170.xml
 share/mess/hash/ibmpcjr_cart.xml
 share/mess/hash/ibmpcjr_flop.xml
@@ -141,12 +97,16 @@ share/mess/hash/megacdj.xml
 share/mess/hash/megadriv.xml
 share/mess/hash/megaduck.xml
 share/mess/hash/megapc.xml
+share/mess/hash/megatech.xml
 share/mess/hash/mpz80.xml
 share/mess/hash/msx.hsi
 share/mess/hash/msx1_cart.xml
 share/mess/hash/msx2.hsi
 share/mess/hash/msx2_cart.xml
+share/mess/hash/mz2000_cass.xml
+share/mess/hash/mz2000_flop.xml
 share/mess/hash/mz2500.xml
+share/mess/hash/mz700_cass.xml
 share/mess/hash/n64.xml
 share/mess/hash/neogeo.xml
 share/mess/hash/nes.hsi
@@ -165,6 +125,7 @@ share/mess/hash/pc88va.xml
 share/mess/hash/pc98.xml
 share/mess/hash/pce.xml
 share/mess/hash/pcecd.xml
+share/mess/hash/pcw.xml
 share/mess/hash/pico.xml
 share/mess/hash/pippin.xml
 share/mess/hash/pippin_flop.xml
@@ -176,6 +137,7 @@ share/mess/hash/psx.xml
 share/mess/hash/pv1000.xml
 share/mess/hash/pv2000.xml
 share/mess/hash/ql.xml
+share/mess/hash/ql_cass.xml
 share/mess/hash/rainbow.xml
 share/mess/hash/rx78.xml
 share/mess/hash/sage2.xml
@@ -183,6 +145,7 @@ share/mess/hash/sat_cart.xml
 share/mess/hash/saturn.xml
 share/mess/hash/scv.xml
 share/mess/hash/segacd.xml
+share/mess/hash/sf7000.xml
 share/mess/hash/sg1000.xml
 share/mess/hash/sgx.xml
 share/mess/hash/smc777.xml
@@ -193,6 +156,7 @@ share/mess/hash/sorcerer_cart.xml
 share/mess/hash/spectrum.xml
 share/mess/hash/st.xml
 share/mess/hash/studio2.xml
+share/mess/hash/stv.xml
 share/mess/hash/super6.xml
 share/mess/hash/supracan.xml
 share/mess/hash/svi318_cart.xml
@@ -200,6 +164,8 @@ share/mess/hash/svi318_cass.xml
 share/mess/hash/svi318_flop.xml
 share/mess/hash/svision.xml
 share/mess/hash/tandy200.xml
+share/mess/hash/tandy2k.xml
+share/mess/hash/tandy6k.xml
 share/mess/hash/tdv2324.xml
 share/mess/hash/tg16.xml
 share/mess/hash/ti99_cart.xml
@@ -219,8 +185,11 @@ share/mess/hash/vic1001_cart.xml
 share/mess/hash/vic1001_flop.xml
 share/mess/hash/vidbrain.xml
 share/mess/hash/vii.xml
+share/mess/hash/vip.xml
 share/mess/hash/vixen.xml
 share/mess/hash/vsmile.xml
+share/mess/hash/wangpc.xml
+share/mess/hash/wmbullet.xml
 share/mess/hash/wscolor.xml
 share/mess/hash/wswan.xml
 share/mess/hash/x07_card.xml
diff --git a/emulators/mess/distinfo b/emulators/mess/distinfo
index 486b21a5853..85d7d2959fd 100644
--- a/emulators/mess/distinfo
+++ b/emulators/mess/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.9 2012/06/01 20:00:41 wiz Exp $
+$NetBSD: distinfo,v 1.10 2012/10/07 22:04:46 wiz Exp $
 
-SHA1 (mess0146s.zip) = c859df9ed4c3894ccacf327c8af5bd8801e1cd15
-RMD160 (mess0146s.zip) = 20aafc92232be1cfa34952452bfdf4b61b7d4913
-Size (mess0146s.zip) = 62626787 bytes
+SHA1 (mame0147s.zip) = 023a5841389ae8d41db21704cffdeedb258591e9
+RMD160 (mame0147s.zip) = 708d29c9cdec21877e6222a2248f40e5630b7531
+Size (mame0147s.zip) = 32354285 bytes