diff options
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/wine/Makefile | 2 | ||||
| -rw-r--r-- | emulators/wine/files/pkg32.sh | 16 |
2 files changed, 11 insertions, 7 deletions
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index 13b3d6e84b7c..a086d9c20cfd 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -1,6 +1,6 @@ PORTNAME= wine DISTVERSION= 10.0 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= https://dl.winehq.org/wine/source/10.0/ diff --git a/emulators/wine/files/pkg32.sh b/emulators/wine/files/pkg32.sh index 64d82459c219..04595f6c104c 100644 --- a/emulators/wine/files/pkg32.sh +++ b/emulators/wine/files/pkg32.sh @@ -1,19 +1,23 @@ #!/bin/sh -e -if [ "$(id -u)" = 0 ] -then +if [ "$(id -u)" = 0 ]; then echo "Don't run this script as root!" exit 1 fi I386_ROOT="${WINE_i386_ROOT:-$HOME/.i386-wine-pkg}" +ABI_FILE=/usr/lib32/libc.so.7 -if [ ! -d "$I386_ROOT/usr/share/keys/pkg" ] -then +if [ ! -f $ABI_FILE ]; then + echo "\"$ABI_FILE\" not found; exiting." + exit 1 +fi + +if [ ! -d "$I386_ROOT/usr/share/keys/pkg" ]; then mkdir -p "$I386_ROOT/usr/share/keys" 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=/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" "$@" +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" "$@" |