3 files changed, 22 insertions, 16 deletions
diff --git a/math/libmatheval/patches/patch-aa b/math/libmatheval/patches/patch-aa
index 16c1b85bb00..746d32608b6 100644
--- a/math/libmatheval/patches/patch-aa
+++ b/math/libmatheval/patches/patch-aa
@@ -1,6 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2014/04/28 12:43:34 joerg Exp $
+$NetBSD: patch-aa,v 1.4 2016/09/15 16:39:17 wiz Exp $
 
---- lib/scanner.l.orig	2011-07-03 09:37:11.000000000 +0000
+Fixes linking (missing yywrap symbol).
+
+--- lib/scanner.l.orig	2013-08-14 20:22:08.000000000 +0000
 +++ lib/scanner.l
 @@ -18,7 +18,7 @@
   * along with GNU libmatheval.  If not, see
@@ -10,4 +12,4 @@ $NetBSD: patch-aa,v 1.3 2014/04/28 12:43:34 joerg Exp $
 +%option noyywrap
  %{
  /*
-  * Copyright (C) 1999, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2011
+  * Copyright (C) 1999, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2011,
diff --git a/math/libmatheval/patches/patch-lib_Makefile.in b/math/libmatheval/patches/patch-lib_Makefile.in
deleted file mode 100644
index 9f2a5e79943..00000000000
--- a/math/libmatheval/patches/patch-lib_Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-lib_Makefile.in,v 1.1 2014/04/28 12:43:34 joerg Exp $
-
---- lib/Makefile.in.orig	2014-04-28 10:52:55.000000000 +0000
-+++ lib/Makefile.in
-@@ -258,7 +258,7 @@ libmatheval_la_SOURCES = parser.y scanne
- g77_interface.c node.c symbol_table.c xmalloc.c xmath.c
- 
- libmatheval_la_LDFLAGS = -version-info 1:0:0
--libmatheval_la_LIBADD = -lfl -lm
-+libmatheval_la_LIBADD = -lm
- include_HEADERS = matheval.h
- noinst_HEADERS = common.h error.h node.h symbol_table.h xmalloc.h	\
- xmath.h
diff --git a/math/libmatheval/patches/patch-tests_matheval.c b/math/libmatheval/patches/patch-tests_matheval.c
new file mode 100644
index 00000000000..dcc48b47ef4
--- /dev/null
+++ b/math/libmatheval/patches/patch-tests_matheval.c
@@ -0,0 +1,17 @@
+$NetBSD: patch-tests_matheval.c,v 1.1 2016/09/15 16:39:17 wiz Exp $
+
+Define is not defined even if scm_t_bits exists.
+
+--- tests/matheval.c.orig	2013-08-14 20:22:08.000000000 +0000
++++ tests/matheval.c
+@@ -26,10 +26,6 @@
+ #include <matheval.h>
+ #include "config.h"
+ 
+-#ifndef HAVE_SCM_T_BITS
+-typedef long    scm_t_bits;
+-#endif
+-
+ #ifndef HAVE_SCM_NUM2DBL
+ #ifdef SCM_NUM2DBL
+ #define scm_num2dbl(x,s) SCM_NUM2DBL(x)