Fri Dec 25 21:47:47 2020 UTC ()
zsh: Do not hardcode /usr/pkg/pkgdb

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


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

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

--- pkgsrc/shells/zsh/distinfo 2020/12/04 15:23:02 1.70
+++ pkgsrc/shells/zsh/distinfo 2020/12/25 21:47:47 1.71
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.70 2020/12/04 15:23:02 ryoon Exp $ 1$NetBSD: distinfo,v 1.71 2020/12/25 21:47:47 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-Completion_BSD_Command___bsd__pkg) = 1f9e9e896d0424c13b7d01a3d9b7af0a5fcad363
8SHA1 (patch-aczsh.m4) = 36c270d8d7cf727f48787ef889b2bd89cbf065e2 8SHA1 (patch-aczsh.m4) = 36c270d8d7cf727f48787ef889b2bd89cbf065e2
9SHA1 (patch-configure.ac) = e4c743b627aeb0a409170ed6c0c3d50d274661e0 9SHA1 (patch-configure.ac) = e4c743b627aeb0a409170ed6c0c3d50d274661e0
cvs diff -r1.1 -r1.2 pkgsrc/shells/zsh/patches/patch-Completion_BSD_Command___bsd__pkg (expand / switch to unified diff)

--- pkgsrc/shells/zsh/patches/patch-Completion_BSD_Command___bsd__pkg 2020/12/04 15:23:02 1.1
+++ pkgsrc/shells/zsh/patches/patch-Completion_BSD_Command___bsd__pkg 2020/12/25 21:47:47 1.2
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1$NetBSD: patch-Completion_BSD_Command___bsd__pkg,v 1.1 2020/12/04 15:23:02 ryoon Exp $ 1$NetBSD: patch-Completion_BSD_Command___bsd__pkg,v 1.2 2020/12/25 21:47:47 ryoon Exp $
2 2
3* Use new pkgsrc database directory for NetBSD. 3* Use new pkgsrc database directory for NetBSD.
4 4
5--- Completion/BSD/Command/_bsd_pkg.orig 2019-05-06 03:42:37.000000000 +0000 5--- Completion/BSD/Command/_bsd_pkg.orig 2019-05-06 03:42:37.000000000 +0000
6+++ Completion/BSD/Command/_bsd_pkg 6+++ Completion/BSD/Command/_bsd_pkg
7@@ -31,7 +31,14 @@ _bsd_pkg_pkgfiles() { 7@@ -31,7 +31,14 @@ _bsd_pkg_pkgfiles() {
8  8
9 (( $+functions[_bsd_pkg_pkgs] )) || 9 (( $+functions[_bsd_pkg_pkgs] )) ||
10 _bsd_pkg_pkgs() { 10 _bsd_pkg_pkgs() {
11- compadd "$@" - ${PKG_DBDIR:-/var/db/pkg}/*(/:t) 11- compadd "$@" - ${PKG_DBDIR:-/var/db/pkg}/*(/:t)
12+ case $OSTYPE in 12+ case $OSTYPE in
13+ netbsd*) 13+ netbsd*)
14+ compadd "$@" - ${PKG_DBDIR:-/usr/pkg/pkgdb}/*(/:t) 14+ compadd "$@" - ${PKG_DBDIR:-@PKG_DBDIR@}/*(/:t)
15+ ;; 15+ ;;
16+ *) 16+ *)
17+ compadd "$@" - ${PKG_DBDIR:-/var/db/pkg}/*(/:t) 17+ compadd "$@" - ${PKG_DBDIR:-/var/db/pkg}/*(/:t)
18+ ;; 18+ ;;
19+ esac 19+ esac
20 } 20 }
21  21
22 (( $+functions[_bsd_pkg_pkgs_and_files] )) || 22 (( $+functions[_bsd_pkg_pkgs_and_files] )) ||