3 files changed, 144 insertions, 126 deletions

diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 28e559e438a7..5e7d6c3ddace 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	wine
-PORTVERSION=	2002.03.10
+PORTVERSION=	2002.04.11
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	ALPHA/wine/development
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo
index ae86b4355a13..060b7a9abce0 100644
--- a/emulators/wine/distinfo
+++ b/emulators/wine/distinfo
@@ -1 +1 @@
-MD5 (Wine-20020310.tar.gz) = a3c4cac20b4336d99671594707a5fff1
+MD5 (Wine-20020411.tar.gz) = a86f56f1cee754f46eae63474515fef7
diff --git a/emulators/wine/pkg-plist b/emulators/wine/pkg-plist
index 769c75420e36..d18e74685044 100644
--- a/emulators/wine/pkg-plist
+++ b/emulators/wine/pkg-plist
@@ -40,11 +40,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
@@ -59,6 +63,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
@@ -85,6 +91,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
@@ -213,113 +220,42 @@ include/wine/wsipx.h
 include/wine/wtypes.h
 include/wine/zmouse.h
 lib/wine/bug_report.pl
-lib/wine/libadvapi32.so
-lib/wine/libavicap32.so
-lib/wine/libavifil32.so
-lib/wine/libavifile.so
-lib/wine/libcomctl32.so
-lib/wine/libcomdlg32.so
-lib/wine/libcomm.so
-lib/wine/libcommdlg.so
-lib/wine/libcompobj.so
-lib/wine/libcrtdll.so
-lib/wine/libcrypt32.so
-lib/wine/libdciman32.so
-lib/wine/libddeml.so
-lib/wine/libddraw.so
-lib/wine/libdevenum.so
-lib/wine/libdinput.so
-lib/wine/libdispdib.so
-lib/wine/libdisplay.so
-lib/wine/libdplay.so
-lib/wine/libdplayx.so
-lib/wine/libdsound.so
-lib/wine/libgdi.so
-lib/wine/libgdi32.so
-lib/wine/libicmp.so
-lib/wine/libimagehlp.so
-lib/wine/libimm.so
-lib/wine/libimm32.so
-lib/wine/libjoystick.drv.so
-lib/wine/libkernel.so
-lib/wine/libkernel32.so
-lib/wine/libkeyboard.so
-lib/wine/liblz32.so
-lib/wine/liblzexpand.so
-lib/wine/libmapi32.so
-lib/wine/libmcianim.drv.so
-lib/wine/libmciavi.drv.so
-lib/wine/libmcicda.drv.so
-lib/wine/libmciseq.drv.so
-lib/wine/libmciwave.drv.so
-lib/wine/libmidimap.drv.so
-lib/wine/libmmsystem.so
-lib/wine/libmouse.so
-lib/wine/libmpr.so
-lib/wine/libmsacm.drv.so
-lib/wine/libmsacm.so
-lib/wine/libmsacm32.so
-lib/wine/libmsdmo.so
-lib/wine/libmsimg32.so
-lib/wine/libmsnet32.so
-lib/wine/libmsrle32.so
-lib/wine/libmsvcrt.so
-lib/wine/libmsvcrt20.so
-lib/wine/libmsvfw32.so
-lib/wine/libmsvideo.so
-lib/wine/libnetapi32.so
-lib/wine/libntdll.so
-lib/wine/libodbc32.so
-lib/wine/libole2.so
-lib/wine/libole2conv.so
-lib/wine/libole2disp.so
-lib/wine/libole2nls.so
-lib/wine/libole2prox.so
-lib/wine/libole2thk.so
-lib/wine/libole32.so
-lib/wine/liboleaut32.so
-lib/wine/libolecli.so
-lib/wine/libolecli32.so
-lib/wine/liboledlg.so
-lib/wine/libolepro32.so
-lib/wine/libolesvr.so
-lib/wine/libolesvr32.so
-lib/wine/libpsapi.so
-lib/wine/libqcap.so
-lib/wine/libquartz.so
-lib/wine/librasapi16.so
-lib/wine/librasapi32.so
-lib/wine/libriched32.so
-lib/wine/librpcrt4.so
-lib/wine/libserialui.so
-lib/wine/libsetupapi.so
-lib/wine/libsetupx.so
-lib/wine/libshdocvw.so
-lib/wine/libshell.so
-lib/wine/libshell32.so
-lib/wine/libshfolder.so
-lib/wine/libshlwapi.so
-lib/wine/libsound.so
-lib/wine/libsti.so
-lib/wine/libstorage.so
-lib/wine/libstress.so
-lib/wine/libsystem.so
-lib/wine/libtapi32.so
-lib/wine/libtoolhelp.so
-lib/wine/libttydrv.so
-lib/wine/libtypelib.so
-lib/wine/liburl.so
-lib/wine/liburlmon.so
-lib/wine/libuser.so
-lib/wine/libuser32.so
-lib/wine/libver.so
-lib/wine/libversion.so
-lib/wine/libw32skrnl.so
-lib/wine/libw32sys.so
-lib/wine/libwin32s16.so
-lib/wine/libwin87em.so
-lib/wine/libwinaspi.so
-lib/wine/libwindebug.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/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/libgdi32.dll.so
+lib/wine/libkernel32.dll.so
+lib/wine/libntdll.dll.so
+lib/wine/libuser32.dll.so
 lib/wine/libwine.so
 lib/wine/libwine.so.1
 lib/wine/libwine_tsx11.so
@@ -327,24 +263,106 @@ lib/wine/libwine_tsx11.so.1
 lib/wine/libwine_unicode.so
 lib/wine/libwine_unicode.so.1
 lib/wine/libwine_uuid.a
-lib/wine/libwinedos.so
-lib/wine/libwineoss.drv.so
-lib/wine/libwineps.so
-lib/wine/libwineps16.so
-lib/wine/libwing.so
-lib/wine/libwininet.so
-lib/wine/libwinmm.so
-lib/wine/libwinnls.so
-lib/wine/libwinnls32.so
-lib/wine/libwinsock.so
 lib/wine/libwinspool.drv.so
-lib/wine/libwintrust.so
-lib/wine/libwnaspi32.so
-lib/wine/libwow32.so
-lib/wine/libwprocs.so
-lib/wine/libws2_32.so
-lib/wine/libwsock32.so
-lib/wine/libx11drv.so
+lib/wine/libx11drv.dll.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.drv.so
+lib/wine/msacm.dll.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/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
 lib/wine/reg/regFixer.pl
 lib/wine/reg/regRestorer.pl
 lib/wine/winedefault.reg