4 files changed, 211 insertions, 22 deletions

diff --git a/emulators/mame/Makefile b/emulators/mame/Makefile
index 30b7c56ad1e0..2155920b457f 100644
--- a/emulators/mame/Makefile
+++ b/emulators/mame/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	sdlmame
-# Date created:				2007-01-10
-# Whom:					alepulver
-#
+# Created by: alepulver
 # $FreeBSD$
-#
 
 PORTNAME=	mame
-PORTVERSION=	0.146${PATCHSUFFIX}
+PORTVERSION=	0.147${PATCHSUFFIX}
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}.mirror/${PORTNAME:U}%20${PORTVERSION} \
 		http://mame.mirrors.zippykid.com/releases/ \
@@ -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
 
@@ -55,6 +51,14 @@ UPDATE_PATCHES!=	/usr/bin/jot -s " " \
 
 .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)" \
@@ -110,8 +114,8 @@ post-patch:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
 	@${MKDIR} ${PREFIX}/libexec/${PORTNAME}
-.for FILE in chdman jedutil ldresample ldverify romcmp testkeys unidasm
-	${INSTALL_PROGRAM} ${WRKSRC}/${FILE} ${PREFIX}/libexec/${PORTNAME}
+.for F in chdman jedutil ldresample ldverify romcmp testkeys unidasm
+	${INSTALL_PROGRAM} ${WRKSRC}/${F} ${PREFIX}/libexec/${PORTNAME}
 .endfor
 	@${MKDIR} ${DATADIR}
 	@(cd ${WRKSRC} && ${COPYTREE_SHARE} artwork ${DATADIR})
@@ -119,7 +123,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/mame/distinfo b/emulators/mame/distinfo
index 159e7261b6e7..52c89b1d1633 100644
--- a/emulators/mame/distinfo
+++ b/emulators/mame/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mame/mame0146s.zip) = d6a61febbafd73d084955e11e5e42378aef2202a81e7febe364c1602fd1846e9
-SIZE (mame/mame0146s.zip) = 20933242
+SHA256 (mame/mame0147s.zip) = 4567df6ff381248fdf6e731a87f784d242b17086a1e0dd46826fac29f9304d68
+SIZE (mame/mame0147s.zip) = 32354285
diff --git a/emulators/mame/pkg-descr b/emulators/mame/pkg-descr
index a1a6d88dfb3d..a8907f9e4cf7 100644
--- a/emulators/mame/pkg-descr
+++ b/emulators/mame/pkg-descr
@@ -1,9 +1,8 @@
-MAME stands for Multiple Arcade Machine Emulator.
-When used in conjunction with images of the original
-arcade game's ROM and disk data, MAME attempts to
-reproduce that game as faithfully as possible on a
-more modern general-purpose computer. MAME can currently
-emulate several thousand different classic arcade video
-games from the late 1970s through the modern era.
+MAME stands for Multiple Arcade Machine Emulator. When used in
+conjunction with images of the original arcade game's ROM and disk
+data, MAME attempts to reproduce that game as faithfully as possible
+on a more modern general-purpose computer. MAME can currently emulate
+several thousand different classic arcade video games from the late
+1970s through the modern era.
 
-WWW: http://mamedev.org
+WWW: http://mamedev.org/
diff --git a/emulators/mame/pkg-plist b/emulators/mame/pkg-plist
index 7c017b9cda75..5d994b11dde4 100644
--- a/emulators/mame/pkg-plist
+++ b/emulators/mame/pkg-plist
@@ -8,18 +8,205 @@ libexec/mame/testkeys
 libexec/mame/unidasm
 %%PORTDOCS%%%%DOCSDIR%%/docs/config.txt
 %%PORTDOCS%%%%DOCSDIR%%/docs/hlsl.txt
+%%PORTDOCS%%%%DOCSDIR%%/docs/imgtool.txt
 %%PORTDOCS%%%%DOCSDIR%%/docs/license.txt
 %%PORTDOCS%%%%DOCSDIR%%/docs/mame.txt
 %%PORTDOCS%%%%DOCSDIR%%/docs/newvideo.txt
+%%PORTDOCS%%%%DOCSDIR%%/docs/nscsi.txt
 %%PORTDOCS%%%%DOCSDIR%%/docs/windows.txt
-%%PORTDOCS%%%%DOCSDIR%%/whatsnew.txt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mame.ini
 %%DATADIR%%/artwork/aperture.png
 %%DATADIR%%/artwork/white.png
+%%DATADIR%%/hash/32x.xml
+%%DATADIR%%/hash/3do_m2.xml
+%%DATADIR%%/hash/a2600.xml
+%%DATADIR%%/hash/a2600_cass.xml
+%%DATADIR%%/hash/a5200.hsi
+%%DATADIR%%/hash/a5200.xml
+%%DATADIR%%/hash/a7800.xml
+%%DATADIR%%/hash/a800.xml
+%%DATADIR%%/hash/abc1600.xml
+%%DATADIR%%/hash/abc80.xml
+%%DATADIR%%/hash/abc800.xml
+%%DATADIR%%/hash/abc806.xml
+%%DATADIR%%/hash/advision.xml
+%%DATADIR%%/hash/alice32.xml
+%%DATADIR%%/hash/alice90.xml
+%%DATADIR%%/hash/apfm1000.xml
+%%DATADIR%%/hash/apple1.xml
+%%DATADIR%%/hash/apple2.xml
+%%DATADIR%%/hash/apple2gs.xml
+%%DATADIR%%/hash/aquarius.xml
+%%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
+%%DATADIR%%/hash/c128_rom.xml
+%%DATADIR%%/hash/c64_cart.xml
+%%DATADIR%%/hash/c64_flop.xml
+%%DATADIR%%/hash/casloopy.xml
+%%DATADIR%%/hash/cbm700_cart.xml
+%%DATADIR%%/hash/cd32.xml
+%%DATADIR%%/hash/cdi.xml
+%%DATADIR%%/hash/cdtv.xml
+%%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
+%%DATADIR%%/hash/fm7_disk.xml
+%%DATADIR%%/hash/gameboy.xml
+%%DATADIR%%/hash/gamecom.xml
+%%DATADIR%%/hash/gamegear.xml
+%%DATADIR%%/hash/gamepock.xml
+%%DATADIR%%/hash/gba.xml
+%%DATADIR%%/hash/gbcolor.xml
+%%DATADIR%%/hash/gmaster.xml
+%%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
+%%DATADIR%%/hash/intv.hsi
+%%DATADIR%%/hash/intv.xml
+%%DATADIR%%/hash/intvecs.xml
+%%DATADIR%%/hash/iq151_cart.xml
+%%DATADIR%%/hash/iq151_flop.xml
+%%DATADIR%%/hash/jaguar.xml
+%%DATADIR%%/hash/juicebox.xml
+%%DATADIR%%/hash/kc_cart.xml
+%%DATADIR%%/hash/kc_cass.xml
+%%DATADIR%%/hash/kc_flop.xml
+%%DATADIR%%/hash/lisa.xml
+%%DATADIR%%/hash/lisa2.xml
+%%DATADIR%%/hash/lynx.xml
+%%DATADIR%%/hash/m5.xml
+%%DATADIR%%/hash/mac_flop.xml
+%%DATADIR%%/hash/mac_hdd.xml
+%%DATADIR%%/hash/mbc55x.xml
+%%DATADIR%%/hash/megacd.xml
+%%DATADIR%%/hash/megacdj.xml
+%%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/nes.hsi
+%%DATADIR%%/hash/nes.xml
 %%DATADIR%%/hash/neogeo.xml
+%%DATADIR%%/hash/next.xml
+%%DATADIR%%/hash/ngp.xml
+%%DATADIR%%/hash/ngpc.xml
+%%DATADIR%%/hash/pasogo.xml
+%%DATADIR%%/hash/pb2000c.xml
+%%DATADIR%%/hash/pc1512.xml
+%%DATADIR%%/hash/pc1640.xml
+%%DATADIR%%/hash/pc8201.xml
+%%DATADIR%%/hash/pc8801_cass.xml
+%%DATADIR%%/hash/pc8801_flop.xml
+%%DATADIR%%/hash/pc88va.xml
+%%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
+%%DATADIR%%/hash/plus4_cart.xml
+%%DATADIR%%/hash/plus4_flop.xml
+%%DATADIR%%/hash/pokemini.xml
+%%DATADIR%%/hash/psion.xml
+%%DATADIR%%/hash/psx.xml
+%%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
+%%DATADIR%%/hash/sat_cart.xml
+%%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/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
+%%DATADIR%%/hash/svi318_cass.xml
+%%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
+%%DATADIR%%/hash/tiki100.xml
+%%DATADIR%%/hash/trs80m2.xml
+%%DATADIR%%/hash/trsm100.xml
+%%DATADIR%%/hash/tutor.xml
+%%DATADIR%%/hash/tvc_cart.xml
+%%DATADIR%%/hash/uzebox.xml
+%%DATADIR%%/hash/v1050.xml
+%%DATADIR%%/hash/vboy.xml
+%%DATADIR%%/hash/vc4000.xml
+%%DATADIR%%/hash/vectrex.xml
+%%DATADIR%%/hash/vg5k.xml
+%%DATADIR%%/hash/vic10.xml
+%%DATADIR%%/hash/vic1001_cart.xml
+%%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
+%%DATADIR%%/hash/x1_cass.xml
+%%DATADIR%%/hash/x1_flop.xml
+%%DATADIR%%/hash/x68k_flop.xml
+%%DATADIR%%/hash/xegs.xml
 %%DATADIR%%/keymaps/km-be.txt
 %%DATADIR%%/keymaps/km-ch.txt
 %%DATADIR%%/keymaps/km-de.txt