Changes 0.9.17:

 - Still more work on Direct3D shaders.
 - Now using the Gecko engine directly for MSHTML.
 - Better support for apps switching to full screen mode.
 - Support for multiple joysticks.
 - Lots of bug fixes.

6 files changed, 40 insertions, 15 deletions

diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 1bf16325bf0..f20710f4fa0 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.110 2006/07/03 11:19:22 adam Exp $
+# $NetBSD: Makefile,v 1.111 2006/07/10 21:12:03 adam Exp $
 
-DISTNAME=	wine-0.9.16
+DISTNAME=	wine-0.9.17
 CATEGORIES=	emulators
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=wine/} \
-		http://ibiblio.org/pub/linux/system/emulators/wine/
+MASTER_SITES=	http://ibiblio.org/pub/linux/system/emulators/wine/ \
+		${MASTER_SITE_SOURCEFORGE:=wine/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	adam@NetBSD.org
diff --git a/emulators/wine/PLIST b/emulators/wine/PLIST
index 431bad9094b..8c57284da59 100644
--- a/emulators/wine/PLIST
+++ b/emulators/wine/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.46 2006/07/03 11:19:22 adam Exp $
+@comment $NetBSD: PLIST,v 1.47 2006/07/10 21:12:03 adam Exp $
 bin/bin2res
 bin/fnt2bdf
 bin/function_grep.pl
@@ -188,6 +188,8 @@ include/wine/windows/guiddef.h
 include/wine/windows/hlguids.h
 include/wine/windows/hlink.h
 include/wine/windows/hlink.idl
+include/wine/windows/htiframe.h
+include/wine/windows/htiframe.idl
 include/wine/windows/htmlhelp.h
 include/wine/windows/iads.h
 include/wine/windows/iads.idl
@@ -196,6 +198,8 @@ include/wine/windows/icmpapi.h
 include/wine/windows/idispids.h
 include/wine/windows/imagehlp.h
 include/wine/windows/imm.h
+include/wine/windows/indexsvr.h
+include/wine/windows/indexsvr.idl
 include/wine/windows/initguid.h
 include/wine/windows/ipexport.h
 include/wine/windows/iphlpapi.h
@@ -271,6 +275,7 @@ include/wine/windows/ntddcdrm.h
 include/wine/windows/ntddscsi.h
 include/wine/windows/ntddstor.h
 include/wine/windows/ntdsapi.h
+include/wine/windows/ntquery.h
 include/wine/windows/ntsecapi.h
 include/wine/windows/ntstatus.h
 include/wine/windows/oaidl.h
@@ -291,6 +296,8 @@ include/wine/windows/olectl.h
 include/wine/windows/oledlg.h
 include/wine/windows/oleidl.h
 include/wine/windows/oleidl.idl
+include/wine/windows/optary.h
+include/wine/windows/optary.idl
 include/wine/windows/pktdef.h
 include/wine/windows/poppack.h
 include/wine/windows/powrprof.h
@@ -442,6 +449,7 @@ lib/wine/control.exe.so
 lib/wine/crtdll.dll.so
 lib/wine/crypt32.dll.so
 lib/wine/cryptdll.dll.so
+lib/wine/cryptnet.dll.so
 lib/wine/ctl3d.dll16
 lib/wine/ctl3d32.dll.so
 lib/wine/ctl3dv2.dll16
@@ -694,6 +702,7 @@ lib/wine/progman.exe.so
 lib/wine/psapi.dll.so
 lib/wine/qcap.dll.so
 lib/wine/quartz.dll.so
+lib/wine/query.dll.so
 lib/wine/rasapi16.dll16
 lib/wine/rasapi32.dll.so
 lib/wine/regedit.exe.so
diff --git a/emulators/wine/buildlink3.mk b/emulators/wine/buildlink3.mk
index d902bff1fe2..327a5b0162c 100644
--- a/emulators/wine/buildlink3.mk
+++ b/emulators/wine/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:10:49 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/07/10 21:12:03 adam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 WINE_BUILDLINK3_MK:=	${WINE_BUILDLINK3_MK}+
@@ -9,6 +9,7 @@ BUILDLINK_DEPENDS+=	wine
 
 BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nwine}
 BUILDLINK_PACKAGES+=	wine
+
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}wine
 
 .if !empty(WINE_BUILDLINK3_MK:M+)
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo
index 3de91b0f42f..bdfa95b3336 100644
--- a/emulators/wine/distinfo
+++ b/emulators/wine/distinfo
@@ -1,15 +1,16 @@
-$NetBSD: distinfo,v 1.48 2006/07/03 11:19:22 adam Exp $
+$NetBSD: distinfo,v 1.49 2006/07/10 21:12:03 adam Exp $
 
-SHA1 (wine-0.9.16.tar.bz2) = 763a451538811a96ee51a8311e4e7b85c93306c9
-RMD160 (wine-0.9.16.tar.bz2) = fbf18e947e3763a623cc4f96f326a4329bd0fb5d
-Size (wine-0.9.16.tar.bz2) = 11007838 bytes
+SHA1 (wine-0.9.17.tar.bz2) = 9f85e246d0d3f7435a3d343dba39e86fbe9d0fb7
+RMD160 (wine-0.9.17.tar.bz2) = 44e1f760ca31d67437ba769a6bdf6939028e8530
+Size (wine-0.9.17.tar.bz2) = 11044610 bytes
 SHA1 (patch-aa) = 12e51699b3e8e3a66b3ba51e5971bfc71aedb14a
 SHA1 (patch-ab) = 66c1f1ec98674d15c7a72e8ac16105c28aa25e91
-SHA1 (patch-ac) = 9297ae5f36b83522a03f4c921dbe923c070d4435
+SHA1 (patch-ac) = 5d092eefd078e004f06328efb85282d9f97978f1
 SHA1 (patch-ad) = 67366ff3feed3f0941f8ca8d7cb097b16dd5d421
 SHA1 (patch-ae) = dbd40183fb8e1f1d7af9ab4e51910a2227524e3c
 SHA1 (patch-af) = 423bb6844dc5684cf6d14528ec2a4a0f0089d0ce
 SHA1 (patch-ag) = 656f9667da542489595d1db65c84579b3dfce279
+SHA1 (patch-ah) = 080fd52ef3767e984c769ab46a0f2cefa5bf8a07
 SHA1 (patch-ai) = a334ee48b949f9f5d4356beed3b422ee032619c2
 SHA1 (patch-aj) = 9ad0a5e641f86756018bf460a969c0187aae17a0
 SHA1 (patch-ak) = 4bb4f47b47fc70cca1eba422e9c4c6c14c0a78bd
diff --git a/emulators/wine/patches/patch-ac b/emulators/wine/patches/patch-ac
index 95f1e65923c..2cb307ba1b7 100644
--- a/emulators/wine/patches/patch-ac
+++ b/emulators/wine/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.30 2006/07/03 11:19:22 adam Exp $
+$NetBSD: patch-ac,v 1.31 2006/07/10 21:12:03 adam Exp $
 
---- configure.orig	2006-06-21 18:21:18.000000000 +0200
+--- configure.orig	2006-07-10 18:01:06.000000000 +0200
 +++ configure
-@@ -20721,7 +20721,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -20839,7 +20839,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.30 2006/07/03 11:19:22 adam Exp $
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
-@@ -22738,7 +22738,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -22856,7 +22856,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-ah b/emulators/wine/patches/patch-ah
new file mode 100644
index 00000000000..5fd272474fc
--- /dev/null
+++ b/emulators/wine/patches/patch-ah
@@ -0,0 +1,14 @@
+$NetBSD: patch-ah,v 1.11 2006/07/10 21:12:03 adam Exp $
+
+--- libs/wine/loader.c.orig	2006-07-10 22:43:42.000000000 +0200
++++ libs/wine/loader.c
+@@ -632,7 +632,9 @@ void wine_init( int argc, char *argv[], 
+ 
+     /* force a few limits that are set too low on some platforms */
+     set_max_limit( RLIMIT_NOFILE );
++#if !defined(__NetBSD__)
+     set_max_limit( RLIMIT_AS );
++#endif
+ 
+     wine_init_argv0_path( argv[0] );
+     build_dll_path();