git: 3b0b9249b5c1 - main - emulators/wine-proton: Refine WoW64 32-bit ABI determination

The branch main has been updated by gerald:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3b0b9249b5c1a920c53f828ed51e73a0a638c24e

commit 3b0b9249b5c1a920c53f828ed51e73a0a638c24e
Author:     Alexander Vereeken <Alexander88207@protonmail.com>
AuthorDate: 2024-05-05 19:11:39 +0000
Commit:     Gerald Pfeifer <gerald@FreeBSD.org>
CommitDate: 2024-05-05 19:12:25 +0000

    emulators/wine-proton: Refine WoW64 32-bit ABI determination
    
    PR:             278525
    Reported by:    Eduardo C. <idude0407@gmail.com>
    Approved by:    Alex S <iwtcex@gmail.com> (maintainer)
---
 emulators/wine-proton/Makefile       | 2 +-
 emulators/wine-proton/files/pkg32.sh | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/emulators/wine-proton/Makefile b/emulators/wine-proton/Makefile
index 0d6cc6af9321..ff22204d38cc 100644
--- a/emulators/wine-proton/Makefile
+++ b/emulators/wine-proton/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	wine-proton
 DISTVERSION=	8.0-5
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	emulators
 
 MAINTAINER=	iwtcex@gmail.com
diff --git a/emulators/wine-proton/files/pkg32.sh b/emulators/wine-proton/files/pkg32.sh
index 6e87ee27add3..64d82459c219 100644
--- a/emulators/wine-proton/files/pkg32.sh
+++ b/emulators/wine-proton/files/pkg32.sh
@@ -14,6 +14,6 @@ then
   ln -s /usr/share/keys/pkg "$I386_ROOT/usr/share/keys/pkg"
 fi
 
-ABI=$(pkg config ABI | sed s/amd64/i386/)
-echo pkg -o ABI="$ABI" -o INSTALL_AS_USER=true -o RUN_SCRIPTS=false --rootdir "$I386_ROOT" "$@"
-exec pkg -o ABI="$ABI" -o INSTALL_AS_USER=true -o RUN_SCRIPTS=false --rootdir "$I386_ROOT" "$@"
+# Show what we're going to do, then do it.
+echo pkg -o ABI_FILE=/usr/lib32/libc.so.7 -o INSTALL_AS_USER=true -o RUN_SCRIPTS=false --rootdir "$I386_ROOT" "$@"
+exec pkg -o ABI_FILE=/usr/lib32/libc.so.7 -o INSTALL_AS_USER=true -o RUN_SCRIPTS=false --rootdir "$I386_ROOT" "$@"