Avoid conflict with std::is_function. Add some missing const and

a missing include.

4 files changed, 60 insertions, 1 deletions

diff --git a/math/fityk/distinfo b/math/fityk/distinfo
index 3bf57b4ea37..39e6a50534a 100644
--- a/math/fityk/distinfo
+++ b/math/fityk/distinfo
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.3 2011/03/11 13:00:12 drochner Exp $
+$NetBSD: distinfo,v 1.4 2013/04/30 22:25:39 joerg Exp $
 
 SHA1 (fityk-0.9.7.tar.bz2) = bb4d11b529c6c87c68c6f7359075915caf95a996
 RMD160 (fityk-0.9.7.tar.bz2) = bd403037157b32ec7c7c6972f17116e403d099bc
 Size (fityk-0.9.7.tar.bz2) = 1146628 bytes
 SHA1 (patch-aa) = c923919db013ca9ddb8370617bf0b4b0aaa31922
+SHA1 (patch-src_GAfit.cpp) = 6543899d3861853d0738bbb5ced2cc9f59fda6db
+SHA1 (patch-src_eparser.cpp) = 6120b71f1bcafc1efc5b774426955084739a42c0
+SHA1 (patch-src_wxgui_ceria.cpp) = d3d07180b20b563c67d1bb7316d38ef64ff91a8a
diff --git a/math/fityk/patches/patch-src_GAfit.cpp b/math/fityk/patches/patch-src_GAfit.cpp
new file mode 100644
index 00000000000..6ae506c1203
--- /dev/null
+++ b/math/fityk/patches/patch-src_GAfit.cpp
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_GAfit.cpp,v 1.1 2013/04/30 22:25:39 joerg Exp $
+
+--- src/GAfit.cpp.orig	2013-04-30 20:13:09.000000000 +0000
++++ src/GAfit.cpp
+@@ -347,7 +347,7 @@ void GAfit::stochastic_remainder_samplin
+ struct Remainder_and_ptr {
+     int ind;
+     fp r;
+-    bool operator< (const Remainder_and_ptr &b) {
++    bool operator< (const Remainder_and_ptr &b) const {
+         return r < b.r;
+     }
+ };
diff --git a/math/fityk/patches/patch-src_eparser.cpp b/math/fityk/patches/patch-src_eparser.cpp
new file mode 100644
index 00000000000..463ba260765
--- /dev/null
+++ b/math/fityk/patches/patch-src_eparser.cpp
@@ -0,0 +1,31 @@
+$NetBSD: patch-src_eparser.cpp,v 1.1 2013/04/30 22:25:40 joerg Exp $
+
+--- src/eparser.cpp.orig	2013-04-30 20:10:11.000000000 +0000
++++ src/eparser.cpp
+@@ -139,7 +139,7 @@ int get_function_narg(int op)
+     }
+ }
+ 
+-bool is_function(int op)
++bool my_is_function(int op)
+ {
+     return (bool) get_function_narg(op);
+ }
+@@ -812,7 +812,7 @@ void ExpressionParser::parse_expr(Lexer&
+                 // check if this is closing bracket of func()
+                 if (!opstack_.empty()) {
+                     int top = opstack_.back();
+-                    if (is_function(top)) {
++                    if (my_is_function(top)) {
+                         pop_onto_que();
+                         int n = arg_cnt_.back() + 1;
+                         int expected_n = get_function_narg(top);
+@@ -846,7 +846,7 @@ void ExpressionParser::parse_expr(Lexer&
+                     lex.throw_syntax_error("unexpected ',' after '?'");
+                 // if we are here, opstack_.back() == OP_OPEN_ROUND
+                 else if (opstack_.size() < 2 ||
+-                         !is_function(*(opstack_.end() - 2)))
++                         !my_is_function(*(opstack_.end() - 2)))
+                     lex.throw_syntax_error("',' outside of function");
+                 else
+                     // don't pop OP_OPEN_ROUND from the stack
diff --git a/math/fityk/patches/patch-src_wxgui_ceria.cpp b/math/fityk/patches/patch-src_wxgui_ceria.cpp
new file mode 100644
index 00000000000..734dcd5d46b
--- /dev/null
+++ b/math/fityk/patches/patch-src_wxgui_ceria.cpp
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_wxgui_ceria.cpp,v 1.1 2013/04/30 22:25:40 joerg Exp $
+
+--- src/wxgui/ceria.cpp.orig	2013-04-30 20:14:19.000000000 +0000
++++ src/wxgui/ceria.cpp
+@@ -7,6 +7,7 @@
+ #define _USE_MATH_DEFINES
+ #endif
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <ctype.h>
+ #include <math.h>
+ #include <assert.h>