1 files changed, 69 insertions, 63 deletions

diff --git a/shells/zsh/pkg-plist b/shells/zsh/pkg-plist
index 70a96368ef34..19ea162b5067 100644
--- a/shells/zsh/pkg-plist
+++ b/shells/zsh/pkg-plist
@@ -7,7 +7,7 @@ bin/rzsh
 @unexec cp /etc/shells /etc/shells.bak; (grep -v %D/%F /etc/shells.bak) >/etc/shells; rm -f /etc/shells.bak
 bin/zsh-%%ZSH_VER%%
 @exec   mkdir %%ZSH_ETCDIR%% 2> /dev/null || true
-@unexec rmdir %%ZSH_ETCDIR%% 2> /dev/null || true
+@dirrmtry %%ZSH_ETCDIR%%
 %%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/cap.so
 %%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/clone.so
 %%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/compctl.so
@@ -25,6 +25,7 @@ bin/zsh-%%ZSH_VER%%
 %%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/net/tcp.so
 %%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/newuser.so
 %%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/parameter.so
+%%PCRE%%%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/pcre.so
 %%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/rlimits.so
 %%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/sched.so
 %%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/stat.so
@@ -43,68 +44,18 @@ bin/zsh-%%ZSH_VER%%
 %%NO_STATIC%%@dirrm lib/zsh/%%ZSH_VER%%
 %%NO_STATIC%%lib/zsh/libzsh-%%ZSH_VER%%.so
 %%NO_STATIC%%@dirrm lib/zsh
-%%PORTDOCS%%%%DOCSDIR%%/BUGS
-%%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTORS
-%%PORTDOCS%%%%DOCSDIR%%/FAQ
-%%PORTDOCS%%%%DOCSDIR%%/LICENCE
-%%PORTDOCS%%%%DOCSDIR%%/META-FAQ
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/completion-style-guide
-%%PORTDOCS%%%%DOCSDIR%%/zsh.dvi
-%%PORTDOCS%%%%DOCSDIR%%/zsh.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_1.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_10.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_11.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_12.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_13.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_14.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_15.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_16.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_17.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_18.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_19.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_2.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_20.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_21.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_22.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_23.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_24.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_25.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_26.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_27.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_28.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_29.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_3.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_30.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_31.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_32.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_33.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_34.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_35.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_36.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_37.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_38.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_39.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_4.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_40.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_41.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_42.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_43.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_44.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_45.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_5.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_6.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_7.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_8.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_9.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_toc.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%EXAMPLESDIR%%/zlogin
-%%EXAMPLESDIR%%/zshenv
-%%EXAMPLESDIR%%/zshrc
-@dirrm %%EXAMPLESDIR%%
 @exec   mkdir %%ZSH_SITEFNDIR%% 2> /dev/null || true
 @unexec rmdir %%ZSH_SITEFNDIR%% 2> /dev/null || true
+%%ZSH_FNDIR%%/Calendar/age
+%%ZSH_FNDIR%%/Calendar/calendar
+%%ZSH_FNDIR%%/Calendar/calendar_add
+%%ZSH_FNDIR%%/Calendar/calendar_edit
+%%ZSH_FNDIR%%/Calendar/calendar_lockfiles
+%%ZSH_FNDIR%%/Calendar/calendar_read
+%%ZSH_FNDIR%%/Calendar/calendar_scandate
+%%ZSH_FNDIR%%/Calendar/calendar_show
+%%ZSH_FNDIR%%/Calendar/calendar_showdate
+%%ZSH_FNDIR%%/Calendar/calendar_sort
 %%ZSH_FNDIR%%/Completion/AIX/_floppy
 %%ZSH_FNDIR%%/Completion/AIX/_logical_volumes
 %%ZSH_FNDIR%%/Completion/AIX/_lscfg
@@ -119,7 +70,10 @@ bin/zsh-%%ZSH_VER%%
 %%ZSH_FNDIR%%/Completion/BSD/_bsd_pkg
 %%ZSH_FNDIR%%/Completion/BSD/_chflags
 %%ZSH_FNDIR%%/Completion/BSD/_cvsup
+%%ZSH_FNDIR%%/Completion/BSD/_csup
 %%ZSH_FNDIR%%/Completion/BSD/_kld
+%%ZSH_FNDIR%%/Completion/BSD/_portlint
+%%ZSH_FNDIR%%/Completion/BSD/_portsnap
 %%ZSH_FNDIR%%/Completion/Base/_all_labels
 %%ZSH_FNDIR%%/Completion/Base/_all_matches
 %%ZSH_FNDIR%%/Completion/Base/_alternative
@@ -165,6 +119,7 @@ bin/zsh-%%ZSH_VER%%
 %%ZSH_FNDIR%%/Completion/Base/_prefix
 %%ZSH_FNDIR%%/Completion/Base/_read_comp
 %%ZSH_FNDIR%%/Completion/Base/_regex_arguments
+%%ZSH_FNDIR%%/Completion/Base/_regex_words
 %%ZSH_FNDIR%%/Completion/Base/_requested
 %%ZSH_FNDIR%%/Completion/Base/_retrieve_cache
 %%ZSH_FNDIR%%/Completion/Base/_sep_parts
@@ -196,14 +151,19 @@ bin/zsh-%%ZSH_VER%%
 %%ZSH_FNDIR%%/Completion/Darwin/_qtplay
 %%ZSH_FNDIR%%/Completion/Darwin/_retrieve_mac_apps
 %%ZSH_FNDIR%%/Completion/Darwin/_softwareupdate
+%%ZSH_FNDIR%%/Completion/Debian/_a2utils
 %%ZSH_FNDIR%%/Completion/Debian/_apt
+%%ZSH_FNDIR%%/Completion/Debian/_apt-file
 %%ZSH_FNDIR%%/Completion/Debian/_apt-move
 %%ZSH_FNDIR%%/Completion/Debian/_apt-show-versions
 %%ZSH_FNDIR%%/Completion/Debian/_aptitude
 %%ZSH_FNDIR%%/Completion/Debian/_auto-apt
 %%ZSH_FNDIR%%/Completion/Debian/_bts
 %%ZSH_FNDIR%%/Completion/Debian/_bug
+%%ZSH_FNDIR%%/Completion/Debian/_cdbs-edit-patch
+%%ZSH_FNDIR%%/Completion/Debian/_dak
 %%ZSH_FNDIR%%/Completion/Debian/_dchroot
+%%ZSH_FNDIR%%/Completion/Debian/_dchroot-dsa
 %%ZSH_FNDIR%%/Completion/Debian/_deb_packages
 %%ZSH_FNDIR%%/Completion/Debian/_debchange
 %%ZSH_FNDIR%%/Completion/Debian/_debdiff
@@ -215,6 +175,7 @@ bin/zsh-%%ZSH_VER%%
 %%ZSH_FNDIR%%/Completion/Debian/_dpkg_source
 %%ZSH_FNDIR%%/Completion/Debian/_dput
 %%ZSH_FNDIR%%/Completion/Debian/_dupload
+%%ZSH_FNDIR%%/Completion/Debian/_invoke-rc.d
 %%ZSH_FNDIR%%/Completion/Debian/_linda
 %%ZSH_FNDIR%%/Completion/Debian/_lintian
 %%ZSH_FNDIR%%/Completion/Debian/_madison
@@ -230,7 +191,11 @@ bin/zsh-%%ZSH_VER%%
 %%ZSH_FNDIR%%/Completion/Debian/_wajig
 %%ZSH_FNDIR%%/Completion/Debian/_wanna-build
 %%ZSH_FNDIR%%/Completion/Linux/_acpi
+%%ZSH_FNDIR%%/Completion/Linux/_acpitool
+%%ZSH_FNDIR%%/Completion/Linux/_analyseplugin
 %%ZSH_FNDIR%%/Completion/Linux/_brctl
+%%ZSH_FNDIR%%/Completion/Linux/_fuse_arguments
+%%ZSH_FNDIR%%/Completion/Linux/_fuse_values
 %%ZSH_FNDIR%%/Completion/Linux/_fusermount
 %%ZSH_FNDIR%%/Completion/Linux/_iptables
 %%ZSH_FNDIR%%/Completion/Linux/_iwconfig
@@ -245,8 +210,10 @@ bin/zsh-%%ZSH_VER%%
 %%ZSH_FNDIR%%/Completion/Linux/_tune2fs
 %%ZSH_FNDIR%%/Completion/Linux/_uml
 %%ZSH_FNDIR%%/Completion/Linux/_valgrind
+%%ZSH_FNDIR%%/Completion/Linux/_vserver
+%%ZSH_FNDIR%%/Completion/Linux/_wakeup_capable_devices
 %%ZSH_FNDIR%%/Completion/Linux/_yast
-%%ZSH_FNDIR%%/Completion/Mandrake/_urpmi
+%%ZSH_FNDIR%%/Completion/Mandriva/_urpmi
 %%ZSH_FNDIR%%/Completion/Redhat/_rpm
 %%ZSH_FNDIR%%/Completion/Redhat/_service
 %%ZSH_FNDIR%%/Completion/Redhat/_yum
@@ -262,23 +229,28 @@ bin/zsh-%%ZSH_VER%%
 %%ZSH_FNDIR%%/Completion/Unix/_arping
 %%ZSH_FNDIR%%/Completion/Unix/_attr
 %%ZSH_FNDIR%%/Completion/Unix/_baz
+%%ZSH_FNDIR%%/Completion/Unix/_bind_addresses
 %%ZSH_FNDIR%%/Completion/Unix/_bison
 %%ZSH_FNDIR%%/Completion/Unix/_bittorrent
 %%ZSH_FNDIR%%/Completion/Unix/_bogofilter
 %%ZSH_FNDIR%%/Completion/Unix/_bzip2
 %%ZSH_FNDIR%%/Completion/Unix/_bzr
 %%ZSH_FNDIR%%/Completion/Unix/_cal
+%%ZSH_FNDIR%%/Completion/Unix/_canonical_paths
 %%ZSH_FNDIR%%/Completion/Unix/_ccal
 %%ZSH_FNDIR%%/Completion/Unix/_cdcd
 %%ZSH_FNDIR%%/Completion/Unix/_cdrecord
 %%ZSH_FNDIR%%/Completion/Unix/_chkconfig
 %%ZSH_FNDIR%%/Completion/Unix/_chmod
 %%ZSH_FNDIR%%/Completion/Unix/_chown
+%%ZSH_FNDIR%%/Completion/Unix/_comm
 %%ZSH_FNDIR%%/Completion/Unix/_compress
 %%ZSH_FNDIR%%/Completion/Unix/_configure
+%%ZSH_FNDIR%%/Completion/Unix/_cowsay
 %%ZSH_FNDIR%%/Completion/Unix/_cp
 %%ZSH_FNDIR%%/Completion/Unix/_cpio
 %%ZSH_FNDIR%%/Completion/Unix/_cplay
+%%ZSH_FNDIR%%/Completion/Unix/_cssh
 %%ZSH_FNDIR%%/Completion/Unix/_ctags_tags
 %%ZSH_FNDIR%%/Completion/Unix/_cvs
 %%ZSH_FNDIR%%/Completion/Unix/_darcs
@@ -300,6 +272,7 @@ bin/zsh-%%ZSH_VER%%
 %%ZSH_FNDIR%%/Completion/Unix/_elm
 %%ZSH_FNDIR%%/Completion/Unix/_email_addresses
 %%ZSH_FNDIR%%/Completion/Unix/_enscript
+%%ZSH_FNDIR%%/Completion/Unix/_env
 %%ZSH_FNDIR%%/Completion/Unix/_fakeroot
 %%ZSH_FNDIR%%/Completion/Unix/_fetchmail
 %%ZSH_FNDIR%%/Completion/Unix/_figlet
@@ -316,6 +289,7 @@ bin/zsh-%%ZSH_VER%%
 %%ZSH_FNDIR%%/Completion/Unix/_gdb
 %%ZSH_FNDIR%%/Completion/Unix/_getconf
 %%ZSH_FNDIR%%/Completion/Unix/_getent
+%%ZSH_FNDIR%%/Completion/Unix/_getmail
 %%ZSH_FNDIR%%/Completion/Unix/_git
 %%ZSH_FNDIR%%/Completion/Unix/_global
 %%ZSH_FNDIR%%/Completion/Unix/_global_tags
@@ -334,6 +308,7 @@ bin/zsh-%%ZSH_VER%%
 %%ZSH_FNDIR%%/Completion/Unix/_ifconfig
 %%ZSH_FNDIR%%/Completion/Unix/_imagemagick
 %%ZSH_FNDIR%%/Completion/Unix/_init_d
+%%ZSH_FNDIR%%/Completion/Unix/_ip
 %%ZSH_FNDIR%%/Completion/Unix/_irssi
 %%ZSH_FNDIR%%/Completion/Unix/_ispell
 %%ZSH_FNDIR%%/Completion/Unix/_java
@@ -345,8 +320,10 @@ bin/zsh-%%ZSH_VER%%
 %%ZSH_FNDIR%%/Completion/Unix/_last
 %%ZSH_FNDIR%%/Completion/Unix/_less
 %%ZSH_FNDIR%%/Completion/Unix/_links
+%%ZSH_FNDIR%%/Completion/Unix/_list_files
 %%ZSH_FNDIR%%/Completion/Unix/_loadkeys
 %%ZSH_FNDIR%%/Completion/Unix/_locales
+%%ZSH_FNDIR%%/Completion/Unix/_locate
 %%ZSH_FNDIR%%/Completion/Unix/_look
 %%ZSH_FNDIR%%/Completion/Unix/_lp
 %%ZSH_FNDIR%%/Completion/Unix/_ls
@@ -358,8 +335,13 @@ bin/zsh-%%ZSH_VER%%
 %%ZSH_FNDIR%%/Completion/Unix/_make
 %%ZSH_FNDIR%%/Completion/Unix/_man
 %%ZSH_FNDIR%%/Completion/Unix/_mencal
+%%ZSH_FNDIR%%/Completion/Unix/_mercurial
+%%ZSH_FNDIR%%/Completion/Unix/_metaflac
 %%ZSH_FNDIR%%/Completion/Unix/_mh
 %%ZSH_FNDIR%%/Completion/Unix/_mime_types
+%%ZSH_FNDIR%%/Completion/Unix/_mkdir
+%%ZSH_FNDIR%%/Completion/Unix/_module
+%%ZSH_FNDIR%%/Completion/Unix/_monotone
 %%ZSH_FNDIR%%/Completion/Unix/_mount
 %%ZSH_FNDIR%%/Completion/Unix/_mpc
 %%ZSH_FNDIR%%/Completion/Unix/_mt
@@ -380,6 +362,7 @@ bin/zsh-%%ZSH_VER%%
 %%ZSH_FNDIR%%/Completion/Unix/_pack
 %%ZSH_FNDIR%%/Completion/Unix/_patch
 %%ZSH_FNDIR%%/Completion/Unix/_path_files
+%%ZSH_FNDIR%%/Completion/Unix/_pax
 %%ZSH_FNDIR%%/Completion/Unix/_pbm
 %%ZSH_FNDIR%%/Completion/Unix/_pdf
 %%ZSH_FNDIR%%/Completion/Unix/_perforce
@@ -392,6 +375,7 @@ bin/zsh-%%ZSH_VER%%
 %%ZSH_FNDIR%%/Completion/Unix/_pine
 %%ZSH_FNDIR%%/Completion/Unix/_ping
 %%ZSH_FNDIR%%/Completion/Unix/_pkg-config
+%%ZSH_FNDIR%%/Completion/Unix/_pon
 %%ZSH_FNDIR%%/Completion/Unix/_ports
 %%ZSH_FNDIR%%/Completion/Unix/_postfix
 %%ZSH_FNDIR%%/Completion/Unix/_prcs
@@ -402,6 +386,7 @@ bin/zsh-%%ZSH_VER%%
 %%ZSH_FNDIR%%/Completion/Unix/_psutils
 %%ZSH_FNDIR%%/Completion/Unix/_pump
 %%ZSH_FNDIR%%/Completion/Unix/_python
+%%ZSH_FNDIR%%/Completion/Unix/_qemu
 %%ZSH_FNDIR%%/Completion/Unix/_quilt
 %%ZSH_FNDIR%%/Completion/Unix/_raggle
 %%ZSH_FNDIR%%/Completion/Unix/_rake
@@ -409,6 +394,7 @@ bin/zsh-%%ZSH_VER%%
 %%ZSH_FNDIR%%/Completion/Unix/_rcs
 %%ZSH_FNDIR%%/Completion/Unix/_renice
 %%ZSH_FNDIR%%/Completion/Unix/_rlogin
+%%ZSH_FNDIR%%/Completion/Unix/_ri
 %%ZSH_FNDIR%%/Completion/Unix/_rsync
 %%ZSH_FNDIR%%/Completion/Unix/_rubber
 %%ZSH_FNDIR%%/Completion/Unix/_ruby
@@ -421,9 +407,11 @@ bin/zsh-%%ZSH_VER%%
 %%ZSH_FNDIR%%/Completion/Unix/_sh
 %%ZSH_FNDIR%%/Completion/Unix/_showmount
 %%ZSH_FNDIR%%/Completion/Unix/_signals
+%%ZSH_FNDIR%%/Completion/Unix/_sisu
 %%ZSH_FNDIR%%/Completion/Unix/_slrn
 %%ZSH_FNDIR%%/Completion/Unix/_socket
 %%ZSH_FNDIR%%/Completion/Unix/_spamassassin
+%%ZSH_FNDIR%%/Completion/Unix/_sqsh
 %%ZSH_FNDIR%%/Completion/Unix/_ssh
 %%ZSH_FNDIR%%/Completion/Unix/_strip
 %%ZSH_FNDIR%%/Completion/Unix/_stty
@@ -434,6 +422,8 @@ bin/zsh-%%ZSH_VER%%
 %%ZSH_FNDIR%%/Completion/Unix/_sysctl
 %%ZSH_FNDIR%%/Completion/Unix/_tar
 %%ZSH_FNDIR%%/Completion/Unix/_tar_archive
+%%ZSH_FNDIR%%/Completion/Unix/_tardy
+%%ZSH_FNDIR%%/Completion/Unix/_tcptraceroute
 %%ZSH_FNDIR%%/Completion/Unix/_telnet
 %%ZSH_FNDIR%%/Completion/Unix/_terminals
 %%ZSH_FNDIR%%/Completion/Unix/_tex
@@ -445,7 +435,10 @@ bin/zsh-%%ZSH_VER%%
 %%ZSH_FNDIR%%/Completion/Unix/_time_zone
 %%ZSH_FNDIR%%/Completion/Unix/_tin
 %%ZSH_FNDIR%%/Completion/Unix/_tla
+%%ZSH_FNDIR%%/Completion/Unix/_todo.sh
+%%ZSH_FNDIR%%/Completion/Unix/_toilet
 %%ZSH_FNDIR%%/Completion/Unix/_totd
+%%ZSH_FNDIR%%/Completion/Unix/_tracepath
 %%ZSH_FNDIR%%/Completion/Unix/_twisted
 %%ZSH_FNDIR%%/Completion/Unix/_unace
 %%ZSH_FNDIR%%/Completion/Unix/_unexpand
@@ -457,6 +450,7 @@ bin/zsh-%%ZSH_VER%%
 %%ZSH_FNDIR%%/Completion/Unix/_users_on
 %%ZSH_FNDIR%%/Completion/Unix/_vim
 %%ZSH_FNDIR%%/Completion/Unix/_vorbis
+%%ZSH_FNDIR%%/Completion/Unix/_vorbiscomment
 %%ZSH_FNDIR%%/Completion/Unix/_vux
 %%ZSH_FNDIR%%/Completion/Unix/_w3m
 %%ZSH_FNDIR%%/Completion/Unix/_webbrowser
@@ -466,6 +460,7 @@ bin/zsh-%%ZSH_VER%%
 %%ZSH_FNDIR%%/Completion/Unix/_wiggle
 %%ZSH_FNDIR%%/Completion/Unix/_xargs
 %%ZSH_FNDIR%%/Completion/Unix/_xmlsoft
+%%ZSH_FNDIR%%/Completion/Unix/_yafc
 %%ZSH_FNDIR%%/Completion/Unix/_yodl
 %%ZSH_FNDIR%%/Completion/Unix/_yp
 %%ZSH_FNDIR%%/Completion/Unix/_zcat
@@ -479,10 +474,12 @@ bin/zsh-%%ZSH_VER%%
 %%ZSH_FNDIR%%/Completion/X/_kfmclient
 %%ZSH_FNDIR%%/Completion/X/_mozilla
 %%ZSH_FNDIR%%/Completion/X/_mplayer
+%%ZSH_FNDIR%%/Completion/X/_nautilus
 %%ZSH_FNDIR%%/Completion/X/_nedit
 %%ZSH_FNDIR%%/Completion/X/_netscape
 %%ZSH_FNDIR%%/Completion/X/_qiv
 %%ZSH_FNDIR%%/Completion/X/_urxvt
+%%ZSH_FNDIR%%/Completion/X/_setxkbmap
 %%ZSH_FNDIR%%/Completion/X/_vnc
 %%ZSH_FNDIR%%/Completion/X/_x_arguments
 %%ZSH_FNDIR%%/Completion/X/_x_borderwidth
@@ -600,6 +597,7 @@ bin/zsh-%%ZSH_VER%%
 %%ZSH_FNDIR%%/MIME/pick-web-browser
 %%ZSH_FNDIR%%/MIME/zsh-mime-handler
 %%ZSH_FNDIR%%/MIME/zsh-mime-setup
+%%ZSH_FNDIR%%/Misc/add-zsh-hook
 %%ZSH_FNDIR%%/Misc/allopt
 %%ZSH_FNDIR%%/Misc/checkmail
 %%ZSH_FNDIR%%/Misc/colors
@@ -616,6 +614,7 @@ bin/zsh-%%ZSH_VER%%
 %%ZSH_FNDIR%%/Misc/zcalc
 %%ZSH_FNDIR%%/Misc/zed
 %%ZSH_FNDIR%%/Misc/zkbd
+%%ZSH_FNDIR%%/Misc/zmathfuncdef
 %%ZSH_FNDIR%%/Misc/zmv
 %%ZSH_FNDIR%%/Misc/zrecompile
 %%ZSH_FNDIR%%/Misc/zstyle+
@@ -696,6 +695,7 @@ bin/zsh-%%ZSH_VER%%
 %%ZSH_FNDIR%%/Zle/down-line-or-beginning-search
 %%ZSH_FNDIR%%/Zle/edit-command-line
 %%ZSH_FNDIR%%/Zle/forward-word-match
+%%ZSH_FNDIR%%/Zle/history-beginning-search-menu
 %%ZSH_FNDIR%%/Zle/history-pattern-search
 %%ZSH_FNDIR%%/Zle/history-search-end
 %%ZSH_FNDIR%%/Zle/incarg
@@ -704,16 +704,21 @@ bin/zsh-%%ZSH_VER%%
 %%ZSH_FNDIR%%/Zle/insert-files
 %%ZSH_FNDIR%%/Zle/insert-unicode-char
 %%ZSH_FNDIR%%/Zle/keeper
+%%ZSH_FNDIR%%/Zle/keymap+widget
 %%ZSH_FNDIR%%/Zle/kill-word-match
 %%ZSH_FNDIR%%/Zle/match-words-by-style
+%%ZSH_FNDIR%%/Zle/match-word-context
+%%ZSH_FNDIR%%/Zle/modify-current-argument
 %%ZSH_FNDIR%%/Zle/narrow-to-region
 %%ZSH_FNDIR%%/Zle/narrow-to-region-invisible
 %%ZSH_FNDIR%%/Zle/predict-on
 %%ZSH_FNDIR%%/Zle/quote-and-complete-word
 %%ZSH_FNDIR%%/Zle/read-from-minibuffer
 %%ZSH_FNDIR%%/Zle/replace-string
+%%ZSH_FNDIR%%/Zle/replace-string-again
 %%ZSH_FNDIR%%/Zle/select-word-style
 %%ZSH_FNDIR%%/Zle/smart-insert-last-word
+%%ZSH_FNDIR%%/Zle/split-shell-arguments
 %%ZSH_FNDIR%%/Zle/transpose-words-match
 %%ZSH_FNDIR%%/Zle/up-case-word-match
 %%ZSH_FNDIR%%/Zle/up-line-or-beginning-search
@@ -721,6 +726,7 @@ bin/zsh-%%ZSH_VER%%
 %%ZSH_FNDIR%%/Zle/which-command
 %%ZSH_FNDIR%%/Zle/zed-set-file-name
 %%DATADIR%%/%%ZSH_VER%%/scripts/newuser
+@dirrm %%ZSH_FNDIR%%/Calendar
 @dirrm %%ZSH_FNDIR%%/Completion/AIX
 @dirrm %%ZSH_FNDIR%%/Completion/BSD
 @dirrm %%ZSH_FNDIR%%/Completion/Base
@@ -728,7 +734,7 @@ bin/zsh-%%ZSH_VER%%
 @dirrm %%ZSH_FNDIR%%/Completion/Darwin
 @dirrm %%ZSH_FNDIR%%/Completion/Debian
 @dirrm %%ZSH_FNDIR%%/Completion/Linux
-@dirrm %%ZSH_FNDIR%%/Completion/Mandrake
+@dirrm %%ZSH_FNDIR%%/Completion/Mandriva
 @dirrm %%ZSH_FNDIR%%/Completion/Redhat
 @dirrm %%ZSH_FNDIR%%/Completion/Unix
 @dirrm %%ZSH_FNDIR%%/Completion/X