git: db5b7c102e70 - main - emulators/wine-devel: Update 11.0-rc2 => 11.0-rc3

The branch main has been updated by vvd:

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

commit db5b7c102e70ee5bcbaafb76f73969f538e16819
Author:     Thibault Payet <monwarez@mailoo.org>
AuthorDate: 2025-12-21 02:53:16 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2025-12-21 02:57:56 +0000

    emulators/wine-devel: Update 11.0-rc2 => 11.0-rc3
    
    Changelog:
    - Bug fixes only, we are in code freeze.
    https://gitlab.winehq.org/wine/wine/-/releases/wine-11.0-rc3
    
    Allow user of 15.0 to install 32bit packages from 14.3:
    Add a new positional parameter --old for pkg32.sh that would allow the
    user to install the 32bits from the 14.3 repository.
    
    PR:     291849 291328
---
 emulators/wine-devel/Makefile            |  2 +-
 emulators/wine-devel/distinfo            |  6 +++---
 emulators/wine-devel/files/pkg32.sh      | 27 ++++++++++++++++++++++++---
 emulators/wine-devel/files/wine-wow64.sh |  5 ++++-
 4 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index 2f0dfdc83ee8..7bbdb4e26d37 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	wine
-DISTVERSION=	11.0-rc2
+DISTVERSION=	11.0-rc3
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	https://dl.winehq.org/wine/source/11.0/
diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo
index 2378c636c5bb..f626c45deaa4 100644
--- a/emulators/wine-devel/distinfo
+++ b/emulators/wine-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1765613391
-SHA256 (wine-11.0-rc2.tar.xz) = 58c3f4091e94500ba691bd9cd47095137160ccd3b23c365473a6d90c843b55ef
-SIZE (wine-11.0-rc2.tar.xz) = 33148876
+TIMESTAMP = 1766260757
+SHA256 (wine-11.0-rc3.tar.xz) = 6f1dcd06fe8d9b19d7b6ce605373fa21c17a56abf67f84dba19e7a68b92a1322
+SIZE (wine-11.0-rc3.tar.xz) = 33168328
diff --git a/emulators/wine-devel/files/pkg32.sh b/emulators/wine-devel/files/pkg32.sh
index 04595f6c104c..41fed66b1045 100644
--- a/emulators/wine-devel/files/pkg32.sh
+++ b/emulators/wine-devel/files/pkg32.sh
@@ -18,6 +18,27 @@ if [ ! -d "$I386_ROOT/usr/share/keys/pkg" ]; then
   ln -s /usr/share/keys/pkg "$I386_ROOT/usr/share/keys/pkg"
 fi
 
-# Show what we're going to do, then do it.
-echo pkg -o ABI_FILE=$ABI_FILE -o INSTALL_AS_USER=true -o RUN_SCRIPTS=false --rootdir "$I386_ROOT" "$@"
-exec pkg -o ABI_FILE=$ABI_FILE -o INSTALL_AS_USER=true -o RUN_SCRIPTS=false --rootdir "$I386_ROOT" "$@"
+run_pkg32()
+{
+    # Show what we're going to do, then do it.
+    echo pkg -o ABI_FILE=$ABI_FILE -o INSTALL_AS_USER=true -o RUN_SCRIPTS=false --rootdir "$I386_ROOT" "$@";
+    pkg -o ABI_FILE=$ABI_FILE -o INSTALL_AS_USER=true -o RUN_SCRIPTS=false --rootdir "$I386_ROOT" "$@";
+}
+
+run_pkg32_old()
+{
+    shift
+
+    # Show what we're going to do, then do it.
+    echo pkg -o ABI="FreeBSD:14:i386" -o OSVERSION=1403000 -o INSTALL_AS_USER=true -o RUN_SCRIPTS=false --rootdir "$I386_ROOT" "$@";
+    pkg -o ABI="FreeBSD:14:i386" -o OSVERSION=1403000 -o INSTALL_AS_USER=true -o RUN_SCRIPTS=false --rootdir "$I386_ROOT" "$@";
+}
+
+if [ $# -gt 0 ]; then
+    case $1 in
+    --old) run_pkg32_old "$@" ;;
+    *) run_pkg32 "$@" ;;
+    esac
+else
+    run_pkg32 "$@"
+fi
diff --git a/emulators/wine-devel/files/wine-wow64.sh b/emulators/wine-devel/files/wine-wow64.sh
index 23afe20f1514..478b11d43f99 100644
--- a/emulators/wine-devel/files/wine-wow64.sh
+++ b/emulators/wine-devel/files/wine-wow64.sh
@@ -11,7 +11,9 @@ then
   printf "%s doesn't exist!\n\n" "$I386_ROOT/$PREFIX/bin/wine"
   printf "Try installing 32-bit Wine with\n\t%s\n" "$PREFIX/share/wine/pkg32.sh install wine-devel mesa-dri"
 
-  printf "In the case of FreeBSD 15.0, use wine64.bin instead or use Poudriere if 32bit is needed\n"
+  printf "In the case of FreeBSD 15.0, use wine64.bin if 32bit is not needed\n"
+  printf "If 32bit is needed, then either use the repository from 14.3 with this command:\n\t%s\n" "$PREFIX/share/wine/pkg32.sh --old install -r FreeBSD-ports wine-devel mesa-dri"
+  printf "Or use Poudriere\n"
 
   ABI=$(pkg config ABI | sed s/amd64/i386/)
   FREEBSD_VERSION_MAJOR=`uname -r | sed "s/\..*//"`
@@ -36,6 +38,7 @@ if [ "$WINE32_VERSION" != "$WINE64_VERSION" ]
 then
   printf "wine [%s] and wine64 [%s] versions do not match!\n\n" "$WINE32_VERSION" "$WINE64_VERSION"
   printf "Try updating 32-bit wine with\n\t%s\n" "$PREFIX/share/wine/pkg32.sh upgrade"
+  printf "If you are on 15.0, then you can use the old repository\n\t%s\n" "$PREFIX/share/wine/pkg32.sh --old upgrade -r FreeBSD-ports"
   exit 1
 fi