Update to Wine 1.9.21. This includes the following changes:

 - Initial version of the HID minidriver.
 - Support for lists in the RichEdit control.
 - System tray improvements.
 - Various bug fixes.

Sort a number of entries in pkg-plist; all files within a given
directory should be fine now, even module %%OPTIONS%%.

3 files changed, 18 insertions, 14 deletions

diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index 0433dd89c67c..0b85874add24 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	wine
-DISTVERSION=	1.9.20
+DISTVERSION=	1.9.21
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}/Source \
diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo
index e01f7d5f038c..5935cd8e095c 100644
--- a/emulators/wine-devel/distinfo
+++ b/emulators/wine-devel/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1475476422
-SHA256 (wine-1.9.20.tar.bz2) = 2769f30642329916f12696f7be225644d28fc54d1b9181c979381d70b9a279df
-SIZE (wine-1.9.20.tar.bz2) = 23555024
-SHA256 (v1.9.20.tar.gz) = 201506a3e58fd46b590cfc2f9f70d2e3ba6d3bcff5640da135cee9118e71babc
-SIZE (v1.9.20.tar.gz) = 9979675
+TIMESTAMP = 1476886139
+SHA256 (wine-1.9.21.tar.bz2) = 8b6dd027021be9dd646d65bd19c0334c36dcf9403d8ed4a6e9460b6703efade1
+SIZE (wine-1.9.21.tar.bz2) = 23561191
+SHA256 (v1.9.21.tar.gz) = 88fd8263ba3c13c18423298c49a83d8922e5b45b4797edcd8723aa5d855ce84f
+SIZE (v1.9.21.tar.gz) = 10007408
diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist
index 8f55e2111837..e19f17bfeb92 100644
--- a/emulators/wine-devel/pkg-plist
+++ b/emulators/wine-devel/pkg-plist
@@ -891,10 +891,10 @@ lib/wine/advapi32.dll.so
 lib/wine/advpack.dll.so
 lib/wine/amstream.dll.so
 %%STAGING%%lib/wine/api-ms-win-appmodel-runtime-l1-1-1.dll.so
-lib/wine/api-ms-win-core-atoms-l1-1-0.dll.so
 %%STAGING%%lib/wine/api-ms-win-core-apiquery-l1-1-0.dll.so
 lib/wine/api-ms-win-core-appcompat-l1-1-1.dll.so
 lib/wine/api-ms-win-core-appinit-l1-1-0.dll.so
+lib/wine/api-ms-win-core-atoms-l1-1-0.dll.so
 lib/wine/api-ms-win-core-bem-l1-1-0.dll.so
 lib/wine/api-ms-win-core-com-l1-1-0.dll.so
 %%STAGING%%lib/wine/api-ms-win-core-com-l1-1-1.dll.so
@@ -1225,10 +1225,10 @@ lib/wine/fakedlls/actxprxy.dll
 lib/wine/fakedlls/advapi32.dll
 lib/wine/fakedlls/advpack.dll
 lib/wine/fakedlls/amstream.dll
-lib/wine/fakedlls/api-ms-win-core-appcompat-l1-1-1.dll
-lib/wine/fakedlls/api-ms-win-core-appinit-l1-1-0.dll
 %%STAGING%%lib/wine/fakedlls/api-ms-win-appmodel-runtime-l1-1-1.dll
 %%STAGING%%lib/wine/fakedlls/api-ms-win-core-apiquery-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-core-appcompat-l1-1-1.dll
+lib/wine/fakedlls/api-ms-win-core-appinit-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-core-atoms-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-core-bem-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-core-com-l1-1-0.dll
@@ -1848,6 +1848,7 @@ lib/wine/fakedlls/stdole32.tlb
 lib/wine/fakedlls/sti.dll
 %%WINE32%%lib/wine/fakedlls/storage.dll16
 %%WINE32%%lib/wine/fakedlls/stress.dll16
+lib/wine/fakedlls/subst.exe
 lib/wine/fakedlls/svchost.exe
 lib/wine/fakedlls/svrapi.dll
 lib/wine/fakedlls/sxs.dll
@@ -1922,11 +1923,12 @@ lib/wine/fakedlls/winebrowser.exe
 lib/wine/fakedlls/winebus.sys
 lib/wine/fakedlls/winecfg.exe
 lib/wine/fakedlls/wineconsole.exe
-lib/wine/fakedlls/wined3d.dll
 %%STAGING%%lib/wine/fakedlls/wined3d-csmt.dll
+lib/wine/fakedlls/wined3d.dll
 lib/wine/fakedlls/winedbg.exe
 lib/wine/fakedlls/winedevice.exe
 lib/wine/fakedlls/winefile.exe
+lib/wine/fakedlls/winehid.sys
 lib/wine/fakedlls/winemapi.dll
 lib/wine/fakedlls/winemenubuilder.exe
 lib/wine/fakedlls/winemine.exe
@@ -2442,11 +2444,11 @@ lib/wine/setupapi.dll.so
 %%WINE32%%lib/wine/setupx.dll16.so
 lib/wine/sfc.dll.so
 lib/wine/sfc_os.dll.so
+%%STAGING%%lib/wine/shcore.dll.so
 lib/wine/shdoclc.dll.so
 lib/wine/shdocvw.dll.so
 %%WINE32%%lib/wine/shell.dll16.so
 lib/wine/shell32.dll.so
-%%STAGING%%lib/wine/shcore.dll.so
 lib/wine/shfolder.dll.so
 lib/wine/shlwapi.dll.so
 %%STAGING%%lib/wine/shutdown.exe.so
@@ -2464,6 +2466,7 @@ lib/wine/stdole32.tlb.so
 lib/wine/sti.dll.so
 %%WINE32%%lib/wine/storage.dll16.so
 %%WINE32%%lib/wine/stress.dll16.so
+lib/wine/subst.exe.so
 lib/wine/svchost.exe.so
 lib/wine/svrapi.dll.so
 lib/wine/sxs.dll.so
@@ -2506,7 +2509,6 @@ lib/wine/vcomp90.dll.so
 %%STAGING%%lib/wine/vcruntime140.dll.so
 %%WINE32%%lib/wine/vdhcp.vxd.so
 lib/wine/vdmdbg.dll.so
-lib/wine/wimgapi.dll.so
 %%WINE32%%lib/wine/ver.dll16.so
 lib/wine/version.dll.so
 lib/wine/view.exe.so
@@ -2527,6 +2529,7 @@ lib/wine/wer.dll.so
 lib/wine/wevtapi.dll.so
 lib/wine/wevtutil.exe.so
 lib/wine/wiaservc.dll.so
+lib/wine/wimgapi.dll.so
 %%WINE32%%lib/wine/win32s16.dll16.so
 %%WINE32%%lib/wine/win87em.dll16.so
 %%WINE32%%lib/wine/winaspi.dll16.so
@@ -2538,17 +2541,18 @@ lib/wine/winebrowser.exe.so
 lib/wine/winebus.sys.so
 lib/wine/winecfg.exe.so
 lib/wine/wineconsole.exe.so
-lib/wine/wined3d.dll.so
 %%STAGING%%lib/wine/wined3d-csmt.dll.so
+lib/wine/wined3d.dll.so
 lib/wine/winedbg.exe.so
 lib/wine/winedevice.exe.so
 lib/wine/winefile.exe.so
+lib/wine/winehid.sys.so
 lib/wine/winemapi.dll.so
 lib/wine/winemenubuilder.exe.so
 lib/wine/winemine.exe.so
+%%MPG123%%lib/wine/winemp3.acm.so
 lib/wine/winemsibuilder.exe.so
 lib/wine/wineoss.drv.so
-%%MPG123%%lib/wine/winemp3.acm.so
 lib/wine/winepath.exe.so
 lib/wine/wineps.drv.so
 %%WINE32%%lib/wine/wineps16.drv16.so