update to 0.9.7

changes:
-General build updates and bug fixes
-Bug fix for segfaults with some uses of integrate()
-New Simplified Chinese translation
-Fix crash with unsupported operator in RPN syntax
-Fix reduction of vector size

6 files changed, 20 insertions, 111 deletions

diff --git a/math/qalculate/Makefile b/math/qalculate/Makefile
index 5aae4b10c9f..4a861852084 100644
--- a/math/qalculate/Makefile
+++ b/math/qalculate/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.34 2009/09/08 19:29:35 asau Exp $
+# $NetBSD: Makefile,v 1.35 2010/04/13 17:25:22 drochner Exp $
 
-DISTNAME=	libqalculate-0.9.6
-PKGNAME=	qalculate-0.9.6
-PKGREVISION=	3
+DISTNAME=	libqalculate-0.9.7
+PKGNAME=	qalculate-0.9.7
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=qalculate/}
 
diff --git a/math/qalculate/PLIST b/math/qalculate/PLIST
index 131e1030bf2..4cf4d7d36a9 100644
--- a/math/qalculate/PLIST
+++ b/math/qalculate/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2009/06/14 18:05:48 joerg Exp $
+@comment $NetBSD: PLIST,v 1.15 2010/04/13 17:25:22 drochner Exp $
 bin/qalc
 include/libqalculate/BuiltinFunctions.h
 include/libqalculate/Calculator.h
@@ -184,7 +184,6 @@ share/doc/lib${PKGNAME}/reference/html/functions_vars.html
 share/doc/lib${PKGNAME}/reference/html/globals.html
 share/doc/lib${PKGNAME}/reference/html/globals_enum.html
 share/doc/lib${PKGNAME}/reference/html/globals_eval.html
-share/doc/lib${PKGNAME}/reference/html/globals_vars.html
 share/doc/lib${PKGNAME}/reference/html/hierarchy.html
 share/doc/lib${PKGNAME}/reference/html/includes_8h.html
 share/doc/lib${PKGNAME}/reference/html/index.html
@@ -202,10 +201,12 @@ share/doc/lib${PKGNAME}/reference/html/structPrintOptions-members.html
 share/doc/lib${PKGNAME}/reference/html/structPrintOptions.html
 share/doc/lib${PKGNAME}/reference/html/structSortOptions-members.html
 share/doc/lib${PKGNAME}/reference/html/structSortOptions.html
+share/doc/lib${PKGNAME}/reference/html/tabs.css
 share/doc/lib${PKGNAME}/reference/html/util_8h.html
 share/locale/fr/LC_MESSAGES/libqalculate.mo
 share/locale/nl/LC_MESSAGES/libqalculate.mo
 share/locale/sv/LC_MESSAGES/libqalculate.mo
+share/locale/zh_CN/LC_MESSAGES/libqalculate.mo
 share/qalculate/currencies.xml
 share/qalculate/datasets.xml
 share/qalculate/elements.xml
diff --git a/math/qalculate/distinfo b/math/qalculate/distinfo
index 6f9118f58e0..000c3883f30 100644
--- a/math/qalculate/distinfo
+++ b/math/qalculate/distinfo
@@ -1,12 +1,10 @@
-$NetBSD: distinfo,v 1.19 2009/09/06 12:17:17 asau Exp $
+$NetBSD: distinfo,v 1.20 2010/04/13 17:25:22 drochner Exp $
 
-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 (libqalculate-0.9.7.tar.gz) = c15f7f3a97995decf62cc964956fc1e374ecd78c
+RMD160 (libqalculate-0.9.7.tar.gz) = cc9e198769bea9731f92d2f3836875c83f715674
+Size (libqalculate-0.9.7.tar.gz) = 1256271 bytes
 SHA1 (patch-ab) = b1a4b0ffe5dc19ff2b1c640960c3f3a524fd524b
 SHA1 (patch-ac) = 98e817d60fc4cd521e7d227ecd330364ec072ecd
-SHA1 (patch-ad) = 8ad2fb4926aabc6f7f2e5c96cd6869fd8366eb51
+SHA1 (patch-ad) = 8327989bed8dee02c3881f42b981197238609f82
 SHA1 (patch-ae) = 7c9685c578a848cb4e9c55756110d891b9254f2b
 SHA1 (patch-af) = 3bab134f0ca10ecf91252e8211982be767e594e5
-SHA1 (patch-ag) = 20d50594c6f21a6b5291043ddf765a2cef56df54
diff --git a/math/qalculate/patches/patch-aa b/math/qalculate/patches/patch-aa
deleted file mode 100644
index 80c16a332ff..00000000000
--- a/math/qalculate/patches/patch-aa
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2006/06/14 20:14:21 adam Exp $
-
---- libqalculate/Calculator.cc.orig	2006-06-02 16:37:20.000000000 +0200
-+++ libqalculate/Calculator.cc
-@@ -33,7 +33,11 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <dirent.h>
-+#if defined(__NetBSD__) || defined(__DragonFly__)
-+#include <sys/wait.h>
-+#else
- #include <wait.h>
-+#endif
- #include <queue>
- #include <glib.h>
- //#include <dlfcn.h>
diff --git a/math/qalculate/patches/patch-ad b/math/qalculate/patches/patch-ad
index fa62f4cfc03..d881999bb20 100644
--- a/math/qalculate/patches/patch-ad
+++ b/math/qalculate/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.3 2009/09/06 12:17:17 asau Exp $
+$NetBSD: patch-ad,v 1.4 2010/04/13 17:25:22 drochner Exp $
 
---- configure.in.orig	2007-05-18 12:08:26.000000000 +0400
-+++ configure.in	2009-09-06 16:03:10.000000000 +0400
-@@ -34,6 +34,7 @@
+--- configure.in.orig	2010-01-05 15:15:27.000000000 +0000
++++ configure.in
+@@ -34,6 +34,7 @@ AC_PROG_LN_S
  AC_HEADER_STDC
  AC_PROG_INTLTOOL
  AM_PROG_LIBTOOL
@@ -10,63 +10,12 @@ $NetBSD: patch-ad,v 1.3 2009/09/06 12:17:17 asau Exp $
  
  dnl  ------------------------------------
  dnl | check for compiler characteristics |-------------------------------------
-@@ -84,28 +85,6 @@
- 
- 
+@@ -87,8 +88,6 @@ dnl  --------------------------------
+ dnl | check for neccessary libraries |-----------------------------------------
  dnl  --------------------------------
--dnl | check for neccessary libraries |-----------------------------------------
--dnl  --------------------------------
--
+ 
 -AC_CHECK_LIB(pthread, pthread_create, [LIBS="$LIBS -lpthread"])
 -
--AC_LANG([C++])
--
--AC_PATH_CLN(1.1.0, [
--     	LIBS="$LIBS $CLN_LIBS"
--     	CPPFLAGS="$CPPFLAGS $CLN_CPPFLAGS"
--  	AC_DEFINE(HAVE_LIBCLN,1,[If CLN can be used])
--], AC_MSG_ERROR([No suitable installed version of CLN could be found.]))
--
--
--PKG_CHECK_MODULES(GLIB, [
--	glib-2.0
--	libxml-2.0 >= 2.3.8
--	])
--AC_SUBST(GLIB_CFLAGS)
--AC_SUBST(GLIB_LIBS)
--
--dnl  --------------------------------
- dnl | check for readline            |-----------------------------------------
- dnl  --------------------------------
- 
-@@ -230,6 +209,30 @@
- INTLTOOL_QALCULATE_DEFINITIONS_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po-defs/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po-defs/.intltool-merge-cache $(top_srcdir)/po-defs $< [$]@' 
- AC_SUBST(INTLTOOL_QALCULATE_DEFINITIONS_RULE)	 
+ AC_LANG([C++])
  
-+dnl  --------------------------------
-+dnl | check for neccessary libraries |-----------------------------------------
-+dnl  --------------------------------
-+
-+AC_LANG([C++])
-+
-+if pkg-config --atleast-version=1.1.0 cln; then
-+   CLN_CPPFLAGS="`pkg-config --cflags cln`"
-+   CLN_LIBS="`pkg-config --libs cln`"
-+   	LIBS="$LIBS `pkg-config --libs cln`"
-+     	CPPFLAGS="$CPPFLAGS `pkg-config --cflags cln`"
-+  	AC_DEFINE(HAVE_LIBCLN,1,[If CLN can be used])
-+else AC_MSG_ERROR([No suitable installed version of CLN could be found.])
-+fi
-+AC_SUBST(CLN_CPPFLAGS)
-+AC_SUBST(CLN_LIBS)
-+
-+PKG_CHECK_MODULES(GLIB, [
-+	glib-2.0
-+	libxml-2.0 >= 2.3.8
-+	])
-+AC_SUBST(GLIB_CFLAGS)
-+AC_SUBST(GLIB_LIBS)
-+
- dnl  --------
- dnl | output |-----------------------------------------------------------------
- dnl  --------
+ PKG_CHECK_MODULES(GLIB, [
diff --git a/math/qalculate/patches/patch-ag b/math/qalculate/patches/patch-ag
deleted file mode 100644
index 37dccbeb40d..00000000000
--- a/math/qalculate/patches/patch-ag
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2009/09/06 12:17:17 asau Exp $
-
---- libqalculate/Number.cc.orig	2007-05-18 12:03:22.000000000 +0400
-+++ libqalculate/Number.cc	2009-09-06 16:00:18.000000000 +0400
-@@ -28,7 +28,8 @@
- 
- using namespace cln;
- 
--void cln::cl_abort() {
-+namespace cln {
-+void cl_abort() {
- 	CALCULATOR->error(true, "CLN Error: see terminal output (probably too large or small floating point number)", NULL);
- 	if(CALCULATOR->busy()) {
- 		CALCULATOR->abort_this();
-@@ -36,6 +37,7 @@
- 		exit(0);
- 	}
- }
-+}
- 
- string printCL_I(cl_I integ, int base = 10, bool display_sign = true, BaseDisplay base_display = BASE_DISPLAY_NORMAL, bool lower_case = false) {
- 	if(base == BASE_ROMAN_NUMERALS) {