ports/182801: emulators/mame: Update to version 0.150
KATO Tsuguru
tkato432 at yahoo.com
Sat Oct 26 18:10:04 UTC 2013
The following reply was made to PR ports/182801; it has been noted by GNATS.
From: KATO Tsuguru <tkato432 at yahoo.com>
To: bug-followup at FreeBSD.org
Cc:
Subject: Re: ports/182801: emulators/mame: Update to version 0.150
Date: Sun, 27 Oct 2013 02:45:17 +0900
This is a multi-part message in MIME format.
--Multipart=_Sun__27_Oct_2013_02_45_17_+0900_xp5sJFFG3CIxVd.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Remake of the patch against current tree.
--Multipart=_Sun__27_Oct_2013_02_45_17_+0900_xp5sJFFG3CIxVd.0
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-10-26 17:20:16.000000000 +0900
+++ emulators/mame/Makefile 2013-10-27 00:00:00.000000000 +0900
@@ -2,8 +2,7 @@
# $FreeBSD: head/emulators/mame/Makefile 331644 2013-10-26 00:52:33Z gerald $
PORTNAME= mame
-PORTVERSION= 0.149${PATCHSUFFIX}
-PORTREVISION= 1
+PORTVERSION= 0.150${PATCHSUFFIX}
CATEGORIES= emulators
MASTER_SITES= SF/${PORTNAME}.mirror/${PORTNAME:U}%20${PORTVERSION} \
http://mame.mirrors.zippykid.com/releases/ \
@@ -17,34 +16,34 @@
MAINTAINER= ports at FreeBSD.org
COMMENT= Multi Arcade Machine Emulator
-LIB_DEPENDS= FLAC:${PORTSDIR}/audio/flac \
- jpeg:${PORTSDIR}/graphics/jpeg \
- expat:${PORTSDIR}/textproc/expat2 \
- fontconfig:${PORTSDIR}/x11-fonts/fontconfig
+LIB_DEPENDS= libFLAC.so:${PORTSDIR}/audio/flac \
+ libjpeg.so:${PORTSDIR}/graphics/jpeg \
+ libexpat.so:${PORTSDIR}/textproc/expat2 \
+ libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
RUN_DEPENDS= liberation-fonts-ttf>=0:${PORTSDIR}/x11-fonts/liberation-fonts-ttf
-OPTIONS_DEFINE= DEBUG DOCS EXAMPLES
+OPTIONS_DEFINE= SDL2 DEBUG DOCS EXAMPLES
OPTIONS_RADIO= BUILTIN_DEBUGGER
OPTIONS_RADIO_BUILTIN_DEBUGGER= GTK2 QT4
+SDL2_DESC= SDL2 libraries support
BUILTIN_DEBUGGER_DESC= Builtin debugger support
NO_WRKSUBDIR= yes
USE_ZIP= yes
-USES= pkgconfig shebangfix
+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
-USE_DOS2UNIX= ${SHEBANG_FILES}
+USE_DOS2UNIX= src/osd/sdl/input.c \
+ src/osd/sdl/testkeys.c
USE_XORG= xext xi xinerama xrender
USE_GL= gl
-USE_SDL= sdl ttf
USE_PYTHON_BUILD=yes
-USE_GMAKE= yes
-MAKE_ENV= NOWERROR=1 OPTIMIZE=0 USE_NETWORK=1 \
+MAKE_ENV= NOWERROR=1 USE_NETWORK=1 \
OPT_FLAGS="${CXXFLAGS}" GCC_LDFLAGS="${LDFLAGS}" \
- TARGET="${PORTNAME}"
+ TARGET="${PORTNAME}" FULLNAME="${PORTNAME}"
MAKEFILE= makefile
SUB_FILES= pkg-message
@@ -58,9 +57,15 @@
${PATCHLEVEL} 1 ${PATCHLEVEL}
.endif
-NO_STAGE= yes
.include <bsd.port.options.mk>
+.if ${PORT_OPTIONS:MSDL2}
+USE_SDL= sdl2 ttf2
+MAKE_ENV+= SDL_LIBVER="sdl2"
+.else
+USE_SDL= sdl ttf
+.endif
+
.if ${PORT_OPTIONS:MDEBUG}
MAKE_ENV+= DEBUG=1
.endif
@@ -120,12 +125,14 @@
s|^BUILD_JPEGLIB|# BUILD_JPEGLIB| ; \
s| = @gcc| := $$(CC)| ; \
s| = @g++| := $$(CXX)| ; \
- s|^FULLNAME =.*|FULLNAME = $$(NAME)| ; \
+ s|-O$$(OPTIMIZE)|| ; \
/--warn-common/s|= -Wl,|= $$(GCC_LDFLAGS) -Wl,| ; \
/LDFLAGS/s|-s|| ; \
/LIBS/s|-lstdc++|| ; \
/LIBS/s|-lpthread|-pthread|' ${WRKSRC}/makefile
@${REINPLACE_CMD} -e \
+ '/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)| ; \
@@ -134,23 +141,21 @@
/X11R6/s|^|#|' ${WRKSRC}/src/osd/sdl/sdl.mak
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
- @${MKDIR} ${PREFIX}/libexec/${PORTNAME}
+ (cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PORTNAME} \
+ ${STAGEDIR}${PREFIX}/bin)
+ @${MKDIR} ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}
.for F in chdman jedutil ldresample ldverify romcmp testkeys unidasm
- ${INSTALL_PROGRAM} ${WRKSRC}/${F} ${PREFIX}/libexec/${PORTNAME}
+ (cd ${WRKSRC} && ${INSTALL_PROGRAM} ${F} \
+ ${STAGEDIR}${PREFIX}/libexec/${PORTNAME})
.endfor
- @${MKDIR} ${DATADIR}
- @(cd ${WRKSRC} && ${COPYTREE_SHARE} artwork ${DATADIR})
- @(cd ${WRKSRC} && ${COPYTREE_SHARE} hash ${DATADIR})
- @(cd ${WRKSRC}/src/osd/sdl && ${COPYTREE_SHARE} keymaps ${DATADIR})
-.if ${PORT_OPTIONS:MDOCS}
- @${MKDIR} ${DOCSDIR}
- @(cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${DOCSDIR})
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
- @${MKDIR} ${EXAMPLESDIR}
- ${INSTALL_DATA} ${FILESDIR}/mame.ini ${EXAMPLESDIR}
-.endif
- @${CAT} ${PKGMESSAGE}
+ @${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} mame.ini ${STAGEDIR}${EXAMPLESDIR})
.include <bsd.port.post.mk>
diff -urN /usr/ports/emulators/mame/distinfo emulators/mame/distinfo
--- /usr/ports/emulators/mame/distinfo 2013-07-12 02:21:30.000000000 +0900
+++ emulators/mame/distinfo 2013-10-27 00:00:00.000000000 +0900
@@ -1,2 +1,2 @@
-SHA256 (mame/mame0149s.zip) = 0e41b5773bea217d3ca04002903ac5ef569e6f5b67c05c72496d2cd7993b0a6b
-SIZE (mame/mame0149s.zip) = 35160585
+SHA256 (mame/mame0150s.zip) = e672b033baa001e1a909498b6c9206c68d0456fd883e410ad50f1a4f4c2253f7
+SIZE (mame/mame0150s.zip) = 35999158
diff -urN /usr/ports/emulators/mame/files/patch-src__emu__cpu__m6502__m6502make.py emulators/mame/files/patch-src__emu__cpu__m6502__m6502make.py
--- /usr/ports/emulators/mame/files/patch-src__emu__cpu__m6502__m6502make.py 2013-07-12 02:21:30.000000000 +0900
+++ emulators/mame/files/patch-src__emu__cpu__m6502__m6502make.py 1970-01-01 09:00:00.000000000 +0900
@@ -1,20 +0,0 @@
---- src/emu/cpu/m6502/m6502make.py.orig
-+++ src/emu/cpu/m6502/m6502make.py
-@@ -14,7 +14,7 @@
- opcodes = []
- logging.info("load_opcodes: %s", fname)
- try:
-- f = open(fname, "r")
-+ f = open(fname, "rU")
- except Exception, err:
- logging.error("cannot read opcodes file %s [%s]", fname, err)
- sys.exit(1)
-@@ -36,7 +36,7 @@
- logging.info("load_disp: %s", fname)
- states = []
- try:
-- f = open(fname, "r")
-+ f = open(fname, "rU")
- except Exception, err:
- logging.error("cannot read display file %s [%s]", fname, err)
- sys.exit(1)
diff -urN /usr/ports/emulators/mame/files/patch-src__emu__cpu__m6809__m6809make.py emulators/mame/files/patch-src__emu__cpu__m6809__m6809make.py
--- /usr/ports/emulators/mame/files/patch-src__emu__cpu__m6809__m6809make.py 2013-07-12 02:21:30.000000000 +0900
+++ emulators/mame/files/patch-src__emu__cpu__m6809__m6809make.py 1970-01-01 09:00:00.000000000 +0900
@@ -1,11 +0,0 @@
---- src/emu/cpu/m6809/m6809make.py.orig
-+++ src/emu/cpu/m6809/m6809make.py
-@@ -16,7 +16,7 @@
- if path != "":
- path = path + '/'
- try:
-- f = open(fname, "r")
-+ f = open(fname, "rU")
- except Exception, err:
- print "Cannot read opcodes file %s [%s]" % (fname, err)
- sys.exit(1)
diff -urN /usr/ports/emulators/mame/files/patch-src__emu__cpu__mcs96__mcs96make.py emulators/mame/files/patch-src__emu__cpu__mcs96__mcs96make.py
--- /usr/ports/emulators/mame/files/patch-src__emu__cpu__mcs96__mcs96make.py 2013-07-12 02:21:30.000000000 +0900
+++ emulators/mame/files/patch-src__emu__cpu__mcs96__mcs96make.py 1970-01-01 09:00:00.000000000 +0900
@@ -1,11 +0,0 @@
---- src/emu/cpu/mcs96/mcs96make.py.orig
-+++ src/emu/cpu/mcs96/mcs96make.py
-@@ -69,7 +69,7 @@
- self.ea = {}
- self.macros = {}
- try:
-- f = open(fname, "r")
-+ f = open(fname, "rU")
- except Exception, err:
- print "Cannot read opcodes file %s [%s]" % (fname, err)
- sys.exit(1)
diff -urN /usr/ports/emulators/mame/files/patch-src__emu__cpu__tms57002__tmsmake.py emulators/mame/files/patch-src__emu__cpu__tms57002__tmsmake.py
--- /usr/ports/emulators/mame/files/patch-src__emu__cpu__tms57002__tmsmake.py 2013-07-12 02:21:30.000000000 +0900
+++ emulators/mame/files/patch-src__emu__cpu__tms57002__tmsmake.py 1970-01-01 09:00:00.000000000 +0900
@@ -1,11 +0,0 @@
---- src/emu/cpu/tms57002/tmsmake.py.orig
-+++ src/emu/cpu/tms57002/tmsmake.py
-@@ -328,7 +328,7 @@
- def LoadLst(filename):
- instructions = []
- ins = None
-- for n, line in enumerate(open(filename)):
-+ for n, line in enumerate(open(filename, "rU")):
- line = line.rstrip()
- if not line and ins:
- # new lines separate intructions
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 1970-01-01 09:00:00.000000000 +0900
+++ emulators/mame/files/patch-src__osd__sdl__input.c 2013-10-27 00:00:00.000000000 +0900
@@ -0,0 +1,14 @@
+--- 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 1970-01-01 09:00:00.000000000 +0900
+++ emulators/mame/files/patch-src__osd__sdl__testkeys.c 2013-10-27 00:00:00.000000000 +0900
@@ -0,0 +1,18 @@
+--- 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-07-12 02:21:30.000000000 +0900
+++ emulators/mame/pkg-plist 2013-10-27 00:00:00.000000000 +0900
@@ -27,6 +27,7 @@
%%DATADIR%%/hash/a5200.xml
%%DATADIR%%/hash/a7800.xml
%%DATADIR%%/hash/a800.xml
+%%DATADIR%%/hash/a800_flop.xml
%%DATADIR%%/hash/abc1600.xml
%%DATADIR%%/hash/abc80.xml
%%DATADIR%%/hash/abc800.xml
@@ -39,6 +40,7 @@
%%DATADIR%%/hash/aim65_cart.xml
%%DATADIR%%/hash/alice32.xml
%%DATADIR%%/hash/alice90.xml
+%%DATADIR%%/hash/alphatro_flop.xml
%%DATADIR%%/hash/amiga1000_flop.xml
%%DATADIR%%/hash/amiga1200_flop.xml
%%DATADIR%%/hash/amiga3000_flop.xml
@@ -49,6 +51,7 @@
%%DATADIR%%/hash/amigaaga_flop.xml
%%DATADIR%%/hash/amigaecs_flop.xml
%%DATADIR%%/hash/amigaocs_flop.xml
+%%DATADIR%%/hash/ampro.xml
%%DATADIR%%/hash/apc.xml
%%DATADIR%%/hash/apfm1000.xml
%%DATADIR%%/hash/apogee.xml
@@ -67,6 +70,7 @@
%%DATADIR%%/hash/bbcm_cart.xml
%%DATADIR%%/hash/bbcm_cass.xml
%%DATADIR%%/hash/bk0010.xml
+%%DATADIR%%/hash/bml3_flop.xml
%%DATADIR%%/hash/bw12.xml
%%DATADIR%%/hash/bw2.xml
%%DATADIR%%/hash/bx256hp_flop.xml
@@ -89,16 +93,19 @@
%%DATADIR%%/hash/coleco.xml
%%DATADIR%%/hash/compis.xml
%%DATADIR%%/hash/comx35_flop.xml
+%%DATADIR%%/hash/copera.xml
%%DATADIR%%/hash/cpc_cass.xml
%%DATADIR%%/hash/cpc_flop.xml
%%DATADIR%%/hash/crvision.xml
%%DATADIR%%/hash/dim68k.xml
+%%DATADIR%%/hash/dps1.xml
%%DATADIR%%/hash/ec1841.xml
%%DATADIR%%/hash/einstein.xml
%%DATADIR%%/hash/electron_cart.xml
%%DATADIR%%/hash/ep64_cart.xml
%%DATADIR%%/hash/ep64_cass.xml
%%DATADIR%%/hash/ep64_flop.xml
+%%DATADIR%%/hash/famicom_cass.xml
%%DATADIR%%/hash/famicom_flop.xml
%%DATADIR%%/hash/fm77av.xml
%%DATADIR%%/hash/fm7_cass.xml
@@ -246,6 +253,7 @@
%%DATADIR%%/hash/snes.xml
%%DATADIR%%/hash/snes_bspack.xml
%%DATADIR%%/hash/snes_strom.xml
+%%DATADIR%%/hash/snes_vkun.xml
%%DATADIR%%/hash/socrates.xml
%%DATADIR%%/hash/softbox.xml
%%DATADIR%%/hash/softwarelist.dtd
@@ -294,13 +302,16 @@
%%DATADIR%%/hash/vic1001_cart.xml
%%DATADIR%%/hash/vic1001_cass.xml
%%DATADIR%%/hash/vic1001_flop.xml
+%%DATADIR%%/hash/victor9k_flop.xml
%%DATADIR%%/hash/vidbrain.xml
%%DATADIR%%/hash/vii.xml
%%DATADIR%%/hash/vip.xml
+%%DATADIR%%/hash/visicom.xml
%%DATADIR%%/hash/vixen.xml
%%DATADIR%%/hash/vsmile_cart.xml
%%DATADIR%%/hash/vsmile_cd.xml
%%DATADIR%%/hash/wangpc.xml
+%%DATADIR%%/hash/wicat.xml
%%DATADIR%%/hash/wmbullet.xml
%%DATADIR%%/hash/wscolor.xml
%%DATADIR%%/hash/wswan.xml
--Multipart=_Sun__27_Oct_2013_02_45_17_+0900_xp5sJFFG3CIxVd.0
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-10-26 17:20:17.000000000 +0900
+++ emulators/mess/Makefile 2013-10-27 00:00:00.000000000 +0900
@@ -2,8 +2,7 @@
# $FreeBSD: head/emulators/mess/Makefile 331644 2013-10-26 00:52:33Z gerald $
PORTNAME= mess
-PORTVERSION= 0.149${PATCHSUFFIX}
-PORTREVISION= 1
+PORTVERSION= 0.150${PATCHSUFFIX}
CATEGORIES= emulators
MASTER_SITES= SF/mame.mirror/MAME%20${PORTVERSION} \
http://mame.mirrors.zippykid.com/releases/ \
@@ -17,34 +16,34 @@
MAINTAINER= ports at FreeBSD.org
COMMENT= Multiple Emulator Super System
-LIB_DEPENDS= FLAC:${PORTSDIR}/audio/flac \
- jpeg:${PORTSDIR}/graphics/jpeg \
- expat:${PORTSDIR}/textproc/expat2 \
- fontconfig:${PORTSDIR}/x11-fonts/fontconfig
+LIB_DEPENDS= libFLAC.so:${PORTSDIR}/audio/flac \
+ libjpeg.so:${PORTSDIR}/graphics/jpeg \
+ libexpat.so:${PORTSDIR}/textproc/expat2 \
+ libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
RUN_DEPENDS= liberation-fonts-ttf>=0:${PORTSDIR}/x11-fonts/liberation-fonts-ttf
-OPTIONS_DEFINE= DEBUG DOCS EXAMPLES
+OPTIONS_DEFINE= SDL2 DEBUG DOCS EXAMPLES
OPTIONS_RADIO= BUILTIN_DEBUGGER
OPTIONS_RADIO_BUILTIN_DEBUGGER= GTK2 QT4
+SDL2_DESC= SDL2 libraries support
BUILTIN_DEBUGGER_DESC= Builtin debugger support
NO_WRKSUBDIR= yes
USE_ZIP= yes
-USES= pkgconfig shebangfix
+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
-USE_DOS2UNIX= ${SHEBANG_FILES}
+USE_DOS2UNIX= src/osd/sdl/input.c \
+ src/osd/sdl/testkeys.c
USE_XORG= xext xi xinerama xrender
USE_GL= gl
-USE_SDL= sdl ttf
USE_PYTHON_BUILD=yes
-USE_GMAKE= yes
-MAKE_ENV= NOWERROR=1 OPTIMIZE=0 USE_NETWORK=1 \
+MAKE_ENV= NOWERROR=1 USE_NETWORK=1 \
OPT_FLAGS="${CXXFLAGS}" GCC_LDFLAGS="${LDFLAGS}" \
- TARGET="${PORTNAME}"
+ TARGET="${PORTNAME}" FULLNAME="${PORTNAME}"
MAKEFILE= makefile
SUB_FILES= pkg-message
@@ -58,9 +57,15 @@
${PATCHLEVEL} 1 ${PATCHLEVEL}
.endif
-NO_STAGE= yes
.include <bsd.port.options.mk>
+.if ${PORT_OPTIONS:MSDL2}
+USE_SDL= sdl2 ttf2
+MAKE_ENV+= SDL_LIBVER="sdl2"
+.else
+USE_SDL= sdl ttf
+.endif
+
.if ${PORT_OPTIONS:MDEBUG}
MAKE_ENV+= DEBUG=1
.endif
@@ -120,12 +125,14 @@
s|^BUILD_JPEGLIB|# BUILD_JPEGLIB| ; \
s| = @gcc| := $$(CC)| ; \
s| = @g++| := $$(CXX)| ; \
- s|^FULLNAME =.*|FULLNAME = $$(NAME)| ; \
+ s|-O$$(OPTIMIZE)|| ; \
/--warn-common/s|= -Wl,|= $$(GCC_LDFLAGS) -Wl,| ; \
/LDFLAGS/s|-s|| ; \
/LIBS/s|-lstdc++|| ; \
/LIBS/s|-lpthread|-pthread|' ${WRKSRC}/makefile
@${REINPLACE_CMD} -e \
+ '/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)| ; \
@@ -134,24 +141,22 @@
/X11R6/s|^|#|' ${WRKSRC}/src/osd/sdl/sdl.mak
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
- @${MKDIR} ${PREFIX}/libexec/${PORTNAME}
+ (cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PORTNAME} \
+ ${STAGEDIR}/${PREFIX}/bin)
+ @${MKDIR} ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}
.for F in castool chdman imgtool jedutil ldresample ldverify romcmp \
testkeys unidasm
- ${INSTALL_PROGRAM} ${WRKSRC}/${F} ${PREFIX}/libexec/${PORTNAME}
+ (cd ${WRKSRC} && ${INSTALL_PROGRAM} ${F} \
+ ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME})
.endfor
- @${MKDIR} ${DATADIR}
- @(cd ${WRKSRC} && ${COPYTREE_SHARE} artwork ${DATADIR})
- @(cd ${WRKSRC} && ${COPYTREE_SHARE} hash ${DATADIR})
- @(cd ${WRKSRC}/src/osd/sdl && ${COPYTREE_SHARE} keymaps ${DATADIR})
-.if ${PORT_OPTIONS:MDOCS}
- @${MKDIR} ${DOCSDIR}
- @(cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${DOCSDIR})
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
- @${MKDIR} ${EXAMPLESDIR}
- ${INSTALL_DATA} ${FILESDIR}/mess.ini ${EXAMPLESDIR}
-.endif
- @${CAT} ${PKGMESSAGE}
+ @${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})
.include <bsd.port.post.mk>
diff -urN /usr/ports/emulators/mess/distinfo emulators/mess/distinfo
--- /usr/ports/emulators/mess/distinfo 2013-07-12 02:21:33.000000000 +0900
+++ emulators/mess/distinfo 2013-10-27 00:00:00.000000000 +0900
@@ -1,2 +1,2 @@
-SHA256 (mame/mame0149s.zip) = 0e41b5773bea217d3ca04002903ac5ef569e6f5b67c05c72496d2cd7993b0a6b
-SIZE (mame/mame0149s.zip) = 35160585
+SHA256 (mame/mame0150s.zip) = e672b033baa001e1a909498b6c9206c68d0456fd883e410ad50f1a4f4c2253f7
+SIZE (mame/mame0150s.zip) = 35999158
diff -urN /usr/ports/emulators/mess/files/patch-src__emu__cpu__m6502__m6502make.py emulators/mess/files/patch-src__emu__cpu__m6502__m6502make.py
--- /usr/ports/emulators/mess/files/patch-src__emu__cpu__m6502__m6502make.py 2013-07-12 02:21:33.000000000 +0900
+++ emulators/mess/files/patch-src__emu__cpu__m6502__m6502make.py 1970-01-01 09:00:00.000000000 +0900
@@ -1,20 +0,0 @@
---- src/emu/cpu/m6502/m6502make.py.orig
-+++ src/emu/cpu/m6502/m6502make.py
-@@ -14,7 +14,7 @@
- opcodes = []
- logging.info("load_opcodes: %s", fname)
- try:
-- f = open(fname, "r")
-+ f = open(fname, "rU")
- except Exception, err:
- logging.error("cannot read opcodes file %s [%s]", fname, err)
- sys.exit(1)
-@@ -36,7 +36,7 @@
- logging.info("load_disp: %s", fname)
- states = []
- try:
-- f = open(fname, "r")
-+ f = open(fname, "rU")
- except Exception, err:
- logging.error("cannot read display file %s [%s]", fname, err)
- sys.exit(1)
diff -urN /usr/ports/emulators/mess/files/patch-src__emu__cpu__m6809__m6809make.py emulators/mess/files/patch-src__emu__cpu__m6809__m6809make.py
--- /usr/ports/emulators/mess/files/patch-src__emu__cpu__m6809__m6809make.py 2013-07-12 02:21:33.000000000 +0900
+++ emulators/mess/files/patch-src__emu__cpu__m6809__m6809make.py 1970-01-01 09:00:00.000000000 +0900
@@ -1,11 +0,0 @@
---- src/emu/cpu/m6809/m6809make.py.orig
-+++ src/emu/cpu/m6809/m6809make.py
-@@ -16,7 +16,7 @@
- if path != "":
- path = path + '/'
- try:
-- f = open(fname, "r")
-+ f = open(fname, "rU")
- except Exception, err:
- print "Cannot read opcodes file %s [%s]" % (fname, err)
- sys.exit(1)
diff -urN /usr/ports/emulators/mess/files/patch-src__emu__cpu__mcs96__mcs96make.py emulators/mess/files/patch-src__emu__cpu__mcs96__mcs96make.py
--- /usr/ports/emulators/mess/files/patch-src__emu__cpu__mcs96__mcs96make.py 2013-07-12 02:21:33.000000000 +0900
+++ emulators/mess/files/patch-src__emu__cpu__mcs96__mcs96make.py 1970-01-01 09:00:00.000000000 +0900
@@ -1,11 +0,0 @@
---- src/emu/cpu/mcs96/mcs96make.py.orig
-+++ src/emu/cpu/mcs96/mcs96make.py
-@@ -69,7 +69,7 @@
- self.ea = {}
- self.macros = {}
- try:
-- f = open(fname, "r")
-+ f = open(fname, "rU")
- except Exception, err:
- print "Cannot read opcodes file %s [%s]" % (fname, err)
- sys.exit(1)
diff -urN /usr/ports/emulators/mess/files/patch-src__emu__cpu__tms57002__tmsmake.py emulators/mess/files/patch-src__emu__cpu__tms57002__tmsmake.py
--- /usr/ports/emulators/mess/files/patch-src__emu__cpu__tms57002__tmsmake.py 2013-07-12 02:21:33.000000000 +0900
+++ emulators/mess/files/patch-src__emu__cpu__tms57002__tmsmake.py 1970-01-01 09:00:00.000000000 +0900
@@ -1,11 +0,0 @@
---- src/emu/cpu/tms57002/tmsmake.py.orig
-+++ src/emu/cpu/tms57002/tmsmake.py
-@@ -328,7 +328,7 @@
- def LoadLst(filename):
- instructions = []
- ins = None
-- for n, line in enumerate(open(filename)):
-+ for n, line in enumerate(open(filename, "rU")):
- line = line.rstrip()
- if not line and ins:
- # new lines separate intructions
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 1970-01-01 09:00:00.000000000 +0900
+++ emulators/mess/files/patch-src__osd__sdl__input.c 2013-10-27 00:00:00.000000000 +0900
@@ -0,0 +1,14 @@
+--- 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 1970-01-01 09:00:00.000000000 +0900
+++ emulators/mess/files/patch-src__osd__sdl__testkeys.c 2013-10-27 00:00:00.000000000 +0900
@@ -0,0 +1,20 @@
+--- src/osd/sdl/testkeys.c.orig
++++ src/osd/sdl/testkeys.c
+@@ -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
+ }
diff -urN /usr/ports/emulators/mess/pkg-plist emulators/mess/pkg-plist
--- /usr/ports/emulators/mess/pkg-plist 2013-07-12 02:21:33.000000000 +0900
+++ emulators/mess/pkg-plist 2013-10-27 00:00:00.000000000 +0900
@@ -29,6 +29,7 @@
%%DATADIR%%/hash/a5200.xml
%%DATADIR%%/hash/a7800.xml
%%DATADIR%%/hash/a800.xml
+%%DATADIR%%/hash/a800_flop.xml
%%DATADIR%%/hash/abc1600.xml
%%DATADIR%%/hash/abc80.xml
%%DATADIR%%/hash/abc800.xml
@@ -41,6 +42,7 @@
%%DATADIR%%/hash/aim65_cart.xml
%%DATADIR%%/hash/alice32.xml
%%DATADIR%%/hash/alice90.xml
+%%DATADIR%%/hash/alphatro_flop.xml
%%DATADIR%%/hash/amiga1000_flop.xml
%%DATADIR%%/hash/amiga1200_flop.xml
%%DATADIR%%/hash/amiga3000_flop.xml
@@ -51,6 +53,7 @@
%%DATADIR%%/hash/amigaaga_flop.xml
%%DATADIR%%/hash/amigaecs_flop.xml
%%DATADIR%%/hash/amigaocs_flop.xml
+%%DATADIR%%/hash/ampro.xml
%%DATADIR%%/hash/apc.xml
%%DATADIR%%/hash/apfm1000.xml
%%DATADIR%%/hash/apogee.xml
@@ -69,6 +72,7 @@
%%DATADIR%%/hash/bbcm_cart.xml
%%DATADIR%%/hash/bbcm_cass.xml
%%DATADIR%%/hash/bk0010.xml
+%%DATADIR%%/hash/bml3_flop.xml
%%DATADIR%%/hash/bw12.xml
%%DATADIR%%/hash/bw2.xml
%%DATADIR%%/hash/bx256hp_flop.xml
@@ -91,16 +95,19 @@
%%DATADIR%%/hash/coleco.xml
%%DATADIR%%/hash/compis.xml
%%DATADIR%%/hash/comx35_flop.xml
+%%DATADIR%%/hash/copera.xml
%%DATADIR%%/hash/cpc_cass.xml
%%DATADIR%%/hash/cpc_flop.xml
%%DATADIR%%/hash/crvision.xml
%%DATADIR%%/hash/dim68k.xml
+%%DATADIR%%/hash/dps1.xml
%%DATADIR%%/hash/ec1841.xml
%%DATADIR%%/hash/einstein.xml
%%DATADIR%%/hash/electron_cart.xml
%%DATADIR%%/hash/ep64_cart.xml
%%DATADIR%%/hash/ep64_cass.xml
%%DATADIR%%/hash/ep64_flop.xml
+%%DATADIR%%/hash/famicom_cass.xml
%%DATADIR%%/hash/famicom_flop.xml
%%DATADIR%%/hash/fm77av.xml
%%DATADIR%%/hash/fm7_cass.xml
@@ -248,6 +255,7 @@
%%DATADIR%%/hash/snes.xml
%%DATADIR%%/hash/snes_bspack.xml
%%DATADIR%%/hash/snes_strom.xml
+%%DATADIR%%/hash/snes_vkun.xml
%%DATADIR%%/hash/socrates.xml
%%DATADIR%%/hash/softbox.xml
%%DATADIR%%/hash/softwarelist.dtd
@@ -296,13 +304,16 @@
%%DATADIR%%/hash/vic1001_cart.xml
%%DATADIR%%/hash/vic1001_cass.xml
%%DATADIR%%/hash/vic1001_flop.xml
+%%DATADIR%%/hash/victor9k_flop.xml
%%DATADIR%%/hash/vidbrain.xml
%%DATADIR%%/hash/vii.xml
%%DATADIR%%/hash/vip.xml
+%%DATADIR%%/hash/visicom.xml
%%DATADIR%%/hash/vixen.xml
%%DATADIR%%/hash/vsmile_cart.xml
%%DATADIR%%/hash/vsmile_cd.xml
%%DATADIR%%/hash/wangpc.xml
+%%DATADIR%%/hash/wicat.xml
%%DATADIR%%/hash/wmbullet.xml
%%DATADIR%%/hash/wscolor.xml
%%DATADIR%%/hash/wswan.xml
--Multipart=_Sun__27_Oct_2013_02_45_17_+0900_xp5sJFFG3CIxVd.0
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-10-26 17:20:16.000000000 +0900
+++ emulators/qmc2/Makefile 2013-10-27 00:00:00.000000000 +0900
@@ -18,12 +18,12 @@
NO_WRKSUBDIR= yes
USE_BZIP2= yes
+USES= gmake
USE_XORG= xmu
USE_GL= glu
USE_QT4= gui opengl phonon qtestlib webkit xml \
moc_build qmake_build rcc_build uic_build
USE_SDL= sdl
-USE_GMAKE= yes
MAKE_ARGS= QTDIR="${QT_PREFIX}" QMAKE="${QMAKE}" \
SYSCONFDIR="${PREFIX}/etc" ARCH="${OPSYS}" \
CC_FLAGS="${CFLAGS}" CXX_FLAGS="${CXXFLAGS}" \
@@ -34,7 +34,6 @@
"QMC2 (MESS)" "MESS frontend" "${DATADIR}/img/mess.png" \
"${PORTNAME}-sdlmess" "Game;Emulator;Qt;" "true"
-NO_STAGE= yes
.include <bsd.port.options.mk>
post-extract:
@@ -48,20 +47,24 @@
< qmc2.ini.template > qmc2.ini)
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/qmc2/qmc2-sdlmame ${PREFIX}/bin
- ${INSTALL_PROGRAM} ${WRKSRC}/qmc2-sdlmess/qmc2-sdlmess ${PREFIX}/bin
- @${MKDIR} ${ETCDIR}
- ${INSTALL_DATA} ${WRKSRC}/qmc2/inst/qmc2.ini ${ETCDIR}
- @${MKDIR} ${DATADIR}/img
- @(cd ${WRKSRC}/qmc2/data/img; ${COPYTREE_SHARE} . ${DATADIR}/img)
- @${MKDIR} ${DATADIR}/lng
- ${INSTALL_DATA} ${WRKSRC}/qmc2/data/lng/qmc2_*.qm ${DATADIR}/lng
- @${MKDIR} ${DATADIR}/opt
- @(cd ${WRKSRC}/qmc2/data/opt; ${COPYTREE_SHARE} . ${DATADIR}/opt)
-.if ${PORT_OPTIONS:MDOCS}
- @${MKDIR} ${DOCSDIR}/html
- @(cd ${WRKSRC}/qmc2/data/doc/html; ${COPYTREE_SHARE} . ${DOCSDIR}/html)
-.endif
- @${CAT} ${PKGMESSAGE}
+ (cd ${WRKSRC}/qmc2 && ${INSTALL_PROGRAM} qmc2-sdlmame \
+ ${STAGEDIR}${PREFIX}/bin)
+ (cd ${WRKSRC}/qmc2-sdlmess && ${INSTALL_PROGRAM} qmc2-sdlmess \
+ ${STAGEDIR}${PREFIX}/bin)
+ @${MKDIR} ${STAGEDIR}${ETCDIR}
+ (cd ${WRKSRC}/qmc2/inst && ${INSTALL_DATA} qmc2.ini \
+ ${STAGEDIR}${ETCDIR})
+ @${MKDIR} ${STAGEDIR}${DATADIR}/img
+ @(cd ${WRKSRC}/qmc2/data/img; ${COPYTREE_SHARE} . \
+ ${STAGEDIR}${DATADIR}/img)
+ @${MKDIR} ${STAGEDIR}${DATADIR}/lng
+ (cd ${WRKSRC}/qmc2/data/lng && ${INSTALL_DATA} qmc2_*.qm \
+ ${STAGEDIR}${DATADIR}/lng)
+ @${MKDIR} ${STAGEDIR}${DATADIR}/opt
+ @(cd ${WRKSRC}/qmc2/data/opt; ${COPYTREE_SHARE} . \
+ ${STAGEDIR}${DATADIR}/opt)
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}/html
+ @(cd ${WRKSRC}/qmc2/data/doc/html; ${COPYTREE_SHARE} . \
+ ${STAGEDIR}${DOCSDIR}/html)
.include <bsd.port.mk>
--Multipart=_Sun__27_Oct_2013_02_45_17_+0900_xp5sJFFG3CIxVd.0--
More information about the freebsd-ports-bugs
mailing list