emulators/wine-devel: Update to Wine 6.6

This includes the following changes:
 - DWrite and DnsApi libraries converted to PE.
 - Plug & play driver support improvements.
 - Various bug fixes.

Also a decent number of files installed no longer are contingent on
the Staging patchset, having moved into Wine proper.

On the way simplify the dependency on wine-mono-devel.

3 files changed, 33 insertions, 25 deletions

diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index 033a2c037d61..a3f29a0b8e3f 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -1,7 +1,7 @@
 # Created by: Gerald Pfeifer <gerald@FreeBSD.org>
 
 PORTNAME=	wine
-DISTVERSION=	6.5
+DISTVERSION=	6.6
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}/Source \
@@ -88,7 +88,7 @@ LDAP_USE=		OPENLDAP=yes
 LIBXSLT_CONFIGURE_WITH=	xslt
 LIBXSLT_LIB_DEPENDS=	libxslt.so:textproc/libxslt
 
-MONO_RUN_DEPENDS=	${DATADIR}/mono/wine-mono-6.0.0-x86.msi:emulators/wine-mono-devel
+MONO_RUN_DEPENDS=	wine-mono-devel>0:emulators/wine-mono-devel
 
 MPG123_CONFIGURE_WITH=	mpg123
 MPG123_LIB_DEPENDS=	libmpg123.so:audio/mpg123
diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo
index bab3393f47ce..d389fffe7e2e 100644
--- a/emulators/wine-devel/distinfo
+++ b/emulators/wine-devel/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1617088628
-SHA256 (wine-6.5.tar.xz) = 0600fd208c06925d6634d29f543bba0a64361c34e9bd7609c2f0e209610ad347
-SIZE (wine-6.5.tar.xz) = 24375196
-SHA256 (v6.5.tar.gz) = 965b96a5058d3b4403bafb46993a959b92a2eb7a896f1070368db795e32aeb10
-SIZE (v6.5.tar.gz) = 9743825
+TIMESTAMP = 1618011122
+SHA256 (wine-6.6.tar.xz) = 99e522c6dcc0ac1d53d201bf3054891fdf11864257473c3eb341e37671fd84ad
+SIZE (wine-6.6.tar.xz) = 24400568
diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist
index 242783e0669c..265b7043a4aa 100644
--- a/emulators/wine-devel/pkg-plist
+++ b/emulators/wine-devel/pkg-plist
@@ -118,8 +118,8 @@ include/wine/windows/appmodel.h
 include/wine/windows/asferr.h
 include/wine/windows/asptlb.h
 include/wine/windows/asptlb.idl
-%%STAGING%%include/wine/windows/asyncinfo.h
-%%STAGING%%include/wine/windows/asyncinfo.idl
+include/wine/windows/asyncinfo.h
+include/wine/windows/asyncinfo.idl
 include/wine/windows/asynot.idl
 include/wine/windows/asysta.idl
 include/wine/windows/atlbase.h
@@ -947,6 +947,7 @@ include/wine/windows/wiadef.h
 include/wine/windows/wimgapi.h
 include/wine/windows/winapifamily.h
 include/wine/windows/winbase.h
+include/wine/windows/winber.h
 include/wine/windows/wincodec.h
 include/wine/windows/wincodec.idl
 include/wine/windows/wincodecsdk.h
@@ -961,19 +962,19 @@ include/wine/windows/windows.foundation.collections.h
 include/wine/windows/windows.foundation.collections.idl
 include/wine/windows/windows.foundation.h
 include/wine/windows/windows.foundation.idl
-%%STAGING%%include/wine/windows/windows.gaming.input.forcefeedback.h
-%%STAGING%%include/wine/windows/windows.gaming.input.forcefeedback.idl
-%%STAGING%%include/wine/windows/windows.gaming.input.h
-%%STAGING%%include/wine/windows/windows.gaming.input.idl
-%%STAGING%%include/wine/windows/windows.globalization.h
-%%STAGING%%include/wine/windows/windows.globalization.idl
+include/wine/windows/windows.gaming.input.forcefeedback.h
+include/wine/windows/windows.gaming.input.forcefeedback.idl
+include/wine/windows/windows.gaming.input.h
+include/wine/windows/windows.gaming.input.idl
+include/wine/windows/windows.globalization.h
+include/wine/windows/windows.globalization.idl
 include/wine/windows/windows.h
 include/wine/windows/windows.media.speechsynthesis.h
 include/wine/windows/windows.media.speechsynthesis.idl
-%%STAGING%%include/wine/windows/windows.system.h
-%%STAGING%%include/wine/windows/windows.system.idl
-%%STAGING%%include/wine/windows/windows.system.userprofile.h
-%%STAGING%%include/wine/windows/windows.system.userprofile.idl
+include/wine/windows/windows.system.h
+include/wine/windows/windows.system.idl
+include/wine/windows/windows.system.userprofile.h
+include/wine/windows/windows.system.userprofile.idl
 include/wine/windows/windowscontracts.h
 include/wine/windows/windowscontracts.idl
 include/wine/windows/windowsx.h
@@ -1342,8 +1343,10 @@ lib/wine/api-ms-win-service-private-l1-1-1.dll.so
 lib/wine/api-ms-win-service-winsvc-l1-1-0.dll.so
 lib/wine/api-ms-win-service-winsvc-l1-2-0.dll.so
 lib/wine/api-ms-win-shcore-obsolete-l1-1-0.dll.so
+lib/wine/api-ms-win-shcore-scaling-l1-1-0.dll.so
 lib/wine/api-ms-win-shcore-scaling-l1-1-1.dll.so
 lib/wine/api-ms-win-shcore-stream-l1-1-0.dll.so
+lib/wine/api-ms-win-shcore-stream-winrt-l1-1-0.dll.so
 lib/wine/api-ms-win-shcore-thread-l1-1-0.dll.so
 lib/wine/api-ms-win-shell-shellcom-l1-1-0.dll.so
 lib/wine/api-ms-win-shell-shellfolders-l1-1-0.dll.so
@@ -1500,6 +1503,7 @@ lib/wine/dmsynth.dll.so
 lib/wine/dmusic.dll.so
 lib/wine/dmusic32.dll.so
 lib/wine/dnsapi.dll.so
+lib/wine/dnsapi.so
 lib/wine/dplay.dll.so
 lib/wine/dplaysvr.exe.so
 lib/wine/dplayx.dll.so
@@ -1526,6 +1530,7 @@ lib/wine/dsuiext.dll.so
 lib/wine/dswave.dll.so
 lib/wine/dwmapi.dll.so
 lib/wine/dwrite.dll.so
+lib/wine/dwrite.so
 %%STAGING%%lib/wine/dx7vb.dll.so
 lib/wine/dx8vb.dll.so
 %%STAGING%%lib/wine/dxapi.sys.so
@@ -1829,8 +1834,10 @@ lib/wine/fakedlls/api-ms-win-service-private-l1-1-1.dll
 lib/wine/fakedlls/api-ms-win-service-winsvc-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-service-winsvc-l1-2-0.dll
 lib/wine/fakedlls/api-ms-win-shcore-obsolete-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-shcore-scaling-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-shcore-scaling-l1-1-1.dll
 lib/wine/fakedlls/api-ms-win-shcore-stream-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-shcore-stream-winrt-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-shcore-thread-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-shell-shellcom-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-shell-shellfolders-l1-1-0.dll
@@ -2481,6 +2488,7 @@ lib/wine/fakedlls/wbemdisp.dll
 lib/wine/fakedlls/wbemprox.dll
 lib/wine/fakedlls/wdscore.dll
 lib/wine/fakedlls/webservices.dll
+lib/wine/fakedlls/websocket.dll
 lib/wine/fakedlls/wer.dll
 lib/wine/fakedlls/wevtapi.dll
 lib/wine/fakedlls/wevtsvc.dll
@@ -2494,9 +2502,9 @@ lib/wine/fakedlls/wimgapi.dll
 %%WINE32%%lib/wine/fakedlls/win87em.dll16
 %%WINE32%%lib/wine/fakedlls/winaspi.dll16
 %%WINE32%%lib/wine/fakedlls/windebug.dll16
-%%STAGING%%lib/wine/fakedlls/windows.gaming.input.dll
-%%STAGING%%lib/wine/fakedlls/windows.globalization.dll
-%%STAGING%%lib/wine/fakedlls/windows.media.speech.dll
+lib/wine/fakedlls/windows.gaming.input.dll
+lib/wine/fakedlls/windows.globalization.dll
+lib/wine/fakedlls/windows.media.speech.dll
 lib/wine/fakedlls/windowscodecs.dll
 lib/wine/fakedlls/windowscodecsext.dll
 lib/wine/fakedlls/wineboot.exe
@@ -2776,6 +2784,7 @@ lib/wine/libmapi32.def
 lib/wine/libmf.def
 lib/wine/libmfmediaengine.def
 lib/wine/libmfplat.def
+lib/wine/libmfplay.def
 lib/wine/libmfreadwrite.def
 lib/wine/libmfuuid.a
 lib/wine/libmlang.def
@@ -3246,6 +3255,7 @@ lib/wine/wbemdisp.dll.so
 lib/wine/wbemprox.dll.so
 lib/wine/wdscore.dll.so
 lib/wine/webservices.dll.so
+lib/wine/websocket.dll.so
 lib/wine/wer.dll.so
 lib/wine/wevtapi.dll.so
 lib/wine/wevtsvc.dll.so
@@ -3259,9 +3269,9 @@ lib/wine/wimgapi.dll.so
 %%WINE32%%lib/wine/win87em.dll16.so
 %%WINE32%%lib/wine/winaspi.dll16.so
 %%WINE32%%lib/wine/windebug.dll16.so
-%%STAGING%%lib/wine/windows.gaming.input.dll.so
-%%STAGING%%lib/wine/windows.globalization.dll.so
-%%STAGING%%lib/wine/windows.media.speech.dll.so
+lib/wine/windows.gaming.input.dll.so
+lib/wine/windows.globalization.dll.so
+lib/wine/windows.media.speech.dll.so
 lib/wine/windowscodecs.dll.so
 lib/wine/windowscodecs.so
 lib/wine/windowscodecsext.dll.so