git: 789fe3db9a60 - main - emulators/wine-devel: Update to Wine 9.7

From: Gerald Pfeifer <gerald_at_FreeBSD.org>
Date: Thu, 09 May 2024 06:45:28 UTC
The branch main has been updated by gerald:

URL: https://cgit.FreeBSD.org/ports/commit/?id=789fe3db9a6066d0759a492cb59d303a3fdc04f7

commit 789fe3db9a6066d0759a492cb59d303a3fdc04f7
Author:     Gerald Pfeifer <gerald@FreeBSD.org>
AuthorDate: 2024-05-09 06:44:59 +0000
Commit:     Gerald Pfeifer <gerald@FreeBSD.org>
CommitDate: 2024-05-09 06:44:59 +0000

    emulators/wine-devel: Update to Wine 9.7
    
    This includes the following changes:
     - Some restructuration of the Vulkan driver interface.
     - Some ARM work (which we aren't using yet).
     - Various bug fixes.
    
    Also refine 32-bit ABI determination for WoW64. [1]
    
    PR:             278525 [1]
    Submitted by:   Alexander Vereeken <Alexander88207@protonmail.com> [1]
    Reviewed by:    Alex S <iwtcex@gmail.com> [1]
---
 emulators/wine-devel/Makefile       | 2 +-
 emulators/wine-devel/distinfo       | 6 +++---
 emulators/wine-devel/files/pkg32.sh | 5 ++---
 emulators/wine-devel/pkg-plist      | 1 +
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index 05195b52501b..cfb75a1b1d7e 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	wine
-DISTVERSION=	9.6
+DISTVERSION=	9.7
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	https://dl.winehq.org/wine/source/9.x/
diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo
index ed60fcbefa83..64b2a0262dbf 100644
--- a/emulators/wine-devel/distinfo
+++ b/emulators/wine-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1714124404
-SHA256 (wine-9.6.tar.xz) = 0e0960ed82b6017e882eda3338bad1270a1177b6cf05f03ac1fab155abe82048
-SIZE (wine-9.6.tar.xz) = 30261488
+TIMESTAMP = 1714804742
+SHA256 (wine-9.7.tar.xz) = d9f3c333656e88bd4cef5331f34b1c8b69c964a52759eef745d8ddae51a15353
+SIZE (wine-9.7.tar.xz) = 30281616
diff --git a/emulators/wine-devel/files/pkg32.sh b/emulators/wine-devel/files/pkg32.sh
index d75422997e12..64d82459c219 100644
--- a/emulators/wine-devel/files/pkg32.sh
+++ b/emulators/wine-devel/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" "$@"
diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist
index e780d7ee862d..22407adcd502 100644
--- a/emulators/wine-devel/pkg-plist
+++ b/emulators/wine-devel/pkg-plist
@@ -624,6 +624,7 @@ include/wine/windows/lmcons.h
 include/wine/windows/lmerr.h
 include/wine/windows/lmjoin.h
 include/wine/windows/lmmsg.h
+include/wine/windows/lmremutl.h
 include/wine/windows/lmserver.h
 include/wine/windows/lmshare.h
 include/wine/windows/lmstats.h