Updated to wine-20030618

3 files changed, 32 insertions, 33 deletions

diff --git a/emulators/wine/patches/patch-aa b/emulators/wine/patches/patch-aa
index 190e851c869..6742c66f372 100644
--- a/emulators/wine/patches/patch-aa
+++ b/emulators/wine/patches/patch-aa
@@ -1,17 +1,8 @@
-$NetBSD: patch-aa,v 1.7 2002/10/10 10:48:21 junyoung Exp $
+$NetBSD: patch-aa,v 1.8 2003/06/23 08:12:59 adam Exp $
 
---- Make.rules.in.orig	Wed Oct  2 11:34:09 2002
-+++ Make.rules.in	Thu Oct 10 19:01:06 2002
-@@ -26,7 +26,7 @@
- CPP       = @CPP@
- CFLAGS    = @CFLAGS@ $(EXTRACFLAGS)
- OPTIONS   = @OPTIONS@ -D_REENTRANT
--LIBS      = @LIBS@
-+LIBS      = @LIBS@ -lc
- YACC      = @YACC@
- LEX       = @LEX@
- LEXLIB    = @LEXLIB@
-@@ -98,7 +98,7 @@
+--- Make.rules.in.orig	2003-06-14 01:26:02.000000000 +0200
++++ Make.rules.in	2003-06-19 11:33:36.000000000 +0200
+@@ -102,7 +102,7 @@
  CLEAN_FILES     = *.o *.a *.so *.ln *.$(LIBEXT) \\\#*\\\# *~ *% .\\\#* *.bak *.orig *.rej \
                    *.flc *.spec.c *.spec.def *.glue.c *.dbg.c y.tab.c y.tab.h @LEX_OUTPUT_ROOT@.c core
  
diff --git a/emulators/wine/patches/patch-ab b/emulators/wine/patches/patch-ab
index aed9818ac40..462fe9d35b1 100644
--- a/emulators/wine/patches/patch-ab
+++ b/emulators/wine/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.13 2003/03/04 11:46:00 wiz Exp $
+$NetBSD: patch-ab,v 1.14 2003/06/23 08:13:00 adam Exp $
 
---- dlls/ntdll/cdrom.c.orig	Wed Feb 19 23:08:50 2003
-+++ dlls/ntdll/cdrom.c
+--- dlls/ntdll/cdrom.c.orig	2003-04-02 02:59:12.000000000 +0200
++++ dlls/ntdll/cdrom.c	2003-05-30 14:47:32.000000000 +0200
 @@ -53,6 +53,16 @@
  #endif
  #ifdef HAVE_LINUX_CDROM_H
@@ -19,13 +19,3 @@ $NetBSD: patch-ab,v 1.13 2003/03/04 11:46:00 wiz Exp $
  #endif
  #ifdef HAVE_LINUX_UCDROM_H
  # include <linux/ucdrom.h>
-@@ -286,7 +296,9 @@ static int CDROM_SyncCache(int dev)
-     toc->Length[0] = tsz >> 8;
-     toc->Length[1] = tsz;
-    
-+#if 0
-     TRACE("caching toc from=%d to=%d\n", hdr.cdth_trk0, hdr.cdth_trk1);
-+#endif
- 
-     for (i = toc->FirstTrack; i <= toc->LastTrack + 1; i++)
-     {
diff --git a/emulators/wine/patches/patch-ac b/emulators/wine/patches/patch-ac
index ed01ba4d2f0..374afbe2580 100644
--- a/emulators/wine/patches/patch-ac
+++ b/emulators/wine/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.5 2002/10/10 16:48:09 junyoung Exp $
+$NetBSD: patch-ac,v 1.6 2003/06/23 08:13:00 adam Exp $
 
---- configure.orig	Tue Oct  8 11:03:41 2002
-+++ configure	Fri Oct 11 00:54:07 2002
-@@ -10982,7 +10982,7 @@
+--- configure.orig	2003-06-18 22:35:38.000000000 +0200
++++ configure	2003-06-19 11:34:00.000000000 +0200
+@@ -12230,7 +12230,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.5 2002/10/10 16:48:09 junyoung Exp $
    if test "x$ac_cv_lib_soname_X11" = "x"
    then
       ac_cv_lib_soname_X11="libX11.so"
-@@ -11048,7 +11048,7 @@
+@@ -12295,7 +12295,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
@@ -20,7 +20,7 @@ $NetBSD: patch-ac,v 1.5 2002/10/10 16:48:09 junyoung Exp $
    if test "x$ac_cv_lib_soname_Xext" = "x"
    then
       ac_cv_lib_soname_Xext="libXext.so"
-@@ -11114,7 +11114,7 @@
+@@ -12360,7 +12360,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
@@ -29,7 +29,7 @@ $NetBSD: patch-ac,v 1.5 2002/10/10 16:48:09 junyoung Exp $
    if test "x$ac_cv_lib_soname_Xrender" = "x"
    then
       ac_cv_lib_soname_Xrender="libXrender.so"
-@@ -11180,7 +11180,7 @@
+@@ -12425,7 +12425,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
@@ -38,3 +38,21 @@ $NetBSD: patch-ac,v 1.5 2002/10/10 16:48:09 junyoung Exp $
    if test "x$ac_cv_lib_soname_freetype" = "x"
    then
       ac_cv_lib_soname_freetype="libfreetype.so"
+@@ -14770,7 +14770,7 @@
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  wine_cv_linux_gethostbyname_r_6=yes
++  wine_cv_linux_gethostbyname_r_6=no
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -15656,7 +15656,7 @@
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+-  ac_cv_member_siginfo_t_si_fd=yes
++  ac_cv_member_siginfo_t_si_fd=no
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5