Add patches to fix building on NetBSD with terminfo, fixes PR pkg/42761.diff -r1.14 -r1.15 pkgsrc/shells/zsh-current/distinfo
(roy)
| @@ -1,10 +1,12 @@ | @@ -1,10 +1,12 @@ | |||
| 1 | $NetBSD: distinfo,v 1.14 2008/12/22 02:18:51 uebayasi Exp $ | 1 | $NetBSD: distinfo,v 1.15 2010/02/07 10:07:10 roy Exp $ | |
| 2 | 2 | |||
| 3 | SHA1 (zsh-4.3.9.tar.bz2) = 7c80e1ad6b311ee5877172a1a7e0161a9a60da70 | 3 | SHA1 (zsh-4.3.9.tar.bz2) = 7c80e1ad6b311ee5877172a1a7e0161a9a60da70 | |
| 4 | RMD160 (zsh-4.3.9.tar.bz2) = 2c88347fa357e3624f000721963749c6ccb4e129 | 4 | RMD160 (zsh-4.3.9.tar.bz2) = 2c88347fa357e3624f000721963749c6ccb4e129 | |
| 5 | Size (zsh-4.3.9.tar.bz2) = 2659602 bytes | 5 | Size (zsh-4.3.9.tar.bz2) = 2659602 bytes | |
| 6 | SHA1 (patch-ab) = 4fc9ef0aa307a794fddf018a7888ac8b0073a13a | 6 | SHA1 (patch-ab) = 4fc9ef0aa307a794fddf018a7888ac8b0073a13a | |
| 7 | SHA1 (patch-ac) = b586fcb6ab7d831a3490077f84fe170969905c26 | 7 | SHA1 (patch-ac) = b586fcb6ab7d831a3490077f84fe170969905c26 | |
| 8 | SHA1 (patch-af) = c78fa8e786d3ae2e3b15a9587f2a7b6e64891778 | 8 | SHA1 (patch-af) = c78fa8e786d3ae2e3b15a9587f2a7b6e64891778 | |
| 9 | SHA1 (patch-ag) = 2fe6b7f0a76ca7e5d341fda408f3ab5443d09cbc | 9 | SHA1 (patch-ag) = 2fe6b7f0a76ca7e5d341fda408f3ab5443d09cbc | |
| 10 | SHA1 (patch-ah) = 561132abcd56df88d7ed3da4bca5f172ca341439 | 10 | SHA1 (patch-ah) = 561132abcd56df88d7ed3da4bca5f172ca341439 | |
| 11 | SHA1 (patch-ba) = 8b62a94af40b619c46f9da4b89bd678833600f7a | |||
| 12 | SHA1 (patch-bb) = 9638cb7f10a30dad7f0dd5d413aa9796a0ef07f7 |
termcap does not require curses.
--- Src/Modules/termcap.c.orig 2010-02-07 08:23:33.000000000 +0000
+++ Src/Modules/termcap.c 2010-02-07 08:34:57.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(ZSH_HAVE_CURSES_H) && defined(ZSH_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"
@@ -50,19 +38,7 @@
/**/
#ifdef HAVE_TGETENT
-# ifdef USES_TERM_H
-# ifdef HAVE_TERMIO_H
-# include <termio.h>
-# endif
-# ifdef ZSH_HAVE_CURSES_H
-# include "../zshcurses.h"
-# endif
-# include "../zshterm.h"
-# else
-# ifdef USES_TERMCAP_H
-# include <termcap.h>
-# endif
-# endif
+# include <termcap.h>
#ifndef HAVE_BOOLCODES
static char *boolcodes[] = {
terminfo does not require curses.
--- Src/Modules/terminfo.c.orig 2010-02-07 08:31:07.000000000 +0000
+++ Src/Modules/terminfo.c 2010-02-07 08:31:30.000000000 +0000
@@ -49,10 +49,6 @@
# undef offsetof
# endif
-#ifdef ZSH_HAVE_CURSES_H
-# include "../zshcurses.h"
-#endif
-
# ifdef ZSH_HAVE_TERM_H
# include "../zshterm.h"
# endif