ports/182801: emulators/mame: Update to version 0.150

KATO Tsuguru tkato432 at yahoo.com
Mon Oct 7 18:10:02 UTC 2013 

>Number:         182801
>Category:       ports
>Synopsis:       emulators/mame: Update to version 0.150
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Oct 07 18:10:01 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 8.4-RELEASE-p3 i386
>Organization:
>Environment:
>Description:
- Update emulators/mame to version 0.150
- Update emulators/mess to version 0.150

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

Remove file:
files/patch-src__emu__cpu__m6502__m6502make.py
files/patch-src__emu__cpu__m6809__m6809make.py
files/patch-src__emu__cpu__mcs96__mcs96make.py
files/patch-src__emu__cpu__tms57002__tmsmake.py

[emulators/mess]
New file:
files/patch-src__osd__sdl__input.c
files/patch-src__osd__sdl__testkeys.c

Remove file:
files/patch-src__emu__cpu__m6502__m6502make.py
files/patch-src__emu__cpu__m6809__m6809make.py
files/patch-src__emu__cpu__mcs96__mcs96make.py
files/patch-src__emu__cpu__tms57002__tmsmake.py

>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
#
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-09-22 00:40:27.000000000 +0900
X+++ emulators/mame/Makefile	2013-10-08 00:00:00.000000000 +0900
X@@ -2,7 +2,7 @@
X # $FreeBSD: head/emulators/mame/Makefile 327721 2013-09-20 16:43:52Z bapt $
X 
X PORTNAME=	mame
X-PORTVERSION=	0.149${PATCHSUFFIX}
X+PORTVERSION=	0.150${PATCHSUFFIX}
X CATEGORIES=	emulators
X MASTER_SITES=	SF/${PORTNAME}.mirror/${PORTNAME:U}%20${PORTVERSION} \
X 		http://mame.mirrors.zippykid.com/releases/ \
X@@ -22,28 +22,28 @@
X 		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
X RUN_DEPENDS=	liberation-fonts-ttf>=0:${PORTSDIR}/x11-fonts/liberation-fonts-ttf
X 
X-OPTIONS_DEFINE=	DEBUG DOCS EXAMPLES
X+OPTIONS_DEFINE=	SDL2 DEBUG DOCS EXAMPLES
X OPTIONS_RADIO=	BUILTIN_DEBUGGER
X OPTIONS_RADIO_BUILTIN_DEBUGGER=	GTK2 QT4
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=		pkgconfig shebangfix
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-USE_DOS2UNIX=	${SHEBANG_FILES}
X+USE_DOS2UNIX=	src/osd/sdl/input.c \
X+		src/osd/sdl/testkeys.c
X USE_XORG=	xext xi xinerama xrender
X USE_GL=		gl
X-USE_SDL=	sdl ttf
X USE_PYTHON_BUILD=yes
X-USE_GMAKE=	yes
X-MAKE_ENV=	NOWERROR=1 OPTIMIZE=0 USE_NETWORK=1 \
X+MAKE_ENV=	NOWERROR=1 USE_NETWORK=1 \
X 		OPT_FLAGS="${CXXFLAGS}" GCC_LDFLAGS="${LDFLAGS}" \
X-		TARGET="${PORTNAME}"
X+		TARGET="${PORTNAME}" FULLNAME="${PORTNAME}"
X MAKEFILE=	makefile
X 
X SUB_FILES=	pkg-message
X@@ -57,9 +57,15 @@
X 		${PATCHLEVEL} 1 ${PATCHLEVEL}
X .endif
X 
X-NO_STAGE=	yes
X .include <bsd.port.options.mk>
X 
X+.if ${PORT_OPTIONS:MSDL2}
X+USE_SDL=	sdl2 ttf2
X+MAKE_ENV+=	SDL_LIBVER="sdl2"
X+.else
X+USE_SDL=	sdl ttf
X+.endif
X+
X .if ${PORT_OPTIONS:MDEBUG}
X MAKE_ENV+=	DEBUG=1
X .endif
X@@ -119,12 +125,14 @@
X 		 s|^BUILD_JPEGLIB|# BUILD_JPEGLIB| ; \
X 		 s| = @gcc| := $$(CC)| ; \
X 		 s| = @g++| := $$(CXX)| ; \
X-		 s|^FULLNAME =.*|FULLNAME = $$(NAME)| ; \
X+		 s|-O$$(OPTIMIZE)|| ; \
X 		 /--warn-common/s|= -Wl,|= $$(GCC_LDFLAGS) -Wl,| ; \
X 		 /LDFLAGS/s|-s|| ; \
X 		 /LIBS/s|-lstdc++|| ; \
X 		 /LIBS/s|-lpthread|-pthread|' ${WRKSRC}/makefile
X 	@${REINPLACE_CMD} -e \
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@@ -133,23 +141,21 @@
X 		 /X11R6/s|^|#|' ${WRKSRC}/src/osd/sdl/sdl.mak
X 
X do-install:
X-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
X-	@${MKDIR} ${PREFIX}/libexec/${PORTNAME}
X+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PORTNAME} \
X+		${STAGEDIR}${PREFIX}/bin)
X+	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}
X .for F in chdman jedutil ldresample ldverify romcmp testkeys unidasm
X-	${INSTALL_PROGRAM} ${WRKSRC}/${F} ${PREFIX}/libexec/${PORTNAME}
X+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} ${F} \
X+		${STAGEDIR}${PREFIX}/libexec/${PORTNAME})
X .endfor
X-	@${MKDIR} ${DATADIR}
X-	@(cd ${WRKSRC} && ${COPYTREE_SHARE} artwork ${DATADIR})
X-	@(cd ${WRKSRC} && ${COPYTREE_SHARE} hash ${DATADIR})
X-	@(cd ${WRKSRC}/src/osd/sdl && ${COPYTREE_SHARE} keymaps ${DATADIR})
X-.if ${PORT_OPTIONS:MDOCS}
X-	@${MKDIR} ${DOCSDIR}
X-	@(cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${DOCSDIR})
X-.endif
X-.if ${PORT_OPTIONS:MEXAMPLES}
X-	@${MKDIR} ${EXAMPLESDIR}
X-	${INSTALL_DATA} ${FILESDIR}/mame.ini ${EXAMPLESDIR}
X-.endif
X-	@${CAT} ${PKGMESSAGE}
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} mame.ini ${STAGEDIR}${EXAMPLESDIR})
X 
X .include <bsd.port.post.mk>
Xdiff -urN /usr/ports/emulators/mame/distinfo emulators/mame/distinfo
X--- /usr/ports/emulators/mame/distinfo	2013-07-12 02:21:30.000000000 +0900
X+++ emulators/mame/distinfo	2013-10-08 00:00:00.000000000 +0900
X@@ -1,2 +1,2 @@
X-SHA256 (mame/mame0149s.zip) = 0e41b5773bea217d3ca04002903ac5ef569e6f5b67c05c72496d2cd7993b0a6b
X-SIZE (mame/mame0149s.zip) = 35160585
X+SHA256 (mame/mame0150s.zip) = e672b033baa001e1a909498b6c9206c68d0456fd883e410ad50f1a4f4c2253f7
X+SIZE (mame/mame0150s.zip) = 35999158
Xdiff -urN /usr/ports/emulators/mame/files/patch-src__emu__cpu__m6502__m6502make.py emulators/mame/files/patch-src__emu__cpu__m6502__m6502make.py
X--- /usr/ports/emulators/mame/files/patch-src__emu__cpu__m6502__m6502make.py	2013-07-12 02:21:30.000000000 +0900
X+++ emulators/mame/files/patch-src__emu__cpu__m6502__m6502make.py	1970-01-01 09:00:00.000000000 +0900
X@@ -1,20 +0,0 @@
X---- src/emu/cpu/m6502/m6502make.py.orig
X-+++ src/emu/cpu/m6502/m6502make.py
X-@@ -14,7 +14,7 @@
X-     opcodes = []
X-     logging.info("load_opcodes: %s", fname)
X-     try:
X--        f = open(fname, "r")
X-+        f = open(fname, "rU")
X-     except Exception, err:
X-         logging.error("cannot read opcodes file %s [%s]", fname, err)
X-         sys.exit(1)
X-@@ -36,7 +36,7 @@
X-     logging.info("load_disp: %s", fname)
X-     states = []
X-     try:
X--        f = open(fname, "r")
X-+        f = open(fname, "rU")
X-     except Exception, err:
X-         logging.error("cannot read display file %s [%s]", fname, err)
X-         sys.exit(1)
Xdiff -urN /usr/ports/emulators/mame/files/patch-src__emu__cpu__m6809__m6809make.py emulators/mame/files/patch-src__emu__cpu__m6809__m6809make.py
X--- /usr/ports/emulators/mame/files/patch-src__emu__cpu__m6809__m6809make.py	2013-07-12 02:21:30.000000000 +0900
X+++ emulators/mame/files/patch-src__emu__cpu__m6809__m6809make.py	1970-01-01 09:00:00.000000000 +0900
X@@ -1,11 +0,0 @@
X---- src/emu/cpu/m6809/m6809make.py.orig
X-+++ src/emu/cpu/m6809/m6809make.py
X-@@ -16,7 +16,7 @@
X- 	if path != "":
X- 		path = path + '/'
X- 	try:
X--		f = open(fname, "r")
X-+		f = open(fname, "rU")
X- 	except Exception, err:
X- 		print "Cannot read opcodes file %s [%s]" % (fname, err)
X- 		sys.exit(1)
Xdiff -urN /usr/ports/emulators/mame/files/patch-src__emu__cpu__mcs96__mcs96make.py emulators/mame/files/patch-src__emu__cpu__mcs96__mcs96make.py
X--- /usr/ports/emulators/mame/files/patch-src__emu__cpu__mcs96__mcs96make.py	2013-07-12 02:21:30.000000000 +0900
X+++ emulators/mame/files/patch-src__emu__cpu__mcs96__mcs96make.py	1970-01-01 09:00:00.000000000 +0900
X@@ -1,11 +0,0 @@
X---- src/emu/cpu/mcs96/mcs96make.py.orig
X-+++ src/emu/cpu/mcs96/mcs96make.py
X-@@ -69,7 +69,7 @@
X-         self.ea = {}
X-         self.macros = {}
X-         try:
X--            f = open(fname, "r")
X-+            f = open(fname, "rU")
X-         except Exception, err:
X-             print "Cannot read opcodes file %s [%s]" % (fname, err)
X-             sys.exit(1)
Xdiff -urN /usr/ports/emulators/mame/files/patch-src__emu__cpu__tms57002__tmsmake.py emulators/mame/files/patch-src__emu__cpu__tms57002__tmsmake.py
X--- /usr/ports/emulators/mame/files/patch-src__emu__cpu__tms57002__tmsmake.py	2013-07-12 02:21:30.000000000 +0900
X+++ emulators/mame/files/patch-src__emu__cpu__tms57002__tmsmake.py	1970-01-01 09:00:00.000000000 +0900
X@@ -1,11 +0,0 @@
X---- src/emu/cpu/tms57002/tmsmake.py.orig
X-+++ src/emu/cpu/tms57002/tmsmake.py
X-@@ -328,7 +328,7 @@
X- def LoadLst(filename):
X-     instructions = []
X-     ins = None
X--    for n, line in enumerate(open(filename)):
X-+    for n, line in enumerate(open(filename, "rU")):
X-         line = line.rstrip()
X-         if not line and ins:
X-             # new lines separate intructions
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	1970-01-01 09:00:00.000000000 +0900
X+++ emulators/mame/files/patch-src__osd__sdl__input.c	2013-10-08 00:00:00.000000000 +0900
X@@ -0,0 +1,14 @@
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	1970-01-01 09:00:00.000000000 +0900
X+++ emulators/mame/files/patch-src__osd__sdl__testkeys.c	2013-10-08 00:00:00.000000000 +0900
X@@ -0,0 +1,18 @@
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);
Xdiff -urN /usr/ports/emulators/mame/pkg-plist emulators/mame/pkg-plist
X--- /usr/ports/emulators/mame/pkg-plist	2013-07-12 02:21:30.000000000 +0900
X+++ emulators/mame/pkg-plist	2013-10-08 00:00:00.000000000 +0900
X@@ -27,6 +27,7 @@
X %%DATADIR%%/hash/a5200.xml
X %%DATADIR%%/hash/a7800.xml
X %%DATADIR%%/hash/a800.xml
X+%%DATADIR%%/hash/a800_flop.xml
X %%DATADIR%%/hash/abc1600.xml
X %%DATADIR%%/hash/abc80.xml
X %%DATADIR%%/hash/abc800.xml
X@@ -39,6 +40,7 @@
X %%DATADIR%%/hash/aim65_cart.xml
X %%DATADIR%%/hash/alice32.xml
X %%DATADIR%%/hash/alice90.xml
X+%%DATADIR%%/hash/alphatro_flop.xml
X %%DATADIR%%/hash/amiga1000_flop.xml
X %%DATADIR%%/hash/amiga1200_flop.xml
X %%DATADIR%%/hash/amiga3000_flop.xml
X@@ -49,6 +51,7 @@
X %%DATADIR%%/hash/amigaaga_flop.xml
X %%DATADIR%%/hash/amigaecs_flop.xml
X %%DATADIR%%/hash/amigaocs_flop.xml
X+%%DATADIR%%/hash/ampro.xml
X %%DATADIR%%/hash/apc.xml
X %%DATADIR%%/hash/apfm1000.xml
X %%DATADIR%%/hash/apogee.xml
X@@ -67,6 +70,7 @@
X %%DATADIR%%/hash/bbcm_cart.xml
X %%DATADIR%%/hash/bbcm_cass.xml
X %%DATADIR%%/hash/bk0010.xml
X+%%DATADIR%%/hash/bml3_flop.xml
X %%DATADIR%%/hash/bw12.xml
X %%DATADIR%%/hash/bw2.xml
X %%DATADIR%%/hash/bx256hp_flop.xml
X@@ -89,16 +93,19 @@
X %%DATADIR%%/hash/coleco.xml
X %%DATADIR%%/hash/compis.xml
X %%DATADIR%%/hash/comx35_flop.xml
X+%%DATADIR%%/hash/copera.xml
X %%DATADIR%%/hash/cpc_cass.xml
X %%DATADIR%%/hash/cpc_flop.xml
X %%DATADIR%%/hash/crvision.xml
X %%DATADIR%%/hash/dim68k.xml
X+%%DATADIR%%/hash/dps1.xml
X %%DATADIR%%/hash/ec1841.xml
X %%DATADIR%%/hash/einstein.xml
X %%DATADIR%%/hash/electron_cart.xml
X %%DATADIR%%/hash/ep64_cart.xml
X %%DATADIR%%/hash/ep64_cass.xml
X %%DATADIR%%/hash/ep64_flop.xml
X+%%DATADIR%%/hash/famicom_cass.xml
X %%DATADIR%%/hash/famicom_flop.xml
X %%DATADIR%%/hash/fm77av.xml
X %%DATADIR%%/hash/fm7_cass.xml
X@@ -246,6 +253,7 @@
X %%DATADIR%%/hash/snes.xml
X %%DATADIR%%/hash/snes_bspack.xml
X %%DATADIR%%/hash/snes_strom.xml
X+%%DATADIR%%/hash/snes_vkun.xml
X %%DATADIR%%/hash/socrates.xml
X %%DATADIR%%/hash/softbox.xml
X %%DATADIR%%/hash/softwarelist.dtd
X@@ -294,13 +302,16 @@
X %%DATADIR%%/hash/vic1001_cart.xml
X %%DATADIR%%/hash/vic1001_cass.xml
X %%DATADIR%%/hash/vic1001_flop.xml
X+%%DATADIR%%/hash/victor9k_flop.xml
X %%DATADIR%%/hash/vidbrain.xml
X %%DATADIR%%/hash/vii.xml
X %%DATADIR%%/hash/vip.xml
X+%%DATADIR%%/hash/visicom.xml
X %%DATADIR%%/hash/vixen.xml
X %%DATADIR%%/hash/vsmile_cart.xml
X %%DATADIR%%/hash/vsmile_cd.xml
X %%DATADIR%%/hash/wangpc.xml
X+%%DATADIR%%/hash/wicat.xml
X %%DATADIR%%/hash/wmbullet.xml
X %%DATADIR%%/hash/wscolor.xml
X %%DATADIR%%/hash/wswan.xml
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-09-22 00:40:22.000000000 +0900
X+++ emulators/mess/Makefile	2013-10-08 00:00:00.000000000 +0900
X@@ -2,7 +2,7 @@
X # $FreeBSD: head/emulators/mess/Makefile 327721 2013-09-20 16:43:52Z bapt $
X 
X PORTNAME=	mess
X-PORTVERSION=	0.149${PATCHSUFFIX}
X+PORTVERSION=	0.150${PATCHSUFFIX}
X CATEGORIES=	emulators
X MASTER_SITES=	SF/mame.mirror/MAME%20${PORTVERSION} \
X 		http://mame.mirrors.zippykid.com/releases/ \
X@@ -22,28 +22,28 @@
X 		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
X RUN_DEPENDS=	liberation-fonts-ttf>=0:${PORTSDIR}/x11-fonts/liberation-fonts-ttf
X 
X-OPTIONS_DEFINE=	DEBUG DOCS EXAMPLES
X+OPTIONS_DEFINE=	SDL2 DEBUG DOCS EXAMPLES
X OPTIONS_RADIO=	BUILTIN_DEBUGGER
X OPTIONS_RADIO_BUILTIN_DEBUGGER=	GTK2 QT4
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=		pkgconfig shebangfix
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-USE_DOS2UNIX=	${SHEBANG_FILES}
X+USE_DOS2UNIX=	src/osd/sdl/input.c \
X+		src/osd/sdl/testkeys.c
X USE_XORG=	xext xi xinerama xrender
X USE_GL=		gl
X-USE_SDL=	sdl ttf
X USE_PYTHON_BUILD=yes
X-USE_GMAKE=	yes
X-MAKE_ENV=	NOWERROR=1 OPTIMIZE=0 USE_NETWORK=1 \
X+MAKE_ENV=	NOWERROR=1 USE_NETWORK=1 \
X 		OPT_FLAGS="${CXXFLAGS}" GCC_LDFLAGS="${LDFLAGS}" \
X-		TARGET="${PORTNAME}"
X+		TARGET="${PORTNAME}" FULLNAME="${PORTNAME}"
X MAKEFILE=	makefile
X 
X SUB_FILES=	pkg-message
X@@ -57,9 +57,15 @@
X 		${PATCHLEVEL} 1 ${PATCHLEVEL}
X .endif
X 
X-NO_STAGE=	yes
X .include <bsd.port.options.mk>
X 
X+.if ${PORT_OPTIONS:MSDL2}
X+USE_SDL=	sdl2 ttf2
X+MAKE_ENV+=	SDL_LIBVER="sdl2"
X+.else
X+USE_SDL=	sdl ttf
X+.endif
X+
X .if ${PORT_OPTIONS:MDEBUG}
X MAKE_ENV+=	DEBUG=1
X .endif
X@@ -119,12 +125,14 @@
X 		 s|^BUILD_JPEGLIB|# BUILD_JPEGLIB| ; \
X 		 s| = @gcc| := $$(CC)| ; \
X 		 s| = @g++| := $$(CXX)| ; \
X-		 s|^FULLNAME =.*|FULLNAME = $$(NAME)| ; \
X+		 s|-O$$(OPTIMIZE)|| ; \
X 		 /--warn-common/s|= -Wl,|= $$(GCC_LDFLAGS) -Wl,| ; \
X 		 /LDFLAGS/s|-s|| ; \
X 		 /LIBS/s|-lstdc++|| ; \
X 		 /LIBS/s|-lpthread|-pthread|' ${WRKSRC}/makefile
X 	@${REINPLACE_CMD} -e \
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@@ -133,24 +141,22 @@
X 		 /X11R6/s|^|#|' ${WRKSRC}/src/osd/sdl/sdl.mak
X 
X do-install:
X-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
X-	@${MKDIR} ${PREFIX}/libexec/${PORTNAME}
X+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} ${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-	${INSTALL_PROGRAM} ${WRKSRC}/${F} ${PREFIX}/libexec/${PORTNAME}
X+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} ${F} \
X+		${STAGEDIR}/${PREFIX}/libexec/${PORTNAME})
X .endfor
X-	@${MKDIR} ${DATADIR}
X-	@(cd ${WRKSRC} && ${COPYTREE_SHARE} artwork ${DATADIR})
X-	@(cd ${WRKSRC} && ${COPYTREE_SHARE} hash ${DATADIR})
X-	@(cd ${WRKSRC}/src/osd/sdl && ${COPYTREE_SHARE} keymaps ${DATADIR})
X-.if ${PORT_OPTIONS:MDOCS}
X-	@${MKDIR} ${DOCSDIR}
X-	@(cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${DOCSDIR})
X-.endif
X-.if ${PORT_OPTIONS:MEXAMPLES}
X-	@${MKDIR} ${EXAMPLESDIR}
X-	${INSTALL_DATA} ${FILESDIR}/mess.ini ${EXAMPLESDIR}
X-.endif
X-	@${CAT} ${PKGMESSAGE}
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 
X .include <bsd.port.post.mk>
Xdiff -urN /usr/ports/emulators/mess/distinfo emulators/mess/distinfo
X--- /usr/ports/emulators/mess/distinfo	2013-07-12 02:21:33.000000000 +0900
X+++ emulators/mess/distinfo	2013-10-08 00:00:00.000000000 +0900
X@@ -1,2 +1,2 @@
X-SHA256 (mame/mame0149s.zip) = 0e41b5773bea217d3ca04002903ac5ef569e6f5b67c05c72496d2cd7993b0a6b
X-SIZE (mame/mame0149s.zip) = 35160585
X+SHA256 (mame/mame0150s.zip) = e672b033baa001e1a909498b6c9206c68d0456fd883e410ad50f1a4f4c2253f7
X+SIZE (mame/mame0150s.zip) = 35999158
Xdiff -urN /usr/ports/emulators/mess/files/patch-src__emu__cpu__m6502__m6502make.py emulators/mess/files/patch-src__emu__cpu__m6502__m6502make.py
X--- /usr/ports/emulators/mess/files/patch-src__emu__cpu__m6502__m6502make.py	2013-07-12 02:21:33.000000000 +0900
X+++ emulators/mess/files/patch-src__emu__cpu__m6502__m6502make.py	1970-01-01 09:00:00.000000000 +0900
X@@ -1,20 +0,0 @@
X---- src/emu/cpu/m6502/m6502make.py.orig
X-+++ src/emu/cpu/m6502/m6502make.py
X-@@ -14,7 +14,7 @@
X-     opcodes = []
X-     logging.info("load_opcodes: %s", fname)
X-     try:
X--        f = open(fname, "r")
X-+        f = open(fname, "rU")
X-     except Exception, err:
X-         logging.error("cannot read opcodes file %s [%s]", fname, err)
X-         sys.exit(1)
X-@@ -36,7 +36,7 @@
X-     logging.info("load_disp: %s", fname)
X-     states = []
X-     try:
X--        f = open(fname, "r")
X-+        f = open(fname, "rU")
X-     except Exception, err:
X-         logging.error("cannot read display file %s [%s]", fname, err)
X-         sys.exit(1)
Xdiff -urN /usr/ports/emulators/mess/files/patch-src__emu__cpu__m6809__m6809make.py emulators/mess/files/patch-src__emu__cpu__m6809__m6809make.py
X--- /usr/ports/emulators/mess/files/patch-src__emu__cpu__m6809__m6809make.py	2013-07-12 02:21:33.000000000 +0900
X+++ emulators/mess/files/patch-src__emu__cpu__m6809__m6809make.py	1970-01-01 09:00:00.000000000 +0900
X@@ -1,11 +0,0 @@
X---- src/emu/cpu/m6809/m6809make.py.orig
X-+++ src/emu/cpu/m6809/m6809make.py
X-@@ -16,7 +16,7 @@
X- 	if path != "":
X- 		path = path + '/'
X- 	try:
X--		f = open(fname, "r")
X-+		f = open(fname, "rU")
X- 	except Exception, err:
X- 		print "Cannot read opcodes file %s [%s]" % (fname, err)
X- 		sys.exit(1)
Xdiff -urN /usr/ports/emulators/mess/files/patch-src__emu__cpu__mcs96__mcs96make.py emulators/mess/files/patch-src__emu__cpu__mcs96__mcs96make.py
X--- /usr/ports/emulators/mess/files/patch-src__emu__cpu__mcs96__mcs96make.py	2013-07-12 02:21:33.000000000 +0900
X+++ emulators/mess/files/patch-src__emu__cpu__mcs96__mcs96make.py	1970-01-01 09:00:00.000000000 +0900
X@@ -1,11 +0,0 @@
X---- src/emu/cpu/mcs96/mcs96make.py.orig
X-+++ src/emu/cpu/mcs96/mcs96make.py
X-@@ -69,7 +69,7 @@
X-         self.ea = {}
X-         self.macros = {}
X-         try:
X--            f = open(fname, "r")
X-+            f = open(fname, "rU")
X-         except Exception, err:
X-             print "Cannot read opcodes file %s [%s]" % (fname, err)
X-             sys.exit(1)
Xdiff -urN /usr/ports/emulators/mess/files/patch-src__emu__cpu__tms57002__tmsmake.py emulators/mess/files/patch-src__emu__cpu__tms57002__tmsmake.py
X--- /usr/ports/emulators/mess/files/patch-src__emu__cpu__tms57002__tmsmake.py	2013-07-12 02:21:33.000000000 +0900
X+++ emulators/mess/files/patch-src__emu__cpu__tms57002__tmsmake.py	1970-01-01 09:00:00.000000000 +0900
X@@ -1,11 +0,0 @@
X---- src/emu/cpu/tms57002/tmsmake.py.orig
X-+++ src/emu/cpu/tms57002/tmsmake.py
X-@@ -328,7 +328,7 @@
X- def LoadLst(filename):
X-     instructions = []
X-     ins = None
X--    for n, line in enumerate(open(filename)):
X-+    for n, line in enumerate(open(filename, "rU")):
X-         line = line.rstrip()
X-         if not line and ins:
X-             # new lines separate intructions
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	1970-01-01 09:00:00.000000000 +0900
X+++ emulators/mess/files/patch-src__osd__sdl__input.c	2013-10-08 00:00:00.000000000 +0900
X@@ -0,0 +1,14 @@
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	1970-01-01 09:00:00.000000000 +0900
X+++ emulators/mess/files/patch-src__osd__sdl__testkeys.c	2013-10-08 00:00:00.000000000 +0900
X@@ -0,0 +1,20 @@
X+--- src/osd/sdl/testkeys.c.orig
X++++ src/osd/sdl/testkeys.c
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+ 			}
Xdiff -urN /usr/ports/emulators/mess/pkg-plist emulators/mess/pkg-plist
X--- /usr/ports/emulators/mess/pkg-plist	2013-07-12 02:21:33.000000000 +0900
X+++ emulators/mess/pkg-plist	2013-10-08 00:00:00.000000000 +0900
X@@ -29,6 +29,7 @@
X %%DATADIR%%/hash/a5200.xml
X %%DATADIR%%/hash/a7800.xml
X %%DATADIR%%/hash/a800.xml
X+%%DATADIR%%/hash/a800_flop.xml
X %%DATADIR%%/hash/abc1600.xml
X %%DATADIR%%/hash/abc80.xml
X %%DATADIR%%/hash/abc800.xml
X@@ -41,6 +42,7 @@
X %%DATADIR%%/hash/aim65_cart.xml
X %%DATADIR%%/hash/alice32.xml
X %%DATADIR%%/hash/alice90.xml
X+%%DATADIR%%/hash/alphatro_flop.xml
X %%DATADIR%%/hash/amiga1000_flop.xml
X %%DATADIR%%/hash/amiga1200_flop.xml
X %%DATADIR%%/hash/amiga3000_flop.xml
X@@ -51,6 +53,7 @@
X %%DATADIR%%/hash/amigaaga_flop.xml
X %%DATADIR%%/hash/amigaecs_flop.xml
X %%DATADIR%%/hash/amigaocs_flop.xml
X+%%DATADIR%%/hash/ampro.xml
X %%DATADIR%%/hash/apc.xml
X %%DATADIR%%/hash/apfm1000.xml
X %%DATADIR%%/hash/apogee.xml
X@@ -69,6 +72,7 @@
X %%DATADIR%%/hash/bbcm_cart.xml
X %%DATADIR%%/hash/bbcm_cass.xml
X %%DATADIR%%/hash/bk0010.xml
X+%%DATADIR%%/hash/bml3_flop.xml
X %%DATADIR%%/hash/bw12.xml
X %%DATADIR%%/hash/bw2.xml
X %%DATADIR%%/hash/bx256hp_flop.xml
X@@ -91,16 +95,19 @@
X %%DATADIR%%/hash/coleco.xml
X %%DATADIR%%/hash/compis.xml
X %%DATADIR%%/hash/comx35_flop.xml
X+%%DATADIR%%/hash/copera.xml
X %%DATADIR%%/hash/cpc_cass.xml
X %%DATADIR%%/hash/cpc_flop.xml
X %%DATADIR%%/hash/crvision.xml
X %%DATADIR%%/hash/dim68k.xml
X+%%DATADIR%%/hash/dps1.xml
X %%DATADIR%%/hash/ec1841.xml
X %%DATADIR%%/hash/einstein.xml
X %%DATADIR%%/hash/electron_cart.xml
X %%DATADIR%%/hash/ep64_cart.xml
X %%DATADIR%%/hash/ep64_cass.xml
X %%DATADIR%%/hash/ep64_flop.xml
X+%%DATADIR%%/hash/famicom_cass.xml
X %%DATADIR%%/hash/famicom_flop.xml
X %%DATADIR%%/hash/fm77av.xml
X %%DATADIR%%/hash/fm7_cass.xml
X@@ -248,6 +255,7 @@
X %%DATADIR%%/hash/snes.xml
X %%DATADIR%%/hash/snes_bspack.xml
X %%DATADIR%%/hash/snes_strom.xml
X+%%DATADIR%%/hash/snes_vkun.xml
X %%DATADIR%%/hash/socrates.xml
X %%DATADIR%%/hash/softbox.xml
X %%DATADIR%%/hash/softwarelist.dtd
X@@ -296,13 +304,16 @@
X %%DATADIR%%/hash/vic1001_cart.xml
X %%DATADIR%%/hash/vic1001_cass.xml
X %%DATADIR%%/hash/vic1001_flop.xml
X+%%DATADIR%%/hash/victor9k_flop.xml
X %%DATADIR%%/hash/vidbrain.xml
X %%DATADIR%%/hash/vii.xml
X %%DATADIR%%/hash/vip.xml
X+%%DATADIR%%/hash/visicom.xml
X %%DATADIR%%/hash/vixen.xml
X %%DATADIR%%/hash/vsmile_cart.xml
X %%DATADIR%%/hash/vsmile_cd.xml
X %%DATADIR%%/hash/wangpc.xml
X+%%DATADIR%%/hash/wicat.xml
X %%DATADIR%%/hash/wmbullet.xml
X %%DATADIR%%/hash/wscolor.xml
X %%DATADIR%%/hash/wswan.xml
13f7e11912cff6c9343e13b09ba021e1
exit

>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list