git: b1ac48afa4fb - main - emulators/wine: revert accidentially committed local changes

From: Stefan Eßer <se_at_FreeBSD.org>
Date: Wed, 24 Nov 2021 12:44:41 UTC
The branch main has been updated by se:

URL: https://cgit.FreeBSD.org/ports/commit/?id=b1ac48afa4fb490b5fc7d1dc8e3862ef2ef93c88

commit b1ac48afa4fb490b5fc7d1dc8e3862ef2ef93c88
Author:     Stefan Eßer <se@FreeBSD.org>
AuthorDate: 2021-11-24 12:38:04 +0000
Commit:     Stefan Eßer <se@FreeBSD.org>
CommitDate: 2021-11-24 12:44:05 +0000

    emulators/wine: revert accidentially committed local changes
    
    In commit 5933ac0b099 CONFLICTS_INSTALL definitions in multiple ports
    have been fixed to omit the unneeded version patterns they had.
    
    The commit of the wine port did not include that fix, but instead
    local changes to deal with an issue introduced by recent changes to
    sched.h.
    
    This commit reverts the accidentially committed changes, but retains
    the intended removal of a version wildcard in CONFLICTS_INSTALL.
    
    Reported by:    gerald
---
 emulators/wine/Makefile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 367205931cc6..ed3e5754d68f 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -18,8 +18,7 @@ ONLY_FOR_ARCHS=	amd64 i386
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/flex:textproc/flex
 LIB_DEPENDS=	libFAudio.so:audio/faudio \
-		libxml2.so:textproc/libxml2 \
-		libsysinfo.so:devel/libsysinfo
+		libxml2.so:textproc/libxml2
 
 USES=		bison cpe desktop-file-utils gmake localbase \
 		pkgconfig sdl shebangfix tar:xz
@@ -58,7 +57,7 @@ CONFIGURE_ARGS+=--verbose \
 		--without-udev \
 		--without-unwind \
 		--without-usb
-CONFIGURE_ENV=	CPPBIN="${CPP}" FLEX="${LOCALBASE}/bin/flex" CFLAGS="-D_WITH_CPU_SET_T"
+CONFIGURE_ENV=	CPPBIN="${CPP}" FLEX="${LOCALBASE}/bin/flex"
 WINELIBDIR?=	${PREFIX}/lib
 .if !defined(USE_LDCONFIG32)
 USE_LDCONFIG=	${WINELIBDIR} ${WINELIBDIR}/wine