fish: use variadic tparm on netbsd curses.

don't mess with the declaration of tparm_solaris_kludge unnecessarily.

uwe thinks the non-variadic tparm is wrong (so might be broken for
solaris curses), but I'm not sure how to correct it.

PR pkg/52649

bump PKGREVISION

4 files changed, 27 insertions, 21 deletions

diff --git a/shells/fish/Makefile b/shells/fish/Makefile
index dc0de7de0fd..d350d93afc7 100644
--- a/shells/fish/Makefile
+++ b/shells/fish/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2017/10/24 03:51:41 maya Exp $
+# $NetBSD: Makefile,v 1.13 2017/10/25 09:32:38 maya Exp $
 
 DISTNAME=		fish-2.6.0
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		shells
 MASTER_SITES=		http://fishshell.com/files/${PKGVERSION_NOREV}/
 
@@ -14,7 +14,6 @@ EXTRACT_USING=		gtar
 
 USE_LANGUAGES+=		c c++
 GNU_CONFIGURE=		yes
-USE_NCURSES=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--without-xsel
 USE_TOOLS+=		gmake autoreconf autoconf automake
@@ -50,6 +49,5 @@ pre-configure:
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/gettext-tools/buildlink3.mk"
 .include "../../lang/python/application.mk"
-# Broken auto completion with netbsd curses
-.include "../../devel/ncurses/buildlink3.mk"
+.include "../../mk/curses.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/shells/fish/distinfo b/shells/fish/distinfo
index cf31c306e09..0c852806e9e 100644
--- a/shells/fish/distinfo
+++ b/shells/fish/distinfo
@@ -1,14 +1,13 @@
-$NetBSD: distinfo,v 1.9 2017/10/24 03:51:41 maya Exp $
+$NetBSD: distinfo,v 1.10 2017/10/25 09:32:38 maya 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) = 862b6cef9e269531924965ce928031e063aa90ba
+SHA1 (patch-configure.ac) = ba20a0182920e2dfb0851038e00875331ba94196
 SHA1 (patch-src_builtin.cpp) = b48a52d45ba545a92043e58dc554305670c7fcfc
-SHA1 (patch-src_fallback.cpp) = 4a35401ed0d3c3a912e448d56c9375801c919fbc
-SHA1 (patch-src_fallback.h) = 87537e6f5be2fa1b8a196d67eb21e6b48380cabb
+SHA1 (patch-src_fallback.h) = 9ca7e829c663d744165fc06ff50ec101ae20091d
 SHA1 (patch-src_output.cpp) = 36a2cc0576aca6585090a1b5b32aa39c90ed3996
 SHA1 (patch-src_output.h) = 8e72aefbd940450fb69f4b970ce1d151f17eb48a
 SHA1 (patch-src_screen.cpp) = f2d5e10dff9d09e985a8e27a8f2066dcfb58db05
diff --git a/shells/fish/patches/patch-configure.ac b/shells/fish/patches/patch-configure.ac
index 981ac532376..fe2c704eb84 100644
--- a/shells/fish/patches/patch-configure.ac
+++ b/shells/fish/patches/patch-configure.ac
@@ -1,8 +1,18 @@
-$NetBSD: patch-configure.ac,v 1.1 2017/10/24 03:51:41 maya Exp $
+$NetBSD: patch-configure.ac,v 1.2 2017/10/25 09:32:38 maya Exp $
 
 --- configure.ac.orig	2017-06-03 12:45:13.000000000 +0000
 +++ configure.ac
-@@ -323,7 +323,24 @@ AC_CHECK_FUNCS( wcslcpy lrand48_r killpg
+@@ -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
+@@ -323,7 +326,24 @@ AC_CHECK_FUNCS( wcslcpy lrand48_r killpg
  AC_CHECK_FUNCS( backtrace_symbols getifaddrs )
  AC_CHECK_FUNCS( futimens clock_gettime )
  AC_CHECK_FUNCS( getpwent flock )
@@ -28,3 +38,11 @@ $NetBSD: patch-configure.ac,v 1.1 2017/10/24 03:51:41 maya Exp $
  
  AC_CHECK_DECL( [mkostemp], [ AC_CHECK_FUNCS([mkostemp]) ] )
  
+@@ -553,6 +573,7 @@ AC_COMPILE_IFELSE(
+ 	#else
+ 	#include <curses.h>
+ 	#endif
++	#define TPARM_VARARGS
+ 
+ 	#if HAVE_TERM_H
+ 	#include <term.h>
diff --git a/shells/fish/patches/patch-src_fallback.h b/shells/fish/patches/patch-src_fallback.h
index a3ea39a384f..9f742227445 100644
--- a/shells/fish/patches/patch-src_fallback.h
+++ b/shells/fish/patches/patch-src_fallback.h
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_fallback.h,v 1.1 2017/10/24 03:51:41 maya Exp $
+$NetBSD: patch-src_fallback.h,v 1.2 2017/10/25 09:32:38 maya Exp $
 
 --- src/fallback.h.orig	2017-06-03 12:45:13.000000000 +0000
 +++ src/fallback.h
@@ -11,12 +11,3 @@ $NetBSD: patch-src_fallback.h,v 1.1 2017/10/24 03:51:41 maya Exp $
  typedef int tputs_arg_t;
  #else
  typedef char tputs_arg_t;
-@@ -57,7 +57,7 @@ struct winsize {
- #ifdef TPARM_SOLARIS_KLUDGE
- /// Solaris tparm has a set fixed of paramters in it's curses implementation, work around this here.
- #define tparm tparm_solaris_kludge
--char *tparm_solaris_kludge(char *str, ...);
-+char *tparm_solaris_kludge(const char *str, ...);
- #endif
- 
- /// On OS X, use weak linking for wcsdup and wcscasecmp. Weak linking allows you to call the