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]

7 files changed, 79 insertions, 95 deletions

diff --git a/emulators/mame/Makefile b/emulators/mame/Makefile
index 24eb9fb2687c..4d8e3c11d486 100644
--- a/emulators/mame/Makefile
+++ b/emulators/mame/Makefile
@@ -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}/audio/flac \
 		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>
diff --git a/emulators/mame/distinfo b/emulators/mame/distinfo
index 5bb6ca1b12f7..0bdc2aab8290 100644
--- a/emulators/mame/distinfo
+++ b/emulators/mame/distinfo
@@ -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 --git a/emulators/mame/files/patch-src__emu__netlist__nl_base.h b/emulators/mame/files/patch-src__emu__netlist__nl_base.h
new file mode 100644
index 000000000000..b3ed93f57ce9
--- /dev/null
+++ b/emulators/mame/files/patch-src__emu__netlist__nl_base.h
@@ -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 --git a/emulators/mame/files/patch-src__emu__netlist__pstate.h b/emulators/mame/files/patch-src__emu__netlist__pstate.h
new file mode 100644
index 000000000000..73700f7f7a78
--- /dev/null
+++ b/emulators/mame/files/patch-src__emu__netlist__pstate.h
@@ -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 --git a/emulators/mame/files/patch-src__osd__sdl__input.c b/emulators/mame/files/patch-src__osd__sdl__input.c
deleted file mode 100644
index 2b2c0bf9e9fc..000000000000
--- a/emulators/mame/files/patch-src__osd__sdl__input.c
+++ /dev/null
@@ -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 --git a/emulators/mame/files/patch-src__osd__sdl__testkeys.c b/emulators/mame/files/patch-src__osd__sdl__testkeys.c
deleted file mode 100644
index 70a72ac1f615..000000000000
--- a/emulators/mame/files/patch-src__osd__sdl__testkeys.c
+++ /dev/null
@@ -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 --git a/emulators/mame/pkg-plist b/emulators/mame/pkg-plist
index 6f4b264cf33c..47dd69882ae2 100644
--- a/emulators/mame/pkg-plist
+++ b/emulators/mame/pkg-plist
@@ -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