ports/188861: emulators/mame: Update to version 0.153

KATO Tsuguru tkato432 at yahoo.com
Mon Apr 21 18:10:02 UTC 2014 

>Number:         188861
>Category:       ports
>Synopsis:       emulators/mame: Update to version 0.153
>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 Apr 21 18:10:02 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 8.4-RELEASE-p8 i386
>Organization:
>Environment:
>Description:
- Update emulators/mame to version 0.153
- Update emulators/mess to version 0.153

[emulators/mame]
New file:
files/patch-src__emu__eigccx86.h
files/patch-src__emu__eminline.h
files/patch-src__lib__lib7z__CpuArch.h
files/patch-src__lib__lua__luaconf.h
files/patch-src__osd__sdl__osinline.h
files/patch-src__osd__sdl__sdlsync_ntc.c
files/patch-src__osd__sdl__sdlsync_os2.c

Remove file:
emulatorsfiles/patch-src__emu__netlist__nl_base.h
files/patch-src__emu__netlist__pstate.h

[emulators/mess]
New file:
files/patch-src__emu__eigccx86.h
files/patch-src__emu__eminline.h
files/patch-src__lib__lib7z__CpuArch.h
files/patch-src__lib__lua__luaconf.h
files/patch-src__osd__sdl__osinline.h
files/patch-src__osd__sdl__sdlsync_ntc.c
files/patch-src__osd__sdl__sdlsync_os2.c

Remove file:
emulatorsfiles/patch-src__emu__netlist__nl_base.h
files/patch-src__emu__netlist__pstate.h

>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	2014-01-16 15:34:38.000000000 +0900
X+++ emulators/mame/Makefile	2014-04-22 00:00:00.000000000 +0900
X@@ -2,12 +2,12 @@
X # $FreeBSD: head/emulators/mame/Makefile 339885 2014-01-16 02:44:49Z danilo $
X 
X PORTNAME=	mame
X-PORTVERSION=	0.152${PATCHSUFFIX}
X+PORTVERSION=	0.153${PATCHSUFFIX}
X CATEGORIES=	emulators
X MASTER_SITES=	http://mame.mirrors.zippykid.com/releases/ \
X 		http://emumovies.com/aarongiles/releases/ \
X 		http://mamedev.org/updates/:patchsets
X-DISTFILES=	${PORTNAME}${PORTVERSION:S/.//:C/p[0-9]*$//}s.zip \
X+DISTFILES=	${PORTNAME}${PORTVERSION:S/.//:C/p[0-9]*$//}s${EXTRACT_SUFX} \
X 		${UPDATE_PATCHES:C/$/.zip:patchsets/}
X DIST_SUBDIR=	${PORTNAME}
X 
X@@ -20,15 +20,16 @@
X 		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
X RUN_DEPENDS=	liberation-fonts-ttf>=0:${PORTSDIR}/x11-fonts/liberation-fonts-ttf
X 
X-OPTIONS_DEFINE=	BUILTIN_DEBUGGER DEBUG DOCS EXAMPLES SDL2
X-BUILTIN_DEBUGGER_DESC=	Builtin debugger support
X-SDL2_DESC=	SDL2 libraries support
X-
X NO_WRKSUBDIR=	yes
X 
X-USES=		dos2unix gmake pkgconfig shebangfix
X-DOS2UNIX_FILES=	src/emu/netlist/nl_base.h \
X-		src/emu/netlist/pstate.h
X+USES=		dos2unix gmake pkgconfig shebangfix zip
X+DOS2UNIX_FILES=	src/emu/eigccx86.h \
X+		src/emu/eminline.h \
X+		src/lib/lib7z/CpuArch.h \
X+		src/lib/lua/luaconf.h \
X+		src/osd/sdl/osinline.h \
X+		src/osd/sdl/sdlsync_ntc.c \
X+		src/osd/sdl/sdlsync_os2.c
X SHEBANG_FILES=	src/emu/cpu/m6502/m6502make.py \
X 		src/emu/cpu/m6809/m6809make.py \
X 		src/emu/cpu/mcs96/mcs96make.py \
X@@ -44,6 +45,17 @@
X 
X SUB_FILES=	pkg-message
X 
X+OPTIONS_DEFINE=		BUILTIN_DEBUGGER DEBUG DOCS EXAMPLES SDL2
X+
X+BUILTIN_DEBUGGER_DESC=	Builtin debugger support
X+BUILTIN_DEBUGGER_USE=	QT4=gui,moc_build,qmake_build
X+BUILTIN_DEBUGGER_MAKE_ENV_OFF=\
X+			NO_DEBUGGER=1 NO_USE_QTDEBUG=1
X+DEBUG_MAKE_ENV=		DEBUG=1
X+SDL2_DESC=		SDL2 libraries support
X+SDL2_USE=		SDL=sdl2,ttf2
X+SDL2_MAKE_ENV=		SDL_LIBVER="sdl2"
X+
X PATCHLEVEL=	# none
X 
X .if defined(PATCHLEVEL) && ${PATCHLEVEL}
X@@ -55,25 +67,10 @@
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-.else
X+.if empty(PORT_OPTIONS:MSDL2)
X USE_SDL=	sdl ttf
X .endif
X 
X-.if ${PORT_OPTIONS:MDEBUG}
X-MAKE_ENV+=	DEBUG=1
X-.endif
X-
X-.include <bsd.port.pre.mk>
X-
X .if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
X BROKEN=		Does not install on ia64, powerpc, or sparc64
X .endif
X@@ -93,13 +90,13 @@
X 
X post-patch:
X 	@${REINPLACE_CMD} -e \
X-		'/^BUILD_EXPAT /s|^|#| ; \
X-		 /^BUILD_ZLIB /s|^|#| ; \
X-		 /^BUILD_FLAC /s|^|#| ; \
X-		 /^BUILD_JPEGLIB /s|^|#| ; \
X-		 /^CC /s|^|#| ; \
X-		 /^LD /s|^|#| ; \
X-		 /^PYTHON /s|^|#| ; \
X+		's|^\(BUILD_EXPAT \)|#\1| ; \
X+		 s|^\(BUILD_ZLIB \)|#\1| ; \
X+		 s|^\(BUILD_FLAC \)|#\1| ; \
X+		 s|^\(BUILD_JPEGLIB \)|#\1| ; \
X+		 s|^\(CC \)|#\1| ; \
X+		 s|^\(LD \)|#\1| ; \
X+		 s|^\(PYTHON \)|#\1| ; \
X 		 s|-O$$(OPTIMIZE)|| ; \
X 		 /--warn-common/s|= -Wl,|= $$(GCC_LDFLAGS) -Wl,| ; \
X 		 /LDFLAGS/s|-s|| ; \
X@@ -121,13 +118,13 @@
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-	(cd ${WRKSRC}/src/osd/sdl && ${COPYTREE_SHARE} keymaps \
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 ${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>
X+.include <bsd.port.mk>
Xdiff -urN /usr/ports/emulators/mame/distinfo emulators/mame/distinfo
X--- /usr/ports/emulators/mame/distinfo	2014-01-16 15:34:38.000000000 +0900
X+++ emulators/mame/distinfo	2014-04-22 00:00:00.000000000 +0900
X@@ -1,2 +1,2 @@
X-SHA256 (mame/mame0152s.zip) = dd245297824e0b3938312c74aee31e1d32798d093bbf19f857de56bbd1ea4bdf
X-SIZE (mame/mame0152s.zip) = 36247883
X+SHA256 (mame/mame0153s.zip) = abf6fb4da48985ccefeaf6016aeedbe91d07ad6b0cd7dda7c0f3dc0eb83355e4
X+SIZE (mame/mame0153s.zip) = 37829714
Xdiff -urN /usr/ports/emulators/mame/files/patch-src__emu__eigccx86.h emulators/mame/files/patch-src__emu__eigccx86.h
X--- /usr/ports/emulators/mame/files/patch-src__emu__eigccx86.h	1970-01-01 09:00:00.000000000 +0900
X+++ emulators/mame/files/patch-src__emu__eigccx86.h	2014-04-22 00:00:00.000000000 +0900
X@@ -0,0 +1,128 @@
X+--- src/emu/eigccx86.h.orig
X++++ src/emu/eigccx86.h
X+@@ -42,7 +42,7 @@
X+     multiply and return the full 64 bit result
X+ -------------------------------------------------*/
X+ 
X+-#ifndef __x86_64__
X++#if !defined(__amd64__) && !defined(__x86_64__)
X+ #define mul_32x32 _mul_32x32
X+ INLINE INT64 ATTR_CONST ATTR_FORCE_INLINE
X+ _mul_32x32(INT32 a, INT32 b)
X+@@ -68,7 +68,7 @@
X+     result
X+ -------------------------------------------------*/
X+ 
X+-#ifndef __x86_64__
X++#if !defined(__amd64__) && !defined(__x86_64__)
X+ #define mulu_32x32 _mulu_32x32
X+ INLINE UINT64 ATTR_CONST ATTR_FORCE_INLINE
X+ _mulu_32x32(UINT32 a, UINT32 b)
X+@@ -145,7 +145,7 @@
X+     result to 32 bits
X+ -------------------------------------------------*/
X+ 
X+-#ifndef __x86_64__
X++#if !defined(__amd64__) && !defined(__x86_64__)
X+ #define mul_32x32_shift _mul_32x32_shift
X+ INLINE INT32 ATTR_CONST ATTR_FORCE_INLINE
X+ _mul_32x32_shift(INT32 a, INT32 b, UINT8 shift)
X+@@ -175,7 +175,7 @@
X+     result to 32 bits
X+ -------------------------------------------------*/
X+ 
X+-#ifndef __x86_64__
X++#if !defined(__amd64__) && !defined(__x86_64__)
X+ #define mulu_32x32_shift _mulu_32x32_shift
X+ INLINE UINT32 ATTR_CONST ATTR_FORCE_INLINE
X+ _mulu_32x32_shift(UINT32 a, UINT32 b, UINT8 shift)
X+@@ -203,7 +203,7 @@
X+     divide and return the 32 bit quotient
X+ -------------------------------------------------*/
X+ 
X+-#ifndef __x86_64__
X++#if !defined(__amd64__) && !defined(__x86_64__)
X+ #define div_64x32 _div_64x32
X+ INLINE INT32 ATTR_CONST ATTR_FORCE_INLINE
X+ _div_64x32(INT64 a, INT32 b)
X+@@ -230,7 +230,7 @@
X+     divide and return the 32 bit quotient
X+ -------------------------------------------------*/
X+ 
X+-#ifndef __x86_64__
X++#if !defined(__amd64__) && !defined(__x86_64__)
X+ #define divu_64x32 _divu_64x32
X+ INLINE UINT32 ATTR_CONST ATTR_FORCE_INLINE
X+ _divu_64x32(UINT64 a, UINT32 b)
X+@@ -258,7 +258,7 @@
X+     32 bit remainder
X+ -------------------------------------------------*/
X+ 
X+-#ifndef __x86_64__
X++#if !defined(__amd64__) && !defined(__x86_64__)
X+ #define div_64x32_rem _div_64x32_rem
X+ INLINE INT32 ATTR_FORCE_INLINE
X+ _div_64x32_rem(INT64 dividend, INT32 divisor, INT32 *remainder)
X+@@ -286,7 +286,7 @@
X+     and 32 bit remainder
X+ -------------------------------------------------*/
X+ 
X+-#ifndef __x86_64__
X++#if !defined(__amd64__) && !defined(__x86_64__)
X+ #define divu_64x32_rem _divu_64x32_rem
X+ INLINE UINT32 ATTR_FORCE_INLINE
X+ _divu_64x32_rem(UINT64 dividend, UINT32 divisor, UINT32 *remainder)
X+@@ -337,7 +337,7 @@
X+     division, and returning the 32 bit quotient
X+ -------------------------------------------------*/
X+ 
X+-#ifndef __x86_64__
X++#if !defined(__amd64__) && !defined(__x86_64__)
X+ #define div_32x32_shift _div_32x32_shift
X+ INLINE INT32 ATTR_CONST ATTR_FORCE_INLINE
X+ _div_32x32_shift(INT32 a, INT32 b, UINT8 shift)
X+@@ -369,7 +369,7 @@
X+     division, and returning the 32 bit quotient
X+ -------------------------------------------------*/
X+ 
X+-#ifndef __x86_64__
X++#if !defined(__amd64__) && !defined(__x86_64__)
X+ #define divu_32x32_shift _divu_32x32_shift
X+ INLINE UINT32 ATTR_CONST ATTR_FORCE_INLINE
X+ _divu_32x32_shift(UINT32 a, UINT32 b, UINT8 shift)
X+@@ -400,7 +400,7 @@
X+     divide and return the 32 bit remainder
X+ -------------------------------------------------*/
X+ 
X+-#ifndef __x86_64__
X++#if !defined(__amd64__) && !defined(__x86_64__)
X+ #define mod_64x32 _mod_64x32
X+ INLINE INT32 ATTR_CONST ATTR_FORCE_INLINE
X+ _mod_64x32(INT64 a, INT32 b)
X+@@ -427,7 +427,7 @@
X+     divide and return the 32 bit remainder
X+ -------------------------------------------------*/
X+ 
X+-#ifndef __x86_64__
X++#if !defined(__amd64__) && !defined(__x86_64__)
X+ #define modu_64x32 _modu_64x32
X+ INLINE UINT32 ATTR_CONST ATTR_FORCE_INLINE
X+ _modu_64x32(UINT64 a, UINT32 b)
X+@@ -563,7 +563,7 @@
X+     return the previous value at 'ptr'.
X+ -------------------------------------------------*/
X+ 
X+-#ifdef __x86_64__
X++#if defined(__amd64__) || defined(__x86_64__)
X+ #define compare_exchange64 _compare_exchange64
X+ INLINE INT64 ATTR_NONNULL(1) ATTR_FORCE_INLINE
X+ _compare_exchange64(INT64 volatile *ptr, INT64 compare, INT64 exchange)
X+@@ -693,7 +693,7 @@
X+ 
X+ #define get_profile_ticks _get_profile_ticks
X+ 
X+-#ifndef __x86_64__
X++#if !defined(__amd64__) && !defined(__x86_64__)
X+ INLINE UINT64 ATTR_UNUSED ATTR_FORCE_INLINE _get_profile_ticks(void)
X+ {
X+ 	UINT64 result;
Xdiff -urN /usr/ports/emulators/mame/files/patch-src__emu__eminline.h emulators/mame/files/patch-src__emu__eminline.h
X--- /usr/ports/emulators/mame/files/patch-src__emu__eminline.h	1970-01-01 09:00:00.000000000 +0900
X+++ emulators/mame/files/patch-src__emu__eminline.h	2014-04-22 00:00:00.000000000 +0900
X@@ -0,0 +1,11 @@
X+--- src/emu/eminline.h.orig
X++++ src/emu/eminline.h
X+@@ -17,7 +17,7 @@
X+ /* we come with implementations for GCC x86 and PPC */
X+ #if defined(__GNUC__)
X+ 
X+-#if defined(__i386__) || defined(__x86_64__)
X++#if defined(__i386__) || defined(__amd64__) || defined(__x86_64__)
X+ #include "eigccx86.h"
X+ #elif defined(__ppc__) || defined (__PPC__) || defined(__ppc64__) || defined(__PPC64__)
X+ #include "eigccppc.h"
Xdiff -urN /usr/ports/emulators/mame/files/patch-src__emu__netlist__nl_base.h emulators/mame/files/patch-src__emu__netlist__nl_base.h
X--- /usr/ports/emulators/mame/files/patch-src__emu__netlist__nl_base.h	2014-01-16 15:34:37.000000000 +0900
X+++ emulators/mame/files/patch-src__emu__netlist__nl_base.h	1970-01-01 09:00:00.000000000 +0900
X@@ -1,20 +0,0 @@
X---- src/emu/netlist/nl_base.h.orig
X-+++ src/emu/netlist/nl_base.h
X-@@ -287,7 +287,7 @@
X- 
X- 	ATTR_COLD const pstring &name() const;
X- 
X--	PSTATE_INTERFACE(*m_netlist, name())
X-+	PSTATE_INTERFACE_DECL()
X- 
X- #if 0
X- 	template<class C> ATTR_COLD void save(C &state, const pstring &stname)
X-@@ -1120,6 +1120,8 @@
X- // Inline implementations
X- // ----------------------------------------------------------------------------------------
X- 
X-+PSTATE_INTERFACE(netlist_object_t, m_netlist, name())
X-+
X- ATTR_HOT inline void netlist_param_str_t::setTo(const pstring &param)
X- {
X- 	m_param = param;
Xdiff -urN /usr/ports/emulators/mame/files/patch-src__emu__netlist__pstate.h emulators/mame/files/patch-src__emu__netlist__pstate.h
X--- /usr/ports/emulators/mame/files/patch-src__emu__netlist__pstate.h	2014-01-16 15:34:37.000000000 +0900
X+++ emulators/mame/files/patch-src__emu__netlist__pstate.h	1970-01-01 09:00:00.000000000 +0900
X@@ -1,19 +0,0 @@
X---- src/emu/netlist/pstate.h.orig
X-+++ src/emu/netlist/pstate.h
X-@@ -15,10 +15,13 @@
X- // state saving ...
X- // ----------------------------------------------------------------------------------------
X- 
X--#define PSTATE_INTERFACE(manager, module)               \
X--	template<class C> ATTR_COLD void save(C &state, const pstring &stname) \
X-+#define PSTATE_INTERFACE_DECL()               \
X-+	template<class C> ATTR_COLD void save(C &state, const pstring &stname);
X-+
X-+#define PSTATE_INTERFACE(obj, manager, module)               \
X-+	template<class C> ATTR_COLD void obj::save(C &state, const pstring &stname) \
X- 	{                                                                       \
X--		dynamic_cast<pstate_manager_t &>(manager).save_manager(state, module + "." + stname);  \
X-+		manager->save_manager(state, module + "." + stname);  \
X- 	}
X- 
X- enum netlist_data_type_e {
Xdiff -urN /usr/ports/emulators/mame/files/patch-src__lib__lib7z__CpuArch.h emulators/mame/files/patch-src__lib__lib7z__CpuArch.h
X--- /usr/ports/emulators/mame/files/patch-src__lib__lib7z__CpuArch.h	1970-01-01 09:00:00.000000000 +0900
X+++ emulators/mame/files/patch-src__lib__lib7z__CpuArch.h	2014-04-22 00:00:00.000000000 +0900
X@@ -0,0 +1,11 @@
X+--- src/lib/lib7z/CpuArch.h.orig
X++++ src/lib/lib7z/CpuArch.h
X+@@ -16,7 +16,7 @@
X+ If MY_CPU_LE_UNALIGN is not defined, we don't know about these properties of platform.
X+ */
X+ 
X+-#if defined(_M_X64) || defined(_M_AMD64) || defined(__x86_64__)
X++#if defined(__amd64__) || defined(_M_X64) || defined(_M_AMD64) || defined(__x86_64__)
X+ #define MY_CPU_AMD64
X+ #endif
X+ 
Xdiff -urN /usr/ports/emulators/mame/files/patch-src__lib__lua__luaconf.h emulators/mame/files/patch-src__lib__lua__luaconf.h
X--- /usr/ports/emulators/mame/files/patch-src__lib__lua__luaconf.h	1970-01-01 09:00:00.000000000 +0900
X+++ emulators/mame/files/patch-src__lib__lua__luaconf.h	2014-04-22 00:00:00.000000000 +0900
X@@ -0,0 +1,11 @@
X+--- src/lib/lua/luaconf.h.orig
X++++ src/lib/lua/luaconf.h
X+@@ -514,7 +514,7 @@
X+ #define LUA_NANTRICK
X+ 
X+ /* pentium 64 bits? */
X+-#elif defined(__x86_64)                     /* }{ */
X++#elif defined(__amd64__) || defined(__x86_64__) || defined(__x86_64) /* }{ */
X+ 
X+ #define LUA_IEEE754TRICK
X+ #define LUA_IEEEENDIAN      0
Xdiff -urN /usr/ports/emulators/mame/files/patch-src__osd__sdl__osinline.h emulators/mame/files/patch-src__osd__sdl__osinline.h
X--- /usr/ports/emulators/mame/files/patch-src__osd__sdl__osinline.h	1970-01-01 09:00:00.000000000 +0900
X+++ emulators/mame/files/patch-src__osd__sdl__osinline.h	2014-04-22 00:00:00.000000000 +0900
X@@ -0,0 +1,11 @@
X+--- src/osd/sdl/osinline.h.orig
X++++ src/osd/sdl/osinline.h
X+@@ -14,7 +14,7 @@
X+ //  INLINE FUNCTIONS
X+ //============================================================
X+ 
X+-#if defined(__i386__) || defined(__x86_64__)
X++#if defined(__i386__) || defined(__amd64__) || defined(__x86_64__)
X+ 
X+ 
X+ INLINE void ATTR_FORCE_INLINE
Xdiff -urN /usr/ports/emulators/mame/files/patch-src__osd__sdl__sdlsync_ntc.c emulators/mame/files/patch-src__osd__sdl__sdlsync_ntc.c
X--- /usr/ports/emulators/mame/files/patch-src__osd__sdl__sdlsync_ntc.c	1970-01-01 09:00:00.000000000 +0900
X+++ emulators/mame/files/patch-src__osd__sdl__sdlsync_ntc.c	2014-04-22 00:00:00.000000000 +0900
X@@ -0,0 +1,29 @@
X+--- src/osd/sdl/sdlsync_ntc.c.orig
X++++ src/osd/sdl/sdlsync_ntc.c
X+@@ -102,7 +102,7 @@
X+ {
X+ 	INT32 myslot = (atomic_increment32(&lock->nextindex) - 1) & (WORK_MAX_THREADS - 1);
X+ 
X+-#if defined(__i386__) || defined(__x86_64__)
X++#if defined(__i386__) || defined(__amd64__) || defined(__x86_64__)
X+ 	register INT32 tmp;
X+ 	__asm__ __volatile__ (
X+ 		"1: clr    %[tmp]             ;"
X+@@ -157,7 +157,7 @@
X+ 
X+ void osd_scalable_lock_release(osd_scalable_lock *lock, INT32 myslot)
X+ {
X+-#if defined(__i386__) || defined(__x86_64__)
X++#if defined(__i386__) || defined(__amd64__) || defined(__x86_64__)
X+ 	register INT32 tmp = TRUE;
X+ 	__asm__ __volatile__ (
X+ 		" xchg   %[haslock], %[tmp] ;"
X+@@ -230,7 +230,7 @@
X+ 		do {
X+ 			register INT32 spin = 10000; // Convenient spin count
X+ 			register pthread_t tmp;
X+-#if defined(__i386__) || defined(__x86_64__)
X++#if defined(__i386__) || defined(__amd64__) || defined(__x86_64__)
X+ 			__asm__ __volatile__ (
X+ 				"1: pause                    ;"
X+ 				"   mov    %[holder], %[tmp] ;"
Xdiff -urN /usr/ports/emulators/mame/files/patch-src__osd__sdl__sdlsync_os2.c emulators/mame/files/patch-src__osd__sdl__sdlsync_os2.c
X--- /usr/ports/emulators/mame/files/patch-src__osd__sdl__sdlsync_os2.c	1970-01-01 09:00:00.000000000 +0900
X+++ emulators/mame/files/patch-src__osd__sdl__sdlsync_os2.c	2014-04-22 00:00:00.000000000 +0900
X@@ -0,0 +1,29 @@
X+--- src/osd/sdl/sdlsync_os2.c.orig
X++++ src/osd/sdl/sdlsync_os2.c
X+@@ -91,7 +91,7 @@
X+ {
X+ 	INT32 myslot = (atomic_increment32(&lock->nextindex) - 1) & (WORK_MAX_THREADS - 1);
X+ 
X+-#if defined(__i386__) || defined(__x86_64__)
X++#if defined(__i386__) || defined(__amd64__) || defined(__x86_64__)
X+ 	register INT32 tmp;
X+ 	__asm__ __volatile__ (
X+ 		"1: clr    %[tmp]             ;"
X+@@ -146,7 +146,7 @@
X+ 
X+ void osd_scalable_lock_release(osd_scalable_lock *lock, INT32 myslot)
X+ {
X+-#if defined(__i386__) || defined(__x86_64__)
X++#if defined(__i386__) || defined(__amd64__) || defined(__x86_64__)
X+ 	register INT32 tmp = TRUE;
X+ 	__asm__ __volatile__ (
X+ 		" xchg   %[haslock], %[tmp] ;"
X+@@ -219,7 +219,7 @@
X+ 		do {
X+ 			register INT32 spin = 10000; // Convenient spin count
X+ 			register pthread_t tmp;
X+-#if defined(__i386__) || defined(__x86_64__)
X++#if defined(__i386__) || defined(__amd64__) || defined(__x86_64__)
X+ 			__asm__ __volatile__ (
X+ 				"1: pause                    ;"
X+ 				"   mov    %[holder], %[tmp] ;"
Xdiff -urN /usr/ports/emulators/mame/pkg-plist emulators/mame/pkg-plist
X--- /usr/ports/emulators/mame/pkg-plist	2014-01-16 15:34:38.000000000 +0900
X+++ emulators/mame/pkg-plist	2014-04-22 00:00:00.000000000 +0900
X@@ -8,6 +8,7 @@
X libexec/mame/unidasm
X %%PORTDOCS%%%%DOCSDIR%%/docs/SDL.txt
X %%PORTDOCS%%%%DOCSDIR%%/docs/config.txt
X+%%PORTDOCS%%%%DOCSDIR%%/docs/floppy.txt
X %%PORTDOCS%%%%DOCSDIR%%/docs/hlsl.txt
X %%PORTDOCS%%%%DOCSDIR%%/docs/imgtool.txt
X %%PORTDOCS%%%%DOCSDIR%%/docs/license.txt
X@@ -92,7 +93,9 @@
X %%DATADIR%%/hash/cdtv.xml
X %%DATADIR%%/hash/channelf.xml
X %%DATADIR%%/hash/coco_cart.xml
X+%%DATADIR%%/hash/coco_flop.xml
X %%DATADIR%%/hash/coleco.xml
X+%%DATADIR%%/hash/compclr2_flop.xml
X %%DATADIR%%/hash/compis.xml
X %%DATADIR%%/hash/comx35_flop.xml
X %%DATADIR%%/hash/copera.xml
X@@ -121,6 +124,8 @@
X %%DATADIR%%/hash/gba.xml
X %%DATADIR%%/hash/gbcolor.xml
X %%DATADIR%%/hash/genius.xml
X+%%DATADIR%%/hash/gl2000.xml
X+%%DATADIR%%/hash/gl6000sl.xml
X %%DATADIR%%/hash/gmaster.xml
X %%DATADIR%%/hash/gp32.xml
X %%DATADIR%%/hash/gx4000.xml
X@@ -173,6 +178,7 @@
X %%DATADIR%%/hash/msx.hsi
X %%DATADIR%%/hash/msx1_cart.xml
X %%DATADIR%%/hash/msx1_cass.xml
X+%%DATADIR%%/hash/msx1_flop.xml
X %%DATADIR%%/hash/msx2.hsi
X %%DATADIR%%/hash/msx2_cart.xml
X %%DATADIR%%/hash/myvision.xml
X@@ -187,6 +193,9 @@
X %%DATADIR%%/hash/neogeo.xml
X %%DATADIR%%/hash/nes.hsi
X %%DATADIR%%/hash/nes.xml
X+%%DATADIR%%/hash/nes_ade.xml
X+%%DATADIR%%/hash/nes_datach.xml
X+%%DATADIR%%/hash/nes_kstudio.xml
X %%DATADIR%%/hash/nes_ntbrom.xml
X %%DATADIR%%/hash/next.xml
X %%DATADIR%%/hash/ngp.xml
X@@ -249,6 +258,7 @@
X %%DATADIR%%/hash/samcoupe_flop.xml
X %%DATADIR%%/hash/sat_cart.xml
X %%DATADIR%%/hash/saturn.xml
X+%%DATADIR%%/hash/sawatte.xml
X %%DATADIR%%/hash/scv.xml
X %%DATADIR%%/hash/segacd.xml
X %%DATADIR%%/hash/sf7000.xml
X@@ -278,6 +288,7 @@
X %%DATADIR%%/hash/super6.xml
X %%DATADIR%%/hash/superpet_flop.xml
X %%DATADIR%%/hash/supracan.xml
X+%%DATADIR%%/hash/sv8000.xml
X %%DATADIR%%/hash/svi318_cart.xml
X %%DATADIR%%/hash/svi318_cass.xml
X %%DATADIR%%/hash/svi318_flop.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	2014-01-16 15:34:37.000000000 +0900
X+++ emulators/mess/Makefile	2014-04-22 00:00:00.000000000 +0900
X@@ -2,12 +2,12 @@
X # $FreeBSD: head/emulators/mess/Makefile 339885 2014-01-16 02:44:49Z danilo $
X 
X PORTNAME=	mess
X-PORTVERSION=	0.152${PATCHSUFFIX}
X+PORTVERSION=	0.153${PATCHSUFFIX}
X CATEGORIES=	emulators
X MASTER_SITES=	http://mame.mirrors.zippykid.com/releases/ \
X 		http://emumovies.com/aarongiles/releases/ \
X 		http://mamedev.org/updates/:patchsets
X-DISTFILES=	mame${PORTVERSION:S/.//:C/p[0-9]*$//}s.zip \
X+DISTFILES=	mame${PORTVERSION:S/.//:C/p[0-9]*$//}s${EXTRACT_SUFX} \
X 		${UPDATE_PATCHES:C/$/.zip:patchsets/}
X DIST_SUBDIR=	mame
X 
X@@ -20,15 +20,16 @@
X 		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
X RUN_DEPENDS=	liberation-fonts-ttf>=0:${PORTSDIR}/x11-fonts/liberation-fonts-ttf
X 
X-OPTIONS_DEFINE=	BUILTIN_DEBUGGER DEBUG DOCS EXAMPLES SDL2
X-BUILTIN_DEBUGGER_DESC=	Builtin debugger support
X-SDL2_DESC=	SDL2 libraries support
X-
X NO_WRKSUBDIR=	yes
X 
X-USES=		dos2unix gmake pkgconfig shebangfix
X-DOS2UNIX_FILES=	src/emu/netlist/nl_base.h \
X-		src/emu/netlist/pstate.h
X+USES=		dos2unix gmake pkgconfig shebangfix zip
X+DOS2UNIX_FILES=	src/emu/eigccx86.h \
X+		src/emu/eminline.h \
X+		src/lib/lib7z/CpuArch.h \
X+		src/lib/lua/luaconf.h \
X+		src/osd/sdl/osinline.h \
X+		src/osd/sdl/sdlsync_ntc.c \
X+		src/osd/sdl/sdlsync_os2.c
X SHEBANG_FILES=	src/emu/cpu/m6502/m6502make.py \
X 		src/emu/cpu/m6809/m6809make.py \
X 		src/emu/cpu/mcs96/mcs96make.py \
X@@ -44,6 +45,17 @@
X 
X SUB_FILES=	pkg-message
X 
X+OPTIONS_DEFINE=		BUILTIN_DEBUGGER DEBUG DOCS EXAMPLES SDL2
X+
X+BUILTIN_DEBUGGER_DESC=	Builtin debugger support
X+BUILTIN_DEBUGGER_USE=	QT4=gui,moc_build,qmake_build
X+BUILTIN_DEBUGGER_MAKE_ENV_OFF=\
X+			NO_DEBUGGER=1 NO_USE_QTDEBUG=1
X+DEBUG_MAKE_ENV=		DEBUG=1
X+SDL2_DESC=		SDL2 libraries support
X+SDL2_USE=		SDL=sdl2,ttf2
X+SDL2_MAKE_ENV=		SDL_LIBVER="sdl2"
X+
X PATCHLEVEL=	# none
X 
X .if defined(PATCHLEVEL) && ${PATCHLEVEL}
X@@ -55,25 +67,10 @@
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-.else
X+.if empty(PORT_OPTIONS:MSDL2)
X USE_SDL=	sdl ttf
X .endif
X 
X-.if ${PORT_OPTIONS:MDEBUG}
X-MAKE_ENV+=	DEBUG=1
X-.endif
X-
X-.include <bsd.port.pre.mk>
X-
X .if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64"
X BROKEN=		Does not install on ia64, powerpc, or sparc64
X .endif
X@@ -93,13 +90,13 @@
X 
X post-patch:
X 	@${REINPLACE_CMD} -e \
X-		'/^BUILD_EXPAT /s|^|#| ; \
X-		 /^BUILD_ZLIB /s|^|#| ; \
X-		 /^BUILD_FLAC /s|^|#| ; \
X-		 /^BUILD_JPEGLIB /s|^|#| ; \
X-		 /^CC /s|^|#| ; \
X-		 /^LD /s|^|#| ; \
X-		 /^PYTHON /s|^|#| ; \
X+		's|^\(BUILD_EXPAT \)|#\1| ; \
X+		 s|^\(BUILD_ZLIB \)|#\1| ; \
X+		 s|^\(BUILD_FLAC \)|#\1| ; \
X+		 s|^\(BUILD_JPEGLIB \)|#\1| ; \
X+		 s|^\(CC \)|#\1| ; \
X+		 s|^\(LD \)|#\1| ; \
X+		 s|^\(PYTHON \)|#\1| ; \
X 		 s|-O$$(OPTIMIZE)|| ; \
X 		 /--warn-common/s|= -Wl,|= $$(GCC_LDFLAGS) -Wl,| ; \
X 		 /LDFLAGS/s|-s|| ; \
X@@ -131,4 +128,4 @@
X 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
X 	(cd ${FILESDIR} && ${INSTALL_DATA} mess.ini ${STAGEDIR}${EXAMPLESDIR})
X 
X-.include <bsd.port.post.mk>
X+.include <bsd.port.mk>
Xdiff -urN /usr/ports/emulators/mess/distinfo emulators/mess/distinfo
X--- /usr/ports/emulators/mess/distinfo	2014-01-16 15:34:37.000000000 +0900
X+++ emulators/mess/distinfo	2014-04-22 00:00:00.000000000 +0900
X@@ -1,2 +1,2 @@
X-SHA256 (mame/mame0152s.zip) = dd245297824e0b3938312c74aee31e1d32798d093bbf19f857de56bbd1ea4bdf
X-SIZE (mame/mame0152s.zip) = 36247883
X+SHA256 (mame/mame0153s.zip) = abf6fb4da48985ccefeaf6016aeedbe91d07ad6b0cd7dda7c0f3dc0eb83355e4
X+SIZE (mame/mame0153s.zip) = 37829714
Xdiff -urN /usr/ports/emulators/mess/files/patch-src__emu__eigccx86.h emulators/mess/files/patch-src__emu__eigccx86.h
X--- /usr/ports/emulators/mess/files/patch-src__emu__eigccx86.h	1970-01-01 09:00:00.000000000 +0900
X+++ emulators/mess/files/patch-src__emu__eigccx86.h	2014-04-22 00:00:00.000000000 +0900
X@@ -0,0 +1,128 @@
X+--- src/emu/eigccx86.h.orig
X++++ src/emu/eigccx86.h
X+@@ -42,7 +42,7 @@
X+     multiply and return the full 64 bit result
X+ -------------------------------------------------*/
X+ 
X+-#ifndef __x86_64__
X++#if !defined(__amd64__) && !defined(__x86_64__)
X+ #define mul_32x32 _mul_32x32
X+ INLINE INT64 ATTR_CONST ATTR_FORCE_INLINE
X+ _mul_32x32(INT32 a, INT32 b)
X+@@ -68,7 +68,7 @@
X+     result
X+ -------------------------------------------------*/
X+ 
X+-#ifndef __x86_64__
X++#if !defined(__amd64__) && !defined(__x86_64__)
X+ #define mulu_32x32 _mulu_32x32
X+ INLINE UINT64 ATTR_CONST ATTR_FORCE_INLINE
X+ _mulu_32x32(UINT32 a, UINT32 b)
X+@@ -145,7 +145,7 @@
X+     result to 32 bits
X+ -------------------------------------------------*/
X+ 
X+-#ifndef __x86_64__
X++#if !defined(__amd64__) && !defined(__x86_64__)
X+ #define mul_32x32_shift _mul_32x32_shift
X+ INLINE INT32 ATTR_CONST ATTR_FORCE_INLINE
X+ _mul_32x32_shift(INT32 a, INT32 b, UINT8 shift)
X+@@ -175,7 +175,7 @@
X+     result to 32 bits
X+ -------------------------------------------------*/
X+ 
X+-#ifndef __x86_64__
X++#if !defined(__amd64__) && !defined(__x86_64__)
X+ #define mulu_32x32_shift _mulu_32x32_shift
X+ INLINE UINT32 ATTR_CONST ATTR_FORCE_INLINE
X+ _mulu_32x32_shift(UINT32 a, UINT32 b, UINT8 shift)
X+@@ -203,7 +203,7 @@
X+     divide and return the 32 bit quotient
X+ -------------------------------------------------*/
X+ 
X+-#ifndef __x86_64__
X++#if !defined(__amd64__) && !defined(__x86_64__)
X+ #define div_64x32 _div_64x32
X+ INLINE INT32 ATTR_CONST ATTR_FORCE_INLINE
X+ _div_64x32(INT64 a, INT32 b)
X+@@ -230,7 +230,7 @@
X+     divide and return the 32 bit quotient
X+ -------------------------------------------------*/
X+ 
X+-#ifndef __x86_64__
X++#if !defined(__amd64__) && !defined(__x86_64__)
X+ #define divu_64x32 _divu_64x32
X+ INLINE UINT32 ATTR_CONST ATTR_FORCE_INLINE
X+ _divu_64x32(UINT64 a, UINT32 b)
X+@@ -258,7 +258,7 @@
X+     32 bit remainder
X+ -------------------------------------------------*/
X+ 
X+-#ifndef __x86_64__
X++#if !defined(__amd64__) && !defined(__x86_64__)
X+ #define div_64x32_rem _div_64x32_rem
X+ INLINE INT32 ATTR_FORCE_INLINE
X+ _div_64x32_rem(INT64 dividend, INT32 divisor, INT32 *remainder)
X+@@ -286,7 +286,7 @@
X+     and 32 bit remainder
X+ -------------------------------------------------*/
X+ 
X+-#ifndef __x86_64__
X++#if !defined(__amd64__) && !defined(__x86_64__)
X+ #define divu_64x32_rem _divu_64x32_rem
X+ INLINE UINT32 ATTR_FORCE_INLINE
X+ _divu_64x32_rem(UINT64 dividend, UINT32 divisor, UINT32 *remainder)
X+@@ -337,7 +337,7 @@
X+     division, and returning the 32 bit quotient
X+ -------------------------------------------------*/
X+ 
X+-#ifndef __x86_64__
X++#if !defined(__amd64__) && !defined(__x86_64__)
X+ #define div_32x32_shift _div_32x32_shift
X+ INLINE INT32 ATTR_CONST ATTR_FORCE_INLINE
X+ _div_32x32_shift(INT32 a, INT32 b, UINT8 shift)
X+@@ -369,7 +369,7 @@
X+     division, and returning the 32 bit quotient
X+ -------------------------------------------------*/
X+ 
X+-#ifndef __x86_64__
X++#if !defined(__amd64__) && !defined(__x86_64__)
X+ #define divu_32x32_shift _divu_32x32_shift
X+ INLINE UINT32 ATTR_CONST ATTR_FORCE_INLINE
X+ _divu_32x32_shift(UINT32 a, UINT32 b, UINT8 shift)
X+@@ -400,7 +400,7 @@
X+     divide and return the 32 bit remainder
X+ -------------------------------------------------*/
X+ 
X+-#ifndef __x86_64__
X++#if !defined(__amd64__) && !defined(__x86_64__)
X+ #define mod_64x32 _mod_64x32
X+ INLINE INT32 ATTR_CONST ATTR_FORCE_INLINE
X+ _mod_64x32(INT64 a, INT32 b)
X+@@ -427,7 +427,7 @@
X+     divide and return the 32 bit remainder
X+ -------------------------------------------------*/
X+ 
X+-#ifndef __x86_64__
X++#if !defined(__amd64__) && !defined(__x86_64__)
X+ #define modu_64x32 _modu_64x32
X+ INLINE UINT32 ATTR_CONST ATTR_FORCE_INLINE
X+ _modu_64x32(UINT64 a, UINT32 b)
X+@@ -563,7 +563,7 @@
X+     return the previous value at 'ptr'.
X+ -------------------------------------------------*/
X+ 
X+-#ifdef __x86_64__
X++#if defined(__amd64__) || defined(__x86_64__)
X+ #define compare_exchange64 _compare_exchange64
X+ INLINE INT64 ATTR_NONNULL(1) ATTR_FORCE_INLINE
X+ _compare_exchange64(INT64 volatile *ptr, INT64 compare, INT64 exchange)
X+@@ -693,7 +693,7 @@
X+ 
X+ #define get_profile_ticks _get_profile_ticks
X+ 
X+-#ifndef __x86_64__
X++#if !defined(__amd64__) && !defined(__x86_64__)
X+ INLINE UINT64 ATTR_UNUSED ATTR_FORCE_INLINE _get_profile_ticks(void)
X+ {
X+ 	UINT64 result;
Xdiff -urN /usr/ports/emulators/mess/files/patch-src__emu__eminline.h emulators/mess/files/patch-src__emu__eminline.h
X--- /usr/ports/emulators/mess/files/patch-src__emu__eminline.h	1970-01-01 09:00:00.000000000 +0900
X+++ emulators/mess/files/patch-src__emu__eminline.h	2014-04-22 00:00:00.000000000 +0900
X@@ -0,0 +1,11 @@
X+--- src/emu/eminline.h.orig
X++++ src/emu/eminline.h
X+@@ -17,7 +17,7 @@
X+ /* we come with implementations for GCC x86 and PPC */
X+ #if defined(__GNUC__)
X+ 
X+-#if defined(__i386__) || defined(__x86_64__)
X++#if defined(__i386__) || defined(__amd64__) || defined(__x86_64__)
X+ #include "eigccx86.h"
X+ #elif defined(__ppc__) || defined (__PPC__) || defined(__ppc64__) || defined(__PPC64__)
X+ #include "eigccppc.h"
Xdiff -urN /usr/ports/emulators/mess/files/patch-src__emu__netlist__nl_base.h emulators/mess/files/patch-src__emu__netlist__nl_base.h
X--- /usr/ports/emulators/mess/files/patch-src__emu__netlist__nl_base.h	2014-01-16 15:34:37.000000000 +0900
X+++ emulators/mess/files/patch-src__emu__netlist__nl_base.h	1970-01-01 09:00:00.000000000 +0900
X@@ -1,20 +0,0 @@
X---- src/emu/netlist/nl_base.h.orig
X-+++ src/emu/netlist/nl_base.h
X-@@ -287,7 +287,7 @@
X- 
X- 	ATTR_COLD const pstring &name() const;
X- 
X--	PSTATE_INTERFACE(*m_netlist, name())
X-+	PSTATE_INTERFACE_DECL()
X- 
X- #if 0
X- 	template<class C> ATTR_COLD void save(C &state, const pstring &stname)
X-@@ -1120,6 +1120,8 @@
X- // Inline implementations
X- // ----------------------------------------------------------------------------------------
X- 
X-+PSTATE_INTERFACE(netlist_object_t, m_netlist, name())
X-+
X- ATTR_HOT inline void netlist_param_str_t::setTo(const pstring &param)
X- {
X- 	m_param = param;
Xdiff -urN /usr/ports/emulators/mess/files/patch-src__emu__netlist__pstate.h emulators/mess/files/patch-src__emu__netlist__pstate.h
X--- /usr/ports/emulators/mess/files/patch-src__emu__netlist__pstate.h	2014-01-16 15:34:37.000000000 +0900
X+++ emulators/mess/files/patch-src__emu__netlist__pstate.h	1970-01-01 09:00:00.000000000 +0900
X@@ -1,19 +0,0 @@
X---- src/emu/netlist/pstate.h.orig
X-+++ src/emu/netlist/pstate.h
X-@@ -15,10 +15,13 @@
X- // state saving ...
X- // ----------------------------------------------------------------------------------------
X- 
X--#define PSTATE_INTERFACE(manager, module)               \
X--	template<class C> ATTR_COLD void save(C &state, const pstring &stname) \
X-+#define PSTATE_INTERFACE_DECL()               \
X-+	template<class C> ATTR_COLD void save(C &state, const pstring &stname);
X-+
X-+#define PSTATE_INTERFACE(obj, manager, module)               \
X-+	template<class C> ATTR_COLD void obj::save(C &state, const pstring &stname) \
X- 	{                                                                       \
X--		dynamic_cast<pstate_manager_t &>(manager).save_manager(state, module + "." + stname);  \
X-+		manager->save_manager(state, module + "." + stname);  \
X- 	}
X- 
X- enum netlist_data_type_e {
Xdiff -urN /usr/ports/emulators/mess/files/patch-src__lib__lib7z__CpuArch.h emulators/mess/files/patch-src__lib__lib7z__CpuArch.h
X--- /usr/ports/emulators/mess/files/patch-src__lib__lib7z__CpuArch.h	1970-01-01 09:00:00.000000000 +0900
X+++ emulators/mess/files/patch-src__lib__lib7z__CpuArch.h	2014-04-22 00:00:00.000000000 +0900
X@@ -0,0 +1,11 @@
X+--- src/lib/lib7z/CpuArch.h.orig
X++++ src/lib/lib7z/CpuArch.h
X+@@ -16,7 +16,7 @@
X+ If MY_CPU_LE_UNALIGN is not defined, we don't know about these properties of platform.
X+ */
X+ 
X+-#if defined(_M_X64) || defined(_M_AMD64) || defined(__x86_64__)
X++#if defined(__amd64__) || defined(_M_X64) || defined(_M_AMD64) || defined(__x86_64__)
X+ #define MY_CPU_AMD64
X+ #endif
X+ 
Xdiff -urN /usr/ports/emulators/mess/files/patch-src__lib__lua__luaconf.h emulators/mess/files/patch-src__lib__lua__luaconf.h
X--- /usr/ports/emulators/mess/files/patch-src__lib__lua__luaconf.h	1970-01-01 09:00:00.000000000 +0900
X+++ emulators/mess/files/patch-src__lib__lua__luaconf.h	2014-04-22 00:00:00.000000000 +0900
X@@ -0,0 +1,11 @@
X+--- src/lib/lua/luaconf.h.orig
X++++ src/lib/lua/luaconf.h
X+@@ -514,7 +514,7 @@
X+ #define LUA_NANTRICK
X+ 
X+ /* pentium 64 bits? */
X+-#elif defined(__x86_64)                     /* }{ */
X++#elif defined(__amd64__) || defined(__x86_64__) || defined(__x86_64) /* }{ */
X+ 
X+ #define LUA_IEEE754TRICK
X+ #define LUA_IEEEENDIAN      0
Xdiff -urN /usr/ports/emulators/mess/files/patch-src__osd__sdl__osinline.h emulators/mess/files/patch-src__osd__sdl__osinline.h
X--- /usr/ports/emulators/mess/files/patch-src__osd__sdl__osinline.h	1970-01-01 09:00:00.000000000 +0900
X+++ emulators/mess/files/patch-src__osd__sdl__osinline.h	2014-04-22 00:00:00.000000000 +0900
X@@ -0,0 +1,11 @@
X+--- src/osd/sdl/osinline.h.orig
X++++ src/osd/sdl/osinline.h
X+@@ -14,7 +14,7 @@
X+ //  INLINE FUNCTIONS
X+ //============================================================
X+ 
X+-#if defined(__i386__) || defined(__x86_64__)
X++#if defined(__i386__) || defined(__amd64__) || defined(__x86_64__)
X+ 
X+ 
X+ INLINE void ATTR_FORCE_INLINE
Xdiff -urN /usr/ports/emulators/mess/files/patch-src__osd__sdl__sdlsync_ntc.c emulators/mess/files/patch-src__osd__sdl__sdlsync_ntc.c
X--- /usr/ports/emulators/mess/files/patch-src__osd__sdl__sdlsync_ntc.c	1970-01-01 09:00:00.000000000 +0900
X+++ emulators/mess/files/patch-src__osd__sdl__sdlsync_ntc.c	2014-04-22 00:00:00.000000000 +0900
X@@ -0,0 +1,29 @@
X+--- src/osd/sdl/sdlsync_ntc.c.orig
X++++ src/osd/sdl/sdlsync_ntc.c
X+@@ -102,7 +102,7 @@
X+ {
X+ 	INT32 myslot = (atomic_increment32(&lock->nextindex) - 1) & (WORK_MAX_THREADS - 1);
X+ 
X+-#if defined(__i386__) || defined(__x86_64__)
X++#if defined(__i386__) || defined(__amd64__) || defined(__x86_64__)
X+ 	register INT32 tmp;
X+ 	__asm__ __volatile__ (
X+ 		"1: clr    %[tmp]             ;"
X+@@ -157,7 +157,7 @@
X+ 
X+ void osd_scalable_lock_release(osd_scalable_lock *lock, INT32 myslot)
X+ {
X+-#if defined(__i386__) || defined(__x86_64__)
X++#if defined(__i386__) || defined(__amd64__) || defined(__x86_64__)
X+ 	register INT32 tmp = TRUE;
X+ 	__asm__ __volatile__ (
X+ 		" xchg   %[haslock], %[tmp] ;"
X+@@ -230,7 +230,7 @@
X+ 		do {
X+ 			register INT32 spin = 10000; // Convenient spin count
X+ 			register pthread_t tmp;
X+-#if defined(__i386__) || defined(__x86_64__)
X++#if defined(__i386__) || defined(__amd64__) || defined(__x86_64__)
X+ 			__asm__ __volatile__ (
X+ 				"1: pause                    ;"
X+ 				"   mov    %[holder], %[tmp] ;"
Xdiff -urN /usr/ports/emulators/mess/files/patch-src__osd__sdl__sdlsync_os2.c emulators/mess/files/patch-src__osd__sdl__sdlsync_os2.c
X--- /usr/ports/emulators/mess/files/patch-src__osd__sdl__sdlsync_os2.c	1970-01-01 09:00:00.000000000 +0900
X+++ emulators/mess/files/patch-src__osd__sdl__sdlsync_os2.c	2014-04-22 00:00:00.000000000 +0900
X@@ -0,0 +1,29 @@
X+--- src/osd/sdl/sdlsync_os2.c.orig
X++++ src/osd/sdl/sdlsync_os2.c
X+@@ -91,7 +91,7 @@
X+ {
X+ 	INT32 myslot = (atomic_increment32(&lock->nextindex) - 1) & (WORK_MAX_THREADS - 1);
X+ 
X+-#if defined(__i386__) || defined(__x86_64__)
X++#if defined(__i386__) || defined(__amd64__) || defined(__x86_64__)
X+ 	register INT32 tmp;
X+ 	__asm__ __volatile__ (
X+ 		"1: clr    %[tmp]             ;"
X+@@ -146,7 +146,7 @@
X+ 
X+ void osd_scalable_lock_release(osd_scalable_lock *lock, INT32 myslot)
X+ {
X+-#if defined(__i386__) || defined(__x86_64__)
X++#if defined(__i386__) || defined(__amd64__) || defined(__x86_64__)
X+ 	register INT32 tmp = TRUE;
X+ 	__asm__ __volatile__ (
X+ 		" xchg   %[haslock], %[tmp] ;"
X+@@ -219,7 +219,7 @@
X+ 		do {
X+ 			register INT32 spin = 10000; // Convenient spin count
X+ 			register pthread_t tmp;
X+-#if defined(__i386__) || defined(__x86_64__)
X++#if defined(__i386__) || defined(__amd64__) || defined(__x86_64__)
X+ 			__asm__ __volatile__ (
X+ 				"1: pause                    ;"
X+ 				"   mov    %[holder], %[tmp] ;"
Xdiff -urN /usr/ports/emulators/mess/pkg-plist emulators/mess/pkg-plist
X--- /usr/ports/emulators/mess/pkg-plist	2014-01-16 15:34:37.000000000 +0900
X+++ emulators/mess/pkg-plist	2014-04-22 00:00:00.000000000 +0900
X@@ -10,6 +10,7 @@
X libexec/mess/unidasm
X %%PORTDOCS%%%%DOCSDIR%%/docs/SDL.txt
X %%PORTDOCS%%%%DOCSDIR%%/docs/config.txt
X+%%PORTDOCS%%%%DOCSDIR%%/docs/floppy.txt
X %%PORTDOCS%%%%DOCSDIR%%/docs/hlsl.txt
X %%PORTDOCS%%%%DOCSDIR%%/docs/imgtool.txt
X %%PORTDOCS%%%%DOCSDIR%%/docs/license.txt
X@@ -94,7 +95,9 @@
X %%DATADIR%%/hash/cdtv.xml
X %%DATADIR%%/hash/channelf.xml
X %%DATADIR%%/hash/coco_cart.xml
X+%%DATADIR%%/hash/coco_flop.xml
X %%DATADIR%%/hash/coleco.xml
X+%%DATADIR%%/hash/compclr2_flop.xml
X %%DATADIR%%/hash/compis.xml
X %%DATADIR%%/hash/comx35_flop.xml
X %%DATADIR%%/hash/copera.xml
X@@ -123,6 +126,8 @@
X %%DATADIR%%/hash/gba.xml
X %%DATADIR%%/hash/gbcolor.xml
X %%DATADIR%%/hash/genius.xml
X+%%DATADIR%%/hash/gl2000.xml
X+%%DATADIR%%/hash/gl6000sl.xml
X %%DATADIR%%/hash/gmaster.xml
X %%DATADIR%%/hash/gp32.xml
X %%DATADIR%%/hash/gx4000.xml
X@@ -175,6 +180,7 @@
X %%DATADIR%%/hash/msx.hsi
X %%DATADIR%%/hash/msx1_cart.xml
X %%DATADIR%%/hash/msx1_cass.xml
X+%%DATADIR%%/hash/msx1_flop.xml
X %%DATADIR%%/hash/msx2.hsi
X %%DATADIR%%/hash/msx2_cart.xml
X %%DATADIR%%/hash/myvision.xml
X@@ -189,6 +195,9 @@
X %%DATADIR%%/hash/neogeo.xml
X %%DATADIR%%/hash/nes.hsi
X %%DATADIR%%/hash/nes.xml
X+%%DATADIR%%/hash/nes_ade.xml
X+%%DATADIR%%/hash/nes_datach.xml
X+%%DATADIR%%/hash/nes_kstudio.xml
X %%DATADIR%%/hash/nes_ntbrom.xml
X %%DATADIR%%/hash/next.xml
X %%DATADIR%%/hash/ngp.xml
X@@ -251,6 +260,7 @@
X %%DATADIR%%/hash/samcoupe_flop.xml
X %%DATADIR%%/hash/sat_cart.xml
X %%DATADIR%%/hash/saturn.xml
X+%%DATADIR%%/hash/sawatte.xml
X %%DATADIR%%/hash/scv.xml
X %%DATADIR%%/hash/segacd.xml
X %%DATADIR%%/hash/sf7000.xml
X@@ -280,6 +290,7 @@
X %%DATADIR%%/hash/super6.xml
X %%DATADIR%%/hash/superpet_flop.xml
X %%DATADIR%%/hash/supracan.xml
X+%%DATADIR%%/hash/sv8000.xml
X %%DATADIR%%/hash/svi318_cart.xml
X %%DATADIR%%/hash/svi318_cass.xml
X %%DATADIR%%/hash/svi318_flop.xml
13f7e11912cff6c9343e13b09ba021e1
exit

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

More information about the freebsd-ports-bugs mailing list