Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 29 May 2025 10:22:03 GMT
From:      Gerald Pfeifer <gerald@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 6da5d9f4e588 - main - emulators/wine: Restore 32-bit builds
Message-ID:  <202505291022.54TAM33c059921@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch main has been updated by gerald:

URL: https://cgit.FreeBSD.org/ports/commit/?id=6da5d9f4e5885f06d1444a7931b15264fd352373

commit 6da5d9f4e5885f06d1444a7931b15264fd352373
Author:     Gerald Pfeifer <gerald@FreeBSD.org>
AuthorDate: 2025-05-29 10:18:41 +0000
Commit:     Gerald Pfeifer <gerald@FreeBSD.org>
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:


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202505291022.54TAM33c059921>