Re: pkg/43083 (shells/zsh-current can't build on MacOS X environment)

[Masao Uebayashi <uebayasi%tombi.co.jp@localhost>]

The following reply was made to PR pkg/43083; it has been noted by GNATS.

From: Masao Uebayashi <uebayasi%tombi.co.jp@localhost>
To: Roy Marples <roy%NetBSD.org@localhost>
Cc: gnats-bugs%NetBSD.org@localhost, wiz%NetBSD.org@localhost, 
uebayasi%NetBSD.org@localhost,
        pkgsrc-bugs%netbsd.org@localhost, gnats-admin%netbsd.org@localhost,
        goro%venus.dti.ne.jp@localhost
Subject: Re: pkg/43083 (shells/zsh-current can't build on MacOS X
 environment)
Date: Sun, 18 Apr 2010 08:16:23 +0900

 How about this?  Override zsh's conditional checks only on NetBSD.  A little
 hackish, but should be manageable.
 
 Masao
 
 Index: distinfo
 ===================================================================
 RCS file: /src/netbsd/cvsroot/pkgsrc/shells/zsh-current/distinfo,v
 retrieving revision 1.16
 diff -u -r1.16 distinfo
 --- distinfo   27 Feb 2010 18:19:02 -0000      1.16
 +++ distinfo   17 Apr 2010 14:03:50 -0000
 @@ -8,5 +8,5 @@
  SHA1 (patch-af) = c78fa8e786d3ae2e3b15a9587f2a7b6e64891778
  SHA1 (patch-ag) = 2fe6b7f0a76ca7e5d341fda408f3ab5443d09cbc
  SHA1 (patch-ah) = 561132abcd56df88d7ed3da4bca5f172ca341439
 -SHA1 (patch-ba) = 8b62a94af40b619c46f9da4b89bd678833600f7a
 +SHA1 (patch-ba) = ff4aac4bf030a781feede16614948dc1098adee0
  SHA1 (patch-bb) = 9638cb7f10a30dad7f0dd5d413aa9796a0ef07f7
 Index: patches/patch-ba
 ===================================================================
 RCS file: /src/netbsd/cvsroot/pkgsrc/shells/zsh-current/patches/patch-ba,v
 retrieving revision 1.1
 diff -u -r1.1 patch-ba
 --- patches/patch-ba   7 Feb 2010 10:07:10 -0000       1.1
 +++ patches/patch-ba   17 Apr 2010 14:03:46 -0000
 @@ -1,49 +1,39 @@
 -termcap does not require curses.
 +NetBSD's new 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).
 -- */
 +--- Src/Modules/termcap.c.orig        2010-04-18 08:03:50.000000000 +0900
 ++++ Src/Modules/termcap.c     2010-04-18 08:05:45.000000000 +0900
 +@@ -36,6 +36,9 @@
   #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
 ++#ifdef __NetBSD__
  +# define USES_TERMCAP_H 1
 ++#else
 + # if defined(ZSH_HAVE_CURSES_H) && defined(ZSH_HAVE_TERM_H)
 + #  define USES_TERM_H 1
 + # else
 +@@ -44,12 +47,16 @@
 + #  endif
 + # endif
   #endif
 ++#endif
   
   #include "termcap.mdh"
 -@@ -50,19 +38,7 @@
 + #include "termcap.pro"
   
   /**/
   #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
 ++#ifdef __NetBSD__
  +# include <termcap.h>
 ++#else
 + # ifdef USES_TERM_H
 + #  ifdef HAVE_TERMIO_H
 + #   include <termio.h>
 +@@ -63,6 +70,7 @@
 + #   include <termcap.h>
 + #  endif
 + # endif
 ++#endif
   
   #ifndef HAVE_BOOLCODES
   static char *boolcodes[] = {
 
 -- 
 Masao Uebayashi / Tombi Inc. / Tel: +81-90-9141-4635