Update wine to 20020411. Changes include:

    * Licence changed to LGPL.
    * Beginnings of an SMB client implementation.
    * New naming scheme and location for builtin dlls.
    * aRts sound driver.
    * A bunch of unit tests.
    * Much more complete setupapi implementation.
    * Some dll separation progress.
    * The usual common controls rewrites.
    * Much improved Microsoft Office support.
    * Lots of bug fixes.

4 files changed, 157 insertions, 136 deletions

diff --git a/emulators/wine/DESCR b/emulators/wine/DESCR
index 92c27c88ff9..6c519aa01bd 100644
--- a/emulators/wine/DESCR
+++ b/emulators/wine/DESCR
@@ -5,6 +5,6 @@ and a library that implements Windows API calls using their Unix or X11
 equivalents.  The library may also be used for porting Win32 code into
 native Unix executables.
 
-Wine is free software, and its license (contained in the file LICENSE) is
-BSD style.  Basically, you can do anything with it except claim that you
-wrote it.
+Wine is free software, and after version 20020228, its license (contained
+in the file LICENSE) changed from BSD style to LGPL.  For a BSD-style fork
+of Wine, see the emulators/rewind package.
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index f289a85c223..004e968596f 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2002/04/05 20:20:26 kent Exp $
+# $NetBSD: Makefile,v 1.27 2002/04/20 08:20:16 rh Exp $
 
-DISTNAME=		Wine-20020228
-PKGNAME=		wine-20020228
+DISTNAME=		Wine-20020411
+PKGNAME=		${DISTNAME:S/W/w/}
 WRKSRC=			${WRKDIR}/${PKGNAME}
 CATEGORIES=		emulators
 MASTER_SITES=		${MASTER_SITE_SUNSITE:=ALPHA/wine/development/}
@@ -10,6 +10,8 @@ MAINTAINER=		junyoung@netbsd.org
 HOMEPAGE=		http://www.winehq.com/
 COMMENT=		Free implementation of Windows on Unix (still alpha)
 
+CONFLICTS=		rewind-[0-9]*
+
 ONLY_FOR_PLATFORM=	NetBSD-1.5Z*-i386 NetBSD-1.[6-9]*-i386
 
 USE_BUILDLINK_ONLY=	YES
diff --git a/emulators/wine/PLIST b/emulators/wine/PLIST
index 2a783caf959..a8caeef3300 100644
--- a/emulators/wine/PLIST
+++ b/emulators/wine/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/03/15 04:10:20 junyoung Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/04/20 08:20:16 rh Exp $
 bin/fnt2bdf
 bin/function_grep.pl
 bin/wine
@@ -38,11 +38,15 @@ include/wine/digitalv.h
 include/wine/dinput.h
 include/wine/dispdib.h
 include/wine/dlgs.h
+include/wine/dmo.h
+include/wine/dmoreg.h
+include/wine/dmort.h
 include/wine/docobj.h
 include/wine/dplay.h
 include/wine/dplobby.h
 include/wine/dshow.h
 include/wine/dsound.h
+include/wine/dvdmedia.h
 include/wine/errors.h
 include/wine/evcode.h
 include/wine/guiddef.h
@@ -57,6 +61,8 @@ include/wine/mapicode.h
 include/wine/mapidefs.h
 include/wine/mciavi.h
 include/wine/mcx.h
+include/wine/mediaerr.h
+include/wine/mediaobj.h
 include/wine/minmax.h
 include/wine/mmreg.h
 include/wine/mmsystem.h
@@ -83,6 +89,7 @@ include/wine/msvcrt/stddef.h
 include/wine/msvcrt/stdio.h
 include/wine/msvcrt/stdlib.h
 include/wine/msvcrt/string.h
+include/wine/msvcrt/sys/locking.h
 include/wine/msvcrt/sys/stat.h
 include/wine/msvcrt/sys/timeb.h
 include/wine/msvcrt/sys/types.h
@@ -210,115 +217,10 @@ include/wine/wshisotp.h
 include/wine/wsipx.h
 include/wine/wtypes.h
 include/wine/zmouse.h
-lib/libadvapi32.so
-lib/libavicap32.so
-lib/libavifil32.so
-lib/libavifile.so
-lib/libcomctl32.so
-lib/libcomdlg32.so
-lib/libcomm.so
-lib/libcommdlg.so
-lib/libcompobj.so
-lib/libcrtdll.so
-lib/libcrypt32.so
-lib/libdciman32.so
-lib/libddeml.so
-lib/libddraw.so
-lib/libdevenum.so
-lib/libdinput.so
-lib/libdispdib.so
-lib/libdisplay.so
-lib/libdplay.so
-lib/libdplayx.so
-lib/libdsound.so
-lib/libgdi.so
-lib/libgdi32.so
-lib/libglu32.so
-lib/libicmp.so
-lib/libimagehlp.so
-lib/libimm.so
-lib/libimm32.so
-lib/libjoystick.drv.so
-lib/libkernel.so
-lib/libkernel32.so
-lib/libkeyboard.so
-lib/liblz32.so
-lib/liblzexpand.so
-lib/libmapi32.so
-lib/libmcianim.drv.so
-lib/libmciavi.drv.so
-lib/libmcicda.drv.so
-lib/libmciseq.drv.so
-lib/libmciwave.drv.so
-lib/libmidimap.drv.so
-lib/libmmsystem.so
-lib/libmouse.so
-lib/libmpr.so
-lib/libmsacm.drv.so
-lib/libmsacm.so
-lib/libmsacm32.so
-lib/libmsdmo.so
-lib/libmsimg32.so
-lib/libmsnet32.so
-lib/libmsrle32.so
-lib/libmsvcrt.so
-lib/libmsvcrt20.so
-lib/libmsvfw32.so
-lib/libmsvideo.so
-lib/libnetapi32.so
-lib/libntdll.so
-lib/libodbc32.so
-lib/libole2.so
-lib/libole2conv.so
-lib/libole2disp.so
-lib/libole2nls.so
-lib/libole2prox.so
-lib/libole2thk.so
-lib/libole32.so
-lib/liboleaut32.so
-lib/libolecli.so
-lib/libolecli32.so
-lib/liboledlg.so
-lib/libolepro32.so
-lib/libolesvr.so
-lib/libolesvr32.so
-lib/libopengl32.so
-lib/libpsapi.so
-lib/libqcap.so
-lib/libquartz.so
-lib/librasapi16.so
-lib/librasapi32.so
-lib/libriched32.so
-lib/librpcrt4.so
-lib/libserialui.so
-lib/libsetupapi.so
-lib/libsetupx.so
-lib/libshdocvw.so
-lib/libshell.so
-lib/libshell32.so
-lib/libshfolder.so
-lib/libshlwapi.so
-lib/libsound.so
-lib/libsti.so
-lib/libstorage.so
-lib/libstress.so
-lib/libsystem.so
-lib/libtapi32.so
-lib/libtoolhelp.so
-lib/libttydrv.so
-lib/libtypelib.so
-lib/liburl.so
-lib/liburlmon.so
-lib/libuser.so
-lib/libuser32.so
-lib/libver.so
-lib/libversion.so
-lib/libw32skrnl.so
-lib/libw32sys.so
-lib/libwin32s16.so
-lib/libwin87em.so
-lib/libwinaspi.so
-lib/libwindebug.so
+lib/libgdi32.dll.so
+lib/libkernel32.dll.so
+lib/libntdll.dll.so
+lib/libuser32.dll.so
 lib/libwine.so
 lib/libwine.so.1.0
 lib/libwine_tsx11.so
@@ -326,24 +228,140 @@ lib/libwine_tsx11.so.1.0
 lib/libwine_unicode.so
 lib/libwine_unicode.so.1.0
 lib/libwine_uuid.a
-lib/libwinedos.so
-lib/libwineoss.drv.so
-lib/libwineps.so
-lib/libwineps16.so
-lib/libwing.so
-lib/libwininet.so
-lib/libwinmm.so
-lib/libwinnls.so
-lib/libwinnls32.so
-lib/libwinsock.so
 lib/libwinspool.drv.so
-lib/libwintrust.so
-lib/libwnaspi32.so
-lib/libwow32.so
-lib/libwprocs.so
-lib/libws2_32.so
-lib/libwsock32.so
-lib/libx11drv.so
+lib/libx11drv.dll.so
+lib/wine/advapi32.dll.so
+lib/wine/avicap32.dll.so
+lib/wine/avifil32.dll.so
+lib/wine/avifile.dll.so
+lib/wine/comctl32.dll.so
+lib/wine/comdlg32.dll.so
+lib/wine/comm.dll.so
+lib/wine/commdlg.dll.so
+lib/wine/compobj.dll.so
+lib/wine/crtdll.dll.so
+lib/wine/crypt32.dll.so
+lib/wine/dciman32.dll.so
+lib/wine/ddeml.dll.so
+lib/wine/ddraw.dll.so
+lib/wine/devenum.dll.so
+lib/wine/dinput.dll.so
+lib/wine/dispdib.dll.so
+lib/wine/display.dll.so
+lib/wine/dplay.dll.so
+lib/wine/dplayx.dll.so
+lib/wine/dsound.dll.so
+lib/wine/gdi.exe.so
+lib/wine/gdi32.dll.so
+lib/wine/glu32.dll.so
+lib/wine/icmp.dll.so
+lib/wine/imaadp32.acm.so
+lib/wine/imagehlp.dll.so
+lib/wine/imm.dll.so
+lib/wine/imm32.dll.so
+lib/wine/joystick.drv.so
+lib/wine/kernel32.dll.so
+lib/wine/keyboard.dll.so
+lib/wine/krnl386.exe.so
+lib/wine/lz32.dll.so
+lib/wine/lzexpand.dll.so
+lib/wine/mapi32.dll.so
+lib/wine/mcianim.drv.so
+lib/wine/mciavi.drv.so
+lib/wine/mcicda.drv.so
+lib/wine/mciseq.drv.so
+lib/wine/mciwave.drv.so
+lib/wine/midimap.drv.so
+lib/wine/mmsystem.dll.so
+lib/wine/mouse.dll.so
+lib/wine/mpr.dll.so
+lib/wine/msacm.dll.so
+lib/wine/msacm.drv.so
+lib/wine/msacm32.dll.so
+lib/wine/msdmo.dll.so
+lib/wine/msg711.drv.so
+lib/wine/msimg32.dll.so
+lib/wine/msisys.ocx.so
+lib/wine/msnet32.dll.so
+lib/wine/msrle32.dll.so
+lib/wine/msvcrt.dll.so
+lib/wine/msvcrt20.dll.so
+lib/wine/msvfw32.dll.so
+lib/wine/msvideo.dll.so
+lib/wine/netapi32.dll.so
+lib/wine/ntdll.dll.so
+lib/wine/odbc32.dll.so
+lib/wine/ole2.dll.so
+lib/wine/ole2conv.dll.so
+lib/wine/ole2disp.dll.so
+lib/wine/ole2nls.dll.so
+lib/wine/ole2prox.dll.so
+lib/wine/ole2thk.dll.so
+lib/wine/ole32.dll.so
+lib/wine/oleaut32.dll.so
+lib/wine/olecli.dll.so
+lib/wine/olecli32.dll.so
+lib/wine/oledlg.dll.so
+lib/wine/olepro32.dll.so
+lib/wine/olesvr.dll.so
+lib/wine/olesvr32.dll.so
+lib/wine/opengl32.dll.so
+lib/wine/psapi.dll.so
+lib/wine/qcap.dll.so
+lib/wine/quartz.dll.so
+lib/wine/rasapi16.dll.so
+lib/wine/rasapi32.dll.so
+lib/wine/riched32.dll.so
+lib/wine/rpcrt4.dll.so
+lib/wine/serialui.dll.so
+lib/wine/setupapi.dll.so
+lib/wine/setupx.dll.so
+lib/wine/shdocvw.dll.so
+lib/wine/shell.dll.so
+lib/wine/shell32.dll.so
+lib/wine/shfolder.dll.so
+lib/wine/shlwapi.dll.so
+lib/wine/sound.dll.so
+lib/wine/sti.dll.so
+lib/wine/storage.dll.so
+lib/wine/stress.dll.so
+lib/wine/system.dll.so
+lib/wine/tapi32.dll.so
+lib/wine/toolhelp.dll.so
+lib/wine/ttydrv.dll.so
+lib/wine/twain_32.dll.so
+lib/wine/typelib.dll.so
+lib/wine/url.dll.so
+lib/wine/urlmon.dll.so
+lib/wine/user.exe.so
+lib/wine/user32.dll.so
+lib/wine/ver.dll.so
+lib/wine/version.dll.so
+lib/wine/w32skrnl.dll.so
+lib/wine/w32sys.dll.so
+lib/wine/win32s16.dll.so
+lib/wine/win87em.dll.so
+lib/wine/winaspi.dll.so
+lib/wine/windebug.dll.so
+lib/wine/winearts.drv.so
+lib/wine/winedos.dll.so
+lib/wine/wineoss.drv.so
+lib/wine/wineps.dll.so
+lib/wine/wineps16.dll.so
+lib/wine/wing.dll.so
+lib/wine/wininet.dll.so
+lib/wine/winmm.dll.so
+lib/wine/winnls.dll.so
+lib/wine/winnls32.dll.so
+lib/wine/winsock.dll.so
+lib/wine/winspool.drv.so
+lib/wine/wintrust.dll.so
+lib/wine/wnaspi32.dll.so
+lib/wine/wow32.dll.so
+lib/wine/wprocs.dll.so
+lib/wine/ws2_32.dll.so
+lib/wine/wsock32.dll.so
+lib/wine/x11drv.dll.so
 man/man1/wine.1
 man/man1/winemaker.1
 man/man1/wmc.1
@@ -353,6 +371,7 @@ share/examples/wine/generic.ppd
 share/examples/wine/system.ini
 share/examples/wine/wine.conf
 @dirrm share/examples/wine
+@dirrm lib/wine
 @dirrm include/wine/wine
 @dirrm include/wine/msvcrt/sys
 @dirrm include/wine/msvcrt
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo
index 5e1233e9b5f..d6ad1040131 100644
--- a/emulators/wine/distinfo
+++ b/emulators/wine/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2002/04/12 17:45:43 junyoung Exp $
+$NetBSD: distinfo,v 1.7 2002/04/20 08:20:16 rh Exp $
 
-SHA1 (Wine-20020228.tar.gz) = 4e275f639200752126ebdfdca23daa7f692dbfb4
-Size (Wine-20020228.tar.gz) = 6970746 bytes
+SHA1 (Wine-20020411.tar.gz) = d83060fc97f02bf9deaef0a23951042d631f268c
+Size (Wine-20020411.tar.gz) = 7270988 bytes
 SHA1 (patch-aa) = bf45f5b343bda55a0809459469a2476b566ad7d5