CVS commit: pkgsrc/shells/zsh

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

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Mon May 16 14:58:30 UTC 2022

Modified Files:
        pkgsrc/shells/zsh: Makefile PLIST distinfo
        pkgsrc/shells/zsh/patches: patch-Completion_BSD_Command___bsd__pkg
            patch-Completion_Unix_Command___gpg patch-configure.ac
Removed Files:
        pkgsrc/shells/zsh/patches: patch-aczsh.m4

Log Message:
zsh: Update to 5.9

Changelog:
5.9:
Changes since 5.8.1
-------------------

zsh 5.9 is dedicated to the memory of Sven Guckes, who was, amongst other
things, a long-time zsh advocate.  For more information, see:

  https://linuxnews.de/2022/02/sven-guckes-verstorben/
  https://groups.google.com/g/vim_announce/c/MJBKVd-xrEE/m/joVNaDgAAgAJ

When unsetting a hash element, the string enclosed in square brackets is
interpreted literally after any normal command-line-argument expansions.
Thus
  unset "hash[$key]"
first expands $key as usual for a double-quoted string, and then interprets
that result as the exact hash element to unset.  This differs from previous
versions of the shell, which would also remove a leading backslash for an
unusual subset of characters in the expansion of $key.  Note this also
means, for example, that now
  unset 'hash[ab]cd]'
unsets the element with key "ab]cd" rather than silently doing nothing.

The function command learnt a -T option to declare a function and enable
tracing for it simultaneously.

The option SHORT_REPEAT was added to enable the short syntax of
SHORT_LOOPS for the repeat command only. It is disabled by default.

The _arguments function now supports NUL-delimiting optargs in the
opt_args array via the -0 option. Developers of completion functions
should find this easier to handle reliably than the default
colon-delimiting behaviour.

The zsh/system module's `zsystem flock` command learnt an -i option to
set the wait interval used with -t. Additionally, -t now supports
fractional seconds.

The option CLOBBER_EMPTY was added to enable the overwrite behaviour
of CLOBBER for empty files only. It is disabled by default.

A (-) expansion flag was added. It works like (n) but correctly sorts
negative numbers.

The (*) expansion flag enables EXTENDED_GLOB for pattern matching.
For example, ${(*)sample/(#b)*(pat)*/${match[1]}} uses backreferences
even if EXTENDED_GLOB is not otherwise set.  However, this does not
descend into nested exapansions, and doubling as (**) does not disable
EXTENDED_GLOB.

The compinit function learnt a -w option to explain why compdump runs.
When run without the -i or -u options and compaudit discovers security
issues, answering "y" to the "Ignore insecure ..." prompt removes the
insecure elements (like the -i option) where previously it ignored the
result (thus formerly like the -u option).  Further, removing those
elements includes dropping directories from the $fpath array.

The zsh/datetime module's strftime builtin learnt an -n option to omit
the trailing newline when printing a formatted time.

The XTRACE option is now disabled while running user-defined completion
widgets.  This corresponds to long-standing behavior of other user ZLE
widgets.  Use the _complete_debug widget to capture XTRACE output, or
use "functions -T" to enable tracing of specific completion functions.

The fc builtin learnt an -s option which is a POSIX equivalent to the
`fc -e-` method of re-executing a command without invoking an editor.

The option CASE_PATHS was added to control how NO_CASE_GLOB behaves.
NO_CASE_GLOB + NO_CASE_PATHS is equivalent to the current NO_CASE_GLOB
behaviour. NO_CASE_GLOB + CASE_PATHS treats only path components that
contain globbing characters as case-insensitive; this behaviour may
yield more predictable results on case-sensitive file systems.
NO_CASE_PATHS is the default.

With the new TYPESET_TO_UNSET option set, "typeset foo" leaves foo unset,
in contrast to the default behavior which assigns foo="".  Any parameter
attributes such as numeric type, sorting, and padding are retained until
the parameter is explicitly unset or a conflicting value is assigned.
This is similar to default behavior of bash and ksh.  This option is
disabled by default.

The compadd builtin's -D option can now be specified more than once.

The zsh/zutil module's zformat builtin learnt an -F option which behaves
like -f except that ternary expressions check for existence instead of
doing math evaluation.

The conventional syntax used to indicate units, ranges, and default values
in completion descriptions (e.g. `timeout (seconds) (0-60) [20]`) is now
recognised by the completion system itself. These components are parsed
out of the description and can be individually styled. A _numbers helper
function has been added to help function authors offer rich completion
for these values.

The log builtin, WATCH parameter, et al., have been broken out into a
separate module, zsh/watch. The module is enabled by default.

The zsh/watch module's WATCHFMT parameter now supports colours via the
%F and %K escapes.

The STTY parameter can now be set to an empty string before running a
command to automatically restore terminal settings after the command
finishes.

The "jobs" command and "$jobstates" and related parameters can report on
parent shell jobs even in subshells.  This is a snapshot of the parent
state, frozen at the point the subshell started.  However, if a subshell
starts its own background jobs, the parent state is discarded in order
to report on those new jobs.


To generate a diff of this commit:
cvs rdiff -u -r1.102 -r1.103 pkgsrc/shells/zsh/Makefile
cvs rdiff -u -r1.43 -r1.44 pkgsrc/shells/zsh/PLIST
cvs rdiff -u -r1.76 -r1.77 pkgsrc/shells/zsh/distinfo
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/shells/zsh/patches/patch-Completion_BSD_Command___bsd__pkg
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/shells/zsh/patches/patch-Completion_Unix_Command___gpg
cvs rdiff -u -r1.1 -r0 pkgsrc/shells/zsh/patches/patch-aczsh.m4
cvs rdiff -u -r1.8 -r1.9 pkgsrc/shells/zsh/patches/patch-configure.ac

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.102 pkgsrc/shells/zsh/Makefile:1.103
--- pkgsrc/shells/zsh/Makefile:1.102    Sat Mar 12 06:07:48 2022
+++ pkgsrc/shells/zsh/Makefile  Mon May 16 14:58:30 2022
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.102 2022/03/12 06:07:48 kim Exp $
+# $NetBSD: Makefile,v 1.103 2022/05/16 14:58:30 ryoon Exp $
 
-DISTNAME=      zsh-5.8.1
+DISTNAME=      zsh-5.9
 CATEGORIES=    shells
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=zsh/}
 EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      http://zsh.sourceforge.net/
+HOMEPAGE=      https://zsh.sourceforge.io/
 COMMENT=       The Z shell
 LICENSE=       gnu-gpl-v2 AND zsh
 
@@ -63,6 +63,7 @@ REPLACE.zsh.new=      ${PREFIX}/bin/zsh
 REPLACE_FILES.zsh=     Functions/Calendar/*
 REPLACE_FILES.zsh+=    Functions/Example/*
 REPLACE_FILES.zsh+=    Functions/Misc/*
+REPLACE_FILES.zsh+=    Functions/VCS_Info/*
 REPLACE_FILES.zsh+=    Misc/globtests*
 REPLACE_FILES.zsh+=    Test/runtests.zsh Test/ztst.zsh
 REPLACE_FILES.zsh+=    Util/check-tmux-state Util/reporter

Index: pkgsrc/shells/zsh/PLIST
diff -u pkgsrc/shells/zsh/PLIST:1.43 pkgsrc/shells/zsh/PLIST:1.44
--- pkgsrc/shells/zsh/PLIST:1.43        Thu Feb 27 03:05:37 2020
+++ pkgsrc/shells/zsh/PLIST     Mon May 16 14:58:30 2022
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.43 2020/02/27 03:05:37 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.44 2022/05/16 14:58:30 ryoon Exp $
 bin/zsh
 bin/${PKGNAME}
 info/zsh.info
@@ -30,6 +30,7 @@ ${PLIST.dynamic}lib/zsh/${PKGVERSION}/zs
 ${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/system.so
 ${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/termcap.so
 ${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/terminfo.so
+${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/watch.so
 ${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/zftp.so
 ${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/zle.so
 ${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/zleparameter.so
@@ -95,8 +96,10 @@ share/zsh/${PKGVERSION}/functions/VCS_IN
 share/zsh/${PKGVERSION}/functions/VCS_INFO_quilt
 share/zsh/${PKGVERSION}/functions/VCS_INFO_reposub
 share/zsh/${PKGVERSION}/functions/VCS_INFO_set
+share/zsh/${PKGVERSION}/functions/VCS_INFO_set-branch-format
 share/zsh/${PKGVERSION}/functions/VCS_INFO_set-patch-format
 share/zsh/${PKGVERSION}/functions/_SUSEconfig
+share/zsh/${PKGVERSION}/functions/__arguments
 share/zsh/${PKGVERSION}/functions/_a2ps
 share/zsh/${PKGVERSION}/functions/_a2utils
 share/zsh/${PKGVERSION}/functions/_aap
@@ -147,6 +150,7 @@ share/zsh/${PKGVERSION}/functions/_awk
 share/zsh/${PKGVERSION}/functions/_axi-cache
 share/zsh/${PKGVERSION}/functions/_base64
 share/zsh/${PKGVERSION}/functions/_basename
+share/zsh/${PKGVERSION}/functions/_basenc
 share/zsh/${PKGVERSION}/functions/_bash
 share/zsh/${PKGVERSION}/functions/_bash_completions
 share/zsh/${PKGVERSION}/functions/_baudrates
@@ -182,6 +186,7 @@ share/zsh/${PKGVERSION}/functions/_calen
 share/zsh/${PKGVERSION}/functions/_call_function
 share/zsh/${PKGVERSION}/functions/_call_program
 share/zsh/${PKGVERSION}/functions/_canonical_paths
+share/zsh/${PKGVERSION}/functions/_capabilities
 share/zsh/${PKGVERSION}/functions/_cat
 share/zsh/${PKGVERSION}/functions/_ccal
 share/zsh/${PKGVERSION}/functions/_cd
@@ -195,6 +200,7 @@ share/zsh/${PKGVERSION}/functions/_chcon
 share/zsh/${PKGVERSION}/functions/_chflags
 share/zsh/${PKGVERSION}/functions/_chkconfig
 share/zsh/${PKGVERSION}/functions/_chmod
+share/zsh/${PKGVERSION}/functions/_choom
 share/zsh/${PKGVERSION}/functions/_chown
 share/zsh/${PKGVERSION}/functions/_chroot
 share/zsh/${PKGVERSION}/functions/_chrt
@@ -235,8 +241,10 @@ share/zsh/${PKGVERSION}/functions/_cpupo
 share/zsh/${PKGVERSION}/functions/_crontab
 share/zsh/${PKGVERSION}/functions/_cryptsetup
 share/zsh/${PKGVERSION}/functions/_cscope
+share/zsh/${PKGVERSION}/functions/_csplit
 share/zsh/${PKGVERSION}/functions/_cssh
 share/zsh/${PKGVERSION}/functions/_csup
+share/zsh/${PKGVERSION}/functions/_ctags
 share/zsh/${PKGVERSION}/functions/_ctags_tags
 share/zsh/${PKGVERSION}/functions/_cu
 share/zsh/${PKGVERSION}/functions/_curl
@@ -271,6 +279,7 @@ share/zsh/${PKGVERSION}/functions/_debdi
 share/zsh/${PKGVERSION}/functions/_debfoster
 share/zsh/${PKGVERSION}/functions/_deborphan
 share/zsh/${PKGVERSION}/functions/_debsign
+share/zsh/${PKGVERSION}/functions/_debsnap
 share/zsh/${PKGVERSION}/functions/_debuild
 share/zsh/${PKGVERSION}/functions/_default
 share/zsh/${PKGVERSION}/functions/_defaults
@@ -313,6 +322,8 @@ share/zsh/${PKGVERSION}/functions/_dpkg-
 share/zsh/${PKGVERSION}/functions/_dpkg_source
 share/zsh/${PKGVERSION}/functions/_dput
 share/zsh/${PKGVERSION}/functions/_drill
+share/zsh/${PKGVERSION}/functions/_dropbox
+share/zsh/${PKGVERSION}/functions/_dscverify
 share/zsh/${PKGVERSION}/functions/_dsh
 share/zsh/${PKGVERSION}/functions/_dtrace
 share/zsh/${PKGVERSION}/functions/_dtruss
@@ -460,6 +471,7 @@ share/zsh/${PKGVERSION}/functions/_ionic
 share/zsh/${PKGVERSION}/functions/_iostat
 share/zsh/${PKGVERSION}/functions/_ip
 share/zsh/${PKGVERSION}/functions/_ipadm
+share/zsh/${PKGVERSION}/functions/_ipfw
 share/zsh/${PKGVERSION}/functions/_ipsec
 share/zsh/${PKGVERSION}/functions/_ipset
 share/zsh/${PKGVERSION}/functions/_iptables
@@ -481,12 +493,15 @@ share/zsh/${PKGVERSION}/functions/_join
 share/zsh/${PKGVERSION}/functions/_jot
 share/zsh/${PKGVERSION}/functions/_jq
 share/zsh/${PKGVERSION}/functions/_kdeconnect
+share/zsh/${PKGVERSION}/functions/_kdump
 share/zsh/${PKGVERSION}/functions/_kfmclient
 share/zsh/${PKGVERSION}/functions/_kill
 share/zsh/${PKGVERSION}/functions/_killall
 share/zsh/${PKGVERSION}/functions/_kld
 share/zsh/${PKGVERSION}/functions/_knock
 share/zsh/${PKGVERSION}/functions/_kpartx
+share/zsh/${PKGVERSION}/functions/_ktrace
+share/zsh/${PKGVERSION}/functions/_ktrace_points
 share/zsh/${PKGVERSION}/functions/_kvno
 share/zsh/${PKGVERSION}/functions/_last
 share/zsh/${PKGVERSION}/functions/_ld_debug
@@ -510,7 +525,9 @@ share/zsh/${PKGVERSION}/functions/_local
 share/zsh/${PKGVERSION}/functions/_localedef
 share/zsh/${PKGVERSION}/functions/_locales
 share/zsh/${PKGVERSION}/functions/_locate
+share/zsh/${PKGVERSION}/functions/_logger
 share/zsh/${PKGVERSION}/functions/_logical_volumes
+share/zsh/${PKGVERSION}/functions/_login_classes
 share/zsh/${PKGVERSION}/functions/_look
 share/zsh/${PKGVERSION}/functions/_losetup
 share/zsh/${PKGVERSION}/functions/_lp
@@ -520,6 +537,7 @@ share/zsh/${PKGVERSION}/functions/_lsblk
 share/zsh/${PKGVERSION}/functions/_lscfg
 share/zsh/${PKGVERSION}/functions/_lsdev
 share/zsh/${PKGVERSION}/functions/_lslv
+share/zsh/${PKGVERSION}/functions/_lsns
 share/zsh/${PKGVERSION}/functions/_lsof
 share/zsh/${PKGVERSION}/functions/_lspv
 share/zsh/${PKGVERSION}/functions/_lsusb
@@ -539,6 +557,8 @@ share/zsh/${PKGVERSION}/functions/_main_
 share/zsh/${PKGVERSION}/functions/_make
 share/zsh/${PKGVERSION}/functions/_make-kpkg
 share/zsh/${PKGVERSION}/functions/_man
+share/zsh/${PKGVERSION}/functions/_mat
+share/zsh/${PKGVERSION}/functions/_mat2
 share/zsh/${PKGVERSION}/functions/_match
 share/zsh/${PKGVERSION}/functions/_math
 share/zsh/${PKGVERSION}/functions/_math_params
@@ -611,7 +631,9 @@ share/zsh/${PKGVERSION}/functions/_nmap
 share/zsh/${PKGVERSION}/functions/_normal
 share/zsh/${PKGVERSION}/functions/_nothing
 share/zsh/${PKGVERSION}/functions/_npm
+share/zsh/${PKGVERSION}/functions/_nsenter
 share/zsh/${PKGVERSION}/functions/_nslookup
+share/zsh/${PKGVERSION}/functions/_numbers
 share/zsh/${PKGVERSION}/functions/_numfmt
 share/zsh/${PKGVERSION}/functions/_nvram
 share/zsh/${PKGVERSION}/functions/_objdump
@@ -627,6 +649,7 @@ share/zsh/${PKGVERSION}/functions/_opkg
 share/zsh/${PKGVERSION}/functions/_options
 share/zsh/${PKGVERSION}/functions/_options_set
 share/zsh/${PKGVERSION}/functions/_options_unset
+share/zsh/${PKGVERSION}/functions/_opustools
 share/zsh/${PKGVERSION}/functions/_osascript
 share/zsh/${PKGVERSION}/functions/_osc
 share/zsh/${PKGVERSION}/functions/_other_accounts
@@ -646,6 +669,7 @@ share/zsh/${PKGVERSION}/functions/_pbm
 share/zsh/${PKGVERSION}/functions/_pbuilder
 share/zsh/${PKGVERSION}/functions/_pdf
 share/zsh/${PKGVERSION}/functions/_pdftk
+share/zsh/${PKGVERSION}/functions/_perf
 share/zsh/${PKGVERSION}/functions/_perforce
 share/zsh/${PKGVERSION}/functions/_perl
 share/zsh/${PKGVERSION}/functions/_perl_basepods
@@ -653,6 +677,7 @@ share/zsh/${PKGVERSION}/functions/_perl_
 share/zsh/${PKGVERSION}/functions/_perldoc
 share/zsh/${PKGVERSION}/functions/_pfctl
 share/zsh/${PKGVERSION}/functions/_pfexec
+share/zsh/${PKGVERSION}/functions/_pgids
 share/zsh/${PKGVERSION}/functions/_pgrep
 share/zsh/${PKGVERSION}/functions/_php
 share/zsh/${PKGVERSION}/functions/_physical_volumes
@@ -662,6 +687,7 @@ share/zsh/${PKGVERSION}/functions/_pidof
 share/zsh/${PKGVERSION}/functions/_pids
 share/zsh/${PKGVERSION}/functions/_pine
 share/zsh/${PKGVERSION}/functions/_ping
+share/zsh/${PKGVERSION}/functions/_pip
 share/zsh/${PKGVERSION}/functions/_piuparts
 share/zsh/${PKGVERSION}/functions/_pkg-config
 share/zsh/${PKGVERSION}/functions/_pkg5
@@ -683,6 +709,7 @@ share/zsh/${PKGVERSION}/functions/_postf
 share/zsh/${PKGVERSION}/functions/_postgresql
 share/zsh/${PKGVERSION}/functions/_postscript
 share/zsh/${PKGVERSION}/functions/_powerd
+share/zsh/${PKGVERSION}/functions/_pr
 share/zsh/${PKGVERSION}/functions/_precommand
 share/zsh/${PKGVERSION}/functions/_prefix
 share/zsh/${PKGVERSION}/functions/_print
@@ -699,6 +726,7 @@ share/zsh/${PKGVERSION}/functions/_pscp
 share/zsh/${PKGVERSION}/functions/_pspdf
 share/zsh/${PKGVERSION}/functions/_psutils
 share/zsh/${PKGVERSION}/functions/_ptree
+share/zsh/${PKGVERSION}/functions/_ptx
 share/zsh/${PKGVERSION}/functions/_pump
 share/zsh/${PKGVERSION}/functions/_putclip
 share/zsh/${PKGVERSION}/functions/_pv
@@ -738,6 +766,8 @@ share/zsh/${PKGVERSION}/functions/_rlogi
 share/zsh/${PKGVERSION}/functions/_rm
 share/zsh/${PKGVERSION}/functions/_rmdir
 share/zsh/${PKGVERSION}/functions/_route
+share/zsh/${PKGVERSION}/functions/_routing_domains
+share/zsh/${PKGVERSION}/functions/_routing_tables
 share/zsh/${PKGVERSION}/functions/_rpm
 share/zsh/${PKGVERSION}/functions/_rrdtool
 share/zsh/${PKGVERSION}/functions/_rsync
@@ -775,6 +805,7 @@ share/zsh/${PKGVERSION}/functions/_set
 share/zsh/${PKGVERSION}/functions/_set_command
 share/zsh/${PKGVERSION}/functions/_setfacl
 share/zsh/${PKGVERSION}/functions/_setopt
+share/zsh/${PKGVERSION}/functions/_setpriv
 share/zsh/${PKGVERSION}/functions/_setsid
 share/zsh/${PKGVERSION}/functions/_setup
 share/zsh/${PKGVERSION}/functions/_setxkbmap
@@ -834,11 +865,15 @@ share/zsh/${PKGVERSION}/functions/_swaks
 share/zsh/${PKGVERSION}/functions/_swanctl
 share/zsh/${PKGVERSION}/functions/_swift
 share/zsh/${PKGVERSION}/functions/_sys_calls
+share/zsh/${PKGVERSION}/functions/_sysclean
 share/zsh/${PKGVERSION}/functions/_sysctl
+share/zsh/${PKGVERSION}/functions/_sysmerge
+share/zsh/${PKGVERSION}/functions/_syspatch
 share/zsh/${PKGVERSION}/functions/_sysrc
 share/zsh/${PKGVERSION}/functions/_sysstat
 share/zsh/${PKGVERSION}/functions/_systat
 share/zsh/${PKGVERSION}/functions/_system_profiler
+share/zsh/${PKGVERSION}/functions/_sysupgrade
 share/zsh/${PKGVERSION}/functions/_tac
 share/zsh/${PKGVERSION}/functions/_tags
 share/zsh/${PKGVERSION}/functions/_tail
@@ -879,6 +914,7 @@ share/zsh/${PKGVERSION}/functions/_trans
 share/zsh/${PKGVERSION}/functions/_trap
 share/zsh/${PKGVERSION}/functions/_trash
 share/zsh/${PKGVERSION}/functions/_tree
+share/zsh/${PKGVERSION}/functions/_truncate
 share/zsh/${PKGVERSION}/functions/_truss
 share/zsh/${PKGVERSION}/functions/_tty
 share/zsh/${PKGVERSION}/functions/_ttyctl
@@ -897,12 +933,14 @@ share/zsh/${PKGVERSION}/functions/_unhas
 share/zsh/${PKGVERSION}/functions/_uniq
 share/zsh/${PKGVERSION}/functions/_unison
 share/zsh/${PKGVERSION}/functions/_units
+share/zsh/${PKGVERSION}/functions/_unshare
 share/zsh/${PKGVERSION}/functions/_update-alternatives
 share/zsh/${PKGVERSION}/functions/_update-rc.d
 share/zsh/${PKGVERSION}/functions/_uptime
 share/zsh/${PKGVERSION}/functions/_urls
 share/zsh/${PKGVERSION}/functions/_urpmi
 share/zsh/${PKGVERSION}/functions/_urxvt
+share/zsh/${PKGVERSION}/functions/_usbconfig
 share/zsh/${PKGVERSION}/functions/_uscan
 share/zsh/${PKGVERSION}/functions/_user_admin
 share/zsh/${PKGVERSION}/functions/_user_at_host
@@ -915,7 +953,9 @@ share/zsh/${PKGVERSION}/functions/_value
 share/zsh/${PKGVERSION}/functions/_values
 share/zsh/${PKGVERSION}/functions/_vared
 share/zsh/${PKGVERSION}/functions/_vars
-share/zsh/${PKGVERSION}/functions/_vcsh
+share/zsh/${PKGVERSION}/functions/_vcs_info
+share/zsh/${PKGVERSION}/functions/_vcs_info_hooks
+share/zsh/${PKGVERSION}/functions/_vi
 share/zsh/${PKGVERSION}/functions/_vim
 share/zsh/${PKGVERSION}/functions/_vim-addons
 share/zsh/${PKGVERSION}/functions/_visudo
@@ -973,6 +1013,7 @@ share/zsh/${PKGVERSION}/functions/_xcode
 share/zsh/${PKGVERSION}/functions/_xdvi
 share/zsh/${PKGVERSION}/functions/_xfig
 share/zsh/${PKGVERSION}/functions/_xft_fonts
+share/zsh/${PKGVERSION}/functions/_xinput
 share/zsh/${PKGVERSION}/functions/_xloadimage
 share/zsh/${PKGVERSION}/functions/_xmlsoft
 share/zsh/${PKGVERSION}/functions/_xmlstarlet
@@ -1006,7 +1047,6 @@ share/zsh/${PKGVERSION}/functions/_zeal
 share/zsh/${PKGVERSION}/functions/_zed
 share/zsh/${PKGVERSION}/functions/_zfs
 share/zsh/${PKGVERSION}/functions/_zfs_dataset
-share/zsh/${PKGVERSION}/functions/_zfs_keysource_props
 share/zsh/${PKGVERSION}/functions/_zfs_pool
 share/zsh/${PKGVERSION}/functions/_zftp
 share/zsh/${PKGVERSION}/functions/_zip
@@ -1017,7 +1057,6 @@ share/zsh/${PKGVERSION}/functions/_zmv
 share/zsh/${PKGVERSION}/functions/_zoneadm
 share/zsh/${PKGVERSION}/functions/_zones
 share/zsh/${PKGVERSION}/functions/_zparseopts
-share/zsh/${PKGVERSION}/functions/_zpool
 share/zsh/${PKGVERSION}/functions/_zpty
 share/zsh/${PKGVERSION}/functions/_zsh
 share/zsh/${PKGVERSION}/functions/_zsh-mime-handler
@@ -1120,6 +1159,7 @@ share/zsh/${PKGVERSION}/functions/replac
 share/zsh/${PKGVERSION}/functions/replace-string
 share/zsh/${PKGVERSION}/functions/replace-string-again
 share/zsh/${PKGVERSION}/functions/run-help
+share/zsh/${PKGVERSION}/functions/run-help-btrfs
 share/zsh/${PKGVERSION}/functions/run-help-git
 share/zsh/${PKGVERSION}/functions/run-help-ip
 share/zsh/${PKGVERSION}/functions/run-help-openssl
@@ -1154,6 +1194,8 @@ ${PLIST.dynamic}share/zsh/${PKGVERSION}/
 ${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/tcp_spam
 ${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/tcp_talk
 ${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/tcp_wait
+share/zsh/${PKGVERSION}/functions/test-repo-git-rebase-apply
+share/zsh/${PKGVERSION}/functions/test-repo-git-rebase-merge
 share/zsh/${PKGVERSION}/functions/tetris
 share/zsh/${PKGVERSION}/functions/tetriscurses
 share/zsh/${PKGVERSION}/functions/throw
@@ -1274,7 +1316,6 @@ share/zsh/${PKGVERSION}/help/kill
 share/zsh/${PKGVERSION}/help/let
 share/zsh/${PKGVERSION}/help/limit
 share/zsh/${PKGVERSION}/help/local
-share/zsh/${PKGVERSION}/help/log
 share/zsh/${PKGVERSION}/help/logout
 share/zsh/${PKGVERSION}/help/noglob
 share/zsh/${PKGVERSION}/help/popd
@@ -1329,4 +1370,3 @@ share/zsh/${PKGVERSION}/help/zsocket
 share/zsh/${PKGVERSION}/help/zstyle
 share/zsh/${PKGVERSION}/help/ztcp
 ${PLIST.dynamic}share/zsh/${PKGVERSION}/scripts/newuser
-@pkgdir share/zsh/site-functions

Index: pkgsrc/shells/zsh/distinfo
diff -u pkgsrc/shells/zsh/distinfo:1.76 pkgsrc/shells/zsh/distinfo:1.77
--- pkgsrc/shells/zsh/distinfo:1.76     Sat Mar 12 06:07:48 2022
+++ pkgsrc/shells/zsh/distinfo  Mon May 16 14:58:30 2022
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.76 2022/03/12 06:07:48 kim Exp $
+$NetBSD: distinfo,v 1.77 2022/05/16 14:58:30 ryoon Exp $
 
-BLAKE2s (zsh-5.8.1.tar.xz) = 4ee16432bdb40c9f7c79da389ca32d5e45c339608425214f84075a3cea8f3e9b
-SHA512 (zsh-5.8.1.tar.xz) = f54a5a47ed15d134902613f6169c985680afc45a67538505e11b66b348fcb367145e9b8ae2d9eac185e07ef5f97254b85df01ba97294002a8c036fd02ed5e76d
-Size (zsh-5.8.1.tar.xz) = 3200540 bytes
-SHA1 (patch-Completion_BSD_Command___bsd__pkg) = c15924342b827b0ee490ac01a89fe06d439fef0f
-SHA1 (patch-Completion_Unix_Command___gpg) = 226b6025e646f8c74e7e648f33a1001310c9ce3e
+BLAKE2s (zsh-5.9.tar.xz) = 1ab2ab9dd0debc176bdefd661b62e102153c26f591e35916ccc7527c337d0530
+SHA512 (zsh-5.9.tar.xz) = d9138b7f379ad942a5f46819d2dd52d31f3a1129f2a0d1b53d4c5cd43c318b60396da6d37c57c477b8e958fb750209aca0ae93f8c9dd42ac958de006a0ff067e
+Size (zsh-5.9.tar.xz) = 3332400 bytes
+SHA1 (patch-Completion_BSD_Command___bsd__pkg) = fe0d9cc399fe185ce71a64431e4086ed07920cb8
+SHA1 (patch-Completion_Unix_Command___gpg) = 8eba031838b1cfb0bfadf0fa539e760fd1cb539c
 SHA1 (patch-Config_installfns.sh) = ef0b250a0121c0e4925022e02553aefa23e6cc8d
-SHA1 (patch-aczsh.m4) = 36c270d8d7cf727f48787ef889b2bd89cbf065e2
-SHA1 (patch-configure.ac) = e4c743b627aeb0a409170ed6c0c3d50d274661e0
+SHA1 (patch-configure.ac) = 450c4cee0ec8e4cba959b978d83e20a5ed9cc70c

Index: pkgsrc/shells/zsh/patches/patch-Completion_BSD_Command___bsd__pkg
diff -u pkgsrc/shells/zsh/patches/patch-Completion_BSD_Command___bsd__pkg:1.3 pkgsrc/shells/zsh/patches/patch-Completion_BSD_Command___bsd__pkg:1.4
--- pkgsrc/shells/zsh/patches/patch-Completion_BSD_Command___bsd__pkg:1.3       Fri Feb 18 09:48:44 2022
+++ pkgsrc/shells/zsh/patches/patch-Completion_BSD_Command___bsd__pkg   Mon May 16 14:58:30 2022
@@ -1,9 +1,9 @@
-$NetBSD: patch-Completion_BSD_Command___bsd__pkg,v 1.3 2022/02/18 09:48:44 pho Exp $
+$NetBSD: patch-Completion_BSD_Command___bsd__pkg,v 1.4 2022/05/16 14:58:30 ryoon Exp $
 
 * Better Darwin support.
 * Use pkgsrc PKG_DBDIR as the default database directory.
 
---- Completion/BSD/Command/_bsd_pkg.orig       2019-05-06 03:42:37.000000000 +0000
+--- Completion/BSD/Command/_bsd_pkg.orig       2022-05-08 06:18:22.000000000 +0000
 +++ Completion/BSD/Command/_bsd_pkg
 @@ -15,6 +15,10 @@ _bsd_pkg_pkgfiles() {
      pkgsdir=${${(M)${(f)"$(</etc/mk.conf)"}:#PACKAGE_REPOSITORY*}#*=[[:blank:]]#}
@@ -34,16 +34,16 @@ $NetBSD: patch-Completion_BSD_Command___
        flags+=(
          '-A[do not record packages as installed manually]'
          '-C[specify configuration file]:config file:_files'
-@@ -141,7 +145,7 @@ _bsd_pkg() {
+@@ -139,7 +143,7 @@ _bsd_pkg() {
      )
  
      case "$OSTYPE" in
 -    netbsd*)
 +    netbsd*|darwin*)
        flags+=(
-         '(:)-a[delete all installed packages]'
+         '(:)-A[remove automatically installed packages that are no longer required]'
          "-D[don't execute deinstallation scripts]"
-@@ -202,7 +206,7 @@ _bsd_pkg() {
+@@ -203,7 +207,7 @@ _bsd_pkg() {
      )
  
      case "$OSTYPE" in

Index: pkgsrc/shells/zsh/patches/patch-Completion_Unix_Command___gpg
diff -u pkgsrc/shells/zsh/patches/patch-Completion_Unix_Command___gpg:1.1 pkgsrc/shells/zsh/patches/patch-Completion_Unix_Command___gpg:1.2
--- pkgsrc/shells/zsh/patches/patch-Completion_Unix_Command___gpg:1.1   Tue Nov 23 19:42:43 2021
+++ pkgsrc/shells/zsh/patches/patch-Completion_Unix_Command___gpg       Mon May 16 14:58:30 2022
@@ -1,4 +1,4 @@
-$NetBSD: patch-Completion_Unix_Command___gpg,v 1.1 2021/11/23 19:42:43 pho Exp $
+$NetBSD: patch-Completion_Unix_Command___gpg,v 1.2 2022/05/16 14:58:30 ryoon Exp $
 
 Fix an issue in _gpg. Simply typing "gpg2 [TAB]" fails with an error:
 
@@ -11,13 +11,13 @@ assignment? Creating arrays with unquote
 because they can easily cause shell expansions in a totally unexpected
 way.
 
---- Completion/Unix/Command/_gpg.orig  2018-12-16 01:39:51.000000000 +0000
+--- Completion/Unix/Command/_gpg.orig  2022-05-08 06:18:22.000000000 +0000
 +++ Completion/Unix/Command/_gpg
 @@ -173,8 +173,8 @@ fi
    '--dump-options[show all options]'
  )
  
--extra=( ${${${args#\([^\)]#\)}#\*}%%[:=\[]*} )
+-extra=( ${${${args#\([^\)]#\)}#\*}%%[=:\[]*} )
 -extra=( ${allopts:|extra} )
 +extra=( "${(@)${(@)${(@)args#\([^\)]#\)}#\*}%%[:=\[]*}" )
 +extra=( "${(@)allopts:|extra}" )

Index: pkgsrc/shells/zsh/patches/patch-configure.ac
diff -u pkgsrc/shells/zsh/patches/patch-configure.ac:1.8 pkgsrc/shells/zsh/patches/patch-configure.ac:1.9
--- pkgsrc/shells/zsh/patches/patch-configure.ac:1.8    Thu Feb 27 03:05:37 2020
+++ pkgsrc/shells/zsh/patches/patch-configure.ac        Mon May 16 14:58:30 2022
@@ -1,95 +1,9 @@
-$NetBSD: patch-configure.ac,v 1.8 2020/02/27 03:05:37 ryoon Exp $
-
-Use a compile test, not a run test, for whether various rlimit values
-are equivalent.  A compile test is sufficient because zsh uses these
-values in switch cases, so they must be compile-time, if not
-preprocessor-time, constants.
+$NetBSD: patch-configure.ac,v 1.9 2022/05/16 14:58:30 ryoon Exp $
 
 Fix SunOS flags.
 
 --- configure.ac.orig  2020-02-27 02:06:19.620472371 +0000
 +++ configure.ac
-@@ -1934,77 +1934,9 @@ zsh_LIMIT_PRESENT(RLIMIT_SWAP)
- zsh_LIMIT_PRESENT(RLIMIT_KQUEUES)
- zsh_LIMIT_PRESENT(RLIMIT_UMTXP)
- 
--AH_TEMPLATE([RLIMIT_VMEM_IS_RSS],
--[Define to 1 if RLIMIT_VMEM and RLIMIT_RSS both exist and are equal.])
--AC_CACHE_CHECK(if RLIMIT_VMEM and RLIMIT_RSS are the same,
--zsh_cv_rlimit_vmem_is_rss,
--[AC_RUN_IFELSE([AC_LANG_SOURCE([[
--#include <sys/types.h>
--#ifdef HAVE_SYS_TIME_H
--#include <sys/time.h>
--#endif
--#include <sys/resource.h>
--int main()
--{
--int ret = 1;
--#if defined(HAVE_RLIMIT_VMEM) && defined(HAVE_RLIMIT_RSS)
--if (RLIMIT_RSS == RLIMIT_VMEM) ret = 0;
--#endif
--return ret;
--}]])],[zsh_cv_rlimit_vmem_is_rss=yes],[zsh_cv_rlimit_vmem_is_rss=no],[zsh_cv_rlimit_vmem_is_rss=no])])
--
--if test x$zsh_cv_rlimit_vmem_is_rss = xyes; then
--  AC_DEFINE(RLIMIT_VMEM_IS_RSS)
--fi
--
--
--AH_TEMPLATE([RLIMIT_VMEM_IS_AS],
--[Define to 1 if RLIMIT_VMEM and RLIMIT_AS both exist and are equal.])
--AC_CACHE_CHECK(if RLIMIT_VMEM and RLIMIT_AS are the same,
--zsh_cv_rlimit_vmem_is_as,
--[AC_RUN_IFELSE([AC_LANG_SOURCE([[
--#include <sys/types.h>
--#ifdef HAVE_SYS_TIME_H
--#include <sys/time.h>
--#endif
--#include <sys/resource.h>
--int main()
--{
--int ret = 1;
--#if defined(HAVE_RLIMIT_VMEM) && defined(HAVE_RLIMIT_AS)
--if (RLIMIT_AS == RLIMIT_VMEM) ret = 0;
--#endif
--return ret;
--}]])],[zsh_cv_rlimit_vmem_is_as=yes],[zsh_cv_rlimit_vmem_is_as=no],[zsh_cv_rlimit_vmem_is_as=no])])
--
--if test x$zsh_cv_rlimit_vmem_is_as = xyes; then
--  AC_DEFINE(RLIMIT_VMEM_IS_AS)
--fi
--
--
--AH_TEMPLATE([RLIMIT_RSS_IS_AS],
--[Define to 1 if RLIMIT_RSS and RLIMIT_AS both exist and are equal.])
--AC_CACHE_CHECK(if RLIMIT_RSS and RLIMIT_AS are the same,
--zsh_cv_rlimit_rss_is_as,
--[AC_RUN_IFELSE([AC_LANG_SOURCE([[
--#include <sys/types.h>
--#ifdef HAVE_SYS_TIME_H
--#include <sys/time.h>
--#endif
--#include <sys/resource.h>
--int main()
--{
--int ret = 1;
--#if defined(HAVE_RLIMIT_RSS) && defined(HAVE_RLIMIT_AS)
--if (RLIMIT_AS == RLIMIT_RSS) ret = 0;
--#endif
--return ret;
--}]])],[zsh_cv_rlimit_rss_is_as=yes],[zsh_cv_rlimit_rss_is_as=no],[zsh_cv_rlimit_rss_is_as=no])])
--
--if test x$zsh_cv_rlimit_rss_is_as = xyes; then
--  AC_DEFINE(RLIMIT_RSS_IS_AS)
--fi
--
-+zsh_LIMITS_EQUAL(VMEM, vmem, RSS, rss)
-+zsh_LIMITS_EQUAL(VMEM, vmem, AS, as)
-+zsh_LIMITS_EQUAL(RSS, rss, AS, as)
- 
- dnl --------------------------------------------
- dnl Check for members of struct rusage
 @@ -2857,7 +2789,7 @@ char *argv[];
      sunos*)       DLLDFLAGS="${DLLDFLAGS=-assert nodefinitions}" ;;
      sysv4*|esix*) DLLDFLAGS="${DLLDFLAGS=-G $ldflags}" ;;