3 files changed, 49 insertions, 77 deletions

diff --git a/emulators/mess/Makefile b/emulators/mess/Makefile
index 9b1ac55e39a7..5ae62681e352 100644
--- a/emulators/mess/Makefile
+++ b/emulators/mess/Makefile
@@ -1,20 +1,16 @@
-# New ports collection makefile for:	sdlmess
-# Date created:				2007-01-10
-# Whom:					alepulver
-#
+# Created by: alepulver
 # $FreeBSD$
-#
 
 PORTNAME=	mess
-PORTVERSION=	0.146${PATCHSUFFIX}
+PORTVERSION=	0.147${PATCHSUFFIX}
 CATEGORIES=	emulators
-#MASTER_SITES=	http://www.mess.org/_media/downloads:/
-MASTER_SITES=	http://ompldr.org/vZHV6ag/ \
-		http://distfiles.exherbo.org/distfiles/ \
-		http://www.umich.edu/~archive/apollo/
-DISTNAME=	${PORTNAME}${PORTVERSION:S/.//:C/p[0-9]*$//}s
+MASTER_SITES=	SF/mame.mirror/MAME%20${PORTVERSION} \
+		http://mame.mirrors.zippykid.com/releases/ \
+		http://emumovies.com/aarongiles/releases/ \
+		http://mamedev.org/updates/:patchsets
+DISTNAME=	mame${PORTVERSION:S/.//:C/p[0-9]*$//}s
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		${UPDATE_PATCHES:C/$/.zip/}
+		${UPDATE_PATCHES:C/$/.zip:patchsets/}
 DIST_SUBDIR=	mame
 
 MAINTAINER=	ports@FreeBSD.org
@@ -35,10 +31,10 @@ USE_ZIP=	yes
 USE_XORG=	xext xi xinerama xrender
 USE_GL=		gl
 USE_SDL=	sdl ttf
-USE_GCC=	4.6+
 USE_GMAKE=	yes
 MAKE_ENV=	NOWERROR=1 OPTIMIZE=0 USE_NETWORK=1 \
-		OPT_FLAGS="${CXXFLAGS}" GCC_LDFLAGS="${LDFLAGS}"
+		OPT_FLAGS="${CXXFLAGS}" GCC_LDFLAGS="${LDFLAGS}" \
+		TARGET="${PORTNAME}"
 MAKEFILE=	makefile
 MAKE_JOBS_SAFE=	yes
 
@@ -49,12 +45,20 @@ PATCHLEVEL=	# none
 .if defined(PATCHLEVEL) && ${PATCHLEVEL}
 PATCHSUFFIX=	p${PATCHLEVEL}
 UPDATE_PATCHES!=	/usr/bin/jot -s " " \
-		-w ${PORTNAME}${PORTVERSION:S/.//:C/\.p[0-9]*$//}u%d_diff \
+		-w ${PORTVERSION:S/.//:C/\.p[0-9]*$//}u%d_diff \
 		${PATCHLEVEL} 1 ${PATCHLEVEL}
 .endif
 
 .include <bsd.port.options.mk>
 
+.if exists(/usr/bin/clang) && ${OSVERSION} >= 900014
+CC=		/usr/bin/clang
+CPP=		/usr/bin/clang-cpp
+CXX=		/usr/bin/clang++
+.else
+USE_GCC=	4.6+
+.endif
+
 .if ${PORT_OPTIONS:MBUILTIN_DEBUGGER}
 USE_GNOME=	gtk20 gconf2
 MAKE_ENV+=	GTK_INCPATH="$$(pkg-config --cflags-only-I gtk+-2.0 gconf-2.0)" \
@@ -78,6 +82,8 @@ BROKEN=		Does not install on ia64, powerpc, or sparc64
 .endif
 
 post-extract:
+	@${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${WRKDIR}/mame.zip ${EXTRACT_AFTER_ARGS}
+	@${RM} -f ${WRKDIR}/mame.zip
 # Use post-extract target to get in before dos2unix-isation
 .if defined(UPDATE_PATCHES)
 . for patch in ${UPDATE_PATCHES:S/_/./}
@@ -108,9 +114,9 @@ post-patch:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
 	@${MKDIR} ${PREFIX}/libexec/${PORTNAME}
-.for FILE in castool chdman imgtool jedutil ldresample ldverify romcmp \
+.for F in castool chdman imgtool jedutil ldresample ldverify romcmp \
 	testkeys unidasm
-	${INSTALL_PROGRAM} ${WRKSRC}/${FILE} ${PREFIX}/libexec/${PORTNAME}
+	${INSTALL_PROGRAM} ${WRKSRC}/${F} ${PREFIX}/libexec/${PORTNAME}
 .endfor
 	@${MKDIR} ${DATADIR}
 	@(cd ${WRKSRC} && ${COPYTREE_SHARE} artwork ${DATADIR})
@@ -118,7 +124,6 @@ do-install:
 	@(cd ${WRKSRC}/src/osd/sdl && ${COPYTREE_SHARE} keymaps ${DATADIR})
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/*.txt ${DOCSDIR}
 	@(cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${DOCSDIR})
 .endif
 .if ${PORT_OPTIONS:MEXAMPLES}
diff --git a/emulators/mess/distinfo b/emulators/mess/distinfo
index 330e9f6d7503..52c89b1d1633 100644
--- a/emulators/mess/distinfo
+++ b/emulators/mess/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mame/mess0146s.zip) = bdebfdcdef8f4d7a6e87ff80af00446a68d374c7f279fe8b5a63cf87f2b7ee28
-SIZE (mame/mess0146s.zip) = 62626787
+SHA256 (mame/mame0147s.zip) = 4567df6ff381248fdf6e731a87f784d242b17086a1e0dd46826fac29f9304d68
+SIZE (mame/mame0147s.zip) = 32354285
diff --git a/emulators/mess/pkg-plist b/emulators/mess/pkg-plist
index 8cf0e31a0eb3..e03fd492ac91 100644
--- a/emulators/mess/pkg-plist
+++ b/emulators/mess/pkg-plist
@@ -8,70 +8,16 @@ libexec/mess/ldverify
 libexec/mess/romcmp
 libexec/mess/testkeys
 libexec/mess/unidasm
-%%PORTDOCS%%%%DOCSDIR%%/docs/compiling.htm
 %%PORTDOCS%%%%DOCSDIR%%/docs/config.txt
-%%PORTDOCS%%%%DOCSDIR%%/docs/credits.htm
-%%PORTDOCS%%%%DOCSDIR%%/docs/faq.htm
 %%PORTDOCS%%%%DOCSDIR%%/docs/hlsl.txt
-%%PORTDOCS%%%%DOCSDIR%%/docs/howto.htm
 %%PORTDOCS%%%%DOCSDIR%%/docs/imgtool.txt
 %%PORTDOCS%%%%DOCSDIR%%/docs/license.txt
 %%PORTDOCS%%%%DOCSDIR%%/docs/mame.txt
-%%PORTDOCS%%%%DOCSDIR%%/docs/messnew.txt
 %%PORTDOCS%%%%DOCSDIR%%/docs/newvideo.txt
+%%PORTDOCS%%%%DOCSDIR%%/docs/nscsi.txt
 %%PORTDOCS%%%%DOCSDIR%%/docs/windows.txt
-%%PORTDOCS%%%%DOCSDIR%%/whatsnew.txt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mess.ini
-%%DATADIR%%/artwork/4004clk.zip
-%%DATADIR%%/artwork/academy.zip
-%%DATADIR%%/artwork/aim65.zip
-%%DATADIR%%/artwork/alm16.zip
-%%DATADIR%%/artwork/alm32.zip
-%%DATADIR%%/artwork/amsterd.zip
 %%DATADIR%%/artwork/aperture.png
-%%DATADIR%%/artwork/avigo.zip
-%%DATADIR%%/artwork/berlinp.zip
-%%DATADIR%%/artwork/bpl32.zip
-%%DATADIR%%/artwork/ccmk1.zip
-%%DATADIR%%/artwork/ccmk2.zip
-%%DATADIR%%/artwork/dallas16.zip
-%%DATADIR%%/artwork/gen32.zip
-%%DATADIR%%/artwork/gen32_41.zip
-%%DATADIR%%/artwork/gen32_oc.zip
-%%DATADIR%%/artwork/glasgow.zip
-%%DATADIR%%/artwork/hp48g.zip
-%%DATADIR%%/artwork/hp48gp.zip
-%%DATADIR%%/artwork/hp48gx.zip
-%%DATADIR%%/artwork/hp48s.zip
-%%DATADIR%%/artwork/hp48sx.zip
-%%DATADIR%%/artwork/junior.zip
-%%DATADIR%%/artwork/kim1.zip
-%%DATADIR%%/artwork/lond020.zip
-%%DATADIR%%/artwork/lond030.zip
-%%DATADIR%%/artwork/lyon16.zip
-%%DATADIR%%/artwork/lyon32.zip
-%%DATADIR%%/artwork/milano.zip
-%%DATADIR%%/artwork/mm4.zip
-%%DATADIR%%/artwork/mo5.zip
-%%DATADIR%%/artwork/mo5nr.zip
-%%DATADIR%%/artwork/mo6.zip
-%%DATADIR%%/artwork/monteciv.zip
-%%DATADIR%%/artwork/mpf1.zip
-%%DATADIR%%/artwork/mpf1b.zip
-%%DATADIR%%/artwork/pc1401.zip
-%%DATADIR%%/artwork/pc1402.zip
-%%DATADIR%%/artwork/pc1403.zip
-%%DATADIR%%/artwork/polgar.zip
-%%DATADIR%%/artwork/sexpertc.zip
-%%DATADIR%%/artwork/ssystem3.zip
-%%DATADIR%%/artwork/supercon.zip
-%%DATADIR%%/artwork/to7.zip
-%%DATADIR%%/artwork/to770.zip
-%%DATADIR%%/artwork/to8.zip
-%%DATADIR%%/artwork/to9.zip
-%%DATADIR%%/artwork/to9p.zip
-%%DATADIR%%/artwork/van16.zip
-%%DATADIR%%/artwork/van32.zip
 %%DATADIR%%/artwork/white.png
 %%DATADIR%%/hash/32x.xml
 %%DATADIR%%/hash/3do_m2.xml
@@ -96,7 +42,12 @@ libexec/mess/unidasm
 %%DATADIR%%/hash/arcadia.xml
 %%DATADIR%%/hash/astrocde.xml
 %%DATADIR%%/hash/atom.xml
+%%DATADIR%%/hash/bbca_cass.xml
+%%DATADIR%%/hash/bbcb_cass.xml
 %%DATADIR%%/hash/bbcbc.xml
+%%DATADIR%%/hash/bbcm_cart.xml
+%%DATADIR%%/hash/bbcm_cass.xml
+%%DATADIR%%/hash/bw12.xml
 %%DATADIR%%/hash/bw2.xml
 %%DATADIR%%/hash/c128_cart.xml
 %%DATADIR%%/hash/c128_flop.xml
@@ -111,11 +62,13 @@ libexec/mess/unidasm
 %%DATADIR%%/hash/channelf.xml
 %%DATADIR%%/hash/coco_cart.xml
 %%DATADIR%%/hash/coleco.xml
+%%DATADIR%%/hash/compis.xml
 %%DATADIR%%/hash/cpc_cass.xml
 %%DATADIR%%/hash/cpc_flop.xml
 %%DATADIR%%/hash/crvision.xml
 %%DATADIR%%/hash/dim68k.xml
 %%DATADIR%%/hash/einstein.xml
+%%DATADIR%%/hash/electron_cart.xml
 %%DATADIR%%/hash/famicom_flop.xml
 %%DATADIR%%/hash/fm77av.xml
 %%DATADIR%%/hash/fm7_cass.xml
@@ -130,6 +83,7 @@ libexec/mess/unidasm
 %%DATADIR%%/hash/gx4000.xml
 %%DATADIR%%/hash/ibm5140.xml
 %%DATADIR%%/hash/ibm5150.xml
+%%DATADIR%%/hash/ibm5150_cass.xml
 %%DATADIR%%/hash/ibm5170.xml
 %%DATADIR%%/hash/ibmpcjr_cart.xml
 %%DATADIR%%/hash/ibmpcjr_flop.xml
@@ -155,16 +109,20 @@ libexec/mess/unidasm
 %%DATADIR%%/hash/megadriv.xml
 %%DATADIR%%/hash/megaduck.xml
 %%DATADIR%%/hash/megapc.xml
+%%DATADIR%%/hash/megatech.xml
 %%DATADIR%%/hash/mpz80.xml
 %%DATADIR%%/hash/msx.hsi
 %%DATADIR%%/hash/msx1_cart.xml
 %%DATADIR%%/hash/msx2.hsi
 %%DATADIR%%/hash/msx2_cart.xml
+%%DATADIR%%/hash/mz2000_cass.xml
+%%DATADIR%%/hash/mz2000_flop.xml
 %%DATADIR%%/hash/mz2500.xml
+%%DATADIR%%/hash/mz700_cass.xml
 %%DATADIR%%/hash/n64.xml
-%%DATADIR%%/hash/neogeo.xml
 %%DATADIR%%/hash/nes.hsi
 %%DATADIR%%/hash/nes.xml
+%%DATADIR%%/hash/neogeo.xml
 %%DATADIR%%/hash/next.xml
 %%DATADIR%%/hash/ngp.xml
 %%DATADIR%%/hash/ngpc.xml
@@ -179,6 +137,7 @@ libexec/mess/unidasm
 %%DATADIR%%/hash/pc98.xml
 %%DATADIR%%/hash/pce.xml
 %%DATADIR%%/hash/pcecd.xml
+%%DATADIR%%/hash/pcw.xml
 %%DATADIR%%/hash/pico.xml
 %%DATADIR%%/hash/pippin.xml
 %%DATADIR%%/hash/pippin_flop.xml
@@ -190,6 +149,7 @@ libexec/mess/unidasm
 %%DATADIR%%/hash/pv1000.xml
 %%DATADIR%%/hash/pv2000.xml
 %%DATADIR%%/hash/ql.xml
+%%DATADIR%%/hash/ql_cass.xml
 %%DATADIR%%/hash/rainbow.xml
 %%DATADIR%%/hash/rx78.xml
 %%DATADIR%%/hash/sage2.xml
@@ -197,16 +157,18 @@ libexec/mess/unidasm
 %%DATADIR%%/hash/saturn.xml
 %%DATADIR%%/hash/scv.xml
 %%DATADIR%%/hash/segacd.xml
+%%DATADIR%%/hash/sf7000.xml
 %%DATADIR%%/hash/sg1000.xml
 %%DATADIR%%/hash/sgx.xml
 %%DATADIR%%/hash/smc777.xml
 %%DATADIR%%/hash/sms.xml
 %%DATADIR%%/hash/snes.xml
-%%DATADIR%%/hash/softwarelist.dtd
 %%DATADIR%%/hash/sorcerer_cart.xml
+%%DATADIR%%/hash/softwarelist.dtd
 %%DATADIR%%/hash/spectrum.xml
 %%DATADIR%%/hash/st.xml
 %%DATADIR%%/hash/studio2.xml
+%%DATADIR%%/hash/stv.xml
 %%DATADIR%%/hash/super6.xml
 %%DATADIR%%/hash/supracan.xml
 %%DATADIR%%/hash/svi318_cart.xml
@@ -214,6 +176,8 @@ libexec/mess/unidasm
 %%DATADIR%%/hash/svi318_flop.xml
 %%DATADIR%%/hash/svision.xml
 %%DATADIR%%/hash/tandy200.xml
+%%DATADIR%%/hash/tandy2k.xml
+%%DATADIR%%/hash/tandy6k.xml
 %%DATADIR%%/hash/tdv2324.xml
 %%DATADIR%%/hash/tg16.xml
 %%DATADIR%%/hash/ti99_cart.xml
@@ -233,8 +197,11 @@ libexec/mess/unidasm
 %%DATADIR%%/hash/vic1001_flop.xml
 %%DATADIR%%/hash/vidbrain.xml
 %%DATADIR%%/hash/vii.xml
+%%DATADIR%%/hash/vip.xml
 %%DATADIR%%/hash/vixen.xml
 %%DATADIR%%/hash/vsmile.xml
+%%DATADIR%%/hash/wangpc.xml
+%%DATADIR%%/hash/wmbullet.xml
 %%DATADIR%%/hash/wscolor.xml
 %%DATADIR%%/hash/wswan.xml
 %%DATADIR%%/hash/x07_card.xml