summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoerg <joerg>2014-04-28 12:43:34 +0000
committerjoerg <joerg>2014-04-28 12:43:34 +0000
commit6ed237764ea4af8ab65db480f532c279dfde0a4c (patch)
tree2ac0a29680c0b455240397af0660a5a679de9b00
parent700ea62d43e5a215f8ef88bd244bbf74d20f2ba9 (diff)
downloadpkgsrc-6ed237764ea4af8ab65db480f532c279dfde0a4c.tar.gz
Don't use libfl. Bump revision.
-rw-r--r--math/libmatheval/Makefile5
-rw-r--r--math/libmatheval/distinfo5
-rw-r--r--math/libmatheval/patches/patch-aa22
-rw-r--r--math/libmatheval/patches/patch-lib_Makefile.in13
4 files changed, 31 insertions, 14 deletions
diff --git a/math/libmatheval/Makefile b/math/libmatheval/Makefile
index 51ef701613b..9bbf991223b 100644
--- a/math/libmatheval/Makefile
+++ b/math/libmatheval/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2012/09/13 17:14:36 drochner Exp $
+# $NetBSD: Makefile,v 1.17 2014/04/28 12:43:34 joerg Exp $
#
DISTNAME= libmatheval-1.1.8
+PKGREVISION= 1
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_GNU:=libmatheval/}
@@ -17,6 +18,8 @@ INFO_FILES= yes
PKGCONFIG_OVERRIDE= libmatheval.pc.in
TEST_TARGET= check
+CONFIGURE_ARGS+= ac_cv_lib_lex="none needed"
+
.include "../../devel/flex/buildlink3.mk"
.include "../../lang/guile/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
diff --git a/math/libmatheval/distinfo b/math/libmatheval/distinfo
index 068a9cee644..685dfb2fd19 100644
--- a/math/libmatheval/distinfo
+++ b/math/libmatheval/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.5 2012/09/13 15:44:04 asau Exp $
+$NetBSD: distinfo,v 1.6 2014/04/28 12:43:34 joerg Exp $
SHA1 (libmatheval-1.1.8.tar.gz) = 86fb13d66878c42afce091f1e6b06c158c593486
RMD160 (libmatheval-1.1.8.tar.gz) = f8b1212984f5b4e50aea0573b0ff9eeaa7537054
Size (libmatheval-1.1.8.tar.gz) = 538012 bytes
-SHA1 (patch-aa) = c6289e600a480fbf10f37debb7db5e55c821f41d
+SHA1 (patch-aa) = a3b4073ca7339c94f7eddc02d6f368ff5f3408db
+SHA1 (patch-lib_Makefile.in) = 071c2968ddcef2c29d9f895a63710853e8cf1c7d
diff --git a/math/libmatheval/patches/patch-aa b/math/libmatheval/patches/patch-aa
index 37ba4fa5a1d..16c1b85bb00 100644
--- a/math/libmatheval/patches/patch-aa
+++ b/math/libmatheval/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.2 2006/07/10 11:16:24 drochner Exp $
+$NetBSD: patch-aa,v 1.3 2014/04/28 12:43:34 joerg Exp $
---- lib/scanner.l.orig 2006-05-05 07:22:48.000000000 +0200
+--- lib/scanner.l.orig 2011-07-03 09:37:11.000000000 +0000
+++ lib/scanner.l
-@@ -163,3 +163,8 @@ void input_reset()
- /* Forget contents of input buffer. */
- YY_FLUSH_BUFFER;
- }
-+
-+int yywrap()
-+{
-+ return (1);
-+}
+@@ -18,7 +18,7 @@
+ * along with GNU libmatheval. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+-
++%option noyywrap
+ %{
+ /*
+ * 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
new file mode 100644
index 00000000000..9f2a5e79943
--- /dev/null
+++ b/math/libmatheval/patches/patch-lib_Makefile.in
@@ -0,0 +1,13 @@
+$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