diff --git a/emulators/i386-wine/Makefile b/emulators/i386-wine/Makefile --- a/emulators/i386-wine/Makefile +++ b/emulators/i386-wine/Makefile @@ -8,7 +8,6 @@ # define a dummy DISTVERSION to avoid errors with poudriere bulk -a # on architectures unsupported by this port DISTVERSION?= 0 -PORTREVISION= 1 PKGNAMEPREFIX= i386- CATEGORIES= emulators @@ -24,7 +23,7 @@ distinfo-update: ${RM} ${.CURDIR}/distinfo ${.CURDIR}/distinfo~ -.for osrel in 11 12 13 +.for osrel in 11 12 13 14 ${MAKE} fetch OSREL=${osrel} OSVERSION=${osrel}99999 _OSRELEASE=${osrel} ${MAKE} makesum OSREL=${osrel} OSVERSION=${osrel}99999 _OSRELEASE=${osrel} ${CAT} ${.CURDIR}/distinfo >> ${.CURDIR}/distinfo~ diff --git a/emulators/i386-wine/Makefile.amd64 b/emulators/i386-wine/Makefile.amd64 --- a/emulators/i386-wine/Makefile.amd64 +++ b/emulators/i386-wine/Makefile.amd64 @@ -1,8 +1,8 @@ # Created by: David Naylor -DISTVERSION= 5.0 +DISTVERSION= 5.0.4 PORTEPOCH= 1 -MASTER_SITES= LOCAL/salvadore/i386-wine/${DIST_SUBDIR}/ +MASTER_SITES= https://homura.magzu.net/winebuilds/${DIST_SUBDIR}/ DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${DISTVERSION},${PORTEPOCH} DIST_SUBDIR= FreeBSD:${OSREL:C/\..*//}:amd64 @@ -22,7 +22,7 @@ PKGMESSAGE= ${WRKDIR}/pkg-message PORTSCOUT= limitw:1,even -.for osrel in 11 12 13 +.for osrel in 11 12 13 14 .if ${OSREL:C/\..*//} == ${osrel} PLIST_SUB+= OSREL${osrel}="" PLIST_SUB+= NOOSREL${osrel}="@comment " @@ -32,8 +32,8 @@ .endif .endfor -.if ${OPSYS} != FreeBSD || (!(${OSVERSION} >= 1104000 && ${OSVERSION} < 1200000) && !(${OSVERSION} >= 1202000 && ${OSVERSION} < 1300000) && !(${OSVERSION} >= 1300084 && ${OSVERSION} < 1400000)) -IGNORE= binaries compiled for FreeBSD 11.4+, 12.2+ and 13.0+ only +.if ${OPSYS} != FreeBSD || (!(${OSVERSION} >= 1104000 && ${OSVERSION} < 1200000) && !(${OSVERSION} >= 1202000 && ${OSVERSION} < 1300000) && !(${OSVERSION} >= 1300084 && ${OSVERSION} < 1400000) && !(${OSVERSION} >= 1400006)) +IGNORE= binaries compiled for FreeBSD 11.4+, 12.2+, 13.0+ and 14.0+ only .endif OPTIONS_DEFINE= GECKO MONO diff --git a/emulators/i386-wine/distinfo b/emulators/i386-wine/distinfo --- a/emulators/i386-wine/distinfo +++ b/emulators/i386-wine/distinfo @@ -1,7 +1,9 @@ -TIMESTAMP = 1588246565 -SHA256 (FreeBSD:11:amd64/i386-wine-5.0,1.txz) = 18967945475b8b98f21ee0f0b063b3450c30241ff8127bfd8f829cbe614176e8 -SIZE (FreeBSD:11:amd64/i386-wine-5.0,1.txz) = 71647480 -SHA256 (FreeBSD:12:amd64/i386-wine-5.0,1.txz) = a32f4c10ca4062854d47c1a2052c2872458a5d669a00bd4bb52e75f48324af1c -SIZE (FreeBSD:12:amd64/i386-wine-5.0,1.txz) = 71924448 -SHA256 (FreeBSD:13:amd64/i386-wine-5.0,1.txz) = 0b402febf2caa60cfae326ed0f9830fb38eb74494f58bd4355db270dab7a9e43 -SIZE (FreeBSD:13:amd64/i386-wine-5.0,1.txz) = 73941832 +TIMESTAMP = 1619355602 +SHA256 (FreeBSD:11:amd64/i386-wine-5.0.4,1.txz) = 10edadd4365d0185cc8d74309b8b7603162617dd80d2ad66562e46d60b7b8e0d +SIZE (FreeBSD:11:amd64/i386-wine-5.0.4,1.txz) = 92826236 +SHA256 (FreeBSD:12:amd64/i386-wine-5.0.4,1.txz) = 8f06392db8208abccc40f10f52db8448a126330bb8507f42032263566b9573c6 +SIZE (FreeBSD:12:amd64/i386-wine-5.0.4,1.txz) = 93166296 +SHA256 (FreeBSD:13:amd64/i386-wine-5.0.4,1.txz) = 58a203ba1d7f434b338a2bfa55c57b99a5dd71ab4f8822b0bd8de67e369aa6ed +SIZE (FreeBSD:13:amd64/i386-wine-5.0.4,1.txz) = 93594704 +SHA256 (FreeBSD:14:amd64/i386-wine-5.0.4,1.txz) = 08718f11593cd95ccafa69992fc4c8d3252864f5a7337b91c26991e3b5a038eb +SIZE (FreeBSD:14:amd64/i386-wine-5.0.4,1.txz) = 93636880 diff --git a/emulators/i386-wine/pkg-plist b/emulators/i386-wine/pkg-plist --- a/emulators/i386-wine/pkg-plist +++ b/emulators/i386-wine/pkg-plist @@ -1031,6 +1031,7 @@ include/wine/windows/zmouse.h lib32/.libGL/dri/i915_dri.so lib32/.libGL/dri/i965_dri.so +lib32/.libGL/dri/iris_dri.so lib32/.libGL/dri/kms_swrast_dri.so lib32/.libGL/dri/r200_dri.so lib32/.libGL/dri/r300_dri.so @@ -1040,7 +1041,7 @@ lib32/.libGL/dri/swrast_dri.so lib32/.libGL/dri/vmwgfx_dri.so lib32/.libGL/libGL.so.1 -lib32/libLLVM-8.so +lib32/libLLVM-10.so lib32/libX11-xcb.so.1 lib32/libX11.so.6 lib32/libXau.so.6 @@ -1061,17 +1062,18 @@ lib32/libdrm_radeon.so.1 lib32/libedit.so.0 lib32/libexpat.so.1 -lib32/libffi.so.6 +lib32/libffi.so.7 lib32/libfontconfig.so.1 lib32/libfreetype.so.6 lib32/libglapi.so.0 lib32/libgmp.so.10 lib32/libgnutls.so.30 -lib32/libhogweed.so.5 +lib32/libhogweed.so.6 lib32/libidn2.so.0 +lib32/libintl.so.8 lib32/libjpeg.so.8 lib32/liblcms2.so.2 -lib32/libnettle.so.7 +lib32/libnettle.so.8 lib32/libp11-kit.so.0 lib32/libpciaccess.so.0 lib32/libpng16.so.16 @@ -1089,6 +1091,7 @@ lib32/libxcb.so.1 lib32/libxml2.so.2 lib32/libxshmfence.so.1 +lib32/libzstd.so.1 lib32/wine/acledit.dll.so lib32/wine/aclui.dll.so lib32/wine/activeds.dll.so @@ -2361,6 +2364,8 @@ lib32/wine/fakedlls/wer.dll lib32/wine/fakedlls/wevtapi.dll lib32/wine/fakedlls/wevtutil.exe +lib32/wine/fakedlls/where.exe +lib32/wine/fakedlls/whoami.exe lib32/wine/fakedlls/wiaservc.dll lib32/wine/fakedlls/wimgapi.dll lib32/wine/fakedlls/win32s16.dll16 @@ -3024,6 +3029,8 @@ lib32/wine/wer.dll.so lib32/wine/wevtapi.dll.so lib32/wine/wevtutil.exe.so +lib32/wine/where.exe.so +lib32/wine/whoami.exe.so lib32/wine/wiaservc.dll.so lib32/wine/wimgapi.dll.so lib32/wine/win32s16.dll16.so