Changes 0.9.26:

- Better support for Unix locale settings.
- Improved X11 keyboard support.
- Various MSI fixes.
- Winecfg improvements.
- Lots of bug fixes.

5 files changed, 21 insertions, 16 deletions

diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 46cadb599f5..95d1e45a731 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.118 2006/11/10 21:56:15 adam Exp $
+# $NetBSD: Makefile,v 1.119 2006/11/25 13:23:14 adam Exp $
 
-DISTNAME=	wine-0.9.25
+DISTNAME=	wine-0.9.26
 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 afcf4fb8635..e0263ca3c5e 100644
--- a/emulators/wine/PLIST
+++ b/emulators/wine/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.50 2006/10/29 20:03:58 adam Exp $
+@comment $NetBSD: PLIST,v 1.51 2006/11/25 13:23:14 adam Exp $
 bin/bin2res
 bin/fnt2bdf
 bin/function_grep.pl
@@ -77,6 +77,7 @@ include/wine/windows/accctrl.h
 include/wine/windows/aclapi.h
 include/wine/windows/activscp.h
 include/wine/windows/activscp.idl
+include/wine/windows/adshlp.h
 include/wine/windows/advpub.h
 include/wine/windows/amstream.h
 include/wine/windows/amstream.idl
@@ -293,6 +294,8 @@ include/wine/windows/objsafe.idl
 include/wine/windows/objsel.h
 include/wine/windows/ocidl.h
 include/wine/windows/ocidl.idl
+include/wine/windows/ocmm.h
+include/wine/windows/ocmm.idl
 include/wine/windows/odbcinst.h
 include/wine/windows/ole2.h
 include/wine/windows/ole2ver.h
@@ -389,6 +392,7 @@ include/wine/windows/vfw.h
 include/wine/windows/vfwmsgs.h
 include/wine/windows/winbase.h
 include/wine/windows/wincon.h
+include/wine/windows/wincred.h
 include/wine/windows/wincrypt.h
 include/wine/windows/windef.h
 include/wine/windows/windns.h
@@ -749,6 +753,7 @@ lib/wine/serialui.dll.so
 lib/wine/setupapi.dll.so
 lib/wine/setupx.dll16
 lib/wine/sfc.dll.so
+lib/wine/shdoclc.dll.so
 lib/wine/shdocvw.dll.so
 lib/wine/shell.dll16
 lib/wine/shell32.dll.so
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo
index a48d69858f6..2ee78bf93fb 100644
--- a/emulators/wine/distinfo
+++ b/emulators/wine/distinfo
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.55 2006/11/10 21:56:15 adam Exp $
+$NetBSD: distinfo,v 1.56 2006/11/25 13:23:14 adam Exp $
 
-SHA1 (wine-0.9.25.tar.bz2) = bdfac6530616d69bee305ed4c5bc6c41f424be7a
-RMD160 (wine-0.9.25.tar.bz2) = 7aa4317cf64f473a44fb7f9093cecf86ba022fd8
-Size (wine-0.9.25.tar.bz2) = 11297723 bytes
+SHA1 (wine-0.9.26.tar.bz2) = fc5cc0f14df7db577ffbf0deb452b4a379963abf
+RMD160 (wine-0.9.26.tar.bz2) = 6db55826d06fc5f008131ad90f3ffaf1fa40c65f
+Size (wine-0.9.26.tar.bz2) = 11318798 bytes
 SHA1 (patch-aa) = ba1c86faa7e9d7008622f105359229d3593e3cee
 SHA1 (patch-ab) = 66c1f1ec98674d15c7a72e8ac16105c28aa25e91
-SHA1 (patch-ac) = 79157f03206befc34e00b6b2f117c126bbf2e12c
+SHA1 (patch-ac) = 519aae38eac15edf3ff60936aec07a4543a0fc44
 SHA1 (patch-ae) = a4f39995baf5511ddc70b4e1c006a159a86eeb22
 SHA1 (patch-af) = a55e83f71f09fdbc5f980999ca9d435aac4120f9
 SHA1 (patch-ag) = c4bf5a592ad5cad67ff933c5da418c58d6e1367a
 SHA1 (patch-ai) = a334ee48b949f9f5d4356beed3b422ee032619c2
 SHA1 (patch-aj) = 9ad0a5e641f86756018bf460a969c0187aae17a0
-SHA1 (patch-ak) = 2262d241caac39cffa557aa24d9b057eec3db22c
+SHA1 (patch-ak) = 08bdf2115f8373d1f439af6f2e6262901e5b4b42
 SHA1 (patch-al) = 7ee943a4060d526dab328cb2a8a7308b98514949
diff --git a/emulators/wine/patches/patch-ac b/emulators/wine/patches/patch-ac
index 8a98ef58c5b..1fd0ac511bb 100644
--- a/emulators/wine/patches/patch-ac
+++ b/emulators/wine/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.34 2006/10/29 20:03:58 adam Exp $
+$NetBSD: patch-ac,v 1.35 2006/11/25 13:23:14 adam Exp $
 
---- configure.orig	2006-10-27 17:20:13.000000000 +0200
+--- configure.orig	2006-11-24 17:18:04.000000000 +0100
 +++ configure
-@@ -20266,7 +20266,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -20215,7 +20215,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
@@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.34 2006/10/29 20:03:58 adam Exp $
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
-@@ -22283,7 +22283,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -22232,7 +22232,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
diff --git a/emulators/wine/patches/patch-ak b/emulators/wine/patches/patch-ak
index d714add90e9..19712f52e8a 100644
--- a/emulators/wine/patches/patch-ak
+++ b/emulators/wine/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.8 2006/10/18 20:37:21 adam Exp $
+$NetBSD: patch-ak,v 1.9 2006/11/25 13:23:14 adam Exp $
 
---- dlls/ntdll/file.c.orig	2006-10-13 16:43:39.000000000 +0200
+--- dlls/ntdll/file.c.orig	2006-11-24 17:18:04.000000000 +0100
 +++ dlls/ntdll/file.c
-@@ -1624,6 +1624,35 @@ NTSTATUS FILE_GetDeviceInfo( int fd, FIL
+@@ -1765,6 +1765,35 @@ static NTSTATUS get_device_info( int fd,
              info->DeviceType = FILE_DEVICE_DISK_FILE_SYSTEM;
              break;
          }