diff options
| author | Alex S <iwtcex@gmail.com> | 2021-10-26 08:21:18 +0000 |
|---|---|---|
| committer | Gerald Pfeifer <gerald@FreeBSD.org> | 2021-10-26 08:21:18 +0000 |
| commit | d10bf5d0be8ac6b24b8ffdb42be450b84cdc1eba (patch) | |
| tree | 74cce2d2005d0d3f0c2b8cd5d4fdfd8517ad5bfb | |
| parent | 994d222c89224d6709757c1c3449f1222b952afe (diff) | |
emulators/wine-devel: Adjust pkg32.sh to pkg 1.17.3
After recent changes, given an uninitialized root dir pkg now fails
with:
pkg: Error opening the trusted directory /usr/share/keys/pkg/trusted
pkg: Error loading trusted certificates
This works around it for our WoW setup.
PR: 259404
Approved by: Damjan Jovanovic <damjan.jov@gmail.com>
| -rw-r--r-- | emulators/wine-devel/Makefile | 2 | ||||
| -rw-r--r-- | emulators/wine-devel/files/pkg32.sh | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index 16caa1a462b6..2ae1e4df53c0 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -2,7 +2,7 @@ PORTNAME= wine DISTVERSION= 6.19 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= SF/${PORTNAME}/Source \ diff --git a/emulators/wine-devel/files/pkg32.sh b/emulators/wine-devel/files/pkg32.sh index 267fb8b38ca4..d75422997e12 100644 --- a/emulators/wine-devel/files/pkg32.sh +++ b/emulators/wine-devel/files/pkg32.sh @@ -8,7 +8,12 @@ fi I386_ROOT="${WINE_i386_ROOT:-$HOME/.i386-wine-pkg}" -mkdir -p "$I386_ROOT" +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 + ABI=$(pkg config ABI | sed s/amd64/i386/) # Show what we're going to do, then do it. echo pkg -o ABI="$ABI" -o INSTALL_AS_USER=true -o RUN_SCRIPTS=false --rootdir "$I386_ROOT" "$@" |