update to 0.9.7

changes:
General build updates and bug fixes, including the ability to
 build against cln >= 1.2

4 files changed, 13 insertions, 45 deletions

diff --git a/math/qalculate-gtk/Makefile b/math/qalculate-gtk/Makefile
index d74fbff2c16..78c98c8e438 100644
--- a/math/qalculate-gtk/Makefile
+++ b/math/qalculate-gtk/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.32 2010/01/18 09:59:12 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2010/04/13 17:28:34 drochner Exp $
 
-DISTNAME=	qalculate-gtk-0.9.6
-PKGREVISION=	6
+DISTNAME=	qalculate-gtk-0.9.7
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=qalculate/}
 
diff --git a/math/qalculate-gtk/PLIST b/math/qalculate-gtk/PLIST
index cf505b19d83..f6951ac38d9 100644
--- a/math/qalculate-gtk/PLIST
+++ b/math/qalculate-gtk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2009/06/14 18:05:48 joerg Exp $
+@comment $NetBSD: PLIST,v 1.8 2010/04/13 17:28:34 drochner Exp $
 bin/qalculate-gtk
 share/applications/qalculate-gtk.desktop
 share/gnome/help/qalculate-gtk/C/appendixa.xml
@@ -11,7 +11,6 @@ share/gnome/help/qalculate-gtk/C/figures/completion.png
 share/gnome/help/qalculate-gtk/C/figures/convert-number-bases.png
 share/gnome/help/qalculate-gtk/C/figures/convert-unit.png
 share/gnome/help/qalculate-gtk/C/figures/edit-function.png
-share/gnome/help/qalculate-gtk/C/figures/edit-functiongeneral.png
 share/gnome/help/qalculate-gtk/C/figures/edit-matrix.png
 share/gnome/help/qalculate-gtk/C/figures/edit-unit.png
 share/gnome/help/qalculate-gtk/C/figures/edit-variable.png
@@ -20,7 +19,6 @@ share/gnome/help/qalculate-gtk/C/figures/gnuplot.png
 share/gnome/help/qalculate-gtk/C/figures/import-csv.png
 share/gnome/help/qalculate-gtk/C/figures/insert-function-screen.png
 share/gnome/help/qalculate-gtk/C/figures/insert-function.png
-share/gnome/help/qalculate-gtk/C/figures/mainwindow-screen.png
 share/gnome/help/qalculate-gtk/C/figures/mainwindow.png
 share/gnome/help/qalculate-gtk/C/figures/plot-data.png
 share/gnome/help/qalculate-gtk/C/figures/plot-settings.png
diff --git a/math/qalculate-gtk/distinfo b/math/qalculate-gtk/distinfo
index e4ca7d0f45a..f4bee55a76e 100644
--- a/math/qalculate-gtk/distinfo
+++ b/math/qalculate-gtk/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.10 2009/09/06 15:15:53 asau Exp $
+$NetBSD: distinfo,v 1.11 2010/04/13 17:28:34 drochner Exp $
 
-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 (qalculate-gtk-0.9.7.tar.gz) = c714c91224045fa49f261686e985df0aefa1d678
+RMD160 (qalculate-gtk-0.9.7.tar.gz) = bbb89fbfc6199dcf87666596ee0d7df3019635af
+Size (qalculate-gtk-0.9.7.tar.gz) = 1511036 bytes
 SHA1 (patch-aa) = bccd5b7385652eaa1d7a85eb5396934c14c73b8a
-SHA1 (patch-ac) = 298c951ad5e7bc6ebbd3e8479c752ba476b226a0
+SHA1 (patch-ac) = 85a5929715916d5fe3c2c213b71e1bf90639c7d4
diff --git a/math/qalculate-gtk/patches/patch-ac b/math/qalculate-gtk/patches/patch-ac
index 69ac4d500da..265b1a4869c 100644
--- a/math/qalculate-gtk/patches/patch-ac
+++ b/math/qalculate-gtk/patches/patch-ac
@@ -1,16 +1,8 @@
-$NetBSD: patch-ac,v 1.3 2009/09/06 15:15:53 asau Exp $
+$NetBSD: patch-ac,v 1.4 2010/04/13 17:28:34 drochner Exp $
 
---- configure.in.orig	2007-05-18 12:36:10.000000000 +0400
-+++ configure.in	2009-09-06 19:11:00.000000000 +0400
-@@ -24,6 +24,7 @@
- AC_HEADER_STDC
- AC_PROG_INTLTOOL
- AM_PROG_LIBTOOL
-+PKG_PROG_PKG_CONFIG
- 
- dnl  ------------------------------------
- dnl | check for compiler characteristics |-------------------------------------
-@@ -55,6 +56,35 @@
+--- configure.in.orig	2010-01-05 15:43:49.000000000 +0000
++++ configure.in
+@@ -55,6 +55,35 @@ fi
  changequote([,])dnl
  
  
@@ -46,28 +38,7 @@ $NetBSD: patch-ac,v 1.3 2009/09/06 15:15:53 asau Exp $
  dnl  --------------------------------
  dnl | check for neccessary libraries |-----------------------------------------
  dnl  --------------------------------
-@@ -63,11 +93,16 @@
- 
- AC_LANG([C++])
- 
--AC_PATH_CLN(1.1.0, [
--     	LIBS="$LIBS $CLN_LIBS"
--     	CPPFLAGS="$CPPFLAGS $CLN_CPPFLAGS"
-+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])
--], AC_MSG_ERROR([No suitable installed version of CLN could be found.]))
-+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 >= 2.4
-@@ -137,35 +172,6 @@
+@@ -142,35 +171,6 @@ AC_SUBST(QALCULATE_GTK)
  
  AC_SUBST(LN_QALCULATE)