git: 9070f78b2fd4 - main - emulators/wine-devel: Improve messages around WoW

The branch main has been updated by gerald:

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

commit 9070f78b2fd4bd0de1246dd77e1ba045bc998a0e
Author:     Gerald Pfeifer <gerald@FreeBSD.org>
AuthorDate: 2026-03-21 21:41:56 +0000
Commit:     Gerald Pfeifer <gerald@FreeBSD.org>
CommitDate: 2026-03-21 22:08:49 +0000

    emulators/wine-devel: Improve messages around WoW
    
    Sync with emulators/wine where commit 942473af4d improved a number of
    messages (and comments) around WoW, i.e. 32-bit support on amd64.
    
    PR:             293073, 291328
    Approved by:    Thibault Payet <monwarez@mailoo.org> (maintainer)
---
 emulators/wine-devel/files/wine-wow64.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/emulators/wine-devel/files/wine-wow64.sh b/emulators/wine-devel/files/wine-wow64.sh
index 478b11d43f99..af386a7c3443 100644
--- a/emulators/wine-devel/files/wine-wow64.sh
+++ b/emulators/wine-devel/files/wine-wow64.sh
@@ -9,11 +9,11 @@ I386_ROOT="${WINE_i386_ROOT:-$HOME/.i386-wine-pkg}"
 if [ ! -f "$I386_ROOT/$PREFIX/bin/wine" ]
 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 "Try installing 32-bit Wine with\n\t%s\n\n" "$PREFIX/share/wine/pkg32.sh install wine-devel mesa-dri"
 
-  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"
+  printf "On FreeBSD 15, use wine64.bin if 32-bit support is not needed.\n"
+  printf "If 32-bit is needed, either use the repository from FreeBSD 14 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 to build your own packages.\n"
 
   ABI=$(pkg config ABI | sed s/amd64/i386/)
   FREEBSD_VERSION_MAJOR=`uname -r | sed "s/\..*//"`
@@ -29,7 +29,7 @@ HERE
   exit 1
 fi
 
-# Export early so that external libs could be found
+# Export early so that external 32-bit libs are found.
 export LD_32_LIBRARY_PATH="${LD_32_LIBRARY_PATH:+$LD_32_LIBRARY_PATH:}$I386_ROOT/$LOCALBASE/lib"
 
 WINE32_VERSION=$(env -u WINELOADERNOEXEC "$I386_ROOT/$PREFIX/bin/wine" --version)
@@ -38,7 +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"
+  printf "If you are on FreeBSD 15, you can use the old repository\n\t%s\n" "$PREFIX/share/wine/pkg32.sh --old upgrade -r FreeBSD-ports"
   exit 1
 fi