From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Sep 27 01:10:08 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 597BB1065672 for ; Mon, 27 Sep 2010 01:10:08 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 1A12D8FC0C for ; Mon, 27 Sep 2010 01:10:08 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id o8R1A7T0057046 for ; Mon, 27 Sep 2010 01:10:07 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o8R1A7WC057044; Mon, 27 Sep 2010 01:10:07 GMT (envelope-from gnats) Resent-Date: Mon, 27 Sep 2010 01:10:07 GMT Resent-Message-Id: <201009270110.o8R1A7WC057044@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Emmanuel Vadot Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D7E9B106564A for ; Mon, 27 Sep 2010 01:02:56 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id C44278FC14 for ; Mon, 27 Sep 2010 01:02:56 +0000 (UTC) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o8R12uuK079052 for ; Mon, 27 Sep 2010 01:02:56 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id o8R12uYJ079050; Mon, 27 Sep 2010 01:02:56 GMT (envelope-from nobody) Message-Id: <201009270102.o8R12uYJ079050@www.freebsd.org> Date: Mon, 27 Sep 2010 01:02:56 GMT From: Emmanuel Vadot To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/150978: Update ports: emulators/sdlmame-devel update to 0.139u3 and rename to emulators/mame-devel X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Sep 2010 01:10:08 -0000 >Number: 150978 >Category: ports >Synopsis: Update ports: emulators/sdlmame-devel update to 0.139u3 and rename to emulators/mame-devel >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Sep 27 01:10:07 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Emmanuel Vadot >Release: 8.1-STABLE-i386 >Organization: ArcadeBSD >Environment: FreeBSD emeraldas 8.1-STABLE FreeBSD 8.1-STABLE #1: Thu Sep 23 02:06:19 CEST 2010 root@emeraldas:/usr/obj/usr/src/sys/emeraldas i386 >Description: Update port to 0.139u3 Move port to emulators/mame-devel as sdlmame have been moved to emulators/mame >How-To-Repeat: >Fix: Patch attached with submission follows: diff -uNr /usr/ports/emulators/sdlmame-devel/Makefile mame-devel/Makefile --- /usr/ports/emulators/sdlmame-devel/Makefile 2010-06-02 18:29:41.000000000 +0200 +++ mame-devel/Makefile 2010-09-27 02:53:58.000000000 +0200 @@ -5,37 +5,39 @@ # $FreeBSD: ports/emulators/sdlmame-devel/Makefile,v 1.37 2010/05/22 16:42:31 makc Exp $ # -PORTNAME= sdlmame-devel -PORTVERSION= 0.135u3 +PORTNAME= mame-devel +MAMEREL= 0.139 +MAMEUREL= u3 +PORTVERSION= ${MAMEREL}${MAMEUREL} CATEGORIES= emulators -MASTER_SITES= ftp://ftp.arcadebsd.org/pub/ArcadeBSD/ports/distfiles/ \ - http://rbelmont.mameworld.info/ -DISTNAME= sdlmame${PORTVERSION:S/.//} +MASTER_SITES= http://www.aarongiles.com/mirror/releases/ +PATCH_SITES= http://mamedev.org/updates/ +DISTFILES= ${PORTNAME:S/-devel//}${MAMEREL:S/.//}s.zip +PATCHFILES!= /usr/bin/jot -w ${MAMEREL:S/.//}u%d_diff.zip ${MAMEUREL:S/u//} MAINTAINER= elbarto@ArcadeBSD.org COMMENT= SDL port of the popular MAME (Multi Arcade Machine Emulator) -FETCH_ENV= HTTP_USER_AGENT=defined 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.4+ MAKEFILE= makefile ONLY_FOR_ARCHS= i386 amd64 SUB_FILES= pkg-message OPTIONS= DEBUG "Build sdlmame debugger" off -IGNORE= outdated, use emulators/mame - .include .if !defined(WITH_DEBUG) USE_GNOME= # -EXTRA_PATCHES+= ${FILESDIR}/sdl.mak.patch +#EXTRA_PATCHES+= ${FILESDIR}/sdl.mak.patch .endif MAKE_JOBS_SAFE= yes @@ -47,8 +49,12 @@ 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 +# @${REINPLACE_CMD} -e "s|ui.bdf|${DATADIR}/ui.bdf|g" ${WRKSRC}/src/emu/ui.c do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/ @@ -63,8 +69,7 @@ ${CP} -R ${WRKSRC}/docs ${DOCSDIR} .endif ${MKDIR} ${DATADIR} - ${CP} ${WRKSRC}/ui.bdf ${DATADIR}/ - ${CP} -R ${WRKSRC}/keymaps ${DATADIR}/ + ${CP} -R ${WRKSRC}/src/osd/sdl/keymaps ${DATADIR}/ ${MKDIR} ${EXAMPLESDIR} ${CP} ${FILESDIR}/mame.ini ${EXAMPLESDIR} diff -uNr /usr/ports/emulators/sdlmame-devel/distinfo mame-devel/distinfo --- /usr/ports/emulators/sdlmame-devel/distinfo 2009-12-23 00:37:28.000000000 +0100 +++ mame-devel/distinfo 2010-09-27 01:37:42.000000000 +0200 @@ -1,3 +1,12 @@ -MD5 (sdlmame0135u3.zip) = e360aba6c81a1ec84035bf251c032b02 -SHA256 (sdlmame0135u3.zip) = 640ae16c6ab8443b183d7228a6903e7c81717b561eeacdf2e664d93a3f0af686 -SIZE (sdlmame0135u3.zip) = 18735041 +MD5 (mame0139s.zip) = e9f81e86b786e0131eb6fb59e6bfe189 +SHA256 (mame0139s.zip) = e9dc268530b9a2b6fe17330af96dc5680dadba1b5e444bf7ef8fa1f15de7f3d6 +SIZE (mame0139s.zip) = 16706970 +MD5 (0139u1_diff.zip) = 4abbeeef195864fb894163718ff49fec +SHA256 (0139u1_diff.zip) = 0c05912c3f16fc4d79024c6e702f9b03dcb7a91fd8be98910856d3bcb65788b5 +SIZE (0139u1_diff.zip) = 651444 +MD5 (0139u2_diff.zip) = bde35bfb22aab028fa730d9bb2c94aa0 +SHA256 (0139u2_diff.zip) = b7619ae96847aef45653e81a4b63c15af7e7e5bcc574fa1ee89dc80c413dd873 +SIZE (0139u2_diff.zip) = 679257 +MD5 (0139u3_diff.zip) = 6d0b700c69f56b9085ca382931d9a534 +SHA256 (0139u3_diff.zip) = 68b7b9e3f589f09b7676ee812e4490137677fcc37e88c2dc96fa54ef874ee414 +SIZE (0139u3_diff.zip) = 761786 diff -uNr /usr/ports/emulators/sdlmame-devel/files/mame.ini mame-devel/files/mame.ini --- /usr/ports/emulators/sdlmame-devel/files/mame.ini 2009-08-14 21:49:54.000000000 +0200 +++ mame-devel/files/mame.ini 2010-09-27 02:54:45.000000000 +0200 @@ -4,6 +4,7 @@ # CORE CONFIGURATION OPTIONS # readconfig 1 +writeconfig 0 # # CORE SEARCH PATH OPTIONS @@ -13,7 +14,7 @@ artpath $HOME/.mame-devel/artwork ctrlrpath $HOME/.mame-devel/ctrlr inipath $HOME/.mame-devel;.;ini -fontpath /usr/local/share/sdlmame-devel/ +fontpath $HOME/.mame-devel/. cheatpath $HOME/.mame-devel/cheat crosshairpath $HOME/.mame-devel/crosshair @@ -112,6 +113,8 @@ joystick_map auto joystick_deadzone 0.3 joystick_saturation 0.85 +natural 0 +uimodekey auto # # CORE INPUT AUTOMATIC ENABLE OPTIONS @@ -133,6 +136,7 @@ update_in_pause 0 debug 0 debugscript +debug_internal 0 # # CORE MISC OPTIONS @@ -150,6 +154,7 @@ # PERFORMANCE OPTIONS # multithreading 0 +numprocessors auto sdlvideofps 0 # diff -uNr /usr/ports/emulators/sdlmame-devel/files/patch-debugcpu.c mame-devel/files/patch-debugcpu.c --- /usr/ports/emulators/sdlmame-devel/files/patch-debugcpu.c 1970-01-01 01:00:00.000000000 +0100 +++ mame-devel/files/patch-debugcpu.c 2010-09-27 01:57:15.000000000 +0200 @@ -0,0 +1,13 @@ +--- src/emu/debug/debugcpu.c.orig 2010-09-27 01:56:32.000000000 +0200 ++++ src/emu/debug/debugcpu.c 2010-09-27 01:56:51.000000000 +0200 +@@ -51,7 +51,9 @@ + #include "xmlfile.h" + #include + #include +- ++#ifdef __FreeBSD__ ++# undef tolower ++#endif + + + /*************************************************************************** diff -uNr /usr/ports/emulators/sdlmame-devel/files/patch-makefile mame-devel/files/patch-makefile --- /usr/ports/emulators/sdlmame-devel/files/patch-makefile 2009-11-04 11:07:50.000000000 +0100 +++ mame-devel/files/patch-makefile 2010-09-27 02:27:19.000000000 +0200 @@ -1,67 +1,22 @@ ---- makefile.orig 2009-11-01 01:19:01.000000000 +0100 -+++ makefile 2009-11-01 01:21:41.000000000 +0100 -@@ -59,7 +59,7 @@ - ifeq ($(OSD),windows) - TARGETOS = win32 - else --TARGETOS = unix -+TARGETOS = freebsd - endif - endif - -@@ -73,7 +73,7 @@ - # PREFIX = - - # uncomment and specify suffix to be added to the name --# SUFFIX = -+SUFFIX = -devel - - - -@@ -197,8 +197,8 @@ - - # compiler, linker and utilities - AR = @ar --CC = @gcc --LD = @gcc -+CC := @$(CC) -+LD = @$(CC) - MD = -mkdir$(EXE) - RM = @rm -f - -@@ -227,7 +227,7 @@ - endif - - # fullname is prefix+name+suffix+debugsuffix --FULLNAME = $(PREFIX)$(NAME)$(CPPSUFFIX)$(SUFFIX)$(DEBUGSUFFIX) -+FULLNAME = sdl$(NAME)$(CPPSUFFIX)$(SUFFIX)$(DEBUGSUFFIX) - - # add an EXE suffix to get the final emulator name - EMULATOR = $(FULLNAME)$(EXE) -@@ -338,7 +338,7 @@ - ifneq ($(OPTIMIZE),0) - ifneq ($(TARGETOS),os2) - ifndef IA64 --CCOMFLAGS += -Werror -fno-strict-aliasing $(ARCHOPTS) -+CCOMFLAGS += -fno-strict-aliasing $(ARCHOPTS) - else - endif - else -@@ -382,7 +382,7 @@ - -I$(SRC)/lib/util \ - -I$(SRC)/osd \ - -I$(SRC)/osd/$(OSD) \ -- -+ -I$(LOCALBASE)/include \ - - - #------------------------------------------------- -@@ -395,7 +395,7 @@ - ifneq ($(TARGETOS),macosx) - ifneq ($(TARGETOS),os2) - ifneq ($(TARGETOS),solaris) --LDFLAGS = -Wl,--warn-common -+LDFLAGS = -Wl,--warn-common -L$(LOCALBASE)/lib - endif - endif - endif +--- makefile.orig 2010-09-27 02:26:51.000000000 +0200 ++++ makefile 2010-09-27 02:27:14.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 = mame-devel + + # add an EXE suffix to get the final emulator name + EMULATOR = $(FULLNAME)$(EXE) diff -uNr /usr/ports/emulators/sdlmame-devel/files/patch-sdlmain.c mame-devel/files/patch-sdlmain.c --- /usr/ports/emulators/sdlmame-devel/files/patch-sdlmain.c 2009-11-04 11:07:50.000000000 +0100 +++ mame-devel/files/patch-sdlmain.c 2010-09-27 02:22:20.000000000 +0200 @@ -1,11 +1,11 @@ ---- src/osd/sdl/sdlmain.c.orig 2009-11-01 01:22:48.000000000 +0100 -+++ src/osd/sdl/sdlmain.c 2009-11-01 01:23:26.000000000 +0100 -@@ -78,7 +78,7 @@ - #ifdef MESS - #define INI_PATH "$HOME/.mess;.;ini" - #else -- #define INI_PATH "$HOME/.mame;.;ini" -+ #define INI_PATH "$HOME/.mame-devel;.;ini" - #endif // MESS - #endif // MACOSX - #endif // INI_PATH +--- src/osd/sdl/sdlmain.c.orig 2010-06-29 20:46:22.000000000 +0200 ++++ src/osd/sdl/sdlmain.c 2010-09-27 02:21:59.000000000 +0200 +@@ -54,7 +54,7 @@ + #ifdef MESS + #define INI_PATH "$HOME/.mess;.;ini" + #else +- #define INI_PATH "$HOME/.mame;.;ini" ++ #define INI_PATH "$HOME/.mame-devel;.;ini" + #endif // MESS + #endif // MACOSX + #endif // INI_PATH diff -uNr /usr/ports/emulators/sdlmame-devel/files/pkg-message.in mame-devel/files/pkg-message.in --- /usr/ports/emulators/sdlmame-devel/files/pkg-message.in 2009-04-05 08:04:39.000000000 +0200 +++ mame-devel/files/pkg-message.in 2010-09-27 02:55:01.000000000 +0200 @@ -1,10 +1,10 @@ ============================================================================== -SDLMAME devel has been installed. +MAME has been installed. A example configuration file has been installed in "%%EXAMPLESDIR%%/mame.ini" -Should you create a "~/.mame-devel" directory and place it here or -launch "sdlmame-devel -createconfig" and place the mame.ini created instead. +Should you create a "~/.mame" directory and place it here or +launch "mame -createconfig" and place the mame.ini created instead. If you have a non-qwerty keyboard, you should put in your mame.ini : keymap 1 diff -uNr /usr/ports/emulators/sdlmame-devel/files/sdl.mak.patch mame-devel/files/sdl.mak.patch --- /usr/ports/emulators/sdlmame-devel/files/sdl.mak.patch 2009-11-04 11:07:50.000000000 +0100 +++ mame-devel/files/sdl.mak.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,26 +0,0 @@ ---- src/osd/sdl/sdl.mak.orig 2009-10-25 16:43:25.000000000 +0100 -+++ src/osd/sdl/sdl.mak 2009-11-01 02:07:41.000000000 +0100 -@@ -142,6 +142,7 @@ - ifeq ($(TARGETOS),freebsd) - TARGETOS = unix - SYNC_IMPLEMENTATION = ntc -+DEFS += -DNO_DEBUGGER - endif - - ifeq ($(TARGETOS),openbsd) -@@ -288,10 +289,11 @@ - # the new debugger relies on GTK+ in addition to the base SDLMAME needs - # Non-X11 builds can not use the debugger - ifndef NO_X11 --OSDCOREOBJS += $(SDLOBJ)/debugwin.o $(SDLOBJ)/dview.o $(SDLOBJ)/debug-sup.o $(SDLOBJ)/debug-intf.o --CFLAGS += `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` --CFLAGS += -DGTK_DISABLE_DEPRECATED -+OSDCOREOBJS += $(SDLOBJ)/debugwin.o -+#OSDCOREOBJS += $(SDLOBJ)/debugwin.o $(SDLOBJ)/dview.o $(SDLOBJ)/debug-sup.o $(SDLOBJ)/debug-intf.o -+#CFLAGS += `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` -+#CFLAGS += -DGTK_DISABLE_DEPRECATED - else - OSDCOREOBJS += $(SDLOBJ)/debugwin.o - endif # NO_X11 diff -uNr /usr/ports/emulators/sdlmame-devel/pkg-plist mame-devel/pkg-plist --- /usr/ports/emulators/sdlmame-devel/pkg-plist 2009-12-23 00:37:28.000000000 +0100 +++ mame-devel/pkg-plist 2010-09-27 02:56:31.000000000 +0200 @@ -1,18 +1,15 @@ -bin/sdlmame-devel -libexec/sdlmame-devel/chdman -libexec/sdlmame-devel/ldverify -libexec/sdlmame-devel/ldresample -libexec/sdlmame-devel/testkeys -libexec/sdlmame-devel/unidasm -%%PORTDOCS%%%%DOCSDIR%%/SDLMAME.txt +bin/mame-devel +libexec/mame-devel/chdman +libexec/mame-devel/ldverify +libexec/mame-devel/ldresample +libexec/mame-devel/testkeys +libexec/mame-devel/unidasm %%PORTDOCS%%%%DOCSDIR%%/docs/license.txt %%PORTDOCS%%%%DOCSDIR%%/docs/mame.txt %%PORTDOCS%%%%DOCSDIR%%/docs/newvideo.txt %%PORTDOCS%%%%DOCSDIR%%/docs/windows.txt %%PORTDOCS%%%%DOCSDIR%%/docs/config.txt %%PORTDOCS%%%%DOCSDIR%%/whatsnew.txt -%%PORTDOCS%%%%DOCSDIR%%/whatsnew_0135u3.txt -%%DATADIR%%/ui.bdf %%DATADIR%%/keymaps/km-be.txt %%DATADIR%%/keymaps/km-ch.txt %%DATADIR%%/keymaps/km-de.txt @@ -22,7 +19,7 @@ %%EXAMPLESDIR%%/mame.ini @dirrm %%DATADIR%%/keymaps/ @dirrm %%DATADIR%%/ -@dirrm libexec/sdlmame-devel +@dirrm libexec/mame-devel %%PORTDOCS%%@dirrm %%DOCSDIR%%/docs %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm %%EXAMPLESDIR%% >Release-Note: >Audit-Trail: >Unformatted: