From nobody@FreeBSD.org  Fri Mar 26 06:43:47 2010
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 98B9C106566C
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 26 Mar 2010 06:43:47 +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 860158FC1B
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 26 Mar 2010 06:43:47 +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 o2Q6hl5Y079864
	for <freebsd-gnats-submit@FreeBSD.org>; Fri, 26 Mar 2010 06:43:47 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id o2Q6hlEb079863;
	Fri, 26 Mar 2010 06:43:47 GMT
	(envelope-from nobody)
Message-Id: <201003260643.o2Q6hlEb079863@www.freebsd.org>
Date: Fri, 26 Mar 2010 06:43:47 GMT
From: Emmanuel Vadot <elbarto@megadrive.org>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Update ports emulator/sdlmame : Update to v0.137 and rename to emulator/mame
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         145050
>Category:       ports
>Synopsis:       Update ports emulator/sdlmame : Update to v0.137 and rename to emulator/mame
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    makc
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Mar 26 06:50:01 UTC 2010
>Closed-Date:    Mon May 17 22:22:30 UTC 2010
>Last-Modified:  Mon May 17 22:30:03 UTC 2010
>Originator:     Emmanuel Vadot
>Release:        8.0-STABLE-i386
>Organization:
ArcadeBSD
>Environment:
FreeBSD emeraldas 8.0-STABLE FreeBSD 8.0-STABLE #1: Wed Mar 10 18:10:25 CET 2010     root@emeraldas:/usr/obj/usr/src/sys/GENERIC  i386
>Description:
Update port to v0.137.
Rename the port to mame as the sdl layer is now included in the mainstream code.
Change the pkg-desc and www according the the change.

>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -uNr /usr/ports/emulators/sdlmame/CVS/Entries mame/CVS/Entries
--- /usr/ports/emulators/sdlmame/CVS/Entries	2010-03-22 00:07:10.000000000 +0100
+++ mame/CVS/Entries	2010-03-18 21:45:19.000000000 +0100
@@ -1,5 +1,5 @@
+/Makefile/1.31/Mon Jan  4 23:14:35 2010//THEAD
 /distinfo/1.18/Mon Jan  4 23:14:35 2010//THEAD
 /pkg-descr/1.1/Sun Feb 25 15:17:51 2007//THEAD
 /pkg-plist/1.14/Mon Jan  4 23:14:35 2010//THEAD
 D/files////
-/Makefile/1.32/Sun Mar 21 23:07:10 2010//THEAD
diff -uNr /usr/ports/emulators/sdlmame/Makefile mame/Makefile
--- /usr/ports/emulators/sdlmame/Makefile	2010-03-22 00:07:10.000000000 +0100
+++ mame/Makefile	2010-03-25 02:27:48.000000000 +0100
@@ -2,19 +2,21 @@
 # Date created:				2007-01-10
 # Whom:					alepulver
 #
-# $FreeBSD: ports/emulators/sdlmame/Makefile,v 1.32 2010/02/22 00:49:21 wen Exp $
+# $FreeBSD: ports/emulators/sdlmame/Makefile,v 1.31 2010/01/04 23:14:35 miwi Exp $
 #
 
-PORTNAME=	sdlmame
-PORTVERSION=	0.136
+PORTNAME=	mame
+PORTVERSION=	0.137
 CATEGORIES=	emulators
-MASTER_SITES=	ftp://ftp.arcadebsd.org/pub/ArcadeBSD/ports/distfiles/
-DISTNAME=	${PORTNAME}${PORTVERSION:S/.//}
+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=	SDL port of the popular MAME (Multi Arcade Machine Emulator)
+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
@@ -22,7 +24,7 @@
 MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}"
 USE_SDL=	sdl
 MAKEFILE=	makefile
-ONLY_FOR_ARCHS=	i386 amd64
+ONLY_FOR_ARCH=	i386 amd64
 SUB_FILES=	pkg-message
 
 OPTIONS=	DEBUG "Build sdlmame debugger" off
@@ -43,16 +45,22 @@
 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/sdlmame
-	${INSTALL_PROGRAM} ${WRKSRC}/chdman ${PREFIX}/libexec/sdlmame
-	${INSTALL_PROGRAM} ${WRKSRC}/ldresample ${PREFIX}/libexec/sdlmame
-	${INSTALL_PROGRAM} ${WRKSRC}/ldverify ${PREFIX}/libexec/sdlmame
-	${INSTALL_PROGRAM} ${WRKSRC}/testkeys ${PREFIX}/libexec/sdlmame
+	${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}
@@ -60,8 +68,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/distinfo mame/distinfo
--- /usr/ports/emulators/sdlmame/distinfo	2010-01-05 00:14:35.000000000 +0100
+++ mame/distinfo	2010-03-18 21:56:56.000000000 +0100
@@ -1,3 +1,3 @@
-MD5 (sdlmame0136.zip) = 3a83a5ba70b63298f4173558ccad1eba
-SHA256 (sdlmame0136.zip) = 863c34af4850b7687de358601e5b13fbb4ed1c121e11654179e87fb39e7ede2d
-SIZE (sdlmame0136.zip) = 18936113
+MD5 (mame0137s.zip) = ce9e5359e882d5a8219821e39bd4f27a
+SHA256 (mame0137s.zip) = 19678b480355b3c88fd026d0b5d4cb8f5da283666be7b0aa677a05f84041f8c7
+SIZE (mame0137s.zip) = 16336251
diff -uNr /usr/ports/emulators/sdlmame/files/mame.ini mame/files/mame.ini
--- /usr/ports/emulators/sdlmame/files/mame.ini	2009-07-26 22:50:59.000000000 +0200
+++ mame/files/mame.ini	2010-03-24 00:58:04.000000000 +0100
@@ -13,9 +13,9 @@
 artpath                   $HOME/.mame/artwork
 ctrlrpath                 $HOME/.mame/ctrlr
 inipath                   $HOME/.mame;.;ini
-fontpath                  /usr/local/share/sdlmame/
+fontpath                  $HOME/.mame/.
 cheatpath                 $HOME/.mame/cheat
-crosshairpath             crosshair
+crosshairpath             $HOME/.mame/crosshair
 
 #
 # CORE OUTPUT DIRECTORY OPTIONS
@@ -112,6 +112,8 @@
 joystick_map              auto
 joystick_deadzone         0.3
 joystick_saturation       0.85
+natural                   0
+uimodekey                 auto
 
 #
 # CORE INPUT AUTOMATIC ENABLE OPTIONS
@@ -133,6 +135,7 @@
 update_in_pause           0
 debug                     0
 debugscript               
+debug_internal            0
 
 #
 # CORE MISC OPTIONS
@@ -150,6 +153,7 @@
 # PERFORMANCE OPTIONS
 #
 multithreading            0
+numprocessors             auto
 sdlvideofps               0
 
 #
diff -uNr /usr/ports/emulators/sdlmame/files/patch-makefile mame/files/patch-makefile
--- /usr/ports/emulators/sdlmame/files/patch-makefile	2009-11-21 23:35:43.000000000 +0100
+++ mame/files/patch-makefile	2010-03-24 01:07:16.000000000 +0100
@@ -1,58 +1,22 @@
---- makefile.orig	2009-11-13 11:07:31.000000000 +0100
-+++ makefile	2009-11-13 11:08:58.000000000 +0100
-@@ -59,7 +59,7 @@
- ifeq ($(OSD),windows)
- TARGETOS = win32
- else
--TARGETOS = unix
-+TARGETOS = freebsd
- endif
- endif
- 
-@@ -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 $(PTHREAD_LIBS) -L$(LOCALBASE)/lib
- endif
- endif
- endif
+--- makefile.orig	2010-03-01 20:26:50.000000000 +0100
++++ makefile	2010-03-24 00:48:38.000000000 +0100
+@@ -266,8 +266,8 @@
+ 
+ # compiler, linker and utilities
+ AR = @ar
+-CC = @gcc
+-LD = @g++
++CC:= @$(CC)
++LD:= @$(CXX)
+ MD = -mkdir$(EXE)
+ RM = @rm -f
+ 
+@@ -308,7 +308,7 @@
+ endif
+ 
+ # fullname is prefix+name+suffix+suffix64+suffixdebug
+-FULLNAME = $(PREFIX)$(PREFIXSDL)$(NAME)$(SUFFIX)$(SUFFIX64)$(SUFFIXDEBUG)
++FULLNAME = $(PREFIXSDL)$(NAME)$(SUFFIX)$(SUFFIX64)$(SUFFIXDEBUG)
+ 
+ # add an EXE suffix to get the final emulator name
+ EMULATOR = $(FULLNAME)$(EXE)
diff -uNr /usr/ports/emulators/sdlmame/files/pkg-message.in mame/files/pkg-message.in
--- /usr/ports/emulators/sdlmame/files/pkg-message.in	2009-03-13 04:14:10.000000000 +0100
+++ mame/files/pkg-message.in	2010-03-24 01:02:56.000000000 +0100
@@ -1,10 +1,10 @@
 ==============================================================================
 
-SDLMAME has been installed.
+MAME has been installed.
 
 A example configuration file has been installed in "%%EXAMPLESDIR%%/mame.ini"
 Should you create a "~/.mame" directory and place it here or
-launch "sdlmame -createconfig" and place the mame.ini created instead.
+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/files/sdl.mak.patch mame/files/sdl.mak.patch
--- /usr/ports/emulators/sdlmame/files/sdl.mak.patch	2009-11-21 23:35:44.000000000 +0100
+++ mame/files/sdl.mak.patch	2010-03-24 00:17:42.000000000 +0100
@@ -1,25 +1,31 @@
---- src/osd/sdl/sdl.mak.orig	2009-11-13 11:09:21.000000000 +0100
-+++ src/osd/sdl/sdl.mak	2009-11-13 11:10:24.000000000 +0100
-@@ -140,6 +140,7 @@
- endif
- 
- ifeq ($(TARGETOS),freebsd)
-+DEFS += -DNO_DEBUGGER
- TARGETOS = unix
- SYNC_IMPLEMENTATION = ntc
- endif
-@@ -288,10 +289,10 @@
- # 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
-+#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
+--- 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
+@@ -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
+@@ -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
diff -uNr /usr/ports/emulators/sdlmame/pkg-descr mame/pkg-descr
--- /usr/ports/emulators/sdlmame/pkg-descr	2007-02-25 16:17:51.000000000 +0100
+++ mame/pkg-descr	2010-03-24 01:02:32.000000000 +0100
@@ -1,17 +1,9 @@
-SDLMAME is a port of the popular MAME. There are a few principles that guide
-it's development:
+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.
 
-1) Run on Linux/Unix, Mac OS X, and other SDL supported operating systems with
-   as few changes as possible to the base Win32 code. This means we can track
-   changes faster than larger more conventional ports such as MacMAME, and we
-   also maintain what I call "Firefox compatibilty" where learning a major app
-   only needs to be done once per application, and it then applies across many
-   operating systems. If you can use the command-line Win32 MAME, you already
-   know how to use SDLMAME on any platform you may encounter it on.
-
-2) MAME developers are important. By keeping quickly up to date, we make it
-   easy for people on non-Windows platforms to make and submit changes to the
-   core MAME code, and we offer native implementations of MAME's multi-window
-   GUI debugger on both Linux/Unix and Mac OS X.
-
-WWW: http://rbelmont.mameworld.info/?page_id=163
+WWW: http://mamedev.org
diff -uNr /usr/ports/emulators/sdlmame/pkg-plist mame/pkg-plist
--- /usr/ports/emulators/sdlmame/pkg-plist	2010-01-05 00:14:35.000000000 +0100
+++ mame/pkg-plist	2010-03-24 01:03:55.000000000 +0100
@@ -1,15 +1,16 @@
-bin/sdlmame
-libexec/sdlmame/chdman
-libexec/sdlmame/ldverify
-libexec/sdlmame/ldresample
-libexec/sdlmame/testkeys
-%%PORTDOCS%%%%DOCSDIR%%/SDLMAME.txt
+bin/mame
+libexec/mame/chdman
+libexec/mame/ldresample
+libexec/mame/ldverify
+libexec/mame/romcmp
+libexec/mame/testkeys
+libexec/mame/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
-%%DATADIR%%/ui.bdf
+%%PORTDOCS%%%%DOCSDIR%%/whatsnew.txt
 %%DATADIR%%/keymaps/km-be.txt
 %%DATADIR%%/keymaps/km-ch.txt
 %%DATADIR%%/keymaps/km-de.txt
@@ -19,7 +20,7 @@
 %%EXAMPLESDIR%%/mame.ini
 @dirrm %%DATADIR%%/keymaps/
 @dirrm %%DATADIR%%/
-@dirrm libexec/sdlmame
+@dirrm libexec/mame
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/docs
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%EXAMPLESDIR%%


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->makc 
Responsible-Changed-By: makc 
Responsible-Changed-When: Fri May 7 18:56:38 UTC 2010 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=145050 
State-Changed-From-To: open->repocopy 
State-Changed-By: makc 
State-Changed-When: Sat May 8 12:59:36 UTC 2010 
State-Changed-Why:  
Please, repocopy emulator/sdlmame to emulator/mame 


Responsible-Changed-From-To: makc->portmgr 
Responsible-Changed-By: makc 
Responsible-Changed-When: Sat May 8 12:59:36 UTC 2010 
Responsible-Changed-Why:  
Please, repocopy emulator/sdlmame to emulator/mame 

http://www.freebsd.org/cgi/query-pr.cgi?pr=145050 
State-Changed-From-To: repocopy->open 
State-Changed-By: marcus 
State-Changed-When: Sun May 9 17:35:57 UTC 2010 
State-Changed-Why:  
Repocopy complete. 


Responsible-Changed-From-To: portmgr->makc 
Responsible-Changed-By: marcus 
Responsible-Changed-When: Sun May 9 17:35:57 UTC 2010 
Responsible-Changed-Why:  
Repocopy complete. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=145050 
State-Changed-From-To: open->feedback 
State-Changed-By: makc 
State-Changed-When: Mon May 10 10:27:17 UTC 2010 
State-Changed-Why:  
Fails on my tinderbox: 
http://people.freebsd.org/~makc/tb/mame-0.137.log.bz2 . Any idea? 

http://www.freebsd.org/cgi/query-pr.cgi?pr=145050 

From: Emmanuel Vadot <elbarto@arcadebsd.org>
To: bug-followup@FreeBSD.org, elbarto@megadrive.org
Cc:  
Subject: Re: ports/145050: Update ports emulator/sdlmame : Update to v0.137
 and rename to emulator/mame
Date: Mon, 17 May 2010 07:32:55 +0200

 This is a multi-part message in MIME format.
 
 --Multipart=_Mon__17_May_2010_07_32_55_+0200_YWAW1iwTcHXhgReI
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: 7bit
 
 
  Sorry for that, the makefile add a suffix under 64bit os.
  New patch attached, based on the emulator/mame directory since the repocopy has been done.
 
 -- 
 Emmanuel Vadot
 elbarto@ArcadeBSD.org
 
 --Multipart=_Mon__17_May_2010_07_32_55_+0200_YWAW1iwTcHXhgReI
 Content-Type: text/plain;
  name="mame.txt"
 Content-Disposition: attachment;
  filename="mame.txt"
 Content-Transfer-Encoding: 7bit
 
 diff -uNr /usr/ports/emulators/mame/Makefile mame/Makefile
 --- /usr/ports/emulators/mame/Makefile	2010-02-22 01:49:21.000000000 +0100
 +++ mame/Makefile	2010-05-17 07:19:57.000000000 +0200
 @@ -5,16 +5,18 @@
  # $FreeBSD: ports/emulators/mame/Makefile,v 1.32 2010/02/22 00:49:21 wen Exp $
  #
  
 -PORTNAME=	sdlmame
 -PORTVERSION=	0.136
 +PORTNAME=	mame
 +PORTVERSION=	0.138
  CATEGORIES=	emulators
 -MASTER_SITES=	ftp://ftp.arcadebsd.org/pub/ArcadeBSD/ports/distfiles/
 -DISTNAME=	${PORTNAME}${PORTVERSION:S/.//}
 +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=	SDL port of 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
 @@ -22,7 +24,7 @@
  MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}"
  USE_SDL=	sdl
  MAKEFILE=	makefile
 -ONLY_FOR_ARCHS=	i386 amd64
 +ONLY_FOR_ARCH=	i386 amd64
  SUB_FILES=	pkg-message
  
  OPTIONS=	DEBUG "Build sdlmame debugger" off
 @@ -43,16 +45,22 @@
  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/sdlmame
 -	${INSTALL_PROGRAM} ${WRKSRC}/chdman ${PREFIX}/libexec/sdlmame
 -	${INSTALL_PROGRAM} ${WRKSRC}/ldresample ${PREFIX}/libexec/sdlmame
 -	${INSTALL_PROGRAM} ${WRKSRC}/ldverify ${PREFIX}/libexec/sdlmame
 -	${INSTALL_PROGRAM} ${WRKSRC}/testkeys ${PREFIX}/libexec/sdlmame
 +	${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}
 @@ -60,8 +68,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/mame/distinfo mame/distinfo
 --- /usr/ports/emulators/mame/distinfo	2010-01-05 00:14:35.000000000 +0100
 +++ mame/distinfo	2010-05-17 07:20:12.000000000 +0200
 @@ -1,3 +1,3 @@
 -MD5 (sdlmame0136.zip) = 3a83a5ba70b63298f4173558ccad1eba
 -SHA256 (sdlmame0136.zip) = 863c34af4850b7687de358601e5b13fbb4ed1c121e11654179e87fb39e7ede2d
 -SIZE (sdlmame0136.zip) = 18936113
 +MD5 (mame0138s.zip) = c0932c5456af79ad83ab0a2dd2219b2e
 +SHA256 (mame0138s.zip) = a80ee0b6d7c20743e35274d39129f313fb8756cfcb995c1cf95d5a81bdfabc2d
 +SIZE (mame0138s.zip) = 16446378
 diff -uNr /usr/ports/emulators/mame/files/mame.ini mame/files/mame.ini
 --- /usr/ports/emulators/mame/files/mame.ini	2009-07-26 22:50:59.000000000 +0200
 +++ mame/files/mame.ini	2010-05-17 07:16:04.000000000 +0200
 @@ -13,9 +13,9 @@
  artpath                   $HOME/.mame/artwork
  ctrlrpath                 $HOME/.mame/ctrlr
  inipath                   $HOME/.mame;.;ini
 -fontpath                  /usr/local/share/sdlmame/
 +fontpath                  $HOME/.mame/.
  cheatpath                 $HOME/.mame/cheat
 -crosshairpath             crosshair
 +crosshairpath             $HOME/.mame/crosshair
  
  #
  # CORE OUTPUT DIRECTORY OPTIONS
 @@ -112,6 +112,8 @@
  joystick_map              auto
  joystick_deadzone         0.3
  joystick_saturation       0.85
 +natural                   0
 +uimodekey                 auto
  
  #
  # CORE INPUT AUTOMATIC ENABLE OPTIONS
 @@ -133,6 +135,7 @@
  update_in_pause           0
  debug                     0
  debugscript               
 +debug_internal            0
  
  #
  # CORE MISC OPTIONS
 @@ -150,6 +153,7 @@
  # PERFORMANCE OPTIONS
  #
  multithreading            0
 +numprocessors             auto
  sdlvideofps               0
  
  #
 diff -uNr /usr/ports/emulators/mame/files/patch-makefile mame/files/patch-makefile
 --- /usr/ports/emulators/mame/files/patch-makefile	2009-11-21 23:35:43.000000000 +0100
 +++ mame/files/patch-makefile	2010-05-17 07:16:09.000000000 +0200
 @@ -1,58 +1,22 @@
 ---- makefile.orig	2009-11-13 11:07:31.000000000 +0100
 -+++ makefile	2009-11-13 11:08:58.000000000 +0100
 -@@ -59,7 +59,7 @@
 - ifeq ($(OSD),windows)
 - TARGETOS = win32
 - else
 --TARGETOS = unix
 -+TARGETOS = freebsd
 - endif
 - endif
 - 
 -@@ -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 $(PTHREAD_LIBS) -L$(LOCALBASE)/lib
 - endif
 - endif
 - endif
 +--- makefile.orig	2010-05-13 11:12:54.000000000 +0200
 ++++ makefile	2010-05-17 07:05:24.000000000 +0200
 +@@ -281,8 +281,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 @@
 + endif
 + 
 + # fullname is prefix+name+suffix+suffix64+suffixdebug
 +-FULLNAME = $(PREFIX)$(PREFIXSDL)$(NAME)$(SUFFIX)$(SUFFIX64)$(SUFFIXDEBUG)$(SUFFIXGPROF)
 ++FULLNAME = $(PREFIXSDL)$(NAME)$(SUFFIX)$(SUFFIXDEBUG)$(SUFFIXGPROF)
 + 
 + # add an EXE suffix to get the final emulator name
 + EMULATOR = $(FULLNAME)$(EXE)
 diff -uNr /usr/ports/emulators/mame/files/pkg-message.in mame/files/pkg-message.in
 --- /usr/ports/emulators/mame/files/pkg-message.in	2009-03-13 04:14:10.000000000 +0100
 +++ mame/files/pkg-message.in	2010-05-17 07:16:15.000000000 +0200
 @@ -1,10 +1,10 @@
  ==============================================================================
  
 -SDLMAME has been installed.
 +MAME has been installed.
  
  A example configuration file has been installed in "%%EXAMPLESDIR%%/mame.ini"
  Should you create a "~/.mame" directory and place it here or
 -launch "sdlmame -createconfig" and place the mame.ini created instead.
 +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/mame/files/sdl.mak.patch mame/files/sdl.mak.patch
 --- /usr/ports/emulators/mame/files/sdl.mak.patch	2009-11-21 23:35:44.000000000 +0100
 +++ mame/files/sdl.mak.patch	2010-05-17 07:16:22.000000000 +0200
 @@ -1,25 +1,31 @@
 ---- src/osd/sdl/sdl.mak.orig	2009-11-13 11:09:21.000000000 +0100
 -+++ src/osd/sdl/sdl.mak	2009-11-13 11:10:24.000000000 +0100
 -@@ -140,6 +140,7 @@
 - endif
 - 
 - ifeq ($(TARGETOS),freebsd)
 -+DEFS += -DNO_DEBUGGER
 - TARGETOS = unix
 - SYNC_IMPLEMENTATION = ntc
 - endif
 -@@ -288,10 +289,10 @@
 - # 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
 -+#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
 +--- 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
 +@@ -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
 +@@ -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
 diff -uNr /usr/ports/emulators/mame/pkg-plist mame/pkg-plist
 --- /usr/ports/emulators/mame/pkg-plist	2010-01-05 00:14:35.000000000 +0100
 +++ mame/pkg-plist	2010-05-17 07:30:25.000000000 +0200
 @@ -1,15 +1,16 @@
 -bin/sdlmame
 -libexec/sdlmame/chdman
 -libexec/sdlmame/ldverify
 -libexec/sdlmame/ldresample
 -libexec/sdlmame/testkeys
 -%%PORTDOCS%%%%DOCSDIR%%/SDLMAME.txt
 +bin/mame
 +libexec/mame/chdman
 +libexec/mame/ldresample
 +libexec/mame/ldverify
 +libexec/mame/romcmp
 +libexec/mame/testkeys
 +libexec/mame/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
 -%%DATADIR%%/ui.bdf
 +%%PORTDOCS%%%%DOCSDIR%%/whatsnew.txt
  %%DATADIR%%/keymaps/km-be.txt
  %%DATADIR%%/keymaps/km-ch.txt
  %%DATADIR%%/keymaps/km-de.txt
 @@ -19,7 +20,7 @@
  %%EXAMPLESDIR%%/mame.ini
  @dirrm %%DATADIR%%/keymaps/
  @dirrm %%DATADIR%%/
 -@dirrm libexec/sdlmame
 +@dirrm libexec/mame
  %%PORTDOCS%%@dirrm %%DOCSDIR%%/docs
  %%PORTDOCS%%@dirrm %%DOCSDIR%%
  @dirrm %%EXAMPLESDIR%%
 
 --Multipart=_Mon__17_May_2010_07_32_55_+0200_YWAW1iwTcHXhgReI--
State-Changed-From-To: feedback->open 
State-Changed-By: makc 
State-Changed-When: Mon May 17 22:22:17 UTC 2010 
State-Changed-Why:  
Feedback received. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=145050 
State-Changed-From-To: open->closed 
State-Changed-By: makc 
State-Changed-When: Mon May 17 22:22:29 UTC 2010 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=145050 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/145050: commit references a PR
Date: Mon, 17 May 2010 22:20:37 +0000 (UTC)

 makc        2010-05-17 22:20:26 UTC
 
   FreeBSD ports repository
 
   Modified files:
     emulators/mame       Makefile distinfo pkg-descr pkg-plist 
     emulators/mame/files mame.ini patch-makefile pkg-message.in 
                          sdl.mak.patch 
   Removed files:
     emulators/sdlmame    Makefile distinfo pkg-descr pkg-plist 
     emulators/sdlmame/files mame.ini patch-makefile pkg-message.in 
                             sdl.mak.patch 
   Log:
   Update port to v0.137.
   Rename the port to mame as the sdl layer is now included in the mainstream code.
   
   PR:             ports/145050
   Submitted by:   Emmanuel Vadot (maintainer)
   
   Revision  Changes    Path
   1.33      +21 -12    ports/emulators/mame/Makefile
   1.19      +3 -3      ports/emulators/mame/distinfo
   1.3       +6 -2      ports/emulators/mame/files/mame.ini
   1.13      +10 -46    ports/emulators/mame/files/patch-makefile
   1.3       +2 -2      ports/emulators/mame/files/pkg-message.in
   1.4       +26 -20    ports/emulators/mame/files/sdl.mak.patch
   1.2       +8 -16     ports/emulators/mame/pkg-descr
   1.15      +9 -8      ports/emulators/mame/pkg-plist
   1.33      +0 -73     ports/emulators/sdlmame/Makefile (dead)
   1.19      +0 -3      ports/emulators/sdlmame/distinfo (dead)
   1.3       +0 -262    ports/emulators/sdlmame/files/mame.ini (dead)
   1.13      +0 -58     ports/emulators/sdlmame/files/patch-makefile (dead)
   1.3       +0 -13     ports/emulators/sdlmame/files/pkg-message.in (dead)
   1.4       +0 -25     ports/emulators/sdlmame/files/sdl.mak.patch (dead)
   1.2       +0 -17     ports/emulators/sdlmame/pkg-descr (dead)
   1.15      +0 -25     ports/emulators/sdlmame/pkg-plist (dead)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
