From nobody Thu May 29 10:22:03 2025 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 4b7Mqc3tzsz5y3fl; Thu, 29 May 2025 10:22:04 +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 4b7Mqb53rGz3vWl; Thu, 29 May 2025 10:22:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748514123; 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=rGNwBhVO6MdaKOqvvw48g/RaxvJRQKC9Y81R79OuRV8=; b=CsvmmrkiHLrjDnl3BAyQQWxmTcTgox3GaVzz6gtUyu8c1PtkZ8oedsqlwpCaMGxpxtNeKE BJsEv4Tw+cSAkHo4abDBCowiGiW/Ecq4EGFEvogXpEubEJL8iMyzgphW2b2VUOGkX0/jzj rD82F07riYLpgcljXM2NgdP7oh5gEHY0d0WGiC+C5mzbEkg2b1redOwLhc4nYPOECG4g3G 1QHL6Ik626oV6imS86c9qh9msLKkYiVBuJl7pdGnoAEoaW9BPIMBD0Fl2XQqgdiJ7vBhY7 CG6KrNITi5Mv4Olxx73tNPxgVIQqCv6dCD3A0PgNDBCPVKgey5Dr6/mPWdcGMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748514123; a=rsa-sha256; cv=none; b=P9zdTkWxZTZLIg4IJ8JeMSRfVxz2pLtGlH100tK+JqrS4j6z3cV1Dom3rRvgszG9OjNRCv 2gFrBbmRWIQd1/LRIY+Cr1AcS1YsOfKomy/wtE8IzdLTPaLdRVb7z1/udN1UjdOf+tNosH 1eltCU6i/MuXyxxE+0oD1jOKS05y3Vt4UEeYhNC8XrWgfuKm+SbWIGjlFn0PEXMVK4snWc 6yZq8YYzisgONpdpvS05dVtlwOOVkzP0ul3SQaJoo6y+UKwvcAWTvLBlj+NpKR+j07vkBR uxLjhGZRNT9YuZZg4/ZagLo1bwDCvtZ9VYCV4pCHDYv4Juk4oCrMJY/G/qCnVQ== 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=1748514123; 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=rGNwBhVO6MdaKOqvvw48g/RaxvJRQKC9Y81R79OuRV8=; b=VI3JRYt77yHkX2Rld5jLBdUpbhBYhC4l9VWBVmokxyNCYupRZAA89MIA/HVPkhH40Mig3C Qneiy96TWvCh1NxRaLayVhpLvVaGEoH6niZZvjNNtMzc9YE++ezj9IWqe9StcmfxdYZdZh YbOTd0MoUi8WY0fGCN+IfeUsefTaz2L6IZu0sfQP4WgM6SENERoNdjyL7kG733Oj0smUTO +aYMlURNRKWXfka3WPPaT67ETtUwlPAgJnBmF6ZISSTs37teyGfgxFHvontBU+xpcKJPJX my5SY/8aHtGsraBolCyzfqL9Hrylw64Shm9QC1TFaqoKh6sGtJklgFb95tJsmg== 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 4b7Mqb47svz1Hk5; Thu, 29 May 2025 10:22:03 +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 54TAM3Vt059924; Thu, 29 May 2025 10:22:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54TAM33c059921; Thu, 29 May 2025 10:22:03 GMT (envelope-from git) Date: Thu, 29 May 2025 10:22:03 GMT Message-Id: <202505291022.54TAM33c059921@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: 6da5d9f4e588 - main - emulators/wine: Restore 32-bit builds 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: 6da5d9f4e5885f06d1444a7931b15264fd352373 Auto-Submitted: auto-generated The branch main has been updated by gerald: URL: https://cgit.FreeBSD.org/ports/commit/?id=6da5d9f4e5885f06d1444a7931b15264fd352373 commit 6da5d9f4e5885f06d1444a7931b15264fd352373 Author: Gerald Pfeifer AuthorDate: 2025-05-29 10:18:41 +0000 Commit: Gerald Pfeifer CommitDate: 2025-05-29 10:21:51 +0000 emulators/wine: Restore 32-bit builds We need the same source tree for 32-bit as for 64-bit builds for files/patch-man not to break things. Also revert f48100735d93 which was harmless, alas not helpful. PR: 204227 --- emulators/wine/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index 2df6984a7179..13b3d6e84b7c 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -148,11 +148,14 @@ PLIST_SUB+= WINE32="@comment " WINE64="" WINEARCH="x86_64" # FreeBSD yet. post-patch: ${REINPLACE_CMD} '/Exec/s|wine|wine64|g' ${WRKSRC}/loader/wine.desktop - ${CP} ${WRKSRC}/loader/*.man.in ${WRKSRC}/tools/wine/ + ${MV} ${WRKSRC}/loader/*.man.in ${WRKSRC}/tools/wine/ .else EXTRA_PATCHES+= files/extra-patch-tools-winebuild-res32 PLIST_SUB+= WINE32="" WINE64="@comment " WINEARCH="i386" + +post-patch: + ${MV} ${WRKSRC}/loader/*.man.in ${WRKSRC}/tools/wine/ .endif pre-build: