From nobody Mon Jul 01 10:06:07 2024 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 4WCMBR3c8Sz5Q1TR; Mon, 01 Jul 2024 10:06:07 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WCMBR34hrz4Dx7; Mon, 1 Jul 2024 10:06:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719828367; 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=BT8WbFDebCt4wP8M1hXcgyqChe0aZztbkeVFYmGVWHg=; b=i8EoDDej3npZzopH9eGWUhppYMmdZRwT+2JzG8GVSALbprhDOsCehahxLQiJMwOiGhbdq1 alx8IT4Ge5z/WBxTbOuef8WpeFJQbkVBcU+2WXOfIuG91Zfyp4gaLkedfB0st1hqH1MJTv xmyRQiJQGvUBfBDAE0IyYWpH3XSK/rZqT4K9BDDTwVThtmT7zxvzIAtj/W6ChoVBOZE+Hy 2xFg3Fiavds+RryCXyJyR4+SnSIPDUPJFT1glEbAnyEG/+qzv5P0kWcNH4qutPOR62qH3m N0zsov3SLnpY9dovXsS090JFoVTEWxa3KLUYxM2N08V+78o7Xi0pG+CbC/r/yg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719828367; a=rsa-sha256; cv=none; b=iufmZKLwMYCtZEB0SPCnqPq2VQseYlJVvhSzsOHZ/M0JEzPVRr4dheTyGZ77Rv7ftVpYwx FXw4BqgJDwZE8V3LPKyx96knQm8NzykWbJ1GgHnGhMOjIqO83cR5CqZRux8GRPPnjepmAC sxH5Rr7jxESlxJ92mDRGr72Ysio5mGL75/cZKYg8gApVgKswRpeUSy1VUiBwWLjuR5wVny 9uouO0zRerQvTVvbma/BVDRU3kDmaimEhQvk128jxv74zJgmki4OiaeH6Af3dEKc4lfNFd P8Q78wQ3ln0TA33FwyDrCkv/l2/YVR30BSCfKsaqv86adMI4o0K6hD3IS1FTwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719828367; 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=BT8WbFDebCt4wP8M1hXcgyqChe0aZztbkeVFYmGVWHg=; b=nCC+wrR7xHeQfIdeefeKO6//52sdQ7j7NYCNUp3mM6VKSOH5MkB+HjGOBpQVski9Gexl16 ruHXUI8oBzMMi/wNHFO8iS8kv2wfLwWwoVfgXLji4X2cMi60j1SgwsfCM8IbbzQZKZ9wXI rHqsoARqVy8lVIKde44PsxBuUDH/rO1WFaxVZyV1/M7/U1+p0p9+3OZ64ptouMRFqMtX/n nxJ3DaSOQUnMtPTnVJZj4ZbLzWhWxZBFOUE1VuZ6EjqqHQ0bVUCjjv4dDgL5Sk+PxNWkAT a3JtyHrTFFgJ+ZK48xZqvDyiFTWnLSGb1EKAttODcs42Cni4j3QxtC98qlY5mQ== 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 4WCMBR2Qfnz11Jp; Mon, 1 Jul 2024 10:06:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 461A67CK056600; Mon, 1 Jul 2024 10:06:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 461A67kO056597; Mon, 1 Jul 2024 10:06:07 GMT (envelope-from git) Date: Mon, 1 Jul 2024 10:06:07 GMT Message-Id: <202407011006.461A67kO056597@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: a1490b259251 - main - emulators/wine-devel: Sync files/wine.sh with emulators/wine 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-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: a1490b259251fe09f42ec55658a0f2c5d89a2479 Auto-Submitted: auto-generated The branch main has been updated by gerald: URL: https://cgit.FreeBSD.org/ports/commit/?id=a1490b259251fe09f42ec55658a0f2c5d89a2479 commit a1490b259251fe09f42ec55658a0f2c5d89a2479 Author: Gerald Pfeifer AuthorDate: 2024-07-01 10:05:19 +0000 Commit: Gerald Pfeifer CommitDate: 2024-07-01 10:05:19 +0000 emulators/wine-devel: Sync files/wine.sh with emulators/wine This forward ports the following two commits from emulators/wine as far as files/wine.sh goes: commit ef11261971a87d2b75b352ab479b651d2f2b0b50 Author: Gerald Pfeifer Date: Wed Jan 31 12:27:21 2024 +0000 emulators/wine: Simplify the logic in wine.sh and commit 0f2052c3784e3b8d5aed85aab22b8a49613ee85c Author: Alexander Vereeken Date: Sun Dec 17 22:58:41 2023 +0000 emulators/wine: Unbreak WoW64 This is an excerpt of 1f07ec6014 by Alex S for emulators/wine-proton. PR: 275677, 279927 Reported by: scf --- emulators/wine-devel/Makefile | 1 + emulators/wine-devel/files/wine.sh | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index a91c963d466d..1a9a09b5679b 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -1,5 +1,6 @@ PORTNAME= wine DISTVERSION= 9.11 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= https://dl.winehq.org/wine/source/9.x/ diff --git a/emulators/wine-devel/files/wine.sh b/emulators/wine-devel/files/wine.sh index 96a350fce615..ebd89e55ebdc 100644 --- a/emulators/wine-devel/files/wine.sh +++ b/emulators/wine-devel/files/wine.sh @@ -2,9 +2,12 @@ TARGET="$(realpath "$0")" -if [ -z "$WINESERVER" ] && [ -f "${TARGET}server32" ] -then - export WINESERVER="${TARGET}server32" +if [ -z "$WINESERVER" ]; then + if [ -f "${TARGET%/*}/wineserver32" ]; then + export WINESERVER="${TARGET%/*}/wineserver32" + elif [ -f "${TARGET%/*}/wineserver" ]; then + export WINESERVER="${TARGET%/*}/wineserver" + fi fi # Workaround for https://bugs.winehq.org/show_bug.cgi?id=50257