Changes 1.3.19:

* New sound driver architecture for MMDevAPI.
* Better support for relative mouse events in DInput.
* Debugger support for the ARM platform.
* Various improvements in D3DX9.
* More MSVC runtime functions.
* Various bug fixes.

14 files changed, 131 insertions, 199 deletions

diff --git a/emulators/wine-devel/patches/patch-aa b/emulators/wine-devel/patches/patch-aa
index 11fad18abc1..037933648b2 100644
--- a/emulators/wine-devel/patches/patch-aa
+++ b/emulators/wine-devel/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.2 2009/01/03 20:12:44 adam Exp $
+$NetBSD: patch-aa,v 1.3 2011/05/02 21:23:01 adam Exp $
 
---- Make.rules.in.orig	2009-01-02 17:24:09.000000000 +0100
-+++ Make.rules.in
-@@ -122,7 +122,7 @@ IDL_GEN_HEADERS = $(IDL_H_SRCS:.idl=.h) 
- CLEAN_TARGETS = $(IDL_GEN_C_SRCS) $(IDL_GEN_HEADERS) $(IDL_TLB_SRCS:.idl=.tlb) $(IDL_P_SRCS:%=dlldata.c) \
-                 $(BISON_SRCS:.y=.tab.c) $(BISON_SRCS:.y=.tab.h) $(LEX_SRCS:.l=.yy.c) $(MC_SRCS:.mc=.mc.rc)
+--- dlls/ntdll/signal_x86_64.c.orig	2011-04-29 18:04:41.000000000 +0000
++++ dlls/ntdll/signal_x86_64.c
+@@ -2450,7 +2450,7 @@ void signal_init_thread( TEB *teb )
+ #elif defined (__FreeBSD__) || defined (__FreeBSD_kernel__)
+     amd64_set_gsbase( teb );
+ #else
+-# error Please define setting %gs for your architecture
++# warning Please define setting %gs for your architecture
+ #endif
  
--OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(IDL_GEN_C_SRCS:.c=.o) $(EXTRA_OBJS)
-+OBJS = $(EXTRA_OBJS) $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(IDL_GEN_C_SRCS:.c=.o)
- 
- RCOBJS = $(RC_SRCS:.rc=.res.o)
- LINTS  = $(C_SRCS:.c=.ln)
+     ss.ss_sp    = (char *)teb + teb_size;
diff --git a/emulators/wine-devel/patches/patch-ac b/emulators/wine-devel/patches/patch-ac
index 34ed551c18f..2a52af2df0e 100644
--- a/emulators/wine-devel/patches/patch-ac
+++ b/emulators/wine-devel/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.2 2008/11/21 18:54:56 adam Exp $
+$NetBSD: patch-ac,v 1.3 2011/05/02 21:23:01 adam Exp $
 
---- dlls/ntdll/directory.c.orig	2008-11-21 17:20:28.000000000 +0100
+--- dlls/ntdll/directory.c.orig	2010-06-18 17:36:58.000000000 +0000
 +++ dlls/ntdll/directory.c
-@@ -130,6 +130,20 @@ static inline int getdents64( int fd, ch
+@@ -128,6 +128,20 @@ static inline int getdents64( int fd, ch
  #endif  /* linux */
  
  #define IS_OPTION_TRUE(ch) ((ch) == 'y' || (ch) == 'Y' || (ch) == 't' || (ch) == 'T' || (ch) == '1')
diff --git a/emulators/wine-devel/patches/patch-ad b/emulators/wine-devel/patches/patch-ad
index 484f1f24f37..b7b393d9ac6 100644
--- a/emulators/wine-devel/patches/patch-ad
+++ b/emulators/wine-devel/patches/patch-ad
@@ -1,10 +1,10 @@
-$NetBSD: patch-ad,v 1.5 2009/02/28 15:30:13 adam Exp $
+$NetBSD: patch-ad,v 1.6 2011/05/02 21:23:01 adam Exp $
 
---- dlls/iphlpapi/ipstats.c.orig	2009-02-27 23:21:46.000000000 +0100
-+++ dlls/iphlpapi/ipstats.c
+--- dlls/iphlpapi/ipstats.c.orig	2010-12-10 22:33:07.000000000 +0300
++++ dlls/iphlpapi/ipstats.c	2010-12-22 00:38:30.000000000 +0300
 @@ -27,6 +27,10 @@
- #include <stdlib.h>
  #include <string.h>
+ #include <errno.h>
  #include <sys/types.h>
 +#if defined(__NetBSD__)
 +#include <sys/param.h>
@@ -13,82 +13,48 @@ $NetBSD: patch-ad,v 1.5 2009/02/28 15:30:13 adam Exp $
  #ifdef HAVE_ALIAS_H
  #include <alias.h>
  #endif
-@@ -287,7 +291,7 @@ DWORD getInterfaceStatsByName(const char
- 
- DWORD getICMPStats(MIB_ICMP *stats)
- {
--#if defined(HAVE_SYS_SYSCTL_H) && defined(ICMPCTL_STATS)
-+#if defined(HAVE_SYS_SYSCTL_H) && defined(ICMPCTL_STATS) && !defined(__NetBSD__)
-   int mib[] = {CTL_NET, PF_INET, IPPROTO_ICMP, ICMPCTL_STATS};
+@@ -489,7 +493,7 @@
+         }
+         if (kc) kstat_close( kc );
+     }
+-#elif defined(HAVE_SYS_SYSCTL_H) && defined(ICMPCTL_STATS)
++#elif defined(HAVE_SYS_SYSCTL_H) && defined(ICMPCTL_STATS) && !defined(__NetBSD__)
+     {
+         int mib[] = {CTL_NET, PF_INET, IPPROTO_ICMP, ICMPCTL_STATS};
  #define MIB_LEN (sizeof(mib) / sizeof(mib[0]))
-   size_t needed;
-@@ -484,7 +488,7 @@ DWORD getICMPStats(MIB_ICMP *stats)
- 
- DWORD getIPStats(PMIB_IPSTATS stats)
- {
--#if defined(HAVE_SYS_SYSCTL_H) && defined(IPCTL_STATS)
-+#if defined(HAVE_SYS_SYSCTL_H) && defined(IPCTL_STATS) && !defined(__NetBSD__)
-   int mib[] = {CTL_NET, PF_INET, IPPROTO_IP, IPCTL_STATS};
+@@ -655,7 +659,7 @@
+         }
+         if (kc) kstat_close( kc );
+     }
+-#elif defined(HAVE_SYS_SYSCTL_H) && defined(IPCTL_STATS)
++#elif defined(HAVE_SYS_SYSCTL_H) && defined(IPCTL_STATS) && !defined(__NetBSD__)
+     {
+         int mib[] = {CTL_NET, PF_INET, IPPROTO_IP, IPCTL_STATS};
  #define MIB_LEN (sizeof(mib) / sizeof(mib[0]))
-   int ip_ttl, ip_forwarding;
-@@ -653,7 +657,7 @@ DWORD getIPStats(PMIB_IPSTATS stats)
- 
- DWORD getTCPStats(MIB_TCPSTATS *stats)
- {
--#if defined(HAVE_SYS_SYSCTL_H) && defined(UDPCTL_STATS)
-+#if defined(HAVE_SYS_SYSCTL_H) && defined(UDPCTL_STATS) && !defined(__NetBSD__)
+@@ -804,7 +808,7 @@
+         }
+         if (kc) kstat_close( kc );
+     }
+-#elif defined(HAVE_SYS_SYSCTL_H) && defined(UDPCTL_STATS)
++#elif defined(HAVE_SYS_SYSCTL_H) && defined(UDPCTL_STATS) && !defined(__NetBSD__)
+     {
  #ifndef TCPTV_MIN  /* got removed in Mac OS X for some reason */
  #define TCPTV_MIN 2
- #define TCPTV_REXMTMAX 128
-@@ -790,7 +794,7 @@ DWORD getTCPStats(MIB_TCPSTATS *stats)
- 
- DWORD getUDPStats(MIB_UDPSTATS *stats)
- {
--#if defined(HAVE_SYS_SYSCTL_H) && defined(UDPCTL_STATS)
-+#if defined(HAVE_SYS_SYSCTL_H) && defined(UDPCTL_STATS) && !defined(__NetBSD__)
-   int mib[] = {CTL_NET, PF_INET, IPPROTO_UDP, UDPCTL_STATS};
- #define MIB_LEN (sizeof(mib) / sizeof(mib[0]))
-   struct udpstat udp_stat;
-@@ -1032,7 +1036,11 @@ DWORD getNumRoutes(void)
- 
-       /* Ignore all entries except for gateway routes which aren't
-          multicast */
-+#if !defined(RTF_MULTICAST)
-+      if (!(rtm->rtm_flags & RTF_GATEWAY))
-+#else
-       if (!(rtm->rtm_flags & RTF_GATEWAY) || (rtm->rtm_flags & RTF_MULTICAST))
-+#endif
-          continue;
- 
-       RouteCount++;
-@@ -1108,8 +1116,12 @@ DWORD getRouteTable(PMIB_IPFORWARDTABLE 
- 
-           /* Ignore all entries except for gateway routes which aren't
-              multicast */
-+#if !defined(RTF_MULTICAST)
-+          if (!(rtm->rtm_flags & RTF_GATEWAY))
-+#else
-           if (!(rtm->rtm_flags & RTF_GATEWAY) ||
-               (rtm->rtm_flags & RTF_MULTICAST))
-+#endif
-              continue;
- 
-           memset (&table->table[table->dwNumEntries], 0,
-@@ -1270,7 +1282,7 @@ DWORD getRouteTable(PMIB_IPFORWARDTABLE 
- 
- DWORD getNumArpEntries(void)
- {
--#if defined(HAVE_SYS_SYSCTL_H) && defined(NET_RT_DUMP)
-+#if defined(HAVE_SYS_SYSCTL_H) && defined(NET_RT_DUMP) && !defined(__NetBSD__)
-   int mib[] = {CTL_NET, PF_ROUTE, 0, AF_INET, NET_RT_FLAGS, RTF_LLINFO};
+@@ -915,7 +919,7 @@
+         }
+         if (kc) kstat_close( kc );
+     }
+-#elif defined(HAVE_SYS_SYSCTL_H) && defined(UDPCTL_STATS)
++#elif defined(HAVE_SYS_SYSCTL_H) && defined(UDPCTL_STATS) && !defined(__NetBSD__)
+     {
+         int mib[] = {CTL_NET, PF_INET, IPPROTO_UDP, UDPCTL_STATS};
  #define MIB_LEN (sizeof(mib) / sizeof(mib[0]))
-   DWORD arpEntries = 0;
-@@ -1326,7 +1338,7 @@ DWORD getArpTable(PMIB_IPNETTABLE *ppIpN
-     if (numEntries > 1)
-       size += (numEntries - 1) * sizeof(MIB_IPNETROW);
-     table = HeapAlloc(heap, flags, size);
--#if defined(HAVE_SYS_SYSCTL_H) && defined(NET_RT_DUMP)
-+#if defined(HAVE_SYS_SYSCTL_H) && defined(NET_RT_DUMP) && !defined(__NetBSD__)
-     if (table)
+@@ -1347,7 +1351,7 @@
+         }
+         else ret = ERROR_NOT_SUPPORTED;
+     }
+-#elif defined(HAVE_SYS_SYSCTL_H) && defined(NET_RT_DUMP)
++#elif defined(HAVE_SYS_SYSCTL_H) && defined(NET_RT_DUMP) && !defined(__NetBSD__)
      {
        int mib[] = {CTL_NET, PF_ROUTE, 0, AF_INET, NET_RT_FLAGS, RTF_LLINFO};
+ #define MIB_LEN (sizeof(mib) / sizeof(mib[0]))
diff --git a/emulators/wine-devel/patches/patch-ae b/emulators/wine-devel/patches/patch-ae
index 742a373df4b..0fe7ab35137 100644
--- a/emulators/wine-devel/patches/patch-ae
+++ b/emulators/wine-devel/patches/patch-ae
@@ -1,12 +1,12 @@
-$NetBSD: patch-ae,v 1.1.1.1 2008/11/21 17:40:31 adam Exp $
+$NetBSD: patch-ae,v 1.2 2011/05/02 21:23:01 adam Exp $
 
---- dlls/winex11.drv/opengl.c.orig	2008-06-27 16:24:42.000000000 +0200
+--- dlls/winex11.drv/opengl.c.orig	2010-06-18 17:36:58.000000000 +0000
 +++ dlls/winex11.drv/opengl.c
-@@ -47,6 +47,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wgl);
+@@ -55,6 +55,7 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag);
  #endif
  #ifdef HAVE_GL_GLX_H
  # include <GL/glx.h>
 +# include <GL/glxext.h>
  #endif
- #ifdef HAVE_GL_GLEXT_H
- # include <GL/glext.h>
+ 
+ #include "wine/wgl.h"
diff --git a/emulators/wine-devel/patches/patch-af b/emulators/wine-devel/patches/patch-af
index 37b7a1a3baa..591997b7954 100644
--- a/emulators/wine-devel/patches/patch-af
+++ b/emulators/wine-devel/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.6 2009/02/28 15:30:13 adam Exp $
+$NetBSD: patch-af,v 1.7 2011/05/02 21:23:01 adam Exp $
 
---- dlls/ntdll/signal_i386.c.orig	2009-02-27 23:21:46.000000000 +0100
+--- dlls/ntdll/signal_i386.c.orig	2009-07-03 18:28:33.000000000 +0200
 +++ dlls/ntdll/signal_i386.c
-@@ -403,8 +403,13 @@ enum i386_trap_code
+@@ -448,8 +448,13 @@ 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 */
diff --git a/emulators/wine-devel/patches/patch-ah b/emulators/wine-devel/patches/patch-ah
deleted file mode 100644
index d345db15c50..00000000000
--- a/emulators/wine-devel/patches/patch-ah
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ah,v 1.4 2009/01/30 19:39:04 adam Exp $
-
---- dlls/kernel32/cpu.c.orig	2009-01-30 17:54:01.000000000 +0100
-+++ dlls/kernel32/cpu.c
-@@ -551,7 +551,7 @@ VOID WINAPI GetSystemInfo(
-              size_t val_len;
-              char model[256];
-              char *cpuclass;
--             FILE *f = fopen ("/var/run/dmesg.boot", "r");
-+             //FILE *f = fopen ("/var/run/dmesg.boot", "r");
- 
-              /* first deduce as much as possible from the sysctls */
-              mib[0] = CTL_MACHDEP;
-@@ -611,6 +611,7 @@ VOID WINAPI GetSystemInfo(
-                 additional information such as CX8, MMX and TSC
-                 (however this information should be considered less
-                  reliable than that from the sysctl calls) */
-+#if 0
-              if (f != NULL)
-              {
- 	         while (fgets(model, 255, f) != NULL) {
-@@ -632,6 +633,7 @@ VOID WINAPI GetSystemInfo(
-                  }
-                  fclose(f);
-              }
-+#endif
- 
-         }
- #elif defined(__FreeBSD__)
diff --git a/emulators/wine-devel/patches/patch-aj b/emulators/wine-devel/patches/patch-aj
deleted file mode 100644
index 59b80a1c829..00000000000
--- a/emulators/wine-devel/patches/patch-aj
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-aj,v 1.1.1.1 2008/11/21 17:40:31 adam Exp $
-
---- dlls/wineoss.drv/oss.c.orig	2005-12-24 10:24:01.000000000 +0100
-+++ dlls/wineoss.drv/oss.c
-@@ -42,7 +42,9 @@ static LRESULT OSS_drvLoad(void)
- {
-     TRACE("()\n");
-     OSS_WaveInit();
-+#ifdef HAVE_OSS_MIDI
-     OSS_MidiInit();
-+#endif
-     OSS_MixerInit();
-     OSS_AuxInit();
-     return 1;
-@@ -55,7 +57,9 @@ static LRESULT OSS_drvFree(void)
- {
-     TRACE("()\n");
-     OSS_WaveExit();
-+#ifdef HAVE_OSS_MIDI
-     OSS_MidiExit();
-+#endif
-     OSS_MixerExit();
-     OSS_AuxExit();
-     return 1;
diff --git a/emulators/wine-devel/patches/patch-ba b/emulators/wine-devel/patches/patch-ba
index 64934183ebc..c94e9305950 100644
--- a/emulators/wine-devel/patches/patch-ba
+++ b/emulators/wine-devel/patches/patch-ba
@@ -1,8 +1,8 @@
-$NetBSD: patch-ba,v 1.9 2010/02/20 08:59:04 schwarz Exp $
+$NetBSD: patch-ba,v 1.10 2011/05/02 21:23:01 adam Exp $
 
---- configure.orig	2009-02-27 23:21:46.000000000 +0100
-+++ configure	2010-02-20 09:52:42.000000000 +0100
-@@ -3945,12 +3945,6 @@
+--- configure.orig	2010-06-18 17:36:58.000000000 +0000
++++ configure
+@@ -4204,11 +4204,6 @@ fi
  $as_echo "$wine_cv_toolsdir" >&6; }
  TOOLSDIR=$wine_cv_toolsdir
  
@@ -11,19 +11,6 @@ $NetBSD: patch-ba,v 1.9 2010/02/20 08:59:04 schwarz Exp $
 -    TARGETFLAGS="-b $host_alias $TARGETFLAGS"
 -
 -fi
--
+ 
  for ac_prog in flex
  do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
-@@ -17913,6 +17907,11 @@
- 
-         EXTRA_BINARIES="wine-pthread"
-  ;;
-+      netbsd*)
-+        MAIN_BINARY="wine-kthread"
-+
-+        EXTRA_BINARIES="wine-pthread"
-+ ;;
-     esac
-     ;;
- esac
diff --git a/emulators/wine-devel/patches/patch-bc b/emulators/wine-devel/patches/patch-bc
index 71008056db3..2a2f76f556c 100644
--- a/emulators/wine-devel/patches/patch-bc
+++ b/emulators/wine-devel/patches/patch-bc
@@ -1,8 +1,8 @@
-$NetBSD: patch-bc,v 1.2 2008/12/07 00:43:03 adam Exp $
+$NetBSD: patch-bc,v 1.3 2011/05/02 21:23:01 adam Exp $
 
 --- dlls/wineoss.drv/audio.c.orig	2008-12-05 17:57:45.000000000 +0100
 +++ dlls/wineoss.drv/audio.c
-@@ -75,6 +75,12 @@
+@@ -83,6 +83,12 @@
  
  #include "audio.h"
  
@@ -15,7 +15,7 @@ $NetBSD: patch-bc,v 1.2 2008/12/07 00:43:03 adam Exp $
  WINE_DEFAULT_DEBUG_CHANNEL(wave);
  
  /* Allow 1% deviation for sample rates (some ES137x cards) */
-@@ -1170,12 +1176,12 @@ LRESULT OSS_WaveInit(void)
+@@ -1168,12 +1174,12 @@ LRESULT OSS_WaveInit(void)
      }
      else
      {
diff --git a/emulators/wine-devel/patches/patch-bd b/emulators/wine-devel/patches/patch-bd
new file mode 100644
index 00000000000..45c92692c12
--- /dev/null
+++ b/emulators/wine-devel/patches/patch-bd
@@ -0,0 +1,13 @@
+$NetBSD: patch-bd,v 1.1 2011/05/02 21:23:01 adam Exp $
+
+--- dlls/Makedll.rules.in.orig	2010-06-18 17:36:58.000000000 +0000
++++ dlls/Makedll.rules.in
+@@ -84,7 +84,7 @@ install_dll: $(MODULE) $(DESTDIR)$(dlldi
+ 	$(INSTALL_PROGRAM) $(MODULE) $(DESTDIR)$(dlldir)/$(MODULE)
+ 
+ install_dll.so: $(MODULE).so $(DESTDIR)$(dlldir) dummy
+-	$(INSTALL_PROGRAM) $(MODULE).so $(DESTDIR)$(dlldir)/$(MODULE).so
++	$(BSD_INSTALL_LIB) $(MODULE).so $(DESTDIR)$(dlldir)/$(MODULE).so
+ 
+ install_dll.fake: $(MODULE).fake $(DESTDIR)$(fakedlldir) dummy
+ 	$(INSTALL_DATA) $(MODULE).fake $(DESTDIR)$(fakedlldir)/$(MODULE)
diff --git a/emulators/wine-devel/patches/patch-be b/emulators/wine-devel/patches/patch-be
new file mode 100644
index 00000000000..47a417cf173
--- /dev/null
+++ b/emulators/wine-devel/patches/patch-be
@@ -0,0 +1,13 @@
+$NetBSD: patch-be,v 1.1 2011/05/02 21:23:01 adam Exp $
+
+--- programs/Makeprog.rules.in.orig	2010-06-18 17:36:58.000000000 +0000
++++ programs/Makeprog.rules.in
+@@ -26,7 +26,7 @@ $(MODULE) $(MODULE).so $(MODULE).fake: $
+ .PHONY: install_prog install_prog.so install_prog.fake
+ 
+ install_prog.so: $(MODULE).so $(DESTDIR)$(dlldir) dummy
+-	$(INSTALL_PROGRAM) $(MODULE).so $(DESTDIR)$(dlldir)/$(MODULE).so
++	${BSD_INSTALL_LIB} $(MODULE).so $(DESTDIR)$(dlldir)/$(MODULE).so
+ 
+ install_prog.fake: $(MODULE).fake $(DESTDIR)$(fakedlldir) dummy
+ 	$(INSTALL_DATA) $(MODULE).fake $(DESTDIR)$(fakedlldir)/$(MODULE)
diff --git a/emulators/wine-devel/patches/patch-bf b/emulators/wine-devel/patches/patch-bf
new file mode 100644
index 00000000000..932f0576599
--- /dev/null
+++ b/emulators/wine-devel/patches/patch-bf
@@ -0,0 +1,21 @@
+$NetBSD: patch-bf,v 1.1 2011/05/02 21:23:01 adam Exp $
+
+--- libs/wine/Makefile.in.orig	2009-10-09 18:05:57.000000000 +0200
++++ libs/wine/Makefile.in
+@@ -144,14 +144,14 @@ libwine.dylib: libwine.$(SOVERSION).dyli
+ .PHONY: install-lib-so install-lib-dll install-lib-dylib install-dev-so install-dev-dll install-dev-dylib
+ 
+ install-lib-so: libwine.so.$(VERSION) $(DESTDIR)$(libdir) dummy
+-	$(INSTALL_PROGRAM) libwine.so.$(VERSION) $(DESTDIR)$(libdir)/libwine.so.$(VERSION)
++	${BSD_INSTALL_LIB} libwine.so.$(VERSION) $(DESTDIR)$(libdir)/libwine.so.$(VERSION)
+ 	cd $(DESTDIR)$(libdir) && $(RM) libwine.so.$(SOVERSION) && $(LN_S) libwine.so.$(VERSION) libwine.so.$(SOVERSION)
+ 
+ install-lib-dll: libwine.dll $(DESTDIR)$(libdir) dummy
+ 	$(INSTALL_DATA) libwine.dll $(DESTDIR)$(libdir)/libwine.dll
+ 
+ install-lib-dylib: libwine.$(VERSION).dylib $(DESTDIR)$(libdir) dummy
+-	$(INSTALL_PROGRAM) libwine.$(VERSION).dylib $(DESTDIR)$(libdir)/libwine.$(VERSION).dylib
++	${BSD_INSTALL_LIB} libwine.$(VERSION).dylib $(DESTDIR)$(libdir)/libwine.$(VERSION).dylib
+ 	cd $(DESTDIR)$(libdir) && $(RM) libwine.$(SOVERSION).dylib && $(LN_S) libwine.$(VERSION).dylib libwine.$(SOVERSION).dylib
+ 
+ install-dev-so: $(DESTDIR)$(libdir) dummy
diff --git a/emulators/wine-devel/patches/patch-cc b/emulators/wine-devel/patches/patch-cc
deleted file mode 100644
index b793c31b259..00000000000
--- a/emulators/wine-devel/patches/patch-cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-cc,v 1.1 2009/09/07 20:27:25 reinoud Exp $
-
---- dlls/inetcomm/internettransport.c.orig	2009-02-27 23:21:46.000000000 +0100
-+++ dlls/inetcomm/internettransport.c
-@@ -23,11 +23,11 @@
- #include <stdarg.h>
- #include <stdio.h>
- 
-+#include "winsock2.h"
- #include "windef.h"
- #include "winbase.h"
- #include "winnt.h"
- #include "winuser.h"
--#include "winsock2.h"
- #include "ws2tcpip.h"
- #include "objbase.h"
- #include "ole2.h"
diff --git a/emulators/wine-devel/patches/patch-cg b/emulators/wine-devel/patches/patch-cg
index e8c2a029184..d58026531c3 100644
--- a/emulators/wine-devel/patches/patch-cg
+++ b/emulators/wine-devel/patches/patch-cg
@@ -1,12 +1,14 @@
-$NetBSD: patch-cg,v 1.1 2009/09/07 20:27:25 reinoud Exp $
+$NetBSD: patch-cg,v 1.2 2011/05/02 21:23:01 adam Exp $
 
---- dlls/ws2_32/tests/sock.c.orig	2009-02-27 23:21:46.000000000 +0100
-+++ dlls/ws2_32/tests/sock.c
-@@ -22,6 +22,7 @@
+--- dlls/ws2_32/socket.c.orig	2010-12-10 22:33:07.000000000 +0300
++++ dlls/ws2_32/socket.c	2010-12-22 02:33:54.000000000 +0300
+@@ -440,7 +440,9 @@
+     MAP_OPTION( AI_PASSIVE ),
+     MAP_OPTION( AI_CANONNAME ),
+     MAP_OPTION( AI_NUMERICHOST ),
++#if !defined(__NetBSD__)
+     MAP_OPTION( AI_ADDRCONFIG ),
++#endif
+ };
  
- #include <stdarg.h>
- 
-+#include <winsock2.h>
- #include <windef.h>
- #include <winbase.h>
- #include <winsock2.h>
+ static const int ws_niflag_map[][2] =