redid some patches since they had been off by a few lines

6 files changed, 27 insertions, 28 deletions

diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo
index 938b16cb9dd..58d8b73928b 100644
--- a/emulators/wine/distinfo
+++ b/emulators/wine/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.86 2009/09/07 14:25:08 reinoud Exp $
+$NetBSD: distinfo,v 1.87 2010/02/20 08:35:58 schwarz Exp $
 
 SHA1 (wine-1.0.1.tar.bz2) = 0550b03bf7b314514a87b6abb2198da96ef83b22
 RMD160 (wine-1.0.1.tar.bz2) = fecd2bf970c51c80fc02ca39631034f066da145e
 Size (wine-1.0.1.tar.bz2) = 13956805 bytes
 SHA1 (patch-aa) = 906623f16ac87380c63f0c8e80d6490142380566
-SHA1 (patch-ab) = 66c1f1ec98674d15c7a72e8ac16105c28aa25e91
-SHA1 (patch-ac) = e28e9ea8563546a41672f16c8e111e5d37ffbe92
-SHA1 (patch-ad) = 978bdd94b75a2d671d5ed97d7664ff60488683cd
-SHA1 (patch-ae) = a4f39995baf5511ddc70b4e1c006a159a86eeb22
+SHA1 (patch-ab) = 4c8de3db4533519d9964f38cf3fa0462f9fb3d30
+SHA1 (patch-ac) = 3071363f511c9caad53e8b3e94df23fcee3472f4
+SHA1 (patch-ad) = f146f8b07c00890c9dfce824938f3b5abcf90b87
+SHA1 (patch-ae) = e5f62eabe1184ceec873ae2b4e993de5d02d2fca
 SHA1 (patch-af) = 499aa5a82fce105128caff7ca0006e9c8975e905
 SHA1 (patch-ag) = c4bf5a592ad5cad67ff933c5da418c58d6e1367a
 SHA1 (patch-ai) = a334ee48b949f9f5d4356beed3b422ee032619c2
@@ -19,4 +19,4 @@ SHA1 (patch-bd) = 46a7b8cc8e0793facf78876d26f24cd40ee1d097
 SHA1 (patch-be) = ce9d21a9716c79525239499c89fcf0bb3ef807a3
 SHA1 (patch-bf) = d31bcc193ffe6abc57700bcb43fea6ff5886c038
 SHA1 (patch-ca) = 1383c03cc83cefe6099b58340db2bc468c7524bb
-SHA1 (patch-cb) = cc8c4ade538a19b817a10b31e41ea9f968845193
+SHA1 (patch-cb) = 260d3ba130a6d3fc4ad137354a2b9c5fe871ba7a
diff --git a/emulators/wine/patches/patch-ab b/emulators/wine/patches/patch-ab
index 5c41b4dac04..ebd92dbda3f 100644
--- a/emulators/wine/patches/patch-ab
+++ b/emulators/wine/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.19 2005/07/26 13:24:36 adam Exp $
+$NetBSD: patch-ab,v 1.20 2010/02/20 08:35:58 schwarz Exp $
 
---- dlls/ntdll/cdrom.c.orig	2005-07-20 10:28:27.000000000 +0000
-+++ dlls/ntdll/cdrom.c
-@@ -64,6 +64,16 @@
+--- dlls/ntdll/cdrom.c.orig	2008-10-17 17:45:25.000000000 +0200
++++ dlls/ntdll/cdrom.c	2010-02-19 23:38:02.000000000 +0100
+@@ -65,6 +65,16 @@
  #endif
  #ifdef HAVE_LINUX_CDROM_H
  # include <linux/cdrom.h>
diff --git a/emulators/wine/patches/patch-ac b/emulators/wine/patches/patch-ac
index afb9786c89d..8ebede38b62 100644
--- a/emulators/wine/patches/patch-ac
+++ b/emulators/wine/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.38 2008/01/09 17:46:41 reinoud Exp $
+$NetBSD: patch-ac,v 1.39 2010/02/20 08:35:58 schwarz Exp $
 
---- dlls/ntdll/directory.c.orig	2007-08-24 16:34:33.000000000 +0200
-+++ dlls/ntdll/directory.c
-@@ -128,6 +128,20 @@ static inline int getdents64( int fd, ch
+--- dlls/ntdll/directory.c.orig	2008-10-17 17:45:25.000000000 +0200
++++ dlls/ntdll/directory.c	2010-02-19 23:38:56.000000000 +0100
+@@ -127,6 +127,20 @@
  #endif  /* linux */
  
  #define IS_OPTION_TRUE(ch) ((ch) == 'y' || (ch) == 'Y' || (ch) == 't' || (ch) == 'T' || (ch) == '1')
diff --git a/emulators/wine/patches/patch-ad b/emulators/wine/patches/patch-ad
index 0932796ce00..472c9b7eba1 100644
--- a/emulators/wine/patches/patch-ad
+++ b/emulators/wine/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.13 2007/07/17 12:29:17 adam Exp $
+$NetBSD: patch-ad,v 1.14 2010/02/20 08:35:58 schwarz Exp $
 
---- dlls/iphlpapi/ipstats.c.orig	2007-07-13 19:46:16.000000000 +0200
-+++ dlls/iphlpapi/ipstats.c
+--- dlls/iphlpapi/ipstats.c.orig	2008-10-17 17:45:25.000000000 +0200
++++ dlls/iphlpapi/ipstats.c	2010-02-19 23:39:54.000000000 +0100
 @@ -28,6 +28,10 @@
  #include <stdlib.h>
  #include <string.h>
@@ -13,7 +13,7 @@ $NetBSD: patch-ad,v 1.13 2007/07/17 12:29:17 adam Exp $
  #ifdef HAVE_SYS_SOCKET_H
  #include <sys/socket.h>
  #endif
-@@ -740,7 +744,11 @@ DWORD getNumRoutes(void)
+@@ -755,7 +759,11 @@
  
        /* Ignore all entries except for gateway routes which aren't
           multicast */
@@ -25,7 +25,7 @@ $NetBSD: patch-ad,v 1.13 2007/07/17 12:29:17 adam Exp $
           continue;
  
        RouteCount++;
-@@ -813,8 +821,12 @@ DWORD getRouteTable(PMIB_IPFORWARDTABLE 
+@@ -831,8 +839,12 @@
  
            /* Ignore all entries except for gateway routes which aren't
               multicast */
diff --git a/emulators/wine/patches/patch-ae b/emulators/wine/patches/patch-ae
index ee46e2b3a43..abb62f1f5e3 100644
--- a/emulators/wine/patches/patch-ae
+++ b/emulators/wine/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.12 2006/10/18 20:37:21 adam Exp $
+$NetBSD: patch-ae,v 1.13 2010/02/20 08:35:58 schwarz Exp $
 
---- 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);
+--- dlls/winex11.drv/opengl.c.orig	2008-10-17 17:45:25.000000000 +0200
++++ dlls/winex11.drv/opengl.c	2010-02-19 23:41:07.000000000 +0100
+@@ -47,6 +47,7 @@
  #endif
  #ifdef HAVE_GL_GLX_H
  # include <GL/glx.h>
diff --git a/emulators/wine/patches/patch-cb b/emulators/wine/patches/patch-cb
index a38ccfc9e89..9b2459b5688 100644
--- a/emulators/wine/patches/patch-cb
+++ b/emulators/wine/patches/patch-cb
@@ -1,9 +1,8 @@
-$NetBSD: patch-cb,v 1.1 2009/09/07 14:25:08 reinoud Exp $
+$NetBSD: patch-cb,v 1.2 2010/02/20 08:35:58 schwarz Exp $
 
 --- dlls/gdi32/freetype.c.orig	2008-10-17 17:45:25.000000000 +0200
-+++ dlls/gdi32/freetype.c
-@@ -162,8 +162,12 @@ MAKE_FUNCPTR(FT_Get_Sfnt_Name_Count);
- MAKE_FUNCPTR(FT_Get_Sfnt_Table);
++++ dlls/gdi32/freetype.c	2010-02-19 23:42:59.000000000 +0100
+@@ -163,7 +163,11 @@
  MAKE_FUNCPTR(FT_Init_FreeType);
  MAKE_FUNCPTR(FT_Load_Glyph);
  MAKE_FUNCPTR(FT_Matrix_Multiply);
@@ -15,7 +14,7 @@ $NetBSD: patch-cb,v 1.1 2009/09/07 14:25:08 reinoud Exp $
  MAKE_FUNCPTR(FT_New_Face);
  MAKE_FUNCPTR(FT_New_Memory_Face);
  MAKE_FUNCPTR(FT_Outline_Get_Bitmap);
-@@ -2438,7 +2441,9 @@ static BOOL init_freetype(void)
+@@ -2438,7 +2442,9 @@
      LOAD_FUNCPTR(FT_Init_FreeType)
      LOAD_FUNCPTR(FT_Load_Glyph)
      LOAD_FUNCPTR(FT_Matrix_Multiply)