Index: head/emulators/mame/Makefile =================================================================== --- head/emulators/mame/Makefile (revision 258589) +++ head/emulators/mame/Makefile (revision 258590) @@ -1,82 +1,82 @@ # New ports collection makefile for: sdlmame # Date created: 2007-01-10 # Whom: alepulver # # $FreeBSD$ # PORTNAME= mame -PORTVERSION= 0.138 +PORTVERSION= 0.139 CATEGORIES= emulators MASTER_SITES= http://www.aarongiles.com/mirror/releases/ \ ftp://ftp.arcadebsd.org/pub/ArcadeBSD/ports/distfiles/ DISTNAME= ${PORTNAME}${PORTVERSION:S/.//}s MAINTAINER= elbarto@ArcadeBSD.org COMMENT= The popular MAME (Multi Arcade Machine Emulator) USE_ZIP= yes NO_WRKSUBDIR= yes USE_XORG= xext xrender xinerama xi USE_GL= gl USE_GNOME?= gtk20 gconf2 USE_GMAKE= yes MAKE_ENV= PTHREAD_LIBS="${PTHREAD_LIBS}" USE_SDL= sdl USE_GCC= 4.2+ MAKEFILE= makefile ONLY_FOR_ARCHS= i386 amd64 SUB_FILES= pkg-message -USE_DOS2UNIX= makefile sdl.mak +USE_DOS2UNIX= makefile sdl.mak debugcpu.c OPTIONS= DEBUG "Build mame debugger" off .include .if !defined(WITH_DEBUG) USE_GNOME= # EXTRA_PATCHES+= ${FILESDIR}/sdl.mak.patch .endif MAKE_JOBS_SAFE= yes .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} @${RM} -f ${WRKDIR}/mame.zip post-patch: @${REINPLACE_CMD} -e "s|ui.bdf|${DATADIR}/ui.bdf|g" ${WRKSRC}/src/emu/ui.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} .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/*.txt ${DOCSDIR} ${CP} -R ${WRKSRC}/docs ${DOCSDIR} .endif ${MKDIR} ${DATADIR} ${CP} -R ${WRKSRC}/src/osd/sdl/keymaps ${DATADIR}/ ${MKDIR} ${EXAMPLESDIR} ${CP} ${FILESDIR}/mame.ini ${EXAMPLESDIR} post-install: @${ECHO_CMD} @${CAT} ${PKGMESSAGE} @${ECHO_CMD} .include Property changes on: head/emulators/mame/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.34 \ No newline at end of property +1.35 \ No newline at end of property Index: head/emulators/mame/distinfo =================================================================== --- head/emulators/mame/distinfo (revision 258589) +++ head/emulators/mame/distinfo (revision 258590) @@ -1,3 +1,3 @@ -MD5 (mame0138s.zip) = c0932c5456af79ad83ab0a2dd2219b2e -SHA256 (mame0138s.zip) = a80ee0b6d7c20743e35274d39129f313fb8756cfcb995c1cf95d5a81bdfabc2d -SIZE (mame0138s.zip) = 16446378 +MD5 (mame0139s.zip) = e9f81e86b786e0131eb6fb59e6bfe189 +SHA256 (mame0139s.zip) = e9dc268530b9a2b6fe17330af96dc5680dadba1b5e444bf7ef8fa1f15de7f3d6 +SIZE (mame0139s.zip) = 16706970 Property changes on: head/emulators/mame/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.20 \ No newline at end of property +1.21 \ No newline at end of property Index: head/emulators/mame/files/mame.ini =================================================================== --- head/emulators/mame/files/mame.ini (revision 258589) +++ head/emulators/mame/files/mame.ini (revision 258590) @@ -1,266 +1,267 @@  # # CORE CONFIGURATION OPTIONS # readconfig 1 +writeconfig 0 # # CORE SEARCH PATH OPTIONS # rompath $HOME/.mame/roms samplepath $HOME/.mame/samples artpath $HOME/.mame/artwork ctrlrpath $HOME/.mame/ctrlr inipath $HOME/.mame;.;ini fontpath $HOME/.mame/. cheatpath $HOME/.mame/cheat crosshairpath $HOME/.mame/crosshair # # CORE OUTPUT DIRECTORY OPTIONS # cfg_directory $HOME/.mame/cfg nvram_directory $HOME/.mame/nvram memcard_directory $HOME/.mame/memcard input_directory $HOME/.mame/inp state_directory $HOME/.mame/sta snapshot_directory $HOME/.mame/snap diff_directory $HOME/.mame/diff comment_directory $HOME/.mame/comments # # CORE STATE/PLAYBACK OPTIONS # state autosave 0 playback record mngwrite aviwrite wavwrite snapname %g/%i snapsize auto snapview internal burnin 0 # # CORE PERFORMANCE OPTIONS # autoframeskip 0 frameskip 0 seconds_to_run 0 throttle 1 sleep 1 speed 1.0 refreshspeed 0 # # CORE ROTATION OPTIONS # rotate 1 ror 0 rol 0 autoror 0 autorol 0 flipx 0 flipy 0 # # CORE ARTWORK OPTIONS # artwork_crop 0 use_backdrops 1 use_overlays 1 use_bezels 1 # # CORE SCREEN OPTIONS # brightness 1.0 contrast 1.0 gamma 1.0 pause_brightness 0.65 # # CORE VECTOR OPTIONS # antialias 1 beam 1.0 flicker 0 # # CORE SOUND OPTIONS # sound 1 samplerate 48000 samples 1 volume 0 # # CORE INPUT OPTIONS # coin_lockout 1 ctrlr mouse 0 joystick 1 lightgun 0 multikeyboard 0 multimouse 0 steadykey 0 offscreen_reload 0 joystick_map auto joystick_deadzone 0.3 joystick_saturation 0.85 natural 0 uimodekey auto # # CORE INPUT AUTOMATIC ENABLE OPTIONS # paddle_device keyboard adstick_device keyboard pedal_device keyboard dial_device keyboard trackball_device keyboard lightgun_device keyboard positional_device keyboard mouse_device mouse # # CORE DEBUGGING OPTIONS # log 0 verbose 0 update_in_pause 0 debug 0 debugscript debug_internal 0 # # CORE MISC OPTIONS # bios cheat 0 skip_gameinfo 0 # # DEBUGGING OPTIONS # oslog 0 # # PERFORMANCE OPTIONS # multithreading 0 numprocessors auto sdlvideofps 0 # # VIDEO OPTIONS # video soft numscreens 1 window 0 maximize 1 keepaspect 1 unevenstretch 1 effect none centerh 1 centerv 1 waitvsync 0 scalemode none # # OpenGL-SPECIFIC OPTIONS # filter 1 prescale 1 gl_forcepow2texture 0 gl_notexturerect 0 gl_vbo 1 gl_pbo 1 gl_glsl 0 gl_glsl_filter 1 glsl_shader_mame0 none glsl_shader_mame1 none glsl_shader_mame2 none glsl_shader_mame3 none glsl_shader_mame4 none glsl_shader_mame5 none glsl_shader_mame6 none glsl_shader_mame7 none glsl_shader_mame8 none glsl_shader_mame9 none glsl_shader_screen0 none glsl_shader_screen1 none glsl_shader_screen2 none glsl_shader_screen3 none glsl_shader_screen4 none glsl_shader_screen5 none glsl_shader_screen6 none glsl_shader_screen7 none glsl_shader_screen8 none glsl_shader_screen9 none gl_glsl_vid_attr 1 # # PER-WINDOW VIDEO OPTIONS # screen auto aspect auto resolution auto view auto screen0 auto aspect0 auto resolution0 auto view0 auto screen1 auto aspect1 auto resolution1 auto view1 auto screen2 auto aspect2 auto resolution2 auto view2 auto screen3 auto aspect3 auto resolution3 auto view3 auto # # FULL SCREEN OPTIONS # switchres 0 useallheads 0 # # SOUND OPTIONS # audio_latency 3 # # SDL KEYBOARD MAPPING # keymap 0 keymap_file keymap.dat # # SDL JOYSTICK MAPPING # joy_idx1 auto joy_idx2 auto joy_idx3 auto joy_idx4 auto joy_idx5 auto joy_idx6 auto joy_idx7 auto joy_idx8 auto sixaxis 0 # # SDL LOWLEVEL DRIVER OPTIONS # videodriver auto audiodriver auto gl_lib auto Property changes on: head/emulators/mame/files/mame.ini ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.3 \ No newline at end of property +1.4 \ No newline at end of property Index: head/emulators/mame/files/patch-debugcpu.c =================================================================== --- head/emulators/mame/files/patch-debugcpu.c (nonexistent) +++ head/emulators/mame/files/patch-debugcpu.c (revision 258590) @@ -0,0 +1,13 @@ +--- src/emu/debug/debugcpu.c.orig 2010-07-30 10:55:52.000000000 +0200 ++++ src/emu/debug/debugcpu.c 2010-07-30 10:56:13.000000000 +0200 +@@ -49,7 +49,9 @@ + #include "debugint/debugint.h" + #include "uiinput.h" + #include +- ++#ifdef __FreeBSD__ ++#undef tolower ++#endif + + + /*************************************************************************** Property changes on: head/emulators/mame/files/patch-debugcpu.c ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/emulators/mame/files/patch-makefile =================================================================== --- head/emulators/mame/files/patch-makefile (revision 258589) +++ head/emulators/mame/files/patch-makefile (revision 258590) @@ -1,22 +1,22 @@ ---- makefile.orig 2010-05-18 09:19:49.000000000 +0200 -+++ makefile 2010-05-18 09:21:03.000000000 +0200 -@@ -281,8 +281,8 @@ +--- 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 - -@@ -329,7 +329,7 @@ + OBJDUMP = @objdump +@@ -344,7 +344,7 @@ endif # fullname is prefix+name+suffix+suffix64+suffixdebug --FULLNAME = $(PREFIX)$(PREFIXSDL)$(NAME)$(SUFFIX)$(SUFFIX64)$(SUFFIXDEBUG)$(SUFFIXGPROF) +-FULLNAME = $(PREFIX)$(PREFIXSDL)$(NAME)$(SUFFIX)$(SUFFIX64)$(SUFFIXDEBUG)$(SUFFIXPROFILE) +FULLNAME = $(NAME) # add an EXE suffix to get the final emulator name EMULATOR = $(FULLNAME)$(EXE) Property changes on: head/emulators/mame/files/patch-makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.14 \ No newline at end of property +1.15 \ No newline at end of property Index: head/emulators/mame/files/sdl.mak.patch =================================================================== --- head/emulators/mame/files/sdl.mak.patch (revision 258589) +++ head/emulators/mame/files/sdl.mak.patch (revision 258590) @@ -1,31 +1,40 @@ ---- src/osd/sdl/sdl.mak.orig 2010-03-24 00:15:07.000000000 +0100 -+++ src/osd/sdl/sdl.mak 2010-03-24 00:17:26.000000000 +0100 +--- src/osd/sdl/sdl.mak.orig 2010-02-14 04:47:30.000000000 +0100 ++++ src/osd/sdl/sdl.mak 2010-07-30 12:05:33.000000000 +0200 @@ -139,7 +139,7 @@ ifeq ($(TARGETOS),freebsd) BASE_TARGETOS = unix SYNC_IMPLEMENTATION = tc -DEFS += -DNO_AFFINITY_NP +DEFS += -DNO_AFFINITY_NP -DNO_DEBUGGER # /usr/local/include is not considered a system include directory # on FreeBSD. GL.h resides there and throws warnings CCOMFLAGS += -isystem /usr/local/include +@@ -205,7 +205,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 \ @@ -304,7 +304,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 @@ -454,8 +454,8 @@ # the new debugger relies on GTK+ in addition to the base SDLMAME needs # Non-X11 builds can not use the debugger -CCOMFLAGS += `pkg-config --cflags gtk+-2.0` `pkg-config --cflags gconf-2.0` -LIBS += `pkg-config --libs gtk+-2.0` `pkg-config --libs gconf-2.0` +#CCOMFLAGS += `pkg-config --cflags gtk+-2.0` `pkg-config --cflags 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 Property changes on: head/emulators/mame/files/sdl.mak.patch ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.4 \ No newline at end of property +1.5 \ No newline at end of property