emulators/wine-devel: Update to Wine 6.12

This includes the following changes:
 - Builtin "Blue" and "Classic Blue" themes.
 - More work towards WinSock PE conversion.
 - Beginnings of the NSI (Network Store Interface) implementation.
 - Support for 32/64-bit registry views in reg.exe.
 - Various bug fixes.

The Staging patch set is broken for this snapshot; mark the STAGING
option broken accordingly.

Add files/patch-nsiproxy.sys which addresses a build issue on
non-Linux platforms that I pushed upstream in the meantime.

4 files changed, 44 insertions, 6 deletions

diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index 6ce0f6603f3e..21837f23aeb5 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.11
+DISTVERSION=	6.12
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}/Source \
@@ -100,6 +100,7 @@ SDL_CONFIGURE_WITH=	sdl
 SDL_USES=		sdl
 SDL_USE=		SDL=sdl2
 
+STAGING_BROKEN=		fails to patch
 STAGING_MASTER_SITES=	https://github.com/wine-staging/wine-staging/archive/:staging
 STAGING_DIST=		v${DISTVERSION}.tar.gz
 STAGING_DISTFILES=	${STAGING_DIST}:staging
diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo
index fd42a092c7a4..1ff7572cb8d4 100644
--- a/emulators/wine-devel/distinfo
+++ b/emulators/wine-devel/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1624088196
-SHA256 (wine-6.11.tar.xz) = c952bc2d7e3ea349944162a074aead74b7948261ba43d394d971452d7111670b
-SIZE (wine-6.11.tar.xz) = 24599644
-SHA256 (v6.11.tar.gz) = 5c61ecb17ed0cb689c68e20f2d881d163adf3fb332882402d8b5762afa46e7b0
-SIZE (v6.11.tar.gz) = 9672754
+TIMESTAMP = 1625401429
+SHA256 (wine-6.12.tar.xz) = fb92be300edf8039623f138383cb3908c95b2d4b9a490e2a0823b24c56b7cea8
+SIZE (wine-6.12.tar.xz) = 24666960
+SHA256 (v6.12.tar.gz) = 2a1db3a4ffaed01a523f1409da0dcedb8059c33d9b6835efd97b0fb3c8b657c7
+SIZE (v6.12.tar.gz) = 9658338
diff --git a/emulators/wine-devel/files/patch-nsiproxy.sys b/emulators/wine-devel/files/patch-nsiproxy.sys
new file mode 100644
index 000000000000..fa837bc5d5e5
--- /dev/null
+++ b/emulators/wine-devel/files/patch-nsiproxy.sys
@@ -0,0 +1,22 @@
+This patch of mine has been included upstream in the meantime.
+
+commit 1fc3d75a17b025bcdb818714db47a37c309ea186
+Author: Gerald Pfeifer <gerald@pfeifer.com>
+Date:   Sat Jul 3 06:55:06 2021 +0000
+
+    nsiproxy: Include netinet/in.h before if_ether.h
+
+index 647fd650cd3..7a0e7ec6f6c 100644
+--- dlls/nsiproxy.sys/ndis.c
++++ dlls/nsiproxy.sys/ndis.c
+@@ -38,6 +38,10 @@
+ #include <net/if_arp.h>
+ #endif
+ 
++#ifdef HAVE_NETINET_IN_H
++#include <netinet/in.h>
++#endif
++
+ #ifdef HAVE_NETINET_IF_ETHER_H
+ #include <netinet/if_ether.h>
+ #endif
diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist
index 8d5607514db2..d94a492ef0da 100644
--- a/emulators/wine-devel/pkg-plist
+++ b/emulators/wine-devel/pkg-plist
@@ -179,6 +179,7 @@ include/wine/windows/cmdpre.idl
 include/wine/windows/cmdprp.idl
 include/wine/windows/cmdstrm.idl
 include/wine/windows/cmdtxt.idl
+include/wine/windows/cmdwpr.idl
 include/wine/windows/cmnquery.h
 include/wine/windows/cmnquery.idl
 include/wine/windows/codecapi.h
@@ -662,6 +663,7 @@ include/wine/windows/netcon.idl
 include/wine/windows/netfw.h
 include/wine/windows/netfw.idl
 include/wine/windows/netioapi.h
+include/wine/windows/netiodef.h
 include/wine/windows/netlistmgr.h
 include/wine/windows/netlistmgr.idl
 include/wine/windows/newdev.h
@@ -678,6 +680,7 @@ include/wine/windows/ntddstor.h
 include/wine/windows/ntddvdeo.h
 include/wine/windows/ntdef.h
 include/wine/windows/ntdsapi.h
+include/wine/windows/ntgdi.h
 %%STAGING%%include/wine/windows/ntifs.h
 include/wine/windows/ntlsa.h
 include/wine/windows/ntquery.h
@@ -736,6 +739,8 @@ include/wine/windows/poppack.h
 include/wine/windows/powrprof.h
 include/wine/windows/prntvpt.h
 include/wine/windows/profinfo.h
+include/wine/windows/proofofpossessioncookieinfo.h
+include/wine/windows/proofofpossessioncookieinfo.idl
 include/wine/windows/propidl.h
 include/wine/windows/propidl.idl
 include/wine/windows/propkey.h
@@ -866,6 +871,7 @@ include/wine/windows/t2embapi.h
 include/wine/windows/tapi.h
 include/wine/windows/taskschd.h
 include/wine/windows/taskschd.idl
+include/wine/windows/tbs.h
 include/wine/windows/tchar.h
 include/wine/windows/tcpestats.h
 include/wine/windows/tcpmib.h
@@ -1785,6 +1791,7 @@ lib/wine/%%WINEARCH%%-unix/libnetio.def
 lib/wine/%%WINEARCH%%-unix/libnewdev.def
 lib/wine/%%WINEARCH%%-unix/libninput.def
 lib/wine/%%WINEARCH%%-unix/libnormaliz.def
+lib/wine/%%WINEARCH%%-unix/libnsi.def
 lib/wine/%%WINEARCH%%-unix/libntdll.def
 lib/wine/%%WINEARCH%%-unix/libntdsapi.def
 lib/wine/%%WINEARCH%%-unix/libntoskrnl.def
@@ -1880,6 +1887,7 @@ lib/wine/%%WINEARCH%%-unix/libwtsapi32.def
 %%STAGING%%lib/wine/%%WINEARCH%%-unix/libx3daudio1_7.def
 lib/wine/%%WINEARCH%%-unix/libxinput.def
 lib/wine/%%WINEARCH%%-unix/libxmllite.def
+lib/wine/%%WINEARCH%%-unix/light.msstyles.so
 lib/wine/%%WINEARCH%%-unix/loadperf.dll.so
 lib/wine/%%WINEARCH%%-unix/localspl.dll.so
 lib/wine/%%WINEARCH%%-unix/localui.dll.so
@@ -2013,6 +2021,8 @@ lib/wine/%%WINEARCH%%-unix/normaliz.dll.so
 lib/wine/%%WINEARCH%%-unix/notepad.exe.so
 lib/wine/%%WINEARCH%%-unix/npmshtml.dll.so
 lib/wine/%%WINEARCH%%-unix/npptools.dll.so
+lib/wine/%%WINEARCH%%-unix/nsi.dll.so
+lib/wine/%%WINEARCH%%-unix/nsiproxy.sys.so
 lib/wine/%%WINEARCH%%-unix/ntdll.dll.so
 lib/wine/%%WINEARCH%%-unix/ntdll.so
 lib/wine/%%WINEARCH%%-unix/ntdsapi.dll.so
@@ -2164,6 +2174,7 @@ lib/wine/%%WINEARCH%%-unix/taskkill.exe.so
 lib/wine/%%WINEARCH%%-unix/tasklist.exe.so
 lib/wine/%%WINEARCH%%-unix/taskmgr.exe.so
 lib/wine/%%WINEARCH%%-unix/taskschd.dll.so
+lib/wine/%%WINEARCH%%-unix/tbs.dll.so
 lib/wine/%%WINEARCH%%-unix/tdh.dll.so
 lib/wine/%%WINEARCH%%-unix/tdi.sys.so
 lib/wine/%%WINEARCH%%-unix/termsv.exe.so
@@ -2907,6 +2918,7 @@ lib/wine/%%WINEARCH%%-windows/ksproxy.ax
 lib/wine/%%WINEARCH%%-windows/ksuser.dll
 lib/wine/%%WINEARCH%%-windows/ktmw32.dll
 %%MPG123%%lib/wine/%%WINEARCH%%-windows/l3codeca.acm
+lib/wine/%%WINEARCH%%-windows/light.msstyles
 lib/wine/%%WINEARCH%%-windows/loadperf.dll
 lib/wine/%%WINEARCH%%-windows/localspl.dll
 lib/wine/%%WINEARCH%%-windows/localui.dll
@@ -3037,6 +3049,8 @@ lib/wine/%%WINEARCH%%-windows/normaliz.dll
 lib/wine/%%WINEARCH%%-windows/notepad.exe
 lib/wine/%%WINEARCH%%-windows/npmshtml.dll
 lib/wine/%%WINEARCH%%-windows/npptools.dll
+lib/wine/%%WINEARCH%%-windows/nsi.dll
+lib/wine/%%WINEARCH%%-windows/nsiproxy.sys
 lib/wine/%%WINEARCH%%-windows/ntdll.dll
 lib/wine/%%WINEARCH%%-windows/ntdsapi.dll
 lib/wine/%%WINEARCH%%-windows/ntoskrnl.exe
@@ -3184,6 +3198,7 @@ lib/wine/%%WINEARCH%%-windows/taskkill.exe
 lib/wine/%%WINEARCH%%-windows/tasklist.exe
 lib/wine/%%WINEARCH%%-windows/taskmgr.exe
 lib/wine/%%WINEARCH%%-windows/taskschd.dll
+lib/wine/%%WINEARCH%%-windows/tbs.dll
 lib/wine/%%WINEARCH%%-windows/tdh.dll
 lib/wine/%%WINEARCH%%-windows/tdi.sys
 lib/wine/%%WINEARCH%%-windows/termsv.exe