update to 0.9.6

changes:
-Use Lambert W to solve more equations and avoid infinite loop when solving
 some equations
-More data on elements
-Fix simplification of (1-1/x)^3 and similar
-Fix clumsy mistakes in with prefixes leading to crashes
-Fix parsing of unit expressions (when converting) such as W/(m K)
-Add more exact values for sin() and cos() and avoid floating point underflow
 by, in approximate mode, checking against the value of pi
-Always input decimal separator sign on keypad separator press
-Fix crash when expression entry reclaims focus if compiled with optimizations
 (GTK+)
-New units: typographic units, pouce, pied du roi, grams of TNT and tons of TNT
-New functions: lambertW(), addDays(), addMonths(), addYear(), addTime(),
 isNumber(), isReal(), isRational(), isInteger(), representsNumber(),
 representsReal(), representsRational(), representsInteger()
-New variable: omega constant
-Other minor fixes and enhancements

also fix wrong inclusion of scrollkeeper/bl3

4 files changed, 14 insertions, 15 deletions

diff --git a/math/qalculate-gtk/Makefile b/math/qalculate-gtk/Makefile
index c6c01743134..9b847bc60a0 100644
--- a/math/qalculate-gtk/Makefile
+++ b/math/qalculate-gtk/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.21 2007/09/21 13:03:59 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2007/11/05 20:44:03 drochner Exp $
 
-DISTNAME=	qalculate-gtk-0.9.5
-PKGREVISION=	4
+DISTNAME=	qalculate-gtk-0.9.6
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=qalculate/}
 
@@ -23,5 +22,5 @@ pre-configure:
 .include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../math/qalculate/buildlink3.mk"
-.include "../../textproc/scrollkeeper/buildlink3.mk"
+.include "../../textproc/scrollkeeper/omf.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/qalculate-gtk/distinfo b/math/qalculate-gtk/distinfo
index da4f8b49039..090f4720832 100644
--- a/math/qalculate-gtk/distinfo
+++ b/math/qalculate-gtk/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.8 2007/02/20 15:08:47 adam Exp $
+$NetBSD: distinfo,v 1.9 2007/11/05 20:44:04 drochner Exp $
 
-SHA1 (qalculate-gtk-0.9.5.tar.gz) = 9b6802a68f609749185ada9fd011fda565a48546
-RMD160 (qalculate-gtk-0.9.5.tar.gz) = 518e72c8b2dfe60ad68695d7ab453815573269a5
-Size (qalculate-gtk-0.9.5.tar.gz) = 1549393 bytes
+SHA1 (qalculate-gtk-0.9.6.tar.gz) = 1f69097457f6e28b67d1d767670dc519548876b5
+RMD160 (qalculate-gtk-0.9.6.tar.gz) = 91db6e31407df65f164fcd4adfe97278ff60a303
+Size (qalculate-gtk-0.9.6.tar.gz) = 1544175 bytes
 SHA1 (patch-aa) = bccd5b7385652eaa1d7a85eb5396934c14c73b8a
 SHA1 (patch-ac) = ff3e3395654b1936dbf6878562e3173c80b5edad
diff --git a/math/qalculate/Makefile b/math/qalculate/Makefile
index 9969622504f..f8635f3fa51 100644
--- a/math/qalculate/Makefile
+++ b/math/qalculate/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2007/02/22 16:15:14 joerg Exp $
+# $NetBSD: Makefile,v 1.28 2007/11/05 20:44:03 drochner Exp $
 
-DISTNAME=	libqalculate-0.9.5
-PKGNAME=	qalculate-0.9.5
+DISTNAME=	libqalculate-0.9.6
+PKGNAME=	qalculate-0.9.6
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=qalculate/}
 
diff --git a/math/qalculate/distinfo b/math/qalculate/distinfo
index dda6c0ba005..260eba48e12 100644
--- a/math/qalculate/distinfo
+++ b/math/qalculate/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.16 2007/08/01 16:16:11 joerg Exp $
+$NetBSD: distinfo,v 1.17 2007/11/05 20:44:03 drochner Exp $
 
-SHA1 (libqalculate-0.9.5.tar.gz) = df44162bfb41907851817306b6599d27d74de0ce
-RMD160 (libqalculate-0.9.5.tar.gz) = 7839c56e275979157f6bace072d1fc9f500c8953
-Size (libqalculate-0.9.5.tar.gz) = 1118827 bytes
+SHA1 (libqalculate-0.9.6.tar.gz) = 0bcd42e13c23db9489ce594767d5017bdcb338ad
+RMD160 (libqalculate-0.9.6.tar.gz) = 30f819530236da6b6b78088754643408c8aeb70d
+Size (libqalculate-0.9.6.tar.gz) = 1111134 bytes
 SHA1 (patch-aa) = fda2983150bbbdecc1578e747d8a6aa7ef965f3f
 SHA1 (patch-ab) = b1a4b0ffe5dc19ff2b1c640960c3f3a524fd524b
 SHA1 (patch-ac) = 98e817d60fc4cd521e7d227ecd330364ec072ecd