summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2016-09-15 16:39:17 +0000
committerwiz <wiz@pkgsrc.org>2016-09-15 16:39:17 +0000
commit3748d6dbae95d11b24d078edfbe0bd631e6c2961 (patch)
treebd1348c1f1c98e191bdbefb1fa6336234c4dd6a8
parent63e99faf771aa5140b398b5318613fabcac18eae (diff)
downloadpkgsrc-3748d6dbae95d11b24d078edfbe0bd631e6c2961.tar.gz
Updated libmatheval to 1.1.11.
Set LICENSE. Still does not build with guile20, so leave it at 1.8. Version 1.1.11 * Fixed issue with linking Lex library. Version 1.1.10 * Fixed memory leak in evaluator_create function implementation. Version 1.1.9 * Fixed bug in math_step function implementation. * Updated manual.
-rw-r--r--math/libmatheval/Makefile7
-rw-r--r--math/libmatheval/distinfo14
-rw-r--r--math/libmatheval/patches/patch-aa8
-rw-r--r--math/libmatheval/patches/patch-lib_Makefile.in13
-rw-r--r--math/libmatheval/patches/patch-tests_matheval.c17
5 files changed, 32 insertions, 27 deletions
diff --git a/math/libmatheval/Makefile b/math/libmatheval/Makefile
index e548743b2ab..ea2befa6b0a 100644
--- a/math/libmatheval/Makefile
+++ b/math/libmatheval/Makefile
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.20 2016/09/15 14:32:41 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.21 2016/09/15 16:39:17 wiz Exp $
-DISTNAME= libmatheval-1.1.8
-PKGREVISION= 3
+DISTNAME= libmatheval-1.1.11
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_GNU:=libmatheval/}
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://www.gnu.org/software/libmatheval/
COMMENT= Library for evaluating mathematical expressions
+LICENSE= gnu-gpl-v3
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
diff --git a/math/libmatheval/distinfo b/math/libmatheval/distinfo
index 9fd4ef0e539..df8c5831f8f 100644
--- a/math/libmatheval/distinfo
+++ b/math/libmatheval/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.7 2015/11/03 23:33:36 agc Exp $
+$NetBSD: distinfo,v 1.8 2016/09/15 16:39:17 wiz Exp $
-SHA1 (libmatheval-1.1.8.tar.gz) = 86fb13d66878c42afce091f1e6b06c158c593486
-RMD160 (libmatheval-1.1.8.tar.gz) = f8b1212984f5b4e50aea0573b0ff9eeaa7537054
-SHA512 (libmatheval-1.1.8.tar.gz) = 85123f761306a428d540c94a98189dd6791de49ef01b280420f5e8bc4dbd7e263329bda35710a82441f57e5ded629ee004b15449e8a2e578370a084680f0f155
-Size (libmatheval-1.1.8.tar.gz) = 538012 bytes
-SHA1 (patch-aa) = a3b4073ca7339c94f7eddc02d6f368ff5f3408db
-SHA1 (patch-lib_Makefile.in) = 071c2968ddcef2c29d9f895a63710853e8cf1c7d
+SHA1 (libmatheval-1.1.11.tar.gz) = d4720860403c36ebe955b1b5c31c6c3ca20b2a25
+RMD160 (libmatheval-1.1.11.tar.gz) = e48bbe2fdae4237e4e455ea84b10a53874124312
+SHA512 (libmatheval-1.1.11.tar.gz) = 854c35dce7c9a956ea1d7406ed6799375f039dc7305fea20af92d5b1c97b242d23716d0e83d2ff2daa89e3ca06669934a86684faf714a8458a569c5cde09953c
+Size (libmatheval-1.1.11.tar.gz) = 551770 bytes
+SHA1 (patch-aa) = f6e97ab357245e89e5f4173e5a08dc7716c32d35
+SHA1 (patch-tests_matheval.c) = 65bcb8117e65ad44b63ad59ca3349f06b894d697
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)