Changes 0.9.23:

  - Massive update of printf formats for Win64 compatibility.
  - Dynamic drive support on MacOSX.
  - Still more MSI fixes and improvements.
  - Lots of bug fixes.

Changes  0.9.22:
  - The usual assortment of MSI improvements.
  - Several bug fixes to the various common controls.
  - Pixel shaders enabled by default in D3D.
  - Various improvements to the build process.
  - Many translation updates.
  - Lots of bug fixes.

Changes 0.9.20:
  - XEmbed system tray support.
  - Many improvements to NTLM support.
  - Many messages made localizable instead of hardcoded to English.
  - Improved support for various OpenGL platforms.
  - More improvements to the IDL compiler.
  - Lots of bug fixes.

9 files changed, 122 insertions, 104 deletions

diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index b0062a75e20..12ae09dcc3a 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.114 2006/10/08 01:05:55 wiz Exp $
+# $NetBSD: Makefile,v 1.115 2006/10/18 20:37:21 adam Exp $
 
-DISTNAME=	wine-0.9.18
-PKGREVISION=	2
+DISTNAME=	wine-0.9.23
 CATEGORIES=	emulators
 MASTER_SITES=	http://ibiblio.org/pub/linux/system/emulators/wine/ \
 		${MASTER_SITE_SOURCEFORGE:=wine/}
@@ -23,8 +22,6 @@ USE_LIBTOOL=		yes
 USE_NCURSES=		yes
 USE_TOOLS+=		bison gmake mktemp
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--disable-debug
-CONFIGURE_ARGS+=	--disable-trace
 UNLIMIT_RESOURCES=	datasize
 
 REPLACE_PERL+=		tools/winemaker tools/winedump/function_grep.pl
diff --git a/emulators/wine/PLIST b/emulators/wine/PLIST
index d986a6adc91..973ebfe0ddd 100644
--- a/emulators/wine/PLIST
+++ b/emulators/wine/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.48 2006/07/28 13:04:35 adam Exp $
+@comment $NetBSD: PLIST,v 1.49 2006/10/18 20:37:21 adam Exp $
 bin/bin2res
 bin/fnt2bdf
 bin/function_grep.pl
@@ -8,7 +8,6 @@ bin/progman
 bin/regedit
 bin/regsvr32
 bin/uninstaller
-bin/wcmd
 bin/widl
 bin/wine
 bin/wineboot
@@ -171,6 +170,7 @@ include/wine/windows/dplobby8.h
 include/wine/windows/dpnathlp.h
 include/wine/windows/dsconf.h
 include/wine/windows/dsdriver.h
+include/wine/windows/dsgetdc.h
 include/wine/windows/dshow.h
 include/wine/windows/dsound.h
 include/wine/windows/dsrole.h
@@ -202,8 +202,8 @@ include/wine/windows/icmpapi.h
 include/wine/windows/idispids.h
 include/wine/windows/imagehlp.h
 include/wine/windows/imm.h
-include/wine/windows/indexsvr.h
-include/wine/windows/indexsvr.idl
+include/wine/windows/indexsrv.h
+include/wine/windows/indexsrv.idl
 include/wine/windows/initguid.h
 include/wine/windows/ipexport.h
 include/wine/windows/iphlpapi.h
@@ -360,9 +360,12 @@ include/wine/windows/sql.h
 include/wine/windows/sqlext.h
 include/wine/windows/sqltypes.h
 include/wine/windows/sspi.h
+include/wine/windows/stdole2.idl
+include/wine/windows/stdole2.tlb
 include/wine/windows/storage.h
 include/wine/windows/strmif.h
 include/wine/windows/strmif.idl
+include/wine/windows/svrapi.h
 include/wine/windows/tapi.h
 include/wine/windows/tchar.h
 include/wine/windows/textserv.h
@@ -431,6 +434,7 @@ include/wine/windows/xmldsodid.h
 include/wine/windows/zmouse.h
 lib/libwine.so
 lib/libwine.so.1
+lib/libwine.so.1.0
 lib/wine/activeds.dll.so
 lib/wine/advapi32.dll.so
 lib/wine/advpack.dll.so
@@ -444,6 +448,8 @@ lib/wine/capi2032.dll.so
 lib/wine/cards.dll.so
 lib/wine/cfgmgr32.dll.so
 lib/wine/clock.exe.so
+lib/wine/clusapi.dll.so
+lib/wine/cmd.exe.so
 lib/wine/comcat.dll.so
 lib/wine/comctl32.dll.so
 lib/wine/comdlg32.dll.so
@@ -459,11 +465,11 @@ lib/wine/cryptnet.dll.so
 lib/wine/ctl3d.dll16
 lib/wine/ctl3d32.dll.so
 lib/wine/ctl3dv2.dll16
-${WINE_OPENGL}lib/wine/d3d8.dll.so
-${WINE_OPENGL}lib/wine/d3d9.dll.so
+lib/wine/d3d8.dll.so
+lib/wine/d3d9.dll.so
 lib/wine/d3dim.dll.so
 lib/wine/d3drm.dll.so
-${WINE_OPENGL}lib/wine/d3dx8.dll.so
+lib/wine/d3dx8.dll.so
 lib/wine/d3dxof.dll.so
 lib/wine/dbghelp.dll.so
 lib/wine/dciman32.dll.so
@@ -501,6 +507,7 @@ ${WINE_OPENGL}lib/wine/glut32.dll.so
 lib/wine/gphoto2.ds.so
 lib/wine/hh.exe.so
 lib/wine/hhctrl.ocx.so
+lib/wine/hid.dll.so
 lib/wine/hlink.dll.so
 lib/wine/iccvid.dll.so
 lib/wine/icinfo.exe.so
@@ -529,6 +536,7 @@ lib/wine/libcabinet.def
 lib/wine/libcapi2032.def
 lib/wine/libcards.def
 lib/wine/libcfgmgr32.def
+lib/wine/libclusapi.def
 lib/wine/libcomctl32.def
 lib/wine/libcomdlg32.def
 lib/wine/libcompstui.def
@@ -536,11 +544,11 @@ lib/wine/libcrtdll.def
 lib/wine/libcrypt32.def
 lib/wine/libcryptdll.def
 lib/wine/libctl3d32.def
-${WINE_OPENGL}lib/wine/libd3d8.def
-${WINE_OPENGL}lib/wine/libd3d9.def
+lib/wine/libd3d8.def
+lib/wine/libd3d9.def
 lib/wine/libd3dim.def
 lib/wine/libd3drm.def
-${WINE_OPENGL}lib/wine/libd3dx8.def
+lib/wine/libd3dx8.def
 lib/wine/libd3dxof.def
 lib/wine/libdbghelp.def
 lib/wine/libdciman32.def
@@ -560,6 +568,8 @@ lib/wine/libdxguid.a
 lib/wine/libgdi32.def
 ${WINE_OPENGL}lib/wine/libglu32.def
 ${WINE_OPENGL}lib/wine/libglut32.def
+lib/wine/libhid.def
+lib/wine/libhlink.def
 lib/wine/libicmp.def
 lib/wine/libimagehlp.def
 lib/wine/libimm32.def
@@ -582,6 +592,7 @@ lib/wine/libmsvcrt40.def
 lib/wine/libmsvcrtd.def
 lib/wine/libmsvfw32.def
 lib/wine/libmswsock.def
+lib/wine/libnddeapi.def
 lib/wine/libnetapi32.def
 lib/wine/libnewdev.def
 lib/wine/libntdll.def
@@ -600,6 +611,7 @@ lib/wine/libpowrprof.def
 lib/wine/libpsapi.def
 lib/wine/libquartz.def
 lib/wine/librasapi32.def
+lib/wine/libresutils.def
 lib/wine/libriched20.def
 lib/wine/librpcrt4.def
 lib/wine/librsaenh.def
@@ -640,6 +652,7 @@ lib/wine/libwow32.def
 lib/wine/libws2_32.def
 lib/wine/libwsock32.def
 lib/wine/libwtsapi32.def
+lib/wine/localspl.dll.so
 lib/wine/lz32.dll.so
 lib/wine/lzexpand.dll16
 lib/wine/mapi32.dll.so
@@ -660,6 +673,7 @@ lib/wine/msacm32.dll.so
 lib/wine/msacm32.drv.so
 lib/wine/msadp32.acm.so
 lib/wine/mscms.dll.so
+lib/wine/mscoree.dll.so
 lib/wine/msdmo.dll.so
 lib/wine/msftedit.dll.so
 lib/wine/msg711.acm.so
@@ -679,6 +693,7 @@ lib/wine/msvidc32.dll.so
 lib/wine/msvideo.dll16
 lib/wine/mswsock.dll.so
 lib/wine/msxml3.dll.so
+lib/wine/nddeapi.dll.so
 lib/wine/netapi32.dll.so
 lib/wine/newdev.dll.so
 lib/wine/notepad.exe.so
@@ -707,6 +722,7 @@ lib/wine/oleview.exe.so
 lib/wine/powrprof.dll.so
 lib/wine/progman.exe.so
 lib/wine/psapi.dll.so
+lib/wine/pstorec.dll.so
 lib/wine/qcap.dll.so
 lib/wine/quartz.dll.so
 lib/wine/query.dll.so
@@ -714,6 +730,7 @@ lib/wine/rasapi16.dll16
 lib/wine/rasapi32.dll.so
 lib/wine/regedit.exe.so
 lib/wine/regsvr32.exe.so
+lib/wine/resutils.dll.so
 lib/wine/riched20.dll.so
 lib/wine/riched32.dll.so
 lib/wine/rpcrt4.dll.so
@@ -743,6 +760,7 @@ lib/wine/stdole32.tlb.so
 lib/wine/sti.dll.so
 lib/wine/storage.dll16
 lib/wine/stress.dll16
+lib/wine/svrapi.dll.so
 lib/wine/system.drv16
 lib/wine/tapi32.dll.so
 lib/wine/taskmgr.exe.so
@@ -770,7 +788,6 @@ lib/wine/vtdapi.vxd.so
 lib/wine/vwin32.vxd.so
 lib/wine/w32skrnl.dll.so
 lib/wine/w32sys.dll16
-lib/wine/wcmd.exe.so
 lib/wine/win32s16.dll16
 lib/wine/win87em.dll16
 lib/wine/winaspi.dll16
@@ -827,6 +844,7 @@ man/man1/winedump.1
 man/man1/wineg++.1
 man/man1/winegcc.1
 man/man1/winemaker.1
+man/man1/wineprefixcreate.1
 man/man1/wineserver.1
 man/man1/wmc.1
 man/man1/wrc.1
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo
index 04046bd5f8c..cb0ebc2acc6 100644
--- a/emulators/wine/distinfo
+++ b/emulators/wine/distinfo
@@ -1,16 +1,15 @@
-$NetBSD: distinfo,v 1.51 2006/10/08 01:05:55 wiz Exp $
+$NetBSD: distinfo,v 1.52 2006/10/18 20:37:21 adam Exp $
 
-SHA1 (wine-0.9.18.tar.bz2) = 2b4386e5687c5c5b9a5ec44483dbf5068f74ad0a
-RMD160 (wine-0.9.18.tar.bz2) = 2a40ab811c2fe20889b89da20503466d8781655e
-Size (wine-0.9.18.tar.bz2) = 10875491 bytes
-SHA1 (patch-aa) = e432297394d9e92af859eaa0083d9a85b8530e5b
+SHA1 (wine-0.9.23.tar.bz2) = 598a6482cedec84ad95910084600bad38e80bfed
+RMD160 (wine-0.9.23.tar.bz2) = 3b588b0a5f41db336c976cb82ad538e4cd62dbe9
+Size (wine-0.9.23.tar.bz2) = 11197988 bytes
+SHA1 (patch-aa) = d660ead61768a7c2e819e4d554ca416972b191f1
 SHA1 (patch-ab) = 66c1f1ec98674d15c7a72e8ac16105c28aa25e91
-SHA1 (patch-ac) = c0a99356a4e7fb66f41f49c8fa85f8779a419287
+SHA1 (patch-ac) = 461302adb27d3a0eb224dc1ca1b853d58300baa8
 SHA1 (patch-ad) = 67366ff3feed3f0941f8ca8d7cb097b16dd5d421
-SHA1 (patch-ae) = dbd40183fb8e1f1d7af9ab4e51910a2227524e3c
-SHA1 (patch-af) = 680106cf9e8d96f7c30309cab99d40f1e3ad554a
-SHA1 (patch-ag) = 656f9667da542489595d1db65c84579b3dfce279
+SHA1 (patch-ae) = a4f39995baf5511ddc70b4e1c006a159a86eeb22
+SHA1 (patch-af) = a55e83f71f09fdbc5f980999ca9d435aac4120f9
 SHA1 (patch-ai) = a334ee48b949f9f5d4356beed3b422ee032619c2
 SHA1 (patch-aj) = 9ad0a5e641f86756018bf460a969c0187aae17a0
-SHA1 (patch-ak) = 4bb4f47b47fc70cca1eba422e9c4c6c14c0a78bd
+SHA1 (patch-ak) = 2262d241caac39cffa557aa24d9b057eec3db22c
 SHA1 (patch-al) = 7ee943a4060d526dab328cb2a8a7308b98514949
diff --git a/emulators/wine/patches/patch-aa b/emulators/wine/patches/patch-aa
index 7d2d9c47ec3..74b008bfb03 100644
--- a/emulators/wine/patches/patch-aa
+++ b/emulators/wine/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.22 2006/07/28 13:04:35 adam Exp $
+$NetBSD: patch-aa,v 1.23 2006/10/18 20:37:21 adam Exp $
 
---- Make.rules.in.orig	2006-07-27 16:55:50.000000000 +0200
+--- Make.rules.in.orig	2006-09-13 21:10:25.000000000 +0200
 +++ Make.rules.in
-@@ -110,7 +110,7 @@ conf_manext     = 5
+@@ -111,7 +111,7 @@ conf_manext     = 5
  CLEAN_FILES     = *.o *.a *.so *.ln *.$(LIBEXT) \\\#*\\\# *~ *% .\\\#* *.bak *.orig *.rej \
-                   *.flc *.tab.c *.tab.h @LEX_OUTPUT_ROOT@.c core
+                   *.flc *.res *.mc.rc *.tab.[ch] *.yy.c core
  
--OBJS = $(C_SRCS:.c=.o) $(EXTRA_OBJS)
-+OBJS = $(EXTRA_OBJS) $(C_SRCS:.c=.o)
+-OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(EXTRA_OBJS)
++OBJS = $(EXTRA_OBJS) $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o)
  
  RCOBJS = $(RC_SRCS:.rc=.res.o)
  LINTS  = $(C_SRCS:.c=.ln)
diff --git a/emulators/wine/patches/patch-ac b/emulators/wine/patches/patch-ac
index c9d4de96d76..19f384a4dbc 100644
--- a/emulators/wine/patches/patch-ac
+++ b/emulators/wine/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.32 2006/07/28 13:04:35 adam Exp $
+$NetBSD: patch-ac,v 1.33 2006/10/18 20:37:21 adam Exp $
 
---- configure.orig	2006-07-27 16:55:50.000000000 +0200
+--- configure.orig	2006-10-13 16:43:39.000000000 +0200
 +++ configure
-@@ -20903,7 +20903,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -20169,7 +20169,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.32 2006/07/28 13:04:35 adam Exp $
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
-@@ -22920,7 +22920,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -22186,7 +22186,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
diff --git a/emulators/wine/patches/patch-ae b/emulators/wine/patches/patch-ae
index 8e7676fb541..ee46e2b3a43 100644
--- a/emulators/wine/patches/patch-ae
+++ b/emulators/wine/patches/patch-ae
@@ -1,12 +1,12 @@
-$NetBSD: patch-ae,v 1.11 2005/05/25 08:23:43 adam Exp $
+$NetBSD: patch-ae,v 1.12 2006/10/18 20:37:21 adam Exp $
 
---- programs/winetest/winetest.rc.orig	2005-04-18 09:54:24.000000000 +0000
-+++ programs/winetest/winetest.rc
-@@ -21,7 +21,6 @@
- #include <windows.h>
- #include <winres.h>
- #include "resource.h"
--#include "tests.rc"
- 
- IDD_TAG DIALOG 0, 0, 150, 65
- STYLE WS_POPUP
+--- dlls/winex11.drv/opengl.c.orig	2006-09-15 08:03:29.000000000 +0200
++++ dlls/winex11.drv/opengl.c
+@@ -48,6 +48,7 @@ WINE_DECLARE_DEBUG_CHANNEL(opengl);
+ #endif
+ #ifdef HAVE_GL_GLX_H
+ # include <GL/glx.h>
++# include <GL/glxext.h>
+ #endif
+ #ifdef HAVE_GL_GLEXT_H
+ # include <GL/glext.h>
diff --git a/emulators/wine/patches/patch-af b/emulators/wine/patches/patch-af
index 861058422e8..267624e7929 100644
--- a/emulators/wine/patches/patch-af
+++ b/emulators/wine/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.18 2006/10/08 01:05:55 wiz Exp $
+$NetBSD: patch-af,v 1.19 2006/10/18 20:37:21 adam Exp $
 
---- dlls/ntdll/signal_i386.c.orig	2006-07-27 14:55:50.000000000 +0000
+--- dlls/ntdll/signal_i386.c.orig	2006-10-13 16:43:39.000000000 +0200
 +++ dlls/ntdll/signal_i386.c
-@@ -215,7 +215,7 @@ typedef struct trapframe SIGCONTEXT;
+@@ -163,7 +163,7 @@ typedef struct trapframe SIGCONTEXT;
  
  #endif /* bsdi */
  
@@ -11,12 +11,10 @@ $NetBSD: patch-af,v 1.18 2006/10/08 01:05:55 wiz Exp $
  
  typedef struct sigcontext SIGCONTEXT;
  
-@@ -339,8 +339,45 @@ typedef ucontext_t SIGCONTEXT;
+@@ -268,6 +268,43 @@ typedef ucontext_t SIGCONTEXT;
  
  #endif /* __APPLE__ */
  
--#if defined(linux) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) ||\
--    defined(__OpenBSD__) || defined(__EMX__) || defined(__CYGWIN__)
 +#if defined(__NetBSD__) && (__NetBSD_Version__ >= 200000000)
 +# include <sys/ucontext.h>
 +# include <sys/types.h>
@@ -24,50 +22,70 @@ $NetBSD: patch-af,v 1.18 2006/10/08 01:05:55 wiz Exp $
 +
 +typedef ucontext_t SIGCONTEXT;
 +
-+#define EAX_sig(context)     ((context)->uc_mcontext.__gregs[_REG_EAX])
-+#define EBX_sig(context)     ((context)->uc_mcontext.__gregs[_REG_EBX])
-+#define ECX_sig(context)     ((context)->uc_mcontext.__gregs[_REG_ECX])
-+#define EDX_sig(context)     ((context)->uc_mcontext.__gregs[_REG_EDX])
-+#define ESI_sig(context)     ((context)->uc_mcontext.__gregs[_REG_ESI])
-+#define EDI_sig(context)     ((context)->uc_mcontext.__gregs[_REG_EDI])
-+#define EBP_sig(context)     ((context)->uc_mcontext.__gregs[_REG_EBP])
++#define EAX_sig(context)	((context)->uc_mcontext.__gregs[_REG_EAX])
++#define EBX_sig(context)	((context)->uc_mcontext.__gregs[_REG_EBX])
++#define ECX_sig(context)	((context)->uc_mcontext.__gregs[_REG_ECX])
++#define EDX_sig(context)	((context)->uc_mcontext.__gregs[_REG_EDX])
++#define ESI_sig(context)	((context)->uc_mcontext.__gregs[_REG_ESI])
++#define EDI_sig(context)	((context)->uc_mcontext.__gregs[_REG_EDI])
++#define EBP_sig(context)	((context)->uc_mcontext.__gregs[_REG_EBP])
 +
-+#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 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_EFL])
++#define EFL_sig(context)	((context)->uc_mcontext.__gregs[_REG_EFL])
 +
-+#define EIP_sig(context)     (*((unsigned long*)&(context)->uc_mcontext.__gregs[_REG_EIP]))
-+#define ESP_sig(context)     (*((unsigned long*)&(context)->uc_mcontext.__gregs[_REG_ESP]))
++#define EIP_sig(context)	(*((unsigned long*)&(context)->uc_mcontext.__gregs[_REG_EIP]))
++#define ESP_sig(context)	(*((unsigned long*)&(context)->uc_mcontext.__gregs[_REG_ESP]))
 +
-+#define TRAP_sig(context)    ((context)->uc_mcontext.__gregs[_REG_TRAPNO])
-+#define ERROR_sig(context)   ((context)->uc_mcontext.__gregs[_REG_ERR])
++#define TRAP_sig(context)	((context)->uc_mcontext.__gregs[_REG_TRAPNO])
++#define ERROR_sig(context)	((context)->uc_mcontext.__gregs[_REG_ERR])
 +
-+#define FAULT_ADDRESS        (__siginfo->si_addr)
++#define FAULT_ADDRESS		(__siginfo->si_addr)
 +
 +#define HANDLER_DEF(name) void name( int __signal, siginfo_t *__siginfo, SIGCONTEXT *__context )
 +#define HANDLER_CONTEXT (__context)
 +
-+#endif	/* NetBSD */
++#endif /* __NetBSD__ */
 +
-+#if defined(linux) || (defined(__NetBSD__) && (__NetBSD_Version__ < 200000000)) || defined(__FreeBSD__) ||\
-+    defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__EMX__) || defined(__CYGWIN__)
+ #include "wine/exception.h"
+ #include "wine/debug.h"
  
- #define EAX_sig(context)     ((context)->sc_eax)
- #define EBX_sig(context)     ((context)->sc_ebx)
-@@ -1440,9 +1477,9 @@ static int set_handler( int sig, int hav
+@@ -303,8 +340,10 @@ enum i386_trap_code
+     TRAP_x86_PAGEFLT    = T_PAGEFLT,    /* Page fault */
+     TRAP_x86_ARITHTRAP  = T_ARITHTRAP,  /* Floating point exception */
+     TRAP_x86_ALIGNFLT   = T_ALIGNFLT,   /* Alignment check exception */
++#if !defined(__NetBSD__)
+     TRAP_x86_MCHK       = T_MCHK,       /* Machine check exception */
+     TRAP_x86_CACHEFLT   = T_XMMFLT      /* Cache flush exception */
++#endif
+ #else
+     TRAP_x86_DIVIDE     = 0,   /* Division by zero exception */
+     TRAP_x86_TRCTRAP    = 1,   /* Single-step exception */
+@@ -1148,8 +1187,10 @@ static void segv_handler( int signal, si
+     case TRAP_x86_DNA:       /* Device not available exception */
+     case TRAP_x86_DOUBLEFLT: /* Double fault exception */
+     case TRAP_x86_TSSFLT:    /* Invalid TSS exception */
++#if !defined(__NetBSD__)
+     case TRAP_x86_MCHK:      /* Machine check exception */
+     case TRAP_x86_CACHEFLT:  /* Cache flush exception */
++#endif
+         rec->ExceptionCode = EXCEPTION_ILLEGAL_INSTRUCTION;
+         break;
+     }
+@@ -1341,7 +1382,11 @@ BOOL SIGNAL_Init(void)
+     sigaddset( &sig_act.sa_mask, SIGINT );
      sigaddset( &sig_act.sa_mask, SIGUSR1 );
      sigaddset( &sig_act.sa_mask, SIGUSR2 );
- 
--#if defined(linux) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
-+#if defined(linux) || (defined(__NetBSD__) && (__NetBSD_Version__ < 200000000)) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__)
-     sig_act.sa_flags = SA_RESTART;
--#elif defined (__svr4__) || defined(_SCO_DS) || defined(__APPLE__)
-+#elif defined (__svr4__) || defined(_SCO_DS) || defined(__APPLE__) || (defined(__NetBSD__) && (__NetBSD_Version__ >= 200000000))
++#if defined(__NetBSD__) && (__NetBSD_Version__ < 200000000)
++    sig_act.sa_flags = SA_RESTART;
++#else
      sig_act.sa_flags = SA_SIGINFO | SA_RESTART;
- #else
-     sig_act.sa_flags = 0;
++#endif
+ 
+ #ifdef SA_ONSTACK
+     sig_act.sa_flags |= SA_ONSTACK;
diff --git a/emulators/wine/patches/patch-ag b/emulators/wine/patches/patch-ag
deleted file mode 100644
index 9bf81dbb754..00000000000
--- a/emulators/wine/patches/patch-ag
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ag,v 1.5 2005/06/05 06:14:17 minskim Exp $
-
---- dlls/kernel/sync.c.orig	2005-04-24 12:36:34.000000000 -0500
-+++ dlls/kernel/sync.c
-@@ -40,6 +40,9 @@
- #endif
- #include <stdarg.h>
- #include <stdio.h>
-+#ifdef HAVE_MACHINE_LIMITS_H
-+#include <machine/limits.h>
-+#endif
- 
- #define NONAMELESSUNION
- #define NONAMELESSSTRUCT
diff --git a/emulators/wine/patches/patch-ak b/emulators/wine/patches/patch-ak
index dc23947a6c2..d714add90e9 100644
--- a/emulators/wine/patches/patch-ak
+++ b/emulators/wine/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.7 2006/06/12 09:07:22 adam Exp $
+$NetBSD: patch-ak,v 1.8 2006/10/18 20:37:21 adam Exp $
 
---- dlls/ntdll/file.c.orig	2006-06-08 17:06:38.000000000 +0200
+--- dlls/ntdll/file.c.orig	2006-10-13 16:43:39.000000000 +0200
 +++ dlls/ntdll/file.c
-@@ -1629,6 +1629,35 @@ NTSTATUS FILE_GetDeviceInfo( int fd, FIL
+@@ -1624,6 +1624,35 @@ NTSTATUS FILE_GetDeviceInfo( int fd, FIL
              info->DeviceType = FILE_DEVICE_DISK_FILE_SYSTEM;
              break;
          }
@@ -35,6 +35,6 @@ $NetBSD: patch-ak,v 1.7 2006/06/12 09:07:22 adam Exp $
 +	    info->DeviceType = FILE_DEVICE_NETWORK_FILE_SYSTEM;
 +	    info->Characteristics |= FILE_REMOTE_DEVICE;
 +	}
- #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__APPLE__)
          struct statfs stfs;