From nobody@FreeBSD.org  Mon Jan  3 08:16:58 2011
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 98A82106566B
	for <freebsd-gnats-submit@FreeBSD.org>; Mon,  3 Jan 2011 08:16:56 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (unknown [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id 8766A8FC08
	for <freebsd-gnats-submit@FreeBSD.org>; Mon,  3 Jan 2011 08:16:56 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id p038GuS1094982
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 3 Jan 2011 08:16:56 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id p038GuUr094981;
	Mon, 3 Jan 2011 08:16:56 GMT
	(envelope-from nobody)
Message-Id: <201101030816.p038GuUr094981@red.freebsd.org>
Date: Mon, 3 Jan 2011 08:16:56 GMT
From: Emmanuel Vadot <elbarto@arcadebsd.org>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Update ports: emulators/mame update to v0.141
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         153645
>Category:       ports
>Synopsis:       Update ports: emulators/mame update to v0.141
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    crees
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jan 03 08:20:11 UTC 2011
>Closed-Date:    Sat Aug 13 17:05:45 UTC 2011
>Last-Modified:  Sat Aug 13 17:10:09 UTC 2011
>Originator:     Emmanuel Vadot
>Release:        i386-8.2-PRERELEASE
>Organization:
ArcadeBSD
>Environment:
FreeBSD sonic 8.2-PRERELEASE FreeBSD 8.2-PRERELEASE #2: Wed Dec  1 12:20:07 CET 2010     root@sonic:/usr/obj/usr/src/sys/GENERIC  i386

>Description:
Update ports to v0.141
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -uNr /usr/ports/emulators/mame/Makefile mame/Makefile
--- /usr/ports/emulators/mame/Makefile	2010-11-21 00:41:54.000000000 +0100
+++ mame/Makefile	2011-01-03 00:53:45.000000000 +0100
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mame
-PORTVERSION=	0.139
+PORTVERSION=	0.141
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.aarongiles.com/mirror/releases/ \
 		ftp://ftp.arcadebsd.org/pub/ArcadeBSD/ports/distfiles/
@@ -27,7 +27,6 @@
 MAKEFILE=	makefile
 ONLY_FOR_ARCHS=	i386 amd64
 SUB_FILES=	pkg-message
-USE_DOS2UNIX=	makefile sdl.mak debugcpu.c
 
 OPTIONS=	DEBUG "Build mame debugger" off
 
diff -uNr /usr/ports/emulators/mame/distinfo mame/distinfo
--- /usr/ports/emulators/mame/distinfo	2010-11-21 00:41:54.000000000 +0100
+++ mame/distinfo	2011-01-03 01:15:13.000000000 +0100
@@ -1,3 +1,2 @@
-MD5 (mame0139s.zip) = e9f81e86b786e0131eb6fb59e6bfe189
-SHA256 (mame0139s.zip) = e9dc268530b9a2b6fe17330af96dc5680dadba1b5e444bf7ef8fa1f15de7f3d6
-SIZE (mame0139s.zip) = 16706970
+SHA256 (mame0141s.zip) = 27c8829c55041886edafaa459b83452b0a327df31ce922c0b6a2ee91877504f8
+SIZE (mame0141s.zip) = 17092788
diff -uNr /usr/ports/emulators/mame/files/mame.ini mame/files/mame.ini
--- /usr/ports/emulators/mame/files/mame.ini	2010-11-21 00:41:54.000000000 +0100
+++ mame/files/mame.ini	2011-01-03 01:30:28.000000000 +0100
@@ -10,6 +10,7 @@
 # CORE SEARCH PATH OPTIONS
 #
 rompath                   $HOME/.mame/roms
+hashpath                  $HOME/.mame/hash
 samplepath                $HOME/.mame/samples
 artpath                   $HOME/.mame/artwork
 ctrlrpath                 $HOME/.mame/ctrlr
@@ -82,6 +83,7 @@
 contrast                  1.0
 gamma                     1.0
 pause_brightness          0.65
+effect                    none
 
 #
 # CORE VECTOR OPTIONS
@@ -144,6 +146,7 @@
 bios                      
 cheat                     0
 skip_gameinfo             0
+uifont                    default
 
 #
 # DEBUGGING OPTIONS
@@ -160,13 +163,12 @@
 #
 # VIDEO OPTIONS
 #
-video                     soft
+video                     opengl
 numscreens                1
-window                    0
-maximize                  1
+window                    1
+maximize                  0
 keepaspect                1
 unevenstretch             1
-effect                    none
 centerh                   1
 centerv                   1
 waitvsync                 0
diff -uNr /usr/ports/emulators/mame/files/patch-debugcpu.c mame/files/patch-debugcpu.c
--- /usr/ports/emulators/mame/files/patch-debugcpu.c	2010-08-01 19:22:55.000000000 +0200
+++ mame/files/patch-debugcpu.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,13 +0,0 @@
---- 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 <ctype.h>
--
-+#ifdef __FreeBSD__
-+#undef tolower
-+#endif
- 
- 
- /***************************************************************************
diff -uNr /usr/ports/emulators/mame/files/patch-makefile mame/files/patch-makefile
--- /usr/ports/emulators/mame/files/patch-makefile	2010-11-21 00:41:54.000000000 +0100
+++ mame/files/patch-makefile	2010-11-23 02:47:45.000000000 +0100
@@ -1,22 +1,22 @@
---- makefile.orig	2010-07-30 10:42:41.000000000 +0200
-+++ makefile	2010-07-30 10:43:26.000000000 +0200
+--- makefile.orig	2010-09-28 00:33:10.000000000 +0200
++++ makefile	2010-11-23 02:47:43.000000000 +0100
 @@ -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
+ 
+ # 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)
+ 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 -uNr /usr/ports/emulators/mame/files/sdl.mak.patch mame/files/sdl.mak.patch
--- /usr/ports/emulators/mame/files/sdl.mak.patch	2010-11-21 00:41:54.000000000 +0100
+++ mame/files/sdl.mak.patch	2011-01-03 01:33:02.000000000 +0100
@@ -1,40 +1,33 @@
---- 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
+--- src/osd/sdl/sdl.mak.orig	2011-01-03 01:31:41.000000000 +0100
++++ src/osd/sdl/sdl.mak	2011-01-03 01:32:40.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
-@@ -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
+ 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
+@@ -314,7 +314,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
+@@ -481,9 +481,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


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: arved 
State-Changed-When: Mon Jan 3 11:40:31 UTC 2011 
State-Changed-Why:  
The sdl.mak.patch does not apply here: 

===>  Applying extra patch /usr/home/arved/ports/mame/files/sdl.mak.patch 
3 out of 3 hunks failed--saving rejects to src/osd/sdl/sdl.mak.rej 


Can you investigate? 

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

From: Emmanuel Vadot <manu@megadrive.org>
To: bug-followup@FreeBSD.org, elbarto@arcadebsd.org
Cc:  
Subject: Re: ports/153645: Update ports: emulators/mame update to v0.141
Date: Tue, 4 Jan 2011 07:44:51 +0100

 This is a multi-part message in MIME format.
 
 --Multipart=_Tue__4_Jan_2011_07_44_51_+0100_Q5Y3uPEmg6wge.Tp
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: 7bit
 
 
  CRLF was whiped during second patch.
 
  Here is a new one, using USE_DOS2UNIX like before.
 
 -- 
 Emmanuel Vadot <manu@megadrive.org>
 
 --Multipart=_Tue__4_Jan_2011_07_44_51_+0100_Q5Y3uPEmg6wge.Tp
 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-11-21 00:41:54.000000000 +0100
 +++ mame/Makefile	2011-01-03 00:53:45.000000000 +0100
 @@ -6,7 +6,7 @@
  #
  
  PORTNAME=	mame
 -PORTVERSION=	0.139
 +PORTVERSION=	0.141
  CATEGORIES=	emulators
  MASTER_SITES=	http://www.aarongiles.com/mirror/releases/ \
  		ftp://ftp.arcadebsd.org/pub/ArcadeBSD/ports/distfiles/
 @@ -27,7 +27,6 @@
  MAKEFILE=	makefile
  ONLY_FOR_ARCHS=	i386 amd64
  SUB_FILES=	pkg-message
 -USE_DOS2UNIX=	makefile sdl.mak debugcpu.c
  
  OPTIONS=	DEBUG "Build mame debugger" off
  
 diff -uNr /usr/ports/emulators/mame/distinfo mame/distinfo
 --- /usr/ports/emulators/mame/distinfo	2010-11-21 00:41:54.000000000 +0100
 +++ mame/distinfo	2011-01-03 01:15:13.000000000 +0100
 @@ -1,3 +1,2 @@
 -MD5 (mame0139s.zip) = e9f81e86b786e0131eb6fb59e6bfe189
 -SHA256 (mame0139s.zip) = e9dc268530b9a2b6fe17330af96dc5680dadba1b5e444bf7ef8fa1f15de7f3d6
 -SIZE (mame0139s.zip) = 16706970
 +SHA256 (mame0141s.zip) = 27c8829c55041886edafaa459b83452b0a327df31ce922c0b6a2ee91877504f8
 +SIZE (mame0141s.zip) = 17092788
 diff -uNr /usr/ports/emulators/mame/files/mame.ini mame/files/mame.ini
 --- /usr/ports/emulators/mame/files/mame.ini	2010-11-21 00:41:54.000000000 +0100
 +++ mame/files/mame.ini	2011-01-03 01:30:28.000000000 +0100
 @@ -10,6 +10,7 @@
  # CORE SEARCH PATH OPTIONS
  #
  rompath                   $HOME/.mame/roms
 +hashpath                  $HOME/.mame/hash
  samplepath                $HOME/.mame/samples
  artpath                   $HOME/.mame/artwork
  ctrlrpath                 $HOME/.mame/ctrlr
 @@ -82,6 +83,7 @@
  contrast                  1.0
  gamma                     1.0
  pause_brightness          0.65
 +effect                    none
  
  #
  # CORE VECTOR OPTIONS
 @@ -144,6 +146,7 @@
  bios                      
  cheat                     0
  skip_gameinfo             0
 +uifont                    default
  
  #
  # DEBUGGING OPTIONS
 @@ -160,13 +163,12 @@
  #
  # VIDEO OPTIONS
  #
 -video                     soft
 +video                     opengl
  numscreens                1
 -window                    0
 -maximize                  1
 +window                    1
 +maximize                  0
  keepaspect                1
  unevenstretch             1
 -effect                    none
  centerh                   1
  centerv                   1
  waitvsync                 0
 diff -uNr /usr/ports/emulators/mame/files/patch-debugcpu.c mame/files/patch-debugcpu.c
 --- /usr/ports/emulators/mame/files/patch-debugcpu.c	2010-08-01 19:22:55.000000000 +0200
 +++ mame/files/patch-debugcpu.c	1970-01-01 01:00:00.000000000 +0100
 @@ -1,13 +0,0 @@
 ---- 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 <ctype.h>
 --
 -+#ifdef __FreeBSD__
 -+#undef tolower
 -+#endif
 - 
 - 
 - /***************************************************************************
 diff -uNr /usr/ports/emulators/mame/files/patch-makefile mame/files/patch-makefile
 --- /usr/ports/emulators/mame/files/patch-makefile	2010-11-21 00:41:54.000000000 +0100
 +++ mame/files/patch-makefile	2010-11-23 02:47:45.000000000 +0100
 @@ -1,22 +1,22 @@
 ---- makefile.orig	2010-07-30 10:42:41.000000000 +0200
 -+++ makefile	2010-07-30 10:43:26.000000000 +0200
 +--- makefile.orig	2010-09-28 00:33:10.000000000 +0200
 ++++ makefile	2010-11-23 02:47:43.000000000 +0100
  @@ -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
 + 
 + # 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)
 + 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 -uNr /usr/ports/emulators/mame/files/sdl.mak.patch mame/files/sdl.mak.patch
 --- /usr/ports/emulators/mame/files/sdl.mak.patch	2010-11-21 00:41:54.000000000 +0100
 +++ mame/files/sdl.mak.patch	2011-01-03 01:33:02.000000000 +0100
 @@ -1,40 +1,33 @@
 ---- 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
 +--- src/osd/sdl/sdl.mak.orig	2011-01-03 01:31:41.000000000 +0100
 ++++ src/osd/sdl/sdl.mak	2011-01-03 01:32:40.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
 -@@ -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
 + 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
 +@@ -314,7 +314,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
 +@@ -481,9 +481,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
 
 --Multipart=_Tue__4_Jan_2011_07_44_51_+0100_Q5Y3uPEmg6wge.Tp--

From: Emmanuel Vadot <elbarto@arcadebsd.org>
To: bug-followup@FreeBSD.org, elbarto@arcadebsd.org
Cc:  
Subject: Re: ports/153645: Update ports: emulators/mame update to v0.141
Date: Thu, 6 Jan 2011 19:04:18 +0100

 This is a multi-part message in MIME format.
 
 --Multipart=_Thu__6_Jan_2011_19_04_18_+0100_QmYpEUYlH1gNbE=w
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: 7bit
 
 
  Followup with correct email address.
 
 -- 
 Emmanuel Vadot <manu@megadrive.org>
 
 --Multipart=_Thu__6_Jan_2011_19_04_18_+0100_QmYpEUYlH1gNbE=w
 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-11-21 00:41:54.000000000 +0100
 +++ mame/Makefile	2011-01-03 00:53:45.000000000 +0100
 @@ -6,7 +6,7 @@
  #
  
  PORTNAME=	mame
 -PORTVERSION=	0.139
 +PORTVERSION=	0.141
  CATEGORIES=	emulators
  MASTER_SITES=	http://www.aarongiles.com/mirror/releases/ \
  		ftp://ftp.arcadebsd.org/pub/ArcadeBSD/ports/distfiles/
 @@ -27,7 +27,6 @@
  MAKEFILE=	makefile
  ONLY_FOR_ARCHS=	i386 amd64
  SUB_FILES=	pkg-message
 -USE_DOS2UNIX=	makefile sdl.mak debugcpu.c
  
  OPTIONS=	DEBUG "Build mame debugger" off
  
 diff -uNr /usr/ports/emulators/mame/distinfo mame/distinfo
 --- /usr/ports/emulators/mame/distinfo	2010-11-21 00:41:54.000000000 +0100
 +++ mame/distinfo	2011-01-03 01:15:13.000000000 +0100
 @@ -1,3 +1,2 @@
 -MD5 (mame0139s.zip) = e9f81e86b786e0131eb6fb59e6bfe189
 -SHA256 (mame0139s.zip) = e9dc268530b9a2b6fe17330af96dc5680dadba1b5e444bf7ef8fa1f15de7f3d6
 -SIZE (mame0139s.zip) = 16706970
 +SHA256 (mame0141s.zip) = 27c8829c55041886edafaa459b83452b0a327df31ce922c0b6a2ee91877504f8
 +SIZE (mame0141s.zip) = 17092788
 diff -uNr /usr/ports/emulators/mame/files/mame.ini mame/files/mame.ini
 --- /usr/ports/emulators/mame/files/mame.ini	2010-11-21 00:41:54.000000000 +0100
 +++ mame/files/mame.ini	2011-01-03 01:30:28.000000000 +0100
 @@ -10,6 +10,7 @@
  # CORE SEARCH PATH OPTIONS
  #
  rompath                   $HOME/.mame/roms
 +hashpath                  $HOME/.mame/hash
  samplepath                $HOME/.mame/samples
  artpath                   $HOME/.mame/artwork
  ctrlrpath                 $HOME/.mame/ctrlr
 @@ -82,6 +83,7 @@
  contrast                  1.0
  gamma                     1.0
  pause_brightness          0.65
 +effect                    none
  
  #
  # CORE VECTOR OPTIONS
 @@ -144,6 +146,7 @@
  bios                      
  cheat                     0
  skip_gameinfo             0
 +uifont                    default
  
  #
  # DEBUGGING OPTIONS
 @@ -160,13 +163,12 @@
  #
  # VIDEO OPTIONS
  #
 -video                     soft
 +video                     opengl
  numscreens                1
 -window                    0
 -maximize                  1
 +window                    1
 +maximize                  0
  keepaspect                1
  unevenstretch             1
 -effect                    none
  centerh                   1
  centerv                   1
  waitvsync                 0
 diff -uNr /usr/ports/emulators/mame/files/patch-debugcpu.c mame/files/patch-debugcpu.c
 --- /usr/ports/emulators/mame/files/patch-debugcpu.c	2010-08-01 19:22:55.000000000 +0200
 +++ mame/files/patch-debugcpu.c	1970-01-01 01:00:00.000000000 +0100
 @@ -1,13 +0,0 @@
 ---- 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 <ctype.h>
 --
 -+#ifdef __FreeBSD__
 -+#undef tolower
 -+#endif
 - 
 - 
 - /***************************************************************************
 diff -uNr /usr/ports/emulators/mame/files/patch-makefile mame/files/patch-makefile
 --- /usr/ports/emulators/mame/files/patch-makefile	2010-11-21 00:41:54.000000000 +0100
 +++ mame/files/patch-makefile	2010-11-23 02:47:45.000000000 +0100
 @@ -1,22 +1,22 @@
 ---- makefile.orig	2010-07-30 10:42:41.000000000 +0200
 -+++ makefile	2010-07-30 10:43:26.000000000 +0200
 +--- makefile.orig	2010-09-28 00:33:10.000000000 +0200
 ++++ makefile	2010-11-23 02:47:43.000000000 +0100
  @@ -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
 + 
 + # 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)
 + 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 -uNr /usr/ports/emulators/mame/files/sdl.mak.patch mame/files/sdl.mak.patch
 --- /usr/ports/emulators/mame/files/sdl.mak.patch	2010-11-21 00:41:54.000000000 +0100
 +++ mame/files/sdl.mak.patch	2011-01-03 01:33:02.000000000 +0100
 @@ -1,40 +1,33 @@
 ---- 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
 +--- src/osd/sdl/sdl.mak.orig	2011-01-03 01:31:41.000000000 +0100
 ++++ src/osd/sdl/sdl.mak	2011-01-03 01:32:40.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
 -@@ -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
 + 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
 +@@ -314,7 +314,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
 +@@ -481,9 +481,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
 
 --Multipart=_Thu__6_Jan_2011_19_04_18_+0100_QmYpEUYlH1gNbE=w--

From: =?ISO-8859-1?Q?Tilman_Keskin=F6z?= <arved@FreeBSD.org>
To: bug-followup@FreeBSD.org, elbarto@arcadebsd.org
Cc:  
Subject: Re: ports/153645: Update ports: emulators/mame update to v0.141
Date: Tue, 11 Jan 2011 13:15:38 +0100

 Hello,
 
 You are still sending the wrong patch :).
 
 I manual readded the USE_DOS2UNIX line.
 
 Now the build fails with:
 
 Archiving obj/sdl/mame/mame/amiga.a...
 /usr/bin/ld: cannot find -lSDL_ttf
 gmake: *** [obj/sdl/mame/build/verinfo] Error 1
 gmake: *** Waiting for unfinished jobs....
 *** Error code 1
 
 Stop in /usr/home/arved/ports/mame.
 
 
 Probably it is missing a USE_SDL=ttf.
 
 Can you investigate?

From: =?ISO-8859-1?Q?Alonso_C=E1rdenas_M=E1rquez?= <acardenas@bsd-peru.org>
To: bug-followup@FreeBSD.org, elbarto@arcadebsd.org
Cc:  
Subject: Re: ports/153645: Update ports: emulators/mame update to v0.141
Date: Wed, 22 Jun 2011 03:16:07 -0500

 --000e0cd60530999d8e04a64894ec
 Content-Type: text/plain; charset=ISO-8859-1
 
 Hi :)
 
 Could you test the following patch file? It will update mame to 0.142
 
 http://people.freebsd.org/~acm/mame/mame.diff
 
 Greetings
 ACM
 
 --000e0cd60530999d8e04a64894ec
 Content-Type: text/html; charset=ISO-8859-1
 
 <div>Hi :)<br></div><div><br></div><div>Could you test the following patch file? It will update mame to 0.142</div><div><br></div><div><a href="http://people.freebsd.org/~acm/mame/mame.diff">http://people.freebsd.org/~acm/mame/mame.diff</a></div>
 <div><br></div><div>Greetings</div><div>ACM</div><div><br></div><div><br></div>
 
 --000e0cd60530999d8e04a64894ec--
Responsible-Changed-From-To: freebsd-ports-bugs->crees 
Responsible-Changed-By: crees 
Responsible-Changed-When: Fri Aug 12 12:30:26 UTC 2011 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=153645 
State-Changed-From-To: feedback->closed 
State-Changed-By: crees 
State-Changed-When: Sat Aug 13 17:05:43 UTC 2011 
State-Changed-Why:  
I've updated the port to the latest patchlevel, more patches can be 
easily added by bumping PATCHLEVEL. 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/153645: commit references a PR
Date: Sat, 13 Aug 2011 17:04:47 +0000 (UTC)

 crees       2011-08-13 17:04:38 UTC
 
   FreeBSD ports repository
 
   Modified files:
     emulators/mame       Makefile distinfo pkg-plist 
     emulators/mame/files sdl.mak.patch 
   Removed files:
     emulators/mame/files patch-debugcpu.c 
   Log:
   - Update to 0.143p2 ('borrowing' obrien's cool patchlevel code from editors/vim)
   - Add missing fontconfig dependency
   - Use PORTDOCS/PORTEXAMPLES
   - Use PATCHDIR (not FILESDIR)
   - Use COPYTREE_SHARE (not cp -R)
   
   Mostly based on:
   PR:             ports/153645
   Submitted by:   Emmanuel Vadot <elbarto@arcadebsd.org> (maintainer), acm
   Approved by:    maintainer timeout (8 weeks)
   
   Revision  Changes    Path
   1.36      +42 -10    ports/emulators/mame/Makefile
   1.23      +6 -2      ports/emulators/mame/distinfo
   1.2       +0 -13     ports/emulators/mame/files/patch-debugcpu.c (dead)
   1.6       +15 -9     ports/emulators/mame/files/sdl.mak.patch
   1.16      +0 -10     ports/emulators/mame/pkg-plist
 _______________________________________________
 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:
