emulators/wine-devel: Update to Wine 6.16

This includes the following changes:
 - Initial version of a HID-based joystick backend.
 - Improved high-DPI theming support.
 - More preparation work for the GDI syscall interface.
 - Better CodeView support in WineDump.
 - Various bug fixes.

It also addresses a couple of FreeBSD-specific build issues I had to
address due to system headers not including others actually required:

 nsiproxy: Include sys/param.h.
 nsiproxy: Include netinet/in_pcb.h.
 nsiproxy: Include stddef.h.
 ntdll: Always return a value in get_builtin_init_funcs.
 nsiproxy: Include sys/types.h from udp.c.
 nsiproxy: Add $(PROCSTAT_LIBS) to EXTRALIBS.
 nsiproxy: Include netinet/in.h in udp.c.
 nsiproxy: Include sys/queue.h from tcp.c.

My patch files/patch-dlls-nsiproxy.sys has been integrated upstream,
so remove it here.

4 files changed, 17 insertions, 43 deletions

diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index 9d4d9a746b57..36991c43d5c9 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.15
+DISTVERSION=	6.16
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}/Source \
diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo
index 8b5354109fc8..5ba8fd470dfb 100644
--- a/emulators/wine-devel/distinfo
+++ b/emulators/wine-devel/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1629013007
-SHA256 (wine-6.15.tar.xz) = 61fd65a365832a62bae7a78429270c076fb2a29f1c7f462595d1f3543651779b
-SIZE (wine-6.15.tar.xz) = 24751680
-SHA256 (v6.15.tar.gz) = 8eab77df53dac69cc6ffd2df94e4b53f4312806649e2a27ea97082047fe7dd61
-SIZE (v6.15.tar.gz) = 9654539
+TIMESTAMP = 1630139136
+SHA256 (wine-6.16.tar.xz) = 695092050d98a129c4d7f3153cb0e4923248bae5f3d920639fa4ab1a73f8fae8
+SIZE (wine-6.16.tar.xz) = 24789520
+SHA256 (v6.16.tar.gz) = 5b5b57b3419192b4b83f22774cade770fb33ffb415e62a7374703e3b5720f836
+SIZE (v6.16.tar.gz) = 9655388
diff --git a/emulators/wine-devel/files/patch-dlls-nsiproxy.sys b/emulators/wine-devel/files/patch-dlls-nsiproxy.sys
deleted file mode 100644
index c73499fa7810..000000000000
--- a/emulators/wine-devel/files/patch-dlls-nsiproxy.sys
+++ /dev/null
@@ -1,37 +0,0 @@
-This patch of mine has been accepted upstream already.
-
-commit a1cc71207cd22d7d884f44d135d975d981fa21e6
-Author: Gerald Pfeifer <gerald@pfeifer.com>
-Date:   Tue Aug 24 14:53:47 2021 +0200
-
-    nsiproxy: Include sys/queue.h from tcp.c.
-    
-    In what looks like a change between FreeBSD 11 and later versions
-    (FreeBSD 12 and 13), we now need to explicitly include sys/queue.h
-    to avoid
-    
-      In file included from dlls/nsiproxy.sys/tcp.c:42:
-      /usr/include/netinet/tcp_var.h:516:2: error:
-      expected specifier-qualifier-list before 'TAILQ_ENTRY'
-      516 | TAILQ_ENTRY(tcptw)  tw_2msl;
-    
-    Signed-off-by: Gerald Pfeifer <gerald@pfeifer.com>
-    Signed-off-by: Huw Davies <huw@codeweavers.com>
-    Signed-off-by: Alexandre Julliard <julliard@winehq.org>
-
---- UTC
-diff --git dlls/nsiproxy.sys/tcp.c dlls/nsiproxy.sys/tcp.c
-index 8567330be99..603aefadfe9 100644
---- dlls/nsiproxy.sys/tcp.c
-+++ dlls/nsiproxy.sys/tcp.c
-@@ -58,6 +58,10 @@
- #include <netinet/ip_var.h>
- #endif
- 
-+#ifdef HAVE_SYS_QUEUE_H
-+#include <sys/queue.h>
-+#endif
-+
- #ifdef HAVE_NETINET_TCP_VAR_H
- #include <netinet/tcp_var.h>
- #endif
diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist
index e8d020d66f22..adedeb93c113 100644
--- a/emulators/wine-devel/pkg-plist
+++ b/emulators/wine-devel/pkg-plist
@@ -287,6 +287,7 @@ include/wine/windows/d3dx10.h
 include/wine/windows/d3dx10async.h
 include/wine/windows/d3dx10core.h
 include/wine/windows/d3dx10math.h
+include/wine/windows/d3dx10mesh.h
 include/wine/windows/d3dx10tex.h
 include/wine/windows/d3dx11.h
 include/wine/windows/d3dx11async.h
@@ -1107,6 +1108,7 @@ include/wine/windows/ddk/csq.h
 include/wine/windows/ddk/d3dkmthk.h
 include/wine/windows/ddk/fltkernel.h
 include/wine/windows/ddk/hidclass.h
+include/wine/windows/ddk/hidpddi.h
 include/wine/windows/ddk/hidpi.h
 include/wine/windows/ddk/hidport.h
 include/wine/windows/ddk/hidsdi.h
@@ -1237,6 +1239,7 @@ lib/wine/%%WINEARCH%%-unix/api-ms-win-core-profile-l1-1-0.dll.so
 lib/wine/%%WINEARCH%%-unix/api-ms-win-core-psapi-ansi-l1-1-0.dll.so
 lib/wine/%%WINEARCH%%-unix/api-ms-win-core-psapi-l1-1-0.dll.so
 lib/wine/%%WINEARCH%%-unix/api-ms-win-core-psapi-obsolete-l1-1-0.dll.so
+lib/wine/%%WINEARCH%%-unix/api-ms-win-core-psm-appnotify-l1-1-0.dll.so
 lib/wine/%%WINEARCH%%-unix/api-ms-win-core-quirks-l1-1-0.dll.so
 lib/wine/%%WINEARCH%%-unix/api-ms-win-core-realtime-l1-1-0.dll.so
 lib/wine/%%WINEARCH%%-unix/api-ms-win-core-registry-l1-1-0.dll.so
@@ -1640,6 +1643,7 @@ lib/wine/%%WINEARCH%%-unix/hh.exe.so
 lib/wine/%%WINEARCH%%-unix/hhctrl.ocx.so
 lib/wine/%%WINEARCH%%-unix/hid.dll.so
 lib/wine/%%WINEARCH%%-unix/hidclass.sys.so
+lib/wine/%%WINEARCH%%-unix/hidparse.sys.so
 lib/wine/%%WINEARCH%%-unix/hlink.dll.so
 lib/wine/%%WINEARCH%%-unix/hnetcfg.dll.so
 lib/wine/%%WINEARCH%%-unix/hostname.exe.so
@@ -1722,7 +1726,11 @@ lib/wine/%%WINEARCH%%-unix/libd3d9.def
 lib/wine/%%WINEARCH%%-unix/libd3dcompiler.def
 lib/wine/%%WINEARCH%%-unix/libd3drm.def
 lib/wine/%%WINEARCH%%-unix/libd3dx10.def
+lib/wine/%%WINEARCH%%-unix/libd3dx10_40.def
+lib/wine/%%WINEARCH%%-unix/libd3dx10_41.def
+lib/wine/%%WINEARCH%%-unix/libd3dx10_42.def
 lib/wine/%%WINEARCH%%-unix/libd3dx11.def
+lib/wine/%%WINEARCH%%-unix/libd3dx11_42.def
 lib/wine/%%WINEARCH%%-unix/libd3dx9.def
 lib/wine/%%WINEARCH%%-unix/libd3dxof.def
 lib/wine/%%WINEARCH%%-unix/libdbgeng.def
@@ -1752,6 +1760,7 @@ lib/wine/%%WINEARCH%%-unix/libglu32.def
 lib/wine/%%WINEARCH%%-unix/libhal.def
 lib/wine/%%WINEARCH%%-unix/libhid.def
 lib/wine/%%WINEARCH%%-unix/libhidclass.def
+lib/wine/%%WINEARCH%%-unix/libhidparse.def
 lib/wine/%%WINEARCH%%-unix/libhlink.def
 lib/wine/%%WINEARCH%%-unix/libhtmlhelp.def
 lib/wine/%%WINEARCH%%-unix/libhttpapi.def
@@ -2492,6 +2501,7 @@ lib/wine/%%WINEARCH%%-windows/api-ms-win-core-profile-l1-1-0.dll
 lib/wine/%%WINEARCH%%-windows/api-ms-win-core-psapi-ansi-l1-1-0.dll
 lib/wine/%%WINEARCH%%-windows/api-ms-win-core-psapi-l1-1-0.dll
 lib/wine/%%WINEARCH%%-windows/api-ms-win-core-psapi-obsolete-l1-1-0.dll
+lib/wine/%%WINEARCH%%-windows/api-ms-win-core-psm-appnotify-l1-1-0.dll
 lib/wine/%%WINEARCH%%-windows/api-ms-win-core-quirks-l1-1-0.dll
 lib/wine/%%WINEARCH%%-windows/api-ms-win-core-realtime-l1-1-0.dll
 lib/wine/%%WINEARCH%%-windows/api-ms-win-core-registry-l1-1-0.dll
@@ -2890,6 +2900,7 @@ lib/wine/%%WINEARCH%%-windows/hh.exe
 lib/wine/%%WINEARCH%%-windows/hhctrl.ocx
 lib/wine/%%WINEARCH%%-windows/hid.dll
 lib/wine/%%WINEARCH%%-windows/hidclass.sys
+lib/wine/%%WINEARCH%%-windows/hidparse.sys
 lib/wine/%%WINEARCH%%-windows/hlink.dll
 lib/wine/%%WINEARCH%%-windows/hnetcfg.dll
 lib/wine/%%WINEARCH%%-windows/hostname.exe