From tkato432@yahoo.com  Sun Nov 24 18:01:27 2013
Return-Path: <tkato432@yahoo.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTPS id DC1FA29C
	for <FreeBSD-gnats-submit@FreeBSD.org>; Sun, 24 Nov 2013 18:01:25 +0000 (UTC)
Received: from omta03.auone-net.jp (mail-or2-f145.auone-net.jp [111.87.219.145])
	by mx1.freebsd.org (Postfix) with ESMTP id 82D2B2C75
	for <FreeBSD-gnats-submit@FreeBSD.org>; Sun, 24 Nov 2013 18:01:25 +0000 (UTC)
Received: from coppermine.my.domain (ZT030024.ppp.dion.ne.jp [59.128.30.24])
	by omta03.auone-net.jp (au one net mail) with ESMTP id 3DFC4188002E
	for <FreeBSD-gnats-submit@FreeBSD.org>; Mon, 25 Nov 2013 03:01:19 +0900 (JST)
Message-Id: <20131125025109.76df1c4f4d40c2679b20694c@yahoo.com>
Date: Mon, 25 Nov 2013 02:51:09 +0900
From: KATO Tsuguru <tkato432@yahoo.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Subject: emulators/mame: Update to version 0.151

>Number:         184246
>Category:       ports
>Synopsis:       emulators/mame: Update to version 0.151
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    danilo
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Nov 24 18:10:08 UTC 2013
>Closed-Date:    Thu Jan 16 02:46:06 UTC 2014
>Last-Modified:  Thu Jan 16 02:50:00 UTC 2014
>Originator:     KATO Tsuguru
>Release:        FreeBSD 8.4-RELEASE-p4 i386
>Organization:
>Environment:
>Description:
- Update emulators/mame to version 0.151
- Update emulators/mess to version 0.151
- Update emulators/qmc2 to version 0.41

[emulators/mame]
Remove file:
files/patch-src__osd__sdl__input.c
files/patch-src__osd__sdl__testkeys.c

[emulators/mame]
Remove file:
files/patch-src__osd__sdl__input.c
files/patch-src__osd__sdl__testkeys.c

>How-To-Repeat:
>Fix:

# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	emulators_mame.diff
#	emulators_mess.diff
#	emulators_qmc2.diff
#
echo x - emulators_mame.diff
sed 's/^X//' >emulators_mame.diff << '8b92337adc5b7b7ad6d1db78e8717c3e'
Xdiff -urN /usr/ports/emulators/mame/Makefile emulators/mame/Makefile
X--- /usr/ports/emulators/mame/Makefile	2013-11-20 21:29:32.000000000 +0900
X+++ emulators/mame/Makefile	2013-11-25 00:00:00.000000000 +0900
X@@ -2,15 +2,12 @@
X # $FreeBSD: head/emulators/mame/Makefile 334361 2013-11-19 23:08:44Z mat $
X 
X PORTNAME=	mame
X-PORTVERSION=	0.150${PATCHSUFFIX}
X-PORTREVISION=	1
X+PORTVERSION=	0.151${PATCHSUFFIX}
X CATEGORIES=	emulators
X-MASTER_SITES=	SF/${PORTNAME}.mirror/${PORTNAME:U}%20${PORTVERSION} \
X-		http://mame.mirrors.zippykid.com/releases/ \
X+MASTER_SITES=	http://mame.mirrors.zippykid.com/releases/ \
X 		http://emumovies.com/aarongiles/releases/ \
X 		http://mamedev.org/updates/:patchsets
X-DISTNAME=	${PORTNAME}${PORTVERSION:S/.//:C/p[0-9]*$//}s
X-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
X+DISTFILES=	${PORTNAME}${PORTVERSION:S/.//:C/p[0-9]*$//}s.zip \
X 		${UPDATE_PATCHES:C/$/.zip:patchsets/}
X DIST_SUBDIR=	${PORTNAME}
X 
X@@ -23,22 +20,17 @@
X 		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
X RUN_DEPENDS=	liberation-fonts-ttf>=0:${PORTSDIR}/x11-fonts/liberation-fonts-ttf
X 
X-OPTIONS_DEFINE=	SDL2 DEBUG DOCS EXAMPLES
X-OPTIONS_RADIO=	BUILTIN_DEBUGGER
X-OPTIONS_RADIO_BUILTIN_DEBUGGER=	GTK2 QT4
X+OPTIONS_DEFINE=	BUILTIN_DEBUGGER SDL2 DEBUG DOCS EXAMPLES
X SDL2_DESC=	SDL2 libraries support
X BUILTIN_DEBUGGER_DESC=	Builtin debugger support
X 
X NO_WRKSUBDIR=	yes
X 
X-USE_ZIP=	yes
X-USES=		gmake pkgconfig shebangfix dos2unix
X+USES=		gmake pkgconfig shebangfix
X SHEBANG_FILES=	src/emu/cpu/m6502/m6502make.py \
X 		src/emu/cpu/m6809/m6809make.py \
X 		src/emu/cpu/mcs96/mcs96make.py \
X 		src/emu/cpu/tms57002/tmsmake.py
X-DOS2UNIX_FILES=	src/osd/sdl/input.c \
X-		src/osd/sdl/testkeys.c
X USE_XORG=	xext xi xinerama xrender
X USE_GL=		gl
X USE_PYTHON_BUILD=yes
X@@ -60,6 +52,12 @@
X 
X .include <bsd.port.options.mk>
X 
X+.if ${PORT_OPTIONS:MBUILTIN_DEBUGGER}
X+USE_QT4=	gui moc_build qmake_build
X+.else
X+MAKE_ENV+=	NO_DEBUGGER=1 NO_USE_QTDEBUG=1
X+.endif
X+
X .if ${PORT_OPTIONS:MSDL2}
X USE_SDL=	sdl2 ttf2
X MAKE_ENV+=	SDL_LIBVER="sdl2"
X@@ -71,43 +69,15 @@
X MAKE_ENV+=	DEBUG=1
X .endif
X 
X-.if ${PORT_OPTIONS:MGTK2}
X-USE_GNOME=	gtk20 gconf2
X-MAKE_ENV+=	GTK_INCPATH="$$(pkg-config --cflags-only-I gtk+-2.0 gconf-2.0)" \
X-		GTK_CCOMFLAGS="$$(pkg-config --cflags-only-other gtk+-2.0 gconf-2.0)" \
X-		GTK_LIBS="$$(pkg-config --libs gtk+-2.0 gconf-2.0)"
X-.else
X-MAKE_ENV+=	GTK_INCPATH="" \
X-		GTK_CCOMFLAGS="" \
X-		GTK_LIBS=""
X-.endif
X-
X-.if ${PORT_OPTIONS:MQT4}
X-USE_QT4=	gui moc_build qmake_build
X-.else
X-MAKE_ENV+=	NO_USE_QTDEBUG=1
X-.endif
X-
X-.if empty(PORT_OPTIONS:MGTK2) && empty(PORT_OPTIONS:MQT4)
X-MAKE_ENV+=	NO_DEBUGGER=1
X-.endif
X-
X .include <bsd.port.pre.mk>
X 
X-.if exists(/usr/bin/clang) && ${OSVERSION} >= 900014
X-CC=		/usr/bin/clang
X-CPP=		/usr/bin/clang-cpp
X-CXX=		/usr/bin/clang++
X-.else
X-USE_GCC=	yes
X-.endif
X-
X .if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
X BROKEN=		Does not install on ia64, powerpc, or sparc64
X .endif
X 
X post-extract:
X-	@${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${WRKDIR}/mame.zip ${EXTRACT_AFTER_ARGS}
X+	@(cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} mame.zip \
X+		${EXTRACT_AFTER_ARGS})
X 	@${RM} -f ${WRKDIR}/mame.zip
X # Use post-extract target to get in before dos2unix-isation
X .if defined(UPDATE_PATCHES)
X@@ -135,10 +105,7 @@
X 		'/realloc/s|^|// |' ${WRKSRC}/src/emu/emualloc.h
X 	@${REINPLACE_CMD} -e \
X 		'/LIBS/s|-lpthread|-pthread| ; \
X-		 /-system/s|/usr/local/|${LOCALBASE}/| ; \
X-		 /--cflags-only-I gtk+-2.0/s|=.*|= $$(GTK_INCPATH)| ; \
X-		 /--cflags-only-other gtk+-2.0/s|=.*|= $$(GTK_CCOMFLAGS)| ; \
X-		 /--libs gtk+-2.0/s|=.*|= $$(GTK_LIBS)| ; \
X+		 /-isystem/s|^|#| ; \
X 		 /X11R6/s|^|#|' ${WRKSRC}/src/osd/sdl/sdl.mak
X 
X do-install:
Xdiff -urN /usr/ports/emulators/mame/distinfo emulators/mame/distinfo
X--- /usr/ports/emulators/mame/distinfo	2013-11-06 22:06:22.000000000 +0900
X+++ emulators/mame/distinfo	2013-11-25 00:00:00.000000000 +0900
X@@ -1,2 +1,2 @@
X-SHA256 (mame/mame0150s.zip) = e672b033baa001e1a909498b6c9206c68d0456fd883e410ad50f1a4f4c2253f7
X-SIZE (mame/mame0150s.zip) = 35999158
X+SHA256 (mame/mame0151s.zip) = 84ae6a40ea4652bb2211504704e479530ab0182fe5a18641a5dca6d80e4ed72e
X+SIZE (mame/mame0151s.zip) = 36052471
Xdiff -urN /usr/ports/emulators/mame/files/patch-src__osd__sdl__input.c emulators/mame/files/patch-src__osd__sdl__input.c
X--- /usr/ports/emulators/mame/files/patch-src__osd__sdl__input.c	2013-11-06 22:06:22.000000000 +0900
X+++ emulators/mame/files/patch-src__osd__sdl__input.c	1970-01-01 09:00:00.000000000 +0900
X@@ -1,14 +0,0 @@
X---- src/osd/sdl/input.c.orig
X-+++ src/osd/sdl/input.c
X-@@ -720,7 +720,11 @@
X- 	mame_printf_verbose("Joystick: Start initialization\n");
X- 	for (physical_stick = 0; physical_stick < SDL_NumJoysticks(); physical_stick++)
X- 	{
X-+#if (SDLMAME_SDL2)
X-+		char *joy_name = remove_spaces(machine, SDL_JoystickNameForIndex(physical_stick));
X-+#else
X- 		char *joy_name = remove_spaces(machine, SDL_JoystickName(physical_stick));
X-+#endif
X- 
X- 		devmap_register(&joy_map, physical_stick, joy_name);
X- 	}
Xdiff -urN /usr/ports/emulators/mame/files/patch-src__osd__sdl__testkeys.c emulators/mame/files/patch-src__osd__sdl__testkeys.c
X--- /usr/ports/emulators/mame/files/patch-src__osd__sdl__testkeys.c	2013-11-06 22:06:22.000000000 +0900
X+++ emulators/mame/files/patch-src__osd__sdl__testkeys.c	1970-01-01 09:00:00.000000000 +0900
X@@ -1,18 +0,0 @@
X---- src/osd/sdl/testkeys.c.orig
X-+++ src/osd/sdl/testkeys.c
X-@@ -146,7 +146,6 @@
X- 				printf("ITEM_ID_XY %s 0x%x 0x%x %s\n",
X- 					lookup_key_name(sdl_lookup, event.key.keysym.scancode),
X- 					(int) event.key.keysym.scancode,
X--					(int) event.key.keysym.unicode,
X- 					"");
X- 				lasttext[0] = 0;
X- #else
X-@@ -165,7 +164,6 @@
X- 			printf("ITEM_ID_XY %s 0x%x 0x%x %s\n",
X- 					lookup_key_name(sdl_lookup, event.key.keysym.scancode),
X- 					(int) event.key.keysym.scancode,
X--					(int) event.key.keysym.unicode,
X- 					lasttext);
X- #else
X- 			memset(buf, 0, 19);
8b92337adc5b7b7ad6d1db78e8717c3e
echo x - emulators_mess.diff
sed 's/^X//' >emulators_mess.diff << '13f7e11912cff6c9343e13b09ba021e1'
Xdiff -urN /usr/ports/emulators/mess/Makefile emulators/mess/Makefile
X--- /usr/ports/emulators/mess/Makefile	2013-11-20 21:29:32.000000000 +0900
X+++ emulators/mess/Makefile	2013-11-25 00:00:00.000000000 +0900
X@@ -2,15 +2,12 @@
X # $FreeBSD: head/emulators/mess/Makefile 334361 2013-11-19 23:08:44Z mat $
X 
X PORTNAME=	mess
X-PORTVERSION=	0.150${PATCHSUFFIX}
X-PORTREVISION=	1
X+PORTVERSION=	0.151${PATCHSUFFIX}
X CATEGORIES=	emulators
X-MASTER_SITES=	SF/mame.mirror/MAME%20${PORTVERSION} \
X-		http://mame.mirrors.zippykid.com/releases/ \
X+MASTER_SITES=	http://mame.mirrors.zippykid.com/releases/ \
X 		http://emumovies.com/aarongiles/releases/ \
X 		http://mamedev.org/updates/:patchsets
X-DISTNAME=	mame${PORTVERSION:S/.//:C/p[0-9]*$//}s
X-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
X+DISTFILES=	mame${PORTVERSION:S/.//:C/p[0-9]*$//}s.zip \
X 		${UPDATE_PATCHES:C/$/.zip:patchsets/}
X DIST_SUBDIR=	mame
X 
X@@ -23,22 +20,17 @@
X 		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
X RUN_DEPENDS=	liberation-fonts-ttf>=0:${PORTSDIR}/x11-fonts/liberation-fonts-ttf
X 
X-OPTIONS_DEFINE=	SDL2 DEBUG DOCS EXAMPLES
X-OPTIONS_RADIO=	BUILTIN_DEBUGGER
X-OPTIONS_RADIO_BUILTIN_DEBUGGER=	GTK2 QT4
X+OPTIONS_DEFINE=	BUILTIN_DEBUGGER SDL2 DEBUG DOCS EXAMPLES
X SDL2_DESC=	SDL2 libraries support
X BUILTIN_DEBUGGER_DESC=	Builtin debugger support
X 
X NO_WRKSUBDIR=	yes
X 
X-USE_ZIP=	yes
X-USES=		gmake pkgconfig shebangfix dos2unix
X+USES=		gmake pkgconfig shebangfix
X SHEBANG_FILES=	src/emu/cpu/m6502/m6502make.py \
X 		src/emu/cpu/m6809/m6809make.py \
X 		src/emu/cpu/mcs96/mcs96make.py \
X 		src/emu/cpu/tms57002/tmsmake.py
X-DOS2UNIX_FILES=	src/osd/sdl/input.c \
X-		src/osd/sdl/testkeys.c
X USE_XORG=	xext xi xinerama xrender
X USE_GL=		gl
X USE_PYTHON_BUILD=yes
X@@ -60,6 +52,12 @@
X 
X .include <bsd.port.options.mk>
X 
X+.if ${PORT_OPTIONS:MBUILTIN_DEBUGGER}
X+USE_QT4=	gui moc_build qmake_build
X+.else
X+MAKE_ENV+=	NO_DEBUGGER=1 NO_USE_QTDEBUG=1
X+.endif
X+
X .if ${PORT_OPTIONS:MSDL2}
X USE_SDL=	sdl2 ttf2
X MAKE_ENV+=	SDL_LIBVER="sdl2"
X@@ -71,43 +69,15 @@
X MAKE_ENV+=	DEBUG=1
X .endif
X 
X-.if ${PORT_OPTIONS:MGTK2}
X-USE_GNOME=	gtk20 gconf2
X-MAKE_ENV+=	GTK_INCPATH="$$(pkg-config --cflags-only-I gtk+-2.0 gconf-2.0)" \
X-		GTK_CCOMFLAGS="$$(pkg-config --cflags-only-other gtk+-2.0 gconf-2.0)" \
X-		GTK_LIBS="$$(pkg-config --libs gtk+-2.0 gconf-2.0)"
X-.else
X-MAKE_ENV+=	GTK_INCPATH="" \
X-		GTK_CCOMFLAGS="" \
X-		GTK_LIBS=""
X-.endif
X-
X-.if ${PORT_OPTIONS:MQT4}
X-USE_QT4=	gui moc_build qmake_build
X-.else
X-MAKE_ENV+=	NO_USE_QTDEBUG=1
X-.endif
X-
X-.if empty(PORT_OPTIONS:MGTK2) && empty(PORT_OPTIONS:MQT4)
X-MAKE_ENV+=	NO_DEBUGGER=1
X-.endif
X-
X .include <bsd.port.pre.mk>
X 
X-.if exists(/usr/bin/clang) && ${OSVERSION} >= 900014
X-CC=		/usr/bin/clang
X-CPP=		/usr/bin/clang-cpp
X-CXX=		/usr/bin/clang++
X-.else
X-USE_GCC=	yes
X-.endif
X-
X .if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
X BROKEN=		Does not install on ia64, powerpc, or sparc64
X .endif
X 
X post-extract:
X-	@${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${WRKDIR}/mame.zip ${EXTRACT_AFTER_ARGS}
X+	@(cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} mame.zip \
X+		${EXTRACT_AFTER_ARGS})
X 	@${RM} -f ${WRKDIR}/mame.zip
X # Use post-extract target to get in before dos2unix-isation
X .if defined(UPDATE_PATCHES)
X@@ -135,29 +105,26 @@
X 		'/realloc/s|^|// |' ${WRKSRC}/src/emu/emualloc.h
X 	@${REINPLACE_CMD} -e \
X 		'/LIBS/s|-lpthread|-pthread| ; \
X-		 /-system/s|/usr/local/|${LOCALBASE}/| ; \
X-		 /--cflags-only-I gtk+-2.0/s|=.*|= $$(GTK_INCPATH)| ; \
X-		 /--cflags-only-other gtk+-2.0/s|=.*|= $$(GTK_CCOMFLAGS)| ; \
X-		 /--libs gtk+-2.0/s|=.*|= $$(GTK_LIBS)| ; \
X+		 /-isystem/s|^|#| ; \
X 		 /X11R6/s|^|#|' ${WRKSRC}/src/osd/sdl/sdl.mak
X 
X do-install:
X 	(cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PORTNAME} \
X-		${STAGEDIR}/${PREFIX}/bin)
X-	@${MKDIR} ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}
X+		${STAGEDIR}${PREFIX}/bin)
X+	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}
X .for F in castool chdman imgtool jedutil ldresample ldverify romcmp \
X 	testkeys unidasm
X 	(cd ${WRKSRC} && ${INSTALL_PROGRAM} ${F} \
X-		${STAGEDIR}/${PREFIX}/libexec/${PORTNAME})
X+		${STAGEDIR}${PREFIX}/libexec/${PORTNAME})
X .endfor
X-	@${MKDIR} ${STAGEDIR}/${DATADIR}
X-	@(cd ${WRKSRC} && ${COPYTREE_SHARE} artwork ${STAGEDIR}/${DATADIR})
X-	@(cd ${WRKSRC} && ${COPYTREE_SHARE} hash ${STAGEDIR}/${DATADIR})
X+	@${MKDIR} ${STAGEDIR}${DATADIR}
X+	@(cd ${WRKSRC} && ${COPYTREE_SHARE} artwork ${STAGEDIR}${DATADIR})
X+	@(cd ${WRKSRC} && ${COPYTREE_SHARE} hash ${STAGEDIR}${DATADIR})
X 	@(cd ${WRKSRC}/src/osd/sdl && ${COPYTREE_SHARE} keymaps \
X-		${STAGEDIR}/${DATADIR})
X-	@${MKDIR} ${STAGEDIR}/${DOCSDIR}
X-	@(cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${STAGEDIR}/${DOCSDIR})
X-	@${MKDIR} ${STAGEDIR}/${EXAMPLESDIR}
X-	(cd ${FILESDIR} && ${INSTALL_DATA} mess.ini ${STAGEDIR}/${EXAMPLESDIR})
X+		${STAGEDIR}${DATADIR})
X+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
X+	@(cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${STAGEDIR}${DOCSDIR})
X+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
X+	(cd ${FILESDIR} && ${INSTALL_DATA} mess.ini ${STAGEDIR}${EXAMPLESDIR})
X 
X .include <bsd.port.post.mk>
Xdiff -urN /usr/ports/emulators/mess/distinfo emulators/mess/distinfo
X--- /usr/ports/emulators/mess/distinfo	2013-11-06 22:06:20.000000000 +0900
X+++ emulators/mess/distinfo	2013-11-25 00:00:00.000000000 +0900
X@@ -1,2 +1,2 @@
X-SHA256 (mame/mame0150s.zip) = e672b033baa001e1a909498b6c9206c68d0456fd883e410ad50f1a4f4c2253f7
X-SIZE (mame/mame0150s.zip) = 35999158
X+SHA256 (mame/mame0151s.zip) = 84ae6a40ea4652bb2211504704e479530ab0182fe5a18641a5dca6d80e4ed72e
X+SIZE (mame/mame0151s.zip) = 36052471
Xdiff -urN /usr/ports/emulators/mess/files/patch-src__osd__sdl__input.c emulators/mess/files/patch-src__osd__sdl__input.c
X--- /usr/ports/emulators/mess/files/patch-src__osd__sdl__input.c	2013-11-06 22:06:20.000000000 +0900
X+++ emulators/mess/files/patch-src__osd__sdl__input.c	1970-01-01 09:00:00.000000000 +0900
X@@ -1,14 +0,0 @@
X---- src/osd/sdl/input.c.orig
X-+++ src/osd/sdl/input.c
X-@@ -720,7 +720,11 @@
X- 	mame_printf_verbose("Joystick: Start initialization\n");
X- 	for (physical_stick = 0; physical_stick < SDL_NumJoysticks(); physical_stick++)
X- 	{
X-+#if (SDLMAME_SDL2)
X-+		char *joy_name = remove_spaces(machine, SDL_JoystickNameForIndex(physical_stick));
X-+#else
X- 		char *joy_name = remove_spaces(machine, SDL_JoystickName(physical_stick));
X-+#endif
X- 
X- 		devmap_register(&joy_map, physical_stick, joy_name);
X- 	}
Xdiff -urN /usr/ports/emulators/mess/files/patch-src__osd__sdl__testkeys.c emulators/mess/files/patch-src__osd__sdl__testkeys.c
X--- /usr/ports/emulators/mess/files/patch-src__osd__sdl__testkeys.c	2013-11-06 22:06:20.000000000 +0900
X+++ emulators/mess/files/patch-src__osd__sdl__testkeys.c	1970-01-01 09:00:00.000000000 +0900
X@@ -1,38 +0,0 @@
X---- src/osd/sdl/testkeys.c.orig	2013-10-30 21:16:48.577335486 +0100
X-+++ src/osd/sdl/testkeys.c	2013-10-30 21:27:06.551455870 +0100
X-@@ -146,7 +146,7 @@
X- 				printf("ITEM_ID_XY %s 0x%x 0x%x %s\n",
X- 					lookup_key_name(sdl_lookup, event.key.keysym.scancode),
X- 					(int) event.key.keysym.scancode,
X--					(int) event.key.keysym.unicode,
X-+					(int) event.key.keysym.mod,
X- 					"");
X- 				lasttext[0] = 0;
X- #else
X-@@ -155,7 +155,7 @@
X- 				printf("ITEM_ID_XY %s 0x%x 0x%x %s\n",
X- 					lookup_key_name(sdl_lookup, event.key.keysym.sym),
X- 					(int) event.key.keysym.scancode,
X--					(int) event.key.keysym.unicode,
X-+					(int) event.key.keysym.mod,
X- 					buf);
X- #endif
X- 			}
X-@@ -165,7 +165,7 @@
X- 			printf("ITEM_ID_XY %s 0x%x 0x%x %s\n",
X- 					lookup_key_name(sdl_lookup, event.key.keysym.scancode),
X- 					(int) event.key.keysym.scancode,
X--					(int) event.key.keysym.unicode,
X-+					(int) event.key.keysym.mod,
X- 					lasttext);
X- #else
X- 			memset(buf, 0, 19);
X-@@ -173,7 +173,7 @@
X- 			printf("ITEM_ID_XY %s 0x%x 0x%x %s\n",
X- 					lookup_key_name(sdl_lookup, event.key.keysym.sym),
X- 					(int) event.key.keysym.scancode,
X--					(int) event.key.keysym.unicode,
X-+					(int) event.key.keysym.mod,
X- 					buf);
X- #endif
X- 			break;
13f7e11912cff6c9343e13b09ba021e1
echo x - emulators_qmc2.diff
sed 's/^X//' >emulators_qmc2.diff << 'db55c78c3bf9192c4def1b21f00fbc6f'
Xdiff -urN /usr/ports/emulators/qmc2/Makefile emulators/qmc2/Makefile
X--- /usr/ports/emulators/qmc2/Makefile	2013-11-06 22:06:22.000000000 +0900
X+++ emulators/qmc2/Makefile	2013-11-25 00:00:00.000000000 +0900
X@@ -2,8 +2,7 @@
X # $FreeBSD: head/emulators/qmc2/Makefile 332169 2013-10-30 20:42:02Z pawel $
X 
X PORTNAME=	qmc2
X-PORTVERSION=	0.40
X-PORTREVISION=	1
X+PORTVERSION=	0.41
X CATEGORIES=	emulators
X MASTER_SITES=	SF
X 
Xdiff -urN /usr/ports/emulators/qmc2/distinfo emulators/qmc2/distinfo
X--- /usr/ports/emulators/qmc2/distinfo	2013-11-06 22:06:22.000000000 +0900
X+++ emulators/qmc2/distinfo	2013-11-25 00:00:00.000000000 +0900
X@@ -1,2 +1,2 @@
X-SHA256 (qmc2-0.40.tar.bz2) = 1119b991a93f9a29a1605219a05459aa1345397906eb7e32856d7ec96a2dc717
X-SIZE (qmc2-0.40.tar.bz2) = 17910405
X+SHA256 (qmc2-0.41.tar.bz2) = 4c37a1cc64f6799aaafe09133475f988d7221d198b2a23005138ed182038289b
X+SIZE (qmc2-0.41.tar.bz2) = 16353382
db55c78c3bf9192c4def1b21f00fbc6f
exit

>Release-Note:
>Audit-Trail:

From: KATO Tsuguru <tkato432@yahoo.com>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/184246: emulators/mame: Update to version 0.151
Date: Tue, 26 Nov 2013 03:00:00 +0900

 This is a multi-part message in MIME format.
 
 --Multipart=_Tue__26_Nov_2013_03_00_00_+0900_Swa9a0F7itGP=ssN
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: 7bit
 
 Remake of the patch against current tree.
 
 --Multipart=_Tue__26_Nov_2013_03_00_00_+0900_Swa9a0F7itGP=ssN
 Content-Type: text/x-diff;
  name="emulators_mame.diff"
 Content-Disposition: attachment;
  filename="emulators_mame.diff"
 Content-Transfer-Encoding: 7bit
 
 diff -urN /usr/ports/emulators/mame/Makefile emulators/mame/Makefile
 --- /usr/ports/emulators/mame/Makefile	2013-11-25 18:57:44.000000000 +0900
 +++ emulators/mame/Makefile	2013-11-26 00:00:00.000000000 +0900
 @@ -2,15 +2,12 @@
  # $FreeBSD: head/emulators/mame/Makefile 334792 2013-11-24 21:09:22Z mva $
  
  PORTNAME=	mame
 -PORTVERSION=	0.150${PATCHSUFFIX}
 -PORTREVISION=	1
 +PORTVERSION=	0.151${PATCHSUFFIX}
  CATEGORIES=	emulators
 -MASTER_SITES=	SF/${PORTNAME}.mirror/${PORTNAME:U}%20${PORTVERSION} \
 -		http://mame.mirrors.zippykid.com/releases/ \
 +MASTER_SITES=	http://mame.mirrors.zippykid.com/releases/ \
  		http://emumovies.com/aarongiles/releases/ \
  		http://mamedev.org/updates/:patchsets
 -DISTNAME=	${PORTNAME}${PORTVERSION:S/.//:C/p[0-9]*$//}s
 -DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 +DISTFILES=	${PORTNAME}${PORTVERSION:S/.//:C/p[0-9]*$//}s.zip \
  		${UPDATE_PATCHES:C/$/.zip:patchsets/}
  DIST_SUBDIR=	${PORTNAME}
  
 @@ -23,26 +20,22 @@
  		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
  RUN_DEPENDS=	liberation-fonts-ttf>=0:${PORTSDIR}/x11-fonts/liberation-fonts-ttf
  
 -OPTIONS_DEFINE=	SDL2 DEBUG DOCS EXAMPLES
 -OPTIONS_RADIO=	BUILTIN_DEBUGGER
 -OPTIONS_RADIO_BUILTIN_DEBUGGER=	GTK2 QT4
 +OPTIONS_DEFINE=	BUILTIN_DEBUGGER SDL2 DEBUG DOCS EXAMPLES
  SDL2_DESC=	SDL2 libraries support
  BUILTIN_DEBUGGER_DESC=	Builtin debugger support
  
  NO_WRKSUBDIR=	yes
  
 -USE_ZIP=	yes
 -USES=		gmake pkgconfig shebangfix dos2unix
 +USES=		gmake pkgconfig shebangfix
  SHEBANG_FILES=	src/emu/cpu/m6502/m6502make.py \
  		src/emu/cpu/m6809/m6809make.py \
  		src/emu/cpu/mcs96/mcs96make.py \
  		src/emu/cpu/tms57002/tmsmake.py
 -DOS2UNIX_FILES=	src/osd/sdl/input.c \
 -		src/osd/sdl/testkeys.c
  USE_XORG=	xext xi xinerama xrender
  USE_GL=		gl
 -USE_PYTHON_BUILD=-2.7
 +USE_PYTHON_BUILD=	-2.7
  MAKE_ENV=	NOWERROR=1 USE_NETWORK=1 \
 +		LD="${CXX}" PYTHON="${PYTHON_CMD}" \
  		OPT_FLAGS="${CXXFLAGS}" GCC_LDFLAGS="${LDFLAGS}" \
  		TARGET="${PORTNAME}" FULLNAME="${PORTNAME}"
  MAKEFILE=	makefile
 @@ -60,6 +53,12 @@
  
  .include <bsd.port.options.mk>
  
 +.if ${PORT_OPTIONS:MBUILTIN_DEBUGGER}
 +USE_QT4=	gui moc_build qmake_build
 +.else
 +MAKE_ENV+=	NO_DEBUGGER=1 NO_USE_QTDEBUG=1
 +.endif
 +
  .if ${PORT_OPTIONS:MSDL2}
  USE_SDL=	sdl2 ttf2
  MAKE_ENV+=	SDL_LIBVER="sdl2"
 @@ -71,43 +70,15 @@
  MAKE_ENV+=	DEBUG=1
  .endif
  
 -.if ${PORT_OPTIONS:MGTK2}
 -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+=	GTK_INCPATH="" \
 -		GTK_CCOMFLAGS="" \
 -		GTK_LIBS=""
 -.endif
 -
 -.if ${PORT_OPTIONS:MQT4}
 -USE_QT4=	gui moc_build qmake_build
 -.else
 -MAKE_ENV+=	NO_USE_QTDEBUG=1
 -.endif
 -
 -.if empty(PORT_OPTIONS:MGTK2) && empty(PORT_OPTIONS:MQT4)
 -MAKE_ENV+=	NO_DEBUGGER=1
 -.endif
 -
  .include <bsd.port.pre.mk>
  
 -.if exists(/usr/bin/clang) && ${OSVERSION} >= 900014
 -CC=		/usr/bin/clang
 -CPP=		/usr/bin/clang-cpp
 -CXX=		/usr/bin/clang++
 -.else
 -USE_GCC=	yes
 -.endif
 -
  .if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
  BROKEN=		Does not install on ia64, powerpc, or sparc64
  .endif
  
  post-extract:
 -	@${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${WRKDIR}/mame.zip ${EXTRACT_AFTER_ARGS}
 +	@(cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} mame.zip \
 +		${EXTRACT_AFTER_ARGS})
  	@${RM} -f ${WRKDIR}/mame.zip
  # Use post-extract target to get in before dos2unix-isation
  .if defined(UPDATE_PATCHES)
 @@ -120,14 +91,14 @@
  
  post-patch:
  	@${REINPLACE_CMD} -e \
 -		's|^BUILD_EXPAT|# BUILD_EXPAT| ; \
 -		 s|^BUILD_ZLIB|# BUILD_ZLIB| ; \
 -		 s|^BUILD_FLAC|# BUILD_FLAC| ; \
 -		 s|^BUILD_JPEGLIB|# BUILD_JPEGLIB| ; \
 -		 s| = @gcc| := $$(CC)| ; \
 -		 s| = @g++| := $$(CXX)| ; \
 +		'/^BUILD_EXPAT /s|^|#| ; \
 +		 /^BUILD_ZLIB /s|^|#| ; \
 +		 /^BUILD_FLAC /s|^|#| ; \
 +		 /^BUILD_JPEGLIB /s|^|#| ; \
 +		 /^CC /s|^|#| ; \
 +		 /^LD /s|^|#| ; \
 +		 /^PYTHON /s|^|#| ; \
  		 s|-O$$(OPTIMIZE)|| ; \
 -		 s| = @python| = ${PYTHON_CMD}| ; \
  		 /--warn-common/s|= -Wl,|= $$(GCC_LDFLAGS) -Wl,| ; \
  		 /LDFLAGS/s|-s|| ; \
  		 /LIBS/s|-lstdc++|| ; \
 @@ -136,10 +107,7 @@
  		'/realloc/s|^|// |' ${WRKSRC}/src/emu/emualloc.h
  	@${REINPLACE_CMD} -e \
  		'/LIBS/s|-lpthread|-pthread| ; \
 -		 /-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)| ; \
 +		 /-isystem/s|^|#| ; \
  		 /X11R6/s|^|#|' ${WRKSRC}/src/osd/sdl/sdl.mak
  
  do-install:
 diff -urN /usr/ports/emulators/mame/distinfo emulators/mame/distinfo
 --- /usr/ports/emulators/mame/distinfo	2013-11-06 22:06:22.000000000 +0900
 +++ emulators/mame/distinfo	2013-11-26 00:00:00.000000000 +0900
 @@ -1,2 +1,2 @@
 -SHA256 (mame/mame0150s.zip) = e672b033baa001e1a909498b6c9206c68d0456fd883e410ad50f1a4f4c2253f7
 -SIZE (mame/mame0150s.zip) = 35999158
 +SHA256 (mame/mame0151s.zip) = 84ae6a40ea4652bb2211504704e479530ab0182fe5a18641a5dca6d80e4ed72e
 +SIZE (mame/mame0151s.zip) = 36052471
 diff -urN /usr/ports/emulators/mame/files/patch-src__osd__sdl__input.c emulators/mame/files/patch-src__osd__sdl__input.c
 --- /usr/ports/emulators/mame/files/patch-src__osd__sdl__input.c	2013-11-06 22:06:22.000000000 +0900
 +++ emulators/mame/files/patch-src__osd__sdl__input.c	1970-01-01 09:00:00.000000000 +0900
 @@ -1,14 +0,0 @@
 ---- src/osd/sdl/input.c.orig
 -+++ src/osd/sdl/input.c
 -@@ -720,7 +720,11 @@
 - 	mame_printf_verbose("Joystick: Start initialization\n");
 - 	for (physical_stick = 0; physical_stick < SDL_NumJoysticks(); physical_stick++)
 - 	{
 -+#if (SDLMAME_SDL2)
 -+		char *joy_name = remove_spaces(machine, SDL_JoystickNameForIndex(physical_stick));
 -+#else
 - 		char *joy_name = remove_spaces(machine, SDL_JoystickName(physical_stick));
 -+#endif
 - 
 - 		devmap_register(&joy_map, physical_stick, joy_name);
 - 	}
 diff -urN /usr/ports/emulators/mame/files/patch-src__osd__sdl__testkeys.c emulators/mame/files/patch-src__osd__sdl__testkeys.c
 --- /usr/ports/emulators/mame/files/patch-src__osd__sdl__testkeys.c	2013-11-06 22:06:22.000000000 +0900
 +++ emulators/mame/files/patch-src__osd__sdl__testkeys.c	1970-01-01 09:00:00.000000000 +0900
 @@ -1,18 +0,0 @@
 ---- src/osd/sdl/testkeys.c.orig
 -+++ src/osd/sdl/testkeys.c
 -@@ -146,7 +146,6 @@
 - 				printf("ITEM_ID_XY %s 0x%x 0x%x %s\n",
 - 					lookup_key_name(sdl_lookup, event.key.keysym.scancode),
 - 					(int) event.key.keysym.scancode,
 --					(int) event.key.keysym.unicode,
 - 					"");
 - 				lasttext[0] = 0;
 - #else
 -@@ -165,7 +164,6 @@
 - 			printf("ITEM_ID_XY %s 0x%x 0x%x %s\n",
 - 					lookup_key_name(sdl_lookup, event.key.keysym.scancode),
 - 					(int) event.key.keysym.scancode,
 --					(int) event.key.keysym.unicode,
 - 					lasttext);
 - #else
 - 			memset(buf, 0, 19);
 diff -urN /usr/ports/emulators/mame/pkg-plist emulators/mame/pkg-plist
 --- /usr/ports/emulators/mame/pkg-plist	2013-11-06 22:06:22.000000000 +0900
 +++ emulators/mame/pkg-plist	2013-11-26 00:00:00.000000000 +0900
 @@ -11,6 +11,7 @@
  %%PORTDOCS%%%%DOCSDIR%%/docs/hlsl.txt
  %%PORTDOCS%%%%DOCSDIR%%/docs/imgtool.txt
  %%PORTDOCS%%%%DOCSDIR%%/docs/license.txt
 +%%PORTDOCS%%%%DOCSDIR%%/docs/licenseinfo.txt
  %%PORTDOCS%%%%DOCSDIR%%/docs/m6502.txt
  %%PORTDOCS%%%%DOCSDIR%%/docs/mame.txt
  %%PORTDOCS%%%%DOCSDIR%%/docs/newvideo.txt
 @@ -127,7 +128,9 @@
  %%DATADIR%%/hash/ibm5140.xml
  %%DATADIR%%/hash/ibm5150.xml
  %%DATADIR%%/hash/ibm5150_cass.xml
 +%%DATADIR%%/hash/ibm5160_flop.xml
  %%DATADIR%%/hash/ibm5170.xml
 +%%DATADIR%%/hash/ibm5170_cdrom.xml
  %%DATADIR%%/hash/ibmpcjr_cart.xml
  %%DATADIR%%/hash/ibmpcjr_flop.xml
  %%DATADIR%%/hash/interact.xml
 
 --Multipart=_Tue__26_Nov_2013_03_00_00_+0900_Swa9a0F7itGP=ssN
 Content-Type: text/x-diff;
  name="emulators_mess.diff"
 Content-Disposition: attachment;
  filename="emulators_mess.diff"
 Content-Transfer-Encoding: 7bit
 
 diff -urN /usr/ports/emulators/mess/Makefile emulators/mess/Makefile
 --- /usr/ports/emulators/mess/Makefile	2013-11-20 21:29:32.000000000 +0900
 +++ emulators/mess/Makefile	2013-11-26 00:00:00.000000000 +0900
 @@ -2,15 +2,12 @@
  # $FreeBSD: head/emulators/mess/Makefile 334361 2013-11-19 23:08:44Z mat $
  
  PORTNAME=	mess
 -PORTVERSION=	0.150${PATCHSUFFIX}
 -PORTREVISION=	1
 +PORTVERSION=	0.151${PATCHSUFFIX}
  CATEGORIES=	emulators
 -MASTER_SITES=	SF/mame.mirror/MAME%20${PORTVERSION} \
 -		http://mame.mirrors.zippykid.com/releases/ \
 +MASTER_SITES=	http://mame.mirrors.zippykid.com/releases/ \
  		http://emumovies.com/aarongiles/releases/ \
  		http://mamedev.org/updates/:patchsets
 -DISTNAME=	mame${PORTVERSION:S/.//:C/p[0-9]*$//}s
 -DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 +DISTFILES=	mame${PORTVERSION:S/.//:C/p[0-9]*$//}s.zip \
  		${UPDATE_PATCHES:C/$/.zip:patchsets/}
  DIST_SUBDIR=	mame
  
 @@ -23,26 +20,22 @@
  		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
  RUN_DEPENDS=	liberation-fonts-ttf>=0:${PORTSDIR}/x11-fonts/liberation-fonts-ttf
  
 -OPTIONS_DEFINE=	SDL2 DEBUG DOCS EXAMPLES
 -OPTIONS_RADIO=	BUILTIN_DEBUGGER
 -OPTIONS_RADIO_BUILTIN_DEBUGGER=	GTK2 QT4
 +OPTIONS_DEFINE=	BUILTIN_DEBUGGER SDL2 DEBUG DOCS EXAMPLES
  SDL2_DESC=	SDL2 libraries support
  BUILTIN_DEBUGGER_DESC=	Builtin debugger support
  
  NO_WRKSUBDIR=	yes
  
 -USE_ZIP=	yes
 -USES=		gmake pkgconfig shebangfix dos2unix
 +USES=		gmake pkgconfig shebangfix
  SHEBANG_FILES=	src/emu/cpu/m6502/m6502make.py \
  		src/emu/cpu/m6809/m6809make.py \
  		src/emu/cpu/mcs96/mcs96make.py \
  		src/emu/cpu/tms57002/tmsmake.py
 -DOS2UNIX_FILES=	src/osd/sdl/input.c \
 -		src/osd/sdl/testkeys.c
  USE_XORG=	xext xi xinerama xrender
  USE_GL=		gl
 -USE_PYTHON_BUILD=yes
 +USE_PYTHON_BUILD=	-2.7
  MAKE_ENV=	NOWERROR=1 USE_NETWORK=1 \
 +		LD="${CXX}" PYTHON="${PYTHON_CMD}" \
  		OPT_FLAGS="${CXXFLAGS}" GCC_LDFLAGS="${LDFLAGS}" \
  		TARGET="${PORTNAME}" FULLNAME="${PORTNAME}"
  MAKEFILE=	makefile
 @@ -60,6 +53,12 @@
  
  .include <bsd.port.options.mk>
  
 +.if ${PORT_OPTIONS:MBUILTIN_DEBUGGER}
 +USE_QT4=	gui moc_build qmake_build
 +.else
 +MAKE_ENV+=	NO_DEBUGGER=1 NO_USE_QTDEBUG=1
 +.endif
 +
  .if ${PORT_OPTIONS:MSDL2}
  USE_SDL=	sdl2 ttf2
  MAKE_ENV+=	SDL_LIBVER="sdl2"
 @@ -71,43 +70,15 @@
  MAKE_ENV+=	DEBUG=1
  .endif
  
 -.if ${PORT_OPTIONS:MGTK2}
 -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+=	GTK_INCPATH="" \
 -		GTK_CCOMFLAGS="" \
 -		GTK_LIBS=""
 -.endif
 -
 -.if ${PORT_OPTIONS:MQT4}
 -USE_QT4=	gui moc_build qmake_build
 -.else
 -MAKE_ENV+=	NO_USE_QTDEBUG=1
 -.endif
 -
 -.if empty(PORT_OPTIONS:MGTK2) && empty(PORT_OPTIONS:MQT4)
 -MAKE_ENV+=	NO_DEBUGGER=1
 -.endif
 -
  .include <bsd.port.pre.mk>
  
 -.if exists(/usr/bin/clang) && ${OSVERSION} >= 900014
 -CC=		/usr/bin/clang
 -CPP=		/usr/bin/clang-cpp
 -CXX=		/usr/bin/clang++
 -.else
 -USE_GCC=	yes
 -.endif
 -
  .if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
  BROKEN=		Does not install on ia64, powerpc, or sparc64
  .endif
  
  post-extract:
 -	@${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${WRKDIR}/mame.zip ${EXTRACT_AFTER_ARGS}
 +	@(cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} mame.zip \
 +		${EXTRACT_AFTER_ARGS})
  	@${RM} -f ${WRKDIR}/mame.zip
  # Use post-extract target to get in before dos2unix-isation
  .if defined(UPDATE_PATCHES)
 @@ -120,12 +91,13 @@
  
  post-patch:
  	@${REINPLACE_CMD} -e \
 -		's|^BUILD_EXPAT|# BUILD_EXPAT| ; \
 -		 s|^BUILD_ZLIB|# BUILD_ZLIB| ; \
 -		 s|^BUILD_FLAC|# BUILD_FLAC| ; \
 -		 s|^BUILD_JPEGLIB|# BUILD_JPEGLIB| ; \
 -		 s| = @gcc| := $$(CC)| ; \
 -		 s| = @g++| := $$(CXX)| ; \
 +		'/^BUILD_EXPAT /s|^|#| ; \
 +		 /^BUILD_ZLIB /s|^|#| ; \
 +		 /^BUILD_FLAC /s|^|#| ; \
 +		 /^BUILD_JPEGLIB /s|^|#| ; \
 +		 /^CC /s|^|#| ; \
 +		 /^LD /s|^|#| ; \
 +		 /^PYTHON /s|^|#| ; \
  		 s|-O$$(OPTIMIZE)|| ; \
  		 /--warn-common/s|= -Wl,|= $$(GCC_LDFLAGS) -Wl,| ; \
  		 /LDFLAGS/s|-s|| ; \
 @@ -135,29 +107,26 @@
  		'/realloc/s|^|// |' ${WRKSRC}/src/emu/emualloc.h
  	@${REINPLACE_CMD} -e \
  		'/LIBS/s|-lpthread|-pthread| ; \
 -		 /-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)| ; \
 +		 /-isystem/s|^|#| ; \
  		 /X11R6/s|^|#|' ${WRKSRC}/src/osd/sdl/sdl.mak
  
  do-install:
  	(cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PORTNAME} \
 -		${STAGEDIR}/${PREFIX}/bin)
 -	@${MKDIR} ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}
 +		${STAGEDIR}${PREFIX}/bin)
 +	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}
  .for F in castool chdman imgtool jedutil ldresample ldverify romcmp \
  	testkeys unidasm
  	(cd ${WRKSRC} && ${INSTALL_PROGRAM} ${F} \
 -		${STAGEDIR}/${PREFIX}/libexec/${PORTNAME})
 +		${STAGEDIR}${PREFIX}/libexec/${PORTNAME})
  .endfor
 -	@${MKDIR} ${STAGEDIR}/${DATADIR}
 -	@(cd ${WRKSRC} && ${COPYTREE_SHARE} artwork ${STAGEDIR}/${DATADIR})
 -	@(cd ${WRKSRC} && ${COPYTREE_SHARE} hash ${STAGEDIR}/${DATADIR})
 +	@${MKDIR} ${STAGEDIR}${DATADIR}
 +	@(cd ${WRKSRC} && ${COPYTREE_SHARE} artwork ${STAGEDIR}${DATADIR})
 +	@(cd ${WRKSRC} && ${COPYTREE_SHARE} hash ${STAGEDIR}${DATADIR})
  	@(cd ${WRKSRC}/src/osd/sdl && ${COPYTREE_SHARE} keymaps \
 -		${STAGEDIR}/${DATADIR})
 -	@${MKDIR} ${STAGEDIR}/${DOCSDIR}
 -	@(cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${STAGEDIR}/${DOCSDIR})
 -	@${MKDIR} ${STAGEDIR}/${EXAMPLESDIR}
 -	(cd ${FILESDIR} && ${INSTALL_DATA} mess.ini ${STAGEDIR}/${EXAMPLESDIR})
 +		${STAGEDIR}${DATADIR})
 +	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 +	@(cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${STAGEDIR}${DOCSDIR})
 +	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 +	(cd ${FILESDIR} && ${INSTALL_DATA} mess.ini ${STAGEDIR}${EXAMPLESDIR})
  
  .include <bsd.port.post.mk>
 diff -urN /usr/ports/emulators/mess/distinfo emulators/mess/distinfo
 --- /usr/ports/emulators/mess/distinfo	2013-11-06 22:06:20.000000000 +0900
 +++ emulators/mess/distinfo	2013-11-26 00:00:00.000000000 +0900
 @@ -1,2 +1,2 @@
 -SHA256 (mame/mame0150s.zip) = e672b033baa001e1a909498b6c9206c68d0456fd883e410ad50f1a4f4c2253f7
 -SIZE (mame/mame0150s.zip) = 35999158
 +SHA256 (mame/mame0151s.zip) = 84ae6a40ea4652bb2211504704e479530ab0182fe5a18641a5dca6d80e4ed72e
 +SIZE (mame/mame0151s.zip) = 36052471
 diff -urN /usr/ports/emulators/mess/files/patch-src__osd__sdl__input.c emulators/mess/files/patch-src__osd__sdl__input.c
 --- /usr/ports/emulators/mess/files/patch-src__osd__sdl__input.c	2013-11-06 22:06:20.000000000 +0900
 +++ emulators/mess/files/patch-src__osd__sdl__input.c	1970-01-01 09:00:00.000000000 +0900
 @@ -1,14 +0,0 @@
 ---- src/osd/sdl/input.c.orig
 -+++ src/osd/sdl/input.c
 -@@ -720,7 +720,11 @@
 - 	mame_printf_verbose("Joystick: Start initialization\n");
 - 	for (physical_stick = 0; physical_stick < SDL_NumJoysticks(); physical_stick++)
 - 	{
 -+#if (SDLMAME_SDL2)
 -+		char *joy_name = remove_spaces(machine, SDL_JoystickNameForIndex(physical_stick));
 -+#else
 - 		char *joy_name = remove_spaces(machine, SDL_JoystickName(physical_stick));
 -+#endif
 - 
 - 		devmap_register(&joy_map, physical_stick, joy_name);
 - 	}
 diff -urN /usr/ports/emulators/mess/files/patch-src__osd__sdl__testkeys.c emulators/mess/files/patch-src__osd__sdl__testkeys.c
 --- /usr/ports/emulators/mess/files/patch-src__osd__sdl__testkeys.c	2013-11-06 22:06:20.000000000 +0900
 +++ emulators/mess/files/patch-src__osd__sdl__testkeys.c	1970-01-01 09:00:00.000000000 +0900
 @@ -1,38 +0,0 @@
 ---- src/osd/sdl/testkeys.c.orig	2013-10-30 21:16:48.577335486 +0100
 -+++ src/osd/sdl/testkeys.c	2013-10-30 21:27:06.551455870 +0100
 -@@ -146,7 +146,7 @@
 - 				printf("ITEM_ID_XY %s 0x%x 0x%x %s\n",
 - 					lookup_key_name(sdl_lookup, event.key.keysym.scancode),
 - 					(int) event.key.keysym.scancode,
 --					(int) event.key.keysym.unicode,
 -+					(int) event.key.keysym.mod,
 - 					"");
 - 				lasttext[0] = 0;
 - #else
 -@@ -155,7 +155,7 @@
 - 				printf("ITEM_ID_XY %s 0x%x 0x%x %s\n",
 - 					lookup_key_name(sdl_lookup, event.key.keysym.sym),
 - 					(int) event.key.keysym.scancode,
 --					(int) event.key.keysym.unicode,
 -+					(int) event.key.keysym.mod,
 - 					buf);
 - #endif
 - 			}
 -@@ -165,7 +165,7 @@
 - 			printf("ITEM_ID_XY %s 0x%x 0x%x %s\n",
 - 					lookup_key_name(sdl_lookup, event.key.keysym.scancode),
 - 					(int) event.key.keysym.scancode,
 --					(int) event.key.keysym.unicode,
 -+					(int) event.key.keysym.mod,
 - 					lasttext);
 - #else
 - 			memset(buf, 0, 19);
 -@@ -173,7 +173,7 @@
 - 			printf("ITEM_ID_XY %s 0x%x 0x%x %s\n",
 - 					lookup_key_name(sdl_lookup, event.key.keysym.sym),
 - 					(int) event.key.keysym.scancode,
 --					(int) event.key.keysym.unicode,
 -+					(int) event.key.keysym.mod,
 - 					buf);
 - #endif
 - 			break;
 diff -urN /usr/ports/emulators/mess/pkg-plist emulators/mess/pkg-plist
 --- /usr/ports/emulators/mess/pkg-plist	2013-11-06 22:06:20.000000000 +0900
 +++ emulators/mess/pkg-plist	2013-11-26 00:00:00.000000000 +0900
 @@ -13,6 +13,7 @@
  %%PORTDOCS%%%%DOCSDIR%%/docs/hlsl.txt
  %%PORTDOCS%%%%DOCSDIR%%/docs/imgtool.txt
  %%PORTDOCS%%%%DOCSDIR%%/docs/license.txt
 +%%PORTDOCS%%%%DOCSDIR%%/docs/licenseinfo.txt
  %%PORTDOCS%%%%DOCSDIR%%/docs/m6502.txt
  %%PORTDOCS%%%%DOCSDIR%%/docs/mame.txt
  %%PORTDOCS%%%%DOCSDIR%%/docs/newvideo.txt
 @@ -129,7 +130,9 @@
  %%DATADIR%%/hash/ibm5140.xml
  %%DATADIR%%/hash/ibm5150.xml
  %%DATADIR%%/hash/ibm5150_cass.xml
 +%%DATADIR%%/hash/ibm5160_flop.xml
  %%DATADIR%%/hash/ibm5170.xml
 +%%DATADIR%%/hash/ibm5170_cdrom.xml
  %%DATADIR%%/hash/ibmpcjr_cart.xml
  %%DATADIR%%/hash/ibmpcjr_flop.xml
  %%DATADIR%%/hash/interact.xml
 
 --Multipart=_Tue__26_Nov_2013_03_00_00_+0900_Swa9a0F7itGP=ssN
 Content-Type: text/x-diff;
  name="emulators_qmc2.diff"
 Content-Disposition: attachment;
  filename="emulators_qmc2.diff"
 Content-Transfer-Encoding: 7bit
 
 diff -urN /usr/ports/emulators/qmc2/Makefile emulators/qmc2/Makefile
 --- /usr/ports/emulators/qmc2/Makefile	2013-11-06 22:06:22.000000000 +0900
 +++ emulators/qmc2/Makefile	2013-11-26 00:00:00.000000000 +0900
 @@ -2,8 +2,7 @@
  # $FreeBSD: head/emulators/qmc2/Makefile 332169 2013-10-30 20:42:02Z pawel $
  
  PORTNAME=	qmc2
 -PORTVERSION=	0.40
 -PORTREVISION=	1
 +PORTVERSION=	0.41
  CATEGORIES=	emulators
  MASTER_SITES=	SF
  
 diff -urN /usr/ports/emulators/qmc2/distinfo emulators/qmc2/distinfo
 --- /usr/ports/emulators/qmc2/distinfo	2013-11-06 22:06:22.000000000 +0900
 +++ emulators/qmc2/distinfo	2013-11-26 00:00:00.000000000 +0900
 @@ -1,2 +1,2 @@
 -SHA256 (qmc2-0.40.tar.bz2) = 1119b991a93f9a29a1605219a05459aa1345397906eb7e32856d7ec96a2dc717
 -SIZE (qmc2-0.40.tar.bz2) = 17910405
 +SHA256 (qmc2-0.41.tar.bz2) = 4c37a1cc64f6799aaafe09133475f988d7221d198b2a23005138ed182038289b
 +SIZE (qmc2-0.41.tar.bz2) = 16353382
 
 --Multipart=_Tue__26_Nov_2013_03_00_00_+0900_Swa9a0F7itGP=ssN--

From: KATO Tsuguru <tkato432@yahoo.com>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/184246: emulators/mame: Update to version 0.151
Date: Sun, 15 Dec 2013 04:28:24 +0900

 This is a multi-part message in MIME format.
 
 --Multipart=_Sun__15_Dec_2013_04_28_24_+0900_+023D1cjUAUo9x31
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: 7bit
 
 Remake of the patch against current tree.
 
 --Multipart=_Sun__15_Dec_2013_04_28_24_+0900_+023D1cjUAUo9x31
 Content-Type: text/x-diff;
  name="emulators_mame.diff"
 Content-Disposition: attachment;
  filename="emulators_mame.diff"
 Content-Transfer-Encoding: 7bit
 
 diff -urN /usr/ports/emulators/mame/Makefile emulators/mame/Makefile
 --- /usr/ports/emulators/mame/Makefile	2013-11-25 18:57:44.000000000 +0900
 +++ emulators/mame/Makefile	2013-12-15 04:00:00.000000000 +0900
 @@ -2,15 +2,12 @@
  # $FreeBSD: head/emulators/mame/Makefile 334792 2013-11-24 21:09:22Z mva $
  
  PORTNAME=	mame
 -PORTVERSION=	0.150${PATCHSUFFIX}
 -PORTREVISION=	1
 +PORTVERSION=	0.151${PATCHSUFFIX}
  CATEGORIES=	emulators
 -MASTER_SITES=	SF/${PORTNAME}.mirror/${PORTNAME:U}%20${PORTVERSION} \
 -		http://mame.mirrors.zippykid.com/releases/ \
 +MASTER_SITES=	http://mame.mirrors.zippykid.com/releases/ \
  		http://emumovies.com/aarongiles/releases/ \
  		http://mamedev.org/updates/:patchsets
 -DISTNAME=	${PORTNAME}${PORTVERSION:S/.//:C/p[0-9]*$//}s
 -DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 +DISTFILES=	${PORTNAME}${PORTVERSION:S/.//:C/p[0-9]*$//}s.zip \
  		${UPDATE_PATCHES:C/$/.zip:patchsets/}
  DIST_SUBDIR=	${PORTNAME}
  
 @@ -23,26 +20,22 @@
  		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
  RUN_DEPENDS=	liberation-fonts-ttf>=0:${PORTSDIR}/x11-fonts/liberation-fonts-ttf
  
 -OPTIONS_DEFINE=	SDL2 DEBUG DOCS EXAMPLES
 -OPTIONS_RADIO=	BUILTIN_DEBUGGER
 -OPTIONS_RADIO_BUILTIN_DEBUGGER=	GTK2 QT4
 +OPTIONS_DEFINE=	BUILTIN_DEBUGGER SDL2 DEBUG DOCS EXAMPLES
  SDL2_DESC=	SDL2 libraries support
  BUILTIN_DEBUGGER_DESC=	Builtin debugger support
  
  NO_WRKSUBDIR=	yes
  
 -USE_ZIP=	yes
 -USES=		gmake pkgconfig shebangfix dos2unix
 +USES=		gmake pkgconfig shebangfix
  SHEBANG_FILES=	src/emu/cpu/m6502/m6502make.py \
  		src/emu/cpu/m6809/m6809make.py \
  		src/emu/cpu/mcs96/mcs96make.py \
  		src/emu/cpu/tms57002/tmsmake.py
 -DOS2UNIX_FILES=	src/osd/sdl/input.c \
 -		src/osd/sdl/testkeys.c
  USE_XORG=	xext xi xinerama xrender
  USE_GL=		gl
 -USE_PYTHON_BUILD=-2.7
 +USE_PYTHON_BUILD=	-2.7
  MAKE_ENV=	NOWERROR=1 USE_NETWORK=1 \
 +		LD="${CXX}" PYTHON="${PYTHON_CMD}" \
  		OPT_FLAGS="${CXXFLAGS}" GCC_LDFLAGS="${LDFLAGS}" \
  		TARGET="${PORTNAME}" FULLNAME="${PORTNAME}"
  MAKEFILE=	makefile
 @@ -60,6 +53,12 @@
  
  .include <bsd.port.options.mk>
  
 +.if ${PORT_OPTIONS:MBUILTIN_DEBUGGER}
 +USE_QT4=	gui moc_build qmake_build
 +.else
 +MAKE_ENV+=	NO_DEBUGGER=1 NO_USE_QTDEBUG=1
 +.endif
 +
  .if ${PORT_OPTIONS:MSDL2}
  USE_SDL=	sdl2 ttf2
  MAKE_ENV+=	SDL_LIBVER="sdl2"
 @@ -71,43 +70,15 @@
  MAKE_ENV+=	DEBUG=1
  .endif
  
 -.if ${PORT_OPTIONS:MGTK2}
 -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+=	GTK_INCPATH="" \
 -		GTK_CCOMFLAGS="" \
 -		GTK_LIBS=""
 -.endif
 -
 -.if ${PORT_OPTIONS:MQT4}
 -USE_QT4=	gui moc_build qmake_build
 -.else
 -MAKE_ENV+=	NO_USE_QTDEBUG=1
 -.endif
 -
 -.if empty(PORT_OPTIONS:MGTK2) && empty(PORT_OPTIONS:MQT4)
 -MAKE_ENV+=	NO_DEBUGGER=1
 -.endif
 -
  .include <bsd.port.pre.mk>
  
 -.if exists(/usr/bin/clang) && ${OSVERSION} >= 900014
 -CC=		/usr/bin/clang
 -CPP=		/usr/bin/clang-cpp
 -CXX=		/usr/bin/clang++
 -.else
 -USE_GCC=	yes
 -.endif
 -
  .if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
  BROKEN=		Does not install on ia64, powerpc, or sparc64
  .endif
  
  post-extract:
 -	@${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${WRKDIR}/mame.zip ${EXTRACT_AFTER_ARGS}
 +	@(cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} mame.zip \
 +		${EXTRACT_AFTER_ARGS})
  	@${RM} -f ${WRKDIR}/mame.zip
  # Use post-extract target to get in before dos2unix-isation
  .if defined(UPDATE_PATCHES)
 @@ -120,14 +91,14 @@
  
  post-patch:
  	@${REINPLACE_CMD} -e \
 -		's|^BUILD_EXPAT|# BUILD_EXPAT| ; \
 -		 s|^BUILD_ZLIB|# BUILD_ZLIB| ; \
 -		 s|^BUILD_FLAC|# BUILD_FLAC| ; \
 -		 s|^BUILD_JPEGLIB|# BUILD_JPEGLIB| ; \
 -		 s| = @gcc| := $$(CC)| ; \
 -		 s| = @g++| := $$(CXX)| ; \
 +		'/^BUILD_EXPAT /s|^|#| ; \
 +		 /^BUILD_ZLIB /s|^|#| ; \
 +		 /^BUILD_FLAC /s|^|#| ; \
 +		 /^BUILD_JPEGLIB /s|^|#| ; \
 +		 /^CC /s|^|#| ; \
 +		 /^LD /s|^|#| ; \
 +		 /^PYTHON /s|^|#| ; \
  		 s|-O$$(OPTIMIZE)|| ; \
 -		 s| = @python| = ${PYTHON_CMD}| ; \
  		 /--warn-common/s|= -Wl,|= $$(GCC_LDFLAGS) -Wl,| ; \
  		 /LDFLAGS/s|-s|| ; \
  		 /LIBS/s|-lstdc++|| ; \
 @@ -136,10 +107,7 @@
  		'/realloc/s|^|// |' ${WRKSRC}/src/emu/emualloc.h
  	@${REINPLACE_CMD} -e \
  		'/LIBS/s|-lpthread|-pthread| ; \
 -		 /-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)| ; \
 +		 /-isystem/s|^|#| ; \
  		 /X11R6/s|^|#|' ${WRKSRC}/src/osd/sdl/sdl.mak
  
  do-install:
 diff -urN /usr/ports/emulators/mame/distinfo emulators/mame/distinfo
 --- /usr/ports/emulators/mame/distinfo	2013-11-06 22:06:22.000000000 +0900
 +++ emulators/mame/distinfo	2013-12-15 04:00:00.000000000 +0900
 @@ -1,2 +1,2 @@
 -SHA256 (mame/mame0150s.zip) = e672b033baa001e1a909498b6c9206c68d0456fd883e410ad50f1a4f4c2253f7
 -SIZE (mame/mame0150s.zip) = 35999158
 +SHA256 (mame/mame0151s.zip) = 84ae6a40ea4652bb2211504704e479530ab0182fe5a18641a5dca6d80e4ed72e
 +SIZE (mame/mame0151s.zip) = 36052471
 diff -urN /usr/ports/emulators/mame/files/patch-src__osd__sdl__input.c emulators/mame/files/patch-src__osd__sdl__input.c
 --- /usr/ports/emulators/mame/files/patch-src__osd__sdl__input.c	2013-11-06 22:06:22.000000000 +0900
 +++ emulators/mame/files/patch-src__osd__sdl__input.c	1970-01-01 09:00:00.000000000 +0900
 @@ -1,14 +0,0 @@
 ---- src/osd/sdl/input.c.orig
 -+++ src/osd/sdl/input.c
 -@@ -720,7 +720,11 @@
 - 	mame_printf_verbose("Joystick: Start initialization\n");
 - 	for (physical_stick = 0; physical_stick < SDL_NumJoysticks(); physical_stick++)
 - 	{
 -+#if (SDLMAME_SDL2)
 -+		char *joy_name = remove_spaces(machine, SDL_JoystickNameForIndex(physical_stick));
 -+#else
 - 		char *joy_name = remove_spaces(machine, SDL_JoystickName(physical_stick));
 -+#endif
 - 
 - 		devmap_register(&joy_map, physical_stick, joy_name);
 - 	}
 diff -urN /usr/ports/emulators/mame/files/patch-src__osd__sdl__testkeys.c emulators/mame/files/patch-src__osd__sdl__testkeys.c
 --- /usr/ports/emulators/mame/files/patch-src__osd__sdl__testkeys.c	2013-11-06 22:06:22.000000000 +0900
 +++ emulators/mame/files/patch-src__osd__sdl__testkeys.c	1970-01-01 09:00:00.000000000 +0900
 @@ -1,18 +0,0 @@
 ---- src/osd/sdl/testkeys.c.orig
 -+++ src/osd/sdl/testkeys.c
 -@@ -146,7 +146,6 @@
 - 				printf("ITEM_ID_XY %s 0x%x 0x%x %s\n",
 - 					lookup_key_name(sdl_lookup, event.key.keysym.scancode),
 - 					(int) event.key.keysym.scancode,
 --					(int) event.key.keysym.unicode,
 - 					"");
 - 				lasttext[0] = 0;
 - #else
 -@@ -165,7 +164,6 @@
 - 			printf("ITEM_ID_XY %s 0x%x 0x%x %s\n",
 - 					lookup_key_name(sdl_lookup, event.key.keysym.scancode),
 - 					(int) event.key.keysym.scancode,
 --					(int) event.key.keysym.unicode,
 - 					lasttext);
 - #else
 - 			memset(buf, 0, 19);
 diff -urN /usr/ports/emulators/mame/pkg-plist emulators/mame/pkg-plist
 --- /usr/ports/emulators/mame/pkg-plist	2013-11-06 22:06:22.000000000 +0900
 +++ emulators/mame/pkg-plist	2013-12-15 04:00:00.000000000 +0900
 @@ -11,6 +11,7 @@
  %%PORTDOCS%%%%DOCSDIR%%/docs/hlsl.txt
  %%PORTDOCS%%%%DOCSDIR%%/docs/imgtool.txt
  %%PORTDOCS%%%%DOCSDIR%%/docs/license.txt
 +%%PORTDOCS%%%%DOCSDIR%%/docs/licenseinfo.txt
  %%PORTDOCS%%%%DOCSDIR%%/docs/m6502.txt
  %%PORTDOCS%%%%DOCSDIR%%/docs/mame.txt
  %%PORTDOCS%%%%DOCSDIR%%/docs/newvideo.txt
 @@ -127,7 +128,9 @@
  %%DATADIR%%/hash/ibm5140.xml
  %%DATADIR%%/hash/ibm5150.xml
  %%DATADIR%%/hash/ibm5150_cass.xml
 +%%DATADIR%%/hash/ibm5160_flop.xml
  %%DATADIR%%/hash/ibm5170.xml
 +%%DATADIR%%/hash/ibm5170_cdrom.xml
  %%DATADIR%%/hash/ibmpcjr_cart.xml
  %%DATADIR%%/hash/ibmpcjr_flop.xml
  %%DATADIR%%/hash/interact.xml
 
 --Multipart=_Sun__15_Dec_2013_04_28_24_+0900_+023D1cjUAUo9x31
 Content-Type: text/x-diff;
  name="emulators_mess.diff"
 Content-Disposition: attachment;
  filename="emulators_mess.diff"
 Content-Transfer-Encoding: 7bit
 
 diff -urN /usr/ports/emulators/mess/Makefile emulators/mess/Makefile
 --- /usr/ports/emulators/mess/Makefile	2013-12-15 03:47:03.000000000 +0900
 +++ emulators/mess/Makefile	2013-12-15 04:00:00.000000000 +0900
 @@ -2,15 +2,12 @@
  # $FreeBSD: head/emulators/mess/Makefile 336466 2013-12-14 18:34:01Z mva $
  
  PORTNAME=	mess
 -PORTVERSION=	0.150${PATCHSUFFIX}
 -PORTREVISION=	1
 +PORTVERSION=	0.151${PATCHSUFFIX}
  CATEGORIES=	emulators
 -MASTER_SITES=	SF/mame.mirror/MAME%20${PORTVERSION} \
 -		http://mame.mirrors.zippykid.com/releases/ \
 +MASTER_SITES=	http://mame.mirrors.zippykid.com/releases/ \
  		http://emumovies.com/aarongiles/releases/ \
  		http://mamedev.org/updates/:patchsets
 -DISTNAME=	mame${PORTVERSION:S/.//:C/p[0-9]*$//}s
 -DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 +DISTFILES=	mame${PORTVERSION:S/.//:C/p[0-9]*$//}s.zip \
  		${UPDATE_PATCHES:C/$/.zip:patchsets/}
  DIST_SUBDIR=	mame
  
 @@ -23,26 +20,22 @@
  		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
  RUN_DEPENDS=	liberation-fonts-ttf>=0:${PORTSDIR}/x11-fonts/liberation-fonts-ttf
  
 -OPTIONS_DEFINE=	SDL2 DEBUG DOCS EXAMPLES
 -OPTIONS_RADIO=	BUILTIN_DEBUGGER
 -OPTIONS_RADIO_BUILTIN_DEBUGGER=	GTK2 QT4
 +OPTIONS_DEFINE=	BUILTIN_DEBUGGER SDL2 DEBUG DOCS EXAMPLES
  SDL2_DESC=	SDL2 libraries support
  BUILTIN_DEBUGGER_DESC=	Builtin debugger support
  
  NO_WRKSUBDIR=	yes
  
 -USE_ZIP=	yes
 -USES=		gmake pkgconfig shebangfix dos2unix
 +USES=		gmake pkgconfig shebangfix
  SHEBANG_FILES=	src/emu/cpu/m6502/m6502make.py \
  		src/emu/cpu/m6809/m6809make.py \
  		src/emu/cpu/mcs96/mcs96make.py \
  		src/emu/cpu/tms57002/tmsmake.py
 -DOS2UNIX_FILES=	src/osd/sdl/input.c \
 -		src/osd/sdl/testkeys.c
  USE_XORG=	xext xi xinerama xrender
  USE_GL=		gl
 -USE_PYTHON_BUILD=yes
 +USE_PYTHON_BUILD=	-2.7
  MAKE_ENV=	NOWERROR=1 USE_NETWORK=1 \
 +		LD="${CXX}" PYTHON="${PYTHON_CMD}" \
  		OPT_FLAGS="${CXXFLAGS}" GCC_LDFLAGS="${LDFLAGS}" \
  		TARGET="${PORTNAME}" FULLNAME="${PORTNAME}"
  MAKEFILE=	makefile
 @@ -60,6 +53,12 @@
  
  .include <bsd.port.options.mk>
  
 +.if ${PORT_OPTIONS:MBUILTIN_DEBUGGER}
 +USE_QT4=	gui moc_build qmake_build
 +.else
 +MAKE_ENV+=	NO_DEBUGGER=1 NO_USE_QTDEBUG=1
 +.endif
 +
  .if ${PORT_OPTIONS:MSDL2}
  USE_SDL=	sdl2 ttf2
  MAKE_ENV+=	SDL_LIBVER="sdl2"
 @@ -71,43 +70,15 @@
  MAKE_ENV+=	DEBUG=1
  .endif
  
 -.if ${PORT_OPTIONS:MGTK2}
 -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+=	GTK_INCPATH="" \
 -		GTK_CCOMFLAGS="" \
 -		GTK_LIBS=""
 -.endif
 -
 -.if ${PORT_OPTIONS:MQT4}
 -USE_QT4=	gui moc_build qmake_build
 -.else
 -MAKE_ENV+=	NO_USE_QTDEBUG=1
 -.endif
 -
 -.if empty(PORT_OPTIONS:MGTK2) && empty(PORT_OPTIONS:MQT4)
 -MAKE_ENV+=	NO_DEBUGGER=1
 -.endif
 -
  .include <bsd.port.pre.mk>
  
 -.if exists(/usr/bin/clang) && ${OSVERSION} >= 900014
 -CC=		/usr/bin/clang
 -CPP=		/usr/bin/clang-cpp
 -CXX=		/usr/bin/clang++
 -.else
 -USE_GCC=	yes
 -.endif
 -
  .if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
  BROKEN=		Does not install on ia64, powerpc, or sparc64
  .endif
  
  post-extract:
 -	@${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${WRKDIR}/mame.zip ${EXTRACT_AFTER_ARGS}
 +	@(cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} mame.zip \
 +		${EXTRACT_AFTER_ARGS})
  	@${RM} -f ${WRKDIR}/mame.zip
  # Use post-extract target to get in before dos2unix-isation
  .if defined(UPDATE_PATCHES)
 @@ -120,13 +91,13 @@
  
  post-patch:
  	@${REINPLACE_CMD} -e \
 -		's|^BUILD_EXPAT|# BUILD_EXPAT| ; \
 -		 s|^BUILD_ZLIB|# BUILD_ZLIB| ; \
 -		 s|^BUILD_FLAC|# BUILD_FLAC| ; \
 -		 s|^BUILD_JPEGLIB|# BUILD_JPEGLIB| ; \
 -		 s| = @gcc| := $$(CC)| ; \
 -		 s| = @g++| := $$(CXX)| ; \
 -		 s| = @python| := @${PYTHON_CMD}| ; \
 +		'/^BUILD_EXPAT /s|^|#| ; \
 +		 /^BUILD_ZLIB /s|^|#| ; \
 +		 /^BUILD_FLAC /s|^|#| ; \
 +		 /^BUILD_JPEGLIB /s|^|#| ; \
 +		 /^CC /s|^|#| ; \
 +		 /^LD /s|^|#| ; \
 +		 /^PYTHON /s|^|#| ; \
  		 s|-O$$(OPTIMIZE)|| ; \
  		 /--warn-common/s|= -Wl,|= $$(GCC_LDFLAGS) -Wl,| ; \
  		 /LDFLAGS/s|-s|| ; \
 @@ -136,29 +107,26 @@
  		'/realloc/s|^|// |' ${WRKSRC}/src/emu/emualloc.h
  	@${REINPLACE_CMD} -e \
  		'/LIBS/s|-lpthread|-pthread| ; \
 -		 /-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)| ; \
 +		 /-isystem/s|^|#| ; \
  		 /X11R6/s|^|#|' ${WRKSRC}/src/osd/sdl/sdl.mak
  
  do-install:
  	(cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PORTNAME} \
 -		${STAGEDIR}/${PREFIX}/bin)
 -	@${MKDIR} ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}
 +		${STAGEDIR}${PREFIX}/bin)
 +	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}
  .for F in castool chdman imgtool jedutil ldresample ldverify romcmp \
  	testkeys unidasm
  	(cd ${WRKSRC} && ${INSTALL_PROGRAM} ${F} \
 -		${STAGEDIR}/${PREFIX}/libexec/${PORTNAME})
 +		${STAGEDIR}${PREFIX}/libexec/${PORTNAME})
  .endfor
 -	@${MKDIR} ${STAGEDIR}/${DATADIR}
 -	@(cd ${WRKSRC} && ${COPYTREE_SHARE} artwork ${STAGEDIR}/${DATADIR})
 -	@(cd ${WRKSRC} && ${COPYTREE_SHARE} hash ${STAGEDIR}/${DATADIR})
 +	@${MKDIR} ${STAGEDIR}${DATADIR}
 +	@(cd ${WRKSRC} && ${COPYTREE_SHARE} artwork ${STAGEDIR}${DATADIR})
 +	@(cd ${WRKSRC} && ${COPYTREE_SHARE} hash ${STAGEDIR}${DATADIR})
  	@(cd ${WRKSRC}/src/osd/sdl && ${COPYTREE_SHARE} keymaps \
 -		${STAGEDIR}/${DATADIR})
 -	@${MKDIR} ${STAGEDIR}/${DOCSDIR}
 -	@(cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${STAGEDIR}/${DOCSDIR})
 -	@${MKDIR} ${STAGEDIR}/${EXAMPLESDIR}
 -	(cd ${FILESDIR} && ${INSTALL_DATA} mess.ini ${STAGEDIR}/${EXAMPLESDIR})
 +		${STAGEDIR}${DATADIR})
 +	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 +	@(cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${STAGEDIR}${DOCSDIR})
 +	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 +	(cd ${FILESDIR} && ${INSTALL_DATA} mess.ini ${STAGEDIR}${EXAMPLESDIR})
  
  .include <bsd.port.post.mk>
 diff -urN /usr/ports/emulators/mess/distinfo emulators/mess/distinfo
 --- /usr/ports/emulators/mess/distinfo	2013-11-06 22:06:20.000000000 +0900
 +++ emulators/mess/distinfo	2013-12-15 04:00:00.000000000 +0900
 @@ -1,2 +1,2 @@
 -SHA256 (mame/mame0150s.zip) = e672b033baa001e1a909498b6c9206c68d0456fd883e410ad50f1a4f4c2253f7
 -SIZE (mame/mame0150s.zip) = 35999158
 +SHA256 (mame/mame0151s.zip) = 84ae6a40ea4652bb2211504704e479530ab0182fe5a18641a5dca6d80e4ed72e
 +SIZE (mame/mame0151s.zip) = 36052471
 diff -urN /usr/ports/emulators/mess/files/patch-src__osd__sdl__input.c emulators/mess/files/patch-src__osd__sdl__input.c
 --- /usr/ports/emulators/mess/files/patch-src__osd__sdl__input.c	2013-11-06 22:06:20.000000000 +0900
 +++ emulators/mess/files/patch-src__osd__sdl__input.c	1970-01-01 09:00:00.000000000 +0900
 @@ -1,14 +0,0 @@
 ---- src/osd/sdl/input.c.orig
 -+++ src/osd/sdl/input.c
 -@@ -720,7 +720,11 @@
 - 	mame_printf_verbose("Joystick: Start initialization\n");
 - 	for (physical_stick = 0; physical_stick < SDL_NumJoysticks(); physical_stick++)
 - 	{
 -+#if (SDLMAME_SDL2)
 -+		char *joy_name = remove_spaces(machine, SDL_JoystickNameForIndex(physical_stick));
 -+#else
 - 		char *joy_name = remove_spaces(machine, SDL_JoystickName(physical_stick));
 -+#endif
 - 
 - 		devmap_register(&joy_map, physical_stick, joy_name);
 - 	}
 diff -urN /usr/ports/emulators/mess/files/patch-src__osd__sdl__testkeys.c emulators/mess/files/patch-src__osd__sdl__testkeys.c
 --- /usr/ports/emulators/mess/files/patch-src__osd__sdl__testkeys.c	2013-11-06 22:06:20.000000000 +0900
 +++ emulators/mess/files/patch-src__osd__sdl__testkeys.c	1970-01-01 09:00:00.000000000 +0900
 @@ -1,38 +0,0 @@
 ---- src/osd/sdl/testkeys.c.orig	2013-10-30 21:16:48.577335486 +0100
 -+++ src/osd/sdl/testkeys.c	2013-10-30 21:27:06.551455870 +0100
 -@@ -146,7 +146,7 @@
 - 				printf("ITEM_ID_XY %s 0x%x 0x%x %s\n",
 - 					lookup_key_name(sdl_lookup, event.key.keysym.scancode),
 - 					(int) event.key.keysym.scancode,
 --					(int) event.key.keysym.unicode,
 -+					(int) event.key.keysym.mod,
 - 					"");
 - 				lasttext[0] = 0;
 - #else
 -@@ -155,7 +155,7 @@
 - 				printf("ITEM_ID_XY %s 0x%x 0x%x %s\n",
 - 					lookup_key_name(sdl_lookup, event.key.keysym.sym),
 - 					(int) event.key.keysym.scancode,
 --					(int) event.key.keysym.unicode,
 -+					(int) event.key.keysym.mod,
 - 					buf);
 - #endif
 - 			}
 -@@ -165,7 +165,7 @@
 - 			printf("ITEM_ID_XY %s 0x%x 0x%x %s\n",
 - 					lookup_key_name(sdl_lookup, event.key.keysym.scancode),
 - 					(int) event.key.keysym.scancode,
 --					(int) event.key.keysym.unicode,
 -+					(int) event.key.keysym.mod,
 - 					lasttext);
 - #else
 - 			memset(buf, 0, 19);
 -@@ -173,7 +173,7 @@
 - 			printf("ITEM_ID_XY %s 0x%x 0x%x %s\n",
 - 					lookup_key_name(sdl_lookup, event.key.keysym.sym),
 - 					(int) event.key.keysym.scancode,
 --					(int) event.key.keysym.unicode,
 -+					(int) event.key.keysym.mod,
 - 					buf);
 - #endif
 - 			break;
 diff -urN /usr/ports/emulators/mess/pkg-plist emulators/mess/pkg-plist
 --- /usr/ports/emulators/mess/pkg-plist	2013-11-06 22:06:20.000000000 +0900
 +++ emulators/mess/pkg-plist	2013-12-15 04:00:00.000000000 +0900
 @@ -13,6 +13,7 @@
  %%PORTDOCS%%%%DOCSDIR%%/docs/hlsl.txt
  %%PORTDOCS%%%%DOCSDIR%%/docs/imgtool.txt
  %%PORTDOCS%%%%DOCSDIR%%/docs/license.txt
 +%%PORTDOCS%%%%DOCSDIR%%/docs/licenseinfo.txt
  %%PORTDOCS%%%%DOCSDIR%%/docs/m6502.txt
  %%PORTDOCS%%%%DOCSDIR%%/docs/mame.txt
  %%PORTDOCS%%%%DOCSDIR%%/docs/newvideo.txt
 @@ -129,7 +130,9 @@
  %%DATADIR%%/hash/ibm5140.xml
  %%DATADIR%%/hash/ibm5150.xml
  %%DATADIR%%/hash/ibm5150_cass.xml
 +%%DATADIR%%/hash/ibm5160_flop.xml
  %%DATADIR%%/hash/ibm5170.xml
 +%%DATADIR%%/hash/ibm5170_cdrom.xml
  %%DATADIR%%/hash/ibmpcjr_cart.xml
  %%DATADIR%%/hash/ibmpcjr_flop.xml
  %%DATADIR%%/hash/interact.xml
 
 --Multipart=_Sun__15_Dec_2013_04_28_24_+0900_+023D1cjUAUo9x31
 Content-Type: text/x-diff;
  name="emulators_qmc2.diff"
 Content-Disposition: attachment;
  filename="emulators_qmc2.diff"
 Content-Transfer-Encoding: 7bit
 
 diff -urN /usr/ports/emulators/qmc2/Makefile emulators/qmc2/Makefile
 --- /usr/ports/emulators/qmc2/Makefile	2013-11-06 22:06:22.000000000 +0900
 +++ emulators/qmc2/Makefile	2013-12-15 04:00:00.000000000 +0900
 @@ -2,8 +2,7 @@
  # $FreeBSD: head/emulators/qmc2/Makefile 332169 2013-10-30 20:42:02Z pawel $
  
  PORTNAME=	qmc2
 -PORTVERSION=	0.40
 -PORTREVISION=	1
 +PORTVERSION=	0.41
  CATEGORIES=	emulators
  MASTER_SITES=	SF
  
 diff -urN /usr/ports/emulators/qmc2/distinfo emulators/qmc2/distinfo
 --- /usr/ports/emulators/qmc2/distinfo	2013-11-06 22:06:22.000000000 +0900
 +++ emulators/qmc2/distinfo	2013-12-15 04:00:00.000000000 +0900
 @@ -1,2 +1,2 @@
 -SHA256 (qmc2-0.40.tar.bz2) = 1119b991a93f9a29a1605219a05459aa1345397906eb7e32856d7ec96a2dc717
 -SIZE (qmc2-0.40.tar.bz2) = 17910405
 +SHA256 (qmc2-0.41.tar.bz2) = 4c37a1cc64f6799aaafe09133475f988d7221d198b2a23005138ed182038289b
 +SIZE (qmc2-0.41.tar.bz2) = 16353382
 
 --Multipart=_Sun__15_Dec_2013_04_28_24_+0900_+023D1cjUAUo9x31--
Responsible-Changed-From-To: freebsd-ports-bugs->danilo 
Responsible-Changed-By: danilo 
Responsible-Changed-When: Wed Dec 25 20:23:25 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

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

From: KATO Tsuguru <tkato432@yahoo.com>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/184246: emulators/mame: Update to version 0.151
Date: Thu, 16 Jan 2014 02:58:12 +0900

 This is a multi-part message in MIME format.
 
 --Multipart=_Thu__16_Jan_2014_02_58_12_+0900_8Ma+m6B+wBJsgoya
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: 7bit
 
 Version 0.152 has been released.
 
 --Multipart=_Thu__16_Jan_2014_02_58_12_+0900_8Ma+m6B+wBJsgoya
 Content-Type: text/x-diff;
  name="emulators_mame.diff"
 Content-Disposition: attachment;
  filename="emulators_mame.diff"
 Content-Transfer-Encoding: 7bit
 
 diff -urN /usr/ports/emulators/mame/Makefile emulators/mame/Makefile
 --- /usr/ports/emulators/mame/Makefile	2014-01-14 14:05:51.000000000 +0900
 +++ emulators/mame/Makefile	2014-01-16 00:00:00.000000000 +0900
 @@ -2,15 +2,12 @@
  # $FreeBSD: head/emulators/mame/Makefile 339634 2014-01-13 21:00:02Z rene $
  
  PORTNAME=	mame
 -PORTVERSION=	0.150${PATCHSUFFIX}
 -PORTREVISION=	1
 +PORTVERSION=	0.152${PATCHSUFFIX}
  CATEGORIES=	emulators
 -MASTER_SITES=	SF/${PORTNAME}.mirror/${PORTNAME:U}%20${PORTVERSION} \
 -		http://mame.mirrors.zippykid.com/releases/ \
 +MASTER_SITES=	http://mame.mirrors.zippykid.com/releases/ \
  		http://emumovies.com/aarongiles/releases/ \
  		http://mamedev.org/updates/:patchsets
 -DISTNAME=	${PORTNAME}${PORTVERSION:S/.//:C/p[0-9]*$//}s
 -DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 +DISTFILES=	${PORTNAME}${PORTVERSION:S/.//:C/p[0-9]*$//}s.zip \
  		${UPDATE_PATCHES:C/$/.zip:patchsets/}
  DIST_SUBDIR=	${PORTNAME}
  
 @@ -23,26 +20,24 @@
  		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
  RUN_DEPENDS=	liberation-fonts-ttf>=0:${PORTSDIR}/x11-fonts/liberation-fonts-ttf
  
 -OPTIONS_DEFINE=	SDL2 DEBUG DOCS EXAMPLES
 -OPTIONS_RADIO=	BUILTIN_DEBUGGER
 -OPTIONS_RADIO_BUILTIN_DEBUGGER=	GTK2 QT4
 -SDL2_DESC=	SDL2 libraries support
 +OPTIONS_DEFINE=	BUILTIN_DEBUGGER DEBUG DOCS EXAMPLES SDL2
  BUILTIN_DEBUGGER_DESC=	Builtin debugger support
 +SDL2_DESC=	SDL2 libraries support
  
  NO_WRKSUBDIR=	yes
  
 -USE_ZIP=	yes
 -USES=		gmake pkgconfig shebangfix dos2unix
 +USES=		dos2unix gmake pkgconfig shebangfix
 +DOS2UNIX_FILES=	src/emu/netlist/nl_base.h \
 +		src/emu/netlist/pstate.h
  SHEBANG_FILES=	src/emu/cpu/m6502/m6502make.py \
  		src/emu/cpu/m6809/m6809make.py \
  		src/emu/cpu/mcs96/mcs96make.py \
  		src/emu/cpu/tms57002/tmsmake.py
 -DOS2UNIX_FILES=	src/osd/sdl/input.c \
 -		src/osd/sdl/testkeys.c
  USE_XORG=	xext xi xinerama xrender
  USE_GL=		gl
  USE_PYTHON_BUILD=2
  MAKE_ENV=	NOWERROR=1 USE_NETWORK=1 \
 +		LD="${CXX}" PYTHON="${PYTHON_CMD}" \
  		OPT_FLAGS="${CXXFLAGS}" GCC_LDFLAGS="${LDFLAGS}" \
  		TARGET="${PORTNAME}" FULLNAME="${PORTNAME}"
  MAKEFILE=	makefile
 @@ -60,6 +55,12 @@
  
  .include <bsd.port.options.mk>
  
 +.if ${PORT_OPTIONS:MBUILTIN_DEBUGGER}
 +USE_QT4=	gui moc_build qmake_build
 +.else
 +MAKE_ENV+=	NO_DEBUGGER=1 NO_USE_QTDEBUG=1
 +.endif
 +
  .if ${PORT_OPTIONS:MSDL2}
  USE_SDL=	sdl2 ttf2
  MAKE_ENV+=	SDL_LIBVER="sdl2"
 @@ -71,43 +72,15 @@
  MAKE_ENV+=	DEBUG=1
  .endif
  
 -.if ${PORT_OPTIONS:MGTK2}
 -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+=	GTK_INCPATH="" \
 -		GTK_CCOMFLAGS="" \
 -		GTK_LIBS=""
 -.endif
 -
 -.if ${PORT_OPTIONS:MQT4}
 -USE_QT4=	gui moc_build qmake_build
 -.else
 -MAKE_ENV+=	NO_USE_QTDEBUG=1
 -.endif
 -
 -.if empty(PORT_OPTIONS:MGTK2) && empty(PORT_OPTIONS:MQT4)
 -MAKE_ENV+=	NO_DEBUGGER=1
 -.endif
 -
  .include <bsd.port.pre.mk>
  
 -.if exists(/usr/bin/clang) && ${OSVERSION} >= 900014
 -CC=		/usr/bin/clang
 -CPP=		/usr/bin/clang-cpp
 -CXX=		/usr/bin/clang++
 -.else
 -USE_GCC=	yes
 -.endif
 -
  .if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
  BROKEN=		Does not install on ia64, powerpc, or sparc64
  .endif
  
  post-extract:
 -	@${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${WRKDIR}/mame.zip ${EXTRACT_AFTER_ARGS}
 +	@(cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} mame.zip \
 +		${EXTRACT_AFTER_ARGS})
  	@${RM} -f ${WRKDIR}/mame.zip
  # Use post-extract target to get in before dos2unix-isation
  .if defined(UPDATE_PATCHES)
 @@ -120,14 +93,14 @@
  
  post-patch:
  	@${REINPLACE_CMD} -e \
 -		's|^BUILD_EXPAT|# BUILD_EXPAT| ; \
 -		 s|^BUILD_ZLIB|# BUILD_ZLIB| ; \
 -		 s|^BUILD_FLAC|# BUILD_FLAC| ; \
 -		 s|^BUILD_JPEGLIB|# BUILD_JPEGLIB| ; \
 -		 s| = @gcc| := $$(CC)| ; \
 -		 s| = @g++| := $$(CXX)| ; \
 +		'/^BUILD_EXPAT /s|^|#| ; \
 +		 /^BUILD_ZLIB /s|^|#| ; \
 +		 /^BUILD_FLAC /s|^|#| ; \
 +		 /^BUILD_JPEGLIB /s|^|#| ; \
 +		 /^CC /s|^|#| ; \
 +		 /^LD /s|^|#| ; \
 +		 /^PYTHON /s|^|#| ; \
  		 s|-O$$(OPTIMIZE)|| ; \
 -		 s| = @python| = ${PYTHON_CMD}| ; \
  		 /--warn-common/s|= -Wl,|= $$(GCC_LDFLAGS) -Wl,| ; \
  		 /LDFLAGS/s|-s|| ; \
  		 /LIBS/s|-lstdc++|| ; \
 @@ -136,10 +109,7 @@
  		'/realloc/s|^|// |' ${WRKSRC}/src/emu/emualloc.h
  	@${REINPLACE_CMD} -e \
  		'/LIBS/s|-lpthread|-pthread| ; \
 -		 /-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)| ; \
 +		 /-isystem/s|^|#| ; \
  		 /X11R6/s|^|#|' ${WRKSRC}/src/osd/sdl/sdl.mak
  
  do-install:
 diff -urN /usr/ports/emulators/mame/distinfo emulators/mame/distinfo
 --- /usr/ports/emulators/mame/distinfo	2013-11-06 22:06:22.000000000 +0900
 +++ emulators/mame/distinfo	2014-01-16 00:00:00.000000000 +0900
 @@ -1,2 +1,2 @@
 -SHA256 (mame/mame0150s.zip) = e672b033baa001e1a909498b6c9206c68d0456fd883e410ad50f1a4f4c2253f7
 -SIZE (mame/mame0150s.zip) = 35999158
 +SHA256 (mame/mame0152s.zip) = dd245297824e0b3938312c74aee31e1d32798d093bbf19f857de56bbd1ea4bdf
 +SIZE (mame/mame0152s.zip) = 36247883
 diff -urN /usr/ports/emulators/mame/files/patch-src__emu__netlist__nl_base.h emulators/mame/files/patch-src__emu__netlist__nl_base.h
 --- /usr/ports/emulators/mame/files/patch-src__emu__netlist__nl_base.h	1970-01-01 09:00:00.000000000 +0900
 +++ emulators/mame/files/patch-src__emu__netlist__nl_base.h	2014-01-16 00:00:00.000000000 +0900
 @@ -0,0 +1,20 @@
 +--- src/emu/netlist/nl_base.h.orig
 ++++ src/emu/netlist/nl_base.h
 +@@ -287,7 +287,7 @@
 + 
 + 	ATTR_COLD const pstring &name() const;
 + 
 +-	PSTATE_INTERFACE(*m_netlist, name())
 ++	PSTATE_INTERFACE_DECL()
 + 
 + #if 0
 + 	template<class C> ATTR_COLD void save(C &state, const pstring &stname)
 +@@ -1120,6 +1120,8 @@
 + // Inline implementations
 + // ----------------------------------------------------------------------------------------
 + 
 ++PSTATE_INTERFACE(netlist_object_t, m_netlist, name())
 ++
 + ATTR_HOT inline void netlist_param_str_t::setTo(const pstring &param)
 + {
 + 	m_param = param;
 diff -urN /usr/ports/emulators/mame/files/patch-src__emu__netlist__pstate.h emulators/mame/files/patch-src__emu__netlist__pstate.h
 --- /usr/ports/emulators/mame/files/patch-src__emu__netlist__pstate.h	1970-01-01 09:00:00.000000000 +0900
 +++ emulators/mame/files/patch-src__emu__netlist__pstate.h	2014-01-16 00:00:00.000000000 +0900
 @@ -0,0 +1,19 @@
 +--- src/emu/netlist/pstate.h.orig
 ++++ src/emu/netlist/pstate.h
 +@@ -15,10 +15,13 @@
 + // state saving ...
 + // ----------------------------------------------------------------------------------------
 + 
 +-#define PSTATE_INTERFACE(manager, module)               \
 +-	template<class C> ATTR_COLD void save(C &state, const pstring &stname) \
 ++#define PSTATE_INTERFACE_DECL()               \
 ++	template<class C> ATTR_COLD void save(C &state, const pstring &stname);
 ++
 ++#define PSTATE_INTERFACE(obj, manager, module)               \
 ++	template<class C> ATTR_COLD void obj::save(C &state, const pstring &stname) \
 + 	{                                                                       \
 +-		dynamic_cast<pstate_manager_t &>(manager).save_manager(state, module + "." + stname);  \
 ++		manager->save_manager(state, module + "." + stname);  \
 + 	}
 + 
 + enum netlist_data_type_e {
 diff -urN /usr/ports/emulators/mame/files/patch-src__osd__sdl__input.c emulators/mame/files/patch-src__osd__sdl__input.c
 --- /usr/ports/emulators/mame/files/patch-src__osd__sdl__input.c	2013-11-06 22:06:22.000000000 +0900
 +++ emulators/mame/files/patch-src__osd__sdl__input.c	1970-01-01 09:00:00.000000000 +0900
 @@ -1,14 +0,0 @@
 ---- src/osd/sdl/input.c.orig
 -+++ src/osd/sdl/input.c
 -@@ -720,7 +720,11 @@
 - 	mame_printf_verbose("Joystick: Start initialization\n");
 - 	for (physical_stick = 0; physical_stick < SDL_NumJoysticks(); physical_stick++)
 - 	{
 -+#if (SDLMAME_SDL2)
 -+		char *joy_name = remove_spaces(machine, SDL_JoystickNameForIndex(physical_stick));
 -+#else
 - 		char *joy_name = remove_spaces(machine, SDL_JoystickName(physical_stick));
 -+#endif
 - 
 - 		devmap_register(&joy_map, physical_stick, joy_name);
 - 	}
 diff -urN /usr/ports/emulators/mame/files/patch-src__osd__sdl__testkeys.c emulators/mame/files/patch-src__osd__sdl__testkeys.c
 --- /usr/ports/emulators/mame/files/patch-src__osd__sdl__testkeys.c	2013-11-06 22:06:22.000000000 +0900
 +++ emulators/mame/files/patch-src__osd__sdl__testkeys.c	1970-01-01 09:00:00.000000000 +0900
 @@ -1,18 +0,0 @@
 ---- src/osd/sdl/testkeys.c.orig
 -+++ src/osd/sdl/testkeys.c
 -@@ -146,7 +146,6 @@
 - 				printf("ITEM_ID_XY %s 0x%x 0x%x %s\n",
 - 					lookup_key_name(sdl_lookup, event.key.keysym.scancode),
 - 					(int) event.key.keysym.scancode,
 --					(int) event.key.keysym.unicode,
 - 					"");
 - 				lasttext[0] = 0;
 - #else
 -@@ -165,7 +164,6 @@
 - 			printf("ITEM_ID_XY %s 0x%x 0x%x %s\n",
 - 					lookup_key_name(sdl_lookup, event.key.keysym.scancode),
 - 					(int) event.key.keysym.scancode,
 --					(int) event.key.keysym.unicode,
 - 					lasttext);
 - #else
 - 			memset(buf, 0, 19);
 diff -urN /usr/ports/emulators/mame/pkg-plist emulators/mame/pkg-plist
 --- /usr/ports/emulators/mame/pkg-plist	2013-11-06 22:06:22.000000000 +0900
 +++ emulators/mame/pkg-plist	2014-01-16 00:00:00.000000000 +0900
 @@ -11,6 +11,7 @@
  %%PORTDOCS%%%%DOCSDIR%%/docs/hlsl.txt
  %%PORTDOCS%%%%DOCSDIR%%/docs/imgtool.txt
  %%PORTDOCS%%%%DOCSDIR%%/docs/license.txt
 +%%PORTDOCS%%%%DOCSDIR%%/docs/licenseinfo.txt
  %%PORTDOCS%%%%DOCSDIR%%/docs/m6502.txt
  %%PORTDOCS%%%%DOCSDIR%%/docs/mame.txt
  %%PORTDOCS%%%%DOCSDIR%%/docs/newvideo.txt
 @@ -31,6 +32,7 @@
  %%DATADIR%%/hash/abc1600.xml
  %%DATADIR%%/hash/abc80.xml
  %%DATADIR%%/hash/abc800.xml
 +%%DATADIR%%/hash/abc800_hdd.xml
  %%DATADIR%%/hash/abc806.xml
  %%DATADIR%%/hash/adam_cart.xml
  %%DATADIR%%/hash/adam_cass.xml
 @@ -127,7 +129,9 @@
  %%DATADIR%%/hash/ibm5140.xml
  %%DATADIR%%/hash/ibm5150.xml
  %%DATADIR%%/hash/ibm5150_cass.xml
 +%%DATADIR%%/hash/ibm5160_flop.xml
  %%DATADIR%%/hash/ibm5170.xml
 +%%DATADIR%%/hash/ibm5170_cdrom.xml
  %%DATADIR%%/hash/ibmpcjr_cart.xml
  %%DATADIR%%/hash/ibmpcjr_flop.xml
  %%DATADIR%%/hash/interact.xml
 @@ -171,6 +175,7 @@
  %%DATADIR%%/hash/msx1_cass.xml
  %%DATADIR%%/hash/msx2.hsi
  %%DATADIR%%/hash/msx2_cart.xml
 +%%DATADIR%%/hash/myvision.xml
  %%DATADIR%%/hash/mz2000_cass.xml
  %%DATADIR%%/hash/mz2000_flop.xml
  %%DATADIR%%/hash/mz2500.xml
 @@ -215,6 +220,7 @@
  %%DATADIR%%/hash/pentagon_cass.xml
  %%DATADIR%%/hash/pet_cass.xml
  %%DATADIR%%/hash/pet_flop.xml
 +%%DATADIR%%/hash/pet_hdd.xml
  %%DATADIR%%/hash/pet_rom.xml
  %%DATADIR%%/hash/pico.xml
  %%DATADIR%%/hash/pippin.xml
 @@ -293,7 +299,8 @@
  %%DATADIR%%/hash/tvc_cart.xml
  %%DATADIR%%/hash/ut88.xml
  %%DATADIR%%/hash/uzebox.xml
 -%%DATADIR%%/hash/v1050.xml
 +%%DATADIR%%/hash/v1050_flop.xml
 +%%DATADIR%%/hash/v1050_hdd.xml
  %%DATADIR%%/hash/vboy.xml
  %%DATADIR%%/hash/vc4000.xml
  %%DATADIR%%/hash/vectrex.xml
 
 --Multipart=_Thu__16_Jan_2014_02_58_12_+0900_8Ma+m6B+wBJsgoya
 Content-Type: text/x-diff;
  name="emulators_mess.diff"
 Content-Disposition: attachment;
  filename="emulators_mess.diff"
 Content-Transfer-Encoding: 7bit
 
 diff -urN /usr/ports/emulators/mess/Makefile emulators/mess/Makefile
 --- /usr/ports/emulators/mess/Makefile	2013-12-15 03:47:03.000000000 +0900
 +++ emulators/mess/Makefile	2014-01-16 00:00:00.000000000 +0900
 @@ -2,15 +2,12 @@
  # $FreeBSD: head/emulators/mess/Makefile 336466 2013-12-14 18:34:01Z mva $
  
  PORTNAME=	mess
 -PORTVERSION=	0.150${PATCHSUFFIX}
 -PORTREVISION=	1
 +PORTVERSION=	0.152${PATCHSUFFIX}
  CATEGORIES=	emulators
 -MASTER_SITES=	SF/mame.mirror/MAME%20${PORTVERSION} \
 -		http://mame.mirrors.zippykid.com/releases/ \
 +MASTER_SITES=	http://mame.mirrors.zippykid.com/releases/ \
  		http://emumovies.com/aarongiles/releases/ \
  		http://mamedev.org/updates/:patchsets
 -DISTNAME=	mame${PORTVERSION:S/.//:C/p[0-9]*$//}s
 -DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 +DISTFILES=	mame${PORTVERSION:S/.//:C/p[0-9]*$//}s.zip \
  		${UPDATE_PATCHES:C/$/.zip:patchsets/}
  DIST_SUBDIR=	mame
  
 @@ -23,26 +20,24 @@
  		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
  RUN_DEPENDS=	liberation-fonts-ttf>=0:${PORTSDIR}/x11-fonts/liberation-fonts-ttf
  
 -OPTIONS_DEFINE=	SDL2 DEBUG DOCS EXAMPLES
 -OPTIONS_RADIO=	BUILTIN_DEBUGGER
 -OPTIONS_RADIO_BUILTIN_DEBUGGER=	GTK2 QT4
 -SDL2_DESC=	SDL2 libraries support
 +OPTIONS_DEFINE=	BUILTIN_DEBUGGER DEBUG DOCS EXAMPLES SDL2
  BUILTIN_DEBUGGER_DESC=	Builtin debugger support
 +SDL2_DESC=	SDL2 libraries support
  
  NO_WRKSUBDIR=	yes
  
 -USE_ZIP=	yes
 -USES=		gmake pkgconfig shebangfix dos2unix
 +USES=		dos2unix gmake pkgconfig shebangfix
 +DOS2UNIX_FILES=	src/emu/netlist/nl_base.h \
 +		src/emu/netlist/pstate.h
  SHEBANG_FILES=	src/emu/cpu/m6502/m6502make.py \
  		src/emu/cpu/m6809/m6809make.py \
  		src/emu/cpu/mcs96/mcs96make.py \
  		src/emu/cpu/tms57002/tmsmake.py
 -DOS2UNIX_FILES=	src/osd/sdl/input.c \
 -		src/osd/sdl/testkeys.c
  USE_XORG=	xext xi xinerama xrender
  USE_GL=		gl
 -USE_PYTHON_BUILD=yes
 +USE_PYTHON_BUILD=2
  MAKE_ENV=	NOWERROR=1 USE_NETWORK=1 \
 +		LD="${CXX}" PYTHON="${PYTHON_CMD}" \
  		OPT_FLAGS="${CXXFLAGS}" GCC_LDFLAGS="${LDFLAGS}" \
  		TARGET="${PORTNAME}" FULLNAME="${PORTNAME}"
  MAKEFILE=	makefile
 @@ -60,6 +55,12 @@
  
  .include <bsd.port.options.mk>
  
 +.if ${PORT_OPTIONS:MBUILTIN_DEBUGGER}
 +USE_QT4=	gui moc_build qmake_build
 +.else
 +MAKE_ENV+=	NO_DEBUGGER=1 NO_USE_QTDEBUG=1
 +.endif
 +
  .if ${PORT_OPTIONS:MSDL2}
  USE_SDL=	sdl2 ttf2
  MAKE_ENV+=	SDL_LIBVER="sdl2"
 @@ -71,43 +72,15 @@
  MAKE_ENV+=	DEBUG=1
  .endif
  
 -.if ${PORT_OPTIONS:MGTK2}
 -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+=	GTK_INCPATH="" \
 -		GTK_CCOMFLAGS="" \
 -		GTK_LIBS=""
 -.endif
 -
 -.if ${PORT_OPTIONS:MQT4}
 -USE_QT4=	gui moc_build qmake_build
 -.else
 -MAKE_ENV+=	NO_USE_QTDEBUG=1
 -.endif
 -
 -.if empty(PORT_OPTIONS:MGTK2) && empty(PORT_OPTIONS:MQT4)
 -MAKE_ENV+=	NO_DEBUGGER=1
 -.endif
 -
  .include <bsd.port.pre.mk>
  
 -.if exists(/usr/bin/clang) && ${OSVERSION} >= 900014
 -CC=		/usr/bin/clang
 -CPP=		/usr/bin/clang-cpp
 -CXX=		/usr/bin/clang++
 -.else
 -USE_GCC=	yes
 -.endif
 -
  .if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
  BROKEN=		Does not install on ia64, powerpc, or sparc64
  .endif
  
  post-extract:
 -	@${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${WRKDIR}/mame.zip ${EXTRACT_AFTER_ARGS}
 +	@(cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} mame.zip \
 +		${EXTRACT_AFTER_ARGS})
  	@${RM} -f ${WRKDIR}/mame.zip
  # Use post-extract target to get in before dos2unix-isation
  .if defined(UPDATE_PATCHES)
 @@ -120,13 +93,13 @@
  
  post-patch:
  	@${REINPLACE_CMD} -e \
 -		's|^BUILD_EXPAT|# BUILD_EXPAT| ; \
 -		 s|^BUILD_ZLIB|# BUILD_ZLIB| ; \
 -		 s|^BUILD_FLAC|# BUILD_FLAC| ; \
 -		 s|^BUILD_JPEGLIB|# BUILD_JPEGLIB| ; \
 -		 s| = @gcc| := $$(CC)| ; \
 -		 s| = @g++| := $$(CXX)| ; \
 -		 s| = @python| := @${PYTHON_CMD}| ; \
 +		'/^BUILD_EXPAT /s|^|#| ; \
 +		 /^BUILD_ZLIB /s|^|#| ; \
 +		 /^BUILD_FLAC /s|^|#| ; \
 +		 /^BUILD_JPEGLIB /s|^|#| ; \
 +		 /^CC /s|^|#| ; \
 +		 /^LD /s|^|#| ; \
 +		 /^PYTHON /s|^|#| ; \
  		 s|-O$$(OPTIMIZE)|| ; \
  		 /--warn-common/s|= -Wl,|= $$(GCC_LDFLAGS) -Wl,| ; \
  		 /LDFLAGS/s|-s|| ; \
 @@ -136,29 +109,26 @@
  		'/realloc/s|^|// |' ${WRKSRC}/src/emu/emualloc.h
  	@${REINPLACE_CMD} -e \
  		'/LIBS/s|-lpthread|-pthread| ; \
 -		 /-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)| ; \
 +		 /-isystem/s|^|#| ; \
  		 /X11R6/s|^|#|' ${WRKSRC}/src/osd/sdl/sdl.mak
  
  do-install:
  	(cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PORTNAME} \
 -		${STAGEDIR}/${PREFIX}/bin)
 -	@${MKDIR} ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}
 +		${STAGEDIR}${PREFIX}/bin)
 +	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}
  .for F in castool chdman imgtool jedutil ldresample ldverify romcmp \
  	testkeys unidasm
  	(cd ${WRKSRC} && ${INSTALL_PROGRAM} ${F} \
 -		${STAGEDIR}/${PREFIX}/libexec/${PORTNAME})
 +		${STAGEDIR}${PREFIX}/libexec/${PORTNAME})
  .endfor
 -	@${MKDIR} ${STAGEDIR}/${DATADIR}
 -	@(cd ${WRKSRC} && ${COPYTREE_SHARE} artwork ${STAGEDIR}/${DATADIR})
 -	@(cd ${WRKSRC} && ${COPYTREE_SHARE} hash ${STAGEDIR}/${DATADIR})
 +	@${MKDIR} ${STAGEDIR}${DATADIR}
 +	@(cd ${WRKSRC} && ${COPYTREE_SHARE} artwork ${STAGEDIR}${DATADIR})
 +	@(cd ${WRKSRC} && ${COPYTREE_SHARE} hash ${STAGEDIR}${DATADIR})
  	@(cd ${WRKSRC}/src/osd/sdl && ${COPYTREE_SHARE} keymaps \
 -		${STAGEDIR}/${DATADIR})
 -	@${MKDIR} ${STAGEDIR}/${DOCSDIR}
 -	@(cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${STAGEDIR}/${DOCSDIR})
 -	@${MKDIR} ${STAGEDIR}/${EXAMPLESDIR}
 -	(cd ${FILESDIR} && ${INSTALL_DATA} mess.ini ${STAGEDIR}/${EXAMPLESDIR})
 +		${STAGEDIR}${DATADIR})
 +	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 +	@(cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${STAGEDIR}${DOCSDIR})
 +	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 +	(cd ${FILESDIR} && ${INSTALL_DATA} mess.ini ${STAGEDIR}${EXAMPLESDIR})
  
  .include <bsd.port.post.mk>
 diff -urN /usr/ports/emulators/mess/distinfo emulators/mess/distinfo
 --- /usr/ports/emulators/mess/distinfo	2013-11-06 22:06:20.000000000 +0900
 +++ emulators/mess/distinfo	2014-01-16 00:00:00.000000000 +0900
 @@ -1,2 +1,2 @@
 -SHA256 (mame/mame0150s.zip) = e672b033baa001e1a909498b6c9206c68d0456fd883e410ad50f1a4f4c2253f7
 -SIZE (mame/mame0150s.zip) = 35999158
 +SHA256 (mame/mame0152s.zip) = dd245297824e0b3938312c74aee31e1d32798d093bbf19f857de56bbd1ea4bdf
 +SIZE (mame/mame0152s.zip) = 36247883
 diff -urN /usr/ports/emulators/mess/files/patch-src__emu__netlist__nl_base.h emulators/mess/files/patch-src__emu__netlist__nl_base.h
 --- /usr/ports/emulators/mess/files/patch-src__emu__netlist__nl_base.h	1970-01-01 09:00:00.000000000 +0900
 +++ emulators/mess/files/patch-src__emu__netlist__nl_base.h	2014-01-16 00:00:00.000000000 +0900
 @@ -0,0 +1,20 @@
 +--- src/emu/netlist/nl_base.h.orig
 ++++ src/emu/netlist/nl_base.h
 +@@ -287,7 +287,7 @@
 + 
 + 	ATTR_COLD const pstring &name() const;
 + 
 +-	PSTATE_INTERFACE(*m_netlist, name())
 ++	PSTATE_INTERFACE_DECL()
 + 
 + #if 0
 + 	template<class C> ATTR_COLD void save(C &state, const pstring &stname)
 +@@ -1120,6 +1120,8 @@
 + // Inline implementations
 + // ----------------------------------------------------------------------------------------
 + 
 ++PSTATE_INTERFACE(netlist_object_t, m_netlist, name())
 ++
 + ATTR_HOT inline void netlist_param_str_t::setTo(const pstring &param)
 + {
 + 	m_param = param;
 diff -urN /usr/ports/emulators/mess/files/patch-src__emu__netlist__pstate.h emulators/mess/files/patch-src__emu__netlist__pstate.h
 --- /usr/ports/emulators/mess/files/patch-src__emu__netlist__pstate.h	1970-01-01 09:00:00.000000000 +0900
 +++ emulators/mess/files/patch-src__emu__netlist__pstate.h	2014-01-16 00:00:00.000000000 +0900
 @@ -0,0 +1,19 @@
 +--- src/emu/netlist/pstate.h.orig
 ++++ src/emu/netlist/pstate.h
 +@@ -15,10 +15,13 @@
 + // state saving ...
 + // ----------------------------------------------------------------------------------------
 + 
 +-#define PSTATE_INTERFACE(manager, module)               \
 +-	template<class C> ATTR_COLD void save(C &state, const pstring &stname) \
 ++#define PSTATE_INTERFACE_DECL()               \
 ++	template<class C> ATTR_COLD void save(C &state, const pstring &stname);
 ++
 ++#define PSTATE_INTERFACE(obj, manager, module)               \
 ++	template<class C> ATTR_COLD void obj::save(C &state, const pstring &stname) \
 + 	{                                                                       \
 +-		dynamic_cast<pstate_manager_t &>(manager).save_manager(state, module + "." + stname);  \
 ++		manager->save_manager(state, module + "." + stname);  \
 + 	}
 + 
 + enum netlist_data_type_e {
 diff -urN /usr/ports/emulators/mess/files/patch-src__osd__sdl__input.c emulators/mess/files/patch-src__osd__sdl__input.c
 --- /usr/ports/emulators/mess/files/patch-src__osd__sdl__input.c	2013-11-06 22:06:20.000000000 +0900
 +++ emulators/mess/files/patch-src__osd__sdl__input.c	1970-01-01 09:00:00.000000000 +0900
 @@ -1,14 +0,0 @@
 ---- src/osd/sdl/input.c.orig
 -+++ src/osd/sdl/input.c
 -@@ -720,7 +720,11 @@
 - 	mame_printf_verbose("Joystick: Start initialization\n");
 - 	for (physical_stick = 0; physical_stick < SDL_NumJoysticks(); physical_stick++)
 - 	{
 -+#if (SDLMAME_SDL2)
 -+		char *joy_name = remove_spaces(machine, SDL_JoystickNameForIndex(physical_stick));
 -+#else
 - 		char *joy_name = remove_spaces(machine, SDL_JoystickName(physical_stick));
 -+#endif
 - 
 - 		devmap_register(&joy_map, physical_stick, joy_name);
 - 	}
 diff -urN /usr/ports/emulators/mess/files/patch-src__osd__sdl__testkeys.c emulators/mess/files/patch-src__osd__sdl__testkeys.c
 --- /usr/ports/emulators/mess/files/patch-src__osd__sdl__testkeys.c	2013-11-06 22:06:20.000000000 +0900
 +++ emulators/mess/files/patch-src__osd__sdl__testkeys.c	1970-01-01 09:00:00.000000000 +0900
 @@ -1,38 +0,0 @@
 ---- src/osd/sdl/testkeys.c.orig	2013-10-30 21:16:48.577335486 +0100
 -+++ src/osd/sdl/testkeys.c	2013-10-30 21:27:06.551455870 +0100
 -@@ -146,7 +146,7 @@
 - 				printf("ITEM_ID_XY %s 0x%x 0x%x %s\n",
 - 					lookup_key_name(sdl_lookup, event.key.keysym.scancode),
 - 					(int) event.key.keysym.scancode,
 --					(int) event.key.keysym.unicode,
 -+					(int) event.key.keysym.mod,
 - 					"");
 - 				lasttext[0] = 0;
 - #else
 -@@ -155,7 +155,7 @@
 - 				printf("ITEM_ID_XY %s 0x%x 0x%x %s\n",
 - 					lookup_key_name(sdl_lookup, event.key.keysym.sym),
 - 					(int) event.key.keysym.scancode,
 --					(int) event.key.keysym.unicode,
 -+					(int) event.key.keysym.mod,
 - 					buf);
 - #endif
 - 			}
 -@@ -165,7 +165,7 @@
 - 			printf("ITEM_ID_XY %s 0x%x 0x%x %s\n",
 - 					lookup_key_name(sdl_lookup, event.key.keysym.scancode),
 - 					(int) event.key.keysym.scancode,
 --					(int) event.key.keysym.unicode,
 -+					(int) event.key.keysym.mod,
 - 					lasttext);
 - #else
 - 			memset(buf, 0, 19);
 -@@ -173,7 +173,7 @@
 - 			printf("ITEM_ID_XY %s 0x%x 0x%x %s\n",
 - 					lookup_key_name(sdl_lookup, event.key.keysym.sym),
 - 					(int) event.key.keysym.scancode,
 --					(int) event.key.keysym.unicode,
 -+					(int) event.key.keysym.mod,
 - 					buf);
 - #endif
 - 			break;
 diff -urN /usr/ports/emulators/mess/pkg-plist emulators/mess/pkg-plist
 --- /usr/ports/emulators/mess/pkg-plist	2013-11-06 22:06:20.000000000 +0900
 +++ emulators/mess/pkg-plist	2014-01-16 00:00:00.000000000 +0900
 @@ -13,6 +13,7 @@
  %%PORTDOCS%%%%DOCSDIR%%/docs/hlsl.txt
  %%PORTDOCS%%%%DOCSDIR%%/docs/imgtool.txt
  %%PORTDOCS%%%%DOCSDIR%%/docs/license.txt
 +%%PORTDOCS%%%%DOCSDIR%%/docs/licenseinfo.txt
  %%PORTDOCS%%%%DOCSDIR%%/docs/m6502.txt
  %%PORTDOCS%%%%DOCSDIR%%/docs/mame.txt
  %%PORTDOCS%%%%DOCSDIR%%/docs/newvideo.txt
 @@ -33,6 +34,7 @@
  %%DATADIR%%/hash/abc1600.xml
  %%DATADIR%%/hash/abc80.xml
  %%DATADIR%%/hash/abc800.xml
 +%%DATADIR%%/hash/abc800_hdd.xml
  %%DATADIR%%/hash/abc806.xml
  %%DATADIR%%/hash/adam_cart.xml
  %%DATADIR%%/hash/adam_cass.xml
 @@ -129,7 +131,9 @@
  %%DATADIR%%/hash/ibm5140.xml
  %%DATADIR%%/hash/ibm5150.xml
  %%DATADIR%%/hash/ibm5150_cass.xml
 +%%DATADIR%%/hash/ibm5160_flop.xml
  %%DATADIR%%/hash/ibm5170.xml
 +%%DATADIR%%/hash/ibm5170_cdrom.xml
  %%DATADIR%%/hash/ibmpcjr_cart.xml
  %%DATADIR%%/hash/ibmpcjr_flop.xml
  %%DATADIR%%/hash/interact.xml
 @@ -173,6 +177,7 @@
  %%DATADIR%%/hash/msx1_cass.xml
  %%DATADIR%%/hash/msx2.hsi
  %%DATADIR%%/hash/msx2_cart.xml
 +%%DATADIR%%/hash/myvision.xml
  %%DATADIR%%/hash/mz2000_cass.xml
  %%DATADIR%%/hash/mz2000_flop.xml
  %%DATADIR%%/hash/mz2500.xml
 @@ -217,6 +222,7 @@
  %%DATADIR%%/hash/pentagon_cass.xml
  %%DATADIR%%/hash/pet_cass.xml
  %%DATADIR%%/hash/pet_flop.xml
 +%%DATADIR%%/hash/pet_hdd.xml
  %%DATADIR%%/hash/pet_rom.xml
  %%DATADIR%%/hash/pico.xml
  %%DATADIR%%/hash/pippin.xml
 @@ -295,7 +301,8 @@
  %%DATADIR%%/hash/tvc_cart.xml
  %%DATADIR%%/hash/ut88.xml
  %%DATADIR%%/hash/uzebox.xml
 -%%DATADIR%%/hash/v1050.xml
 +%%DATADIR%%/hash/v1050_flop.xml
 +%%DATADIR%%/hash/v1050_hdd.xml
  %%DATADIR%%/hash/vboy.xml
  %%DATADIR%%/hash/vc4000.xml
  %%DATADIR%%/hash/vectrex.xml
 
 --Multipart=_Thu__16_Jan_2014_02_58_12_+0900_8Ma+m6B+wBJsgoya--
State-Changed-From-To: open->closed 
State-Changed-By: danilo 
State-Changed-When: Thu Jan 16 02:46:05 UTC 2014 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/184246: commit references a PR
Date: Thu, 16 Jan 2014 02:45:01 +0000 (UTC)

 Author: danilo
 Date: Thu Jan 16 02:44:49 2014
 New Revision: 339885
 URL: http://svnweb.freebsd.org/changeset/ports/339885
 QAT: https://qat.redports.org/buildarchive/r339885/
 
 Log:
   emulators/qmc2
   - Update from 0.41 to 0.42
   
   emulators/{mame,mess} [1]
   - Update from 0.150 to 0.152
   
   PR:		ports/184246
   Submitted by:	KATO Tsuguru <tkato432@yahoo.com> [1]
 
 Added:
   head/emulators/mame/files/patch-src__emu__netlist__nl_base.h   (contents, props changed)
   head/emulators/mame/files/patch-src__emu__netlist__pstate.h   (contents, props changed)
   head/emulators/mess/files/patch-src__emu__netlist__nl_base.h   (contents, props changed)
   head/emulators/mess/files/patch-src__emu__netlist__pstate.h   (contents, props changed)
 Deleted:
   head/emulators/mame/files/patch-src__osd__sdl__input.c
   head/emulators/mame/files/patch-src__osd__sdl__testkeys.c
   head/emulators/mess/files/patch-src__osd__sdl__input.c
   head/emulators/mess/files/patch-src__osd__sdl__testkeys.c
 Modified:
   head/emulators/mame/Makefile
   head/emulators/mame/distinfo
   head/emulators/mame/pkg-plist
   head/emulators/mess/Makefile
   head/emulators/mess/distinfo
   head/emulators/mess/pkg-plist
   head/emulators/qmc2/Makefile
   head/emulators/qmc2/distinfo
   head/emulators/qmc2/pkg-plist
 
 Modified: head/emulators/mame/Makefile
 ==============================================================================
 --- head/emulators/mame/Makefile	Thu Jan 16 02:41:09 2014	(r339884)
 +++ head/emulators/mame/Makefile	Thu Jan 16 02:44:49 2014	(r339885)
 @@ -2,15 +2,12 @@
  # $FreeBSD$
  
  PORTNAME=	mame
 -PORTVERSION=	0.150${PATCHSUFFIX}
 -PORTREVISION=	1
 +PORTVERSION=	0.152${PATCHSUFFIX}
  CATEGORIES=	emulators
 -MASTER_SITES=	SF/${PORTNAME}.mirror/${PORTNAME:U}%20${PORTVERSION} \
 -		http://mame.mirrors.zippykid.com/releases/ \
 +MASTER_SITES=	http://mame.mirrors.zippykid.com/releases/ \
  		http://emumovies.com/aarongiles/releases/ \
  		http://mamedev.org/updates/:patchsets
 -DISTNAME=	${PORTNAME}${PORTVERSION:S/.//:C/p[0-9]*$//}s
 -DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 +DISTFILES=	${PORTNAME}${PORTVERSION:S/.//:C/p[0-9]*$//}s.zip \
  		${UPDATE_PATCHES:C/$/.zip:patchsets/}
  DIST_SUBDIR=	${PORTNAME}
  
 @@ -23,26 +20,24 @@ LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audi
  		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
  RUN_DEPENDS=	liberation-fonts-ttf>=0:${PORTSDIR}/x11-fonts/liberation-fonts-ttf
  
 -OPTIONS_DEFINE=	SDL2 DEBUG DOCS EXAMPLES
 -OPTIONS_RADIO=	BUILTIN_DEBUGGER
 -OPTIONS_RADIO_BUILTIN_DEBUGGER=	GTK2 QT4
 -SDL2_DESC=	SDL2 libraries support
 +OPTIONS_DEFINE=	BUILTIN_DEBUGGER DEBUG DOCS EXAMPLES SDL2
  BUILTIN_DEBUGGER_DESC=	Builtin debugger support
 +SDL2_DESC=	SDL2 libraries support
  
  NO_WRKSUBDIR=	yes
  
 -USE_ZIP=	yes
 -USES=		gmake pkgconfig shebangfix dos2unix
 +USES=		dos2unix gmake pkgconfig shebangfix
 +DOS2UNIX_FILES=	src/emu/netlist/nl_base.h \
 +		src/emu/netlist/pstate.h
  SHEBANG_FILES=	src/emu/cpu/m6502/m6502make.py \
  		src/emu/cpu/m6809/m6809make.py \
  		src/emu/cpu/mcs96/mcs96make.py \
  		src/emu/cpu/tms57002/tmsmake.py
 -DOS2UNIX_FILES=	src/osd/sdl/input.c \
 -		src/osd/sdl/testkeys.c
  USE_XORG=	xext xi xinerama xrender
  USE_GL=		gl
  USE_PYTHON_BUILD=2
  MAKE_ENV=	NOWERROR=1 USE_NETWORK=1 \
 +		LD="${CXX}" PYTHON="${PYTHON_CMD}" \
  		OPT_FLAGS="${CXXFLAGS}" GCC_LDFLAGS="${LDFLAGS}" \
  		TARGET="${PORTNAME}" FULLNAME="${PORTNAME}"
  MAKEFILE=	makefile
 @@ -60,6 +55,12 @@ UPDATE_PATCHES!=	/usr/bin/jot -s " " \
  
  .include <bsd.port.options.mk>
  
 +.if ${PORT_OPTIONS:MBUILTIN_DEBUGGER}
 +USE_QT4=	gui moc_build qmake_build
 +.else
 +MAKE_ENV+=	NO_DEBUGGER=1 NO_USE_QTDEBUG=1
 +.endif
 +
  .if ${PORT_OPTIONS:MSDL2}
  USE_SDL=	sdl2 ttf2
  MAKE_ENV+=	SDL_LIBVER="sdl2"
 @@ -71,43 +72,15 @@ USE_SDL=	sdl ttf
  MAKE_ENV+=	DEBUG=1
  .endif
  
 -.if ${PORT_OPTIONS:MGTK2}
 -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+=	GTK_INCPATH="" \
 -		GTK_CCOMFLAGS="" \
 -		GTK_LIBS=""
 -.endif
 -
 -.if ${PORT_OPTIONS:MQT4}
 -USE_QT4=	gui moc_build qmake_build
 -.else
 -MAKE_ENV+=	NO_USE_QTDEBUG=1
 -.endif
 -
 -.if empty(PORT_OPTIONS:MGTK2) && empty(PORT_OPTIONS:MQT4)
 -MAKE_ENV+=	NO_DEBUGGER=1
 -.endif
 -
  .include <bsd.port.pre.mk>
  
 -.if exists(/usr/bin/clang) && ${OSVERSION} >= 900014
 -CC=		/usr/bin/clang
 -CPP=		/usr/bin/clang-cpp
 -CXX=		/usr/bin/clang++
 -.else
 -USE_GCC=	yes
 -.endif
 -
  .if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
  BROKEN=		Does not install on ia64, powerpc, or sparc64
  .endif
  
  post-extract:
 -	@${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${WRKDIR}/mame.zip ${EXTRACT_AFTER_ARGS}
 +	@(cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} mame.zip \
 +		${EXTRACT_AFTER_ARGS})
  	@${RM} -f ${WRKDIR}/mame.zip
  # Use post-extract target to get in before dos2unix-isation
  .if defined(UPDATE_PATCHES)
 @@ -120,14 +93,14 @@ post-extract:
  
  post-patch:
  	@${REINPLACE_CMD} -e \
 -		's|^BUILD_EXPAT|# BUILD_EXPAT| ; \
 -		 s|^BUILD_ZLIB|# BUILD_ZLIB| ; \
 -		 s|^BUILD_FLAC|# BUILD_FLAC| ; \
 -		 s|^BUILD_JPEGLIB|# BUILD_JPEGLIB| ; \
 -		 s| = @gcc| := $$(CC)| ; \
 -		 s| = @g++| := $$(CXX)| ; \
 +		'/^BUILD_EXPAT /s|^|#| ; \
 +		 /^BUILD_ZLIB /s|^|#| ; \
 +		 /^BUILD_FLAC /s|^|#| ; \
 +		 /^BUILD_JPEGLIB /s|^|#| ; \
 +		 /^CC /s|^|#| ; \
 +		 /^LD /s|^|#| ; \
 +		 /^PYTHON /s|^|#| ; \
  		 s|-O$$(OPTIMIZE)|| ; \
 -		 s| = @python| = ${PYTHON_CMD}| ; \
  		 /--warn-common/s|= -Wl,|= $$(GCC_LDFLAGS) -Wl,| ; \
  		 /LDFLAGS/s|-s|| ; \
  		 /LIBS/s|-lstdc++|| ; \
 @@ -136,10 +109,7 @@ post-patch:
  		'/realloc/s|^|// |' ${WRKSRC}/src/emu/emualloc.h
  	@${REINPLACE_CMD} -e \
  		'/LIBS/s|-lpthread|-pthread| ; \
 -		 /-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)| ; \
 +		 /-isystem/s|^|#| ; \
  		 /X11R6/s|^|#|' ${WRKSRC}/src/osd/sdl/sdl.mak
  
  do-install:
 @@ -151,13 +121,13 @@ do-install:
  		${STAGEDIR}${PREFIX}/libexec/${PORTNAME})
  .endfor
  	@${MKDIR} ${STAGEDIR}${DATADIR}
 -	@(cd ${WRKSRC} && ${COPYTREE_SHARE} artwork ${STAGEDIR}${DATADIR})
 -	@(cd ${WRKSRC} && ${COPYTREE_SHARE} hash ${STAGEDIR}${DATADIR})
 -	@(cd ${WRKSRC}/src/osd/sdl && ${COPYTREE_SHARE} keymaps \
 +	(cd ${WRKSRC} && ${COPYTREE_SHARE} artwork ${STAGEDIR}${DATADIR})
 +	(cd ${WRKSRC} && ${COPYTREE_SHARE} hash ${STAGEDIR}${DATADIR})
 +	(cd ${WRKSRC}/src/osd/sdl && ${COPYTREE_SHARE} keymaps \
  		${STAGEDIR}${DATADIR})
  	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 -	@(cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${STAGEDIR}${DOCSDIR})
 -	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 +	(cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${STAGEDIR}${DOCSDIR})
 +	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
  	(cd ${FILESDIR} && ${INSTALL_DATA} mame.ini ${STAGEDIR}${EXAMPLESDIR})
  
  .include <bsd.port.post.mk>
 
 Modified: head/emulators/mame/distinfo
 ==============================================================================
 --- head/emulators/mame/distinfo	Thu Jan 16 02:41:09 2014	(r339884)
 +++ head/emulators/mame/distinfo	Thu Jan 16 02:44:49 2014	(r339885)
 @@ -1,2 +1,2 @@
 -SHA256 (mame/mame0150s.zip) = e672b033baa001e1a909498b6c9206c68d0456fd883e410ad50f1a4f4c2253f7
 -SIZE (mame/mame0150s.zip) = 35999158
 +SHA256 (mame/mame0152s.zip) = dd245297824e0b3938312c74aee31e1d32798d093bbf19f857de56bbd1ea4bdf
 +SIZE (mame/mame0152s.zip) = 36247883
 
 Added: head/emulators/mame/files/patch-src__emu__netlist__nl_base.h
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/emulators/mame/files/patch-src__emu__netlist__nl_base.h	Thu Jan 16 02:44:49 2014	(r339885)
 @@ -0,0 +1,20 @@
 +--- src/emu/netlist/nl_base.h.orig
 ++++ src/emu/netlist/nl_base.h
 +@@ -287,7 +287,7 @@
 + 
 + 	ATTR_COLD const pstring &name() const;
 + 
 +-	PSTATE_INTERFACE(*m_netlist, name())
 ++	PSTATE_INTERFACE_DECL()
 + 
 + #if 0
 + 	template<class C> ATTR_COLD void save(C &state, const pstring &stname)
 +@@ -1120,6 +1120,8 @@
 + // Inline implementations
 + // ----------------------------------------------------------------------------------------
 + 
 ++PSTATE_INTERFACE(netlist_object_t, m_netlist, name())
 ++
 + ATTR_HOT inline void netlist_param_str_t::setTo(const pstring &param)
 + {
 + 	m_param = param;
 
 Added: head/emulators/mame/files/patch-src__emu__netlist__pstate.h
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/emulators/mame/files/patch-src__emu__netlist__pstate.h	Thu Jan 16 02:44:49 2014	(r339885)
 @@ -0,0 +1,19 @@
 +--- src/emu/netlist/pstate.h.orig
 ++++ src/emu/netlist/pstate.h
 +@@ -15,10 +15,13 @@
 + // state saving ...
 + // ----------------------------------------------------------------------------------------
 + 
 +-#define PSTATE_INTERFACE(manager, module)               \
 +-	template<class C> ATTR_COLD void save(C &state, const pstring &stname) \
 ++#define PSTATE_INTERFACE_DECL()               \
 ++	template<class C> ATTR_COLD void save(C &state, const pstring &stname);
 ++
 ++#define PSTATE_INTERFACE(obj, manager, module)               \
 ++	template<class C> ATTR_COLD void obj::save(C &state, const pstring &stname) \
 + 	{                                                                       \
 +-		dynamic_cast<pstate_manager_t &>(manager).save_manager(state, module + "." + stname);  \
 ++		manager->save_manager(state, module + "." + stname);  \
 + 	}
 + 
 + enum netlist_data_type_e {
 
 Modified: head/emulators/mame/pkg-plist
 ==============================================================================
 --- head/emulators/mame/pkg-plist	Thu Jan 16 02:41:09 2014	(r339884)
 +++ head/emulators/mame/pkg-plist	Thu Jan 16 02:44:49 2014	(r339885)
 @@ -11,6 +11,7 @@ libexec/mame/unidasm
  %%PORTDOCS%%%%DOCSDIR%%/docs/hlsl.txt
  %%PORTDOCS%%%%DOCSDIR%%/docs/imgtool.txt
  %%PORTDOCS%%%%DOCSDIR%%/docs/license.txt
 +%%PORTDOCS%%%%DOCSDIR%%/docs/licenseinfo.txt
  %%PORTDOCS%%%%DOCSDIR%%/docs/m6502.txt
  %%PORTDOCS%%%%DOCSDIR%%/docs/mame.txt
  %%PORTDOCS%%%%DOCSDIR%%/docs/newvideo.txt
 @@ -31,6 +32,7 @@ libexec/mame/unidasm
  %%DATADIR%%/hash/abc1600.xml
  %%DATADIR%%/hash/abc80.xml
  %%DATADIR%%/hash/abc800.xml
 +%%DATADIR%%/hash/abc800_hdd.xml
  %%DATADIR%%/hash/abc806.xml
  %%DATADIR%%/hash/adam_cart.xml
  %%DATADIR%%/hash/adam_cass.xml
 @@ -127,7 +129,9 @@ libexec/mame/unidasm
  %%DATADIR%%/hash/ibm5140.xml
  %%DATADIR%%/hash/ibm5150.xml
  %%DATADIR%%/hash/ibm5150_cass.xml
 +%%DATADIR%%/hash/ibm5160_flop.xml
  %%DATADIR%%/hash/ibm5170.xml
 +%%DATADIR%%/hash/ibm5170_cdrom.xml
  %%DATADIR%%/hash/ibmpcjr_cart.xml
  %%DATADIR%%/hash/ibmpcjr_flop.xml
  %%DATADIR%%/hash/interact.xml
 @@ -171,6 +175,7 @@ libexec/mame/unidasm
  %%DATADIR%%/hash/msx1_cass.xml
  %%DATADIR%%/hash/msx2.hsi
  %%DATADIR%%/hash/msx2_cart.xml
 +%%DATADIR%%/hash/myvision.xml
  %%DATADIR%%/hash/mz2000_cass.xml
  %%DATADIR%%/hash/mz2000_flop.xml
  %%DATADIR%%/hash/mz2500.xml
 @@ -215,6 +220,7 @@ libexec/mame/unidasm
  %%DATADIR%%/hash/pentagon_cass.xml
  %%DATADIR%%/hash/pet_cass.xml
  %%DATADIR%%/hash/pet_flop.xml
 +%%DATADIR%%/hash/pet_hdd.xml
  %%DATADIR%%/hash/pet_rom.xml
  %%DATADIR%%/hash/pico.xml
  %%DATADIR%%/hash/pippin.xml
 @@ -293,7 +299,8 @@ libexec/mame/unidasm
  %%DATADIR%%/hash/tvc_cart.xml
  %%DATADIR%%/hash/ut88.xml
  %%DATADIR%%/hash/uzebox.xml
 -%%DATADIR%%/hash/v1050.xml
 +%%DATADIR%%/hash/v1050_flop.xml
 +%%DATADIR%%/hash/v1050_hdd.xml
  %%DATADIR%%/hash/vboy.xml
  %%DATADIR%%/hash/vc4000.xml
  %%DATADIR%%/hash/vectrex.xml
 
 Modified: head/emulators/mess/Makefile
 ==============================================================================
 --- head/emulators/mess/Makefile	Thu Jan 16 02:41:09 2014	(r339884)
 +++ head/emulators/mess/Makefile	Thu Jan 16 02:44:49 2014	(r339885)
 @@ -2,15 +2,12 @@
  # $FreeBSD$
  
  PORTNAME=	mess
 -PORTVERSION=	0.150${PATCHSUFFIX}
 -PORTREVISION=	1
 +PORTVERSION=	0.152${PATCHSUFFIX}
  CATEGORIES=	emulators
 -MASTER_SITES=	SF/mame.mirror/MAME%20${PORTVERSION} \
 -		http://mame.mirrors.zippykid.com/releases/ \
 +MASTER_SITES=	http://mame.mirrors.zippykid.com/releases/ \
  		http://emumovies.com/aarongiles/releases/ \
  		http://mamedev.org/updates/:patchsets
 -DISTNAME=	mame${PORTVERSION:S/.//:C/p[0-9]*$//}s
 -DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 +DISTFILES=	mame${PORTVERSION:S/.//:C/p[0-9]*$//}s.zip \
  		${UPDATE_PATCHES:C/$/.zip:patchsets/}
  DIST_SUBDIR=	mame
  
 @@ -23,26 +20,24 @@ LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audi
  		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
  RUN_DEPENDS=	liberation-fonts-ttf>=0:${PORTSDIR}/x11-fonts/liberation-fonts-ttf
  
 -OPTIONS_DEFINE=	SDL2 DEBUG DOCS EXAMPLES
 -OPTIONS_RADIO=	BUILTIN_DEBUGGER
 -OPTIONS_RADIO_BUILTIN_DEBUGGER=	GTK2 QT4
 -SDL2_DESC=	SDL2 libraries support
 +OPTIONS_DEFINE=	BUILTIN_DEBUGGER DEBUG DOCS EXAMPLES SDL2
  BUILTIN_DEBUGGER_DESC=	Builtin debugger support
 +SDL2_DESC=	SDL2 libraries support
  
  NO_WRKSUBDIR=	yes
  
 -USE_ZIP=	yes
 -USES=		gmake pkgconfig shebangfix dos2unix
 +USES=		dos2unix gmake pkgconfig shebangfix
 +DOS2UNIX_FILES=	src/emu/netlist/nl_base.h \
 +		src/emu/netlist/pstate.h
  SHEBANG_FILES=	src/emu/cpu/m6502/m6502make.py \
  		src/emu/cpu/m6809/m6809make.py \
  		src/emu/cpu/mcs96/mcs96make.py \
  		src/emu/cpu/tms57002/tmsmake.py
 -DOS2UNIX_FILES=	src/osd/sdl/input.c \
 -		src/osd/sdl/testkeys.c
  USE_XORG=	xext xi xinerama xrender
  USE_GL=		gl
 -USE_PYTHON_BUILD=yes
 +USE_PYTHON_BUILD=2
  MAKE_ENV=	NOWERROR=1 USE_NETWORK=1 \
 +		LD="${CXX}" PYTHON="${PYTHON_CMD}" \
  		OPT_FLAGS="${CXXFLAGS}" GCC_LDFLAGS="${LDFLAGS}" \
  		TARGET="${PORTNAME}" FULLNAME="${PORTNAME}"
  MAKEFILE=	makefile
 @@ -60,6 +55,12 @@ UPDATE_PATCHES!=	/usr/bin/jot -s " " \
  
  .include <bsd.port.options.mk>
  
 +.if ${PORT_OPTIONS:MBUILTIN_DEBUGGER}
 +USE_QT4=	gui moc_build qmake_build
 +.else
 +MAKE_ENV+=	NO_DEBUGGER=1 NO_USE_QTDEBUG=1
 +.endif
 +
  .if ${PORT_OPTIONS:MSDL2}
  USE_SDL=	sdl2 ttf2
  MAKE_ENV+=	SDL_LIBVER="sdl2"
 @@ -71,43 +72,15 @@ USE_SDL=	sdl ttf
  MAKE_ENV+=	DEBUG=1
  .endif
  
 -.if ${PORT_OPTIONS:MGTK2}
 -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+=	GTK_INCPATH="" \
 -		GTK_CCOMFLAGS="" \
 -		GTK_LIBS=""
 -.endif
 -
 -.if ${PORT_OPTIONS:MQT4}
 -USE_QT4=	gui moc_build qmake_build
 -.else
 -MAKE_ENV+=	NO_USE_QTDEBUG=1
 -.endif
 -
 -.if empty(PORT_OPTIONS:MGTK2) && empty(PORT_OPTIONS:MQT4)
 -MAKE_ENV+=	NO_DEBUGGER=1
 -.endif
 -
  .include <bsd.port.pre.mk>
  
 -.if exists(/usr/bin/clang) && ${OSVERSION} >= 900014
 -CC=		/usr/bin/clang
 -CPP=		/usr/bin/clang-cpp
 -CXX=		/usr/bin/clang++
 -.else
 -USE_GCC=	yes
 -.endif
 -
  .if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
  BROKEN=		Does not install on ia64, powerpc, or sparc64
  .endif
  
  post-extract:
 -	@${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${WRKDIR}/mame.zip ${EXTRACT_AFTER_ARGS}
 +	@(cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} mame.zip \
 +		${EXTRACT_AFTER_ARGS})
  	@${RM} -f ${WRKDIR}/mame.zip
  # Use post-extract target to get in before dos2unix-isation
  .if defined(UPDATE_PATCHES)
 @@ -120,13 +93,13 @@ post-extract:
  
  post-patch:
  	@${REINPLACE_CMD} -e \
 -		's|^BUILD_EXPAT|# BUILD_EXPAT| ; \
 -		 s|^BUILD_ZLIB|# BUILD_ZLIB| ; \
 -		 s|^BUILD_FLAC|# BUILD_FLAC| ; \
 -		 s|^BUILD_JPEGLIB|# BUILD_JPEGLIB| ; \
 -		 s| = @gcc| := $$(CC)| ; \
 -		 s| = @g++| := $$(CXX)| ; \
 -		 s| = @python| := @${PYTHON_CMD}| ; \
 +		'/^BUILD_EXPAT /s|^|#| ; \
 +		 /^BUILD_ZLIB /s|^|#| ; \
 +		 /^BUILD_FLAC /s|^|#| ; \
 +		 /^BUILD_JPEGLIB /s|^|#| ; \
 +		 /^CC /s|^|#| ; \
 +		 /^LD /s|^|#| ; \
 +		 /^PYTHON /s|^|#| ; \
  		 s|-O$$(OPTIMIZE)|| ; \
  		 /--warn-common/s|= -Wl,|= $$(GCC_LDFLAGS) -Wl,| ; \
  		 /LDFLAGS/s|-s|| ; \
 @@ -136,29 +109,26 @@ post-patch:
  		'/realloc/s|^|// |' ${WRKSRC}/src/emu/emualloc.h
  	@${REINPLACE_CMD} -e \
  		'/LIBS/s|-lpthread|-pthread| ; \
 -		 /-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)| ; \
 +		 /-isystem/s|^|#| ; \
  		 /X11R6/s|^|#|' ${WRKSRC}/src/osd/sdl/sdl.mak
  
  do-install:
  	(cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PORTNAME} \
 -		${STAGEDIR}/${PREFIX}/bin)
 -	@${MKDIR} ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}
 +		${STAGEDIR}${PREFIX}/bin)
 +	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}
  .for F in castool chdman imgtool jedutil ldresample ldverify romcmp \
  	testkeys unidasm
  	(cd ${WRKSRC} && ${INSTALL_PROGRAM} ${F} \
 -		${STAGEDIR}/${PREFIX}/libexec/${PORTNAME})
 +		${STAGEDIR}${PREFIX}/libexec/${PORTNAME})
  .endfor
 -	@${MKDIR} ${STAGEDIR}/${DATADIR}
 -	@(cd ${WRKSRC} && ${COPYTREE_SHARE} artwork ${STAGEDIR}/${DATADIR})
 -	@(cd ${WRKSRC} && ${COPYTREE_SHARE} hash ${STAGEDIR}/${DATADIR})
 +	@${MKDIR} ${STAGEDIR}${DATADIR}
 +	@(cd ${WRKSRC} && ${COPYTREE_SHARE} artwork ${STAGEDIR}${DATADIR})
 +	@(cd ${WRKSRC} && ${COPYTREE_SHARE} hash ${STAGEDIR}${DATADIR})
  	@(cd ${WRKSRC}/src/osd/sdl && ${COPYTREE_SHARE} keymaps \
 -		${STAGEDIR}/${DATADIR})
 -	@${MKDIR} ${STAGEDIR}/${DOCSDIR}
 -	@(cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${STAGEDIR}/${DOCSDIR})
 -	@${MKDIR} ${STAGEDIR}/${EXAMPLESDIR}
 -	(cd ${FILESDIR} && ${INSTALL_DATA} mess.ini ${STAGEDIR}/${EXAMPLESDIR})
 +		${STAGEDIR}${DATADIR})
 +	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 +	@(cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${STAGEDIR}${DOCSDIR})
 +	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 +	(cd ${FILESDIR} && ${INSTALL_DATA} mess.ini ${STAGEDIR}${EXAMPLESDIR})
  
  .include <bsd.port.post.mk>
 
 Modified: head/emulators/mess/distinfo
 ==============================================================================
 --- head/emulators/mess/distinfo	Thu Jan 16 02:41:09 2014	(r339884)
 +++ head/emulators/mess/distinfo	Thu Jan 16 02:44:49 2014	(r339885)
 @@ -1,2 +1,2 @@
 -SHA256 (mame/mame0150s.zip) = e672b033baa001e1a909498b6c9206c68d0456fd883e410ad50f1a4f4c2253f7
 -SIZE (mame/mame0150s.zip) = 35999158
 +SHA256 (mame/mame0152s.zip) = dd245297824e0b3938312c74aee31e1d32798d093bbf19f857de56bbd1ea4bdf
 +SIZE (mame/mame0152s.zip) = 36247883
 
 Added: head/emulators/mess/files/patch-src__emu__netlist__nl_base.h
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/emulators/mess/files/patch-src__emu__netlist__nl_base.h	Thu Jan 16 02:44:49 2014	(r339885)
 @@ -0,0 +1,20 @@
 +--- src/emu/netlist/nl_base.h.orig
 ++++ src/emu/netlist/nl_base.h
 +@@ -287,7 +287,7 @@
 + 
 + 	ATTR_COLD const pstring &name() const;
 + 
 +-	PSTATE_INTERFACE(*m_netlist, name())
 ++	PSTATE_INTERFACE_DECL()
 + 
 + #if 0
 + 	template<class C> ATTR_COLD void save(C &state, const pstring &stname)
 +@@ -1120,6 +1120,8 @@
 + // Inline implementations
 + // ----------------------------------------------------------------------------------------
 + 
 ++PSTATE_INTERFACE(netlist_object_t, m_netlist, name())
 ++
 + ATTR_HOT inline void netlist_param_str_t::setTo(const pstring &param)
 + {
 + 	m_param = param;
 
 Added: head/emulators/mess/files/patch-src__emu__netlist__pstate.h
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/emulators/mess/files/patch-src__emu__netlist__pstate.h	Thu Jan 16 02:44:49 2014	(r339885)
 @@ -0,0 +1,19 @@
 +--- src/emu/netlist/pstate.h.orig
 ++++ src/emu/netlist/pstate.h
 +@@ -15,10 +15,13 @@
 + // state saving ...
 + // ----------------------------------------------------------------------------------------
 + 
 +-#define PSTATE_INTERFACE(manager, module)               \
 +-	template<class C> ATTR_COLD void save(C &state, const pstring &stname) \
 ++#define PSTATE_INTERFACE_DECL()               \
 ++	template<class C> ATTR_COLD void save(C &state, const pstring &stname);
 ++
 ++#define PSTATE_INTERFACE(obj, manager, module)               \
 ++	template<class C> ATTR_COLD void obj::save(C &state, const pstring &stname) \
 + 	{                                                                       \
 +-		dynamic_cast<pstate_manager_t &>(manager).save_manager(state, module + "." + stname);  \
 ++		manager->save_manager(state, module + "." + stname);  \
 + 	}
 + 
 + enum netlist_data_type_e {
 
 Modified: head/emulators/mess/pkg-plist
 ==============================================================================
 --- head/emulators/mess/pkg-plist	Thu Jan 16 02:41:09 2014	(r339884)
 +++ head/emulators/mess/pkg-plist	Thu Jan 16 02:44:49 2014	(r339885)
 @@ -13,6 +13,7 @@ libexec/mess/unidasm
  %%PORTDOCS%%%%DOCSDIR%%/docs/hlsl.txt
  %%PORTDOCS%%%%DOCSDIR%%/docs/imgtool.txt
  %%PORTDOCS%%%%DOCSDIR%%/docs/license.txt
 +%%PORTDOCS%%%%DOCSDIR%%/docs/licenseinfo.txt
  %%PORTDOCS%%%%DOCSDIR%%/docs/m6502.txt
  %%PORTDOCS%%%%DOCSDIR%%/docs/mame.txt
  %%PORTDOCS%%%%DOCSDIR%%/docs/newvideo.txt
 @@ -33,6 +34,7 @@ libexec/mess/unidasm
  %%DATADIR%%/hash/abc1600.xml
  %%DATADIR%%/hash/abc80.xml
  %%DATADIR%%/hash/abc800.xml
 +%%DATADIR%%/hash/abc800_hdd.xml
  %%DATADIR%%/hash/abc806.xml
  %%DATADIR%%/hash/adam_cart.xml
  %%DATADIR%%/hash/adam_cass.xml
 @@ -129,7 +131,9 @@ libexec/mess/unidasm
  %%DATADIR%%/hash/ibm5140.xml
  %%DATADIR%%/hash/ibm5150.xml
  %%DATADIR%%/hash/ibm5150_cass.xml
 +%%DATADIR%%/hash/ibm5160_flop.xml
  %%DATADIR%%/hash/ibm5170.xml
 +%%DATADIR%%/hash/ibm5170_cdrom.xml
  %%DATADIR%%/hash/ibmpcjr_cart.xml
  %%DATADIR%%/hash/ibmpcjr_flop.xml
  %%DATADIR%%/hash/interact.xml
 @@ -173,6 +177,7 @@ libexec/mess/unidasm
  %%DATADIR%%/hash/msx1_cass.xml
  %%DATADIR%%/hash/msx2.hsi
  %%DATADIR%%/hash/msx2_cart.xml
 +%%DATADIR%%/hash/myvision.xml
  %%DATADIR%%/hash/mz2000_cass.xml
  %%DATADIR%%/hash/mz2000_flop.xml
  %%DATADIR%%/hash/mz2500.xml
 @@ -217,6 +222,7 @@ libexec/mess/unidasm
  %%DATADIR%%/hash/pentagon_cass.xml
  %%DATADIR%%/hash/pet_cass.xml
  %%DATADIR%%/hash/pet_flop.xml
 +%%DATADIR%%/hash/pet_hdd.xml
  %%DATADIR%%/hash/pet_rom.xml
  %%DATADIR%%/hash/pico.xml
  %%DATADIR%%/hash/pippin.xml
 @@ -295,7 +301,8 @@ libexec/mess/unidasm
  %%DATADIR%%/hash/tvc_cart.xml
  %%DATADIR%%/hash/ut88.xml
  %%DATADIR%%/hash/uzebox.xml
 -%%DATADIR%%/hash/v1050.xml
 +%%DATADIR%%/hash/v1050_flop.xml
 +%%DATADIR%%/hash/v1050_hdd.xml
  %%DATADIR%%/hash/vboy.xml
  %%DATADIR%%/hash/vc4000.xml
  %%DATADIR%%/hash/vectrex.xml
 
 Modified: head/emulators/qmc2/Makefile
 ==============================================================================
 --- head/emulators/qmc2/Makefile	Thu Jan 16 02:41:09 2014	(r339884)
 +++ head/emulators/qmc2/Makefile	Thu Jan 16 02:44:49 2014	(r339885)
 @@ -2,7 +2,7 @@
  # $FreeBSD$
  
  PORTNAME=	qmc2
 -PORTVERSION=	0.41
 +PORTVERSION=	0.42
  CATEGORIES=	emulators
  MASTER_SITES=	SF
  
 
 Modified: head/emulators/qmc2/distinfo
 ==============================================================================
 --- head/emulators/qmc2/distinfo	Thu Jan 16 02:41:09 2014	(r339884)
 +++ head/emulators/qmc2/distinfo	Thu Jan 16 02:44:49 2014	(r339885)
 @@ -1,2 +1,2 @@
 -SHA256 (qmc2-0.41.tar.bz2) = 4c37a1cc64f6799aaafe09133475f988d7221d198b2a23005138ed182038289b
 -SIZE (qmc2-0.41.tar.bz2) = 16353382
 +SHA256 (qmc2-0.42.tar.bz2) = 05560cebcb8e1e9ca43c63bf3709f0e0fe255379a151f1f70c6287c337c9e3d4
 +SIZE (qmc2-0.42.tar.bz2) = 17324420
 
 Modified: head/emulators/qmc2/pkg-plist
 ==============================================================================
 --- head/emulators/qmc2/pkg-plist	Thu Jan 16 02:41:09 2014	(r339884)
 +++ head/emulators/qmc2/pkg-plist	Thu Jan 16 02:44:49 2014	(r339885)
 @@ -26,7 +26,7 @@ bin/qmc2-sdlmess
  %%PORTDOCS%%%%DOCSDIR%%/html/fr/readme.html
  %%PORTDOCS%%%%DOCSDIR%%/html/fr/todo.html
  %%PORTDOCS%%%%DOCSDIR%%/html/images/ballou.png
 -%%PORTDOCS%%%%DOCSDIR%%/html/images/doc-bg.jpg
 +%%PORTDOCS%%%%DOCSDIR%%/html/images/doc-bg.png
  %%PORTDOCS%%%%DOCSDIR%%/html/images/gradient1.png
  %%PORTDOCS%%%%DOCSDIR%%/html/images/gradient2.png
  %%PORTDOCS%%%%DOCSDIR%%/html/images/qmc2_logo.png
 @@ -229,6 +229,7 @@ bin/qmc2-sdlmess
  %%DATADIR%%/img/circles/next-sail.png
  %%DATADIR%%/img/circles/next.png
  %%DATADIR%%/img/circles/no.png
 +%%DATADIR%%/img/circles/no_sound.png
  %%DATADIR%%/img/circles/north.png
  %%DATADIR%%/img/circles/notes.png
  %%DATADIR%%/img/circles/ok.png
 @@ -311,6 +312,7 @@ bin/qmc2-sdlmess
  %%DATADIR%%/img/circles/thumbnail.png
  %%DATADIR%%/img/circles/time.png
  %%DATADIR%%/img/circles/toggle_fullscreen.png
 +%%DATADIR%%/img/circles/toolbox.png
  %%DATADIR%%/img/circles/trafficlight_green.png
  %%DATADIR%%/img/circles/trafficlight_off.png
  %%DATADIR%%/img/circles/trafficlight_red.png
 @@ -483,6 +485,7 @@ bin/qmc2-sdlmess
  %%DATADIR%%/img/classic/next-sail.png
  %%DATADIR%%/img/classic/next.png
  %%DATADIR%%/img/classic/no.png
 +%%DATADIR%%/img/classic/no_sound.png
  %%DATADIR%%/img/classic/north.png
  %%DATADIR%%/img/classic/notes.png
  %%DATADIR%%/img/classic/ok.png
 @@ -565,6 +568,7 @@ bin/qmc2-sdlmess
  %%DATADIR%%/img/classic/thumbnail.png
  %%DATADIR%%/img/classic/time.png
  %%DATADIR%%/img/classic/toggle_fullscreen.png
 +%%DATADIR%%/img/classic/toolbox.png
  %%DATADIR%%/img/classic/trafficlight_green.png
  %%DATADIR%%/img/classic/trafficlight_off.png
  %%DATADIR%%/img/classic/trafficlight_red.png
 @@ -606,259 +610,6 @@ bin/qmc2-sdlmess
  %%DATADIR%%/img/compressed.png
  %%DATADIR%%/img/configure.png
  %%DATADIR%%/img/controller.png
 -%%DATADIR%%/img/crazy/activity_green.png
 -%%DATADIR%%/img/crazy/activity_red.png
 -%%DATADIR%%/img/crazy/add_to_favorites.png
 -%%DATADIR%%/img/crazy/arcadecabinet.png
 -%%DATADIR%%/img/crazy/arcademode.png
 -%%DATADIR%%/img/crazy/back.png
 -%%DATADIR%%/img/crazy/broom.png
 -%%DATADIR%%/img/crazy/browser.png
 -%%DATADIR%%/img/crazy/brush.png
 -%%DATADIR%%/img/crazy/calculator.png
 -%%DATADIR%%/img/crazy/camera.png
 -%%DATADIR%%/img/crazy/category.png
 -%%DATADIR%%/img/crazy/cd.png
 -%%DATADIR%%/img/crazy/characters.png
 -%%DATADIR%%/img/crazy/circuit.png
 -%%DATADIR%%/img/crazy/clock.png
 -%%DATADIR%%/img/crazy/clone.png
 -%%DATADIR%%/img/crazy/colors.png
 -%%DATADIR%%/img/crazy/compressed.png
 -%%DATADIR%%/img/crazy/configure.png
 -%%DATADIR%%/img/crazy/controller.png
 -%%DATADIR%%/img/crazy/detail.png
 -%%DATADIR%%/img/crazy/dev_cartridge.png
 -%%DATADIR%%/img/crazy/dev_cassette.png
 -%%DATADIR%%/img/crazy/dev_cdrom.png
 -%%DATADIR%%/img/crazy/dev_cylinder.png
 -%%DATADIR%%/img/crazy/dev_floppydisk.png
 -%%DATADIR%%/img/crazy/dev_harddisk.png
 -%%DATADIR%%/img/crazy/dev_magtape.png
 -%%DATADIR%%/img/crazy/dev_memcard.png
 -%%DATADIR%%/img/crazy/dev_parallel.png
 -%%DATADIR%%/img/crazy/dev_printer.png
 -%%DATADIR%%/img/crazy/dev_punchtape.png
 -%%DATADIR%%/img/crazy/dev_quickload.png
 -%%DATADIR%%/img/crazy/dev_serial.png
 -%%DATADIR%%/img/crazy/dev_snapshot.png
 -%%DATADIR%%/img/crazy/dice.png
 -%%DATADIR%%/img/crazy/disk.png
 -%%DATADIR%%/img/crazy/disk2.png
 -%%DATADIR%%/img/crazy/dock.png
 -%%DATADIR%%/img/crazy/down.png
 -%%DATADIR%%/img/crazy/down_action.png
 -%%DATADIR%%/img/crazy/download.png
 -%%DATADIR%%/img/crazy/east.png
 -%%DATADIR%%/img/crazy/edit.png
 -%%DATADIR%%/img/crazy/editcopy.png
 -%%DATADIR%%/img/crazy/editcut.png
 -%%DATADIR%%/img/crazy/editdelete.png
 -%%DATADIR%%/img/crazy/editpaste.png
 -%%DATADIR%%/img/crazy/edittrash.png
 -%%DATADIR%%/img/crazy/effect.png
 -%%DATADIR%%/img/crazy/embed.png
 -%%DATADIR%%/img/crazy/embed_multiple.png
 -%%DATADIR%%/img/crazy/exit.png
 -%%DATADIR%%/img/crazy/exit_small.png
 -%%DATADIR%%/img/crazy/export_rom_status.png
 -%%DATADIR%%/img/crazy/favorites.png
 -%%DATADIR%%/img/crazy/favorites_multiple.png
 -%%DATADIR%%/img/crazy/fileclose.png
 -%%DATADIR%%/img/crazy/filefind.png
 -%%DATADIR%%/img/crazy/filenew.png
 -%%DATADIR%%/img/crazy/fileopen.png
 -%%DATADIR%%/img/crazy/fileprint.png
 -%%DATADIR%%/img/crazy/filesave.png
 -%%DATADIR%%/img/crazy/filesaveas.png
 -%%DATADIR%%/img/crazy/filesaveas_and_apply.png
 -%%DATADIR%%/img/crazy/filter.png
 -%%DATADIR%%/img/crazy/find.png
 -%%DATADIR%%/img/crazy/find_negate.png
 -%%DATADIR%%/img/crazy/flat.png
 -%%DATADIR%%/img/crazy/flip.png
 -%%DATADIR%%/img/crazy/folders-first.png
 -%%DATADIR%%/img/crazy/folders-off.png
 -%%DATADIR%%/img/crazy/folders-on.png
 -%%DATADIR%%/img/crazy/fonts.png
 -%%DATADIR%%/img/crazy/forward.png
 -%%DATADIR%%/img/crazy/ghost.png
 -%%DATADIR%%/img/crazy/ghost_video.png
 -%%DATADIR%%/img/crazy/gradient1.png
 -%%DATADIR%%/img/crazy/gradient2.png
 -%%DATADIR%%/img/crazy/halt.png
 -%%DATADIR%%/img/crazy/help.png
 -%%DATADIR%%/img/crazy/highlight.png
 -%%DATADIR%%/img/crazy/hint.png
 -%%DATADIR%%/img/crazy/hint_small.png
 -%%DATADIR%%/img/crazy/home.png
 -%%DATADIR%%/img/crazy/icon.png
 -%%DATADIR%%/img/crazy/info.png
 -%%DATADIR%%/img/crazy/inspect.png
 -%%DATADIR%%/img/crazy/internet.png
 -%%DATADIR%%/img/crazy/invert_tag.png
 -%%DATADIR%%/img/crazy/invert_tag_all.png
 -%%DATADIR%%/img/crazy/invert_tag_down.png
 -%%DATADIR%%/img/crazy/invert_tag_up.png
 -%%DATADIR%%/img/crazy/invert_tag_visible.png
 -%%DATADIR%%/img/crazy/joystick.png
 -%%DATADIR%%/img/crazy/keyboard.png
 -%%DATADIR%%/img/crazy/kill.png
 -%%DATADIR%%/img/crazy/launch.png
 -%%DATADIR%%/img/crazy/launch_multiple.png
 -%%DATADIR%%/img/crazy/led_off.png
 -%%DATADIR%%/img/crazy/led_on.png
 -%%DATADIR%%/img/crazy/left_action.png
 -%%DATADIR%%/img/crazy/lifebelt.png
 -%%DATADIR%%/img/crazy/locale.png
 -%%DATADIR%%/img/crazy/lock.png
 -%%DATADIR%%/img/crazy/mame.icns
 -%%DATADIR%%/img/crazy/mame.ico
 -%%DATADIR%%/img/crazy/mame.png
 -%%DATADIR%%/img/crazy/marquee.png
 -%%DATADIR%%/img/crazy/maws.png
 -%%DATADIR%%/img/crazy/maximize.png
 -%%DATADIR%%/img/crazy/media_back.png
 -%%DATADIR%%/img/crazy/media_fastbackward.png
 -%%DATADIR%%/img/crazy/media_fastforward.png
 -%%DATADIR%%/img/crazy/media_lower_volume.png
 -%%DATADIR%%/img/crazy/media_next.png
 -%%DATADIR%%/img/crazy/media_pause.png
 -%%DATADIR%%/img/crazy/media_play.png
 -%%DATADIR%%/img/crazy/media_raise_volume.png
 -%%DATADIR%%/img/crazy/media_stop.png
 -%%DATADIR%%/img/crazy/merge.png
 -%%DATADIR%%/img/crazy/merge_nok.png
 -%%DATADIR%%/img/crazy/merge_ok.png
 -%%DATADIR%%/img/crazy/merge_unknown.png
 -%%DATADIR%%/img/crazy/mess.icns
 -%%DATADIR%%/img/crazy/mess.ico
 -%%DATADIR%%/img/crazy/mess.png
 -%%DATADIR%%/img/crazy/minimize.png
 -%%DATADIR%%/img/crazy/minus.png
 -%%DATADIR%%/img/crazy/minus_all.png
 -%%DATADIR%%/img/crazy/movie.png
 -%%DATADIR%%/img/crazy/music.png
 -%%DATADIR%%/img/crazy/next-sail.png
 -%%DATADIR%%/img/crazy/next.png
 -%%DATADIR%%/img/crazy/no.png
 -%%DATADIR%%/img/crazy/north.png
 -%%DATADIR%%/img/crazy/notes.png
 -%%DATADIR%%/img/crazy/ok.png
 -%%DATADIR%%/img/crazy/opengl.png
 -%%DATADIR%%/img/crazy/pacman.png
 -%%DATADIR%%/img/crazy/pencils.png
 -%%DATADIR%%/img/crazy/plus.png
 -%%DATADIR%%/img/crazy/plus_all.png
 -%%DATADIR%%/img/crazy/preview.png
 -%%DATADIR%%/img/crazy/previous-sail.png
 -%%DATADIR%%/img/crazy/previous.png
 -%%DATADIR%%/img/crazy/process.png
 -%%DATADIR%%/img/crazy/process_multiple.png
 -%%DATADIR%%/img/crazy/project_mess.png
 -%%DATADIR%%/img/crazy/qchdman.ico
 -%%DATADIR%%/img/crazy/qchdman.png
 -%%DATADIR%%/img/crazy/qmc2-arcade-setup.png
 -%%DATADIR%%/img/crazy/qmc2-arcade.ico
 -%%DATADIR%%/img/crazy/qmc2-arcade.png
 -%%DATADIR%%/img/crazy/qmc2_logo_big.png
 -%%DATADIR%%/img/crazy/qmc2_logo_small.png
 -%%DATADIR%%/img/crazy/qmc2_mame_splash.png
 -%%DATADIR%%/img/crazy/qmc2_mess_logo_big.png
 -%%DATADIR%%/img/crazy/qmc2_mess_logo_small.png
 -%%DATADIR%%/img/crazy/qmc2_mess_splash.png
 -%%DATADIR%%/img/crazy/qmc2_ume_logo_big.png
 -%%DATADIR%%/img/crazy/qmc2_ume_logo_small.png
 -%%DATADIR%%/img/crazy/qmc2_ume_splash.png
 -%%DATADIR%%/img/crazy/qt-logo.png
 -%%DATADIR%%/img/crazy/redo.png
 -%%DATADIR%%/img/crazy/refresh.png
 -%%DATADIR%%/img/crazy/release.png
 -%%DATADIR%%/img/crazy/release_alternate.png
 -%%DATADIR%%/img/crazy/reload.png
 -%%DATADIR%%/img/crazy/reload_small.png
 -%%DATADIR%%/img/crazy/remove.png
 -%%DATADIR%%/img/crazy/remove_from_favorites.png
 -%%DATADIR%%/img/crazy/rename.png
 -%%DATADIR%%/img/crazy/reset.png
 -%%DATADIR%%/img/crazy/right_action.png
 -%%DATADIR%%/img/crazy/rom.png
 -%%DATADIR%%/img/crazy/rom_multiple.png
 -%%DATADIR%%/img/crazy/search.png
 -%%DATADIR%%/img/crazy/search_multiple.png
 -%%DATADIR%%/img/crazy/sleep.png
 -%%DATADIR%%/img/crazy/slot.png
 -%%DATADIR%%/img/crazy/software_correct.png
 -%%DATADIR%%/img/crazy/software_incorrect.png
 -%%DATADIR%%/img/crazy/software_mostlycorrect.png
 -%%DATADIR%%/img/crazy/software_notfound.png
 -%%DATADIR%%/img/crazy/software_unknown.png
 -%%DATADIR%%/img/crazy/sort.png
 -%%DATADIR%%/img/crazy/sound.png
 -%%DATADIR%%/img/crazy/south.png
 -%%DATADIR%%/img/crazy/speaker.png
 -%%DATADIR%%/img/crazy/sphere_blue.png
 -%%DATADIR%%/img/crazy/sphere_blue_bios.png
 -%%DATADIR%%/img/crazy/sphere_blue_device.png
 -%%DATADIR%%/img/crazy/sphere_green.png
 -%%DATADIR%%/img/crazy/sphere_green_bios.png
 -%%DATADIR%%/img/crazy/sphere_green_device.png
 -%%DATADIR%%/img/crazy/sphere_grey.png
 -%%DATADIR%%/img/crazy/sphere_grey_bios.png
 -%%DATADIR%%/img/crazy/sphere_grey_device.png
 -%%DATADIR%%/img/crazy/sphere_red.png
 -%%DATADIR%%/img/crazy/sphere_red_bios.png
 -%%DATADIR%%/img/crazy/sphere_red_device.png
 -%%DATADIR%%/img/crazy/sphere_yellowgreen.png
 -%%DATADIR%%/img/crazy/sphere_yellowgreen_bios.png
 -%%DATADIR%%/img/crazy/sphere_yellowgreen_device.png
 -%%DATADIR%%/img/crazy/stop.png
 -%%DATADIR%%/img/crazy/stop_browser.png
 -%%DATADIR%%/img/crazy/swap.png
 -%%DATADIR%%/img/crazy/tag.png
 -%%DATADIR%%/img/crazy/tagged.png
 -%%DATADIR%%/img/crazy/tagged_all.png
 -%%DATADIR%%/img/crazy/tagged_visible.png
 -%%DATADIR%%/img/crazy/tape.png
 -%%DATADIR%%/img/crazy/terminate.png
 -%%DATADIR%%/img/crazy/thumbnail.png
 -%%DATADIR%%/img/crazy/time.png
 -%%DATADIR%%/img/crazy/toggle_fullscreen.png
 -%%DATADIR%%/img/crazy/trafficlight_green.png
 -%%DATADIR%%/img/crazy/trafficlight_off.png
 -%%DATADIR%%/img/crazy/trafficlight_red.png
 -%%DATADIR%%/img/crazy/trafficlight_yellow.png
 -%%DATADIR%%/img/crazy/ume.icns
 -%%DATADIR%%/img/crazy/ume.ico
 -%%DATADIR%%/img/crazy/ume.png
 -%%DATADIR%%/img/crazy/undo.png
 -%%DATADIR%%/img/crazy/unknown.png
 -%%DATADIR%%/img/crazy/unlock.png
 -%%DATADIR%%/img/crazy/untagged.png
 -%%DATADIR%%/img/crazy/untagged_all.png
 -%%DATADIR%%/img/crazy/untagged_visible.png
 -%%DATADIR%%/img/crazy/up.png
 -%%DATADIR%%/img/crazy/up_action.png
 -%%DATADIR%%/img/crazy/update.png
 -%%DATADIR%%/img/crazy/url.png
 -%%DATADIR%%/img/crazy/version.png
 -%%DATADIR%%/img/crazy/view_detail.png
 -%%DATADIR%%/img/crazy/view_tree.png
 -%%DATADIR%%/img/crazy/viewmag+.png
 -%%DATADIR%%/img/crazy/viewmag-.png
 -%%DATADIR%%/img/crazy/viewmagfit.png
 -%%DATADIR%%/img/crazy/warning.png
 -%%DATADIR%%/img/crazy/west.png
 -%%DATADIR%%/img/crazy/wip.png
 -%%DATADIR%%/img/crazy/wizard.png
 -%%DATADIR%%/img/crazy/work.png
 -%%DATADIR%%/img/crazy/world.png
 -%%DATADIR%%/img/crazy/yes.png
 -%%DATADIR%%/img/crazy/youtube.png
 -%%DATADIR%%/img/crazy/zip.png
 -%%DATADIR%%/img/crazy/zoom-in.png
 -%%DATADIR%%/img/crazy/zoom-none.png
 -%%DATADIR%%/img/crazy/zoom-out.png
  %%DATADIR%%/img/crazy-black/activity_green.png
  %%DATADIR%%/img/crazy-black/activity_red.png
  %%DATADIR%%/img/crazy-black/add_to_favorites.png
 @@ -995,6 +746,7 @@ bin/qmc2-sdlmess
  %%DATADIR%%/img/crazy-black/next-sail.png
  %%DATADIR%%/img/crazy-black/next.png
  %%DATADIR%%/img/crazy-black/no.png
 +%%DATADIR%%/img/crazy-black/no_sound.png
  %%DATADIR%%/img/crazy-black/north.png
  %%DATADIR%%/img/crazy-black/notes.png
  %%DATADIR%%/img/crazy-black/ok.png
 @@ -1077,6 +829,7 @@ bin/qmc2-sdlmess
  %%DATADIR%%/img/crazy-black/thumbnail.png
  %%DATADIR%%/img/crazy-black/time.png
  %%DATADIR%%/img/crazy-black/toggle_fullscreen.png
 +%%DATADIR%%/img/crazy-black/toolbox.png
  %%DATADIR%%/img/crazy-black/trafficlight_green.png
  %%DATADIR%%/img/crazy-black/trafficlight_off.png
  %%DATADIR%%/img/crazy-black/trafficlight_red.png
 @@ -1112,6 +865,261 @@ bin/qmc2-sdlmess
  %%DATADIR%%/img/crazy-black/zoom-in.png
  %%DATADIR%%/img/crazy-black/zoom-none.png
  %%DATADIR%%/img/crazy-black/zoom-out.png
 +%%DATADIR%%/img/crazy/activity_green.png
 +%%DATADIR%%/img/crazy/activity_red.png
 +%%DATADIR%%/img/crazy/add_to_favorites.png
 +%%DATADIR%%/img/crazy/arcadecabinet.png
 +%%DATADIR%%/img/crazy/arcademode.png
 +%%DATADIR%%/img/crazy/back.png
 +%%DATADIR%%/img/crazy/broom.png
 +%%DATADIR%%/img/crazy/browser.png
 +%%DATADIR%%/img/crazy/brush.png
 +%%DATADIR%%/img/crazy/calculator.png
 +%%DATADIR%%/img/crazy/camera.png
 +%%DATADIR%%/img/crazy/category.png
 +%%DATADIR%%/img/crazy/cd.png
 +%%DATADIR%%/img/crazy/characters.png
 +%%DATADIR%%/img/crazy/circuit.png
 +%%DATADIR%%/img/crazy/clock.png
 +%%DATADIR%%/img/crazy/clone.png
 +%%DATADIR%%/img/crazy/colors.png
 +%%DATADIR%%/img/crazy/compressed.png
 +%%DATADIR%%/img/crazy/configure.png
 +%%DATADIR%%/img/crazy/controller.png
 +%%DATADIR%%/img/crazy/detail.png
 +%%DATADIR%%/img/crazy/dev_cartridge.png
 +%%DATADIR%%/img/crazy/dev_cassette.png
 +%%DATADIR%%/img/crazy/dev_cdrom.png
 +%%DATADIR%%/img/crazy/dev_cylinder.png
 +%%DATADIR%%/img/crazy/dev_floppydisk.png
 +%%DATADIR%%/img/crazy/dev_harddisk.png
 +%%DATADIR%%/img/crazy/dev_magtape.png
 +%%DATADIR%%/img/crazy/dev_memcard.png
 +%%DATADIR%%/img/crazy/dev_parallel.png
 +%%DATADIR%%/img/crazy/dev_printer.png
 +%%DATADIR%%/img/crazy/dev_punchtape.png
 +%%DATADIR%%/img/crazy/dev_quickload.png
 +%%DATADIR%%/img/crazy/dev_serial.png
 +%%DATADIR%%/img/crazy/dev_snapshot.png
 +%%DATADIR%%/img/crazy/dice.png
 +%%DATADIR%%/img/crazy/disk.png
 +%%DATADIR%%/img/crazy/disk2.png
 +%%DATADIR%%/img/crazy/dock.png
 +%%DATADIR%%/img/crazy/down.png
 +%%DATADIR%%/img/crazy/down_action.png
 +%%DATADIR%%/img/crazy/download.png
 +%%DATADIR%%/img/crazy/east.png
 +%%DATADIR%%/img/crazy/edit.png
 +%%DATADIR%%/img/crazy/editcopy.png
 +%%DATADIR%%/img/crazy/editcut.png
 +%%DATADIR%%/img/crazy/editdelete.png
 +%%DATADIR%%/img/crazy/editpaste.png
 +%%DATADIR%%/img/crazy/edittrash.png
 +%%DATADIR%%/img/crazy/effect.png
 +%%DATADIR%%/img/crazy/embed.png
 +%%DATADIR%%/img/crazy/embed_multiple.png
 +%%DATADIR%%/img/crazy/exit.png
 +%%DATADIR%%/img/crazy/exit_small.png
 +%%DATADIR%%/img/crazy/export_rom_status.png
 +%%DATADIR%%/img/crazy/favorites.png
 +%%DATADIR%%/img/crazy/favorites_multiple.png
 +%%DATADIR%%/img/crazy/fileclose.png
 +%%DATADIR%%/img/crazy/filefind.png
 +%%DATADIR%%/img/crazy/filenew.png
 +%%DATADIR%%/img/crazy/fileopen.png
 +%%DATADIR%%/img/crazy/fileprint.png
 +%%DATADIR%%/img/crazy/filesave.png
 +%%DATADIR%%/img/crazy/filesaveas.png
 +%%DATADIR%%/img/crazy/filesaveas_and_apply.png
 +%%DATADIR%%/img/crazy/filter.png
 +%%DATADIR%%/img/crazy/find.png
 +%%DATADIR%%/img/crazy/find_negate.png
 +%%DATADIR%%/img/crazy/flat.png
 +%%DATADIR%%/img/crazy/flip.png
 +%%DATADIR%%/img/crazy/folders-first.png
 +%%DATADIR%%/img/crazy/folders-off.png
 +%%DATADIR%%/img/crazy/folders-on.png
 +%%DATADIR%%/img/crazy/fonts.png
 +%%DATADIR%%/img/crazy/forward.png
 +%%DATADIR%%/img/crazy/ghost.png
 +%%DATADIR%%/img/crazy/ghost_video.png
 +%%DATADIR%%/img/crazy/gradient1.png
 +%%DATADIR%%/img/crazy/gradient2.png
 +%%DATADIR%%/img/crazy/halt.png
 +%%DATADIR%%/img/crazy/help.png
 +%%DATADIR%%/img/crazy/highlight.png
 +%%DATADIR%%/img/crazy/hint.png
 +%%DATADIR%%/img/crazy/hint_small.png
 +%%DATADIR%%/img/crazy/home.png
 +%%DATADIR%%/img/crazy/icon.png
 +%%DATADIR%%/img/crazy/info.png
 +%%DATADIR%%/img/crazy/inspect.png
 +%%DATADIR%%/img/crazy/internet.png
 +%%DATADIR%%/img/crazy/invert_tag.png
 +%%DATADIR%%/img/crazy/invert_tag_all.png
 +%%DATADIR%%/img/crazy/invert_tag_down.png
 +%%DATADIR%%/img/crazy/invert_tag_up.png
 +%%DATADIR%%/img/crazy/invert_tag_visible.png
 +%%DATADIR%%/img/crazy/joystick.png
 +%%DATADIR%%/img/crazy/keyboard.png
 +%%DATADIR%%/img/crazy/kill.png
 +%%DATADIR%%/img/crazy/launch.png
 +%%DATADIR%%/img/crazy/launch_multiple.png
 +%%DATADIR%%/img/crazy/led_off.png
 +%%DATADIR%%/img/crazy/led_on.png
 +%%DATADIR%%/img/crazy/left_action.png
 +%%DATADIR%%/img/crazy/lifebelt.png
 
 *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
