From nobody Tue Aug 15 21:58:17 2023 X-Original-To: dev-commits-ports-main@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 4RQQBL0Hlvz4qTRc; Tue, 15 Aug 2023 21:58:18 +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 4RQQBK6wP2z4J4Z; Tue, 15 Aug 2023 21:58:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692136698; 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=v6ZX0OEJDZfIAQrD7+u4Qzv+pNLtXl8d11cs47EyVC8=; b=omyC1KtaTtiBv/Y3aoZbw9CNhdOAttNkGjThT8MBAC7JxwFsBiK8fdQ/IyyDv3Kbm/cBfj ZGYd/PfCiB2z+ll51G1VkoaOPvPuPfLOJ0+1/0KQLuMO3dlaV/90IWIyRd2jXF5093Zhgu gNEpceCe7gxrBFQC4hObazducyMQVMg/fjOZyoLUdD6TTvduEKlMVj8NBUv7Ip+LY/sMoH HhYIPN2l4sS9koDiV2FjLD1nxv+jBei3xB+1osq/fIpBQLMqI2e7qRDNEuR9dEJ0VyTxVe 89dmTzjj2HEeiEgRmlrwIDUVAweiz6efFg4uZ7Gbn0I5qA2AhKEur/hPr51vig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692136698; 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=v6ZX0OEJDZfIAQrD7+u4Qzv+pNLtXl8d11cs47EyVC8=; b=cE7ZhtVQIKYPcCt5j+PYX+2OyOh0E/yKNfyIokrwTnn8NQY97G/Stf82jIEJ3Z9DtO/Lxb bj+prdZHoc8NxGPByHWE/z9mQP1oBVZ8miBhWpuEEsDaXRmtnGtQb1hu/kdt/+WoOWW/yA czWwWQs+uMaVnZImGzaSMV0VCkAlXUVCtP0zDfcEE+5bjXIoFalvnRUJLKX7VsxvjXrGkv W1+SnqRkLcczEX6EOyeF4DDzhX1WvDcrzy3QQd2QnaCmTvcPZP/YpnsoW7ADybmXavhaIR 02AEbJBrx/lC4KOGJOTDeCJnc5rHeJsGLTq/WuFCXAaDsv0IXbQbFciHLKeHiw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692136698; a=rsa-sha256; cv=none; b=fKoSSwTBjRPm8wR8DTtd1GCS165LJjKbyoX/sr+7Z4hnTkFFIAJzZks7meTAPrQCMhk8Pp NIMoAiI0VYxnKA0kFAAtxZSbCrHvMiOfdrC1Kmkf371cg5lsFWOa6Eif5p7fA0ekFIpC3a zlo9vj+igmJExWKT2T8D1Gju8c1tsuecpL2MIRxw97OQhVVS/R9k+15g7ytVkMNNXCjIoq zf+Jtv7uDlBX2wKfU7pakfAJVv47B5EEEsnmcbPVOM5Bk7nNSsGuajzHIs+QZTzJuYSi6j Aw9uJLzv6X75bRyAizgyFi+vqrFqEBTghfUzh5JtoYYJBhC+dKeCPEY0c7Jdjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RQQBK5z6dzC3l; Tue, 15 Aug 2023 21:58:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37FLwHkK059197; Tue, 15 Aug 2023 21:58:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37FLwHwF059194; Tue, 15 Aug 2023 21:58:17 GMT (envelope-from git) Date: Tue, 15 Aug 2023 21:58:17 GMT Message-Id: <202308152158.37FLwHwF059194@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gerald Pfeifer Subject: git: 16d8a4b821d2 - main - emulators/wine-devel: Fix 32-bit pkg invocation for WoW64 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gerald X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 16d8a4b821d2db0134901589e22740290cc40020 Auto-Submitted: auto-generated The branch main has been updated by gerald: URL: https://cgit.FreeBSD.org/ports/commit/?id=16d8a4b821d2db0134901589e22740290cc40020 commit 16d8a4b821d2db0134901589e22740290cc40020 Author: Alexander Vereeken AuthorDate: 2023-08-15 21:57:36 +0000 Commit: Gerald Pfeifer CommitDate: 2023-08-15 21:57:36 +0000 emulators/wine-devel: Fix 32-bit pkg invocation for WoW64 This addresses a regression introduced with commit 3f914243d8179e0d on 2022-03-12 which was a forward port from emulators/wine and not sufficiently adjusted to this port). Do not bump PORTREVISION since 32-bit builds are broken right now. PR: 273137 --- emulators/wine-devel/files/wine-wow64.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/emulators/wine-devel/files/wine-wow64.sh b/emulators/wine-devel/files/wine-wow64.sh index ca324c2d50a2..92b3659b7122 100644 --- a/emulators/wine-devel/files/wine-wow64.sh +++ b/emulators/wine-devel/files/wine-wow64.sh @@ -9,7 +9,7 @@ I386_ROOT="${WINE_i386_ROOT:-$HOME/.i386-wine-pkg}" if [ ! -f "$I386_ROOT/$PREFIX/bin/wine" ] then printf "%s doesn't exist!\n\n" "$I386_ROOT/$PREFIX/bin/wine" - printf "Try installing 32-bit Wine with\n\t%s\n" "$PREFIX/share/wine/pkg32.sh install wine mesa-dri" + printf "Try installing 32-bit Wine with\n\t%s\n" "$PREFIX/share/wine/pkg32.sh install wine-devel mesa-dri" ABI=$(pkg config ABI | sed s/amd64/i386/) FREEBSD_VERSION_MAJOR=`uname -r | sed "s/\..*//"` cat <<- HERE