Fri Dec 4 15:23:02 2020 UTC ()
zsh: Follow pkgdb migration to fix pkg_info(1) suggestion on NetBSD

Bump PKGREVISION.


(ryoon)
diff -r1.97 -r1.98 pkgsrc/shells/zsh/Makefile
diff -r1.69 -r1.70 pkgsrc/shells/zsh/distinfo
diff -r0 -r1.1 pkgsrc/shells/zsh/patches/patch-Completion_BSD_Command___bsd__pkg
cvs diff -r1.97 -r1.98 pkgsrc/shells/zsh/Makefile (expand / switch to unified diff)

--- pkgsrc/shells/zsh/Makefile 2020/05/31 09:25:51 1.97
+++ pkgsrc/shells/zsh/Makefile 2020/12/04 15:23:02 1.98
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.97 2020/05/31 09:25:51 rillig Exp $ 1# $NetBSD: Makefile,v 1.98 2020/12/04 15:23:02 ryoon Exp $
2 2
3DISTNAME= zsh-5.8 3DISTNAME= zsh-5.8
 4PKGREVISION= 1
4CATEGORIES= shells 5CATEGORIES= shells
5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=zsh/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=zsh/}
6EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
7 8
8MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://zsh.sourceforge.net/ 10HOMEPAGE= http://zsh.sourceforge.net/
10COMMENT= The Z shell 11COMMENT= The Z shell
11LICENSE= gnu-gpl-v2 AND zsh 12LICENSE= gnu-gpl-v2 AND zsh
12 13
13USE_LANGUAGES= c c99 14USE_LANGUAGES= c c99
14USE_TOOLS+= automake autoconf makeinfo 15USE_TOOLS+= automake autoconf makeinfo
15GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
16INFO_FILES= yes 17INFO_FILES= yes
@@ -60,24 +61,25 @@ PKG_SHELL= bin/zsh @@ -60,24 +61,25 @@ PKG_SHELL= bin/zsh
60REPLACE_INTERPRETER+= zsh 61REPLACE_INTERPRETER+= zsh
61REPLACE.zsh.old= .*zsh 62REPLACE.zsh.old= .*zsh
62REPLACE.zsh.new= ${PREFIX}/bin/zsh 63REPLACE.zsh.new= ${PREFIX}/bin/zsh
63REPLACE_FILES.zsh= Functions/Calendar/* 64REPLACE_FILES.zsh= Functions/Calendar/*
64REPLACE_FILES.zsh+= Functions/Example/* 65REPLACE_FILES.zsh+= Functions/Example/*
65REPLACE_FILES.zsh+= Functions/Misc/* 66REPLACE_FILES.zsh+= Functions/Misc/*
66REPLACE_FILES.zsh+= Misc/globtests* 67REPLACE_FILES.zsh+= Misc/globtests*
67REPLACE_FILES.zsh+= Test/runtests.zsh Test/ztst.zsh 68REPLACE_FILES.zsh+= Test/runtests.zsh Test/ztst.zsh
68REPLACE_FILES.zsh+= Util/check-tmux-state Util/reporter 69REPLACE_FILES.zsh+= Util/check-tmux-state Util/reporter
69 70
70.include "options.mk" 71.include "options.mk"
71 72
72pre-configure: 73pre-configure:
 74 ${RM} ${WRKSRC}/Completion/BSD/Command/_bsd_pkg.orig
73 cd ${WRKSRC}; autoreconf -fiv 75 cd ${WRKSRC}; autoreconf -fiv
74 76
75post-install: 77post-install:
76.for f in FEATURES NEWS Etc/BUGS Etc/FAQ 78.for f in FEATURES NEWS Etc/BUGS Etc/FAQ
77 ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/share/doc/zsh 79 ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/share/doc/zsh
78.endfor 80.endfor
79 81
80.include "../../converters/libiconv/buildlink3.mk" 82.include "../../converters/libiconv/buildlink3.mk"
81.include "../../mk/curses.buildlink3.mk" 83.include "../../mk/curses.buildlink3.mk"
82.include "../../mk/terminfo.buildlink3.mk" 84.include "../../mk/terminfo.buildlink3.mk"
83.include "../../mk/bsd.pkg.mk" 85.include "../../mk/bsd.pkg.mk"
cvs diff -r1.69 -r1.70 pkgsrc/shells/zsh/distinfo (expand / switch to unified diff)

--- pkgsrc/shells/zsh/distinfo 2020/02/27 03:05:37 1.69
+++ pkgsrc/shells/zsh/distinfo 2020/12/04 15:23:02 1.70
@@ -1,8 +1,9 @@ @@ -1,8 +1,9 @@
1$NetBSD: distinfo,v 1.69 2020/02/27 03:05:37 ryoon Exp $ 1$NetBSD: distinfo,v 1.70 2020/12/04 15:23:02 ryoon Exp $
2 2
3SHA1 (zsh-5.8.tar.xz) = 966ea0498fb94140f3caf12af88e98b0e4d02078 3SHA1 (zsh-5.8.tar.xz) = 966ea0498fb94140f3caf12af88e98b0e4d02078
4RMD160 (zsh-5.8.tar.xz) = 4d387cbdaf9db52e24678871cd399c3bd5564429 4RMD160 (zsh-5.8.tar.xz) = 4d387cbdaf9db52e24678871cd399c3bd5564429
5SHA512 (zsh-5.8.tar.xz) = 96198ecef498b7d7945fecebbe6bf14065fa8c5d81a7662164579eba8206b79575812d292adea1864bc7487ac0818ba900e25f9ab3802449340de80417c2c533 5SHA512 (zsh-5.8.tar.xz) = 96198ecef498b7d7945fecebbe6bf14065fa8c5d81a7662164579eba8206b79575812d292adea1864bc7487ac0818ba900e25f9ab3802449340de80417c2c533
6Size (zsh-5.8.tar.xz) = 3193284 bytes 6Size (zsh-5.8.tar.xz) = 3193284 bytes
 7SHA1 (patch-Completion_BSD_Command___bsd__pkg) = dfb6c9bde5c8e388a9daf17ac3550802bab0d36e
7SHA1 (patch-aczsh.m4) = 36c270d8d7cf727f48787ef889b2bd89cbf065e2 8SHA1 (patch-aczsh.m4) = 36c270d8d7cf727f48787ef889b2bd89cbf065e2
8SHA1 (patch-configure.ac) = e4c743b627aeb0a409170ed6c0c3d50d274661e0 9SHA1 (patch-configure.ac) = e4c743b627aeb0a409170ed6c0c3d50d274661e0
File Added: pkgsrc/shells/zsh/patches/patch-Completion_BSD_Command___bsd__pkg
$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] )) ||