[pkgsrc/trunk]: pkgsrc/shells/zsh zsh: Do not hardcode /usr/pkg/pkgdb

[ryoon <ryoon%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/beea514c5f52
branches:  trunk
changeset: 443820:beea514c5f52
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Fri Dec 25 21:47:47 2020 +0000

description:
zsh: Do not hardcode /usr/pkg/pkgdb

Bump PKGREVISION.
TODO: _bsd_pkg should be usable for non-BSD platforms.

diffstat:

 shells/zsh/Makefile                                        |  10 ++++++++--
 shells/zsh/distinfo                                        |   4 ++--
 shells/zsh/patches/patch-Completion_BSD_Command___bsd__pkg |   4 ++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diffs (59 lines):

diff -r 684aa06e87fa -r beea514c5f52 shells/zsh/Makefile
--- a/shells/zsh/Makefile       Thu Dec 24 20:35:25 2020 +0000
+++ b/shells/zsh/Makefile       Fri Dec 25 21:47:47 2020 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.98 2020/12/04 15:23:02 ryoon Exp $
+# $NetBSD: Makefile,v 1.99 2020/12/25 21:47:47 ryoon Exp $
 
 DISTNAME=      zsh-5.8
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    shells
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=zsh/}
 EXTRACT_SUFX=  .tar.xz
@@ -68,6 +68,12 @@
 REPLACE_FILES.zsh+=    Test/runtests.zsh Test/ztst.zsh
 REPLACE_FILES.zsh+=    Util/check-tmux-state Util/reporter
 
+SUBST_CLASSES+=                pkgdb
+SUBST_STAGE.pkgdb=     pre-configure
+SUBST_MESSAGE.pkgdb=   Set PKGDB_DIR
+SUBST_FILES.pkgdb=     Completion/BSD/Command/_bsd_pkg
+SUBST_VARS.pkgdb=      PKG_DBDIR
+
 .include "options.mk"
 
 pre-configure:
diff -r 684aa06e87fa -r beea514c5f52 shells/zsh/distinfo
--- a/shells/zsh/distinfo       Thu Dec 24 20:35:25 2020 +0000
+++ b/shells/zsh/distinfo       Fri Dec 25 21:47:47 2020 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.70 2020/12/04 15:23:02 ryoon Exp $
+$NetBSD: distinfo,v 1.71 2020/12/25 21:47:47 ryoon Exp $
 
 SHA1 (zsh-5.8.tar.xz) = 966ea0498fb94140f3caf12af88e98b0e4d02078
 RMD160 (zsh-5.8.tar.xz) = 4d387cbdaf9db52e24678871cd399c3bd5564429
 SHA512 (zsh-5.8.tar.xz) = 96198ecef498b7d7945fecebbe6bf14065fa8c5d81a7662164579eba8206b79575812d292adea1864bc7487ac0818ba900e25f9ab3802449340de80417c2c533
 Size (zsh-5.8.tar.xz) = 3193284 bytes
-SHA1 (patch-Completion_BSD_Command___bsd__pkg) = dfb6c9bde5c8e388a9daf17ac3550802bab0d36e
+SHA1 (patch-Completion_BSD_Command___bsd__pkg) = 1f9e9e896d0424c13b7d01a3d9b7af0a5fcad363
 SHA1 (patch-aczsh.m4) = 36c270d8d7cf727f48787ef889b2bd89cbf065e2
 SHA1 (patch-configure.ac) = e4c743b627aeb0a409170ed6c0c3d50d274661e0
diff -r 684aa06e87fa -r beea514c5f52 shells/zsh/patches/patch-Completion_BSD_Command___bsd__pkg
--- a/shells/zsh/patches/patch-Completion_BSD_Command___bsd__pkg        Thu Dec 24 20:35:25 2020 +0000
+++ b/shells/zsh/patches/patch-Completion_BSD_Command___bsd__pkg        Fri Dec 25 21:47:47 2020 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-Completion_BSD_Command___bsd__pkg,v 1.1 2020/12/04 15:23:02 ryoon Exp $
+$NetBSD: patch-Completion_BSD_Command___bsd__pkg,v 1.2 2020/12/25 21:47:47 ryoon Exp $
 
 * Use new pkgsrc database directory for NetBSD.
 
@@ -11,7 +11,7 @@
 -  compadd "$@" - ${PKG_DBDIR:-/var/db/pkg}/*(/:t)
 +  case $OSTYPE in
 +  netbsd*)
-+    compadd "$@" - ${PKG_DBDIR:-/usr/pkg/pkgdb}/*(/:t)
++    compadd "$@" - ${PKG_DBDIR:-@PKG_DBDIR@}/*(/:t)
 +    ;;
 +  *)
 +    compadd "$@" - ${PKG_DBDIR:-/var/db/pkg}/*(/:t)