From 02c4efd3b5a81b88d2e08c8f563c8f6816022991 Mon Sep 17 00:00:00 2001 From: Antoine Brodin Date: Wed, 22 Jul 2020 14:00:59 +0000 Subject: [PATCH] Revert r542851 and unbreak INDEX --- emulators/wine-devel/Makefile | 5 +---- emulators/wine-devel/distinfo | 4 +--- ...tdll-unix-registry.c => patch-dlls-ntdll-unix-registry.c} | 0 emulators/wine-devel/pkg-plist | 1 + 4 files changed, 3 insertions(+), 7 deletions(-) rename emulators/wine-devel/files/{extrapatch-dlls-ntdll-unix-registry.c => patch-dlls-ntdll-unix-registry.c} (100%) diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index 1bd58ad1826c..06763656fa26 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -102,6 +102,7 @@ MPG123_LIB_DEPENDS= libmpg123.so:audio/mpg123 OPENAL_CONFIGURE_WITH= openal OPENAL_USES= openal +STAGING_BROKEN= fails to build STAGING_MASTER_SITES= https://github.com/wine-staging/wine-staging/archive/:staging STAGING_DIST= v${DISTVERSION}.tar.gz STAGING_DISTFILES= ${STAGING_DIST}:staging @@ -136,10 +137,6 @@ X11_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ .include .endif -.if !${PORT_OPTIONS:MSTAGING} -EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-dlls-ntdll-unix-registry.c -.endif - .if ${ARCH} == amd64 # Wine is composed of three parts: # - wine (aka this port) is the 32-bit component and runs 32-bit programs (on FreeBSD/i386) diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo index 22822145d29c..82ef234e675a 100644 --- a/emulators/wine-devel/distinfo +++ b/emulators/wine-devel/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1595332764 +TIMESTAMP = 1595061543 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 diff --git a/emulators/wine-devel/files/extrapatch-dlls-ntdll-unix-registry.c b/emulators/wine-devel/files/patch-dlls-ntdll-unix-registry.c similarity index 100% rename from emulators/wine-devel/files/extrapatch-dlls-ntdll-unix-registry.c rename to emulators/wine-devel/files/patch-dlls-ntdll-unix-registry.c diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist index 6276737ccbbd..12d1c8f8b592 100644 --- a/emulators/wine-devel/pkg-plist +++ b/emulators/wine-devel/pkg-plist @@ -1014,6 +1014,7 @@ include/wine/windows/wuapi.h include/wine/windows/wuapi.idl include/wine/windows/x3daudio.h include/wine/windows/xact3.h +%%STAGING%%include/wine/windows/xact3.idl include/wine/windows/xact3wb.h include/wine/windows/xapo.h include/wine/windows/xapo.idl