i386-wine-devel: update to 3.3

 - remove i386-wine-staging (and STAGING option) as patches are no longer
   provided upstream

3 files changed, 27 insertions, 20 deletions

diff --git a/emulators/i386-wine-devel/Makefile.inc b/emulators/i386-wine-devel/Makefile.inc
index 56c195d4b6ab..9a0557f1ff6a 100644
--- a/emulators/i386-wine-devel/Makefile.inc
+++ b/emulators/i386-wine-devel/Makefile.inc
@@ -2,12 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	wine
-PORTVERSION=	3.1
+PORTVERSION=	3.3
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	LOCAL/dbn/repos/wine/${DIST_SUBDIR}/
 PKGNAMEPREFIX=	i386-
-PKGNAMESUFFIX?=	-devel
+PKGNAMESUFFIX=	-devel
 DISTNAME=	${PKGNAME}
 EXTRACT_SUFX=	.txz
 DIST_SUBDIR=	freebsd:${OSREL:C/\..*//}:x86:64
@@ -53,23 +53,18 @@ MONO_RUN_DEPENDS=	${DATADIR}/mono/wine-mono-4.7.1.msi:emulators/wine-mono-devel
 PLIST_SUB+=	OSREL${osrel}=""
 .if ${PKGNAMESUFFIX} == -devel
 PLIST_SUB+=	DEVEL=""
-PLIST_SUB+=	STAGING="@comment "
 PLIST_SUB+=	OSREL${osrel}-DEVEL=""
-PLIST_SUB+=	OSREL${osrel}-STAGING="@comment "
 .else
 PLIST_SUB+=	DEVEL="@comment "
-PLIST_SUB+=	STAGING=""
 PLIST_SUB+=	OSREL${osrel}-DEVEL="@comment "
-PLIST_SUB+=	OSREL${osrel}-STAGING=""
 .endif
 .else
 PLIST_SUB+=	OSREL${osrel}="@comment "
 PLIST_SUB+=	OSREL${osrel}-DEVEL="@comment "
-PLIST_SUB+=	OSREL${osrel}-STAGING="@comment "
 .endif
 .endfor
 
-.if ${OPSYS} != FreeBSD || (!(${OSVERSION} < 1100000) && !(${OSVERSION} >= 1101000 && ${OSVERSION} < 1200000) && !(${OSVERSION} >= 1200056 && ${OSVERSION} < 1300000))
+.if ${OPSYS} != FreeBSD || (!(${OSVERSION} < 1100000) && !(${OSVERSION} >= 1101000 && ${OSVERSION} < 1200000) && !(${OSVERSION} >= 1200060 && ${OSVERSION} < 1300000))
 IGNORE=		binaries compiled for FreeBSD 10.3+, 11.1+ and -current only
 DISTFILES=
 .endif
@@ -89,13 +84,11 @@ ${PLIST}: fetch
 port-update:
 	${RM} ${SLAVEDIR}/distinfo ${SLAVEDIR}/distinfo~ ${SLAVEDIR}/pkg-plist.*
 .for osrel in 10 11 12
-.for suffix in -devel
-	${MAKE} fetch OSREL=${osrel} OSVERSION=${osrel}99999 _OSRELEASE=${osrel} PKGNAMESUFFIX=${suffix}
-	${MAKE} makesum OSREL=${osrel} OSVERSION=${osrel}99999 _OSRELEASE=${osrel} PKGNAMESUFFIX=${suffix}
+	${MAKE} fetch OSREL=${osrel} OSVERSION=${osrel}99999 _OSRELEASE=${osrel}
+	${MAKE} makesum OSREL=${osrel} OSVERSION=${osrel}99999 _OSRELEASE=${osrel}
 	${CAT} ${SLAVEDIR}/distinfo >> ${SLAVEDIR}/distinfo~
 	${RM} ${SLAVEDIR}/distinfo
-	${MAKE} pkg-plist.${osrel}${suffix:tu} PLIST=pkg-plist.${osrel}${suffix:tu} OSREL=${osrel} OSVERSION=${osrel}99999 _OSRELEASE=${osrel} PKGNAMESUFFIX=${suffix}
-.endfor
+	${MAKE} pkg-plist.${osrel}${suffix:tu} PLIST=pkg-plist.${osrel}${suffix:tu} OSREL=${osrel} OSVERSION=${osrel}99999 _OSRELEASE=${osrel}
 .endfor
 	${SED} -e '2,$${' -e '/^TIMESTAMP/d' -e '}' distinfo~ > ${SLAVEDIR}/distinfo
 	python ${FILESDIR}/mergeplist.py ${SLAVEDIR}/pkg-plist.* > ${PLIST}
diff --git a/emulators/i386-wine-devel/distinfo b/emulators/i386-wine-devel/distinfo
index 64b767651174..fe219f4bcc6e 100644
--- a/emulators/i386-wine-devel/distinfo
+++ b/emulators/i386-wine-devel/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1518116685
-SHA256 (freebsd:10:x86:64/i386-wine-devel-3.1,1.txz) = 56cf66198812b806e3596e50298a04cb3e824785964ce39379ce7e116ae90688
-SIZE (freebsd:10:x86:64/i386-wine-devel-3.1,1.txz) = 61936116
-SHA256 (freebsd:11:x86:64/i386-wine-devel-3.1,1.txz) = 73da58cbd90b0fa8fc1a8cf028751c7db0516f1f8495a462701d9e4bda655a13
-SIZE (freebsd:11:x86:64/i386-wine-devel-3.1,1.txz) = 57058260
-SHA256 (freebsd:12:x86:64/i386-wine-devel-3.1,1.txz) = 3e50aaf65fb1f85e1a3da8a5a773574fe15ce5e8dc67162cac97bfdf2d7eb670
-SIZE (freebsd:12:x86:64/i386-wine-devel-3.1,1.txz) = 61165748
+TIMESTAMP = 1520679753
+SHA256 (freebsd:10:x86:64/i386-wine-devel-3.3,1.txz) = b6eed0f8a86685162f5b4f55a99de448b7d5be6bf2a7e46c4fea4798138320c8
+SIZE (freebsd:10:x86:64/i386-wine-devel-3.3,1.txz) = 62049612
+SHA256 (freebsd:11:x86:64/i386-wine-devel-3.3,1.txz) = b6614bed1ce25bf70560b79f0a2953bd3e1b4151cdbc3ca23a9c0fb0ebbf8de6
+SIZE (freebsd:11:x86:64/i386-wine-devel-3.3,1.txz) = 57136896
+SHA256 (freebsd:12:x86:64/i386-wine-devel-3.3,1.txz) = e5f7e1c50098cca9630928e7daacef05841ccb8bb1c2b2f587ff70936e4f65d4
+SIZE (freebsd:12:x86:64/i386-wine-devel-3.3,1.txz) = 61251424
diff --git a/emulators/i386-wine-devel/pkg-plist b/emulators/i386-wine-devel/pkg-plist
index 399a26857587..64393f3c92cf 100644
--- a/emulators/i386-wine-devel/pkg-plist
+++ b/emulators/i386-wine-devel/pkg-plist
@@ -227,6 +227,8 @@ include/wine/windows/d3d11_4.idl
 include/wine/windows/d3d11sdklayers.h
 include/wine/windows/d3d11sdklayers.idl
 include/wine/windows/d3d11shader.h
+include/wine/windows/d3d12.h
+include/wine/windows/d3d12.idl
 include/wine/windows/d3d8.h
 include/wine/windows/d3d8caps.h
 include/wine/windows/d3d8types.h
@@ -669,6 +671,7 @@ include/wine/windows/opnrst.idl
 include/wine/windows/optary.h
 include/wine/windows/optary.idl
 include/wine/windows/patchapi.h
+include/wine/windows/pathcch.h
 include/wine/windows/pdh.h
 include/wine/windows/pdhmsg.h
 include/wine/windows/perflib.h
@@ -1034,6 +1037,7 @@ lib32/wine/acledit.dll.so
 lib32/wine/aclui.dll.so
 lib32/wine/activeds.dll.so
 lib32/wine/actxprxy.dll.so
+lib32/wine/adsldp.dll.so
 lib32/wine/adsldpc.dll.so
 lib32/wine/advapi32.dll.so
 lib32/wine/advpack.dll.so
@@ -1206,6 +1210,7 @@ lib32/wine/api-ms-win-mm-mme-l1-1-0.dll.so
 lib32/wine/api-ms-win-mm-time-l1-1-0.dll.so
 lib32/wine/api-ms-win-ntuser-dc-access-l1-1-0.dll.so
 lib32/wine/api-ms-win-ntuser-rectangle-l1-1-0.dll.so
+lib32/wine/api-ms-win-perf-legacy-l1-1-0.dll.so
 lib32/wine/api-ms-win-power-base-l1-1-0.dll.so
 lib32/wine/api-ms-win-power-setting-l1-1-0.dll.so
 lib32/wine/api-ms-win-rtcore-ntuser-private-l1-1-0.dll.so
@@ -1258,6 +1263,7 @@ lib32/wine/cabinet.dll.so
 lib32/wine/cacls.exe.so
 lib32/wine/capi2032.dll.so
 lib32/wine/cards.dll.so
+lib32/wine/cdosys.dll.so
 lib32/wine/cfgmgr32.dll.so
 lib32/wine/clock.exe.so
 lib32/wine/clusapi.dll.so
@@ -1293,6 +1299,7 @@ lib32/wine/d3d10.dll.so
 lib32/wine/d3d10_1.dll.so
 lib32/wine/d3d10core.dll.so
 lib32/wine/d3d11.dll.so
+lib32/wine/d3d12.dll.so
 lib32/wine/d3d8.dll.so
 lib32/wine/d3d9.dll.so
 lib32/wine/d3dcompiler_33.dll.so
@@ -1425,6 +1432,7 @@ lib32/wine/fakedlls/acledit.dll
 lib32/wine/fakedlls/aclui.dll
 lib32/wine/fakedlls/activeds.dll
 lib32/wine/fakedlls/actxprxy.dll
+lib32/wine/fakedlls/adsldp.dll
 lib32/wine/fakedlls/adsldpc.dll
 lib32/wine/fakedlls/advapi32.dll
 lib32/wine/fakedlls/advpack.dll
@@ -1597,6 +1605,7 @@ lib32/wine/fakedlls/api-ms-win-mm-mme-l1-1-0.dll
 lib32/wine/fakedlls/api-ms-win-mm-time-l1-1-0.dll
 lib32/wine/fakedlls/api-ms-win-ntuser-dc-access-l1-1-0.dll
 lib32/wine/fakedlls/api-ms-win-ntuser-rectangle-l1-1-0.dll
+lib32/wine/fakedlls/api-ms-win-perf-legacy-l1-1-0.dll
 lib32/wine/fakedlls/api-ms-win-power-base-l1-1-0.dll
 lib32/wine/fakedlls/api-ms-win-power-setting-l1-1-0.dll
 lib32/wine/fakedlls/api-ms-win-rtcore-ntuser-private-l1-1-0.dll
@@ -1649,6 +1658,7 @@ lib32/wine/fakedlls/cabinet.dll
 lib32/wine/fakedlls/cacls.exe
 lib32/wine/fakedlls/capi2032.dll
 lib32/wine/fakedlls/cards.dll
+lib32/wine/fakedlls/cdosys.dll
 lib32/wine/fakedlls/cfgmgr32.dll
 lib32/wine/fakedlls/clock.exe
 lib32/wine/fakedlls/clusapi.dll
@@ -1684,6 +1694,7 @@ lib32/wine/fakedlls/d3d10.dll
 lib32/wine/fakedlls/d3d10_1.dll
 lib32/wine/fakedlls/d3d10core.dll
 lib32/wine/fakedlls/d3d11.dll
+lib32/wine/fakedlls/d3d12.dll
 lib32/wine/fakedlls/d3d8.dll
 lib32/wine/fakedlls/d3d9.dll
 lib32/wine/fakedlls/d3dcompiler_33.dll
@@ -2195,6 +2206,7 @@ lib32/wine/fakedlls/winepath.exe
 lib32/wine/fakedlls/wineps.drv
 lib32/wine/fakedlls/wineps16.drv16
 lib32/wine/fakedlls/winevdm.exe
+lib32/wine/fakedlls/winevulkan.dll
 lib32/wine/fakedlls/winex11.drv
 lib32/wine/fakedlls/wing.dll16
 lib32/wine/fakedlls/wing32.dll
@@ -2342,6 +2354,7 @@ lib32/wine/libd3d10.def
 lib32/wine/libd3d10_1.def
 lib32/wine/libd3d10core.def
 lib32/wine/libd3d11.def
+lib32/wine/libd3d12.def
 lib32/wine/libd3d8.def
 lib32/wine/libd3d9.def
 lib32/wine/libd3dcompiler.def
@@ -2819,6 +2832,7 @@ lib32/wine/winepath.exe.so
 lib32/wine/wineps.drv.so
 lib32/wine/wineps16.drv16.so
 lib32/wine/winevdm.exe.so
+lib32/wine/winevulkan.dll.so
 lib32/wine/winex11.drv.so
 lib32/wine/wing.dll16.so
 lib32/wine/wing32.dll.so