diff options
Diffstat (limited to 'shells')
| -rw-r--r-- | shells/zsh/Makefile.common | 24 | ||||
| -rw-r--r-- | shells/zsh/distinfo | 4 | ||||
| -rw-r--r-- | shells/zsh/patches/patch-ba | 49 | ||||
| -rw-r--r-- | shells/zsh/patches/patch-bb | 25 |
4 files changed, 90 insertions, 12 deletions
diff --git a/shells/zsh/Makefile.common b/shells/zsh/Makefile.common index 142b4ec7c30..fed8909c456 100644 --- a/shells/zsh/Makefile.common +++ b/shells/zsh/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.55 2010/02/07 07:22:08 obache Exp $ +# $NetBSD: Makefile.common,v 1.56 2010/02/07 09:53:20 roy Exp $ DISTNAME= zsh-${ZSH_VERSION} CATEGORIES= shells @@ -38,15 +38,15 @@ PLIST_VARS= dynamic terminfo ################################################################################ -_ZSH_OPSYS.OpenBSD= ldflags tcsetpgrp - -_ZSH_OPSYS.Linux= ldflags tcsetpgrp terminfo -_ZSH_OPSYS.IRIX= ldflags tcsetpgrp - -_ZSH_OPSYS.Interix= ldflags notcsetpgrp - -_ZSH_OPSYS.DragonFly= ldflags tcsetpgrp terminfo -_ZSH_OPSYS.FreeBSD= ldflags tcsetpgrp terminfo -_ZSH_OPSYS.SunOS= - tcsetpgrp - +_ZSH_OPSYS.OpenBSD= ldflags tcsetpgrp +_ZSH_OPSYS.Linux= ldflags tcsetpgrp +_ZSH_OPSYS.IRIX= ldflags tcsetpgrp +_ZSH_OPSYS.Interix= ldflags notcsetpgrp +_ZSH_OPSYS.DragonFly= ldflags tcsetpgrp +_ZSH_OPSYS.FreeBSD= ldflags tcsetpgrp +_ZSH_OPSYS.SunOS= - tcsetpgrp -_ZSH_OPSYS.${OPSYS}?= ldflags tcsetpgrp - +_ZSH_OPSYS.${OPSYS}?= ldflags tcsetpgrp ################################################################################ @@ -74,8 +74,10 @@ _ZSH_LINKAGE.dynamic.LDFLAGS= ${_ZSH_DYNAMIC_VARS.ldflags} _ZSH_OPSYS_VARS.tcsetpgrp= --with-tcsetpgrp _ZSH_OPSYS_VARS.notcsetpgrp= --without-tcsetpgrp -### terminfo (ncurses) -.if !empty(_ZSH_OPSYS.${OPSYS}:Mterminfo) +### terminfo +CHECK_BUILTIN.terminfo= yes +.include "../../mk/terminfo.builtin.mk" +.if !empty(IS_BUILTIN.terminfo:M[Yy][Ee][Ss]) PLIST.terminfo= yes .endif diff --git a/shells/zsh/distinfo b/shells/zsh/distinfo index 0cc57ff2d21..71a2ceae7dd 100644 --- a/shells/zsh/distinfo +++ b/shells/zsh/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.28 2008/12/21 16:53:31 uebayasi Exp $ +$NetBSD: distinfo,v 1.29 2010/02/07 09:53:20 roy Exp $ SHA1 (zsh-4.2.7.tar.bz2) = 64c598cd48b78dff9d29341ea0cd904e7aa49541 RMD160 (zsh-4.2.7.tar.bz2) = 454339205c78393cbb9460aa10f37fa341a40b59 @@ -6,3 +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) = 7b7342edd7aea377eaa967afa145c008a336dbcf +SHA1 (patch-bb) = 74acb2a597fcdefbb26f79ab62915a5a75663b9c diff --git a/shells/zsh/patches/patch-ba b/shells/zsh/patches/patch-ba new file mode 100644 index 00000000000..b8805673b91 --- /dev/null +++ b/shells/zsh/patches/patch-ba @@ -0,0 +1,49 @@ +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 +-# ifdef TERM_H_NEEDS_CURSES_H +-# include <curses.h> +-# endif +-# include <term.h> +-# else +-# ifdef USES_TERMCAP_H +-# include <termcap.h> +-# endif +-# endif ++# include <termcap.h> + + static Param termcap_pm; + diff --git a/shells/zsh/patches/patch-bb b/shells/zsh/patches/patch-bb new file mode 100644 index 00000000000..59ab6807dc6 --- /dev/null +++ b/shells/zsh/patches/patch-bb @@ -0,0 +1,25 @@ +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 @@ + # undef offsetof + # endif + +-# include <curses.h> +-# ifdef HAVE_TERM_H +-# include <term.h> +-# endif ++#include <term.h> + + static Param terminfo_pm; + |