From nobody Wed Nov 24 12:44:41 2021 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 80D8C1891D5B; Wed, 24 Nov 2021 12:44:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Hzggs5cqVz3Ftk; Wed, 24 Nov 2021 12:44:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A08A21F5B; Wed, 24 Nov 2021 12:44:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1AOCifai023252; Wed, 24 Nov 2021 12:44:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AOCifv0023251; Wed, 24 Nov 2021 12:44:41 GMT (envelope-from git) Date: Wed, 24 Nov 2021 12:44:41 GMT Message-Id: <202111241244.1AOCifv0023251@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Stefan E=C3=9Fer?= Subject: git: b1ac48afa4fb - main - emulators/wine: revert accidentially committed local changes List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: se X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b1ac48afa4fb490b5fc7d1dc8e3862ef2ef93c88 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1637757881; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cwDENpeU5k4XIaqg4qdgFtaH/s6Ntu3c+xTUpxdRwmc=; b=LoCXcl/nOKglfnEhEUHgNAHHZJWlZtZk4X9j9LlQK78e+KNfGYd3uaqmpzVs15wRWybK1K sIOHEGydb80Q/Cbtk6rERWIKgmz1tQk2EDO5avHYb7FZOcuY4vpb2IUHUk6q5MjEkg3MpC QJ/IhQoZDyoby8eEDb3Spxs2fVYtf5aaInEtBiv4ecN91KAIc4AkafxjkTvwtUh85kJDZF gNSKOjLIVyVI5M9CPgFz/7ENc9wUTeMBtdpZ3Wlt7gddqnm7p8w4JIwMvbsur9gzulIbWL D+H8xRud+/vxpYK90q0T0S1Wcg9YSNGn27Xgcq7PBtgj9asbjszVijvajM2Ngg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1637757881; a=rsa-sha256; cv=none; b=IWLOxlSQmG7VAbKUeIScu0fce+fjKjAb8lqnhEEWXiPOdLeAIrSAfygUNquUtqq3oaddWp rpbX7dZv6fy9FqMkatzMVvbo2dObfD/bBnnTH1FZJqPoqECQIbgKJoIRPpkQPdO3/g3PAz yRejK0WYsxQz6dE/aJGTmAW4duqvYs4zqR3HPUoQE+oUAsk+8zpAmHSkPss4T/6L2dAmjp HsZo9NjVr71JNChmyndMIv/AJXgzbdHRdVCiU20kf/796z8sXMB8yHLAi3+6NKYcp3wGuu EUbX48WaYjBUVCF9/I9ogr+sPTNubRHTallg9EHAf5NgyM1CskwfpsK0KKd+kQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by se: URL: https://cgit.FreeBSD.org/ports/commit/?id=b1ac48afa4fb490b5fc7d1dc8e3862ef2ef93c88 commit b1ac48afa4fb490b5fc7d1dc8e3862ef2ef93c88 Author: Stefan Eßer AuthorDate: 2021-11-24 12:38:04 +0000 Commit: Stefan Eßer 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