diff options
| author | obache <obache> | 2010-11-27 07:21:27 +0000 |
|---|---|---|
| committer | obache <obache> | 2010-11-27 07:21:27 +0000 |
| commit | f13549458d375fd62d60521c9fa6bdb95f810e0d (patch) | |
| tree | 0d9914627df3373ae85f3ba5892a5a390db9152c /shells | |
| parent | 492de2c793265e895169841923d0d2d7cc80e72e (diff) | |
| download | pkgsrc-f13549458d375fd62d60521c9fa6bdb95f810e0d.tar.gz | |
Modify patches to buildable on NetBSD-5.1, NetBSD-5.99.40 and DragonFly-2.8.2.
Diffstat (limited to 'shells')
| -rw-r--r-- | shells/zsh/distinfo | 6 | ||||
| -rw-r--r-- | shells/zsh/patches/patch-ba | 34 | ||||
| -rw-r--r-- | shells/zsh/patches/patch-bb | 4 |
3 files changed, 16 insertions, 28 deletions
diff --git a/shells/zsh/distinfo b/shells/zsh/distinfo index 804e6e0ac33..d4362c82aaa 100644 --- a/shells/zsh/distinfo +++ b/shells/zsh/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.31 2010/03/10 08:19:57 roy Exp $ +$NetBSD: distinfo,v 1.32 2010/11/27 07:21:27 obache 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) = 68e2c61e770f5fa9e74d5f30f7876d657292676c -SHA1 (patch-bb) = 51c64ee6587e9fe3d7a961f755b40fe6c89808bf +SHA1 (patch-ba) = 6cfee12c6fc4ddb07709e07f4f39e3b1ad6c9f16 +SHA1 (patch-bb) = ed3fb8a9e439ea5de6db81bdf9b8c59eb95070e0 diff --git a/shells/zsh/patches/patch-ba b/shells/zsh/patches/patch-ba index 0c604ada442..66b474c682f 100644 --- a/shells/zsh/patches/patch-ba +++ b/shells/zsh/patches/patch-ba @@ -1,25 +1,13 @@ -$NetBSD: patch-ba,v 1.3 2010/03/10 08:19:57 roy Exp $ +$NetBSD: patch-ba,v 1.4 2010/11/27 07:21:27 obache Exp $ ---- 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 --# include <term.h> --# else --# ifdef USES_TERMCAP_H --# include <termcap.h> --# endif -+# endif -+# ifdef TERM_H_NEEDS_CURSES_H -+# include <curses.h> -+# endif -+# ifdef HAVE_TERMCAP_H -+# include <termcap.h> - # endif +--- Src/Modules/termcap.c.orig 2007-08-22 16:23:50.000000000 +0000 ++++ Src/Modules/termcap.c +@@ -36,7 +36,7 @@ + #include "../../config.h" - static Param termcap_pm; + #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 index 7a808c47f51..321455e505a 100644 --- a/shells/zsh/patches/patch-bb +++ b/shells/zsh/patches/patch-bb @@ -1,4 +1,4 @@ -$NetBSD: patch-bb,v 1.3 2010/03/10 08:19:57 roy Exp $ +$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 @@ -7,7 +7,7 @@ $NetBSD: patch-bb,v 1.3 2010/03/10 08:19:57 roy Exp $ # endif -# include <curses.h> -+# ifdef TERM_H_NEEDS_CURSES_H ++# ifndef __NetBSD__ +# include <curses.h> +# endif # ifdef HAVE_TERM_H |