Changes 0.9.24:

  - Support for multiple monitors using Xinerama.
  - Various MSI fixes and improvements.
  - A ton of memory leaks fixed.
  - Many common controls fixes.
  - Lots of bug fixes.

6 files changed, 23 insertions, 33 deletions

diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 967a454668b..3b2abe82f0f 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.116 2006/10/21 08:22:54 wiz Exp $
+# $NetBSD: Makefile,v 1.117 2006/10/29 20:03:58 adam Exp $
 
-DISTNAME=	wine-0.9.23
+DISTNAME=	wine-0.9.24
 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 973ebfe0ddd..afcf4fb8635 100644
--- a/emulators/wine/PLIST
+++ b/emulators/wine/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.49 2006/10/18 20:37:21 adam Exp $
+@comment $NetBSD: PLIST,v 1.50 2006/10/29 20:03:58 adam Exp $
 bin/bin2res
 bin/fnt2bdf
 bin/function_grep.pl
@@ -92,8 +92,10 @@ include/wine/windows/axextend.idl
 include/wine/windows/basetsd.h
 include/wine/windows/basetyps.h
 include/wine/windows/cderr.h
+include/wine/windows/cfgmgr32.h
 include/wine/windows/cguid.h
 include/wine/windows/cierror.h
+include/wine/windows/clusapi.h
 include/wine/windows/comcat.h
 include/wine/windows/comcat.idl
 include/wine/windows/commctrl.h
@@ -126,7 +128,6 @@ include/wine/windows/dciddi.h
 include/wine/windows/dciman.h
 include/wine/windows/dde.h
 include/wine/windows/ddeml.h
-include/wine/windows/ddk/cfgmgr32.h
 include/wine/windows/ddk/compstui.h
 include/wine/windows/ddk/ntddcdvd.h
 include/wine/windows/ddk/ntddser.h
@@ -376,6 +377,8 @@ include/wine/windows/tom.idl
 include/wine/windows/twain.h
 include/wine/windows/unknwn.h
 include/wine/windows/unknwn.idl
+include/wine/windows/urlhist.h
+include/wine/windows/urlhist.idl
 include/wine/windows/urlmon.h
 include/wine/windows/urlmon.idl
 include/wine/windows/usp10.h
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo
index 56a7e11f987..1bc0c6c07ab 100644
--- a/emulators/wine/distinfo
+++ b/emulators/wine/distinfo
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.53 2006/10/21 08:22:54 wiz Exp $
+$NetBSD: distinfo,v 1.54 2006/10/29 20:03:58 adam Exp $
 
-SHA1 (wine-0.9.23.tar.bz2) = 598a6482cedec84ad95910084600bad38e80bfed
-RMD160 (wine-0.9.23.tar.bz2) = 3b588b0a5f41db336c976cb82ad538e4cd62dbe9
-Size (wine-0.9.23.tar.bz2) = 11197988 bytes
-SHA1 (patch-aa) = d660ead61768a7c2e819e4d554ca416972b191f1
+SHA1 (wine-0.9.24.tar.bz2) = 401736bf76674b447df688392ff3a53709229eae
+RMD160 (wine-0.9.24.tar.bz2) = 4fe83188dd8ec0d8a10f8f248b3121cedbe4ba59
+Size (wine-0.9.24.tar.bz2) = 11258286 bytes
+SHA1 (patch-aa) = ba1c86faa7e9d7008622f105359229d3593e3cee
 SHA1 (patch-ab) = 66c1f1ec98674d15c7a72e8ac16105c28aa25e91
-SHA1 (patch-ac) = 461302adb27d3a0eb224dc1ca1b853d58300baa8
-SHA1 (patch-ad) = 67366ff3feed3f0941f8ca8d7cb097b16dd5d421
+SHA1 (patch-ac) = 79157f03206befc34e00b6b2f117c126bbf2e12c
 SHA1 (patch-ae) = a4f39995baf5511ddc70b4e1c006a159a86eeb22
 SHA1 (patch-af) = a55e83f71f09fdbc5f980999ca9d435aac4120f9
 SHA1 (patch-ag) = c4bf5a592ad5cad67ff933c5da418c58d6e1367a
diff --git a/emulators/wine/patches/patch-aa b/emulators/wine/patches/patch-aa
index 74b008bfb03..64a69e1a8f1 100644
--- a/emulators/wine/patches/patch-aa
+++ b/emulators/wine/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.23 2006/10/18 20:37:21 adam Exp $
+$NetBSD: patch-aa,v 1.24 2006/10/29 20:03:58 adam Exp $
 
---- Make.rules.in.orig	2006-09-13 21:10:25.000000000 +0200
+--- Make.rules.in.orig	2006-10-27 17:20:13.000000000 +0200
 +++ Make.rules.in
-@@ -111,7 +111,7 @@ conf_manext     = 5
- CLEAN_FILES     = *.o *.a *.so *.ln *.$(LIBEXT) \\\#*\\\# *~ *% .\\\#* *.bak *.orig *.rej \
+@@ -112,7 +112,7 @@ CLEAN_FILES     = *.o *.a *.so *.ln *.$(
                    *.flc *.res *.mc.rc *.tab.[ch] *.yy.c core
  
--OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(EXTRA_OBJS)
-+OBJS = $(EXTRA_OBJS) $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o)
+ IDL_GEN_C_SRCS = $(IDL_C_SRCS:.idl=_c.c) $(IDL_I_SRCS:.idl=_i.c) $(IDL_P_SRCS:.idl=_p.c) $(IDL_S_SRCS:.idl=_s.c) 
+-OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(IDL_GEN_C_SRCS:.c=.o) $(EXTRA_OBJS)
++OBJS = $(EXTRA_OBJS) $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(IDL_GEN_C_SRCS:.c=.o)
  
  RCOBJS = $(RC_SRCS:.rc=.res.o)
  LINTS  = $(C_SRCS:.c=.ln)
diff --git a/emulators/wine/patches/patch-ac b/emulators/wine/patches/patch-ac
index 19f384a4dbc..8a98ef58c5b 100644
--- a/emulators/wine/patches/patch-ac
+++ b/emulators/wine/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.33 2006/10/18 20:37:21 adam Exp $
+$NetBSD: patch-ac,v 1.34 2006/10/29 20:03:58 adam Exp $
 
---- configure.orig	2006-10-13 16:43:39.000000000 +0200
+--- configure.orig	2006-10-27 17:20:13.000000000 +0200
 +++ configure
-@@ -20169,7 +20169,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -20266,7 +20266,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.33 2006/10/18 20:37:21 adam Exp $
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
-@@ -22186,7 +22186,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -22283,7 +22283,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-ad b/emulators/wine/patches/patch-ad
deleted file mode 100644
index 9f028a1913f..00000000000
--- a/emulators/wine/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.8 2006/02/26 07:48:11 wiz Exp $
-
---- dlls/iphlpapi/ifenum.c.orig	2006-02-15 17:02:42.000000000 +0100
-+++ dlls/iphlpapi/ifenum.c
-@@ -39,6 +39,7 @@
- #endif
- 
- #include <sys/types.h>
-+#include <sys/param.h>
- 
- #ifdef HAVE_SYS_SOCKET_H
- #include <sys/socket.h>