Update to Wine 2.20. This includes the following changes:

 - Improved event support in MSHTML.
 - Interpolation modes in Direct3D.
 - Improved metafile support in GdiPlus.
 - Initial version of Kerberos5 Authentication Package.
 - OLE clipboard cache improvements.
 - Various bug fixes.

Remove files/patch-partial-reservation.  This should not be needed any
longer since on FreeBSD the main wine program is now loaded at a lower
address, making more room available between Wine and 0x80000000, so it
may be ok now if the area above 0x80000000 stays reserved like on other
platforms. [1]

Mark the STAGING option (and hence the wine-staging port as well) as
BROKEN; that patchset still is not available yet, and we cannot wait
forever.

Discussed with: 	tijl [1]

4 files changed, 15 insertions, 20 deletions

diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index 93e78d7188f3..027d051aa448 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	wine
-DISTVERSION=	2.19
+DISTVERSION=	2.20
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}/Source \
@@ -18,6 +18,7 @@ LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=	amd64 i386
+STAGING_BROKEN=	Staging patchset still not available for this version
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/flex:textproc/flex \
 		prelink:sysutils/prelink
diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo
index 53f4b3710e63..d725464f5870 100644
--- a/emulators/wine-devel/distinfo
+++ b/emulators/wine-devel/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1508532666
-SHA256 (wine-2.19.tar.xz) = 487131e69875ae9c2d042798f954160146e603e449c3c97981f29b42f4a66095
-SIZE (wine-2.19.tar.xz) = 19549464
-SHA256 (v2.19.tar.gz) = 2fdb083a484708362433000f92b54a5d648df190b2ab084647c45f5624063bd2
-SIZE (v2.19.tar.gz) = 10241240
+TIMESTAMP = 1509544782
+SHA256 (wine-2.20.tar.xz) = b444826c69048932fd51ac00b791d18528a4d4abd4c397e5bd51ac60eda455a5
+SIZE (wine-2.20.tar.xz) = 19597556
diff --git a/emulators/wine-devel/files/patch-partial-reservation b/emulators/wine-devel/files/patch-partial-reservation
deleted file mode 100644
index 7509b59e0608..000000000000
--- a/emulators/wine-devel/files/patch-partial-reservation
+++ /dev/null
@@ -1,14 +0,0 @@
---- UTC
---- libs/wine/mmap.c
-+++ libs/wine/mmap.c
-@@ -380,6 +380,9 @@
-         reserve_area( base, end );
-     }
-     else reserve_area( user_space_limit, 0 );
-+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-+    wine_mmap_remove_reserved_area( (char *)0x82000000, 0xffffffff - 0x82000000, 1 );
-+#endif
-
-     /* reserve the DOS area if not already done */
- 
-     ptr = list_head( &reserved_areas );
diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist
index 255906c59170..fd8aaf930911 100644
--- a/emulators/wine-devel/pkg-plist
+++ b/emulators/wine-devel/pkg-plist
@@ -989,6 +989,7 @@ lib/wine/api-ms-win-core-fibers-l1-1-1.dll.so
 lib/wine/api-ms-win-core-file-l1-1-0.dll.so
 lib/wine/api-ms-win-core-file-l1-2-0.dll.so
 lib/wine/api-ms-win-core-file-l1-2-1.dll.so
+lib/wine/api-ms-win-core-file-l1-2-2.dll.so
 lib/wine/api-ms-win-core-file-l2-1-0.dll.so
 lib/wine/api-ms-win-core-file-l2-1-1.dll.so
 lib/wine/api-ms-win-core-file-l2-1-2.dll.so
@@ -1009,6 +1010,7 @@ lib/wine/api-ms-win-core-kernel32-private-l1-1-1.dll.so
 lib/wine/api-ms-win-core-libraryloader-l1-1-0.dll.so
 lib/wine/api-ms-win-core-libraryloader-l1-1-1.dll.so
 lib/wine/api-ms-win-core-libraryloader-l1-2-0.dll.so
+lib/wine/api-ms-win-core-libraryloader-l1-2-1.dll.so
 lib/wine/api-ms-win-core-libraryloader-l1-2-2.dll.so
 lib/wine/api-ms-win-core-localization-l1-1-0.dll.so
 lib/wine/api-ms-win-core-localization-l1-2-0.dll.so
@@ -1054,6 +1056,7 @@ lib/wine/api-ms-win-core-string-l1-1-0.dll.so
 lib/wine/api-ms-win-core-string-l2-1-0.dll.so
 lib/wine/api-ms-win-core-string-obsolete-l1-1-0.dll.so
 lib/wine/api-ms-win-core-stringansi-l1-1-0.dll.so
+lib/wine/api-ms-win-core-synch-ansi-l1-1-0.dll.so
 lib/wine/api-ms-win-core-synch-l1-1-0.dll.so
 lib/wine/api-ms-win-core-synch-l1-2-0.dll.so
 lib/wine/api-ms-win-core-synch-l1-2-1.dll.so
@@ -1150,6 +1153,7 @@ 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
 %%STAGING%%lib/wine/api-ms-win-shcore-obsolete-l1-1-0.dll.so
+lib/wine/api-ms-win-shcore-scaling-l1-1-1.dll.so
 %%STAGING%%lib/wine/api-ms-win-shcore-stream-l1-1-0.dll.so
 %%STAGING%%lib/wine/api-ms-win-shcore-thread-l1-1-0.dll.so
 lib/wine/api-ms-win-shell-shellcom-l1-1-0.dll.so
@@ -1385,6 +1389,7 @@ lib/wine/fakedlls/api-ms-win-core-fibers-l1-1-1.dll
 lib/wine/fakedlls/api-ms-win-core-file-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-core-file-l1-2-0.dll
 lib/wine/fakedlls/api-ms-win-core-file-l1-2-1.dll
+lib/wine/fakedlls/api-ms-win-core-file-l1-2-2.dll
 lib/wine/fakedlls/api-ms-win-core-file-l2-1-0.dll
 lib/wine/fakedlls/api-ms-win-core-file-l2-1-1.dll
 lib/wine/fakedlls/api-ms-win-core-file-l2-1-2.dll
@@ -1405,6 +1410,7 @@ lib/wine/fakedlls/api-ms-win-core-kernel32-private-l1-1-1.dll
 lib/wine/fakedlls/api-ms-win-core-libraryloader-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-core-libraryloader-l1-1-1.dll
 lib/wine/fakedlls/api-ms-win-core-libraryloader-l1-2-0.dll
+lib/wine/fakedlls/api-ms-win-core-libraryloader-l1-2-1.dll
 lib/wine/fakedlls/api-ms-win-core-libraryloader-l1-2-2.dll
 lib/wine/fakedlls/api-ms-win-core-localization-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-core-localization-l1-2-0.dll
@@ -1450,6 +1456,7 @@ lib/wine/fakedlls/api-ms-win-core-string-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-core-string-l2-1-0.dll
 lib/wine/fakedlls/api-ms-win-core-string-obsolete-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-core-stringansi-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-core-synch-ansi-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-core-synch-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-core-synch-l1-2-0.dll
 lib/wine/fakedlls/api-ms-win-core-synch-l1-2-1.dll
@@ -1546,6 +1553,7 @@ 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
 %%STAGING%%lib/wine/fakedlls/api-ms-win-shcore-obsolete-l1-1-0.dll
+lib/wine/fakedlls/api-ms-win-shcore-scaling-l1-1-1.dll
 %%STAGING%%lib/wine/fakedlls/api-ms-win-shcore-stream-l1-1-0.dll
 %%STAGING%%lib/wine/fakedlls/api-ms-win-shcore-thread-l1-1-0.dll
 lib/wine/fakedlls/api-ms-win-shell-shellcom-l1-1-0.dll
@@ -1798,6 +1806,7 @@ lib/wine/fakedlls/itss.dll
 lib/wine/fakedlls/joy.cpl
 lib/wine/fakedlls/jscript.dll
 lib/wine/fakedlls/jsproxy.dll
+lib/wine/fakedlls/kerberos.dll
 lib/wine/fakedlls/kernel32.dll
 lib/wine/fakedlls/kernelbase.dll
 %%WINE32%%lib/wine/fakedlls/keyboard.drv16
@@ -2275,6 +2284,7 @@ lib/wine/itss.dll.so
 lib/wine/joy.cpl.so
 lib/wine/jscript.dll.so
 lib/wine/jsproxy.dll.so
+lib/wine/kerberos.dll.so
 lib/wine/kernel32.dll.so
 lib/wine/kernelbase.dll.so
 %%WINE32%%lib/wine/keyboard.drv16.so