Update to the 20050524 snapshot of Wine.

6 files changed, 44 insertions, 30 deletions

diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index fc6d1000c563..d7e9ab09fd69 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	wine
-PORTVERSION=	20050419
+PORTVERSION=	20050524
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	ALPHA/wine/development
diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo
index c734d2d60158..c88b94fd6889 100644
--- a/emulators/wine-devel/distinfo
+++ b/emulators/wine-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (Wine-20050419.tar.gz) = f43ad76846f792f9598fca2428d23e60
-SIZE (Wine-20050419.tar.gz) = 11936962
+MD5 (Wine-20050524.tar.gz) = e0a3e2d52f1e2d80b8bf232b58161fe5
+SIZE (Wine-20050524.tar.gz) = 11844661
diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist
index c4e393fc2752..a0b9053f0595 100644
--- a/emulators/wine-devel/pkg-plist
+++ b/emulators/wine-devel/pkg-plist
@@ -1,4 +1,5 @@
 bin/function_grep.pl
+bin/msiexec
 bin/notepad
 bin/progman
 bin/regedit
@@ -56,6 +57,7 @@ include/wine/msvcrt/process.h
 include/wine/msvcrt/search.h
 include/wine/msvcrt/setjmp.h
 include/wine/msvcrt/share.h
+include/wine/msvcrt/signal.h
 include/wine/msvcrt/stddef.h
 include/wine/msvcrt/stdio.h
 include/wine/msvcrt/stdlib.h
@@ -114,6 +116,8 @@ include/wine/windows/d3dvec.inl
 include/wine/windows/d3dx8core.h
 include/wine/windows/dbghelp.h
 include/wine/windows/dbt.h
+include/wine/windows/dciddi.h
+include/wine/windows/dciman.h
 include/wine/windows/dde.h
 include/wine/windows/ddeml.h
 include/wine/windows/ddraw.h
@@ -157,6 +161,7 @@ include/wine/windows/dxerr9.h
 include/wine/windows/dxfile.h
 include/wine/windows/dyngraph.idl
 include/wine/windows/evcode.h
+include/wine/windows/evntrace.h
 include/wine/windows/excpt.h
 include/wine/windows/exdisp.h
 include/wine/windows/exdisp.idl
@@ -225,6 +230,9 @@ include/wine/windows/msidefs.h
 include/wine/windows/msiquery.h
 include/wine/windows/mssip.h
 include/wine/windows/mswsock.h
+include/wine/windows/msxml.h
+include/wine/windows/msxml.idl
+include/wine/windows/msxmldid.h
 include/wine/windows/nb30.h
 include/wine/windows/npapi.h
 include/wine/windows/nspapi.h
@@ -273,6 +281,8 @@ include/wine/windows/rpcdcep.h
 include/wine/windows/rpcndr.h
 include/wine/windows/rpcnterr.h
 include/wine/windows/rpcproxy.h
+include/wine/windows/schannel.h
+include/wine/windows/schnlsp.h
 include/wine/windows/schemadef.h
 include/wine/windows/sddl.h
 include/wine/windows/secext.h
@@ -340,6 +350,7 @@ include/wine/windows/winternl.h
 include/wine/windows/wintrust.h
 include/wine/windows/winuser.h
 include/wine/windows/winver.h
+include/wine/windows/wmistr.h
 include/wine/windows/wnaspi32.h
 include/wine/windows/wownt32.h
 include/wine/windows/ws2spi.h
@@ -463,6 +474,7 @@ lib/wine/libdciman32.def
 lib/wine/libddraw.def
 lib/wine/libdevenum.def
 lib/wine/libdinput.def
+lib/wine/libdinput.def.a
 lib/wine/libdinput8.def
 lib/wine/libdmband.def
 lib/wine/libdmcompos.def
@@ -475,9 +487,6 @@ lib/wine/libdmusic.def
 lib/wine/libdmusic32.def
 lib/wine/libdpnet.def
 lib/wine/libdpnhpast.def
-lib/wine/libdxerr8.a
-lib/wine/libdxerr9.a
-lib/wine/libdxguid.a
 lib/wine/libglut32.def
 lib/wine/libdplay.def
 lib/wine/libdplayx.def
@@ -516,6 +525,7 @@ lib/wine/libnetapi32.def
 lib/wine/libnewdev.def
 lib/wine/libntdll.def
 lib/wine/libodbc32.def
+lib/wine/libodbccp32.def
 lib/wine/libole32.def
 lib/wine/liboleacc.def
 lib/wine/liboleaut32.def
@@ -524,6 +534,7 @@ lib/wine/liboledlg.def
 lib/wine/libolepro32.def
 lib/wine/libolesvr32.def
 lib/wine/libopengl32.def
+lib/wine/libpowrprof.def
 lib/wine/libpsapi.def
 lib/wine/libqcap.def
 lib/wine/libquartz.def
@@ -543,22 +554,18 @@ lib/wine/libshfolder.def
 lib/wine/libshlwapi.def
 lib/wine/libsnmpapi.def
 lib/wine/libsti.def
-lib/wine/libstrmiids.a
 lib/wine/libtapi32.def
-lib/wine/libttydrv.def
 lib/wine/libtwain_32.def
 lib/wine/libunicows.def
 lib/wine/liburl.def
 lib/wine/liburlmon.def
 lib/wine/libuser32.def
-lib/wine/libuuid.a
 lib/wine/libuxtheme.def
 lib/wine/libvdmdbg.def
 lib/wine/libversion.def
 lib/wine/libw32skrnl.def
 lib/wine/libwined3d.def
 lib/wine/libwinedos.def
-lib/wine/libwineps.def
 lib/wine/libwininet.def
 lib/wine/libwinmm.def
 lib/wine/libwinnls32.def
@@ -570,7 +577,6 @@ lib/wine/libwow32.def
 lib/wine/libws2_32.def
 lib/wine/libwsock32.def
 lib/wine/libwtsapi32.def
-lib/wine/libx11drv.def
 lib/wine/lz32.dll.so
 lib/wine/lzexpand.dll.so
 lib/wine/mapi32.dll.so
@@ -613,6 +619,7 @@ lib/wine/newdev.dll.so
 lib/wine/notepad.exe.so
 lib/wine/ntdll.dll.so
 lib/wine/odbc32.dll.so
+lib/wine/odbccp32.dll.so
 lib/wine/ole2.dll.so
 lib/wine/ole2conv.dll.so
 lib/wine/ole2disp.dll.so
@@ -629,6 +636,7 @@ lib/wine/olepro32.dll.so
 lib/wine/olesvr.dll.so
 lib/wine/olesvr32.dll.so
 lib/wine/opengl32.dll.so
+lib/wine/powrprof.dll.so
 lib/wine/progman.exe.so
 lib/wine/psapi.dll.so
 lib/wine/qcap.dll.so
@@ -665,7 +673,6 @@ lib/wine/system.drv.so
 lib/wine/tapi32.dll.so
 lib/wine/taskmgr.exe.so
 lib/wine/toolhelp.dll.so
-lib/wine/ttydrv.dll.so
 lib/wine/twain.dll.so
 lib/wine/twain_32.dll.so
 lib/wine/typelib.dll.so
@@ -710,9 +717,11 @@ lib/wine/wineoss.drv.so
 lib/wine/winemenubuilder.exe.so
 lib/wine/winenas.drv.so
 lib/wine/winepath.exe.so
-lib/wine/wineps.dll.so
+lib/wine/wineps.drv.so
 lib/wine/wineps16.drv.so
+lib/wine/winetty.drv.so
 lib/wine/winevdm.exe.so
+lib/wine/winex11.drv.so
 lib/wine/wing.dll.so
 lib/wine/winhelp.exe.so
 lib/wine/wininet.dll.so
@@ -731,10 +740,8 @@ lib/wine/wprocs.dll.so
 lib/wine/ws2_32.dll.so
 lib/wine/wsock32.dll.so
 lib/wine/wtsapi32.dll.so
-lib/wine/x11drv.dll.so
 share/aclocal/wine.m4
 share/applications/wine.desktop
-share/wine/generic.ppd
 share/wine/wine.inf
 %%PORTDOCS%%%%DOCSDIR%%/ANNOUNCE
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index fc6d1000c563..d7e9ab09fd69 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	wine
-PORTVERSION=	20050419
+PORTVERSION=	20050524
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	ALPHA/wine/development
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo
index c734d2d60158..c88b94fd6889 100644
--- a/emulators/wine/distinfo
+++ b/emulators/wine/distinfo
@@ -1,2 +1,2 @@
-MD5 (Wine-20050419.tar.gz) = f43ad76846f792f9598fca2428d23e60
-SIZE (Wine-20050419.tar.gz) = 11936962
+MD5 (Wine-20050524.tar.gz) = e0a3e2d52f1e2d80b8bf232b58161fe5
+SIZE (Wine-20050524.tar.gz) = 11844661
diff --git a/emulators/wine/pkg-plist b/emulators/wine/pkg-plist
index c4e393fc2752..a0b9053f0595 100644
--- a/emulators/wine/pkg-plist
+++ b/emulators/wine/pkg-plist
@@ -1,4 +1,5 @@
 bin/function_grep.pl
+bin/msiexec
 bin/notepad
 bin/progman
 bin/regedit
@@ -56,6 +57,7 @@ include/wine/msvcrt/process.h
 include/wine/msvcrt/search.h
 include/wine/msvcrt/setjmp.h
 include/wine/msvcrt/share.h
+include/wine/msvcrt/signal.h
 include/wine/msvcrt/stddef.h
 include/wine/msvcrt/stdio.h
 include/wine/msvcrt/stdlib.h
@@ -114,6 +116,8 @@ include/wine/windows/d3dvec.inl
 include/wine/windows/d3dx8core.h
 include/wine/windows/dbghelp.h
 include/wine/windows/dbt.h
+include/wine/windows/dciddi.h
+include/wine/windows/dciman.h
 include/wine/windows/dde.h
 include/wine/windows/ddeml.h
 include/wine/windows/ddraw.h
@@ -157,6 +161,7 @@ include/wine/windows/dxerr9.h
 include/wine/windows/dxfile.h
 include/wine/windows/dyngraph.idl
 include/wine/windows/evcode.h
+include/wine/windows/evntrace.h
 include/wine/windows/excpt.h
 include/wine/windows/exdisp.h
 include/wine/windows/exdisp.idl
@@ -225,6 +230,9 @@ include/wine/windows/msidefs.h
 include/wine/windows/msiquery.h
 include/wine/windows/mssip.h
 include/wine/windows/mswsock.h
+include/wine/windows/msxml.h
+include/wine/windows/msxml.idl
+include/wine/windows/msxmldid.h
 include/wine/windows/nb30.h
 include/wine/windows/npapi.h
 include/wine/windows/nspapi.h
@@ -273,6 +281,8 @@ include/wine/windows/rpcdcep.h
 include/wine/windows/rpcndr.h
 include/wine/windows/rpcnterr.h
 include/wine/windows/rpcproxy.h
+include/wine/windows/schannel.h
+include/wine/windows/schnlsp.h
 include/wine/windows/schemadef.h
 include/wine/windows/sddl.h
 include/wine/windows/secext.h
@@ -340,6 +350,7 @@ include/wine/windows/winternl.h
 include/wine/windows/wintrust.h
 include/wine/windows/winuser.h
 include/wine/windows/winver.h
+include/wine/windows/wmistr.h
 include/wine/windows/wnaspi32.h
 include/wine/windows/wownt32.h
 include/wine/windows/ws2spi.h
@@ -463,6 +474,7 @@ lib/wine/libdciman32.def
 lib/wine/libddraw.def
 lib/wine/libdevenum.def
 lib/wine/libdinput.def
+lib/wine/libdinput.def.a
 lib/wine/libdinput8.def
 lib/wine/libdmband.def
 lib/wine/libdmcompos.def
@@ -475,9 +487,6 @@ lib/wine/libdmusic.def
 lib/wine/libdmusic32.def
 lib/wine/libdpnet.def
 lib/wine/libdpnhpast.def
-lib/wine/libdxerr8.a
-lib/wine/libdxerr9.a
-lib/wine/libdxguid.a
 lib/wine/libglut32.def
 lib/wine/libdplay.def
 lib/wine/libdplayx.def
@@ -516,6 +525,7 @@ lib/wine/libnetapi32.def
 lib/wine/libnewdev.def
 lib/wine/libntdll.def
 lib/wine/libodbc32.def
+lib/wine/libodbccp32.def
 lib/wine/libole32.def
 lib/wine/liboleacc.def
 lib/wine/liboleaut32.def
@@ -524,6 +534,7 @@ lib/wine/liboledlg.def
 lib/wine/libolepro32.def
 lib/wine/libolesvr32.def
 lib/wine/libopengl32.def
+lib/wine/libpowrprof.def
 lib/wine/libpsapi.def
 lib/wine/libqcap.def
 lib/wine/libquartz.def
@@ -543,22 +554,18 @@ lib/wine/libshfolder.def
 lib/wine/libshlwapi.def
 lib/wine/libsnmpapi.def
 lib/wine/libsti.def
-lib/wine/libstrmiids.a
 lib/wine/libtapi32.def
-lib/wine/libttydrv.def
 lib/wine/libtwain_32.def
 lib/wine/libunicows.def
 lib/wine/liburl.def
 lib/wine/liburlmon.def
 lib/wine/libuser32.def
-lib/wine/libuuid.a
 lib/wine/libuxtheme.def
 lib/wine/libvdmdbg.def
 lib/wine/libversion.def
 lib/wine/libw32skrnl.def
 lib/wine/libwined3d.def
 lib/wine/libwinedos.def
-lib/wine/libwineps.def
 lib/wine/libwininet.def
 lib/wine/libwinmm.def
 lib/wine/libwinnls32.def
@@ -570,7 +577,6 @@ lib/wine/libwow32.def
 lib/wine/libws2_32.def
 lib/wine/libwsock32.def
 lib/wine/libwtsapi32.def
-lib/wine/libx11drv.def
 lib/wine/lz32.dll.so
 lib/wine/lzexpand.dll.so
 lib/wine/mapi32.dll.so
@@ -613,6 +619,7 @@ lib/wine/newdev.dll.so
 lib/wine/notepad.exe.so
 lib/wine/ntdll.dll.so
 lib/wine/odbc32.dll.so
+lib/wine/odbccp32.dll.so
 lib/wine/ole2.dll.so
 lib/wine/ole2conv.dll.so
 lib/wine/ole2disp.dll.so
@@ -629,6 +636,7 @@ lib/wine/olepro32.dll.so
 lib/wine/olesvr.dll.so
 lib/wine/olesvr32.dll.so
 lib/wine/opengl32.dll.so
+lib/wine/powrprof.dll.so
 lib/wine/progman.exe.so
 lib/wine/psapi.dll.so
 lib/wine/qcap.dll.so
@@ -665,7 +673,6 @@ lib/wine/system.drv.so
 lib/wine/tapi32.dll.so
 lib/wine/taskmgr.exe.so
 lib/wine/toolhelp.dll.so
-lib/wine/ttydrv.dll.so
 lib/wine/twain.dll.so
 lib/wine/twain_32.dll.so
 lib/wine/typelib.dll.so
@@ -710,9 +717,11 @@ lib/wine/wineoss.drv.so
 lib/wine/winemenubuilder.exe.so
 lib/wine/winenas.drv.so
 lib/wine/winepath.exe.so
-lib/wine/wineps.dll.so
+lib/wine/wineps.drv.so
 lib/wine/wineps16.drv.so
+lib/wine/winetty.drv.so
 lib/wine/winevdm.exe.so
+lib/wine/winex11.drv.so
 lib/wine/wing.dll.so
 lib/wine/winhelp.exe.so
 lib/wine/wininet.dll.so
@@ -731,10 +740,8 @@ lib/wine/wprocs.dll.so
 lib/wine/ws2_32.dll.so
 lib/wine/wsock32.dll.so
 lib/wine/wtsapi32.dll.so
-lib/wine/x11drv.dll.so
 share/aclocal/wine.m4
 share/applications/wine.desktop
-share/wine/generic.ppd
 share/wine/wine.inf
 %%PORTDOCS%%%%DOCSDIR%%/ANNOUNCE
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS