[pkgsrc/trunk]: pkgsrc/shells/zsh zsh: Follow pkgdb migration to fix pkg_info...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8ec713abd987
branches:  trunk
changeset: 442980:8ec713abd987
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Fri Dec 04 15:23:02 2020 +0000

description:
zsh: Follow pkgdb migration to fix pkg_info(1) suggestion on NetBSD

Bump PKGREVISION.

diffstat:

 shells/zsh/Makefile                                        |   4 +-
 shells/zsh/distinfo                                        |   3 +-
 shells/zsh/patches/patch-Completion_BSD_Command___bsd__pkg |  22 ++++++++++++++
 3 files changed, 27 insertions(+), 2 deletions(-)

diffs (60 lines):

diff -r 490c5c4d1f5a -r 8ec713abd987 shells/zsh/Makefile
--- a/shells/zsh/Makefile       Fri Dec 04 15:04:05 2020 +0000
+++ b/shells/zsh/Makefile       Fri Dec 04 15:23:02 2020 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.97 2020/05/31 09:25:51 rillig Exp $
+# $NetBSD: Makefile,v 1.98 2020/12/04 15:23:02 ryoon Exp $
 
 DISTNAME=      zsh-5.8
+PKGREVISION=   1
 CATEGORIES=    shells
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=zsh/}
 EXTRACT_SUFX=  .tar.xz
@@ -70,6 +71,7 @@
 .include "options.mk"
 
 pre-configure:
+       ${RM} ${WRKSRC}/Completion/BSD/Command/_bsd_pkg.orig
        cd ${WRKSRC};  autoreconf -fiv
 
 post-install:
diff -r 490c5c4d1f5a -r 8ec713abd987 shells/zsh/distinfo
--- a/shells/zsh/distinfo       Fri Dec 04 15:04:05 2020 +0000
+++ b/shells/zsh/distinfo       Fri Dec 04 15:23:02 2020 +0000
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.69 2020/02/27 03:05:37 ryoon Exp $
+$NetBSD: distinfo,v 1.70 2020/12/04 15:23:02 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-aczsh.m4) = 36c270d8d7cf727f48787ef889b2bd89cbf065e2
 SHA1 (patch-configure.ac) = e4c743b627aeb0a409170ed6c0c3d50d274661e0
diff -r 490c5c4d1f5a -r 8ec713abd987 shells/zsh/patches/patch-Completion_BSD_Command___bsd__pkg
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/shells/zsh/patches/patch-Completion_BSD_Command___bsd__pkg        Fri Dec 04 15:23:02 2020 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-Completion_BSD_Command___bsd__pkg,v 1.1 2020/12/04 15:23:02 ryoon Exp $
+
+* Use new pkgsrc database directory for NetBSD.
+
+--- Completion/BSD/Command/_bsd_pkg.orig       2019-05-06 03:42:37.000000000 +0000
++++ Completion/BSD/Command/_bsd_pkg
+@@ -31,7 +31,14 @@ _bsd_pkg_pkgfiles() {
+ 
+ (( $+functions[_bsd_pkg_pkgs] )) ||
+ _bsd_pkg_pkgs() {
+-  compadd "$@" - ${PKG_DBDIR:-/var/db/pkg}/*(/:t)
++  case $OSTYPE in
++  netbsd*)
++    compadd "$@" - ${PKG_DBDIR:-/usr/pkg/pkgdb}/*(/:t)
++    ;;
++  *)
++    compadd "$@" - ${PKG_DBDIR:-/var/db/pkg}/*(/:t)
++    ;;
++  esac
+ }
+ 
+ (( $+functions[_bsd_pkg_pkgs_and_files] )) ||