git: 8d60603b7558 - main - emulators/wine8: Refine WoW64 32-bit ABI determination

The branch main has been updated by gerald:

URL: https://cgit.FreeBSD.org/ports/commit/?id=8d60603b7558af3635f2b9b96e61e7a613b77e64

commit 8d60603b7558af3635f2b9b96e61e7a613b77e64
Author:     Alexander Vereeken <Alexander88207@protonmail.com>
AuthorDate: 2024-05-05 19:15:19 +0000
Commit:     Gerald Pfeifer <gerald@FreeBSD.org>
CommitDate: 2024-05-06 09:20:58 +0000

    emulators/wine8: Refine WoW64 32-bit ABI determination
    
    PR:             278525
    Reported by:    Eduardo C. <idude0407@gmail.com>
---
 emulators/wine8/Makefile       | 2 +-
 emulators/wine8/files/pkg32.sh | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/emulators/wine8/Makefile b/emulators/wine8/Makefile
index 7d4a44135519..97fa767d38df 100644
--- a/emulators/wine8/Makefile
+++ b/emulators/wine8/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	wine
 DISTVERSION=	8.0.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	https://dl.winehq.org/wine/source/8.0/
 PKGNAMESUFFIX=	8
diff --git a/emulators/wine8/files/pkg32.sh b/emulators/wine8/files/pkg32.sh
index d75422997e12..64d82459c219 100644
--- a/emulators/wine8/files/pkg32.sh
+++ b/emulators/wine8/files/pkg32.sh
@@ -14,7 +14,6 @@ then
   ln -s /usr/share/keys/pkg "$I386_ROOT/usr/share/keys/pkg"
 fi
 
-ABI=$(pkg config ABI | sed s/amd64/i386/)
 # Show what we're going to do, then do it.
-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" "$@"
+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" "$@"