Update to Wine 0.9.21. Among others, this brings the following changes:

 - OpenGL restructurations.
 - The usual assortment of MSI improvements.
 - Several Richedit fixes.
 - WCMD Winelib app renamed to CMD for compatibility.
 - Many improvements to the Wintrust DLL.
 - Some code cleanups.
 - Lots of bug fixes.

6 files changed, 18 insertions, 16 deletions

diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index 61ae556ace95..d315156fd3d3 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	wine
-PORTVERSION=	0.9.20
+PORTVERSION=	0.9.21
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED} \
@@ -60,7 +60,7 @@ post-install:
 .for i in README ANNOUNCE AUTHORS LICENSE
 	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
-.for i in progman uninstaller wcmd winedbg winemine
+.for i in progman uninstaller winedbg winemine
 	${INSTALL_DATA} ${WRKSRC}/programs/${i}/README ${DOCSDIR}/README.${i}
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/tools/winedump/README ${DOCSDIR}/README.winedump
diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo
index a79f1704aac7..bae73e834687 100644
--- a/emulators/wine-devel/distinfo
+++ b/emulators/wine-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (wine-0.9.20.tar.bz2) = 3e80a07819e4df084becdbbcd4d6cdd3
-SHA256 (wine-0.9.20.tar.bz2) = d2adcfce0ae95729f9848e614ccee6b2dbc57a46922b227f7f530907bafa1b2c
-SIZE (wine-0.9.20.tar.bz2) = 10982932
+MD5 (wine-0.9.21.tar.bz2) = 4f9528529153399034ab807478887456
+SHA256 (wine-0.9.21.tar.bz2) = 6553030e62060912a29cfddabd0f63ee0939f13bff896debbf44f08e02896718
+SIZE (wine-0.9.21.tar.bz2) = 11085800
diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist
index 2ea69c17cfaf..d1e31f4b6968 100644
--- a/emulators/wine-devel/pkg-plist
+++ b/emulators/wine-devel/pkg-plist
@@ -5,7 +5,6 @@ bin/progman
 bin/regedit
 bin/regsvr32
 bin/uninstaller
-bin/wcmd
 bin/widl
 bin/wine
 bin/wine-kthread
@@ -357,6 +356,7 @@ include/wine/windows/stdole2.tlb
 include/wine/windows/storage.h
 include/wine/windows/strmif.h
 include/wine/windows/strmif.idl
+include/wine/windows/svrapi.h
 include/wine/windows/tapi.h
 include/wine/windows/tchar.h
 include/wine/windows/textserv.h
@@ -446,6 +446,7 @@ lib/wine/capi2032.dll.so
 lib/wine/cards.dll.so
 lib/wine/cfgmgr32.dll.so
 lib/wine/clock.exe.so
+lib/wine/cmd.exe.so
 lib/wine/comcat.dll.so
 lib/wine/comctl32.dll.so
 lib/wine/comdlg32.dll.so
@@ -645,6 +646,7 @@ lib/wine/libwow32.def
 lib/wine/libws2_32.def
 lib/wine/libwsock32.def
 lib/wine/libwtsapi32.def
+lib/wine/localspl.dll.so
 lib/wine/lz32.dll.so
 lib/wine/lzexpand.dll16
 lib/wine/mapi32.dll.so
@@ -749,6 +751,7 @@ lib/wine/stdole32.tlb.so
 lib/wine/sti.dll.so
 lib/wine/storage.dll16
 lib/wine/stress.dll16
+lib/wine/svrapi.dll.so
 lib/wine/system.drv16
 lib/wine/tapi32.dll.so
 lib/wine/taskmgr.exe.so
@@ -776,7 +779,6 @@ lib/wine/vtdapi.vxd.so
 lib/wine/vwin32.vxd.so
 lib/wine/w32skrnl.dll.so
 lib/wine/w32sys.dll16
-lib/wine/wcmd.exe.so
 lib/wine/win32s16.dll16
 lib/wine/win87em.dll16
 lib/wine/winaspi.dll16
@@ -875,7 +877,6 @@ share/wine/fonts/vgasyst.fon
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.progman
 %%PORTDOCS%%%%DOCSDIR%%/README.uninstaller
-%%PORTDOCS%%%%DOCSDIR%%/README.wcmd
 %%PORTDOCS%%%%DOCSDIR%%/README.winedbg
 %%PORTDOCS%%%%DOCSDIR%%/README.winedump
 %%PORTDOCS%%%%DOCSDIR%%/README.winemine
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 61ae556ace95..d315156fd3d3 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	wine
-PORTVERSION=	0.9.20
+PORTVERSION=	0.9.21
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED} \
@@ -60,7 +60,7 @@ post-install:
 .for i in README ANNOUNCE AUTHORS LICENSE
 	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
 .endfor
-.for i in progman uninstaller wcmd winedbg winemine
+.for i in progman uninstaller winedbg winemine
 	${INSTALL_DATA} ${WRKSRC}/programs/${i}/README ${DOCSDIR}/README.${i}
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/tools/winedump/README ${DOCSDIR}/README.winedump
diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo
index a79f1704aac7..bae73e834687 100644
--- a/emulators/wine/distinfo
+++ b/emulators/wine/distinfo
@@ -1,3 +1,3 @@
-MD5 (wine-0.9.20.tar.bz2) = 3e80a07819e4df084becdbbcd4d6cdd3
-SHA256 (wine-0.9.20.tar.bz2) = d2adcfce0ae95729f9848e614ccee6b2dbc57a46922b227f7f530907bafa1b2c
-SIZE (wine-0.9.20.tar.bz2) = 10982932
+MD5 (wine-0.9.21.tar.bz2) = 4f9528529153399034ab807478887456
+SHA256 (wine-0.9.21.tar.bz2) = 6553030e62060912a29cfddabd0f63ee0939f13bff896debbf44f08e02896718
+SIZE (wine-0.9.21.tar.bz2) = 11085800
diff --git a/emulators/wine/pkg-plist b/emulators/wine/pkg-plist
index 2ea69c17cfaf..d1e31f4b6968 100644
--- a/emulators/wine/pkg-plist
+++ b/emulators/wine/pkg-plist
@@ -5,7 +5,6 @@ bin/progman
 bin/regedit
 bin/regsvr32
 bin/uninstaller
-bin/wcmd
 bin/widl
 bin/wine
 bin/wine-kthread
@@ -357,6 +356,7 @@ include/wine/windows/stdole2.tlb
 include/wine/windows/storage.h
 include/wine/windows/strmif.h
 include/wine/windows/strmif.idl
+include/wine/windows/svrapi.h
 include/wine/windows/tapi.h
 include/wine/windows/tchar.h
 include/wine/windows/textserv.h
@@ -446,6 +446,7 @@ lib/wine/capi2032.dll.so
 lib/wine/cards.dll.so
 lib/wine/cfgmgr32.dll.so
 lib/wine/clock.exe.so
+lib/wine/cmd.exe.so
 lib/wine/comcat.dll.so
 lib/wine/comctl32.dll.so
 lib/wine/comdlg32.dll.so
@@ -645,6 +646,7 @@ lib/wine/libwow32.def
 lib/wine/libws2_32.def
 lib/wine/libwsock32.def
 lib/wine/libwtsapi32.def
+lib/wine/localspl.dll.so
 lib/wine/lz32.dll.so
 lib/wine/lzexpand.dll16
 lib/wine/mapi32.dll.so
@@ -749,6 +751,7 @@ lib/wine/stdole32.tlb.so
 lib/wine/sti.dll.so
 lib/wine/storage.dll16
 lib/wine/stress.dll16
+lib/wine/svrapi.dll.so
 lib/wine/system.drv16
 lib/wine/tapi32.dll.so
 lib/wine/taskmgr.exe.so
@@ -776,7 +779,6 @@ lib/wine/vtdapi.vxd.so
 lib/wine/vwin32.vxd.so
 lib/wine/w32skrnl.dll.so
 lib/wine/w32sys.dll16
-lib/wine/wcmd.exe.so
 lib/wine/win32s16.dll16
 lib/wine/win87em.dll16
 lib/wine/winaspi.dll16
@@ -875,7 +877,6 @@ share/wine/fonts/vgasyst.fon
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.progman
 %%PORTDOCS%%%%DOCSDIR%%/README.uninstaller
-%%PORTDOCS%%%%DOCSDIR%%/README.wcmd
 %%PORTDOCS%%%%DOCSDIR%%/README.winedbg
 %%PORTDOCS%%%%DOCSDIR%%/README.winedump
 %%PORTDOCS%%%%DOCSDIR%%/README.winemine