Update zsh-current to 4.3.9.

Changes from NEWS:

--------8<--------8<--------8<--------8<--------8<--------8<--------8<

Major changes between versions 4.3.6 and 4.3.9
----------------------------------------------

The option COMBINING_CHARS has been added.  When it is set, the
line editor assumes the terminal is capable of displaying zero-width
combining characters (typically accents) correctly as modifications
to the base character, and will act accordingly.  Note it is not set
by default owing to vagaries of terminals.  The system is reported
to work on MacOS, where this is particularly important as accented
characters in file names are stored in their decomposed form (i.e.
with base and combining characters).

The option HIST_FCNTL_LOCK has been added to provide locking of history
files using the system call fcntl().  On recent NFS implementations this
may provide better reliability.

The syntax ~[...] provides a dynamic form of directory naming,
supplementing the existing static ~name syntax.  A user-defined shell
function, zsh_directory_name, is used to handle both expansion of names to
directories and contraction of directories to names.

Patterns can now be used in incremental searches with the new widgets
history-incremental-pattern-search-backward and
history-incremental-pattern-search-forward.  These are not bound to
keys by default.

Highlighting and colouring of sections of the command line is now
supported, controlled by the array parameter zle_highlight and the ZLE
special parameter region_highlight.

Colouring of prompts is now supported within the shell by prompt
escapes.  The prompt theme system has been updated.

Various changes have been added to make debugging of shell code easier:
  - As noted in README, the option DEBUG_BEFORE_CMD is now set by default.
  - In DEBUG traps, $ZSH_DEBUG_CMD gives the code for which the trap is
    called as a string.
  - "setopt ERR_EXIT" in a DEBUG trap causes the code not to be executed.
  - $ZSH_SUBSHELL indicates the subshell level at which code is being
    executed.
  - The zsh/parameter module has various additional arrays similar to
    the existing $funcstack and $functrace, namely $funcsourcetrace
    and $funcfiletrace.  The consistency and informativeness of
    the output of all these arrays has been improved.
  - Prompt escapes %x and %I show the source file and line number in
    debug prompts (compare %N and %i which show names and line numbers
    in the execution environment).
  - The option NO_MULTI_FUNCDEF can turn off multiple definition of
    functions at once, a rarely used feature that can cause problems
    with misplaced "()".
  - The "fc" builtin has been enhanced to make non-interactive use possible
    and output consistent when the history is manipulated with "print -s".

The completion style accept-exact-dirs has been added.  When true, this
suppresses attempts to complete non-final directory segments of a filename
path when the directory exists.  (For example, /home/pws/src/zsh/<TAB>
discovers that /home/pws/src/zsh exists and leaves the directory component
alone, while /h/p/s/z/<TAB> completes to /home/pws/src/zsh/... as before.)
This should improve completion behaviour noticeably in special cases, such
as remote paths under Cygwin.

Major changes between versions 4.3.5 and 4.3.6
----------------------------------------------

cd, chdir, pushd and popd now take a -q option to suppress side effects
including printing the directory stack (for pushd and popd) and executing
the chpwd hook functions (for all four).

The parameter subscript (e) flag now forces the argument to be treated
as a string where it would previously have been treated as a pattern,
for example ${array[(ie)*]} substitutes the index of the element whose
value is "*".

Major changes between versions 4.3.4 and 4.3.5
----------------------------------------------

- The new extended globbing flag (#cN,M) behaves similarly to the extended
  regular expression syntax {N,M}.

- The zsh/datetime module has been enhanced and a calendar function
  system has been added along the lines of (but much enhanced from)
  the traditional Unix "calendar" utility.  This is still under
  development.  See the zshcalsys manual.  (The calendar functions
  were in 4.3.4 but were not listed in this file.  There have been
  significant enhancements since 4.3.4.)

- A new module zsh/curses provides a builtin zcurses for access to
  to the curses screen manipulation package.  See the entry for zsh/curses
  in the zshmodules manual.

- The module system has been enhanced to support the notion of "features"
  that give more control over which builtins, parameters, conditions
  and math functions are loaded from a module.  In particular,
  "zmodload -F zsh/stat b:zstat" makes the builtin previously called
  "stat" available as "zstat" (only) to avoid clashes with a system
  command named "stat".

>8-------->8-------->8-------->8-------->8-------->8-------->8--------

13 files changed, 111 insertions, 193 deletions

diff --git a/shells/zsh-current/Makefile b/shells/zsh-current/Makefile
index c25c09d7e7c..659d6083aae 100644
--- a/shells/zsh-current/Makefile
+++ b/shells/zsh-current/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2008/07/25 09:14:48 ghen Exp $
+# $NetBSD: Makefile,v 1.16 2008/12/21 16:53:45 uebayasi Exp $
 
 .include "../../shells/zsh/Makefile.common"
 
-PKGREVISION=	3
-
-ZSH_VERSION=	4.3.4
+ZSH_VERSION=	4.3.9
 ZSH_MAINTAINER=	uebayasi@NetBSD.org
 
 USE_TOOLS+=	env
diff --git a/shells/zsh-current/PLIST b/shells/zsh-current/PLIST
index 108fdc24daa..f247b2e2396 100644
--- a/shells/zsh-current/PLIST
+++ b/shells/zsh-current/PLIST
@@ -1,7 +1,38 @@
-@comment $NetBSD: PLIST,v 1.9 2007/09/21 13:59:16 uebayasi Exp $
+@comment $NetBSD: PLIST,v 1.10 2008/12/21 16:53:45 uebayasi Exp $
 bin/${PKGNAME}
 bin/zsh
 info/zsh.info
+${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/cap.so
+${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/clone.so
+${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/compctl.so
+${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/complete.so
+${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/complist.so
+${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/computil.so
+${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/datetime.so
+${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/deltochar.so
+${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/example.so
+${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/files.so
+${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/langinfo.so
+${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/mapfile.so
+${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/mathfunc.so
+${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/net/socket.so
+${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/net/tcp.so
+${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/newuser.so
+${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/parameter.so
+${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/rlimits.so
+${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/sched.so
+${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/stat.so
+${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/system.so
+${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/termcap.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
+${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/zprof.so
+${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/zpty.so
+${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/zselect.so
+${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/zutil.so
+@comment ${PLIST.terminfo}lib/zsh/${PKGVERSION}/zsh/terminfo.so
+@comment ${PLIST.shlibs}lib/zsh/libzsh-${PKGVERSION}.so
 man/man1/zsh.1
 man/man1/zshall.1
 man/man1/zshbuiltins.1
@@ -649,9 +680,65 @@ share/zsh/${PKGVERSION}/functions/zrecompile
 share/zsh/${PKGVERSION}/functions/zsh-mime-handler
 share/zsh/${PKGVERSION}/functions/zsh-mime-setup
 share/zsh/${PKGVERSION}/functions/zstyle+
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/tcp_alias
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/tcp_close
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/tcp_command
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/tcp_expect
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/tcp_fd_handler
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/tcp_log
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/tcp_open
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/tcp_output
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/tcp_point
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/tcp_proxy
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/tcp_read
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/tcp_rename
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/tcp_send
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/tcp_sess
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/tcp_shoot
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/tcp_spam
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/tcp_talk
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/tcp_wait
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfanon
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfautocheck
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfcd
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfcd_match
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfcget
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfclose
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfcput
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfdir
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zffcache
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfgcp
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfget
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfget_match
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfgoto
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfhere
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfinit
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfls
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfmark
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfopen
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfparams
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfpcp
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfput
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfrglob
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfrtime
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfsession
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfstat
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zftp_chpwd
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zftp_progress
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zftransfer
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zftype
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfuget
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfuput
+${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zsh-newuser-install
+${PLIST.dynamic}share/zsh/${PKGVERSION}/scripts/newuser
 @exec ${MKDIR} %D/share/zsh/site-functions
 @dirrm share/zsh/site-functions
+${PLIST.dynamic}@dirrm share/zsh/${PKGVERSION}/scripts
 @dirrm share/zsh/${PKGVERSION}/functions
 @dirrm share/zsh/${PKGVERSION}
 @dirrm share/zsh
 @dirrm share/doc/zsh
+${PLIST.dynamic}@dirrm lib/zsh/${PKGVERSION}/zsh/net
+${PLIST.dynamic}@dirrm lib/zsh/${PKGVERSION}/zsh
+${PLIST.dynamic}@dirrm lib/zsh/${PKGVERSION}
+${PLIST.dynamic}@dirrm lib/zsh
diff --git a/shells/zsh-current/PLIST.dynamic b/shells/zsh-current/PLIST.dynamic
deleted file mode 100644
index 102de1a6f47..00000000000
--- a/shells/zsh-current/PLIST.dynamic
+++ /dev/null
@@ -1,86 +0,0 @@
-@comment $NetBSD: PLIST.dynamic,v 1.4 2007/09/21 13:59:16 uebayasi 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/net/socket.so
-lib/zsh/${PKGVERSION}/zsh/net/tcp.so
-lib/zsh/${PKGVERSION}/zsh/newuser.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/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
-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
-share/zsh/${PKGVERSION}/functions/zfcd_match
-share/zsh/${PKGVERSION}/functions/zfcget
-share/zsh/${PKGVERSION}/functions/zfclose
-share/zsh/${PKGVERSION}/functions/zfcput
-share/zsh/${PKGVERSION}/functions/zfdir
-share/zsh/${PKGVERSION}/functions/zffcache
-share/zsh/${PKGVERSION}/functions/zfgcp
-share/zsh/${PKGVERSION}/functions/zfget
-share/zsh/${PKGVERSION}/functions/zfget_match
-share/zsh/${PKGVERSION}/functions/zfgoto
-share/zsh/${PKGVERSION}/functions/zfhere
-share/zsh/${PKGVERSION}/functions/zfinit
-share/zsh/${PKGVERSION}/functions/zfls
-share/zsh/${PKGVERSION}/functions/zfmark
-share/zsh/${PKGVERSION}/functions/zfopen
-share/zsh/${PKGVERSION}/functions/zfparams
-share/zsh/${PKGVERSION}/functions/zfpcp
-share/zsh/${PKGVERSION}/functions/zfput
-share/zsh/${PKGVERSION}/functions/zfrglob
-share/zsh/${PKGVERSION}/functions/zfrtime
-share/zsh/${PKGVERSION}/functions/zfsession
-share/zsh/${PKGVERSION}/functions/zfstat
-share/zsh/${PKGVERSION}/functions/zftp_chpwd
-share/zsh/${PKGVERSION}/functions/zftp_progress
-share/zsh/${PKGVERSION}/functions/zftransfer
-share/zsh/${PKGVERSION}/functions/zftype
-share/zsh/${PKGVERSION}/functions/zfuget
-share/zsh/${PKGVERSION}/functions/zfuput
-share/zsh/${PKGVERSION}/functions/zsh-newuser-install
-share/zsh/${PKGVERSION}/scripts/newuser
-@dirrm share/zsh/${PKGVERSION}/scripts
-@dirrm lib/zsh/${PKGVERSION}/zsh/net
-@dirrm lib/zsh/${PKGVERSION}/zsh
-@dirrm lib/zsh/${PKGVERSION}
-@dirrm lib/zsh
diff --git a/shells/zsh-current/PLIST.shlibs b/shells/zsh-current/PLIST.shlibs
deleted file mode 100644
index 2813f00dfa8..00000000000
--- a/shells/zsh-current/PLIST.shlibs
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.shlibs,v 1.3 2006/03/11 13:20:15 uebayasi Exp $
-lib/zsh/libzsh-${PKGVERSION}.so
diff --git a/shells/zsh-current/PLIST.terminfo b/shells/zsh-current/PLIST.terminfo
deleted file mode 100644
index aca6af37884..00000000000
--- a/shells/zsh-current/PLIST.terminfo
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.terminfo,v 1.1 2006/03/11 13:20:15 uebayasi Exp $
-lib/zsh/${PKGVERSION}/zsh/terminfo.so
diff --git a/shells/zsh-current/distinfo b/shells/zsh-current/distinfo
index 6c206ca6c4c..5d21066ec54 100644
--- a/shells/zsh-current/distinfo
+++ b/shells/zsh-current/distinfo
@@ -1,12 +1,7 @@
-$NetBSD: distinfo,v 1.12 2008/07/13 18:26:24 tonnerre Exp $
+$NetBSD: distinfo,v 1.13 2008/12/21 16:53:45 uebayasi Exp $
 
-SHA1 (zsh-4.3.4.tar.bz2) = 6bd905c4bf61bf3df5e5bb78f64be68366ad7517
-RMD160 (zsh-4.3.4.tar.bz2) = 2fe0fcf6371d2072c3b7eeae0392c7ef3665457c
-Size (zsh-4.3.4.tar.bz2) = 2374851 bytes
-SHA1 (patch-aa) = 15f9d45ea98f89945ca274fc5b0298fa9397f89d
-SHA1 (patch-ab) = 799e63e51338d542d6247066d77647365fda09c9
-SHA1 (patch-ac) = 95e15527e75685cbc140066efeec12127a4863ce
-SHA1 (patch-ae) = 62a763ee77b823d63f245f34122b232cf0344285
-SHA1 (patch-af) = baceb8c014b1a6d8291412bf111ca117514ecb4e
-SHA1 (patch-ag) = ddcefd4ebcb4457eaed0bcf70273c35641ca0bde
-SHA1 (patch-ah) = 772f98cbc8487fb074b35030c2ad26eeedb7343a
+SHA1 (zsh-4.3.9.tar.bz2) = 7c80e1ad6b311ee5877172a1a7e0161a9a60da70
+RMD160 (zsh-4.3.9.tar.bz2) = 2c88347fa357e3624f000721963749c6ccb4e129
+Size (zsh-4.3.9.tar.bz2) = 2659602 bytes
+SHA1 (patch-ab) = 4fc9ef0aa307a794fddf018a7888ac8b0073a13a
+SHA1 (patch-ac) = b586fcb6ab7d831a3490077f84fe170969905c26
diff --git a/shells/zsh-current/patches/patch-aa b/shells/zsh-current/patches/patch-aa
deleted file mode 100644
index cc700272cee..00000000000
--- a/shells/zsh-current/patches/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-aa,v 1.7 2008/07/13 18:26:24 tonnerre Exp $
-
---- Util/difflog.pl.orig	2002-04-18 16:35:17.000000000 +0200
-+++ Util/difflog.pl
-@@ -2,10 +2,13 @@
- 
- use strict;
- use IO::File;
-+use File::Temp;
- 
- my @differ = qw(diff -bw);
--my $oldtmp = "/tmp/difflog$$.old";
--my $newtmp = "/tmp/difflog$$.new";
-+my $oldf = new File::Temp(TEMPLATE => 'difflogXXXXX', DIR => '/tmp/', SUFFIX => '.old');
-+my $newf = new File::Temp(TEMPLATE => 'difflogXXXXX', DIR => '/tmp/', SUFFIX => '.new');
-+my $oldtmp = $oldf->filename;
-+my $newtmp = $newf->filename;
- 
- my $newfn = pop(@ARGV);
- my $oldfn = pop(@ARGV);
diff --git a/shells/zsh-current/patches/patch-ab b/shells/zsh-current/patches/patch-ab
index 87bbc4ca16b..e2a5fe1e58a 100644
--- a/shells/zsh-current/patches/patch-ab
+++ b/shells/zsh-current/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2 2007/09/21 05:24:43 uebayasi Exp $
+$NetBSD: patch-ab,v 1.3 2008/12/21 16:53:45 uebayasi Exp $
 
---- Src/zsh.h.orig	2007-03-30 05:33:15.000000000 -0400
-+++ Src/zsh.h	2007-04-28 14:52:11.000000000 -0400
-@@ -1754,6 +1754,7 @@
+--- Src/zsh.h.orig	2008-10-31 18:40:18.000000000 +0900
++++ Src/zsh.h
+@@ -1986,6 +1986,7 @@ struct ttyinfo {
  #endif
  };
  
@@ -10,7 +10,7 @@ $NetBSD: patch-ab,v 1.2 2007/09/21 05:24:43 uebayasi Exp $
  /* defines for whether tabs expand to spaces */
  #if defined(HAVE_TERMIOS_H) || defined(HAVE_TERMIO_H)
  #define SGTTYFLAG       shttyinfo.tio.c_oflag
-@@ -1771,6 +1772,7 @@
+@@ -2003,6 +2004,7 @@ struct ttyinfo {
  #   endif
  #  endif
  # endif
diff --git a/shells/zsh-current/patches/patch-ac b/shells/zsh-current/patches/patch-ac
index 206d44ffff6..96c9e0c7037 100644
--- a/shells/zsh-current/patches/patch-ac
+++ b/shells/zsh-current/patches/patch-ac
@@ -1,19 +1,19 @@
-$NetBSD: patch-ac,v 1.3 2006/03/11 13:20:15 uebayasi Exp $
+$NetBSD: patch-ac,v 1.4 2008/12/21 16:53:45 uebayasi Exp $
 
---- configure.orig	2006-02-28 23:44:59.000000000 +0900
+--- configure.orig	2008-10-31 02:07:59.000000000 +0900
 +++ configure
-@@ -16066,6 +16066,10 @@ echo "${ECHO_T}$zsh_cv_sys_elf" >&6
+@@ -18472,6 +18472,10 @@ echo "${ECHO_T}$zsh_cv_sys_elf" >&6; }
          DLLD="${DLLD=$CC}"
          DLLDARG=""
        ;;
 +      *interix*)
-+	DLLD="${DLLD=$CC}"
-+	DLLDARG=""
++        DLLD="${DLLD=$CC}"
++        DLLDARG=""
 +      ;;
        * )
  	DLLD="${DLLD=ld}"
  	DLLDARG=""
-@@ -16076,6 +16080,7 @@ echo "${ECHO_T}$zsh_cv_sys_elf" >&6
+@@ -18482,6 +18486,7 @@ echo "${ECHO_T}$zsh_cv_sys_elf" >&6; }
      case "$host_os" in
        hpux*)   DLLDFLAGS="${DLLDFLAGS=-shared}" ;;
        darwin*) DLCFLAGS="${DLCFLAGS=-fno-common}" ;;
@@ -21,12 +21,12 @@ $NetBSD: patch-ac,v 1.3 2006/03/11 13:20:15 uebayasi Exp $
        *)       DLCFLAGS="${DLCFLAGS=-fPIC}" ;;
      esac
    else
-@@ -16089,7 +16094,7 @@ echo "${ECHO_T}$zsh_cv_sys_elf" >&6
-     esac
+@@ -18496,7 +18501,7 @@ echo "${ECHO_T}$zsh_cv_sys_elf" >&6; }
    fi
    case "$host_os" in
--    *freebsd*|linux*|irix*|osf*|gnu*|dragonfly*) DLLDFLAGS="${DLLDFLAGS=-shared}" ;;
-+    *freebsd*|linux*|irix*|osf*|gnu*|interix*|dragonfly*) DLLDFLAGS="${DLLDFLAGS=-shared}" ;;
+     osf*) DLLDFLAGS="${DLLDFLAGS=-shared -expect_unresolved '*'}" ;;
+-    *freebsd*|linux*|irix*|gnu*|dragonfly*) DLLDFLAGS="${DLLDFLAGS=-shared}" ;;
++    *freebsd*|linux*|irix*|gnu*|interix*|dragonfly*) DLLDFLAGS="${DLLDFLAGS=-shared}" ;;
      sunos*)       DLLDFLAGS="${DLLDFLAGS=-assert nodefinitions}" ;;
      sysv4*|esix*) DLLDFLAGS="${DLLDFLAGS=-G $ldflags}" ;;
      netbsd*)      DLLDFLAGS="${DLLDFLAGS=${DLLDARG}-x -shared --whole-archive}" ;;
diff --git a/shells/zsh-current/patches/patch-ae b/shells/zsh-current/patches/patch-ae
deleted file mode 100644
index 2767f6d87d0..00000000000
--- a/shells/zsh-current/patches/patch-ae
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2007/09/21 05:24:43 uebayasi Exp $
-
---- Src/mkmakemod.sh.orig	2006-05-27 13:49:53.000000000 -0400
-+++ Src/mkmakemod.sh	2007-04-28 15:00:56.000000000 -0400
-@@ -112,9 +112,7 @@
-     module_list="${bin_mods}${dyn_mods}"
- 
-     # check 2.13, 2.50, and 2.60 syntaxes
--    if grep '%@D@%D%' config.status >/dev/null ||
--       grep ',@D@,D,' config.status >/dev/null ||
--       grep ',@D@,|#_!!_#|D,' config.status >/dev/null; then
-+    if grep '^#[ \t]*define[ \t][ \t]*DYNAMIC[ \t]' config.h >/dev/null; then
- 	is_dynamic=true
-     else
- 	is_dynamic=false
diff --git a/shells/zsh-current/patches/patch-af b/shells/zsh-current/patches/patch-af
deleted file mode 100644
index 071c767541e..00000000000
--- a/shells/zsh-current/patches/patch-af
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-af,v 1.1 2007/09/21 05:24:43 uebayasi Exp $
-
---- Config/defs.mk.in.orig	2007-01-16 01:36:41.000000000 +0900
-+++ Config/defs.mk.in	2007-09-20 11:53:37.000000000 +0900
-@@ -77,6 +77,7 @@
- 
- # install utility
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT  = @INSTALL_SCRIPT@
- INSTALL_DATA    = @INSTALL_DATA@
- 
- # variables used in determining what to install
diff --git a/shells/zsh-current/patches/patch-ag b/shells/zsh-current/patches/patch-ag
deleted file mode 100644
index f9770ed6303..00000000000
--- a/shells/zsh-current/patches/patch-ag
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2007/09/21 05:24:43 uebayasi Exp $
-
---- Makefile.in.orig	2006-09-17 00:53:03.000000000 +0900
-+++ Makefile.in	2007-09-20 11:52:46.000000000 +0900
-@@ -88,6 +88,7 @@
- 	  FUNCTIONS_SUBDIRS="$(FUNCTIONS_SUBDIRS)" \
- 	  INSTALL_DATA="$(INSTALL_DATA)" \
- 	  INSTALL_PROGRAM="$(INSTALL_PROGRAM)" \
-+	  INSTALL_SCRIPT="$(INSTALL_SCRIPT)" \
- 	  DESTDIR="$(DESTDIR)" VERSION="$(VERSION)" \
- 	  $(SHELL) $(sdir_top)/Config/installfns.sh || exit 1; \
- 	fi; \
diff --git a/shells/zsh-current/patches/patch-ah b/shells/zsh-current/patches/patch-ah
deleted file mode 100644
index 7a05b17ae63..00000000000
--- a/shells/zsh-current/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2007/09/21 05:24:43 uebayasi Exp $
-
---- Config/installfns.sh.orig	2006-03-20 20:06:24.000000000 +0900
-+++ Config/installfns.sh	2007-09-20 11:50:26.000000000 +0900
-@@ -46,7 +46,7 @@
-     fi
-     test -d $instdir || /bin/sh $sdir_top/mkinstalldirs $instdir || exit 1
-     if test -x $sdir_top/$file; then
--	$INSTALL_PROGRAM $sdir_top/$file $instdir || exit 1
-+	$INSTALL_SCRIPT $sdir_top/$file $instdir || exit 1
-     else
- 	$INSTALL_DATA $sdir_top/$file $instdir || exit 1
-     fi