Update to the 20050830 version of Wine.

Temporarily disable building wldap32 due to a build problem introduced
directly before the release.  Reenable winetest which we had to disable
for similar reasons back in late 2003.

10 files changed, 102 insertions, 114 deletions

diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index 056012e69205..2c93c400243d 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	wine
-PORTVERSION=	20050725
+PORTVERSION=	20050830
 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 2d2431d16a59..fa91b3b03f96 100644
--- a/emulators/wine-devel/distinfo
+++ b/emulators/wine-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (Wine-20050725.tar.gz) = 491924c85428c940c8f845d8d78001f9
-SIZE (Wine-20050725.tar.gz) = 12205994
+MD5 (Wine-20050830.tar.gz) = 5d95439a74decd1f94dd8d370a24f442
+SIZE (Wine-20050830.tar.gz) = 12433457
diff --git a/emulators/wine-devel/files/patch-dlls-Makefile.in b/emulators/wine-devel/files/patch-dlls-Makefile.in
new file mode 100644
index 000000000000..225689d6668e
--- /dev/null
+++ b/emulators/wine-devel/files/patch-dlls-Makefile.in
@@ -0,0 +1,26 @@
+--- dlls/Makefile.in.orig	Fri Aug 26 14:05:12 2005
++++ dlls/Makefile.in	Tue Aug 30 23:16:02 2005
+@@ -172,7 +172,6 @@ BASEDIRS = \
+ 	winspool \
+ 	wintab32 \
+ 	wintrust \
+-	wldap32 \
+ 	wow32 \
+ 	wsock32 \
+ 	wtsapi32
+@@ -420,7 +419,6 @@ SYMLINKS_SO = \
+ 	winspool.drv.so \
+ 	wintab32.dll.so \
+ 	wintrust.dll.so \
+-	wldap32.dll.so \
+ 	wnaspi32.dll.so \
+ 	wow32.dll.so \
+ 	ws2_32.dll.so \
+@@ -1189,7 +1187,6 @@ IMPORT_LIBS = \
+ 	winspool/libwinspool.$(IMPLIBEXT) \
+ 	wintab32/libwintab32.$(IMPLIBEXT) \
+ 	wintrust/libwintrust.$(IMPLIBEXT) \
+-	wldap32/libwldap32.$(IMPLIBEXT) \
+ 	winaspi/libwnaspi32.$(IMPLIBEXT) \
+ 	wow32/libwow32.$(IMPLIBEXT) \
+ 	winsock/libws2_32.$(IMPLIBEXT) \
diff --git a/emulators/wine-devel/files/patch-program::Makefile.in b/emulators/wine-devel/files/patch-program::Makefile.in
deleted file mode 100644
index 2ba5e0de2ca2..000000000000
--- a/emulators/wine-devel/files/patch-program::Makefile.in
+++ /dev/null
@@ -1,26 +0,0 @@
---- programs/Makefile.in.orig	Sun Dec 14 01:20:59 2003
-+++ programs/Makefile.in	Sun Dec 14 01:21:45 2003
-@@ -29,7 +29,6 @@ SUBDIRS = \
- 	winemenubuilder \
- 	winemine \
- 	winepath \
--	winetest \
- 	winevdm \
- 	winhelp \
- 	winver
-@@ -57,7 +56,6 @@ INSTALLSUBDIRS = \
- 	winemenubuilder \
- 	winemine \
- 	winepath \
--	winetest \
- 	winevdm \
- 	winhelp \
- 	winver
-@@ -106,7 +104,6 @@ SYMLINKS = \
- 	winemenubuilder.exe$(DLLEXT) \
- 	winemine.exe$(DLLEXT) \
- 	winepath.exe$(DLLEXT) \
--	winetest.exe$(DLLEXT) \
- 	winevdm.exe$(DLLEXT) \
- 	winhelp.exe$(DLLEXT) \
- 	winver.exe$(DLLEXT)
diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist
index 54ea64e849c1..f589ce1be0dd 100644
--- a/emulators/wine-devel/pkg-plist
+++ b/emulators/wine-devel/pkg-plist
@@ -32,6 +32,8 @@ bin/wrc
 etc/rc.d/000.wine.sh
 include/wine/debug.h
 include/wine/exception.h
+include/wine/itss.h
+include/wine/itss.idl
 include/wine/library.h
 include/wine/unicode.h
 include/wine/msvcrt/conio.h
@@ -171,6 +173,8 @@ include/wine/windows/exdispid.h
 include/wine/windows/fci.h
 include/wine/windows/fdi.h
 include/wine/windows/guiddef.h
+include/wine/windows/hlink.h
+include/wine/windows/hlink.idl
 include/wine/windows/htmlhelp.h
 include/wine/windows/icm.h
 include/wine/windows/icmpapi.h
@@ -254,6 +258,7 @@ include/wine/windows/oaidl.idl
 include/wine/windows/objbase.h
 include/wine/windows/objidl.h
 include/wine/windows/objidl.idl
+include/wine/windows/objsel.h
 include/wine/windows/ocidl.h
 include/wine/windows/ocidl.idl
 include/wine/windows/odbcinst.h
@@ -380,6 +385,7 @@ include/wine/windows/xmldso.h
 include/wine/windows/xmldso.idl
 include/wine/windows/xmldsodid.h
 include/wine/windows/zmouse.h
+include/wine/windows/ddk/winsplp.h
 lib/libwine.so
 lib/libwine.so.1
 lib/libwine_unicode.so
@@ -468,7 +474,6 @@ lib/wine/krnl386.exe.so
 lib/wine/libactiveds.def
 lib/wine/libadvapi32.def
 lib/wine/libadvpack.def
-lib/wine/libamstream.def
 lib/wine/libatl.def
 lib/wine/libavicap32.def
 lib/wine/libavifil32.def
@@ -476,7 +481,6 @@ lib/wine/libcabinet.def
 lib/wine/libcapi2032.def
 lib/wine/libcards.def
 lib/wine/libcfgmgr32.def
-lib/wine/libcomcat.def
 lib/wine/libcomctl32.def
 lib/wine/libcomdlg32.def
 lib/wine/libcrtdll.def
@@ -492,35 +496,24 @@ lib/wine/libd3dxof.def
 lib/wine/libdbghelp.def
 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
-lib/wine/libdmime.def
-lib/wine/libdmloader.def
-lib/wine/libdmscript.def
-lib/wine/libdmstyle.def
-lib/wine/libdmsynth.def
-lib/wine/libdmusic.def
 lib/wine/libdmusic32.def
 lib/wine/libdpnet.def
-lib/wine/libdpnhpast.def
 lib/wine/libglut32.def
 lib/wine/libdplay.def
 lib/wine/libdplayx.def
 lib/wine/libdsound.def
-lib/wine/libdswave.def
-lib/wine/libdxdiagn.def
+lib/wine/libdxerr8.a
+lib/wine/libdxerr9.a
+lib/wine/libdxguid.a
 lib/wine/libgdi32.def
 lib/wine/libglu32.def
-lib/wine/libiccvid.def
 lib/wine/libicmp.def
 lib/wine/libimagehlp.def
 lib/wine/libimm32.def
 lib/wine/libiphlpapi.def
-lib/wine/libitss.def
 lib/wine/libkernel32.def
 lib/wine/liblz32.def
 lib/wine/libmapi32.def
@@ -532,14 +525,11 @@ lib/wine/libmsdmo.def
 lib/wine/libmshtml.def
 lib/wine/libmsi.def
 lib/wine/libmsimg32.def
-lib/wine/libmsnet32.def
-lib/wine/libmsrle32.def
 lib/wine/libmsvcrt.def
 lib/wine/libmsvcrt20.def
 lib/wine/libmsvcrt40.def
 lib/wine/libmsvcrtd.def
 lib/wine/libmsvfw32.def
-lib/wine/libmsvidc32.def
 lib/wine/libmswsock.def
 lib/wine/libnetapi32.def
 lib/wine/libnewdev.def
@@ -556,12 +546,10 @@ lib/wine/libolesvr32.def
 lib/wine/libopengl32.def
 lib/wine/libpowrprof.def
 lib/wine/libpsapi.def
-lib/wine/libqcap.def
 lib/wine/libquartz.def
 lib/wine/librasapi32.def
 lib/wine/librsaenh.def
 lib/wine/libriched20.def
-lib/wine/libriched32.def
 lib/wine/librpcrt4.def
 lib/wine/librsabase.def
 lib/wine/libsecur32.def
@@ -574,16 +562,19 @@ 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/libtwain_32.def
 lib/wine/libunicows.def
 lib/wine/liburl.def
 lib/wine/liburlmon.def
 lib/wine/libuser32.def
+lib/wine/libusp10.def
+lib/wine/libuuid.a
 lib/wine/libuxtheme.def
 lib/wine/libvdmdbg.def
 lib/wine/libversion.def
 lib/wine/libw32skrnl.def
+lib/wine/libwinecrt0.a
 lib/wine/libwined3d.def
 lib/wine/libwinedos.def
 lib/wine/libwininet.def
@@ -592,7 +583,6 @@ lib/wine/libwinnls32.def
 lib/wine/libwinspool.def
 lib/wine/libwintab32.def
 lib/wine/libwintrust.def
-lib/wine/libwldap32.def
 lib/wine/libwnaspi32.def
 lib/wine/libwow32.def
 lib/wine/libws2_32.def
@@ -601,10 +591,9 @@ lib/wine/libwtsapi32.def
 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/mciavi32.dll.so
+lib/wine/mcicda.dll.so
+lib/wine/mciseq.dll.so
 lib/wine/mciwave.drv.so
 lib/wine/midimap.dll.so
 lib/wine/mlang.dll.so
@@ -635,10 +624,12 @@ lib/wine/msvfw32.dll.so
 lib/wine/msvidc32.dll.so
 lib/wine/msvideo.dll.so
 lib/wine/mswsock.dll.so
+lib/wine/msxml3.dll.so
 lib/wine/netapi32.dll.so
 lib/wine/newdev.dll.so
 lib/wine/notepad.exe.so
 lib/wine/ntdll.dll.so
+lib/wine/objsel.dll.so
 lib/wine/odbc32.dll.so
 lib/wine/odbccp32.dll.so
 lib/wine/ole2.dll.so
@@ -704,6 +695,7 @@ lib/wine/url.dll.so
 lib/wine/urlmon.dll.so
 lib/wine/user.exe.so
 lib/wine/user32.dll.so
+lib/wine/usp10.dll.so
 lib/wine/uxtheme.dll.so
 lib/wine/vdhcp.vxd.so
 lib/wine/vdmdbg.dll.so
@@ -731,6 +723,7 @@ lib/wine/wineconsole.exe.so
 lib/wine/wined3d.dll.so
 lib/wine/winedbg.exe.so
 lib/wine/winedos.dll.so
+lib/wine/wineesd.drv.so
 lib/wine/winefile.exe.so
 lib/wine/winejack.drv.so
 lib/wine/winemine.exe.so
@@ -741,6 +734,7 @@ lib/wine/winenas.drv.so
 lib/wine/winepath.exe.so
 lib/wine/wineps.drv.so
 lib/wine/wineps16.drv.so
+lib/wine/winetest.exe.so
 lib/wine/winetty.drv.so
 lib/wine/winevdm.exe.so
 lib/wine/winex11.drv.so
@@ -756,7 +750,6 @@ lib/wine/wintab.dll.so
 lib/wine/wintab32.dll.so
 lib/wine/wintrust.dll.so
 lib/wine/winver.exe.so
-lib/wine/wldap32.dll.so
 lib/wine/wnaspi32.dll.so
 lib/wine/wow32.dll.so
 lib/wine/wprocs.dll.so
@@ -778,6 +771,7 @@ share/wine/generic.ppd
 @dirrm lib/wine
 @dirrm include/wine/msvcrt/sys
 @dirrm include/wine/msvcrt
+@dirrm include/wine/windows/ddk
 @dirrm include/wine/windows
 @dirrm include/wine
 @unexec rmdir %D/man/man3w 2>/dev/null || true
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 056012e69205..2c93c400243d 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	wine
-PORTVERSION=	20050725
+PORTVERSION=	20050830
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	ALPHA/wine/development
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo
index 2d2431d16a59..fa91b3b03f96 100644
--- a/emulators/wine/distinfo
+++ b/emulators/wine/distinfo
@@ -1,2 +1,2 @@
-MD5 (Wine-20050725.tar.gz) = 491924c85428c940c8f845d8d78001f9
-SIZE (Wine-20050725.tar.gz) = 12205994
+MD5 (Wine-20050830.tar.gz) = 5d95439a74decd1f94dd8d370a24f442
+SIZE (Wine-20050830.tar.gz) = 12433457
diff --git a/emulators/wine/files/patch-dlls-Makefile.in b/emulators/wine/files/patch-dlls-Makefile.in
new file mode 100644
index 000000000000..225689d6668e
--- /dev/null
+++ b/emulators/wine/files/patch-dlls-Makefile.in
@@ -0,0 +1,26 @@
+--- dlls/Makefile.in.orig	Fri Aug 26 14:05:12 2005
++++ dlls/Makefile.in	Tue Aug 30 23:16:02 2005
+@@ -172,7 +172,6 @@ BASEDIRS = \
+ 	winspool \
+ 	wintab32 \
+ 	wintrust \
+-	wldap32 \
+ 	wow32 \
+ 	wsock32 \
+ 	wtsapi32
+@@ -420,7 +419,6 @@ SYMLINKS_SO = \
+ 	winspool.drv.so \
+ 	wintab32.dll.so \
+ 	wintrust.dll.so \
+-	wldap32.dll.so \
+ 	wnaspi32.dll.so \
+ 	wow32.dll.so \
+ 	ws2_32.dll.so \
+@@ -1189,7 +1187,6 @@ IMPORT_LIBS = \
+ 	winspool/libwinspool.$(IMPLIBEXT) \
+ 	wintab32/libwintab32.$(IMPLIBEXT) \
+ 	wintrust/libwintrust.$(IMPLIBEXT) \
+-	wldap32/libwldap32.$(IMPLIBEXT) \
+ 	winaspi/libwnaspi32.$(IMPLIBEXT) \
+ 	wow32/libwow32.$(IMPLIBEXT) \
+ 	winsock/libws2_32.$(IMPLIBEXT) \
diff --git a/emulators/wine/files/patch-program::Makefile.in b/emulators/wine/files/patch-program::Makefile.in
deleted file mode 100644
index 2ba5e0de2ca2..000000000000
--- a/emulators/wine/files/patch-program::Makefile.in
+++ /dev/null
@@ -1,26 +0,0 @@
---- programs/Makefile.in.orig	Sun Dec 14 01:20:59 2003
-+++ programs/Makefile.in	Sun Dec 14 01:21:45 2003
-@@ -29,7 +29,6 @@ SUBDIRS = \
- 	winemenubuilder \
- 	winemine \
- 	winepath \
--	winetest \
- 	winevdm \
- 	winhelp \
- 	winver
-@@ -57,7 +56,6 @@ INSTALLSUBDIRS = \
- 	winemenubuilder \
- 	winemine \
- 	winepath \
--	winetest \
- 	winevdm \
- 	winhelp \
- 	winver
-@@ -106,7 +104,6 @@ SYMLINKS = \
- 	winemenubuilder.exe$(DLLEXT) \
- 	winemine.exe$(DLLEXT) \
- 	winepath.exe$(DLLEXT) \
--	winetest.exe$(DLLEXT) \
- 	winevdm.exe$(DLLEXT) \
- 	winhelp.exe$(DLLEXT) \
- 	winver.exe$(DLLEXT)
diff --git a/emulators/wine/pkg-plist b/emulators/wine/pkg-plist
index 54ea64e849c1..f589ce1be0dd 100644
--- a/emulators/wine/pkg-plist
+++ b/emulators/wine/pkg-plist
@@ -32,6 +32,8 @@ bin/wrc
 etc/rc.d/000.wine.sh
 include/wine/debug.h
 include/wine/exception.h
+include/wine/itss.h
+include/wine/itss.idl
 include/wine/library.h
 include/wine/unicode.h
 include/wine/msvcrt/conio.h
@@ -171,6 +173,8 @@ include/wine/windows/exdispid.h
 include/wine/windows/fci.h
 include/wine/windows/fdi.h
 include/wine/windows/guiddef.h
+include/wine/windows/hlink.h
+include/wine/windows/hlink.idl
 include/wine/windows/htmlhelp.h
 include/wine/windows/icm.h
 include/wine/windows/icmpapi.h
@@ -254,6 +258,7 @@ include/wine/windows/oaidl.idl
 include/wine/windows/objbase.h
 include/wine/windows/objidl.h
 include/wine/windows/objidl.idl
+include/wine/windows/objsel.h
 include/wine/windows/ocidl.h
 include/wine/windows/ocidl.idl
 include/wine/windows/odbcinst.h
@@ -380,6 +385,7 @@ include/wine/windows/xmldso.h
 include/wine/windows/xmldso.idl
 include/wine/windows/xmldsodid.h
 include/wine/windows/zmouse.h
+include/wine/windows/ddk/winsplp.h
 lib/libwine.so
 lib/libwine.so.1
 lib/libwine_unicode.so
@@ -468,7 +474,6 @@ lib/wine/krnl386.exe.so
 lib/wine/libactiveds.def
 lib/wine/libadvapi32.def
 lib/wine/libadvpack.def
-lib/wine/libamstream.def
 lib/wine/libatl.def
 lib/wine/libavicap32.def
 lib/wine/libavifil32.def
@@ -476,7 +481,6 @@ lib/wine/libcabinet.def
 lib/wine/libcapi2032.def
 lib/wine/libcards.def
 lib/wine/libcfgmgr32.def
-lib/wine/libcomcat.def
 lib/wine/libcomctl32.def
 lib/wine/libcomdlg32.def
 lib/wine/libcrtdll.def
@@ -492,35 +496,24 @@ lib/wine/libd3dxof.def
 lib/wine/libdbghelp.def
 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
-lib/wine/libdmime.def
-lib/wine/libdmloader.def
-lib/wine/libdmscript.def
-lib/wine/libdmstyle.def
-lib/wine/libdmsynth.def
-lib/wine/libdmusic.def
 lib/wine/libdmusic32.def
 lib/wine/libdpnet.def
-lib/wine/libdpnhpast.def
 lib/wine/libglut32.def
 lib/wine/libdplay.def
 lib/wine/libdplayx.def
 lib/wine/libdsound.def
-lib/wine/libdswave.def
-lib/wine/libdxdiagn.def
+lib/wine/libdxerr8.a
+lib/wine/libdxerr9.a
+lib/wine/libdxguid.a
 lib/wine/libgdi32.def
 lib/wine/libglu32.def
-lib/wine/libiccvid.def
 lib/wine/libicmp.def
 lib/wine/libimagehlp.def
 lib/wine/libimm32.def
 lib/wine/libiphlpapi.def
-lib/wine/libitss.def
 lib/wine/libkernel32.def
 lib/wine/liblz32.def
 lib/wine/libmapi32.def
@@ -532,14 +525,11 @@ lib/wine/libmsdmo.def
 lib/wine/libmshtml.def
 lib/wine/libmsi.def
 lib/wine/libmsimg32.def
-lib/wine/libmsnet32.def
-lib/wine/libmsrle32.def
 lib/wine/libmsvcrt.def
 lib/wine/libmsvcrt20.def
 lib/wine/libmsvcrt40.def
 lib/wine/libmsvcrtd.def
 lib/wine/libmsvfw32.def
-lib/wine/libmsvidc32.def
 lib/wine/libmswsock.def
 lib/wine/libnetapi32.def
 lib/wine/libnewdev.def
@@ -556,12 +546,10 @@ lib/wine/libolesvr32.def
 lib/wine/libopengl32.def
 lib/wine/libpowrprof.def
 lib/wine/libpsapi.def
-lib/wine/libqcap.def
 lib/wine/libquartz.def
 lib/wine/librasapi32.def
 lib/wine/librsaenh.def
 lib/wine/libriched20.def
-lib/wine/libriched32.def
 lib/wine/librpcrt4.def
 lib/wine/librsabase.def
 lib/wine/libsecur32.def
@@ -574,16 +562,19 @@ 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/libtwain_32.def
 lib/wine/libunicows.def
 lib/wine/liburl.def
 lib/wine/liburlmon.def
 lib/wine/libuser32.def
+lib/wine/libusp10.def
+lib/wine/libuuid.a
 lib/wine/libuxtheme.def
 lib/wine/libvdmdbg.def
 lib/wine/libversion.def
 lib/wine/libw32skrnl.def
+lib/wine/libwinecrt0.a
 lib/wine/libwined3d.def
 lib/wine/libwinedos.def
 lib/wine/libwininet.def
@@ -592,7 +583,6 @@ lib/wine/libwinnls32.def
 lib/wine/libwinspool.def
 lib/wine/libwintab32.def
 lib/wine/libwintrust.def
-lib/wine/libwldap32.def
 lib/wine/libwnaspi32.def
 lib/wine/libwow32.def
 lib/wine/libws2_32.def
@@ -601,10 +591,9 @@ lib/wine/libwtsapi32.def
 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/mciavi32.dll.so
+lib/wine/mcicda.dll.so
+lib/wine/mciseq.dll.so
 lib/wine/mciwave.drv.so
 lib/wine/midimap.dll.so
 lib/wine/mlang.dll.so
@@ -635,10 +624,12 @@ lib/wine/msvfw32.dll.so
 lib/wine/msvidc32.dll.so
 lib/wine/msvideo.dll.so
 lib/wine/mswsock.dll.so
+lib/wine/msxml3.dll.so
 lib/wine/netapi32.dll.so
 lib/wine/newdev.dll.so
 lib/wine/notepad.exe.so
 lib/wine/ntdll.dll.so
+lib/wine/objsel.dll.so
 lib/wine/odbc32.dll.so
 lib/wine/odbccp32.dll.so
 lib/wine/ole2.dll.so
@@ -704,6 +695,7 @@ lib/wine/url.dll.so
 lib/wine/urlmon.dll.so
 lib/wine/user.exe.so
 lib/wine/user32.dll.so
+lib/wine/usp10.dll.so
 lib/wine/uxtheme.dll.so
 lib/wine/vdhcp.vxd.so
 lib/wine/vdmdbg.dll.so
@@ -731,6 +723,7 @@ lib/wine/wineconsole.exe.so
 lib/wine/wined3d.dll.so
 lib/wine/winedbg.exe.so
 lib/wine/winedos.dll.so
+lib/wine/wineesd.drv.so
 lib/wine/winefile.exe.so
 lib/wine/winejack.drv.so
 lib/wine/winemine.exe.so
@@ -741,6 +734,7 @@ lib/wine/winenas.drv.so
 lib/wine/winepath.exe.so
 lib/wine/wineps.drv.so
 lib/wine/wineps16.drv.so
+lib/wine/winetest.exe.so
 lib/wine/winetty.drv.so
 lib/wine/winevdm.exe.so
 lib/wine/winex11.drv.so
@@ -756,7 +750,6 @@ lib/wine/wintab.dll.so
 lib/wine/wintab32.dll.so
 lib/wine/wintrust.dll.so
 lib/wine/winver.exe.so
-lib/wine/wldap32.dll.so
 lib/wine/wnaspi32.dll.so
 lib/wine/wow32.dll.so
 lib/wine/wprocs.dll.so
@@ -778,6 +771,7 @@ share/wine/generic.ppd
 @dirrm lib/wine
 @dirrm include/wine/msvcrt/sys
 @dirrm include/wine/msvcrt
+@dirrm include/wine/windows/ddk
 @dirrm include/wine/windows
 @dirrm include/wine
 @unexec rmdir %D/man/man3w 2>/dev/null || true