From nobody Thu Aug 17 21:18:37 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 4RRdCd6nMgz4q9dM; Thu, 17 Aug 2023 21:18:37 +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 4RRdCd3wnTz4Tlm; Thu, 17 Aug 2023 21:18:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692307117; 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=2lJRSaOBKCGaEE/RAK1oxAS+z+aU2EP2aPRNWonKiNI=; b=NWOqATkpCLWESlHOboB3ViBEp8d6IPIY42KfOLuClebwjzMbip1bfz0tqHtlNA3x8fKDgs FJnwBosAFVVTV1ZVTO2EaphBIevgg3/IajonjZxjIo7eKELALwMQZsftTf2VnpgbyPLm/n FOSHC7Dvyu6G/P7BPYFhXTWvdVnfGhAQus7+NXGFFoe+PGc6vllXEOUwhkSQjn56uae4E/ 5OcKdsriMxagT70NYKDFYNRf81IEDvFbk76JVv+Os+VtzmPOUmrNeTPacRJfwBHQscWh8e vFx1oTu9ejSs5ZJ+TriNUSAFuemImh03gvRj4VO5GFz5Gh09JPUhKPiox2vYZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692307117; 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=2lJRSaOBKCGaEE/RAK1oxAS+z+aU2EP2aPRNWonKiNI=; b=WQV1oQNUoZJZchttGxQzwa2MwV9QznYBnj4HpkXp1KGYM86kSo5Xawue0Dm8YSkOKqYqmT spXlk9twf8GEpF6ZbE+lKhu6I4u86CHaHqrqFcfRddg/JyMWqHYXSokipB7ICbhuwLYizU TKHBvDCKWnrnoQ+z+CtEO0Kcy0eeb47+e+p3drMX/BBnTTQ3mkgAJoi4eo0+m/pwHny73T BBdWoaAfm/PBOojgEqdxT5qmIo1wiQnemWRdfBr+YVIgltXNrUSPfmcAaq/1XmBpoI7JQA Cj6zIKn/7Gh1vrqkxfPDg3ALSoAPpRJNFSogNlzfxPUVqHTX5Modsju418657w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692307117; a=rsa-sha256; cv=none; b=s2CxKxkfQqBGX2pJ6Y4NSvBtzIS06eZU0OyZBWhMKtRTRa9ShMTt/rwr/roByFtyatXuRw cFRfuKrni9Vex7xXvL1DHmrc4kl6DkZrJuPndSjiTzmR1ykm8pwK9fPwQSB4VXa7owXGCO 5eOfhluKKCAWYEpM+kG2VPrCg+JoHfLC5NdTiH2yv8VSRDrcslYfNxB3rbpliWXTbPCakY glbPzC4O2tJmMYNOcFLCKE8uwZgnFHptSnPbocElWKPIr/4DQO4+i0CZRr7VOgO8kPxQVC ztKVxZNuttxlKjOZhaEITscNv6/IbaOSVCyC3KznEDI1kViIU913Vh5Wm6x/vQ== 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 4RRdCd2ydyzqDd; Thu, 17 Aug 2023 21:18:37 +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 37HLIbXh014466; Thu, 17 Aug 2023 21:18:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37HLIbtt014463; Thu, 17 Aug 2023 21:18:37 GMT (envelope-from git) Date: Thu, 17 Aug 2023 21:18:37 GMT Message-Id: <202308172118.37HLIbtt014463@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: 8cd3e4f0fc7a - main - emulators/wine7: Adjust 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: 8cd3e4f0fc7a696019bd3cbeaa810679f23d1482 Auto-Submitted: auto-generated The branch main has been updated by gerald: URL: https://cgit.FreeBSD.org/ports/commit/?id=8cd3e4f0fc7a696019bd3cbeaa810679f23d1482 commit 8cd3e4f0fc7a696019bd3cbeaa810679f23d1482 Author: Gerald Pfeifer AuthorDate: 2023-08-16 11:41:53 +0000 Commit: Gerald Pfeifer CommitDate: 2023-08-17 21:08:39 +0000 emulators/wine7: Adjust 32-bit pkg invocation for WoW64 When cloning wine7 from emulators/wine we missed to update the wine-wow64.sh script with the new package name. PR: 273137 --- emulators/wine7/files/wine-wow64.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/emulators/wine7/files/wine-wow64.sh b/emulators/wine7/files/wine-wow64.sh index ca324c2d50a2..99d2e36975b5 100644 --- a/emulators/wine7/files/wine-wow64.sh +++ b/emulators/wine7/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 wine7 mesa-dri" ABI=$(pkg config ABI | sed s/amd64/i386/) FREEBSD_VERSION_MAJOR=`uname -r | sed "s/\..*//"` cat <<- HERE