fixes build with NetBSD-6 curses.

2 files changed, 64 insertions, 1 deletions

diff --git a/inputmethod/uim/distinfo b/inputmethod/uim/distinfo
index d8f322a11dd..2e87511a01e 100644
--- a/inputmethod/uim/distinfo
+++ b/inputmethod/uim/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.25 2013/08/11 07:50:51 obache Exp $
+$NetBSD: distinfo,v 1.26 2014/02/02 10:47:24 obache Exp $
 
 SHA1 (uim-1.8.6.tar.bz2) = 43b9dbdead6797880e6cfc9c032ecb2d37d42777
 RMD160 (uim-1.8.6.tar.bz2) = 5f94218d82475ac463534ec681769f34547e5707
@@ -8,3 +8,4 @@ SHA1 (patch-ac) = 7c36bc67764925c9d87ad0aa963a53cfd1948224
 SHA1 (patch-ad) = 9c47fa28b6478bf2e720c1c0e7bf7793eb71fbab
 SHA1 (patch-ae) = 59944fc9c7256056125fa3a623aecf6a2e9dfe42
 SHA1 (patch-af) = 9f543b90bfefc5f560e1eaac97d60af70ffed5cc
+SHA1 (patch-fep_escseq.c) = 6c25c344e5b694542a3c5bc137ae1a1d36a8c835
diff --git a/inputmethod/uim/patches/patch-fep_escseq.c b/inputmethod/uim/patches/patch-fep_escseq.c
new file mode 100644
index 00000000000..d49c51c87e8
--- /dev/null
+++ b/inputmethod/uim/patches/patch-fep_escseq.c
@@ -0,0 +1,62 @@
+$NetBSD: patch-fep_escseq.c,v 1.1 2014/02/02 10:47:24 obache Exp $
+
+* termios.h is required for struct termios
+* pass 9 parameters to tparm(3) for portability 
+
+--- fep/escseq.c.orig	2013-06-30 04:26:09.000000000 +0000
++++ fep/escseq.c
+@@ -61,6 +61,9 @@
+ #ifdef HAVE_STRING_H
+ #include <string.h>
+ #endif
++#ifdef HAVE_TERMIOS_H
++#include <termios.h>
++#endif
+ 
+ #include "uim-fep.h"
+ #include "draw.h"
+@@ -964,7 +967,7 @@ void put_cursor_address(int row, int col
+   if (row == s_cursor.row && col == s_cursor.col && col < g_win->ws_col - 2) {
+     return;
+   }
+-  tmp = tparm(cursor_address, row, col);
++  tmp = tparm(cursor_address, row, col, 0, 0, 0, 0, 0, 0, 0);
+   my_putp(tmp);
+   s_cursor.row = row;
+   s_cursor.col = col;
+@@ -985,7 +988,7 @@ void put_insert(int n)
+   if (n <= 0) {
+     return;
+   }
+-  tmp = tparm(parm_ich, n);
++  tmp = tparm(parm_ich, n, 0, 0, 0, 0, 0, 0, 0, 0);
+   my_putp(tmp);
+   debug(("<ins %d>", n));
+ }
+@@ -1007,7 +1010,7 @@ void put_delete(int n)
+     change_background_attr(&s_attr, s_attr_uim);
+   }
+ 
+-  tmp = tparm(parm_dch, n);
++  tmp = tparm(parm_dch, n, 0, 0, 0, 0, 0, 0, 0, 0);
+   my_putp(tmp);
+   debug(("<del %d>", n));
+ }
+@@ -1036,7 +1039,7 @@ void put_goto_lastline(int col)
+   if (row == s_cursor.row && col == s_cursor.col) {
+     return;
+   }
+-  tmp = tparm(cursor_address, row, col);
++  tmp = tparm(cursor_address, row, col, 0, 0, 0, 0, 0, 0, 0);
+   my_putp(tmp);
+   s_cursor.row = row;
+   s_cursor.col = col;
+@@ -1103,7 +1106,7 @@ void put_clear_to_end_of_line(int width)
+  */
+ void put_change_scroll_region(int start, int end)
+ {
+-  const char *tmp = tparm(change_scroll_region, start, end);
++  const char *tmp = tparm(change_scroll_region, start, end, 0, 0, 0, 0, 0, 0, 0);
+   my_putp(tmp);
+   s_cursor.row = s_cursor.col = 0;
+   debug(("<region %d %d>", start, end));