3 files changed, 153 insertions, 32 deletions

diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile
index f228629c5f80..21bb62523402 100644
--- a/shells/zsh/Makefile
+++ b/shells/zsh/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	zsh
-PORTVERSION=	5.0.2
-PORTREVISION=	1
+PORTVERSION=	5.0.4
 CATEGORIES=	shells
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} \
 		SF/${PORTNAME}/${PORTNAME}-doc/${PORTVERSION}:doc
@@ -129,4 +128,9 @@ post-install:
 			${CHMOD} 644 $$i.zwc ; \
 		done'
 
+regression-test:
+	@cd ${WRKSRC}; ${SETENV} -i ${MAKE} check
+
+
+
 .include <bsd.port.mk>
diff --git a/shells/zsh/distinfo b/shells/zsh/distinfo
index 031a53dff500..56bcc48ed3f5 100644
--- a/shells/zsh/distinfo
+++ b/shells/zsh/distinfo
@@ -1,4 +1,4 @@
-SHA256 (zsh-5.0.2.tar.bz2) = eb220ae5a8076191ec6b4c6a5a2f18122d074a19f25b45f0320b44b8166c5a03
-SIZE (zsh-5.0.2.tar.bz2) = 3025767
-SHA256 (zsh-5.0.2-doc.tar.bz2) = 99ee08cfc91935af8714bd98db652f016d6c7a8a71ba7c6d6223910cd0b7fbf1
-SIZE (zsh-5.0.2-doc.tar.bz2) = 2902019
+SHA256 (zsh-5.0.4.tar.bz2) = e96fe7c9440adb4169fd4b2f0d9a5c8bdf1498423bc2efd2c3205ef7c1de4ee8
+SIZE (zsh-5.0.4.tar.bz2) = 3093541
+SHA256 (zsh-5.0.4-doc.tar.bz2) = 8995d71dd41f8e7dbccfcbe3658b9c2a13f50d3eb88f9cf4f8e962adb31946a1
+SIZE (zsh-5.0.4-doc.tar.bz2) = 2939263
diff --git a/shells/zsh/pkg-plist b/shells/zsh/pkg-plist
index 5f696d9f1828..ed3ca68b028f 100644
--- a/shells/zsh/pkg-plist
+++ b/shells/zsh/pkg-plist
@@ -60,12 +60,12 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Calendar/calendar_showdate
 %%DATADIR%%/%%ZSH_VER%%/functions/Calendar/calendar_sort
 %%DATADIR%%/%%ZSH_VER%%/functions/Chpwd.zwc
-%%DATADIR%%/%%ZSH_VER%%/functions/Chpwd/zsh_directory_name_cdr
+%%DATADIR%%/%%ZSH_VER%%/functions/Chpwd/_cdr
+%%DATADIR%%/%%ZSH_VER%%/functions/Chpwd/cdr
 %%DATADIR%%/%%ZSH_VER%%/functions/Chpwd/chpwd_recent_add
-%%DATADIR%%/%%ZSH_VER%%/functions/Chpwd/chpwd_recent_filehandler
 %%DATADIR%%/%%ZSH_VER%%/functions/Chpwd/chpwd_recent_dirs
-%%DATADIR%%/%%ZSH_VER%%/functions/Chpwd/cdr
-%%DATADIR%%/%%ZSH_VER%%/functions/Chpwd/_cdr
+%%DATADIR%%/%%ZSH_VER%%/functions/Chpwd/chpwd_recent_filehandler
+%%DATADIR%%/%%ZSH_VER%%/functions/Chpwd/zsh_directory_name_cdr
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion.zwc
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/AIX.zwc
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/AIX/_floppy
@@ -108,6 +108,7 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Base/_call_function
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Base/_call_program
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Base/_combination
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Base/_comp_locale
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Base/_complete
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Base/_complete_debug
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Base/_complete_help
@@ -193,6 +194,7 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Debian/_dak
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Debian/_dchroot
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Debian/_dchroot-dsa
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Debian/_dcut
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Debian/_deb_packages
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Debian/_debchange
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Debian/_debdiff
@@ -207,11 +209,10 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Debian/_dpkg_source
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Debian/_dput
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Debian/_dupload
-%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Debian/_grep-excuses
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Debian/_git-buildpackage
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Debian/_grep-excuses
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Debian/_invoke-rc.d
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Debian/_lighttpd
-%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Debian/_linda
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Debian/_lintian
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Debian/_madison
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Debian/_make-kpkg
@@ -279,19 +280,19 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Solaris/_coreadm
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Solaris/_dhcpinfo
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Solaris/_dladm
-%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Solaris/_dumpadm
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Solaris/_dtrace
-%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Solaris/_gcore
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Solaris/_dumpadm
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Solaris/_flowadm
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Solaris/_fmadm
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Solaris/_gcore
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Solaris/_inetadm
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Solaris/_ipadm
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Solaris/_netstat
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Solaris/_pfexec
-%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Solaris/_ptree
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Solaris/_pkg5
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Solaris/_prstat
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Solaris/_ps
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Solaris/_ptree
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Solaris/_savecore
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Solaris/_snoop
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Solaris/_svcadm
@@ -304,8 +305,8 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Solaris/_zones
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix.zwc
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_a2ps
-%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_adb
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_aap
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_adb
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_ant
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_antiword
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_apachectl
@@ -327,6 +328,7 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_cal
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_calendar
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_canonical_paths
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_cat
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_ccal
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_cdcd
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_cdrdao
@@ -351,6 +353,7 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_dbus
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_dd
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_devtodo
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_df
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_dhclient
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_dict
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_dict_words
@@ -371,6 +374,7 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_enscript
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_env
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_espeak
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_etags
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_fakeroot
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_feh
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_fetchmail
@@ -398,8 +402,8 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_gnu_generic
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_gnupod
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_gnutls
-%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_gpg
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_go
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_gpg
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_gphoto2
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_gprof
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_gradle
@@ -435,9 +439,9 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_ld_debug
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_ldd
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_less
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_lha
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_links
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_list_files
-%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_lha
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_ln
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_loadkeys
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_locales
@@ -478,11 +482,10 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_nkf
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_nm
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_nmap
-%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_npm
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_notmuch
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_npm
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_nslookup
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_other_accounts
-%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_osc
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_pack
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_patch
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_path_commands
@@ -508,10 +511,11 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_pon
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_ports
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_postfix
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_postscript
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_prcs
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_printenv
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_printers
-%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_ps
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_prove
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_ps1234
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_pspdf
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_psutils
@@ -539,8 +543,8 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_sccs
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_screen
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_sed
-%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_services
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_service
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_services
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_setfacl
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_sh
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_showmount
@@ -613,6 +617,7 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_xargs
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_xmlsoft
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_xmms2
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_xz
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_yafc
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_yodl
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_yp
@@ -624,7 +629,6 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_zfs_pool
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_zip
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_zpool
-%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Unix/_xz
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/X.zwc
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/X/_acroread
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/X/_dcop
@@ -723,7 +727,9 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_limit
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_limits
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_math
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_math_params
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_mere
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_module_math_func
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_options
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_options_set
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_options_unset
@@ -734,6 +740,7 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_prompt
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_read
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_redirect
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_run-help
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_sched
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_set
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_setopt
@@ -749,13 +756,14 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_ulimit
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_unhash
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_unsetopt
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_user_math_func
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_value
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_vared
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_vars
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_wait
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_which
-%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_zattr
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_zargs
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_zattr
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_zcalc_line
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_zcompile
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_zed
@@ -767,17 +775,17 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_zsh-mime-handler
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_zstyle
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/Zsh/_ztodo
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/bashcompinit
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/compaudit
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/compdump
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/compinit
+%%DATADIR%%/%%ZSH_VER%%/functions/Completion/compinstall
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/openSUSE.zwc
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/openSUSE/_SuSEconfig
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/openSUSE/_hwinfo
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/openSUSE/_osc
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/openSUSE/_yast2
 %%DATADIR%%/%%ZSH_VER%%/functions/Completion/openSUSE/_zypper
-%%DATADIR%%/%%ZSH_VER%%/functions/Completion/bashcompinit
-%%DATADIR%%/%%ZSH_VER%%/functions/Completion/compaudit
-%%DATADIR%%/%%ZSH_VER%%/functions/Completion/compdump
-%%DATADIR%%/%%ZSH_VER%%/functions/Completion/compinit
-%%DATADIR%%/%%ZSH_VER%%/functions/Completion/compinstall
 %%DATADIR%%/%%ZSH_VER%%/functions/Exceptions.zwc
 %%DATADIR%%/%%ZSH_VER%%/functions/Exceptions/catch
 %%DATADIR%%/%%ZSH_VER%%/functions/Exceptions/throw
@@ -797,15 +805,15 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Misc/mere
 %%DATADIR%%/%%ZSH_VER%%/functions/Misc/nslookup
 %%DATADIR%%/%%ZSH_VER%%/functions/Misc/promptnl
-%%DATADIR%%/%%ZSH_VER%%/functions/Misc/relative
 %%DATADIR%%/%%ZSH_VER%%/functions/Misc/regexp-replace
+%%DATADIR%%/%%ZSH_VER%%/functions/Misc/relative
 %%DATADIR%%/%%ZSH_VER%%/functions/Misc/run-help
 %%DATADIR%%/%%ZSH_VER%%/functions/Misc/run-help-git
 %%DATADIR%%/%%ZSH_VER%%/functions/Misc/run-help-openssl
 %%DATADIR%%/%%ZSH_VER%%/functions/Misc/run-help-p4
+%%DATADIR%%/%%ZSH_VER%%/functions/Misc/run-help-sudo
 %%DATADIR%%/%%ZSH_VER%%/functions/Misc/run-help-svk
 %%DATADIR%%/%%ZSH_VER%%/functions/Misc/run-help-svn
-%%DATADIR%%/%%ZSH_VER%%/functions/Misc/run-help-sudo
 %%DATADIR%%/%%ZSH_VER%%/functions/Misc/sticky-note
 %%DATADIR%%/%%ZSH_VER%%/functions/Misc/tetris
 %%DATADIR%%/%%ZSH_VER%%/functions/Misc/xtermctl
@@ -891,8 +899,8 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/VCS_Info/VCS_INFO_get_cmd
 %%DATADIR%%/%%ZSH_VER%%/functions/VCS_Info/VCS_INFO_hook
 %%DATADIR%%/%%ZSH_VER%%/functions/VCS_Info/VCS_INFO_maxexports
-%%DATADIR%%/%%ZSH_VER%%/functions/VCS_Info/VCS_INFO_quilt
 %%DATADIR%%/%%ZSH_VER%%/functions/VCS_Info/VCS_INFO_nvcsformats
+%%DATADIR%%/%%ZSH_VER%%/functions/VCS_Info/VCS_INFO_quilt
 %%DATADIR%%/%%ZSH_VER%%/functions/VCS_Info/VCS_INFO_realpath
 %%DATADIR%%/%%ZSH_VER%%/functions/VCS_Info/VCS_INFO_reposub
 %%DATADIR%%/%%ZSH_VER%%/functions/VCS_Info/VCS_INFO_set
@@ -979,6 +987,114 @@ bin/zsh-%%ZSH_VER%%
 %%DATADIR%%/%%ZSH_VER%%/functions/Zle/url-quote-magic
 %%DATADIR%%/%%ZSH_VER%%/functions/Zle/which-command
 %%DATADIR%%/%%ZSH_VER%%/functions/Zle/zed-set-file-name
+%%DATADIR%%/%%ZSH_VER%%/help/alias
+%%DATADIR%%/%%ZSH_VER%%/help/autoload
+%%DATADIR%%/%%ZSH_VER%%/help/bg
+%%DATADIR%%/%%ZSH_VER%%/help/bindkey
+%%DATADIR%%/%%ZSH_VER%%/help/break
+%%DATADIR%%/%%ZSH_VER%%/help/builtin
+%%DATADIR%%/%%ZSH_VER%%/help/bye
+%%DATADIR%%/%%ZSH_VER%%/help/cap
+%%DATADIR%%/%%ZSH_VER%%/help/cd
+%%DATADIR%%/%%ZSH_VER%%/help/chdir
+%%DATADIR%%/%%ZSH_VER%%/help/clone
+%%DATADIR%%/%%ZSH_VER%%/help/colon
+%%DATADIR%%/%%ZSH_VER%%/help/command
+%%DATADIR%%/%%ZSH_VER%%/help/comparguments
+%%DATADIR%%/%%ZSH_VER%%/help/compcall
+%%DATADIR%%/%%ZSH_VER%%/help/compctl
+%%DATADIR%%/%%ZSH_VER%%/help/compdescribe
+%%DATADIR%%/%%ZSH_VER%%/help/compfiles
+%%DATADIR%%/%%ZSH_VER%%/help/compgroups
+%%DATADIR%%/%%ZSH_VER%%/help/compquote
+%%DATADIR%%/%%ZSH_VER%%/help/comptags
+%%DATADIR%%/%%ZSH_VER%%/help/comptry
+%%DATADIR%%/%%ZSH_VER%%/help/compvalues
+%%DATADIR%%/%%ZSH_VER%%/help/continue
+%%DATADIR%%/%%ZSH_VER%%/help/declare
+%%DATADIR%%/%%ZSH_VER%%/help/dirs
+%%DATADIR%%/%%ZSH_VER%%/help/disable
+%%DATADIR%%/%%ZSH_VER%%/help/disown
+%%DATADIR%%/%%ZSH_VER%%/help/dot
+%%DATADIR%%/%%ZSH_VER%%/help/echo
+%%DATADIR%%/%%ZSH_VER%%/help/echotc
+%%DATADIR%%/%%ZSH_VER%%/help/echoti
+%%DATADIR%%/%%ZSH_VER%%/help/emulate
+%%DATADIR%%/%%ZSH_VER%%/help/enable
+%%DATADIR%%/%%ZSH_VER%%/help/eval
+%%DATADIR%%/%%ZSH_VER%%/help/exec
+%%DATADIR%%/%%ZSH_VER%%/help/exit
+%%DATADIR%%/%%ZSH_VER%%/help/export
+%%DATADIR%%/%%ZSH_VER%%/help/false
+%%DATADIR%%/%%ZSH_VER%%/help/fc
+%%DATADIR%%/%%ZSH_VER%%/help/fg
+%%DATADIR%%/%%ZSH_VER%%/help/float
+%%DATADIR%%/%%ZSH_VER%%/help/functions
+%%DATADIR%%/%%ZSH_VER%%/help/getcap
+%%DATADIR%%/%%ZSH_VER%%/help/getln
+%%DATADIR%%/%%ZSH_VER%%/help/getopts
+%%DATADIR%%/%%ZSH_VER%%/help/hash
+%%DATADIR%%/%%ZSH_VER%%/help/history
+%%DATADIR%%/%%ZSH_VER%%/help/integer
+%%DATADIR%%/%%ZSH_VER%%/help/jobs
+%%DATADIR%%/%%ZSH_VER%%/help/kill
+%%DATADIR%%/%%ZSH_VER%%/help/let
+%%DATADIR%%/%%ZSH_VER%%/help/limit
+%%DATADIR%%/%%ZSH_VER%%/help/local
+%%DATADIR%%/%%ZSH_VER%%/help/log
+%%DATADIR%%/%%ZSH_VER%%/help/logout
+%%DATADIR%%/%%ZSH_VER%%/help/noglob
+%%DATADIR%%/%%ZSH_VER%%/help/popd
+%%DATADIR%%/%%ZSH_VER%%/help/print
+%%DATADIR%%/%%ZSH_VER%%/help/printf
+%%DATADIR%%/%%ZSH_VER%%/help/pushd
+%%DATADIR%%/%%ZSH_VER%%/help/pushln
+%%DATADIR%%/%%ZSH_VER%%/help/pwd
+%%DATADIR%%/%%ZSH_VER%%/help/r
+%%DATADIR%%/%%ZSH_VER%%/help/read
+%%DATADIR%%/%%ZSH_VER%%/help/readonly
+%%DATADIR%%/%%ZSH_VER%%/help/rehash
+%%DATADIR%%/%%ZSH_VER%%/help/return
+%%DATADIR%%/%%ZSH_VER%%/help/sched
+%%DATADIR%%/%%ZSH_VER%%/help/set
+%%DATADIR%%/%%ZSH_VER%%/help/setcap
+%%DATADIR%%/%%ZSH_VER%%/help/setopt
+%%DATADIR%%/%%ZSH_VER%%/help/shift
+%%DATADIR%%/%%ZSH_VER%%/help/source
+%%DATADIR%%/%%ZSH_VER%%/help/stat
+%%DATADIR%%/%%ZSH_VER%%/help/suspend
+%%DATADIR%%/%%ZSH_VER%%/help/test
+%%DATADIR%%/%%ZSH_VER%%/help/times
+%%DATADIR%%/%%ZSH_VER%%/help/trap
+%%DATADIR%%/%%ZSH_VER%%/help/true
+%%DATADIR%%/%%ZSH_VER%%/help/ttyctl
+%%DATADIR%%/%%ZSH_VER%%/help/type
+%%DATADIR%%/%%ZSH_VER%%/help/typeset
+%%DATADIR%%/%%ZSH_VER%%/help/ulimit
+%%DATADIR%%/%%ZSH_VER%%/help/umask
+%%DATADIR%%/%%ZSH_VER%%/help/unalias
+%%DATADIR%%/%%ZSH_VER%%/help/unfunction
+%%DATADIR%%/%%ZSH_VER%%/help/unhash
+%%DATADIR%%/%%ZSH_VER%%/help/unlimit
+%%DATADIR%%/%%ZSH_VER%%/help/unset
+%%DATADIR%%/%%ZSH_VER%%/help/unsetopt
+%%DATADIR%%/%%ZSH_VER%%/help/vared
+%%DATADIR%%/%%ZSH_VER%%/help/wait
+%%DATADIR%%/%%ZSH_VER%%/help/whence
+%%DATADIR%%/%%ZSH_VER%%/help/where
+%%DATADIR%%/%%ZSH_VER%%/help/which
+%%DATADIR%%/%%ZSH_VER%%/help/zcompile
+%%DATADIR%%/%%ZSH_VER%%/help/zformat
+%%DATADIR%%/%%ZSH_VER%%/help/zftp
+%%DATADIR%%/%%ZSH_VER%%/help/zle
+%%DATADIR%%/%%ZSH_VER%%/help/zmodload
+%%DATADIR%%/%%ZSH_VER%%/help/zparseopts
+%%DATADIR%%/%%ZSH_VER%%/help/zprof
+%%DATADIR%%/%%ZSH_VER%%/help/zpty
+%%DATADIR%%/%%ZSH_VER%%/help/zregexparse
+%%DATADIR%%/%%ZSH_VER%%/help/zsocket
+%%DATADIR%%/%%ZSH_VER%%/help/zstyle
+%%DATADIR%%/%%ZSH_VER%%/help/ztcp
 %%DATADIR%%/%%ZSH_VER%%/scripts/newuser
 man/man1/zsh.1.gz
 man/man1/zshall.1.gz
@@ -1025,6 +1141,7 @@ man/man1/zshzle.1.gz
 @dirrm %%DATADIR%%/%%ZSH_VER%%/functions/Calendar
 @dirrm %%DATADIR%%/%%ZSH_VER%%/functions/Chpwd
 @dirrm %%DATADIR%%/%%ZSH_VER%%/functions
+@dirrm %%DATADIR%%/%%ZSH_VER%%/help
 @dirrm %%DATADIR%%/%%ZSH_VER%%/scripts
 @dirrm %%DATADIR%%/%%ZSH_VER%%
 @dirrmtry %%DATADIR%%