Update to 4.2.0

Patch provided by Geoff C. Wing in PR 24918
ok'd by uebayasi@

New features between zsh versions 4.0 and 4.2
Configuration:

* upgraded to use autoconf post-2.50
* improved compatibility with other shells through shell options, builtin
  arguments and improved builtin option parsing

Syntax and builtins:

* new printf builtin
* `+=' to append to parameters which works for scalars, arrays and (with
  pairs) associative arrays.
* enhanced multiple parameter `for' loops: for key value in key1 value1 key2
  value2 ... maintaining full compatibility with POSIX syntax.
* Suffix aliases allow the shell to run a command on a file by suffix, e.g
  `alias -s ps=gv' makes `foo.ps' execute `gv foo.ps'. Supplied function
  zsh-mime-setup uses existing mailcap and mime.types files to set up suitable
  aliases. Supplied function pick-web-browser is suitable for finding a browser
  to show .html etc. files by suffix alias.
* new option `no_case_glob' for case-insensitive globbing.

Add-on modules and functions:

* zsh/datetime modules makes date formatting and seconds since EPOCH available
  inside the shell.
* zsh/net/tcp module provides builtin interface to TCP through ztcp builtin.
  Function suite for interactive and script use with expect-style pattern
  matching.
* zsh/net/socket module provides zsocket builtin.
* zcalc calculator function with full line editing.
* builtin interface to pcre library
* zsh/zselect module provides zselect builtin as interface to select system call

Completion system:

* general improvements to command and context support, low-level functions,
  display code.
* in verbose mode, matches with the same description are grouped
* highly configurable completions for values of specific parameters, specific
  redirections for specific commands
* support for bash completion functions (typically zsh native functions are more
  powerful where available)
* New completions provided for (some of these may be in later 4.0 releases):
  valgrind, tidy, texinfo, infocmp, Java classes, larch, limit, locale
  parameters, netcat, mysqldiff, mt, lsof, elinks, ant, debchange (dch), email
  addresses, file system types, Perforce, xsltproc. Plus many others.

Line editor:

* special parameters $PREDISPLAY, $POSTDISPLAY available in function widgets
  to configure uneditable text (for narrowing)
* recursive editing
* supplied widgets read-from-minibuffer, replace-string use these features
  (more  intuitive prompting and argument reading than 4.0)
* access to killed text via $CUTBUFFER and $killring
* supplied highly configurable word widgets forward-word-match etc., can set
  what constitutes a word interactively or in startup script (implement
  bash-style behaviour, replacing previous bash-* word widgets)
* interface to incremental search via $LASTSEARCH
* better handling of keymaps in zle and widgets
* better support for output from user-defined widgets while zle is active
* tetris game which runs entirely in zle
* several other contributed widgets

Local internal improvements:

* disowned jobs are automatically restarted
* \u and \U print escapes for Unicode
* read -d allows a custom line ending.
* read -t .
* line numbers in error messages and $PS4 output are more consistent
* `=prog' expands only paths, no longer aliases for consistency
* job display in prompts; `jobs' command output can be piped
* prompts: new $RPROMPT2, %^, %j, %y, enhanced %{, %}, %_.
* rand48() function in zsh/mathfunc for better randomness in arithmetic
  (if the corresponding math library function is present)
* $SECONDS parameter can be made floating point via `typeset -F SECONDS'
  for better timing accuracy
* improvements to command line history mechanism
* job table is dynamically sized, preventing overflow (typically seen
  previously in complex completions).
* many bugfixes

7 files changed, 93 insertions, 54 deletions

diff --git a/shells/zsh/Makefile b/shells/zsh/Makefile
index c83b2daf79e..2460b70dfa7 100644
--- a/shells/zsh/Makefile
+++ b/shells/zsh/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.44 2004/02/02 08:48:40 uebayasi Exp $
+# $NetBSD: Makefile,v 1.45 2004/03/28 10:30:13 recht Exp $
 #
 .include "../../shells/zsh/Makefile.common"
 
-ZSH_VERSION=	4.0.9
+ZSH_VERSION=	4.2.0
 ZSH_MAINTAINER=	uebayasi@NetBSD.org
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/shells/zsh/Makefile.common b/shells/zsh/Makefile.common
index 278c7c93326..65e149a0861 100644
--- a/shells/zsh/Makefile.common
+++ b/shells/zsh/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2004/02/19 06:37:27 jlam Exp $
+# $NetBSD: Makefile.common,v 1.8 2004/03/28 10:30:13 recht Exp $
 
 DISTNAME=       zsh-${ZSH_VERSION}
 CATEGORIES=	shells
@@ -18,13 +18,6 @@ USE_BUILDLINK2=		YES
 USE_PKGINSTALL=		YES
 GNU_CONFIGURE=		YES
 
-# The zsh build process inspects the generated config.status file for the
-# presence of some strings to decide how to build zsh.  This is, of course,
-# a stupid thing to do, but we must not override config.status to "fix"
-# this build.
-#
-CONFIG_STATUS_OVERRIDE=	# empty
-
 USE_MAKEINFO=		YES
 INFO_FILES=		zsh.info
 
@@ -54,6 +47,7 @@ post-install:
 		${PREFIX}/share/doc/zsh
 
 # Utilize Zsh's test framework.
+# Testing of dynamic shell only works after install has been done
 #
 .PHONY: do-test do-su-test real-su-test
 
diff --git a/shells/zsh/PLIST b/shells/zsh/PLIST
index 8e025771d13..aae9d8ccc5a 100644
--- a/shells/zsh/PLIST
+++ b/shells/zsh/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2004/03/10 01:02:34 seb Exp $
+@comment $NetBSD: PLIST,v 1.12 2004/03/28 10:30:13 recht Exp $
 bin/zsh
 bin/${PKGNAME}
 man/man1/zsh.1
@@ -34,12 +34,14 @@ share/zsh/${PKGVERSION}/functions/_apm
 share/zsh/${PKGVERSION}/functions/_approximate
 share/zsh/${PKGVERSION}/functions/_apt
 share/zsh/${PKGVERSION}/functions/_apt-show-versions
-share/zsh/${PKGVERSION}/functions/_archie
+share/zsh/${PKGVERSION}/functions/_aptitude
 share/zsh/${PKGVERSION}/functions/_arg_compile
 share/zsh/${PKGVERSION}/functions/_arguments
 share/zsh/${PKGVERSION}/functions/_arp
 share/zsh/${PKGVERSION}/functions/_arping
 share/zsh/${PKGVERSION}/functions/_arrays
+share/zsh/${PKGVERSION}/functions/_assign
+share/zsh/${PKGVERSION}/functions/_attr
 share/zsh/${PKGVERSION}/functions/_auto-apt
 share/zsh/${PKGVERSION}/functions/_autocd
 share/zsh/${PKGVERSION}/functions/_autoload
@@ -60,6 +62,7 @@ share/zsh/${PKGVERSION}/functions/_cdcd
 share/zsh/${PKGVERSION}/functions/_cdrecord
 share/zsh/${PKGVERSION}/functions/_chflags
 share/zsh/${PKGVERSION}/functions/_chkconfig
+share/zsh/${PKGVERSION}/functions/_chmod
 share/zsh/${PKGVERSION}/functions/_chown
 share/zsh/${PKGVERSION}/functions/_combination
 share/zsh/${PKGVERSION}/functions/_command
@@ -72,7 +75,6 @@ share/zsh/${PKGVERSION}/functions/_complete_tag
 share/zsh/${PKGVERSION}/functions/_compress
 share/zsh/${PKGVERSION}/functions/_condition
 share/zsh/${PKGVERSION}/functions/_configure
-share/zsh/${PKGVERSION}/functions/_contexts
 share/zsh/${PKGVERSION}/functions/_correct
 share/zsh/${PKGVERSION}/functions/_correct_filename
 share/zsh/${PKGVERSION}/functions/_correct_word
@@ -100,7 +102,9 @@ share/zsh/${PKGVERSION}/functions/_diff_options
 share/zsh/${PKGVERSION}/functions/_dir_list
 share/zsh/${PKGVERSION}/functions/_directories
 share/zsh/${PKGVERSION}/functions/_directory_stack
+share/zsh/${PKGVERSION}/functions/_dirs
 share/zsh/${PKGVERSION}/functions/_disable
+share/zsh/${PKGVERSION}/functions/_dispatch
 share/zsh/${PKGVERSION}/functions/_domains
 share/zsh/${PKGVERSION}/functions/_dpkg
 share/zsh/${PKGVERSION}/functions/_dpkg_source
@@ -114,6 +118,7 @@ share/zsh/${PKGVERSION}/functions/_echotc
 share/zsh/${PKGVERSION}/functions/_echoti
 share/zsh/${PKGVERSION}/functions/_elinks
 share/zsh/${PKGVERSION}/functions/_elm
+share/zsh/${PKGVERSION}/functions/_email_addresses
 share/zsh/${PKGVERSION}/functions/_emulate
 share/zsh/${PKGVERSION}/functions/_enable
 share/zsh/${PKGVERSION}/functions/_enscript
@@ -126,6 +131,7 @@ share/zsh/${PKGVERSION}/functions/_fc
 share/zsh/${PKGVERSION}/functions/_fetchmail
 share/zsh/${PKGVERSION}/functions/_figlet
 share/zsh/${PKGVERSION}/functions/_file_descriptors
+share/zsh/${PKGVERSION}/functions/_file_systems
 share/zsh/${PKGVERSION}/functions/_files
 share/zsh/${PKGVERSION}/functions/_find
 share/zsh/${PKGVERSION}/functions/_finger
@@ -139,11 +145,13 @@ share/zsh/${PKGVERSION}/functions/_gdb
 share/zsh/${PKGVERSION}/functions/_generic
 share/zsh/${PKGVERSION}/functions/_getclip
 share/zsh/${PKGVERSION}/functions/_getconf
+share/zsh/${PKGVERSION}/functions/_getent
 share/zsh/${PKGVERSION}/functions/_getfacl
 share/zsh/${PKGVERSION}/functions/_global
 share/zsh/${PKGVERSION}/functions/_global_tags
 share/zsh/${PKGVERSION}/functions/_gnu_generic
 share/zsh/${PKGVERSION}/functions/_gpg
+share/zsh/${PKGVERSION}/functions/_gphoto2
 share/zsh/${PKGVERSION}/functions/_gprof
 share/zsh/${PKGVERSION}/functions/_gqview
 share/zsh/${PKGVERSION}/functions/_grep
@@ -166,6 +174,7 @@ share/zsh/${PKGVERSION}/functions/_iptables
 share/zsh/${PKGVERSION}/functions/_irssi
 share/zsh/${PKGVERSION}/functions/_ispell
 share/zsh/${PKGVERSION}/functions/_java
+share/zsh/${PKGVERSION}/functions/_java_class
 share/zsh/${PKGVERSION}/functions/_jobs
 share/zsh/${PKGVERSION}/functions/_jobs_bg
 share/zsh/${PKGVERSION}/functions/_jobs_builtin
@@ -176,10 +185,13 @@ share/zsh/${PKGVERSION}/functions/_killall
 share/zsh/${PKGVERSION}/functions/_kld
 share/zsh/${PKGVERSION}/functions/_larch
 share/zsh/${PKGVERSION}/functions/_last
+share/zsh/${PKGVERSION}/functions/_less
+share/zsh/${PKGVERSION}/functions/_limit
 share/zsh/${PKGVERSION}/functions/_limits
 share/zsh/${PKGVERSION}/functions/_links
 share/zsh/${PKGVERSION}/functions/_list
 share/zsh/${PKGVERSION}/functions/_loadkeys
+share/zsh/${PKGVERSION}/functions/_locales
 share/zsh/${PKGVERSION}/functions/_logical_volumes
 share/zsh/${PKGVERSION}/functions/_look
 share/zsh/${PKGVERSION}/functions/_losetup
@@ -215,13 +227,16 @@ share/zsh/${PKGVERSION}/functions/_mozilla
 share/zsh/${PKGVERSION}/functions/_mplayer
 share/zsh/${PKGVERSION}/functions/_mt
 share/zsh/${PKGVERSION}/functions/_mtools
+share/zsh/${PKGVERSION}/functions/_mtr
 share/zsh/${PKGVERSION}/functions/_multi_parts
 share/zsh/${PKGVERSION}/functions/_mutt
 share/zsh/${PKGVERSION}/functions/_my_accounts
 share/zsh/${PKGVERSION}/functions/_mysql_utils
+share/zsh/${PKGVERSION}/functions/_mysqldiff
 share/zsh/${PKGVERSION}/functions/_ncftp
 share/zsh/${PKGVERSION}/functions/_nedit
 share/zsh/${PKGVERSION}/functions/_net_interfaces
+share/zsh/${PKGVERSION}/functions/_netcat
 share/zsh/${PKGVERSION}/functions/_netscape
 share/zsh/${PKGVERSION}/functions/_newsgroups
 share/zsh/${PKGVERSION}/functions/_next_label
@@ -244,12 +259,13 @@ share/zsh/${PKGVERSION}/functions/_patch
 share/zsh/${PKGVERSION}/functions/_path_files
 share/zsh/${PKGVERSION}/functions/_pbm
 share/zsh/${PKGVERSION}/functions/_pdf
+share/zsh/${PKGVERSION}/functions/_perforce
 share/zsh/${PKGVERSION}/functions/_perl
 share/zsh/${PKGVERSION}/functions/_perl_basepods
-share/zsh/${PKGVERSION}/functions/_perl_builtin_funcs
 share/zsh/${PKGVERSION}/functions/_perl_modules
 share/zsh/${PKGVERSION}/functions/_perldoc
 share/zsh/${PKGVERSION}/functions/_physical_volumes
+share/zsh/${PKGVERSION}/functions/_pick_variant
 share/zsh/${PKGVERSION}/functions/_pids
 share/zsh/${PKGVERSION}/functions/_pine
 share/zsh/${PKGVERSION}/functions/_pkgtool
@@ -258,6 +274,7 @@ share/zsh/${PKGVERSION}/functions/_prcs
 share/zsh/${PKGVERSION}/functions/_precommand
 share/zsh/${PKGVERSION}/functions/_prefix
 share/zsh/${PKGVERSION}/functions/_print
+share/zsh/${PKGVERSION}/functions/_printenv
 share/zsh/${PKGVERSION}/functions/_printers
 share/zsh/${PKGVERSION}/functions/_prompt
 share/zsh/${PKGVERSION}/functions/_ps
@@ -266,6 +283,7 @@ share/zsh/${PKGVERSION}/functions/_pspdf
 share/zsh/${PKGVERSION}/functions/_psutils
 share/zsh/${PKGVERSION}/functions/_putclip
 share/zsh/${PKGVERSION}/functions/_python
+share/zsh/${PKGVERSION}/functions/_raggle
 share/zsh/${PKGVERSION}/functions/_rar
 share/zsh/${PKGVERSION}/functions/_rcs
 share/zsh/${PKGVERSION}/functions/_read
@@ -284,10 +302,12 @@ share/zsh/${PKGVERSION}/functions/_samba
 share/zsh/${PKGVERSION}/functions/_sccs
 share/zsh/${PKGVERSION}/functions/_sched
 share/zsh/${PKGVERSION}/functions/_screen
+share/zsh/${PKGVERSION}/functions/_sed
 share/zsh/${PKGVERSION}/functions/_sep_parts
 share/zsh/${PKGVERSION}/functions/_service
 share/zsh/${PKGVERSION}/functions/_services
 share/zsh/${PKGVERSION}/functions/_set
+share/zsh/${PKGVERSION}/functions/_set_command
 share/zsh/${PKGVERSION}/functions/_setopt
 share/zsh/${PKGVERSION}/functions/_setup
 share/zsh/${PKGVERSION}/functions/_sh
@@ -307,11 +327,13 @@ share/zsh/${PKGVERSION}/functions/_sub_commands
 share/zsh/${PKGVERSION}/functions/_subscript
 share/zsh/${PKGVERSION}/functions/_subversion
 share/zsh/${PKGVERSION}/functions/_sudo
+share/zsh/${PKGVERSION}/functions/_suffix_alias_files
 share/zsh/${PKGVERSION}/functions/_sysctl
 share/zsh/${PKGVERSION}/functions/_tags
 share/zsh/${PKGVERSION}/functions/_tar
 share/zsh/${PKGVERSION}/functions/_tar_archive
 share/zsh/${PKGVERSION}/functions/_telnet
+share/zsh/${PKGVERSION}/functions/_terminals
 share/zsh/${PKGVERSION}/functions/_tex
 share/zsh/${PKGVERSION}/functions/_texi
 share/zsh/${PKGVERSION}/functions/_texinfo
@@ -319,15 +341,19 @@ share/zsh/${PKGVERSION}/functions/_tidy
 share/zsh/${PKGVERSION}/functions/_tiff
 share/zsh/${PKGVERSION}/functions/_tilde
 share/zsh/${PKGVERSION}/functions/_tilde_files
+share/zsh/${PKGVERSION}/functions/_time_zone
 share/zsh/${PKGVERSION}/functions/_tin
+share/zsh/${PKGVERSION}/functions/_tla
 share/zsh/${PKGVERSION}/functions/_trap
 share/zsh/${PKGVERSION}/functions/_ttyctl
 share/zsh/${PKGVERSION}/functions/_typeset
 share/zsh/${PKGVERSION}/functions/_ulimit
 share/zsh/${PKGVERSION}/functions/_uml
 share/zsh/${PKGVERSION}/functions/_unhash
+share/zsh/${PKGVERSION}/functions/_uniq
 share/zsh/${PKGVERSION}/functions/_unsetopt
 share/zsh/${PKGVERSION}/functions/_update-alternatives
+share/zsh/${PKGVERSION}/functions/_update-rc.d
 share/zsh/${PKGVERSION}/functions/_urls
 share/zsh/${PKGVERSION}/functions/_urpmi
 share/zsh/${PKGVERSION}/functions/_user_admin
@@ -342,6 +368,7 @@ share/zsh/${PKGVERSION}/functions/_vars
 share/zsh/${PKGVERSION}/functions/_vnc
 share/zsh/${PKGVERSION}/functions/_volume_groups
 share/zsh/${PKGVERSION}/functions/_vorbis
+share/zsh/${PKGVERSION}/functions/_vux
 share/zsh/${PKGVERSION}/functions/_w3m
 share/zsh/${PKGVERSION}/functions/_wait
 share/zsh/${PKGVERSION}/functions/_wanted
@@ -350,6 +377,7 @@ share/zsh/${PKGVERSION}/functions/_wget
 share/zsh/${PKGVERSION}/functions/_whereis
 share/zsh/${PKGVERSION}/functions/_which
 share/zsh/${PKGVERSION}/functions/_whois
+share/zsh/${PKGVERSION}/functions/_wiggle
 share/zsh/${PKGVERSION}/functions/_x_arguments
 share/zsh/${PKGVERSION}/functions/_x_borderwidth
 share/zsh/${PKGVERSION}/functions/_x_color
@@ -396,22 +424,23 @@ share/zsh/${PKGVERSION}/functions/_zmv
 share/zsh/${PKGVERSION}/functions/_zpty
 share/zsh/${PKGVERSION}/functions/_zstyle
 share/zsh/${PKGVERSION}/functions/allopt
-share/zsh/${PKGVERSION}/functions/bash-backward-kill-word
-share/zsh/${PKGVERSION}/functions/bash-backward-word
-share/zsh/${PKGVERSION}/functions/bash-down-case-word
-share/zsh/${PKGVERSION}/functions/bash-forward-word
-share/zsh/${PKGVERSION}/functions/bash-kill-word
-share/zsh/${PKGVERSION}/functions/bash-transpose-words
-share/zsh/${PKGVERSION}/functions/bash-up-case-word
+share/zsh/${PKGVERSION}/functions/backward-kill-word-match
+share/zsh/${PKGVERSION}/functions/backward-word-match
 share/zsh/${PKGVERSION}/functions/bashcompinit
+share/zsh/${PKGVERSION}/functions/capitalize-word-match
 share/zsh/${PKGVERSION}/functions/checkmail
 share/zsh/${PKGVERSION}/functions/colors
 share/zsh/${PKGVERSION}/functions/compaudit
 share/zsh/${PKGVERSION}/functions/compdump
 share/zsh/${PKGVERSION}/functions/compinit
 share/zsh/${PKGVERSION}/functions/compinstall
+share/zsh/${PKGVERSION}/functions/copy-earlier-word
 share/zsh/${PKGVERSION}/functions/cycle-completion-positions
+share/zsh/${PKGVERSION}/functions/delete-whole-word-match
+share/zsh/${PKGVERSION}/functions/down-case-word-match
+share/zsh/${PKGVERSION}/functions/down-line-or-beginning-search
 share/zsh/${PKGVERSION}/functions/edit-command-line
+share/zsh/${PKGVERSION}/functions/forward-word-match
 share/zsh/${PKGVERSION}/functions/getjobs
 share/zsh/${PKGVERSION}/functions/harden
 share/zsh/${PKGVERSION}/functions/history-search-end
@@ -419,8 +448,13 @@ share/zsh/${PKGVERSION}/functions/incarg
 share/zsh/${PKGVERSION}/functions/incremental-complete-word
 share/zsh/${PKGVERSION}/functions/insert-files
 share/zsh/${PKGVERSION}/functions/is-at-least
+share/zsh/${PKGVERSION}/functions/kill-word-match
+share/zsh/${PKGVERSION}/functions/match-words-by-style
 share/zsh/${PKGVERSION}/functions/mere
+share/zsh/${PKGVERSION}/functions/narrow-to-region
+share/zsh/${PKGVERSION}/functions/narrow-to-region-invisible
 share/zsh/${PKGVERSION}/functions/nslookup
+share/zsh/${PKGVERSION}/functions/pick-web-browser
 share/zsh/${PKGVERSION}/functions/predict-on
 share/zsh/${PKGVERSION}/functions/prompt_adam1_setup
 share/zsh/${PKGVERSION}/functions/prompt_adam2_setup
@@ -439,12 +473,26 @@ share/zsh/${PKGVERSION}/functions/prompt_walters_setup
 share/zsh/${PKGVERSION}/functions/prompt_zefram_setup
 share/zsh/${PKGVERSION}/functions/promptinit
 share/zsh/${PKGVERSION}/functions/promptnl
+share/zsh/${PKGVERSION}/functions/quote-and-complete-word
+share/zsh/${PKGVERSION}/functions/read-from-minibuffer
+share/zsh/${PKGVERSION}/functions/relative
+share/zsh/${PKGVERSION}/functions/replace-string
 share/zsh/${PKGVERSION}/functions/run-help
+share/zsh/${PKGVERSION}/functions/select-word-style
 share/zsh/${PKGVERSION}/functions/smart-insert-last-word
+share/zsh/${PKGVERSION}/functions/tetris
+share/zsh/${PKGVERSION}/functions/transpose-words-match
+share/zsh/${PKGVERSION}/functions/up-case-word-match
+share/zsh/${PKGVERSION}/functions/up-line-or-beginning-search
+share/zsh/${PKGVERSION}/functions/url-quote-magic
+share/zsh/${PKGVERSION}/functions/zargs
+share/zsh/${PKGVERSION}/functions/zcalc
 share/zsh/${PKGVERSION}/functions/zed
 share/zsh/${PKGVERSION}/functions/zkbd
 share/zsh/${PKGVERSION}/functions/zmv
 share/zsh/${PKGVERSION}/functions/zrecompile
+share/zsh/${PKGVERSION}/functions/zsh-mime-handler
+share/zsh/${PKGVERSION}/functions/zsh-mime-setup
 share/zsh/${PKGVERSION}/functions/zstyle+
 @exec ${MKDIR} %D/share/zsh/site-functions
 @dirrm share/zsh/site-functions
diff --git a/shells/zsh/PLIST.dynamic b/shells/zsh/PLIST.dynamic
index 1b8173bf940..d88dd546b81 100644
--- a/shells/zsh/PLIST.dynamic
+++ b/shells/zsh/PLIST.dynamic
@@ -1,27 +1,50 @@
-@comment $NetBSD: PLIST.dynamic,v 1.2 2004/02/02 08:48:40 uebayasi Exp $
+@comment $NetBSD: PLIST.dynamic,v 1.3 2004/03/28 10:30:13 recht Exp $
 lib/zsh/${PKGVERSION}/zsh/cap.so
 lib/zsh/${PKGVERSION}/zsh/clone.so
 lib/zsh/${PKGVERSION}/zsh/compctl.so
 lib/zsh/${PKGVERSION}/zsh/complete.so
 lib/zsh/${PKGVERSION}/zsh/complist.so
 lib/zsh/${PKGVERSION}/zsh/computil.so
+lib/zsh/${PKGVERSION}/zsh/datetime.so
 lib/zsh/${PKGVERSION}/zsh/deltochar.so
 lib/zsh/${PKGVERSION}/zsh/example.so
 lib/zsh/${PKGVERSION}/zsh/files.so
+lib/zsh/${PKGVERSION}/zsh/langinfo.so
 lib/zsh/${PKGVERSION}/zsh/mapfile.so
 lib/zsh/${PKGVERSION}/zsh/mathfunc.so
 lib/zsh/${PKGVERSION}/zsh/parameter.so
 lib/zsh/${PKGVERSION}/zsh/rlimits.so
 lib/zsh/${PKGVERSION}/zsh/sched.so
 lib/zsh/${PKGVERSION}/zsh/stat.so
+lib/zsh/${PKGVERSION}/zsh/system.so
 lib/zsh/${PKGVERSION}/zsh/termcap.so
-lib/zsh/${PKGVERSION}/zsh/terminfo.so
 lib/zsh/${PKGVERSION}/zsh/zftp.so
 lib/zsh/${PKGVERSION}/zsh/zle.so
 lib/zsh/${PKGVERSION}/zsh/zleparameter.so
 lib/zsh/${PKGVERSION}/zsh/zprof.so
 lib/zsh/${PKGVERSION}/zsh/zpty.so
+lib/zsh/${PKGVERSION}/zsh/zselect.so
 lib/zsh/${PKGVERSION}/zsh/zutil.so
+lib/zsh/${PKGVERSION}/zsh/net/socket.so
+lib/zsh/${PKGVERSION}/zsh/net/tcp.so
+share/zsh/${PKGVERSION}/functions/tcp_alias
+share/zsh/${PKGVERSION}/functions/tcp_close
+share/zsh/${PKGVERSION}/functions/tcp_command
+share/zsh/${PKGVERSION}/functions/tcp_expect
+share/zsh/${PKGVERSION}/functions/tcp_fd_handler
+share/zsh/${PKGVERSION}/functions/tcp_log
+share/zsh/${PKGVERSION}/functions/tcp_open
+share/zsh/${PKGVERSION}/functions/tcp_output
+share/zsh/${PKGVERSION}/functions/tcp_point
+share/zsh/${PKGVERSION}/functions/tcp_proxy
+share/zsh/${PKGVERSION}/functions/tcp_read
+share/zsh/${PKGVERSION}/functions/tcp_rename
+share/zsh/${PKGVERSION}/functions/tcp_send
+share/zsh/${PKGVERSION}/functions/tcp_sess
+share/zsh/${PKGVERSION}/functions/tcp_shoot
+share/zsh/${PKGVERSION}/functions/tcp_spam
+share/zsh/${PKGVERSION}/functions/tcp_talk
+share/zsh/${PKGVERSION}/functions/tcp_wait
 share/zsh/${PKGVERSION}/functions/zfanon
 share/zsh/${PKGVERSION}/functions/zfautocheck
 share/zsh/${PKGVERSION}/functions/zfcd
@@ -53,6 +76,7 @@ share/zsh/${PKGVERSION}/functions/zftransfer
 share/zsh/${PKGVERSION}/functions/zftype
 share/zsh/${PKGVERSION}/functions/zfuget
 share/zsh/${PKGVERSION}/functions/zfuput
+@dirrm lib/zsh/${PKGVERSION}/zsh/net
 @dirrm lib/zsh/${PKGVERSION}/zsh
 @dirrm lib/zsh/${PKGVERSION}
 @dirrm lib/zsh
diff --git a/shells/zsh/distinfo b/shells/zsh/distinfo
index 6f513df55aa..76ab287212a 100644
--- a/shells/zsh/distinfo
+++ b/shells/zsh/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.14 2004/02/02 08:48:40 uebayasi Exp $
+$NetBSD: distinfo,v 1.15 2004/03/28 10:30:13 recht Exp $
 
-SHA1 (zsh-4.0.9.tar.bz2) = fb00aba117177bf16f2383c7bb6174695702bc4a
-Size (zsh-4.0.9.tar.bz2) = 1749802 bytes
+SHA1 (zsh-4.2.0.tar.bz2) = 944786bec07470aa4fbe58249dba2e345296165e
+Size (zsh-4.2.0.tar.bz2) = 1990884 bytes
 SHA1 (patch-aa) = 5e5fde0f21a64c2e0579958868b05737ef0c6afb
-SHA1 (patch-ac) = f4b7546cbe6748d63c1b5a358912bec137ff858e
-SHA1 (patch-ad) = 8dad34912cdb7dfc448572db90c48e9678b082da
+SHA1 (patch-ae) = 7d4514d0bad6553d3c0cf115874bf50ed0da3d48
diff --git a/shells/zsh/patches/patch-ac b/shells/zsh/patches/patch-ac
deleted file mode 100644
index fe381600969..00000000000
--- a/shells/zsh/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.11 2004/02/02 08:48:40 uebayasi Exp $
-
---- zshconfig.ac.orig	2003-10-28 08:47:44.000000000 -0600
-+++ zshconfig.ac
-@@ -926,7 +926,7 @@ AC_CHECK_FUNCS(strftime difftime gettime
- 	       select poll \
- 	       readlink lstat lchown faccessx fchdir ftruncate \
- 	       fseeko ftello \
--	       mkfifo _mktemp \
-+	       mkfifo \
- 	       waitpid wait3 \
- 	       sigaction sigblock sighold sigrelse sigsetmask sigprocmask \
- 	       killpg setpgid setpgrp tcsetpgrp tcgetattr nice \
diff --git a/shells/zsh/patches/patch-ad b/shells/zsh/patches/patch-ad
deleted file mode 100644
index 14e25063b42..00000000000
--- a/shells/zsh/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.7 2004/02/02 08:48:40 uebayasi Exp $
-
---- configure.orig	2003-10-28 08:51:34.000000000 -0600
-+++ configure
-@@ -5095,7 +5095,7 @@ for ac_func in strftime difftime gettime
- 	       select poll \
- 	       readlink lstat lchown faccessx fchdir ftruncate \
- 	       fseeko ftello \
--	       mkfifo _mktemp \
-+	       mkfifo \
- 	       waitpid wait3 \
- 	       sigaction sigblock sighold sigrelse sigsetmask sigprocmask \
- 	       killpg setpgid setpgrp tcsetpgrp tcgetattr nice \