Fix patches to pull in curses.h when needed.

Fixes PR pkg/42877.

3 files changed, 27 insertions, 65 deletions

diff --git a/shells/zsh/distinfo b/shells/zsh/distinfo
index 151b0e0e19c..804e6e0ac33 100644
--- a/shells/zsh/distinfo
+++ b/shells/zsh/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.30 2010/02/23 17:11:01 roy Exp $
+$NetBSD: distinfo,v 1.31 2010/03/10 08:19:57 roy Exp $
 
 SHA1 (zsh-4.2.7.tar.bz2) = 64c598cd48b78dff9d29341ea0cd904e7aa49541
 RMD160 (zsh-4.2.7.tar.bz2) = 454339205c78393cbb9460aa10f37fa341a40b59
@@ -6,5 +6,5 @@ Size (zsh-4.2.7.tar.bz2) = 2303693 bytes
 SHA1 (patch-ab) = b446fd8138f18113c17cee43cd11a5f458b1db40
 SHA1 (patch-ac) = c80876a222ff9584bc53ec807ee2a8bc2b003cd1
 SHA1 (patch-ae) = ac77147eebfebcd042f93a71bb13f9c0be8de211
-SHA1 (patch-ba) = f712bc5beb7c2076dca94ac0d2a95bdf2e65d427
-SHA1 (patch-bb) = 0c95e3aff51c910c817b6527abacd6ad32aed0b2
+SHA1 (patch-ba) = 68e2c61e770f5fa9e74d5f30f7876d657292676c
+SHA1 (patch-bb) = 51c64ee6587e9fe3d7a961f755b40fe6c89808bf
diff --git a/shells/zsh/patches/patch-ba b/shells/zsh/patches/patch-ba
index 7a670e53d3d..0c604ada442 100644
--- a/shells/zsh/patches/patch-ba
+++ b/shells/zsh/patches/patch-ba
@@ -1,41 +1,11 @@
-$NetBSD: patch-ba,v 1.2 2010/02/23 17:11:01 roy Exp $
+$NetBSD: patch-ba,v 1.3 2010/03/10 08:19:57 roy Exp $
 
-termcap does not require curses.
-
---- Src/Modules/termcap.c.orig	2010-02-07 08:52:07.000000000 +0000
-+++ Src/Modules/termcap.c	2010-02-07 08:54:03.000000000 +0000
-@@ -27,22 +27,10 @@
-  *
-  */
- 
--/*
-- * We need to include the zsh headers later to avoid clashes with
-- * the definitions on some systems, however we need the configuration
-- * file to decide whether we should avoid curses.h, which clashes
-- * with several zsh constants on some systems (e.g. SunOS 4).
-- */
- #include "../../config.h"
- 
- #ifdef HAVE_TGETENT
--# if defined(HAVE_CURSES_H) && defined(HAVE_TERM_H)
--#  define USES_TERM_H 1
--# else
--#  ifdef HAVE_TERMCAP_H
--#   define USES_TERMCAP_H 1
--#  endif
--# endif
-+# define USES_TERMCAP_H 1
- #endif
- 
- #include "termcap.mdh"
-@@ -51,19 +39,7 @@
- static char termcap_nam[] = "termcap";
- 
- #ifdef HAVE_TGETENT
--# ifdef USES_TERM_H
--#  ifdef HAVE_TERMIO_H
--#   include <termio.h>
--#  endif
+--- Src/Modules/termcap.c.orig	2010-03-10 07:58:25.000000000 +0000
++++ Src/Modules/termcap.c	2010-03-10 07:58:35.000000000 +0000
+@@ -55,14 +55,12 @@
+ #  ifdef HAVE_TERMIO_H
+ #   include <termio.h>
+ #  endif
 -#  ifdef TERM_H_NEEDS_CURSES_H
 -#   include <curses.h>
 -#  endif
@@ -44,8 +14,12 @@ termcap does not require curses.
 -#  ifdef USES_TERMCAP_H
 -#   include <termcap.h>
 -#  endif
--# endif
-+# include <termcap.h>
++# endif
++# ifdef TERM_H_NEEDS_CURSES_H
++#  include <curses.h>
++# endif
++# ifdef HAVE_TERMCAP_H
++#  include <termcap.h>
+ # endif
  
  static Param termcap_pm;
- 
diff --git a/shells/zsh/patches/patch-bb b/shells/zsh/patches/patch-bb
index b912130a4de..7a808c47f51 100644
--- a/shells/zsh/patches/patch-bb
+++ b/shells/zsh/patches/patch-bb
@@ -1,27 +1,15 @@
-$NetBSD: patch-bb,v 1.2 2010/02/23 17:11:01 roy Exp $
+$NetBSD: patch-bb,v 1.3 2010/03/10 08:19:57 roy Exp $
 
-terminfo does not require curses.
-
---- Src/Modules/terminfo.c.orig	2010-02-07 08:54:08.000000000 +0000
-+++ Src/Modules/terminfo.c	2010-02-07 08:55:11.000000000 +0000
-@@ -30,7 +30,7 @@
- #define USES_TERM_H 1
- #include "terminfo.mdh"
- 
--#if defined(HAVE_TIGETFLAG) && defined(HAVE_CURSES_H)
-+#if defined(HAVE_TIGETFLAG) && defined(HAVE_TERM_H)
- # define USE_TERMINFO_MODULE 1
- #else
- # undef USE_TERMINFO_MODULE
-@@ -50,10 +50,7 @@
+--- 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>
--# ifdef HAVE_TERM_H
--#  include <term.h>
--# endif
-+#include <term.h>
- 
- static Param terminfo_pm;
- 
++# ifdef TERM_H_NEEDS_CURSES_H
++#  include <curses.h>
++# endif
+ # ifdef HAVE_TERM_H
+ #  include <term.h>
+ # endif