CVS commit: pkgsrc/shells/zsh

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Fri Dec  4 15:23:02 UTC 2020

Modified Files:
        pkgsrc/shells/zsh: Makefile distinfo
Added Files:
        pkgsrc/shells/zsh/patches: patch-Completion_BSD_Command___bsd__pkg

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

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.97 -r1.98 pkgsrc/shells/zsh/Makefile
cvs rdiff -u -r1.69 -r1.70 pkgsrc/shells/zsh/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/shells/zsh/patches/patch-Completion_BSD_Command___bsd__pkg

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/shells/zsh/Makefile
diff -u pkgsrc/shells/zsh/Makefile:1.97 pkgsrc/shells/zsh/Makefile:1.98
--- pkgsrc/shells/zsh/Makefile:1.97     Sun May 31 09:25:51 2020
+++ pkgsrc/shells/zsh/Makefile  Fri Dec  4 15:23:02 2020
@@ -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 @@ REPLACE_FILES.zsh+=   Util/check-tmux-stat
 .include "options.mk"
 
 pre-configure:
+       ${RM} ${WRKSRC}/Completion/BSD/Command/_bsd_pkg.orig
        cd ${WRKSRC};  autoreconf -fiv
 
 post-install:

Index: pkgsrc/shells/zsh/distinfo
diff -u pkgsrc/shells/zsh/distinfo:1.69 pkgsrc/shells/zsh/distinfo:1.70
--- pkgsrc/shells/zsh/distinfo:1.69     Thu Feb 27 03:05:37 2020
+++ pkgsrc/shells/zsh/distinfo  Fri Dec  4 15:23:02 2020
@@ -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

Added files:

Index: pkgsrc/shells/zsh/patches/patch-Completion_BSD_Command___bsd__pkg
diff -u /dev/null pkgsrc/shells/zsh/patches/patch-Completion_BSD_Command___bsd__pkg:1.1
--- /dev/null   Fri Dec  4 15:23:02 2020
+++ pkgsrc/shells/zsh/patches/patch-Completion_BSD_Command___bsd__pkg   Fri Dec  4 15:23:02 2020
@@ -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] )) ||