Update to Wine 5.16. This includes the following changes:

 - Support for x86 AVX registers.
 - Still more restructuration of the console support.
 - Various bug fixes.

Revert an upstream patch (7571fa87df453e404d8b6ca58e2da95340156849)
that breaks the build with GCC 9 for now - files/patch-tools-makedep.

A number of files transitioned from the Staging patchset to the main
codebase, in addition the Staging patchset lost some and gained some.

4 files changed, 60 insertions, 24 deletions

diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index 6e97be23a5f5..834a795a5693 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	wine
-DISTVERSION=	5.15
+DISTVERSION=	5.16
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}/Source \
diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo
index 0c206b4f6b0d..0638e8d68084 100644
--- a/emulators/wine-devel/distinfo
+++ b/emulators/wine-devel/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1597590323
-SHA256 (wine-5.15.tar.xz) = 3f267cfcd4775bfdeddb1b2a592b875291f5e2dccdebce55f9b2012f7c670915
-SIZE (wine-5.15.tar.xz) = 23999688
-SHA256 (v5.15.tar.gz) = a57b3266b430a5a5ea8334ed2ddbe263e4df4b638d90590465bee8afa65babc7
-SIZE (v5.15.tar.gz) = 9840101
+TIMESTAMP = 1598805458
+SHA256 (wine-5.16.tar.xz) = 98d9a62f89e20a8f1321aadd4183229aab47ca5b2f12c7e0968cf81634322249
+SIZE (wine-5.16.tar.xz) = 24025256
+SHA256 (v5.16.tar.gz) = 241dde851ff04fffa08f9f1c37fd9d30d5ca1e27c1ee31913ff74ac412445dd5
+SIZE (v5.16.tar.gz) = 9830408
diff --git a/emulators/wine-devel/files/patch-tools-makedep b/emulators/wine-devel/files/patch-tools-makedep
new file mode 100644
index 000000000000..407b6cff6f48
--- /dev/null
+++ b/emulators/wine-devel/files/patch-tools-makedep
@@ -0,0 +1,32 @@
+Revert
+
+    commit 7571fa87df453e404d8b6ca58e2da95340156849
+    Author: Alexandre Julliard <julliard@winehq.org>
+    Date:   Mon Aug 24 13:30:12 2020 +0200
+
+    makefiles: Don't implicitly import the module itself when -nodefaultlibs is used.
+    
+    Signed-off-by: Alexandre Julliard <julliard@winehq.org>
+
+which breaks the build with GCC 9.
+
+Disclaimer: This is a temporary hack!
+
+--- UTC
+diff --git a/tools/makedep.c b/tools/makedep.c
+index 4bd20d469d..825458156f 100644
+--- tools/makedep.c
++++ tools/makedep.c
+@@ -2212,11 +2212,7 @@ static struct strarray add_import_libs( const struct makefile *make, struct stra
+         const char *lib = NULL;
+ 
+         /* skip module's own importlib, its object files will be linked directly */
+-        if (make->importlib && !strcmp( make->importlib, imports.str[i] ))
+-        {
+-            if (!is_unix) continue;
+-            if (strarray_exists( &make->extradllflags, "-nodefaultlibs" )) continue;
+-        }
++        if (make->importlib && !is_unix && !strcmp( make->importlib, imports.str[i] )) continue;
+ 
+         for (j = 0; j < top_makefile->subdirs.count; j++)
+         {
diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist
index 19b665b4a1be..147229cc0f95 100644
--- a/emulators/wine-devel/pkg-plist
+++ b/emulators/wine-devel/pkg-plist
@@ -2184,6 +2184,7 @@ lib/wine/fakedlls/netio.sys
 lib/wine/fakedlls/netprofm.dll
 lib/wine/fakedlls/netsh.exe
 lib/wine/fakedlls/netstat.exe
+%%STAGING%%lib/wine/fakedlls/netutils.dll
 lib/wine/fakedlls/newdev.dll
 lib/wine/fakedlls/ngen.exe
 lib/wine/fakedlls/ninput.dll
@@ -2272,7 +2273,6 @@ lib/wine/fakedlls/rsaenh.dll
 lib/wine/fakedlls/rstrtmgr.dll
 lib/wine/fakedlls/rtutils.dll
 lib/wine/fakedlls/rtworkq.dll
-%%STAGING%%lib/wine/fakedlls/runas.exe
 %%WINE32%%lib/wine/fakedlls/rundll.exe16
 lib/wine/fakedlls/rundll32.exe
 lib/wine/fakedlls/samlib.dll
@@ -2317,6 +2317,7 @@ lib/wine/fakedlls/softpub.dll
 lib/wine/fakedlls/spoolss.dll
 lib/wine/fakedlls/spoolsv.exe
 lib/wine/fakedlls/srclient.dll
+%%STAGING%%lib/wine/fakedlls/srvcli.dll
 lib/wine/fakedlls/sspicli.dll
 lib/wine/fakedlls/start.exe
 lib/wine/fakedlls/stdole2.tlb
@@ -2404,6 +2405,7 @@ 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
 lib/wine/fakedlls/windowscodecs.dll
 lib/wine/fakedlls/windowscodecsext.dll
 lib/wine/fakedlls/wineboot.exe
@@ -2484,14 +2486,14 @@ lib/wine/fakedlls/wusa.exe
 %%OPENAL%%lib/wine/fakedlls/x3daudio1_5.dll
 %%OPENAL%%lib/wine/fakedlls/x3daudio1_6.dll
 %%OPENAL%%lib/wine/fakedlls/x3daudio1_7.dll
-%%STAGING%%lib/wine/fakedlls/xactengine3_0.dll
-%%STAGING%%lib/wine/fakedlls/xactengine3_1.dll
-%%STAGING%%lib/wine/fakedlls/xactengine3_2.dll
-%%STAGING%%lib/wine/fakedlls/xactengine3_3.dll
-%%STAGING%%lib/wine/fakedlls/xactengine3_4.dll
-%%STAGING%%lib/wine/fakedlls/xactengine3_5.dll
-%%STAGING%%lib/wine/fakedlls/xactengine3_6.dll
-%%STAGING%%lib/wine/fakedlls/xactengine3_7.dll
+lib/wine/fakedlls/xactengine3_0.dll
+lib/wine/fakedlls/xactengine3_1.dll
+lib/wine/fakedlls/xactengine3_2.dll
+lib/wine/fakedlls/xactengine3_3.dll
+lib/wine/fakedlls/xactengine3_4.dll
+lib/wine/fakedlls/xactengine3_5.dll
+lib/wine/fakedlls/xactengine3_6.dll
+lib/wine/fakedlls/xactengine3_7.dll
 %%OPENAL%%lib/wine/fakedlls/xapofx1_1.dll
 %%OPENAL%%lib/wine/fakedlls/xapofx1_2.dll
 %%OPENAL%%lib/wine/fakedlls/xapofx1_3.dll
@@ -2766,6 +2768,7 @@ lib/wine/libvulkan-1.def
 lib/wine/libwbemuuid.a
 lib/wine/libwebservices.def
 lib/wine/libwer.def
+%%STAGING%%lib/wine/windows.gaming.input.dll.so
 lib/wine/libwindowscodecs.a
 lib/wine/libwindowscodecsext.def
 lib/wine/libwinecrt0.a
@@ -2913,6 +2916,7 @@ lib/wine/netio.sys.so
 lib/wine/netprofm.dll.so
 lib/wine/netsh.exe.so
 lib/wine/netstat.exe.so
+%%STAGING%%lib/wine/netutils.dll.so
 lib/wine/newdev.dll.so
 lib/wine/ngen.exe.so
 lib/wine/ninput.dll.so
@@ -3002,7 +3006,6 @@ lib/wine/rsaenh.dll.so
 lib/wine/rstrtmgr.dll.so
 lib/wine/rtutils.dll.so
 lib/wine/rtworkq.dll.so
-%%STAGING%%lib/wine/runas.exe.so
 %%WINE32%%lib/wine/rundll.exe16.so
 lib/wine/rundll32.exe.so
 lib/wine/samlib.dll.so
@@ -3047,6 +3050,7 @@ lib/wine/softpub.dll.so
 lib/wine/spoolss.dll.so
 lib/wine/spoolsv.exe.so
 lib/wine/srclient.dll.so
+%%STAGING%%lib/wine/srvcli.dll.so
 lib/wine/sspicli.dll.so
 lib/wine/start.exe.so
 lib/wine/stdole2.tlb.so
@@ -3214,14 +3218,14 @@ lib/wine/wusa.exe.so
 %%OPENAL%%lib/wine/x3daudio1_5.dll.so
 %%OPENAL%%lib/wine/x3daudio1_6.dll.so
 %%OPENAL%%lib/wine/x3daudio1_7.dll.so
-%%STAGING%%lib/wine/xactengine3_0.dll.so
-%%STAGING%%lib/wine/xactengine3_1.dll.so
-%%STAGING%%lib/wine/xactengine3_2.dll.so
-%%STAGING%%lib/wine/xactengine3_3.dll.so
-%%STAGING%%lib/wine/xactengine3_4.dll.so
-%%STAGING%%lib/wine/xactengine3_5.dll.so
-%%STAGING%%lib/wine/xactengine3_6.dll.so
-%%STAGING%%lib/wine/xactengine3_7.dll.so
+lib/wine/xactengine3_0.dll.so
+lib/wine/xactengine3_1.dll.so
+lib/wine/xactengine3_2.dll.so
+lib/wine/xactengine3_3.dll.so
+lib/wine/xactengine3_4.dll.so
+lib/wine/xactengine3_5.dll.so
+lib/wine/xactengine3_6.dll.so
+lib/wine/xactengine3_7.dll.so
 %%OPENAL%%lib/wine/xapofx1_1.dll.so
 %%OPENAL%%lib/wine/xapofx1_2.dll.so
 %%OPENAL%%lib/wine/xapofx1_3.dll.so