diff options
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/playonbsd/Makefile | 2 | ||||
| -rw-r--r-- | emulators/wine-devel/Makefile | 2 | ||||
| -rw-r--r-- | emulators/wine-devel/distinfo | 6 | ||||
| -rw-r--r-- | emulators/wine-devel/files/pkg32.sh | 27 | ||||
| -rw-r--r-- | emulators/wine-devel/files/wine-wow64.sh | 5 |
5 files changed, 33 insertions, 9 deletions
diff --git a/emulators/playonbsd/Makefile b/emulators/playonbsd/Makefile index 260b492a8331..59c9ca98ac61 100644 --- a/emulators/playonbsd/Makefile +++ b/emulators/playonbsd/Makefile @@ -1,6 +1,6 @@ PORTNAME= playonbsd PORTVERSION= 4.2.10 -PORTREVISION= 16 +PORTREVISION= 17 CATEGORIES= emulators games MAINTAINER= Clockwork6400@protonmail.com 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 |
