7 files changed, 36 insertions, 55 deletions
diff --git a/shells/zsh/patches/patch-ab b/shells/zsh/patches/patch-ab
index c7afd56a5b9..b2331a484fa 100644
--- a/shells/zsh/patches/patch-ab
+++ b/shells/zsh/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.12 2008/12/21 16:53:31 uebayasi Exp $
+$NetBSD: patch-ab,v 1.13 2012/07/22 10:03:40 ryoon Exp $
 
---- Src/zsh.h.orig	2007-11-26 18:38:49.000000000 +0900
+--- Src/zsh.h.orig	2011-05-16 15:49:11.000000000 +0000
 +++ Src/zsh.h
-@@ -1678,6 +1678,7 @@ struct ttyinfo {
+@@ -2122,6 +2122,7 @@ struct ttyinfo {
  #endif
  };
  
@@ -10,7 +10,7 @@ $NetBSD: patch-ab,v 1.12 2008/12/21 16:53:31 uebayasi Exp $
  /* defines for whether tabs expand to spaces */
  #if defined(HAVE_TERMIOS_H) || defined(HAVE_TERMIO_H)
  #define SGTTYFLAG       shttyinfo.tio.c_oflag
-@@ -1695,6 +1696,7 @@ struct ttyinfo {
+@@ -2139,6 +2140,7 @@ struct ttyinfo {
  #   endif
  #  endif
  # endif
diff --git a/shells/zsh/patches/patch-ac b/shells/zsh/patches/patch-ac
index 6876c572dbc..4833dcc88eb 100644
--- a/shells/zsh/patches/patch-ac
+++ b/shells/zsh/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.22 2011/11/11 18:45:46 joerg Exp $
+$NetBSD: patch-ac,v 1.23 2012/07/22 10:03:40 ryoon Exp $
 
---- configure.orig	2007-11-29 10:17:19.000000000 +0000
+--- configure.orig	2011-05-16 15:49:15.000000000 +0000
 +++ configure
-@@ -16619,6 +16619,10 @@ echo "${ECHO_T}$zsh_cv_sys_elf" >&6; }
+@@ -11443,6 +11443,10 @@ $as_echo "$zsh_cv_sys_elf" >&6; }
          DLLD="${DLLD=$CC}"
          DLLDARG=""
        ;;
@@ -13,7 +13,7 @@ $NetBSD: patch-ac,v 1.22 2011/11/11 18:45:46 joerg Exp $
        * )
  	DLLD="${DLLD=ld}"
  	DLLDARG=""
-@@ -16629,6 +16633,7 @@ echo "${ECHO_T}$zsh_cv_sys_elf" >&6; }
+@@ -11453,6 +11457,7 @@ $as_echo "$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.22 2011/11/11 18:45:46 joerg Exp $
        *)       DLCFLAGS="${DLCFLAGS=-fPIC}" ;;
      esac
    else
-@@ -16642,10 +16647,9 @@ echo "${ECHO_T}$zsh_cv_sys_elf" >&6; }
-     esac
+@@ -11467,10 +11472,9 @@ $as_echo "$zsh_cv_sys_elf" >&6; }
    fi
    case "$host_os" in
--    *freebsd*|linux*|irix*|osf*|gnu*|dragonfly*) DLLDFLAGS="${DLLDFLAGS=-shared}" ;;
-+    *freebsd*|*netbsd*|linux*|irix*|osf*|gnu*|interix*|dragonfly*) DLLDFLAGS="${DLLDFLAGS=-shared}" ;;
+     osf*) DLLDFLAGS="${DLLDFLAGS=-shared -expect_unresolved '*'}" ;;
+-    *freebsd*|linux*|irix*|gnu*|dragonfly*) DLLDFLAGS="${DLLDFLAGS=-shared}" ;;
++    *freebsd*|*netbsd*|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/patches/patch-ae b/shells/zsh/patches/patch-ae
deleted file mode 100644
index a34aa2ab938..00000000000
--- a/shells/zsh/patches/patch-ae
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2008/12/21 16:53:31 uebayasi Exp $
-
---- Src/mkmakemod.sh.orig	2007-10-25 17:40:46.000000000 +0900
-+++ Src/mkmakemod.sh
-@@ -112,9 +112,7 @@ if $first_stage; then
-     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/patches/patch-af b/shells/zsh/patches/patch-af
new file mode 100644
index 00000000000..81784227c97
--- /dev/null
+++ b/shells/zsh/patches/patch-af
@@ -0,0 +1,12 @@
+$NetBSD: patch-af,v 1.4 2012/07/22 10:03:40 ryoon Exp $
+
+--- Config/defs.mk.in.orig	2011-04-19 15:05:00.000000000 +0000
++++ Config/defs.mk.in
+@@ -81,6 +81,7 @@ TEXI2PDF	= @TEXI2PDF@
+ 
+ # 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/patches/patch-ag b/shells/zsh/patches/patch-ag
new file mode 100644
index 00000000000..ab78060dcb1
--- /dev/null
+++ b/shells/zsh/patches/patch-ag
@@ -0,0 +1,12 @@
+$NetBSD: patch-ag,v 1.4 2012/07/22 10:03:40 ryoon Exp $
+
+--- Makefile.in.orig	2009-03-14 18:27:05.000000000 +0000
++++ Makefile.in
+@@ -87,6 +87,7 @@ install.fns:
+ 	  scriptdir="$(scriptdir)" \
+ 	  FUNCTIONS_SUBDIRS="$(FUNCTIONS_SUBDIRS)" \
+ 	  INSTALL_DATA="$(INSTALL_DATA)" \
++	  INSTALL_SCRIPT="$(INSTALL_SCRIPT)" \
+ 	  INSTALL_PROGRAM="$(INSTALL_PROGRAM)" \
+ 	  DESTDIR="$(DESTDIR)" VERSION="$(VERSION)" \
+ 	  $(SHELL) $(sdir_top)/Config/installfns.sh || exit 1; \
diff --git a/shells/zsh/patches/patch-ba b/shells/zsh/patches/patch-ba
deleted file mode 100644
index 66b474c682f..00000000000
--- a/shells/zsh/patches/patch-ba
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ba,v 1.4 2010/11/27 07:21:27 obache Exp $
-
---- Src/Modules/termcap.c.orig	2007-08-22 16:23:50.000000000 +0000
-+++ Src/Modules/termcap.c
-@@ -36,7 +36,7 @@
- #include "../../config.h"
- 
- #ifdef HAVE_TGETENT
--# if defined(HAVE_CURSES_H) && defined(HAVE_TERM_H)
-+# if defined(HAVE_CURSES_H) && defined(HAVE_TERM_H) && !defined(__NetBSD__)
- #  define USES_TERM_H 1
- # else
- #  ifdef HAVE_TERMCAP_H
diff --git a/shells/zsh/patches/patch-bb b/shells/zsh/patches/patch-bb
deleted file mode 100644
index 321455e505a..00000000000
--- a/shells/zsh/patches/patch-bb
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-bb,v 1.4 2010/11/27 07:21:27 obache Exp $
-
---- Src/Modules/terminfo.c.orig	2010-03-10 07:58:30.000000000 +0000
-+++ Src/Modules/terminfo.c	2010-03-10 07:58:40.000000000 +0000
-@@ -50,7 +50,9 @@
- #  undef offsetof
- # endif
- 
--# include <curses.h>
-+# ifndef __NetBSD__
-+#  include <curses.h>
-+# endif
- # ifdef HAVE_TERM_H
- #  include <term.h>
- # endif