 @@ -1,14 +1,15 @@
-$NetBSD: distinfo,v 1.10 2017/10/25 09:32:38 maya Exp $
+$NetBSD: distinfo,v 1.11 2017/10/30 11:45:13 jperkin Exp $
 SHA1 (fish-2.6.0.tar.gz) = 16f6612747f8013cd04b3639fe504d4750f363ca
 RMD160 (fish-2.6.0.tar.gz) = f12093fef235487b7c02c245cbbd600750fff874
 SHA512 (fish-2.6.0.tar.gz) = d4ded5ce24600e85673a7bb016e9dc36bce999b27f40e6b1ce0b9ca49a421be2d444d9d2b6f178f6eee963e59daa4a65df4c3de2a8086a610486f758fcfb0ed1
 Size (fish-2.6.0.tar.gz) = 3575346 bytes
 SHA1 (patch-Makefile.in) = e2f5722d2e08e644e0813a662b64bbfe811a8ec6
-SHA1 (patch-configure.ac) = ba20a0182920e2dfb0851038e00875331ba94196
+SHA1 (patch-configure.ac) = 05bad922ce93d5624f8c98a210e473ad702fbe8d
 SHA1 (patch-src_builtin.cpp) = b48a52d45ba545a92043e58dc554305670c7fcfc
-SHA1 (patch-src_fallback.h) = 9ca7e829c663d744165fc06ff50ec101ae20091d
+SHA1 (patch-src_fallback.cpp) = 4a35401ed0d3c3a912e448d56c9375801c919fbc
-SHA1 (patch-src_output.cpp) = 36a2cc0576aca6585090a1b5b32aa39c90ed3996
+SHA1 (patch-src_fallback.h) = e58b29135404211b841232d68e76facdfecc653b
-SHA1 (patch-src_output.h) = 8e72aefbd940450fb69f4b970ce1d151f17eb48a
+SHA1 (patch-src_output.cpp) = ce8a5043982b0f1dc28d56eaaf4ac2c1d4d1e0c6
-SHA1 (patch-src_screen.cpp) = f2d5e10dff9d09e985a8e27a8f2066dcfb58db05
+SHA1 (patch-src_output.h) = 971dfe5e137f46b52a56d808c32bf643750ad65a
 SHA1 (patch-src_screen.cpp) = acac708ab49a66daf7de274e5d3ed77bb73ab724
 SHA1 (patch-src_wutil.cpp) = dbb73cf81d850c4b73598d0c711f68b0d74cabd6

 @@ -1,14 +1,16 @@
-$NetBSD: patch-configure.ac,v 1.2 2017/10/25 09:32:38 maya Exp $
+$NetBSD: patch-configure.ac,v 1.3 2017/10/30 11:45:14 jperkin Exp $
 Work around NetBSD curses.
 --- configure.ac.orig	2017-06-03 12:45:13.000000000 +0000
 +++ configure.ac
 @@ -251,6 +251,9 @@ AC_CHECK_FILES([/proc/self/stat])
  AC_DEFINE([NCURSES_NOMACROS], [1], [Define to 1 to disable ncurses macros that conflict with the STL])
  AC_DEFINE([NOMACROS], [1], [Define to 1 to disable curses macros that conflict with the STL])
 +# Get variadic tparm on NetBSD curses
 +AC_DEFINE([TPARM_VARARGS], [1], [Define to 1 to get variadic tparm on NetBSD curses])
++
  # Threading is excitingly broken on Solaris without adding -pthread to CXXFLAGS
  # Only support GCC for now
  dnl Ideally we would use the AX_PTHREAD macro here, but it's GPL3-licensed

 @@ -1,13 +1,15 @@
-$NetBSD: patch-src_fallback.h,v 1.2 2017/10/25 09:32:38 maya Exp $
+$NetBSD: patch-src_fallback.h,v 1.3 2017/10/30 11:45:14 jperkin Exp $
 Work around NetBSD curses.
 --- src/fallback.h.orig	2017-06-03 12:45:13.000000000 +0000
 +++ src/fallback.h
 @@ -37,7 +37,7 @@ int fish_mkstemp_cloexec(char *);
  /// Under curses, tputs expects an int (*func)(char) as its last parameter, but in ncurses, tputs
  /// expects a int (*func)(int) as its last parameter. tputs_arg_t is defined to always be what tputs
  /// expects. Hopefully.
 -#ifdef NCURSES_VERSION
 +#if defined(NCURSES_VERSION) || defined(__NetBSD__)
  typedef int tputs_arg_t;
  #else
  typedef char tputs_arg_t;

 @@ -1,22 +1,31 @@
-$NetBSD: patch-src_output.cpp,v 1.1 2017/10/24 03:51:41 maya Exp $
+$NetBSD: patch-src_output.cpp,v 1.2 2017/10/30 11:45:14 jperkin Exp $
 Work around NetBSD curses.
 --- src/output.cpp.orig	2017-06-03 12:45:13.000000000 +0000
 +++ src/output.cpp
-@@ -63,7 +63,7 @@ unsigned char index_for_color(rgb_color_
+@@ -63,10 +63,14 @@ unsigned char index_for_color(rgb_color_
      return c.to_term256_index();
+ }
 -static bool write_color_escape(char *todo, unsigned char idx, bool is_fg) {
 +static bool write_color_escape(const char *todo, unsigned char idx, bool is_fg) {
      if (term_supports_color_natively(idx)) {
          // Use tparm to emit color escape.
 +#ifdef __NetBSD__
          writembs(tparm(todo, idx));
-@@ -550,7 +550,7 @@ rgb_color_t parse_color(const wcstring &
++#else
 +        writembs(tparm((char *)todo, idx));
 +#endif
          return true;
+     }
@@ -550,7 +554,7 @@ rgb_color_t parse_color(const wcstring &
+ }
  /// Write specified multibyte string.
 -void writembs_check(char *mbs, const char *mbs_name, const char *file, long line) {
 +void writembs_check(const char *mbs, const char *mbs_name, const char *file, long line) {
      if (mbs != NULL) {
          tputs(mbs, 1, &writeb);
      } else {

 @@ -1,13 +1,15 @@
-$NetBSD: patch-src_output.h,v 1.1 2017/10/24 03:51:41 maya Exp $
+$NetBSD: patch-src_output.h,v 1.2 2017/10/30 11:45:14 jperkin Exp $
 Work around NetBSD curses.
 --- src/output.h.orig	2017-06-03 12:45:13.000000000 +0000
 +++ src/output.h
 @@ -29,7 +29,7 @@ enum {
  void set_color(rgb_color_t c, rgb_color_t c2);
 -void writembs_check(char *mbs, const char *mbs_name, const char *file, long line);
 +void writembs_check(const char *mbs, const char *mbs_name, const char *file, long line);
  #define writembs(mbs) writembs_check((mbs), #mbs, __FILE__, __LINE__)
  int writech(wint_t ch);

 @@ -1,49 +1,87 @@
-$NetBSD: patch-src_screen.cpp,v 1.1 2017/10/24 03:51:41 maya Exp $
+$NetBSD: patch-src_screen.cpp,v 1.2 2017/10/30 11:45:14 jperkin Exp $
 Work around NetBSD curses.
 --- src/screen.cpp.orig	2017-06-03 12:45:13.000000000 +0000
 +++ src/screen.cpp
 @@ -215,7 +215,7 @@ static bool is_color_escape_seq(const wc
      // Detect these terminfo color escapes with parameter value up to max_colors, all of which
      // don't move the cursor.
 -    char *const esc[] = {
 +    const char *const esc[] = {
          set_a_foreground, set_a_background, set_foreground, set_background,
      };
-@@ -238,7 +238,7 @@ static bool is_color_escape_seq(const wc
+@@ -223,7 +223,11 @@ static bool is_color_escape_seq(const wc
          if (!esc[p]) continue;
          for (int k = 0; k < max_colors; k++) {
 +#ifdef __NetBSD__
              size_t esc_seq_len = try_sequence(tparm(esc[p], k), code);
 +#else
 +            size_t esc_seq_len = try_sequence(tparm((char *)esc[p], k), code);
 +#endif
              if (esc_seq_len) {
                  *resulting_length = esc_seq_len;
                  return true;
@@ -238,7 +242,7 @@ static bool is_color_escape_seq(const wc
  /// displayed other than the color.
  static bool is_visual_escape_seq(const wchar_t *code, size_t *resulting_length) {
      if (!cur_term) return false;
 -    char *const esc2[] = {
 +    const char *const esc2[] = {
          enter_bold_mode,      exit_attribute_mode,    enter_underline_mode,  exit_underline_mode,
          enter_standout_mode,  exit_standout_mode,     flash_screen,          enter_subscript_mode,
          exit_subscript_mode,  enter_superscript_mode, exit_superscript_mode, enter_blink_mode,
-@@ -506,7 +506,7 @@ static void s_move(screen_t *s, data_buf
+@@ -251,7 +255,11 @@ static bool is_visual_escape_seq(const w
          if (!esc2[p]) continue;
          // Test both padded and unpadded version, just to be safe. Most versions of tparm don't
          // actually seem to do anything these days.
 +#ifdef __NetBSD__
          size_t esc_seq_len = maxi(try_sequence(tparm(esc2[p]), code), try_sequence(esc2[p], code));
 +#else
 +        size_t esc_seq_len = maxi(try_sequence(tparm((char *)esc2[p]), code), try_sequence(esc2[p], code));
 +#endif
          if (esc_seq_len) {
              *resulting_length = esc_seq_len;
              return true;
@@ -506,7 +514,7 @@ static void s_move(screen_t *s, data_buf
      int i;
      int x_steps, y_steps;
 -    char *str;
 +    const char *str;
      /*
        debug( 0, L"move from %d %d to %d %d",
        s->screen_cursor[0], s->screen_cursor[1],
-@@ -540,7 +540,7 @@ static void s_move(screen_t *s, data_buf
+@@ -540,7 +548,7 @@ static void s_move(screen_t *s, data_buf
          x_steps = 0;
+     }
 -    char *multi_str = NULL;
 +    const char *multi_str = NULL;
      if (x_steps < 0) {
          str = cursor_left;
          multi_str = parm_left_cursor;
-@@ -594,7 +594,7 @@ static void s_write_char(screen_t *s, da
+@@ -554,7 +562,11 @@ static void s_move(screen_t *s, data_buf
      bool use_multi =
          multi_str != NULL && multi_str[0] != '\0' && abs(x_steps) * strlen(str) > strlen(multi_str);
      if (use_multi && cur_term) {
 +#ifdef __NetBSD__
          char *multi_param = tparm(multi_str, abs(x_steps));
 +#else
 +        char *multi_param = tparm((char *)multi_str, abs(x_steps));
 +#endif
          writembs(multi_param);
      } else {
          for (i = 0; i < abs(x_steps); i++) {
@@ -594,7 +606,7 @@ static void s_write_char(screen_t *s, da
+ }
  /// Send the specified string through tputs and append the output to the specified buffer.
 -static void s_write_mbs(data_buffer_t *b, char *s) {
 +static void s_write_mbs(data_buffer_t *b, const char *s) {
      scoped_buffer_t scoped_buffer(b);
      writembs(s);
+ }