Update to 4.3.11.

Changelog is too long.
Please read NEWS and Changelog file.

10 files changed, 76 insertions, 124 deletions

diff --git a/shells/zsh-current/Makefile b/shells/zsh-current/Makefile
index 868f8917d59..137af3f75a9 100644
--- a/shells/zsh-current/Makefile
+++ b/shells/zsh-current/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2010/05/07 12:02:45 jmmv Exp $
+# $NetBSD: Makefile,v 1.20 2011/04/05 13:54:24 ryoon Exp $
 
 .include "../../shells/zsh/Makefile.common"
 
-ZSH_VERSION=	4.3.10
-PKGREVISION=	2
-ZSH_MAINTAINER=	uebayasi@NetBSD.org
+ZSH_VERSION=	4.3.11
+ZSH_MAINTAINER=	ryoon@NetBSD.org
 
 USE_TOOLS+=	env
 
@@ -21,6 +20,7 @@ SUBST_FILES.prefix-fixup= \
 	Functions/Misc/sticky-note \
 	Functions/Misc/zcalc \
 	Functions/Misc/zkbd \
+	Functions/Misc/zed \
 	Functions/Example/cat
 SUBST_SED.prefix-fixup= \
 	-e 's|^\#\!/bin/env|\#\!${TOOLS_PATH.env}|g' \
diff --git a/shells/zsh-current/PLIST b/shells/zsh-current/PLIST
index c13b05e58f0..ed89d1ad653 100644
--- a/shells/zsh-current/PLIST
+++ b/shells/zsh-current/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.19 2010/11/30 09:04:58 wiz Exp $
-bin/${PKGNAME}
+@comment $NetBSD: PLIST,v 1.20 2011/04/05 13:54:24 ryoon Exp $
 bin/zsh
+bin/${PKGNAME}
 info/zsh.info
 ${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/cap.so
 ${PLIST.dynamic}lib/zsh/${PKGVERSION}/zsh/clone.so
@@ -81,8 +81,10 @@ share/zsh/${PKGVERSION}/functions/VCS_INFO_get_data_p4
 share/zsh/${PKGVERSION}/functions/VCS_INFO_get_data_svk
 share/zsh/${PKGVERSION}/functions/VCS_INFO_get_data_svn
 share/zsh/${PKGVERSION}/functions/VCS_INFO_get_data_tla
+share/zsh/${PKGVERSION}/functions/VCS_INFO_hook
 share/zsh/${PKGVERSION}/functions/VCS_INFO_maxexports
 share/zsh/${PKGVERSION}/functions/VCS_INFO_nvcsformats
+share/zsh/${PKGVERSION}/functions/VCS_INFO_quilt
 share/zsh/${PKGVERSION}/functions/VCS_INFO_realpath
 share/zsh/${PKGVERSION}/functions/VCS_INFO_reposub
 share/zsh/${PKGVERSION}/functions/VCS_INFO_set
@@ -120,6 +122,7 @@ share/zsh/${PKGVERSION}/functions/_attr
 share/zsh/${PKGVERSION}/functions/_auto-apt
 share/zsh/${PKGVERSION}/functions/_autocd
 share/zsh/${PKGVERSION}/functions/_awk
+share/zsh/${PKGVERSION}/functions/_axi-cache
 share/zsh/${PKGVERSION}/functions/_bash_completions
 share/zsh/${PKGVERSION}/functions/_baz
 share/zsh/${PKGVERSION}/functions/_bind_addresses
@@ -145,6 +148,7 @@ share/zsh/${PKGVERSION}/functions/_ccal
 share/zsh/${PKGVERSION}/functions/_cd
 share/zsh/${PKGVERSION}/functions/_cdbs-edit-patch
 share/zsh/${PKGVERSION}/functions/_cdcd
+share/zsh/${PKGVERSION}/functions/_cdr
 share/zsh/${PKGVERSION}/functions/_cdrdao
 share/zsh/${PKGVERSION}/functions/_cdrecord
 share/zsh/${PKGVERSION}/functions/_chflags
@@ -244,14 +248,17 @@ share/zsh/${PKGVERSION}/functions/_enable
 share/zsh/${PKGVERSION}/functions/_enscript
 share/zsh/${PKGVERSION}/functions/_env
 share/zsh/${PKGVERSION}/functions/_equal
+share/zsh/${PKGVERSION}/functions/_espeak
 share/zsh/${PKGVERSION}/functions/_ethtool
 share/zsh/${PKGVERSION}/functions/_expand
 share/zsh/${PKGVERSION}/functions/_expand_alias
 share/zsh/${PKGVERSION}/functions/_expand_word
 share/zsh/${PKGVERSION}/functions/_fakeroot
 share/zsh/${PKGVERSION}/functions/_fc
+share/zsh/${PKGVERSION}/functions/_feh
 share/zsh/${PKGVERSION}/functions/_fetch
 share/zsh/${PKGVERSION}/functions/_fetchmail
+share/zsh/${PKGVERSION}/functions/_ffmpeg
 share/zsh/${PKGVERSION}/functions/_figlet
 share/zsh/${PKGVERSION}/functions/_file_descriptors
 share/zsh/${PKGVERSION}/functions/_file_systems
@@ -266,6 +273,7 @@ share/zsh/${PKGVERSION}/functions/_floppy
 share/zsh/${PKGVERSION}/functions/_fortune
 share/zsh/${PKGVERSION}/functions/_freebsd-update
 share/zsh/${PKGVERSION}/functions/_fsh
+share/zsh/${PKGVERSION}/functions/_fstat
 share/zsh/${PKGVERSION}/functions/_functions
 share/zsh/${PKGVERSION}/functions/_fuse_arguments
 share/zsh/${PKGVERSION}/functions/_fuse_values
@@ -282,6 +290,7 @@ share/zsh/${PKGVERSION}/functions/_getent
 share/zsh/${PKGVERSION}/functions/_getfacl
 share/zsh/${PKGVERSION}/functions/_getmail
 share/zsh/${PKGVERSION}/functions/_git
+share/zsh/${PKGVERSION}/functions/_git-buildpackage
 share/zsh/${PKGVERSION}/functions/_global
 share/zsh/${PKGVERSION}/functions/_global_tags
 share/zsh/${PKGVERSION}/functions/_globflags
@@ -295,6 +304,7 @@ share/zsh/${PKGVERSION}/functions/_gpg
 share/zsh/${PKGVERSION}/functions/_gphoto2
 share/zsh/${PKGVERSION}/functions/_gprof
 share/zsh/${PKGVERSION}/functions/_gqview
+share/zsh/${PKGVERSION}/functions/_graphicsmagick
 share/zsh/${PKGVERSION}/functions/_grep
 share/zsh/${PKGVERSION}/functions/_grep-excuses
 share/zsh/${PKGVERSION}/functions/_groff
@@ -308,6 +318,7 @@ share/zsh/${PKGVERSION}/functions/_gzip
 share/zsh/${PKGVERSION}/functions/_hash
 share/zsh/${PKGVERSION}/functions/_have_glob_qual
 share/zsh/${PKGVERSION}/functions/_hdiutil
+share/zsh/${PKGVERSION}/functions/_hg
 share/zsh/${PKGVERSION}/functions/_history
 share/zsh/${PKGVERSION}/functions/_history_complete_word
 share/zsh/${PKGVERSION}/functions/_history_modifiers
@@ -388,7 +399,6 @@ share/zsh/${PKGVERSION}/functions/_mdadm
 share/zsh/${PKGVERSION}/functions/_members
 share/zsh/${PKGVERSION}/functions/_mencal
 share/zsh/${PKGVERSION}/functions/_menu
-share/zsh/${PKGVERSION}/functions/_mercurial
 share/zsh/${PKGVERSION}/functions/_mere
 share/zsh/${PKGVERSION}/functions/_mergechanges
 share/zsh/${PKGVERSION}/functions/_message
@@ -437,6 +447,7 @@ share/zsh/${PKGVERSION}/functions/_open
 share/zsh/${PKGVERSION}/functions/_options
 share/zsh/${PKGVERSION}/functions/_options_set
 share/zsh/${PKGVERSION}/functions/_options_unset
+share/zsh/${PKGVERSION}/functions/_osc
 share/zsh/${PKGVERSION}/functions/_other_accounts
 share/zsh/${PKGVERSION}/functions/_pack
 share/zsh/${PKGVERSION}/functions/_parameter
@@ -446,12 +457,14 @@ share/zsh/${PKGVERSION}/functions/_path_commands
 share/zsh/${PKGVERSION}/functions/_path_files
 share/zsh/${PKGVERSION}/functions/_pax
 share/zsh/${PKGVERSION}/functions/_pbm
+share/zsh/${PKGVERSION}/functions/_pbuilder
 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_modules
 share/zsh/${PKGVERSION}/functions/_perldoc
+share/zsh/${PKGVERSION}/functions/_pfctl
 share/zsh/${PKGVERSION}/functions/_pfexec
 share/zsh/${PKGVERSION}/functions/_php
 share/zsh/${PKGVERSION}/functions/_physical_volumes
@@ -469,6 +482,7 @@ share/zsh/${PKGVERSION}/functions/_pkgtool
 share/zsh/${PKGVERSION}/functions/_pon
 share/zsh/${PKGVERSION}/functions/_portaudit
 share/zsh/${PKGVERSION}/functions/_portlint
+share/zsh/${PKGVERSION}/functions/_portmaster
 share/zsh/${PKGVERSION}/functions/_ports
 share/zsh/${PKGVERSION}/functions/_portsnap
 share/zsh/${PKGVERSION}/functions/_postfix
@@ -479,6 +493,7 @@ share/zsh/${PKGVERSION}/functions/_prefix
 share/zsh/${PKGVERSION}/functions/_print
 share/zsh/${PKGVERSION}/functions/_printenv
 share/zsh/${PKGVERSION}/functions/_printers
+share/zsh/${PKGVERSION}/functions/_procstat
 share/zsh/${PKGVERSION}/functions/_prompt
 share/zsh/${PKGVERSION}/functions/_ps
 share/zsh/${PKGVERSION}/functions/_pscp
@@ -589,6 +604,7 @@ 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/_tmux
 share/zsh/${PKGVERSION}/functions/_todo.sh
 share/zsh/${PKGVERSION}/functions/_toilet
 share/zsh/${PKGVERSION}/functions/_toolchain-source
@@ -622,6 +638,7 @@ share/zsh/${PKGVERSION}/functions/_user_at_host
 share/zsh/${PKGVERSION}/functions/_user_expand
 share/zsh/${PKGVERSION}/functions/_users
 share/zsh/${PKGVERSION}/functions/_users_on
+share/zsh/${PKGVERSION}/functions/_uzbl
 share/zsh/${PKGVERSION}/functions/_valgrind
 share/zsh/${PKGVERSION}/functions/_value
 share/zsh/${PKGVERSION}/functions/_values
@@ -705,7 +722,9 @@ share/zsh/${PKGVERSION}/functions/_zmodload
 share/zsh/${PKGVERSION}/functions/_zmv
 share/zsh/${PKGVERSION}/functions/_zpool
 share/zsh/${PKGVERSION}/functions/_zpty
+share/zsh/${PKGVERSION}/functions/_zsh-mime-handler
 share/zsh/${PKGVERSION}/functions/_zstyle
+share/zsh/${PKGVERSION}/functions/_ztodo
 share/zsh/${PKGVERSION}/functions/add-zsh-hook
 share/zsh/${PKGVERSION}/functions/age
 share/zsh/${PKGVERSION}/functions/allopt
@@ -724,7 +743,11 @@ share/zsh/${PKGVERSION}/functions/calendar_showdate
 share/zsh/${PKGVERSION}/functions/calendar_sort
 share/zsh/${PKGVERSION}/functions/capitalize-word-match
 share/zsh/${PKGVERSION}/functions/catch
+share/zsh/${PKGVERSION}/functions/cdr
 share/zsh/${PKGVERSION}/functions/checkmail
+share/zsh/${PKGVERSION}/functions/chpwd_recent_add
+share/zsh/${PKGVERSION}/functions/chpwd_recent_dirs
+share/zsh/${PKGVERSION}/functions/chpwd_recent_filehandler
 share/zsh/${PKGVERSION}/functions/colors
 share/zsh/${PKGVERSION}/functions/compaudit
 share/zsh/${PKGVERSION}/functions/compdump
@@ -782,40 +805,21 @@ 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/regexp-replace
 share/zsh/${PKGVERSION}/functions/relative
 share/zsh/${PKGVERSION}/functions/replace-string
 share/zsh/${PKGVERSION}/functions/replace-string-again
 share/zsh/${PKGVERSION}/functions/run-help
 share/zsh/${PKGVERSION}/functions/run-help-git
+share/zsh/${PKGVERSION}/functions/run-help-openssl
+share/zsh/${PKGVERSION}/functions/run-help-p4
+share/zsh/${PKGVERSION}/functions/run-help-sudo
 share/zsh/${PKGVERSION}/functions/run-help-svk
 share/zsh/${PKGVERSION}/functions/run-help-svn
 share/zsh/${PKGVERSION}/functions/select-word-style
 share/zsh/${PKGVERSION}/functions/smart-insert-last-word
 share/zsh/${PKGVERSION}/functions/split-shell-arguments
 share/zsh/${PKGVERSION}/functions/sticky-note
-share/zsh/${PKGVERSION}/functions/tetris
-share/zsh/${PKGVERSION}/functions/throw
-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/vcs_info
-share/zsh/${PKGVERSION}/functions/vcs_info_lastmsg
-share/zsh/${PKGVERSION}/functions/vcs_info_printsys
-share/zsh/${PKGVERSION}/functions/vcs_info_setsys
-share/zsh/${PKGVERSION}/functions/which-command
-share/zsh/${PKGVERSION}/functions/xtermctl
-share/zsh/${PKGVERSION}/functions/zargs
-share/zsh/${PKGVERSION}/functions/zcalc
-share/zsh/${PKGVERSION}/functions/zed
-share/zsh/${PKGVERSION}/functions/zed-set-file-name
-share/zsh/${PKGVERSION}/functions/zkbd
-share/zsh/${PKGVERSION}/functions/zmathfuncdef
-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+
 ${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/tcp_alias
 ${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/tcp_close
 ${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/tcp_command
@@ -834,6 +838,23 @@ ${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
+share/zsh/${PKGVERSION}/functions/tetris
+share/zsh/${PKGVERSION}/functions/throw
+share/zsh/${PKGVERSION}/functions/transpose-lines
+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/vcs_info
+share/zsh/${PKGVERSION}/functions/vcs_info_lastmsg
+share/zsh/${PKGVERSION}/functions/vcs_info_printsys
+share/zsh/${PKGVERSION}/functions/vcs_info_setsys
+share/zsh/${PKGVERSION}/functions/which-command
+share/zsh/${PKGVERSION}/functions/xtermctl
+share/zsh/${PKGVERSION}/functions/zargs
+share/zsh/${PKGVERSION}/functions/zcalc
+share/zsh/${PKGVERSION}/functions/zed
+share/zsh/${PKGVERSION}/functions/zed-set-file-name
 ${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfanon
 ${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfautocheck
 ${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zfcd
@@ -865,6 +886,14 @@ ${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
+share/zsh/${PKGVERSION}/functions/zkbd
+share/zsh/${PKGVERSION}/functions/zmathfuncdef
+share/zsh/${PKGVERSION}/functions/zmv
+share/zsh/${PKGVERSION}/functions/zrecompile
+share/zsh/${PKGVERSION}/functions/zsh-mime-handler
+share/zsh/${PKGVERSION}/functions/zsh-mime-setup
 ${PLIST.dynamic}share/zsh/${PKGVERSION}/functions/zsh-newuser-install
+share/zsh/${PKGVERSION}/functions/zstyle+
+share/zsh/${PKGVERSION}/functions/ztodo
 ${PLIST.dynamic}share/zsh/${PKGVERSION}/scripts/newuser
 @pkgdir share/zsh/site-functions
diff --git a/shells/zsh-current/PLIST.DragonFly b/shells/zsh-current/PLIST.DragonFly
new file mode 100644
index 00000000000..24d9451b870
--- /dev/null
+++ b/shells/zsh-current/PLIST.DragonFly
@@ -0,0 +1 @@
+${PLIST.dynamic}lib/zsh/4.3.11/zsh/curses.so
diff --git a/shells/zsh-current/PLIST.Linux b/shells/zsh-current/PLIST.Linux
new file mode 100644
index 00000000000..070cc03aeeb
--- /dev/null
+++ b/shells/zsh-current/PLIST.Linux
@@ -0,0 +1 @@
+${PLIST.dynamic}lib/zsh/4.3.11/zsh/attr.so
diff --git a/shells/zsh-current/distinfo b/shells/zsh-current/distinfo
index 1617ca424d4..d57d8c29327 100644
--- a/shells/zsh-current/distinfo
+++ b/shells/zsh-current/distinfo
@@ -1,12 +1,9 @@
-$NetBSD: distinfo,v 1.18 2010/11/27 12:46:53 roy Exp $
+$NetBSD: distinfo,v 1.19 2011/04/05 13:54:24 ryoon Exp $
 
-SHA1 (zsh-4.3.10.tar.bz2) = 132f9ce411bf318abccbae9cdc2f8cc14f8be85b
-RMD160 (zsh-4.3.10.tar.bz2) = fad1412b76d1388d825cb870681c21696fdfa273
-Size (zsh-4.3.10.tar.bz2) = 2735665 bytes
-SHA1 (patch-ab) = 4fc9ef0aa307a794fddf018a7888ac8b0073a13a
-SHA1 (patch-ac) = b586fcb6ab7d831a3490077f84fe170969905c26
+SHA1 (zsh-4.3.11.tar.bz2) = 25cf0daadc4543d147f6241573d6730b60f16016
+RMD160 (zsh-4.3.11.tar.bz2) = e5e0d79231cdb95e6b6edac0e1b81db6c0018c37
+Size (zsh-4.3.11.tar.bz2) = 2868429 bytes
+SHA1 (patch-ab) = e093eb17eac617eeda096dbcaaba974639570b42
+SHA1 (patch-ac) = 1284846253461b13f84512d76666e943cdc068f3
 SHA1 (patch-af) = c78fa8e786d3ae2e3b15a9587f2a7b6e64891778
 SHA1 (patch-ag) = 2fe6b7f0a76ca7e5d341fda408f3ab5443d09cbc
-SHA1 (patch-ah) = 561132abcd56df88d7ed3da4bca5f172ca341439
-SHA1 (patch-ba) = 67fcb32b9106b4c4de423afdd1684658ebb009d1
-SHA1 (patch-bb) = c7c7dbded897b3f43e6e1e8c090087ee7041906d
diff --git a/shells/zsh-current/patches/patch-ab b/shells/zsh-current/patches/patch-ab
index e2a5fe1e58a..dd4176b8519 100644
--- a/shells/zsh-current/patches/patch-ab
+++ b/shells/zsh-current/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2008/12/21 16:53:45 uebayasi Exp $
+$NetBSD: patch-ab,v 1.4 2011/04/05 13:54:24 ryoon Exp $
 
---- Src/zsh.h.orig	2008-10-31 18:40:18.000000000 +0900
+--- Src/zsh.h.orig	2010-12-14 10:09:52.000000000 +0000
 +++ Src/zsh.h
-@@ -1986,6 +1986,7 @@ struct ttyinfo {
+@@ -2105,6 +2105,7 @@ struct ttyinfo {
  #endif
  };
  
@@ -10,7 +10,7 @@ $NetBSD: patch-ab,v 1.3 2008/12/21 16:53:45 uebayasi Exp $
  /* defines for whether tabs expand to spaces */
  #if defined(HAVE_TERMIOS_H) || defined(HAVE_TERMIO_H)
  #define SGTTYFLAG       shttyinfo.tio.c_oflag
-@@ -2003,6 +2004,7 @@ struct ttyinfo {
+@@ -2122,6 +2123,7 @@ struct ttyinfo {
  #   endif
  #  endif
  # endif
diff --git a/shells/zsh-current/patches/patch-ac b/shells/zsh-current/patches/patch-ac
index 96c9e0c7037..e2448eab2aa 100644
--- a/shells/zsh-current/patches/patch-ac
+++ b/shells/zsh-current/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.4 2008/12/21 16:53:45 uebayasi Exp $
+$NetBSD: patch-ac,v 1.5 2011/04/05 13:54:24 ryoon Exp $
 
---- configure.orig	2008-10-31 02:07:59.000000000 +0900
+--- configure.orig	2010-09-23 09:42:09.000000000 +0000
 +++ configure
-@@ -18472,6 +18472,10 @@ echo "${ECHO_T}$zsh_cv_sys_elf" >&6; }
+@@ -20091,6 +20091,10 @@ $as_echo "$zsh_cv_sys_elf" >&6; }
          DLLD="${DLLD=$CC}"
          DLLDARG=""
        ;;
@@ -13,7 +13,7 @@ $NetBSD: patch-ac,v 1.4 2008/12/21 16:53:45 uebayasi Exp $
        * )
  	DLLD="${DLLD=ld}"
  	DLLDARG=""
-@@ -18482,6 +18486,7 @@ echo "${ECHO_T}$zsh_cv_sys_elf" >&6; }
+@@ -20101,6 +20105,7 @@ $as_echo "$zsh_cv_sys_elf" >&6; }
      case "$host_os" in
        hpux*)   DLLDFLAGS="${DLLDFLAGS=-shared}" ;;
        darwin*) DLCFLAGS="${DLCFLAGS=-fno-common}" ;;
@@ -21,7 +21,7 @@ $NetBSD: patch-ac,v 1.4 2008/12/21 16:53:45 uebayasi Exp $
        *)       DLCFLAGS="${DLCFLAGS=-fPIC}" ;;
      esac
    else
-@@ -18496,7 +18501,7 @@ echo "${ECHO_T}$zsh_cv_sys_elf" >&6; }
+@@ -20115,7 +20120,7 @@ $as_echo "$zsh_cv_sys_elf" >&6; }
    fi
    case "$host_os" in
      osf*) DLLDFLAGS="${DLLDFLAGS=-shared -expect_unresolved '*'}" ;;
diff --git a/shells/zsh-current/patches/patch-ah b/shells/zsh-current/patches/patch-ah
deleted file mode 100644
index 1d6367568e1..00000000000
--- a/shells/zsh-current/patches/patch-ah
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ah,v 1.3 2008/12/22 02:18:51 uebayasi Exp $
-
---- Config/installfns.sh.orig	2007-07-26 17:56:37.000000000 +0900
-+++ Config/installfns.sh
-@@ -45,9 +45,10 @@ for file in $allfuncs; do
-       esac
-     fi
-     test -d $instdir || /bin/sh $sdir_top/mkinstalldirs $instdir || exit 1
--    $INSTALL_DATA $sdir_top/$file $instdir || exit 1
-     if test -x $sdir_top/$file; then
--	chmod +x $instdir/`echo $file | sed -e 's%^.*/%%'`
-+      $INSTALL_SCRIPT $sdir_top/$file $instdir || exit 1
-+    else
-+      $INSTALL_DATA $sdir_top/$file $instdir || exit 1
-     fi
-   fi
- done
diff --git a/shells/zsh-current/patches/patch-ba b/shells/zsh-current/patches/patch-ba
deleted file mode 100644
index ba788d2a09f..00000000000
--- a/shells/zsh-current/patches/patch-ba
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-ba,v 1.3 2010/11/27 12:46:53 roy Exp $
-
-$NetBSD: patch-ba,v 1.3 2010/11/27 12:46:53 roy Exp $
-
---- Src/Modules/termcap.c.orig	2008-10-30 09:39:21.000000000 +0000
-+++ Src/Modules/termcap.c
-@@ -36,6 +36,9 @@
- #include "../../config.h"
- 
- #ifdef HAVE_TGETENT
-+#ifdef __NetBSD__
-+# define USES_TERMCAP_H 1
-+#else
- # if defined(ZSH_HAVE_CURSES_H) && defined(ZSH_HAVE_TERM_H)
- #  define USES_TERM_H 1
- # else
-@@ -44,12 +47,16 @@
- #  endif
- # endif
- #endif
-+#endif
- 
- #include "termcap.mdh"
- #include "termcap.pro"
- 
- /**/
- #ifdef HAVE_TGETENT
-+#ifdef __NetBSD__
-+# include <termcap.h>
-+#else
- # ifdef USES_TERM_H
- #  ifdef HAVE_TERMIO_H
- #   include <termio.h>
-@@ -63,6 +70,7 @@
- #   include <termcap.h>
- #  endif
- # endif
-+#endif
- 
- #ifndef HAVE_BOOLCODES
- static char *boolcodes[] = {
diff --git a/shells/zsh-current/patches/patch-bb b/shells/zsh-current/patches/patch-bb
deleted file mode 100644
index e9280790103..00000000000
--- a/shells/zsh-current/patches/patch-bb
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-bb,v 1.3 2010/11/27 12:46:53 roy Exp $
-
-$NetBSD: patch-bb,v 1.3 2010/11/27 12:46:53 roy Exp $
-
---- Src/Modules/terminfo.c.orig	2008-03-13 09:54:14.000000000 +0000
-+++ Src/Modules/terminfo.c
-@@ -49,9 +49,11 @@
- #  undef offsetof
- # endif
- 
-+#if !defined(__NetBSD__)
- #ifdef ZSH_HAVE_CURSES_H
- # include "../zshcurses.h"
- #endif
-+#endif
- 
- # ifdef ZSH_HAVE_TERM_H
- #  include "../zshterm.h"