summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortnn <tnn@pkgsrc.org>2010-01-15 23:09:28 +0000
committertnn <tnn@pkgsrc.org>2010-01-15 23:09:28 +0000
commit075cc41643a8b2654aea79282abb2a5e39f7c6bd (patch)
tree4083cdbd1203ae9d9bf19f0e0fb651c97c01b3e3
parent43686a29c749d22b6f606f5010c42400ffa66035 (diff)
downloadpkgsrc-075cc41643a8b2654aea79282abb2a5e39f7c6bd.tar.gz
fix build issue with Sun Studio. It doesn't like void values as operators
to ternary expressions, even when the result is discarded. While here, update to nickle-2.69. Only difference seems to be that configry is generated with newer autotools.
-rw-r--r--math/nickle/Makefile4
-rw-r--r--math/nickle/distinfo9
-rw-r--r--math/nickle/patches/patch-aa13
3 files changed, 20 insertions, 6 deletions
diff --git a/math/nickle/Makefile b/math/nickle/Makefile
index e4de89fa052..79d6ba3f2f8 100644
--- a/math/nickle/Makefile
+++ b/math/nickle/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2009/06/07 14:05:04 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2010/01/15 23:09:28 tnn Exp $
#
-DISTNAME= nickle-2.68
+DISTNAME= nickle-2.69
CATEGORIES= math lang
MASTER_SITES= http://nickle.org/release/
diff --git a/math/nickle/distinfo b/math/nickle/distinfo
index 5651225652f..8922a1cae00 100644
--- a/math/nickle/distinfo
+++ b/math/nickle/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.5 2009/06/07 14:05:04 wiz Exp $
+$NetBSD: distinfo,v 1.6 2010/01/15 23:09:28 tnn Exp $
-SHA1 (nickle-2.68.tar.gz) = 226afe1503557a746672fccfa464cfaafd3bb058
-RMD160 (nickle-2.68.tar.gz) = 9d9d6b5fb79b65a8a0cd922e4322d7d91c58065b
-Size (nickle-2.68.tar.gz) = 469027 bytes
+SHA1 (nickle-2.69.tar.gz) = 4d81ac4e88b8f4385f7d73c370ad2cbae11e50ed
+RMD160 (nickle-2.69.tar.gz) = a102e294e183fa008fa1104bcd1891e738faaf25
+Size (nickle-2.69.tar.gz) = 484301 bytes
+SHA1 (patch-aa) = 0b1e03f3e42ea088c5a81109e9534c77efe30659
diff --git a/math/nickle/patches/patch-aa b/math/nickle/patches/patch-aa
new file mode 100644
index 00000000000..e86449ed566
--- /dev/null
+++ b/math/nickle/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.4 2010/01/15 23:09:28 tnn Exp $
+
+--- execute.c.orig 2008-03-20 00:21:49.000000000 +0000
++++ execute.c
+@@ -730,7 +730,7 @@ ThreadUnwind (Value thread, int twixt, i
+ #endif
+ }
+
+-#define ThreadBoxCheck(box,i) (BoxValueGet(box,i) == 0 ? ThreadBoxSetDefault(box,i,0) : 0)
++#define ThreadBoxCheck(box,i) (BoxValueGet(box,i) == 0 ? (ThreadBoxSetDefault(box,i,0) ,1) : 0)
+
+ typedef struct _TypeChain {
+ struct _TypeChain *prev;