Changes 0.9.35:

- Broken aRts sound driver now removed for good.
- Many fixes to the Quartz DLL sound support.
- File I/O performance improvements.
- The usual assortment of Direct3D fixes.
- Lots of bug fixes.

5 files changed, 14 insertions, 18 deletions

diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 2f799411479..abc89529bd4 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.127 2007/04/10 13:17:48 adam Exp $
+# $NetBSD: Makefile,v 1.128 2007/04/13 21:25:48 adam Exp $
 
-DISTNAME=	wine-0.9.34
+DISTNAME=	wine-0.9.35
 CATEGORIES=	emulators
 MASTER_SITES=	http://ibiblio.org/pub/linux/system/emulators/wine/ \
 		${MASTER_SITE_SOURCEFORGE:=wine/}
diff --git a/emulators/wine/PLIST b/emulators/wine/PLIST
index 43360aaa34e..6f642df2536 100644
--- a/emulators/wine/PLIST
+++ b/emulators/wine/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.59 2007/04/10 13:17:48 adam Exp $
+@comment $NetBSD: PLIST,v 1.60 2007/04/13 21:25:48 adam Exp $
 bin/bin2res
 bin/fnt2bdf
 bin/function_grep.pl
@@ -664,6 +664,7 @@ lib/wine/libws2_32.def
 lib/wine/libwsock32.def
 lib/wine/libwtsapi32.def
 lib/wine/localspl.dll.so
+lib/wine/localui.dll.so
 lib/wine/lz32.dll.so
 lib/wine/lzexpand.dll16
 lib/wine/mapi32.dll.so
@@ -808,7 +809,6 @@ lib/wine/win87em.dll16
 lib/wine/winaspi.dll16
 lib/wine/windebug.dll16
 lib/wine/winealsa.drv.so
-lib/wine/winearts.drv.so
 lib/wine/wineaudioio.drv.so
 lib/wine/wineboot.exe.so
 lib/wine/winebrowser.exe.so
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo
index bca27381169..15fdb204af2 100644
--- a/emulators/wine/distinfo
+++ b/emulators/wine/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.65 2007/04/10 13:17:48 adam Exp $
+$NetBSD: distinfo,v 1.66 2007/04/13 21:25:48 adam Exp $
 
-SHA1 (wine-0.9.34.tar.bz2) = 4a95ae1084c09a61c6c310807d68dad7970e9f6b
-RMD160 (wine-0.9.34.tar.bz2) = b8b60d3995cd88ca85cc24c7471414be61baa2b4
-Size (wine-0.9.34.tar.bz2) = 11739663 bytes
+SHA1 (wine-0.9.35.tar.bz2) = 312ca169c76a616e749c4380e98744c5ba445716
+RMD160 (wine-0.9.35.tar.bz2) = ea4c2f8e38d45ccdd46dcc4f624b81dc5cc42df9
+Size (wine-0.9.35.tar.bz2) = 11779572 bytes
 SHA1 (patch-aa) = 13006794c5c93ab377880f8eb8b8b875bf5ceafe
 SHA1 (patch-ab) = 66c1f1ec98674d15c7a72e8ac16105c28aa25e91
 SHA1 (patch-ad) = 21b66f430149cae8319eb80a30cf8ad890d1b1ef
@@ -11,5 +11,5 @@ SHA1 (patch-af) = 413d6ebc5fa7f176d7e14cbc62007c96476bb111
 SHA1 (patch-ag) = c4bf5a592ad5cad67ff933c5da418c58d6e1367a
 SHA1 (patch-ai) = a334ee48b949f9f5d4356beed3b422ee032619c2
 SHA1 (patch-aj) = fa9d3baad8d3b895edc6275c2b6da23daa941a09
-SHA1 (patch-ak) = b1820ff79ef47da0df8cc57ddd29591097d8e46e
+SHA1 (patch-ak) = 20f1aa2ac7dae4a515b706b71b4f7980970ee429
 SHA1 (patch-al) = 4233cdc5d9b4db0a2ffebc037810af8fc94b7c2d
diff --git a/emulators/wine/options.mk b/emulators/wine/options.mk
index d4861f7fc5f..68a9c2e4229 100644
--- a/emulators/wine/options.mk
+++ b/emulators/wine/options.mk
@@ -1,15 +1,11 @@
-# $NetBSD: options.mk,v 1.6 2006/05/31 19:06:08 ghen Exp $
+# $NetBSD: options.mk,v 1.7 2007/04/13 21:25:48 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.wine
-PKG_SUPPORTED_OPTIONS=	arts cups opengl sane
+PKG_SUPPORTED_OPTIONS=	cups opengl sane
 PKG_SUGGESTED_OPTIONS=	opengl
 
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Marts)
-.include "../../audio/arts/buildlink3.mk"
-.endif
-
 .if !empty(PKG_OPTIONS:Mcups)
 .include "../../print/cups/buildlink3.mk"
 .endif
diff --git a/emulators/wine/patches/patch-ak b/emulators/wine/patches/patch-ak
index aa6677a2a00..1c1c0bcc963 100644
--- a/emulators/wine/patches/patch-ak
+++ b/emulators/wine/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.10 2007/01/30 13:11:04 adam Exp $
+$NetBSD: patch-ak,v 1.11 2007/04/13 21:25:48 adam Exp $
 
---- dlls/ntdll/file.c.orig	2007-01-25 16:53:50.000000000 +0100
+--- dlls/ntdll/file.c.orig	2007-04-13 17:47:52.000000000 +0200
 +++ dlls/ntdll/file.c
-@@ -1773,6 +1773,35 @@ static NTSTATUS get_device_info( int fd,
+@@ -1817,6 +1817,35 @@ static NTSTATUS get_device_info( int fd,
              info->DeviceType = FILE_DEVICE_DISK_FILE_SYSTEM;
              break;
          }