3 files changed, 98 insertions, 23 deletions

diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile
index 3e1a8f230daf..08892f045749 100644
--- a/shells/zsh/Makefile
+++ b/shells/zsh/Makefile
@@ -25,7 +25,7 @@
 #			NOTE: does NOT have to be inside ${PREFIX} tree
 
 PORTNAME=	zsh
-PORTVERSION=	4.0.9
+PORTVERSION=	4.2.0
 CATEGORIES=	shells
 MASTER_SITES=	http://www.zsh.org/zsh/ \
 		ftp://ftp.zsh.org/zsh/ \
@@ -56,7 +56,7 @@ ZSH_VER=	${PORTVERSION}
 # Conflicts with shells/zsh-devel as it installs files into the same locations
 CONFLICTS=	zsh-devel-* zsh-4.1.*
 
-#USE_BZIP2=	yes
+USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
@@ -92,10 +92,7 @@ PLIST_SUB+=	ZSH_VER="${ZSH_VER}" ZSHETCDIR="${ZSH_ETCDIR}" \
 
 MAN1=		zsh.1 zshbuiltins.1 zshcompctl.1 zshcompwid.1 zshcompsys.1 \
 		zshcontrib.1 zshexpn.1 zshmisc.1 zshmodules.1 zshoptions.1 \
-		zshparam.1 zshzftpsys.1 zshzle.1 zshall.1
-.if !defined(NOPORTDOCS)
-INFO=		zsh
-.endif
+		zshparam.1 zshtcpsys.1 zshzftpsys.1 zshzle.1 zshall.1
 DOCS=		LICENCE META-FAQ README Etc/BUGS Etc/CONTRIBUTORS Etc/FAQ \
 		Etc/FEATURES Etc/NEWS Etc/completion-style-guide \
 		Doc/zsh*.html Doc/zsh.dvi Doc/zsh_a4.ps Doc/zsh_us.ps
diff --git a/shells/zsh/distinfo b/shells/zsh/distinfo
index 8addcaf053bb..0b8c565e03b3 100644
--- a/shells/zsh/distinfo
+++ b/shells/zsh/distinfo
@@ -1,4 +1,4 @@
-MD5 (zsh-4.0.9.tar.gz) = be68b33eb8d48611bff46b0edc452dc6
-SIZE (zsh-4.0.9.tar.gz) = 2222705
-MD5 (zsh-4.0.9-doc.tar.gz) = b07d99d5ed597077226cedc2036fc827
-SIZE (zsh-4.0.9-doc.tar.gz) = 1925158
+MD5 (zsh-4.2.0.tar.bz2) = 866bcdad8c0c4974650f5eff395a9a35
+SIZE (zsh-4.2.0.tar.bz2) = 1990884
+MD5 (zsh-4.2.0-doc.tar.bz2) = 14aa2d8d9e6f546593fd42f45dfee669
+SIZE (zsh-4.2.0-doc.tar.bz2) = 1695230
diff --git a/shells/zsh/pkg-plist b/shells/zsh/pkg-plist
index 7098a5fec365..71635cd31458 100644
--- a/shells/zsh/pkg-plist
+++ b/shells/zsh/pkg-plist
@@ -11,15 +11,20 @@ bin/zsh-%%ZSH_VER%%
 %%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/complete.so
 %%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/complist.so
 %%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/computil.so
+%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/datetime.so
 %%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/deltochar.so
 %%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/example.so
 %%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/files.so
+%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/langinfo.so
 %%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/mapfile.so
 %%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/mathfunc.so
+%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/net/socket.so
+%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/net/tcp.so
 %%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/parameter.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
+%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/system.so
 %%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/termcap.so
 %%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/terminfo.so
 %%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/zftp.so
@@ -27,11 +32,16 @@ bin/zsh-%%ZSH_VER%%
 %%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/zleparameter.so
 %%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/zprof.so
 %%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/zpty.so
+%%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/zselect.so
 %%NO_STATIC%%lib/zsh/%%ZSH_VER%%/zsh/zutil.so
+%%NO_STATIC%%@dirrm lib/zsh/%%ZSH_VER%%/zsh/net
 %%NO_STATIC%%@dirrm lib/zsh/%%ZSH_VER%%/zsh
 %%NO_STATIC%%@dirrm lib/zsh/%%ZSH_VER%%
 %%NO_STATIC%%lib/zsh/libzsh-%%ZSH_VER%%.so
 %%NO_STATIC%%@dirrm lib/zsh
+%%PORTDOCS%%@unexec install-info --delete %D/info/zsh.info %D/info/dir
+%%PORTDOCS%%info/zsh.info
+%%PORTDOCS%%@exec install-info %D/info/zsh.info %D/info/dir
 %%PORTDOCS%%%%DOCSDIR%%/BUGS
 %%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTORS
 %%PORTDOCS%%%%DOCSDIR%%/FAQ
@@ -42,7 +52,6 @@ bin/zsh-%%ZSH_VER%%
 %%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
@@ -78,14 +87,15 @@ bin/zsh-%%ZSH_VER%%
 %%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_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_a4.ps
-%%PORTDOCS%%%%DOCSDIR%%/zsh_abt.html
-%%PORTDOCS%%%%DOCSDIR%%/zsh_ovr.html
 %%PORTDOCS%%%%DOCSDIR%%/zsh_toc.html
 %%PORTDOCS%%%%DOCSDIR%%/zsh_us.ps
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
@@ -125,12 +135,12 @@ bin/zsh-%%ZSH_VER%%
 %%ZSH_FNDIR%%/Completion/Base/_complete_debug
 %%ZSH_FNDIR%%/Completion/Base/_complete_help
 %%ZSH_FNDIR%%/Completion/Base/_complete_tag
-%%ZSH_FNDIR%%/Completion/Base/_contexts
 %%ZSH_FNDIR%%/Completion/Base/_correct
 %%ZSH_FNDIR%%/Completion/Base/_correct_filename
 %%ZSH_FNDIR%%/Completion/Base/_correct_word
 %%ZSH_FNDIR%%/Completion/Base/_describe
 %%ZSH_FNDIR%%/Completion/Base/_description
+%%ZSH_FNDIR%%/Completion/Base/_dispatch
 %%ZSH_FNDIR%%/Completion/Base/_expand
 %%ZSH_FNDIR%%/Completion/Base/_expand_alias
 %%ZSH_FNDIR%%/Completion/Base/_expand_word
@@ -151,12 +161,14 @@ bin/zsh-%%ZSH_VER%%
 %%ZSH_FNDIR%%/Completion/Base/_normal
 %%ZSH_FNDIR%%/Completion/Base/_nothing
 %%ZSH_FNDIR%%/Completion/Base/_oldlist
+%%ZSH_FNDIR%%/Completion/Base/_pick_variant
 %%ZSH_FNDIR%%/Completion/Base/_prefix
 %%ZSH_FNDIR%%/Completion/Base/_read_comp
 %%ZSH_FNDIR%%/Completion/Base/_regex_arguments
 %%ZSH_FNDIR%%/Completion/Base/_requested
 %%ZSH_FNDIR%%/Completion/Base/_retrieve_cache
 %%ZSH_FNDIR%%/Completion/Base/_sep_parts
+%%ZSH_FNDIR%%/Completion/Base/_set_command
 %%ZSH_FNDIR%%/Completion/Base/_setup
 %%ZSH_FNDIR%%/Completion/Base/_store_cache
 %%ZSH_FNDIR%%/Completion/Base/_sub_commands
@@ -177,6 +189,7 @@ bin/zsh-%%ZSH_VER%%
 %%ZSH_FNDIR%%/Completion/Cygwin/_putclip
 %%ZSH_FNDIR%%/Completion/Debian/_apt
 %%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
@@ -190,6 +203,7 @@ bin/zsh-%%ZSH_VER%%
 %%ZSH_FNDIR%%/Completion/Debian/_dupload
 %%ZSH_FNDIR%%/Completion/Debian/_make-kpkg
 %%ZSH_FNDIR%%/Completion/Debian/_update-alternatives
+%%ZSH_FNDIR%%/Completion/Debian/_update-rc.d
 %%ZSH_FNDIR%%/Completion/Linux/_iptables
 %%ZSH_FNDIR%%/Completion/Linux/_losetup
 %%ZSH_FNDIR%%/Completion/Linux/_modutils
@@ -206,14 +220,15 @@ bin/zsh-%%ZSH_VER%%
 %%ZSH_FNDIR%%/Completion/Unix/_antiword
 %%ZSH_FNDIR%%/Completion/Unix/_apachectl
 %%ZSH_FNDIR%%/Completion/Unix/_apm
-%%ZSH_FNDIR%%/Completion/Unix/_archie
 %%ZSH_FNDIR%%/Completion/Unix/_arp
 %%ZSH_FNDIR%%/Completion/Unix/_arping
+%%ZSH_FNDIR%%/Completion/Unix/_attr
 %%ZSH_FNDIR%%/Completion/Unix/_bison
 %%ZSH_FNDIR%%/Completion/Unix/_bzip2
 %%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/_compress
 %%ZSH_FNDIR%%/Completion/Unix/_configure
@@ -232,10 +247,12 @@ bin/zsh-%%ZSH_VER%%
 %%ZSH_FNDIR%%/Completion/Unix/_ecasound
 %%ZSH_FNDIR%%/Completion/Unix/_elinks
 %%ZSH_FNDIR%%/Completion/Unix/_elm
+%%ZSH_FNDIR%%/Completion/Unix/_email_addresses
 %%ZSH_FNDIR%%/Completion/Unix/_enscript
 %%ZSH_FNDIR%%/Completion/Unix/_fakeroot
 %%ZSH_FNDIR%%/Completion/Unix/_fetchmail
 %%ZSH_FNDIR%%/Completion/Unix/_figlet
+%%ZSH_FNDIR%%/Completion/Unix/_file_systems
 %%ZSH_FNDIR%%/Completion/Unix/_files
 %%ZSH_FNDIR%%/Completion/Unix/_find
 %%ZSH_FNDIR%%/Completion/Unix/_finger
@@ -244,10 +261,12 @@ bin/zsh-%%ZSH_VER%%
 %%ZSH_FNDIR%%/Completion/Unix/_gcc
 %%ZSH_FNDIR%%/Completion/Unix/_gdb
 %%ZSH_FNDIR%%/Completion/Unix/_getconf
+%%ZSH_FNDIR%%/Completion/Unix/_getent
 %%ZSH_FNDIR%%/Completion/Unix/_global
 %%ZSH_FNDIR%%/Completion/Unix/_global_tags
 %%ZSH_FNDIR%%/Completion/Unix/_gnu_generic
 %%ZSH_FNDIR%%/Completion/Unix/_gpg
+%%ZSH_FNDIR%%/Completion/Unix/_gphoto2
 %%ZSH_FNDIR%%/Completion/Unix/_gprof
 %%ZSH_FNDIR%%/Completion/Unix/_grep
 %%ZSH_FNDIR%%/Completion/Unix/_groups
@@ -261,12 +280,15 @@ bin/zsh-%%ZSH_VER%%
 %%ZSH_FNDIR%%/Completion/Unix/_irssi
 %%ZSH_FNDIR%%/Completion/Unix/_ispell
 %%ZSH_FNDIR%%/Completion/Unix/_java
+%%ZSH_FNDIR%%/Completion/Unix/_java_class
 %%ZSH_FNDIR%%/Completion/Unix/_joe
 %%ZSH_FNDIR%%/Completion/Unix/_killall
 %%ZSH_FNDIR%%/Completion/Unix/_larch
 %%ZSH_FNDIR%%/Completion/Unix/_last
+%%ZSH_FNDIR%%/Completion/Unix/_less
 %%ZSH_FNDIR%%/Completion/Unix/_links
 %%ZSH_FNDIR%%/Completion/Unix/_loadkeys
+%%ZSH_FNDIR%%/Completion/Unix/_locales
 %%ZSH_FNDIR%%/Completion/Unix/_look
 %%ZSH_FNDIR%%/Completion/Unix/_lp
 %%ZSH_FNDIR%%/Completion/Unix/_ls
@@ -281,11 +303,14 @@ bin/zsh-%%ZSH_VER%%
 %%ZSH_FNDIR%%/Completion/Unix/_mount
 %%ZSH_FNDIR%%/Completion/Unix/_mt
 %%ZSH_FNDIR%%/Completion/Unix/_mtools
+%%ZSH_FNDIR%%/Completion/Unix/_mtr
 %%ZSH_FNDIR%%/Completion/Unix/_mutt
 %%ZSH_FNDIR%%/Completion/Unix/_my_accounts
 %%ZSH_FNDIR%%/Completion/Unix/_mysql_utils
+%%ZSH_FNDIR%%/Completion/Unix/_mysqldiff
 %%ZSH_FNDIR%%/Completion/Unix/_ncftp
 %%ZSH_FNDIR%%/Completion/Unix/_net_interfaces
+%%ZSH_FNDIR%%/Completion/Unix/_netcat
 %%ZSH_FNDIR%%/Completion/Unix/_newsgroups
 %%ZSH_FNDIR%%/Completion/Unix/_nice
 %%ZSH_FNDIR%%/Completion/Unix/_nmap
@@ -296,20 +321,22 @@ bin/zsh-%%ZSH_VER%%
 %%ZSH_FNDIR%%/Completion/Unix/_path_files
 %%ZSH_FNDIR%%/Completion/Unix/_pbm
 %%ZSH_FNDIR%%/Completion/Unix/_pdf
+%%ZSH_FNDIR%%/Completion/Unix/_perforce
 %%ZSH_FNDIR%%/Completion/Unix/_perl
 %%ZSH_FNDIR%%/Completion/Unix/_perl_basepods
-%%ZSH_FNDIR%%/Completion/Unix/_perl_builtin_funcs
 %%ZSH_FNDIR%%/Completion/Unix/_perl_modules
 %%ZSH_FNDIR%%/Completion/Unix/_perldoc
 %%ZSH_FNDIR%%/Completion/Unix/_pids
 %%ZSH_FNDIR%%/Completion/Unix/_pine
 %%ZSH_FNDIR%%/Completion/Unix/_ports
 %%ZSH_FNDIR%%/Completion/Unix/_prcs
+%%ZSH_FNDIR%%/Completion/Unix/_printenv
 %%ZSH_FNDIR%%/Completion/Unix/_printers
 %%ZSH_FNDIR%%/Completion/Unix/_ps
 %%ZSH_FNDIR%%/Completion/Unix/_pspdf
 %%ZSH_FNDIR%%/Completion/Unix/_psutils
 %%ZSH_FNDIR%%/Completion/Unix/_python
+%%ZSH_FNDIR%%/Completion/Unix/_raggle
 %%ZSH_FNDIR%%/Completion/Unix/_rar
 %%ZSH_FNDIR%%/Completion/Unix/_rcs
 %%ZSH_FNDIR%%/Completion/Unix/_renice
@@ -320,6 +347,7 @@ bin/zsh-%%ZSH_VER%%
 %%ZSH_FNDIR%%/Completion/Unix/_samba
 %%ZSH_FNDIR%%/Completion/Unix/_sccs
 %%ZSH_FNDIR%%/Completion/Unix/_screen
+%%ZSH_FNDIR%%/Completion/Unix/_sed
 %%ZSH_FNDIR%%/Completion/Unix/_services
 %%ZSH_FNDIR%%/Completion/Unix/_sh
 %%ZSH_FNDIR%%/Completion/Unix/_signals
@@ -336,24 +364,30 @@ bin/zsh-%%ZSH_VER%%
 %%ZSH_FNDIR%%/Completion/Unix/_tar
 %%ZSH_FNDIR%%/Completion/Unix/_tar_archive
 %%ZSH_FNDIR%%/Completion/Unix/_telnet
+%%ZSH_FNDIR%%/Completion/Unix/_terminals
 %%ZSH_FNDIR%%/Completion/Unix/_tex
 %%ZSH_FNDIR%%/Completion/Unix/_texi
 %%ZSH_FNDIR%%/Completion/Unix/_texinfo
 %%ZSH_FNDIR%%/Completion/Unix/_tidy
 %%ZSH_FNDIR%%/Completion/Unix/_tiff
 %%ZSH_FNDIR%%/Completion/Unix/_tilde_files
+%%ZSH_FNDIR%%/Completion/Unix/_time_zone
 %%ZSH_FNDIR%%/Completion/Unix/_tin
+%%ZSH_FNDIR%%/Completion/Unix/_tla
+%%ZSH_FNDIR%%/Completion/Unix/_uniq
 %%ZSH_FNDIR%%/Completion/Unix/_urls
 %%ZSH_FNDIR%%/Completion/Unix/_user_admin
 %%ZSH_FNDIR%%/Completion/Unix/_user_at_host
 %%ZSH_FNDIR%%/Completion/Unix/_users
 %%ZSH_FNDIR%%/Completion/Unix/_users_on
 %%ZSH_FNDIR%%/Completion/Unix/_vorbis
+%%ZSH_FNDIR%%/Completion/Unix/_vux
 %%ZSH_FNDIR%%/Completion/Unix/_w3m
 %%ZSH_FNDIR%%/Completion/Unix/_webbrowser
 %%ZSH_FNDIR%%/Completion/Unix/_wget
 %%ZSH_FNDIR%%/Completion/Unix/_whereis
 %%ZSH_FNDIR%%/Completion/Unix/_whois
+%%ZSH_FNDIR%%/Completion/Unix/_wiggle
 %%ZSH_FNDIR%%/Completion/Unix/_xargs
 %%ZSH_FNDIR%%/Completion/Unix/_xmlsoft
 %%ZSH_FNDIR%%/Completion/Unix/_yodl
@@ -403,6 +437,7 @@ bin/zsh-%%ZSH_VER%%
 %%ZSH_FNDIR%%/Completion/Zsh/_alias
 %%ZSH_FNDIR%%/Completion/Zsh/_aliases
 %%ZSH_FNDIR%%/Completion/Zsh/_arrays
+%%ZSH_FNDIR%%/Completion/Zsh/_assign
 %%ZSH_FNDIR%%/Completion/Zsh/_autocd
 %%ZSH_FNDIR%%/Completion/Zsh/_autoload
 %%ZSH_FNDIR%%/Completion/Zsh/_bindkey
@@ -415,6 +450,7 @@ bin/zsh-%%ZSH_VER%%
 %%ZSH_FNDIR%%/Completion/Zsh/_condition
 %%ZSH_FNDIR%%/Completion/Zsh/_default
 %%ZSH_FNDIR%%/Completion/Zsh/_directory_stack
+%%ZSH_FNDIR%%/Completion/Zsh/_dirs
 %%ZSH_FNDIR%%/Completion/Zsh/_disable
 %%ZSH_FNDIR%%/Completion/Zsh/_echotc
 %%ZSH_FNDIR%%/Completion/Zsh/_echoti
@@ -432,6 +468,7 @@ bin/zsh-%%ZSH_VER%%
 %%ZSH_FNDIR%%/Completion/Zsh/_jobs_builtin
 %%ZSH_FNDIR%%/Completion/Zsh/_jobs_fg
 %%ZSH_FNDIR%%/Completion/Zsh/_kill
+%%ZSH_FNDIR%%/Completion/Zsh/_limit
 %%ZSH_FNDIR%%/Completion/Zsh/_limits
 %%ZSH_FNDIR%%/Completion/Zsh/_math
 %%ZSH_FNDIR%%/Completion/Zsh/_mere
@@ -451,6 +488,7 @@ bin/zsh-%%ZSH_VER%%
 %%ZSH_FNDIR%%/Completion/Zsh/_source
 %%ZSH_FNDIR%%/Completion/Zsh/_stat
 %%ZSH_FNDIR%%/Completion/Zsh/_subscript
+%%ZSH_FNDIR%%/Completion/Zsh/_suffix_alias_files
 %%ZSH_FNDIR%%/Completion/Zsh/_tilde
 %%ZSH_FNDIR%%/Completion/Zsh/_trap
 %%ZSH_FNDIR%%/Completion/Zsh/_ttyctl
@@ -476,6 +514,9 @@ bin/zsh-%%ZSH_VER%%
 %%ZSH_FNDIR%%/Completion/compdump
 %%ZSH_FNDIR%%/Completion/compinit
 %%ZSH_FNDIR%%/Completion/compinstall
+%%ZSH_FNDIR%%/MIME/pick-web-browser
+%%ZSH_FNDIR%%/MIME/zsh-mime-handler
+%%ZSH_FNDIR%%/MIME/zsh-mime-setup
 %%ZSH_FNDIR%%/Misc/allopt
 %%ZSH_FNDIR%%/Misc/checkmail
 %%ZSH_FNDIR%%/Misc/colors
@@ -485,7 +526,11 @@ bin/zsh-%%ZSH_VER%%
 %%ZSH_FNDIR%%/Misc/mere
 %%ZSH_FNDIR%%/Misc/nslookup
 %%ZSH_FNDIR%%/Misc/promptnl
+%%ZSH_FNDIR%%/Misc/relative
 %%ZSH_FNDIR%%/Misc/run-help
+%%ZSH_FNDIR%%/Misc/tetris
+%%ZSH_FNDIR%%/Misc/zargs
+%%ZSH_FNDIR%%/Misc/zcalc
 %%ZSH_FNDIR%%/Misc/zed
 %%ZSH_FNDIR%%/Misc/zkbd
 %%ZSH_FNDIR%%/Misc/zmv
@@ -507,6 +552,44 @@ bin/zsh-%%ZSH_VER%%
 %%ZSH_FNDIR%%/Prompts/prompt_walters_setup
 %%ZSH_FNDIR%%/Prompts/prompt_zefram_setup
 %%ZSH_FNDIR%%/Prompts/promptinit
+%%ZSH_FNDIR%%/TCP/tcp_alias
+%%ZSH_FNDIR%%/TCP/tcp_close
+%%ZSH_FNDIR%%/TCP/tcp_command
+%%ZSH_FNDIR%%/TCP/tcp_expect
+%%ZSH_FNDIR%%/TCP/tcp_fd_handler
+%%ZSH_FNDIR%%/TCP/tcp_log
+%%ZSH_FNDIR%%/TCP/tcp_open
+%%ZSH_FNDIR%%/TCP/tcp_output
+%%ZSH_FNDIR%%/TCP/tcp_point
+%%ZSH_FNDIR%%/TCP/tcp_proxy
+%%ZSH_FNDIR%%/TCP/tcp_read
+%%ZSH_FNDIR%%/TCP/tcp_rename
+%%ZSH_FNDIR%%/TCP/tcp_send
+%%ZSH_FNDIR%%/TCP/tcp_sess
+%%ZSH_FNDIR%%/TCP/tcp_shoot
+%%ZSH_FNDIR%%/TCP/tcp_spam
+%%ZSH_FNDIR%%/TCP/tcp_talk
+%%ZSH_FNDIR%%/TCP/tcp_wait
+%%ZSH_FNDIR%%/Zle/backward-kill-word-match
+%%ZSH_FNDIR%%/Zle/backward-word-match
+%%ZSH_FNDIR%%/Zle/capitalize-word-match
+%%ZSH_FNDIR%%/Zle/copy-earlier-word
+%%ZSH_FNDIR%%/Zle/delete-whole-word-match
+%%ZSH_FNDIR%%/Zle/down-case-word-match
+%%ZSH_FNDIR%%/Zle/down-line-or-beginning-search
+%%ZSH_FNDIR%%/Zle/forward-word-match
+%%ZSH_FNDIR%%/Zle/kill-word-match
+%%ZSH_FNDIR%%/Zle/match-words-by-style
+%%ZSH_FNDIR%%/Zle/narrow-to-region
+%%ZSH_FNDIR%%/Zle/narrow-to-region-invisible
+%%ZSH_FNDIR%%/Zle/quote-and-complete-word
+%%ZSH_FNDIR%%/Zle/read-from-minibuffer
+%%ZSH_FNDIR%%/Zle/replace-string
+%%ZSH_FNDIR%%/Zle/select-word-style
+%%ZSH_FNDIR%%/Zle/transpose-words-match
+%%ZSH_FNDIR%%/Zle/up-case-word-match
+%%ZSH_FNDIR%%/Zle/up-line-or-beginning-search
+%%ZSH_FNDIR%%/Zle/url-quote-magic
 %%NO_STATIC%%%%ZSH_FNDIR%%/Zftp/zfanon
 %%NO_STATIC%%%%ZSH_FNDIR%%/Zftp/zfautocheck
 %%NO_STATIC%%%%ZSH_FNDIR%%/Zftp/zfcd
@@ -539,13 +622,6 @@ bin/zsh-%%ZSH_VER%%
 %%NO_STATIC%%%%ZSH_FNDIR%%/Zftp/zfuget
 %%NO_STATIC%%%%ZSH_FNDIR%%/Zftp/zfuput
 %%NO_STATIC%%@dirrm %%ZSH_FNDIR%%/Zftp
-%%ZSH_FNDIR%%/Zle/bash-backward-kill-word
-%%ZSH_FNDIR%%/Zle/bash-backward-word
-%%ZSH_FNDIR%%/Zle/bash-down-case-word
-%%ZSH_FNDIR%%/Zle/bash-forward-word
-%%ZSH_FNDIR%%/Zle/bash-kill-word
-%%ZSH_FNDIR%%/Zle/bash-transpose-words
-%%ZSH_FNDIR%%/Zle/bash-up-case-word
 %%ZSH_FNDIR%%/Zle/cycle-completion-positions
 %%ZSH_FNDIR%%/Zle/edit-command-line
 %%ZSH_FNDIR%%/Zle/history-search-end
@@ -566,8 +642,10 @@ bin/zsh-%%ZSH_VER%%
 @dirrm %%ZSH_FNDIR%%/Completion/X
 @dirrm %%ZSH_FNDIR%%/Completion/Zsh
 @dirrm %%ZSH_FNDIR%%/Completion
+@dirrm %%ZSH_FNDIR%%/MIME
 @dirrm %%ZSH_FNDIR%%/Misc
 @dirrm %%ZSH_FNDIR%%/Prompts
+@dirrm %%ZSH_FNDIR%%/TCP
 @dirrm %%ZSH_FNDIR%%/Zle
 @dirrm %%ZSH_FNDIR%%
 @dirrm %%DATADIR%%/%%ZSH_VER%%