diff options
| author | ryoon <ryoon@pkgsrc.org> | 2020-12-25 21:47:47 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2020-12-25 21:47:47 +0000 |
| commit | 91d32ce061e97114f019aacc7e144461bd70a794 (patch) | |
| tree | 0d73f3f726385016aa66dead7fc92ca30755165c /shells | |
| parent | fb0521a769f8ef3c7e7a44d126db26f526e44875 (diff) | |
| download | pkgsrc-91d32ce061e97114f019aacc7e144461bd70a794.tar.gz | |
zsh: Do not hardcode /usr/pkg/pkgdb
Bump PKGREVISION.
TODO: _bsd_pkg should be usable for non-BSD platforms.
Diffstat (limited to 'shells')
| -rw-r--r-- | shells/zsh/Makefile | 10 | ||||
| -rw-r--r-- | shells/zsh/distinfo | 4 | ||||
| -rw-r--r-- | shells/zsh/patches/patch-Completion_BSD_Command___bsd__pkg | 4 |
3 files changed, 12 insertions, 6 deletions
diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile index 2245e07b4d3..cd98f721855 100644 --- a/shells/zsh/Makefile +++ b/shells/zsh/Makefile @@ -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+= Misc/globtests* 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 --git a/shells/zsh/distinfo b/shells/zsh/distinfo index b01d4d6e7eb..b4b69dd4946 100644 --- a/shells/zsh/distinfo +++ b/shells/zsh/distinfo @@ -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 --git a/shells/zsh/patches/patch-Completion_BSD_Command___bsd__pkg b/shells/zsh/patches/patch-Completion_BSD_Command___bsd__pkg index 05c0dc888bf..6e739aee870 100644 --- a/shells/zsh/patches/patch-Completion_BSD_Command___bsd__pkg +++ b/shells/zsh/patches/patch-Completion_BSD_Command___bsd__pkg @@ -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 @@ $NetBSD: patch-Completion_BSD_Command___bsd__pkg,v 1.1 2020/12/04 15:23:02 ryoon - 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) |