Update zsh-current to 4.3.4.

Several fixes of multi-byte character support.

Patch from Chris Ross, thanks.

5 files changed, 50 insertions, 12 deletions

diff --git a/shells/zsh-current/patches/patch-ab b/shells/zsh-current/patches/patch-ab
index 0b2d544727e..87bbc4ca16b 100644
--- a/shells/zsh-current/patches/patch-ab
+++ b/shells/zsh-current/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2006/03/11 13:20:15 uebayasi Exp $
+$NetBSD: patch-ab,v 1.2 2007/09/21 05:24:43 uebayasi Exp $
 
---- Src/zsh.h.orig	2006-01-17 19:40:06.000000000 +0900
-+++ Src/zsh.h
-@@ -1690,6 +1690,7 @@ struct ttyinfo {
+--- 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 @@
  #endif
  };
  
@@ -10,8 +10,8 @@ $NetBSD: patch-ab,v 1.1 2006/03/11 13:20:15 uebayasi Exp $
  /* defines for whether tabs expand to spaces */
  #if defined(HAVE_TERMIOS_H) || defined(HAVE_TERMIO_H)
  #define SGTTYFLAG       shttyinfo.tio.c_oflag
-@@ -1705,6 +1706,7 @@ struct ttyinfo {
- #define SGTABTYPE       XTABS
+@@ -1771,6 +1772,7 @@
+ #   endif
  #  endif
  # endif
 +#endif
diff --git a/shells/zsh-current/patches/patch-ae b/shells/zsh-current/patches/patch-ae
index 857b6cfd4bc..2767f6d87d0 100644
--- a/shells/zsh-current/patches/patch-ae
+++ b/shells/zsh-current/patches/patch-ae
@@ -1,13 +1,14 @@
-$NetBSD: patch-ae,v 1.1 2006/03/11 13:20:15 uebayasi Exp $
+$NetBSD: patch-ae,v 1.2 2007/09/21 05:24:43 uebayasi Exp $
 
---- Src/mkmakemod.sh.orig	2005-08-09 18:55:18.000000000 +0900
-+++ Src/mkmakemod.sh
-@@ -112,8 +112,7 @@ if $first_stage; then
+--- 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 both 2.13 and 2.50 syntax
+     # check 2.13, 2.50, and 2.60 syntaxes
 -    if grep '%@D@%D%' config.status >/dev/null ||
--       grep ',@D@,D,' config.status >/dev/null; then
+-       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
diff --git a/shells/zsh-current/patches/patch-af b/shells/zsh-current/patches/patch-af
new file mode 100644
index 00000000000..071c767541e
--- /dev/null
+++ b/shells/zsh-current/patches/patch-af
@@ -0,0 +1,12 @@
+$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
new file mode 100644
index 00000000000..f9770ed6303
--- /dev/null
+++ b/shells/zsh-current/patches/patch-ag
@@ -0,0 +1,12 @@
+$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
new file mode 100644
index 00000000000..7a05b17ae63
--- /dev/null
+++ b/shells/zsh-current/patches/patch-ah
@@ -0,0 +1,13 @@
+$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