2 files changed, 28 insertions, 4 deletions
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