git: d10bf5d0be8a - main - emulators/wine-devel: Adjust pkg32.sh to pkg 1.17.3

The branch main has been updated by gerald:

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

commit d10bf5d0be8ac6b24b8ffdb42be450b84cdc1eba
Author:     Alex S <iwtcex@gmail.com>
AuthorDate: 2021-10-26 08:21:18 +0000
Commit:     Gerald Pfeifer <gerald@FreeBSD.org>
CommitDate: 2021-10-26 08:21:18 +0000

    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>
---
 emulators/wine-devel/Makefile       | 2 +-
 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" "$@"