Add patch to make this compile a bit further on amd64. It now fails in

oaidl_p.c:11403:2: error: #error Invalid build platform for this stub.

3 files changed, 62 insertions, 2 deletions

diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 12ae09dcc3a..967a454668b 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.115 2006/10/18 20:37:21 adam Exp $
+# $NetBSD: Makefile,v 1.116 2006/10/21 08:22:54 wiz Exp $
 
 DISTNAME=	wine-0.9.23
 CATEGORIES=	emulators
@@ -14,6 +14,7 @@ BUILD_DEPENDS+=	fontforge-[0-9]*:../../fonts/fontforge
 
 ONLY_FOR_PLATFORM=	NetBSD-1.5Z*-i386 NetBSD-1.6*-i386 NetBSD-[2-9]*-i386
 ONLY_FOR_PLATFORM+=	FreeBSD-*-i386 Linux-*-i386 SunOS-*-i386 Darwin-*-i386
+ONLY_FOR_PLATFORM+=	*-*-x86_64
 
 WRKSRC=			${WRKDIR}/${DISTNAME:S/W/w/}
 USE_DIRS+=		xdg-1.1
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo
index cb0ebc2acc6..56a7e11f987 100644
--- a/emulators/wine/distinfo
+++ b/emulators/wine/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.52 2006/10/18 20:37:21 adam Exp $
+$NetBSD: distinfo,v 1.53 2006/10/21 08:22:54 wiz Exp $
 
 SHA1 (wine-0.9.23.tar.bz2) = 598a6482cedec84ad95910084600bad38e80bfed
 RMD160 (wine-0.9.23.tar.bz2) = 3b588b0a5f41db336c976cb82ad538e4cd62dbe9
@@ -9,6 +9,7 @@ SHA1 (patch-ac) = 461302adb27d3a0eb224dc1ca1b853d58300baa8
 SHA1 (patch-ad) = 67366ff3feed3f0941f8ca8d7cb097b16dd5d421
 SHA1 (patch-ae) = a4f39995baf5511ddc70b4e1c006a159a86eeb22
 SHA1 (patch-af) = a55e83f71f09fdbc5f980999ca9d435aac4120f9
+SHA1 (patch-ag) = c4bf5a592ad5cad67ff933c5da418c58d6e1367a
 SHA1 (patch-ai) = a334ee48b949f9f5d4356beed3b422ee032619c2
 SHA1 (patch-aj) = 9ad0a5e641f86756018bf460a969c0187aae17a0
 SHA1 (patch-ak) = 2262d241caac39cffa557aa24d9b057eec3db22c
diff --git a/emulators/wine/patches/patch-ag b/emulators/wine/patches/patch-ag
new file mode 100644
index 00000000000..1728516714a
--- /dev/null
+++ b/emulators/wine/patches/patch-ag
@@ -0,0 +1,58 @@
+$NetBSD: patch-ag,v 1.7 2006/10/21 08:22:54 wiz Exp $
+
+--- dlls/ntdll/signal_x86_64.c.orig	2006-10-13 14:43:39.000000000 +0000
++++ dlls/ntdll/signal_x86_64.c
+@@ -93,6 +93,53 @@ typedef struct ucontext SIGCONTEXT;
+ 
+ #endif /* linux */
+ 
++#if defined(__NetBSD__) && (__NetBSD_Version__ >= 200000000)
++# include <sys/ucontext.h>
++# include <sys/types.h>
++# include <signal.h>
++
++typedef ucontext_t SIGCONTEXT;
++
++#define RAX_sig(context)	((context)->uc_mcontext.__gregs[_REG_RAX])
++#define RBX_sig(context)	((context)->uc_mcontext.__gregs[_REG_RBX])
++#define RCX_sig(context)	((context)->uc_mcontext.__gregs[_REG_RCX])
++#define RDX_sig(context)	((context)->uc_mcontext.__gregs[_REG_RDX])
++#define RSI_sig(context)	((context)->uc_mcontext.__gregs[_REG_RSI])
++#define RDI_sig(context)	((context)->uc_mcontext.__gregs[_REG_RDI])
++#define RBP_sig(context)	((context)->uc_mcontext.__gregs[_REG_RBP])
++#define R8_sig(context)		((context)->uc_mcontext.__gregs[_REG_R8])
++#define R9_sig(context)		((context)->uc_mcontext.__gregs[_REG_R9])
++#define R10_sig(context)	((context)->uc_mcontext.__gregs[_REG_R10])
++#define R11_sig(context)	((context)->uc_mcontext.__gregs[_REG_R11])
++#define R12_sig(context)	((context)->uc_mcontext.__gregs[_REG_R12])
++#define R13_sig(context)	((context)->uc_mcontext.__gregs[_REG_R13])
++#define R14_sig(context)	((context)->uc_mcontext.__gregs[_REG_R14])
++#define R15_sig(context)	((context)->uc_mcontext.__gregs[_REG_R15])
++
++#define CS_sig(context)		((context)->uc_mcontext.__gregs[_REG_CS])
++#define DS_sig(context)		((context)->uc_mcontext.__gregs[_REG_DS])
++#define ES_sig(context)		((context)->uc_mcontext.__gregs[_REG_ES])
++#define FS_sig(context)		((context)->uc_mcontext.__gregs[_REG_FS])
++#define GS_sig(context)		((context)->uc_mcontext.__gregs[_REG_GS])
++#define SS_sig(context)		((context)->uc_mcontext.__gregs[_REG_SS])
++
++#define EFL_sig(context)	((context)->uc_mcontext.__gregs[_REG_RFL])
++
++#define RIP_sig(context)	(*((unsigned long*)&(context)->uc_mcontext.__gregs[_REG_RIP]))
++#define RSP_sig(context)	(*((unsigned long*)&(context)->uc_mcontext.__gregs[_REG_URSP]))
++
++#define TRAP_sig(context)	((context)->uc_mcontext.__gregs[_REG_TRAPNO])
++#define ERROR_sig(context)	((context)->uc_mcontext.__gregs[_REG_ERR])
++
++#define FAULT_CODE		(__siginfo->si_code)
++#define FAULT_ADDRESS		(__siginfo->si_addr)
++
++#define HANDLER_DEF(name) void name( int __signal, siginfo_t *__siginfo, SIGCONTEXT *__context )
++#define HANDLER_CONTEXT (__context)
++
++#define FPU_sig(context)     ((XMM_SAVE_AREA32 *)((context)->uc_mcontext.__fpregs))
++#endif /* __NetBSD__ */
++
+ enum i386_trap_code
+ {
+     TRAP_x86_UNKNOWN    = -1,  /* Unknown fault (TRAP_sig not defined) */