Update to Wine 5.14. This includes the following changes:

 - More restructuration of the console support.
 - Initial version of the Webdings font.
 - Beginnings of PE conversion of the MSVCRT libraries.
 - Various bug fixes.

My patch files/extrapatch-dlls-ntdll-unix-registry.c is now upstream,
so remove it here.

4 files changed, 10 insertions, 52 deletions

diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index a4b7c3587a34..b973d1cea28e 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	wine
-DISTVERSION=	5.13
+DISTVERSION=	5.14
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}/Source \
@@ -134,10 +134,6 @@ X11_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 # i386-wine-devel slave port.
 .ifndef WINE_SLAVE_BUILD
 .include <bsd.port.pre.mk>
-
-.if !${PORT_OPTIONS:MSTAGING}
-EXTRA_PATCHES+=	${PATCHDIR}/extrapatch-dlls-ntdll-unix-registry.c
-.endif
 .endif
 
 .if ${ARCH} == amd64
diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo
index 22822145d29c..816c89497438 100644
--- a/emulators/wine-devel/distinfo
+++ b/emulators/wine-devel/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1595332764
-SHA256 (wine-5.13.tar.xz) = c46a5c1c2aaf41993de5a5e78b7780060e0e77066531d0ca672ae08e325e0152
-SIZE (wine-5.13.tar.xz) = 23955832
-SHA256 (v5.13.tar.gz) = 395c047d993cf8809727abecadacf2851f078d1f0e68d622a6e6c5284717cb68
-SIZE (v5.13.tar.gz) = 9807468
+TIMESTAMP = 1596359107
+SHA256 (wine-5.14.tar.xz) = f442613537e90e67dbe8a5c4968c8bdb9a101a267892bb9ff67317e0b67fc9ef
+SIZE (wine-5.14.tar.xz) = 23975804
+SHA256 (v5.14.tar.gz) = 16805879471e86a13c5c4f390f52ec7c8a353e69924f0698985bd3fd1d270b1b
+SIZE (v5.14.tar.gz) = 9780843
diff --git a/emulators/wine-devel/files/extrapatch-dlls-ntdll-unix-registry.c b/emulators/wine-devel/files/extrapatch-dlls-ntdll-unix-registry.c
deleted file mode 100644
index b7a0b9cb3975..000000000000
--- a/emulators/wine-devel/files/extrapatch-dlls-ntdll-unix-registry.c
+++ /dev/null
@@ -1,42 +0,0 @@
-From: Gerald Pfeifer <gerald@pfeifer.com>
-To: wine-devel@winehq.org
-Date: Sat, 18 Jul 2020 12:02:58 +0300 (EEST)
-Subject: [PATCH] ntdll: Include <signal.h> for sigset_t
-
-commit 7053b7c615b44e7112ab8fb4c056206d32b6f1c9
-Author: Alexandre Julliard <julliard@winehq.org>
-Date:   Fri Jul 17 11:46:15 2020 +0200
-
-    ntdll: Move the registry system calls to the Unix library.
-    
-    Signed-off-by: Alexandre Julliard <julliard@winehq.org>
-
-broke non-Linux platforms since sigset_t isn't necessarily defined
-based on the #include statements in the new dlls/ntdll/unix/registry.c.
-
-This fixes it.
-
-Observed and tested on FreeBSD 11.4/i386.
-
-Gerald
-
-Signed-off-by: Gerald Pfeifer <gerald@pfeifer.com>
----
- dlls/ntdll/unix/registry.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/dlls/ntdll/unix/registry.c b/dlls/ntdll/unix/registry.c
-index f94c8ff98e..6d58361818 100644
---- dlls/ntdll/unix/registry.c
-+++ dlls/ntdll/unix/registry.c
-@@ -25,6 +25,7 @@
- #pragma makedep unix
- #endif
- 
-+#include <signal.h>
- #include <stdarg.h>
- #include <string.h>
- 
--- 
-2.27.0
-
diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist
index 6276737ccbbd..6942d804b5c6 100644
--- a/emulators/wine-devel/pkg-plist
+++ b/emulators/wine-devel/pkg-plist
@@ -2135,6 +2135,7 @@ lib/wine/fakedlls/msvcp110.dll
 lib/wine/fakedlls/msvcp120.dll
 lib/wine/fakedlls/msvcp120_app.dll
 lib/wine/fakedlls/msvcp140.dll
+lib/wine/fakedlls/msvcp140_1.dll
 lib/wine/fakedlls/msvcp60.dll
 lib/wine/fakedlls/msvcp70.dll
 lib/wine/fakedlls/msvcp71.dll
@@ -2590,6 +2591,7 @@ lib/wine/libcapi2032.def
 lib/wine/libcards.def
 lib/wine/libcfgmgr32.def
 lib/wine/libclusapi.def
+lib/wine/libcombase.def
 lib/wine/libcomctl32.def
 lib/wine/libcomdlg32.def
 lib/wine/libcompstui.def
@@ -2863,6 +2865,7 @@ lib/wine/msvcp110.dll.so
 lib/wine/msvcp120.dll.so
 lib/wine/msvcp120_app.dll.so
 lib/wine/msvcp140.dll.so
+lib/wine/msvcp140_1.dll.so
 lib/wine/msvcp60.dll.so
 lib/wine/msvcp70.dll.so
 lib/wine/msvcp71.dll.so
@@ -3402,4 +3405,5 @@ share/applications/wine.desktop
 %%X11%%%%DATADIR%%/fonts/vgasysg.fon
 %%X11%%%%DATADIR%%/fonts/vgasysr.fon
 %%X11%%%%DATADIR%%/fonts/vgasyst.fon
+%%X11%%%%DATADIR%%/fonts/webdings.ttf
 %%X11%%%%DATADIR%%/fonts/wingding.ttf