Changes 0.9.36:

- Midi support in the CoreAudio driver.
- Mixer support in the Alsa driver.
- A lot of MSI fixes.
- Implementation for most D3DRM functions.
- The usual assortment of Direct3D fixes.
- Lots of bug fixes.

4 files changed, 16 insertions, 12 deletions

diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 86ef12cfd76..0564f1086ce 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.129 2007/04/20 10:52:20 tnn Exp $
+# $NetBSD: Makefile,v 1.130 2007/04/29 12:48:05 adam Exp $
 
-DISTNAME=	wine-0.9.35
-PKGREVISION=	1
+DISTNAME=	wine-0.9.36
 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 6f642df2536..50c7d41903e 100644
--- a/emulators/wine/PLIST
+++ b/emulators/wine/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.60 2007/04/13 21:25:48 adam Exp $
+@comment $NetBSD: PLIST,v 1.61 2007/04/29 12:48:05 adam Exp $
 bin/bin2res
 bin/fnt2bdf
 bin/function_grep.pl
@@ -117,6 +117,7 @@ include/wine/windows/d3d9types.h
 include/wine/windows/d3dcaps.h
 include/wine/windows/d3dhal.h
 include/wine/windows/d3drm.h
+include/wine/windows/d3drmdef.h
 include/wine/windows/d3dtypes.h
 include/wine/windows/d3dvec.inl
 include/wine/windows/d3dx8core.h
@@ -284,6 +285,7 @@ include/wine/windows/ntddstor.h
 include/wine/windows/ntdsapi.h
 include/wine/windows/ntquery.h
 include/wine/windows/ntsecapi.h
+include/wine/windows/ntsecpkg.h
 include/wine/windows/ntstatus.h
 include/wine/windows/oaidl.h
 include/wine/windows/oaidl.idl
@@ -444,6 +446,7 @@ include/wine/windows/zmouse.h
 lib/libwine.so
 lib/libwine.so.1
 lib/libwine.so.1.0
+lib/wine/acledit.dll.so
 lib/wine/activeds.dll.so
 lib/wine/advapi32.dll.so
 lib/wine/advpack.dll.so
@@ -636,6 +639,7 @@ lib/wine/libshell32.def
 lib/wine/libshfolder.def
 lib/wine/libshlwapi.def
 lib/wine/libsnmpapi.def
+lib/wine/libspoolss.def
 lib/wine/libsti.def
 lib/wine/libstrmiids.a
 lib/wine/libtapi32.def
@@ -777,6 +781,7 @@ lib/wine/sti.dll.so
 lib/wine/storage.dll16
 lib/wine/stress.dll16
 lib/wine/svrapi.dll.so
+lib/wine/sxs.dll.so
 lib/wine/system.drv16
 lib/wine/tapi32.dll.so
 lib/wine/taskmgr.exe.so
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo
index 15fdb204af2..078c536d018 100644
--- a/emulators/wine/distinfo
+++ b/emulators/wine/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.66 2007/04/13 21:25:48 adam Exp $
+$NetBSD: distinfo,v 1.67 2007/04/29 12:48:05 adam Exp $
 
-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 (wine-0.9.36.tar.bz2) = 1635943190c32f34b34dc0f40749c974c3bbfc64
+RMD160 (wine-0.9.36.tar.bz2) = 41e77069e07d6bb3db7d18b55e95a5b463ac4227
+Size (wine-0.9.36.tar.bz2) = 11843261 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) = 20f1aa2ac7dae4a515b706b71b4f7980970ee429
+SHA1 (patch-ak) = 6d1b1490b30c7894483bdf93410490a6f326baea
 SHA1 (patch-al) = 4233cdc5d9b4db0a2ffebc037810af8fc94b7c2d
diff --git a/emulators/wine/patches/patch-ak b/emulators/wine/patches/patch-ak
index 1c1c0bcc963..851089203a4 100644
--- a/emulators/wine/patches/patch-ak
+++ b/emulators/wine/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.11 2007/04/13 21:25:48 adam Exp $
+$NetBSD: patch-ak,v 1.12 2007/04/29 12:48:05 adam Exp $
 
---- dlls/ntdll/file.c.orig	2007-04-13 17:47:52.000000000 +0200
+--- dlls/ntdll/file.c.orig	2007-04-27 16:48:53.000000000 +0200
 +++ dlls/ntdll/file.c
-@@ -1817,6 +1817,35 @@ static NTSTATUS get_device_info( int fd,
+@@ -1809,6 +1809,35 @@ static NTSTATUS get_device_info( int fd,
              info->DeviceType = FILE_DEVICE_DISK_FILE_SYSTEM;
              break;
          }