- Update to version 0.146

PR:		ports/168998
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

3 files changed, 27 insertions, 26 deletions

diff --git a/emulators/mame/Makefile b/emulators/mame/Makefile
index d563a3140794..30b7c56ad1e0 100644
--- a/emulators/mame/Makefile
+++ b/emulators/mame/Makefile
@@ -6,14 +6,13 @@
 #
 
 PORTNAME=	mame
-PORTVERSION=	0.145${PATCHSUFFIX}
+PORTVERSION=	0.146${PATCHSUFFIX}
 CATEGORIES=	emulators
-MASTER_SITES=	http://mame.mirrors.zippykid.com/releases/ \
+MASTER_SITES=	SF/${PORTNAME}.mirror/${PORTNAME:U}%20${PORTVERSION} \
+		http://mame.mirrors.zippykid.com/releases/ \
 		http://emumovies.com/aarongiles/releases/ \
-		http://mamedev.mameworld.info/releases/ \
-		http://mamedev.thiswebhost.com/releases/ \
 		http://mamedev.org/updates/:patchsets
-DISTNAME=	${PORTNAME}${PORTVERSION:S/.//:C/\.p[0-9]*$//}s
+DISTNAME=	${PORTNAME}${PORTVERSION:S/.//:C/p[0-9]*$//}s
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		${UPDATE_PATCHES:C/$/.zip:patchsets/}
 DIST_SUBDIR=	${PORTNAME}
@@ -21,15 +20,14 @@ DIST_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The popular MAME (Multi Arcade Machine Emulator)
 
-LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2 \
-		fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
+LIB_DEPENDS=	FLAC:${PORTSDIR}/audio/flac \
+		jpeg:${PORTSDIR}/graphics/jpeg \
+		expat:${PORTSDIR}/textproc/expat2 \
+		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
 RUN_DEPENDS=	liberation-fonts-ttf>=0:${PORTSDIR}/x11-fonts/liberation-fonts-ttf
 
-OPTIONS_DEFINE=	BUILTIN_DEBUGGER DOCS
-
-BUILTIN_DEBUGGER_DESCR=	Enable builtin debugger support
-
-ONLY_FOR_ARCHS=	i386 amd64
+OPTIONS_DEFINE=	BUILTIN_DEBUGGER DEBUG DOCS EXAMPLES
+BUILTIN_DEBUGGER_DESC=	Enable builtin debugger support
 
 NO_WRKSUBDIR=	yes
 
@@ -39,7 +37,8 @@ USE_GL=		gl
 USE_SDL=	sdl ttf
 USE_GCC=	4.6+
 USE_GMAKE=	yes
-MAKE_ENV=	NOWERROR=1 OPT_FLAGS="${CXXFLAGS}" GCC_LDFLAGS="${LDFLAGS}"
+MAKE_ENV=	NOWERROR=1 OPTIMIZE=0 USE_NETWORK=1 \
+		OPT_FLAGS="${CXXFLAGS}" GCC_LDFLAGS="${LDFLAGS}"
 MAKEFILE=	makefile
 MAKE_JOBS_SAFE=	yes
 
@@ -48,7 +47,7 @@ SUB_FILES=	pkg-message
 PATCHLEVEL=	# none
 
 .if defined(PATCHLEVEL) && ${PATCHLEVEL}
-PATCHSUFFIX=	.p${PATCHLEVEL}
+PATCHSUFFIX=	p${PATCHLEVEL}
 UPDATE_PATCHES!=	/usr/bin/jot -s " " \
 		-w ${PORTVERSION:S/.//:C/\.p[0-9]*$//}u%d_diff \
 		${PATCHLEVEL} 1 ${PATCHLEVEL}
@@ -68,10 +67,14 @@ MAKE_ENV+=	NO_DEBUGGER=1 \
 		GTK_LIBS=""
 .endif
 
+.if ${PORT_OPTIONS:MDEBUG}
+MAKE_ENV+=	DEBUG=1
+.endif
+
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "amd64"
-MAKE_ENV+=	PTR64=1
+.if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
+BROKEN=		Does not install on ia64, powerpc, or sparc64
 .endif
 
 post-extract:
@@ -90,21 +93,19 @@ post-patch:
 	@${REINPLACE_CMD} -e \
 		's|^BUILD_EXPAT|# BUILD_EXPAT| ; \
 		 s|^BUILD_ZLIB|# BUILD_ZLIB| ; \
-		 /--warn-common/s|= -Wl,|= $$(GCC_LDFLAGS) -Wl,| ; \
-		 /LDFLAGS/s|-s|| ; \
+		 s|^BUILD_FLAC|# BUILD_FLAC| ; \
+		 s|^BUILD_JPEGLIB|# BUILD_JPEGLIB| ; \
 		 s| = @gcc| := $$(CC)| ; \
 		 s| = @g++| := $$(CXX)| ; \
-		 s|^FULLNAME =.*|FULLNAME = $$(NAME)|' ${WRKSRC}/makefile
+		 s|^FULLNAME =.*|FULLNAME = $$(NAME)| ; \
+		 /--warn-common/s|= -Wl,|= $$(GCC_LDFLAGS) -Wl,| ; \
+		 /LDFLAGS/s|-s||' ${WRKSRC}/makefile
 	@${REINPLACE_CMD} -e \
 		'/-system/s|/usr/local/|${LOCALBASE}/| ; \
 		 /--cflags-only-I gtk+-2.0/s|=.*|= $$(GTK_INCPATH)| ; \
 		 /--cflags-only-other gtk+-2.0/s|=.*|= $$(GTK_CCOMFLAGS)| ; \
 		 /--libs gtk+-2.0/s|=.*|= $$(GTK_LIBS)| ; \
 		 /X11R6/s|^|#|' ${WRKSRC}/src/osd/sdl/sdl.mak
-	@${REINPLACE_CMD} -e \
-		's|int getc()|int getcf()|g' ${WRKSRC}/src/emu/fileio.h
-	@${REINPLACE_CMD} -e \
-		's|::getc()|::getcf()|g' ${WRKSRC}/src/emu/fileio.c
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
diff --git a/emulators/mame/distinfo b/emulators/mame/distinfo
index cf01a25016c0..159e7261b6e7 100644
--- a/emulators/mame/distinfo
+++ b/emulators/mame/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mame/mame0145s.zip) = a6a9a72cfd0eb83fb9748fb6cb69cd60df16283346a81ca3637552a283318b16
-SIZE (mame/mame0145s.zip) = 20346129
+SHA256 (mame/mame0146s.zip) = d6a61febbafd73d084955e11e5e42378aef2202a81e7febe364c1602fd1846e9
+SIZE (mame/mame0146s.zip) = 20933242
diff --git a/emulators/mame/pkg-plist b/emulators/mame/pkg-plist
index ada7abfeadd7..7c017b9cda75 100644
--- a/emulators/mame/pkg-plist
+++ b/emulators/mame/pkg-plist
@@ -12,7 +12,7 @@ libexec/mame/unidasm
 %%PORTDOCS%%%%DOCSDIR%%/docs/mame.txt
 %%PORTDOCS%%%%DOCSDIR%%/docs/newvideo.txt
 %%PORTDOCS%%%%DOCSDIR%%/docs/windows.txt
-%%PORTDOCS%%%%DOCSDIR%%/whatsnew_0145.txt
+%%PORTDOCS%%%%DOCSDIR%%/whatsnew.txt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/mame.ini
 %%DATADIR%%/artwork/aperture.png
 %%DATADIR%%/artwork/white.png