[pkgsrc/trunk]: pkgsrc/sysutils/bacula Spell HAVE_TERM_H correctly, fixes Sun...

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b87d3ea22ca7
branches:  trunk
changeset: 629502:b87d3ea22ca7
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Wed Jan 22 10:45:21 2014 +0000

description:
Spell HAVE_TERM_H correctly, fixes SunOS build.

diffstat:

 sysutils/bacula/distinfo                          |   4 ++--
 sysutils/bacula/patches/patch-src_console_conio.c |  11 +++++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diffs (49 lines):

diff -r 30a4e81f1e6e -r b87d3ea22ca7 sysutils/bacula/distinfo
--- a/sysutils/bacula/distinfo  Wed Jan 22 09:43:57 2014 +0000
+++ b/sysutils/bacula/distinfo  Wed Jan 22 10:45:21 2014 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.49 2014/01/14 10:58:17 markd Exp $
+$NetBSD: distinfo,v 1.50 2014/01/22 10:45:21 jperkin Exp $
 
 SHA1 (bacula-5.2.13.tar.gz) = 30b1eb2efb515138807163d046f675eaa29fad1c
 RMD160 (bacula-5.2.13.tar.gz) = bcc168143c0eec5cb5e983f765935534379f4fcf
@@ -10,7 +10,7 @@
 SHA1 (patch-aj) = 125d1503406474fec32e737068328cdfa718f5c2
 SHA1 (patch-am) = 28536d3f0de81940773749c3704ad7aca86d374d
 SHA1 (patch-configure) = 710d6e4370099a5d6d23d1297864af01abcdae83
-SHA1 (patch-src_console_conio.c) = 2c750c48b45091066edc4aa9c88f494a6c892ce4
+SHA1 (patch-src_console_conio.c) = bfec27296d145ab94c305cc5ffca7f892c14303e
 SHA1 (patch-src_dird_Makefile.in) = fdce18aca972f26f16af90283756cd5bf5ad5831
 SHA1 (patch-src_filed_Makefile.in) = c88ee648ef33c3f7c3a02b77b1d3fc3da8da088d
 SHA1 (patch-src_findlib_attribs.c) = a0917e500d7e937164cf59917cabd992512acd1d
diff -r 30a4e81f1e6e -r b87d3ea22ca7 sysutils/bacula/patches/patch-src_console_conio.c
--- a/sysutils/bacula/patches/patch-src_console_conio.c Wed Jan 22 09:43:57 2014 +0000
+++ b/sysutils/bacula/patches/patch-src_console_conio.c Wed Jan 22 10:45:21 2014 +0000
@@ -1,11 +1,12 @@
-$NetBSD: patch-src_console_conio.c,v 1.2 2014/01/14 10:58:17 markd Exp $
+$NetBSD: patch-src_console_conio.c,v 1.3 2014/01/22 10:45:21 jperkin Exp $
 
 - need termios.h, our term.h does not include it
 - t_insert_line and t_delete_line are macros in term.h; undef them
+- spell HAVE_TERM_H correctly
 
 --- src/console/conio.c.orig   2013-02-19 19:21:35.000000000 +0000
 +++ src/console/conio.c
-@@ -64,6 +64,7 @@
+@@ -64,11 +64,12 @@
  
  #ifdef HAVE_CONIO
  
@@ -13,6 +14,12 @@
  #include <curses.h>
  #include <term.h>
  
+ #if defined(HAVE_SUN_OS)
+-#if !defined(_TERM_H)
++#if !defined(HAVE_TERM_H)
+ extern "C" int tgetent(void *, const char *);
+ extern "C" int tgetnum(const char *);
+ extern "C" char *tgetstr (const char*, char**);
 @@ -250,7 +251,9 @@ static char * getnext(void);
  static char * getprev(void);
  static void putline(char *newl, int newlen);