Update to 20020804 snapshot.

WHAT'S NEW with Wine-20020804: (see ChangeLog for details)
	- Beginnings of an IDL compiler.
	- Several new winedbg features.
	- More OLE and shell improvements.
	- NAS and AudioIO sound drivers.
	- Still more Sparc portability fixes.
	- Lots of bug fixes.

4 files changed, 24 insertions, 27 deletions

diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 70b72f212c9..934aab475b6 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.28 2002/07/29 09:16:37 junyoung Exp $
+# $NetBSD: Makefile,v 1.29 2002/08/05 16:38:57 junyoung Exp $
 
-DISTNAME=		Wine-20020710
+DISTNAME=		Wine-20020804
 PKGNAME=		${DISTNAME:S/W/w/}
 WRKSRC=			${WRKDIR}/${PKGNAME}
 CATEGORIES=		emulators
diff --git a/emulators/wine/PLIST b/emulators/wine/PLIST
index 7630695718d..96d8a531dfe 100644
--- a/emulators/wine/PLIST
+++ b/emulators/wine/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2002/07/29 09:16:38 junyoung Exp $
+@comment $NetBSD: PLIST,v 1.5 2002/08/05 16:38:58 junyoung Exp $
 bin/function_grep.pl
 bin/notepad
 bin/progman
@@ -6,6 +6,7 @@ bin/regedit
 bin/regsvr32
 bin/uninstaller
 bin/wcmd
+bin/widl
 bin/wine
 bin/winebuild
 bin/wineclipsrv
@@ -185,7 +186,6 @@ include/wine/wine/obj_oleview.h
 include/wine/wine/obj_picture.h
 include/wine/wine/obj_property.h
 include/wine/wine/obj_propertystorage.h
-include/wine/wine/obj_queryassociations.h
 include/wine/wine/obj_serviceprovider.h
 include/wine/wine/obj_shellbrowser.h
 include/wine/wine/obj_shellextinit.h
@@ -367,12 +367,14 @@ lib/wine/winaspi.dll.so
 lib/wine/windebug.dll.so
 lib/wine/winealsa.drv.so
 lib/wine/winearts.drv.so
+lib/wine/wineaudioio.drv.so
 lib/wine/wineconsole.exe.so
 lib/wine/winedbg.exe.so
 lib/wine/winedos.dll.so
 lib/wine/winefile.exe.so
 lib/wine/winemine.exe.so
 lib/wine/winemp3.acm.so
+lib/wine/winenas.drv.so
 lib/wine/wineoss.drv.so
 lib/wine/winepath.exe.so
 lib/wine/wineps.dll.so
@@ -395,10 +397,12 @@ lib/wine/ws2_32.dll.so
 lib/wine/wsock32.dll.so
 lib/wine/x11drv.dll.so
 man/man1/wine.1
+man/man1/winebuild.1
 man/man1/winemaker.1
 man/man1/wmc.1
 man/man1/wrc.1
 man/man5/wine.conf.5
+share/aclocal/wine.m4
 share/examples/wine/generic.ppd
 share/examples/wine/system.ini
 share/examples/wine/wine.conf
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo
index 2b946fb3e70..3a6bb201d48 100644
--- a/emulators/wine/distinfo
+++ b/emulators/wine/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2002/07/29 09:16:38 junyoung Exp $
+$NetBSD: distinfo,v 1.9 2002/08/05 16:38:58 junyoung Exp $
 
-SHA1 (Wine-20020710.tar.gz) = 69e0bc8e52e01e209cf30508b49add62d24bc82a
-Size (Wine-20020710.tar.gz) = 7371859 bytes
+SHA1 (Wine-20020804.tar.gz) = 8536d7c15860dbb20d4e609d1bce58ec6d633bb0
+Size (Wine-20020804.tar.gz) = 7497358 bytes
 SHA1 (patch-aa) = bf45f5b343bda55a0809459469a2476b566ad7d5
-SHA1 (patch-ab) = bee147678fcd82ae6d09e45a75f889dd5a42343d
+SHA1 (patch-ab) = 2a1a4432f7e9896f4cc5df066dc0d8581dc78d52
diff --git a/emulators/wine/patches/patch-ab b/emulators/wine/patches/patch-ab
index efe157491f9..e26f0b6a3b7 100644
--- a/emulators/wine/patches/patch-ab
+++ b/emulators/wine/patches/patch-ab
@@ -1,20 +1,13 @@
-$NetBSD: patch-ab,v 1.10 2002/07/29 09:16:39 junyoung Exp $
+$NetBSD: patch-ab,v 1.11 2002/08/05 16:38:58 junyoung Exp $
 
-Index: memory/global.c
-===================================================================
-RCS file: /home/wine/wine/memory/global.c,v
-retrieving revision 1.66
-retrieving revision 1.67
-diff -u -r1.66 -r1.67
---- memory/global.c	3 Jul 2002 21:10:44 -0000	1.66
-+++ memory/global.c	25 Jul 2002 23:57:34 -0000	1.67
-@@ -28,6 +28,9 @@
- #include <stdio.h>
- #include <unistd.h>
- #include <string.h>
-+#ifdef HAVE_SYS_PARAM_H
-+#include <sys/param.h>
-+#endif
- #ifdef HAVE_SYS_SYSCTL_H
- #include <sys/sysctl.h>
- #endif
+--- Make.rules.in.orig	Sat Aug  3 04:34:21 2002
++++ Make.rules.in	Mon Aug  5 14:57:17 2002
+@@ -112,7 +112,7 @@
+ CLEAN_FILES     = *.o *.a *.so *.ln *.$(LIBEXT) \\\#*\\\# *~ *% .\\\#* *.bak *.orig *.rej \
+                   *.flc *.spec.c *.spec.def *.glue.c *.dbg.c y.tab.c y.tab.h @LEX_OUTPUT_ROOT@.c core
+ 
+-OBJS = $(C_SRCS:.c=.o) $(GEN_C_SRCS:.c=.o) $(GEN_ASM_SRCS:.s=.o) $(ASM_SRCS:.S=.o) $(EXTRA_OBJS)
++OBJS = $(EXTRA_OBJS) $(C_SRCS:.c=.o) $(GEN_C_SRCS:.c=.o) $(GEN_ASM_SRCS:.s=.o) $(ASM_SRCS:.S=.o)
+ 
+ RCOBJS = $(RC_SRCS:.rc=.res.o)
+ LINTS  = $(C_SRCS:.c=.ln)