Date: Sun, 12 Feb 2012 02:51:12 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/164990: Update port: emulators/mame to 0.145 Message-ID: <20120212025112.c63c0c5d.tkato432@yahoo.com> Resent-Message-ID: <201202111810.q1BIADwA084680@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 164990
>Category: ports
>Synopsis: Update port: emulators/mame to 0.145
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sat Feb 11 18:10:13 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 7.4-RELEASE-p5 i386
>Organization:
>Environment:
>Description:
- Update to version 0.145
Remove file:
files/patch-makefile
files/sdl.mak.patch
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/emulators/mame/Makefile emulators/mame/Makefile
--- /usr/ports/emulators/mame/Makefile 2012-01-18 15:25:48.000000000 +0900
+++ emulators/mame/Makefile 2012-02-11 02:31:12.000000000 +0900
@@ -6,41 +6,44 @@
#
PORTNAME= mame
-PATCHLEVEL= 2
-PORTVERSION= 0.143${PATCHSUFFIX}
+PORTVERSION= 0.145${PATCHSUFFIX}
CATEGORIES= emulators
-MASTER_SITES= http://mame.mirrors.zippykid.com/releases/:src \
- http://emumovies.com/aarongiles/releases/:src \
- http://mamedev.mameworld.info/releases/:src \
- http://mamedev.thiswebhost.com/releases/:src \
- ftp://ftp.arcadebsd.org/pub/ArcadeBSD/ports/distfiles/:src \
+MASTER_SITES= 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
-DISTFILES= \
- ${PORTNAME}${PORTVERSION:S/.//:C/\.p[0-9]*$//}s${EXTRACT_SUFX}:src \
- ${UPDATE_PATCHES:C/$/.zip:patchsets/}
+DISTNAME= ${PORTNAME}${PORTVERSION:S/.//:C/\.p[0-9]*$//}s
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
+ ${UPDATE_PATCHES:C/$/.zip:patchsets/}
DIST_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= The popular MAME (Multi Arcade Machine Emulator)
-LIB_DEPENDS= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
+LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 \
+ fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
+RUN_DEPENDS= liberation-fonts-ttf>=0:${PORTSDIR}/x11-fonts/liberation-fonts-ttf
+
+OPTIONS= BUILTIN_DEBUGGER "Enable builtin debugger support" off
+
+ONLY_FOR_ARCHS= i386 amd64
-USE_ZIP= yes
NO_WRKSUBDIR= yes
-USE_XORG= xext xrender xinerama xi
+
+USE_ZIP= yes
+USE_XORG= xext xi xinerama xrender
USE_GL= gl
-USE_GNOME?= gtk20 gconf2
-USE_GMAKE= yes
-MAKE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}"
USE_SDL= sdl ttf
-USE_GCC= 4.2+
+USE_GCC= 4.4+
+USE_GMAKE= yes
+MAKE_ENV= NOWERROR=1 OPT_FLAGS="${CXXFLAGS}" GCC_LDFLAGS="${LDFLAGS}"
MAKEFILE= makefile
-ONLY_FOR_ARCHS= i386 amd64
+MAKE_JOBS_SAFE= yes
+
SUB_FILES= pkg-message
-USE_DOS2UNIX= makefile sdl.mak debugcpu.c *.c *.h
-PORTDOCS= *
-PORTEXAMPLES= *
+PATCHLEVEL= # none
.if defined(PATCHLEVEL) && ${PATCHLEVEL}
PATCHSUFFIX= .p${PATCHLEVEL}
@@ -49,23 +52,25 @@
${PATCHLEVEL} 1 ${PATCHLEVEL}
.endif
-OPTIONS= DEBUG "Build mame debugger" off
+.include <bsd.port.options.mk>
-.include <bsd.port.pre.mk>
-
-.if !defined(WITH_DEBUG)
-USE_GNOME= #
-EXTRA_PATCHES+= ${PATCHDIR}/sdl.mak.patch
+.if defined(WITH_BUILTIN_DEBUGGER)
+USE_GNOME= gtk20 gconf2
+MAKE_ENV+= GTK_INCPATH="$$(pkg-config --cflags-only-I gtk+-2.0 gconf-2.0)" \
+ GTK_CCOMFLAGS="$$(pkg-config --cflags-only-other gtk+-2.0 gconf-2.0)" \
+ GTK_LIBS="$$(pkg-config --libs gtk+-2.0 gconf-2.0)"
+.else
+MAKE_ENV+= NO_DEBUGGER=1 \
+ GTK_INCPATH="" \
+ GTK_CCOMFLAGS="" \
+ GTK_LIBS=""
.endif
-MAKE_JOBS_SAFE= yes
+.include <bsd.port.pre.mk>
.if ${ARCH} == "amd64"
MAKE_ENV+= PTR64=1
.endif
-.if ${ARCH} == "sparc64"
-BROKEN= Does not compile on sparc64
-.endif
post-extract:
@${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${WRKDIR}/mame.zip ${EXTRACT_AFTER_ARGS}
@@ -80,35 +85,43 @@
.endif
post-patch:
- @${REINPLACE_CMD} -e "s|ui.bdf|${DATADIR}/ui.bdf|g" ${WRKSRC}/src/emu/ui.c
- @${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
+ @${REINPLACE_CMD} -e \
+ 's|^BUILD_EXPAT|# BUILD_EXPAT| ; \
+ s|^BUILD_ZLIB|# BUILD_ZLIB| ; \
+ /--warn-common/s|= -Wl,|= $$(GCC_LDFLAGS) -Wl,| ; \
+ s| = @gcc| := $$(CC)| ; \
+ s| = @g++| := $$(CXX)| ; \
+ s|^FULLNAME =.*|FULLNAME = $$(NAME)|' ${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/
- ${MKDIR} ${PREFIX}/libexec/${PORTNAME}
- ${INSTALL_PROGRAM} ${WRKSRC}/chdman ${PREFIX}/libexec/${PORTNAME}
- ${INSTALL_PROGRAM} ${WRKSRC}/ldresample ${PREFIX}/libexec/${PORTNAME}
- ${INSTALL_PROGRAM} ${WRKSRC}/ldverify ${PREFIX}/libexec/${PORTNAME}
- ${INSTALL_PROGRAM} ${WRKSRC}/romcmp ${PREFIX}/libexec/${PORTNAME}
- ${INSTALL_PROGRAM} ${WRKSRC}/testkeys ${PREFIX}/libexec/${PORTNAME}
- ${INSTALL_PROGRAM} ${WRKSRC}/unidasm ${PREFIX}/libexec/${PORTNAME}
-
+ ${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}
+.endfor
+ @${MKDIR} ${DATADIR}
+ @(cd ${WRKSRC} && ${COPYTREE_SHARE} artwork ${DATADIR})
+ @(cd ${WRKSRC} && ${COPYTREE_SHARE} hash ${DATADIR})
+ @(cd ${WRKSRC}/src/osd/sdl && ${COPYTREE_SHARE} keymaps ${DATADIR})
.if !defined(NOPORTDOCS)
- ${MKDIR} ${DOCSDIR}
+ @${MKDIR} ${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/*.txt ${DOCSDIR}
- (cd ${WRKSRC}/ && ${COPYTREE_SHARE} docs ${DOCSDIR})
+ @(cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${DOCSDIR})
.endif
- ${MKDIR} ${DATADIR}
- (cd ${WRKSRC}/src/osd/sdl/ && ${COPYTREE_SHARE} keymaps ${DATADIR})
.if !defined(NOPORTEXAMPLES)
- ${MKDIR} ${EXAMPLESDIR}
+ @${MKDIR} ${EXAMPLESDIR}
${INSTALL_DATA} ${FILESDIR}/mame.ini ${EXAMPLESDIR}
.endif
-
-post-install:
- @${ECHO_CMD}
@${CAT} ${PKGMESSAGE}
- @${ECHO_CMD}
.include <bsd.port.post.mk>
diff -urN /usr/ports/emulators/mame/distinfo emulators/mame/distinfo
--- /usr/ports/emulators/mame/distinfo 2011-08-14 21:13:56.000000000 +0900
+++ emulators/mame/distinfo 2012-02-10 01:47:33.000000000 +0900
@@ -1,6 +1,2 @@
-SHA256 (mame/mame0143s.zip) = 677f04756ed7bc00e1adc6e68bbb174f89845887758dc287c7244a58e6ac266f
-SIZE (mame/mame0143s.zip) = 17902802
-SHA256 (mame/0143u1_diff.zip) = 307172c6956f58251590a5c30c454c99fbdf02ae554d0e3aaa0133fc9989eee8
-SIZE (mame/0143u1_diff.zip) = 250465
-SHA256 (mame/0143u2_diff.zip) = 4f6fa5961fe9fe99dfd6d315daf5280b2516ac96213b2a2c0fcf849c284db086
-SIZE (mame/0143u2_diff.zip) = 679992
+SHA256 (mame/mame0145s.zip) = a6a9a72cfd0eb83fb9748fb6cb69cd60df16283346a81ca3637552a283318b16
+SIZE (mame/mame0145s.zip) = 20346129
diff -urN /usr/ports/emulators/mame/files/mame.ini emulators/mame/files/mame.ini
--- /usr/ports/emulators/mame/files/mame.ini 2010-08-02 17:31:25.000000000 +0900
+++ emulators/mame/files/mame.ini 2012-02-11 03:03:19.000000000 +0900
@@ -10,11 +10,12 @@
# CORE SEARCH PATH OPTIONS
#
rompath $HOME/.mame/roms
+hashpath $HOME/.mame/hash;/usr/local/share/mame/hash/
samplepath $HOME/.mame/samples
-artpath $HOME/.mame/artwork
+artpath $HOME/.mame/artwork;/usr/local/share/mame/artwork/
ctrlrpath $HOME/.mame/ctrlr
inipath $HOME/.mame;.;ini
-fontpath $HOME/.mame/.
+fontpath $HOME/.mame/font;/usr/local/share/mame/
cheatpath $HOME/.mame/cheat
crosshairpath $HOME/.mame/crosshair
@@ -74,6 +75,8 @@
use_backdrops 1
use_overlays 1
use_bezels 1
+use_cpanels 1
+use_marquees 1
#
# CORE SCREEN OPTIONS
@@ -82,6 +85,7 @@
contrast 1.0
gamma 1.0
pause_brightness 0.65
+effect none
#
# CORE VECTOR OPTIONS
@@ -114,7 +118,8 @@
joystick_deadzone 0.3
joystick_saturation 0.85
natural 0
-uimodekey auto
+joystick_contradictory 0
+coin_impulse 0
#
# CORE INPUT AUTOMATIC ENABLE OPTIONS
@@ -144,11 +149,15 @@
bios
cheat 0
skip_gameinfo 0
+uifont default
+ramsize
+confirm_quit 0
#
# DEBUGGING OPTIONS
#
oslog 0
+watchdog 0
#
# PERFORMANCE OPTIONS
@@ -156,6 +165,7 @@
multithreading 0
numprocessors auto
sdlvideofps 0
+bench 0
#
# VIDEO OPTIONS
@@ -166,10 +176,10 @@
maximize 1
keepaspect 1
unevenstretch 1
-effect none
centerh 1
centerv 1
waitvsync 0
+syncrefresh 0
scalemode none
#
@@ -245,6 +255,7 @@
#
keymap 0
keymap_file keymap.dat
+uimodekey auto
#
# SDL JOYSTICK MAPPING
diff -urN /usr/ports/emulators/mame/files/patch-makefile emulators/mame/files/patch-makefile
--- /usr/ports/emulators/mame/files/patch-makefile 2010-08-02 17:31:25.000000000 +0900
+++ emulators/mame/files/patch-makefile 1970-01-01 09:00:00.000000000 +0900
@@ -1,22 +0,0 @@
---- makefile.orig 2010-07-30 10:42:41.000000000 +0200
-+++ makefile 2010-07-30 10:43:26.000000000 +0200
-@@ -295,8 +295,8 @@
-
- # compiler, linker and utilities
- AR = @ar
--CC = @gcc
--LD = @g++
-+CC:= @$(CC)
-+LD:= @$(CXX)
- MD = -mkdir$(EXE)
- RM = @rm -f
- OBJDUMP = @objdump
-@@ -344,7 +344,7 @@
- endif
-
- # fullname is prefix+name+suffix+suffix64+suffixdebug
--FULLNAME = $(PREFIX)$(PREFIXSDL)$(NAME)$(SUFFIX)$(SUFFIX64)$(SUFFIXDEBUG)$(SUFFIXPROFILE)
-+FULLNAME = $(NAME)
-
- # add an EXE suffix to get the final emulator name
- EMULATOR = $(FULLNAME)$(EXE)
diff -urN /usr/ports/emulators/mame/files/pkg-message.in emulators/mame/files/pkg-message.in
--- /usr/ports/emulators/mame/files/pkg-message.in 2010-05-18 19:25:02.000000000 +0900
+++ emulators/mame/files/pkg-message.in 2012-02-10 02:03:54.000000000 +0900
@@ -2,7 +2,8 @@
MAME has been installed.
-A example configuration file has been installed in "%%EXAMPLESDIR%%/mame.ini"
+A example configuration file has been installed in
+"%%EXAMPLESDIR%%/mame.ini"
Should you create a "~/.mame" directory and place it here or
launch "mame -createconfig" and place the mame.ini created instead.
diff -urN /usr/ports/emulators/mame/files/sdl.mak.patch emulators/mame/files/sdl.mak.patch
--- /usr/ports/emulators/mame/files/sdl.mak.patch 2011-08-14 21:13:56.000000000 +0900
+++ emulators/mame/files/sdl.mak.patch 1970-01-01 09:00:00.000000000 +0900
@@ -1,46 +0,0 @@
-$FreeBSD: ports/emulators/mame/files/sdl.mak.patch,v 1.6 2011/08/13 17:04:38 crees Exp $
-
-This is applied if WITH_DEBUG is unset.
-
---- src/osd/sdl/sdl.mak 2011-06-21 19:58:18.000000000 -0500
-+++ src/osd/sdl/sdl.mak 2011-06-21 20:01:07.000000000 -0500
-@@ -139,7 +139,7 @@
- ifeq ($(TARGETOS),freebsd)
- BASE_TARGETOS = unix
- SYNC_IMPLEMENTATION = tc
--DEFS += -DNO_AFFINITY_NP
-+DEFS += -DNO_AFFINITY_NP -DNO_DEBUGGER
- LIBS += -lutil
- # /usr/local/include is not considered a system include directory
- # on FreeBSD. GL.h resides there and throws warnings
-@@ -213,7 +213,7 @@
- ifndef GTK_INSTALL_ROOT
- NO_DEBUGGER = 1
- else
--DEBUGOBJS = $(SDLOBJ)/debugwin.o $(SDLOBJ)/dview.o $(SDLOBJ)/debug-sup.o $(SDLOBJ)/debug-intf.o
-+DEBUGOBJS = $(SDLOBJ)/debugwin.o
- LIBS += -lgtk-win32-2.0 -lgdk-win32-2.0 -lgmodule-2.0 -lglib-2.0 -lgobject-2.0 \
- -lpango-1.0 -latk-1.0 -lgdk_pixbuf-2.0
- CCOMFLAGS += -mms-bitfields
-@@ -315,7 +315,7 @@
- ifeq ($(BASE_TARGETOS),unix)
-
- DEFS += -DSDLMAME_UNIX
--DEBUGOBJS = $(SDLOBJ)/debugwin.o $(SDLOBJ)/dview.o $(SDLOBJ)/debug-sup.o $(SDLOBJ)/debug-intf.o
-+DEBUGOBJS = $(SDLOBJ)/debugwin.o
- LIBGL = -lGL
- ifeq ($(NO_X11),1)
- NO_DEBUGGER = 1
-@@ -484,9 +484,9 @@
-
- # the new debugger relies on GTK+ in addition to the base SDLMAME needs
- # Non-X11 builds can not use the debugger
--INCPATH += `pkg-config --cflags-only-I gtk+-2.0` `pkg-config --cflags-only-I gconf-2.0`
--CCOMFLAGS += `pkg-config --cflags-only-other gtk+-2.0` `pkg-config --cflags-only-other gconf-2.0`
--LIBS += `pkg-config --libs gtk+-2.0` `pkg-config --libs gconf-2.0`
-+#INCPATH += `pkg-config --cflags-only-I gtk+-2.0` `pkg-config --cflags-only-I gconf-2.0`
-+#CCOMFLAGS += `pkg-config --cflags-only-other gtk+-2.0` `pkg-config --cflags-only-other gconf-2.0`
-+#LIBS += `pkg-config --libs gtk+-2.0` `pkg-config --libs gconf-2.0`
- #CCOMFLAGS += -DGTK_DISABLE_DEPRECATED
-
- # some systems still put important things in a different prefix
diff -urN /usr/ports/emulators/mame/pkg-plist emulators/mame/pkg-plist
--- /usr/ports/emulators/mame/pkg-plist 2011-08-14 21:13:57.000000000 +0900
+++ emulators/mame/pkg-plist 2012-02-10 16:06:09.000000000 +0900
@@ -1,16 +1,36 @@
bin/mame
libexec/mame/chdman
+libexec/mame/jedutil
libexec/mame/ldresample
libexec/mame/ldverify
libexec/mame/romcmp
libexec/mame/testkeys
libexec/mame/unidasm
+%%PORTDOCS%%%%DOCSDIR%%/docs/config.txt
+%%PORTDOCS%%%%DOCSDIR%%/docs/hlsl.txt
+%%PORTDOCS%%%%DOCSDIR%%/docs/license.txt
+%%PORTDOCS%%%%DOCSDIR%%/docs/mame.txt
+%%PORTDOCS%%%%DOCSDIR%%/docs/newvideo.txt
+%%PORTDOCS%%%%DOCSDIR%%/docs/windows.txt
+%%PORTDOCS%%%%DOCSDIR%%/whatsnew_0145.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mame.ini
+%%DATADIR%%/artwork/aperture.png
+%%DATADIR%%/artwork/white.png
+%%DATADIR%%/hash/megatech.xml
+%%DATADIR%%/hash/neogeo.xml
+%%DATADIR%%/hash/softwarelist.dtd
+%%DATADIR%%/hash/stv.xml
%%DATADIR%%/keymaps/km-be.txt
%%DATADIR%%/keymaps/km-ch.txt
%%DATADIR%%/keymaps/km-de.txt
%%DATADIR%%/keymaps/km-fr-OSX.txt
%%DATADIR%%/keymaps/km-fr.txt
%%DATADIR%%/keymaps/km_it.txt
-@dirrm %%DATADIR%%/keymaps/
-@dirrm %%DATADIR%%/
+@dirrm %%DATADIR%%/keymaps
+@dirrm %%DATADIR%%/hash
+@dirrm %%DATADIR%%/artwork
+@dirrm %%DATADIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/docs
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm libexec/mame
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120212025112.c63c0c5d.tkato432>