Update to Wine 2.1 and hence the new development branch past the

Wine 2.0 release series.  This includes the following changes:
 - Many fixes that were deferred during code freeze.
 - More Shader Model 5 instructions.
 - A number of improvements to MIME message handling.
 - Line breaking improvements in DirectWrite.
 - HID bus service now running by default.
 - Direct2D rendering improvements.
 - Various bug fixes.

Source tarballs now use xz compression, so download size has reduced nicely.

3 files changed, 15 insertions, 8 deletions

diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index f6e38327ed72..84740acbc3b0 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	wine
-DISTVERSION=	2.0-rc6
-PORTREVISION=	1
+DISTVERSION=	2.1
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	SF/${PORTNAME}/Source \
@@ -43,7 +42,7 @@ WINELIBDIR?=	${PREFIX}/lib
 USE_LDCONFIG=	${WINELIBDIR} ${WINELIBDIR}/wine
 .endif
 ONLY_FOR_ARCHS=	i386 amd64
-USES=		bison compiler:c11 desktop-file-utils gmake shebangfix tar:bzip2
+USES=		bison compiler:c11 desktop-file-utils gmake shebangfix tar:xz
 SHEBANG_FILES=	tools/make_requests tools/winemaker/winemaker \
 		tools/winedump/function_grep.pl
 
diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo
index f909c554c060..538fe006f7ac 100644
--- a/emulators/wine-devel/distinfo
+++ b/emulators/wine-devel/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1485079225
-SHA256 (wine-2.0-rc6.tar.bz2) = 1e0521cd622ee4a9fbdd63b905ec21b3b3ca1d0f37ccd4a1449f0a8b122eb405
-SIZE (wine-2.0-rc6.tar.bz2) = 23676397
-SHA256 (v2.0-rc6.tar.gz) = a8a4f8bae3ccfbac1f5560cceef69df27b371050eca6e00b5ab95e9fbac21cbd
-SIZE (v2.0-rc6.tar.gz) = 10172738
+TIMESTAMP = 1486631031
+SHA256 (wine-2.1.tar.xz) = bfb9abf63691c93df28d9599aaa866dc2b4e27209b3b7b546df8a37d7d9d1e6e
+SIZE (wine-2.1.tar.xz) = 18887032
+SHA256 (v2.1.tar.gz) = 1d193be2734ea495df2cae1dc54ce89204ca68699979174b0bd726d2e5e0576b
+SIZE (v2.1.tar.gz) = 10101781
diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist
index 15e78bf775c0..5e4edf45022d 100644
--- a/emulators/wine-devel/pkg-plist
+++ b/emulators/wine-devel/pkg-plist
@@ -262,6 +262,7 @@ include/wine/windows/devicetopology.h
 include/wine/windows/devicetopology.idl
 include/wine/windows/devpkey.h
 include/wine/windows/devpropdef.h
+include/wine/windows/dhcpcsdk.h
 include/wine/windows/difxapi.h
 include/wine/windows/digitalv.h
 include/wine/windows/dimm.h
@@ -1678,6 +1679,7 @@ lib/wine/fakedlls/mciqtz32.dll
 lib/wine/fakedlls/mciseq.dll
 lib/wine/fakedlls/mciwave.dll
 lib/wine/fakedlls/mf.dll
+lib/wine/fakedlls/mf3216.dll
 lib/wine/fakedlls/mfplat.dll
 lib/wine/fakedlls/mfreadwrite.dll
 lib/wine/fakedlls/mgmtapi.dll
@@ -1863,6 +1865,7 @@ lib/wine/fakedlls/sccbase.dll
 lib/wine/fakedlls/schannel.dll
 lib/wine/fakedlls/schedsvc.dll
 lib/wine/fakedlls/schtasks.exe
+lib/wine/fakedlls/scrobj.dll
 lib/wine/fakedlls/scrrun.dll
 lib/wine/fakedlls/scsiport.sys
 lib/wine/fakedlls/sdbinst.exe
@@ -2008,6 +2011,7 @@ lib/wine/fakedlls/winsta.dll
 %%WINE32%%lib/wine/fakedlls/wintab.dll16
 lib/wine/fakedlls/wintab32.dll
 lib/wine/fakedlls/wintrust.dll
+lib/wine/fakedlls/winusb.dll
 lib/wine/fakedlls/winver.exe
 lib/wine/fakedlls/wlanapi.dll
 lib/wine/fakedlls/wldap32.dll
@@ -2296,6 +2300,7 @@ lib/wine/libwinscard.def
 lib/wine/libwinspool.def
 lib/wine/libwintab32.def
 lib/wine/libwintrust.def
+lib/wine/libwlanapi.def
 lib/wine/libwldap32.def
 lib/wine/libwnaspi32.def
 %%WINE32%%lib/wine/libwow32.def
@@ -2319,6 +2324,7 @@ lib/wine/mciqtz32.dll.so
 lib/wine/mciseq.dll.so
 lib/wine/mciwave.dll.so
 lib/wine/mf.dll.so
+lib/wine/mf3216.dll.so
 lib/wine/mfplat.dll.so
 lib/wine/mfreadwrite.dll.so
 lib/wine/mgmtapi.dll.so
@@ -2504,6 +2510,7 @@ lib/wine/sccbase.dll.so
 lib/wine/schannel.dll.so
 lib/wine/schedsvc.dll.so
 lib/wine/schtasks.exe.so
+lib/wine/scrobj.dll.so
 lib/wine/scrrun.dll.so
 lib/wine/scsiport.sys.so
 lib/wine/sdbinst.exe.so
@@ -2649,6 +2656,7 @@ lib/wine/winsta.dll.so
 %%WINE32%%lib/wine/wintab.dll16.so
 lib/wine/wintab32.dll.so
 lib/wine/wintrust.dll.so
+lib/wine/winusb.dll.so
 lib/wine/winver.exe.so
 lib/wine/wlanapi.dll.so
 lib/wine/wldap32.dll.so