Fix breakage after CLN update.

4 files changed, 49 insertions, 14 deletions

diff --git a/math/qalculate/Makefile b/math/qalculate/Makefile
index 4a8dbff40a1..f34320a5a7c 100644
--- a/math/qalculate/Makefile
+++ b/math/qalculate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2009/05/25 15:10:28 drochner Exp $
+# $NetBSD: Makefile,v 1.33 2009/09/06 12:17:17 asau Exp $
 
 DISTNAME=	libqalculate-0.9.6
 PKGNAME=	qalculate-0.9.6
@@ -30,7 +30,7 @@ SUBST_STAGE.pthread=	post-patch
 PTHREAD_AUTO_VARS=	yes
 
 pre-configure:
-	cd ${WRKSRC}; autoconf
+	${RUN} cd ${WRKSRC}; autoconf
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/readline/buildlink3.mk"
diff --git a/math/qalculate/distinfo b/math/qalculate/distinfo
index d14ce8cb60f..6f9118f58e0 100644
--- a/math/qalculate/distinfo
+++ b/math/qalculate/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2009/05/25 15:10:28 drochner Exp $
+$NetBSD: distinfo,v 1.19 2009/09/06 12:17:17 asau Exp $
 
 SHA1 (libqalculate-0.9.6.tar.gz) = 0bcd42e13c23db9489ce594767d5017bdcb338ad
 RMD160 (libqalculate-0.9.6.tar.gz) = 30f819530236da6b6b78088754643408c8aeb70d
@@ -6,6 +6,7 @@ Size (libqalculate-0.9.6.tar.gz) = 1111134 bytes
 SHA1 (patch-aa) = fda2983150bbbdecc1578e747d8a6aa7ef965f3f
 SHA1 (patch-ab) = b1a4b0ffe5dc19ff2b1c640960c3f3a524fd524b
 SHA1 (patch-ac) = 98e817d60fc4cd521e7d227ecd330364ec072ecd
-SHA1 (patch-ad) = 0e767ff393ea2d54da8a49527d24842ca0b90d28
+SHA1 (patch-ad) = 8ad2fb4926aabc6f7f2e5c96cd6869fd8366eb51
 SHA1 (patch-ae) = 7c9685c578a848cb4e9c55756110d891b9254f2b
 SHA1 (patch-af) = 3bab134f0ca10ecf91252e8211982be767e594e5
+SHA1 (patch-ag) = 20d50594c6f21a6b5291043ddf765a2cef56df54
diff --git a/math/qalculate/patches/patch-ad b/math/qalculate/patches/patch-ad
index 0831df8cf9d..fa62f4cfc03 100644
--- a/math/qalculate/patches/patch-ad
+++ b/math/qalculate/patches/patch-ad
@@ -1,8 +1,16 @@
-$NetBSD: patch-ad,v 1.2 2007/02/22 16:15:14 joerg Exp $
+$NetBSD: patch-ad,v 1.3 2009/09/06 12:17:17 asau Exp $
 
---- configure.in.orig	2006-04-13 06:24:58.000000000 -0400
-+++ configure.in
-@@ -84,28 +84,6 @@ AC_SUBST(QALCULATE_AGE)
+--- 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 @@
+ AC_HEADER_STDC
+ AC_PROG_INTLTOOL
+ AM_PROG_LIBTOOL
++PKG_PROG_PKG_CONFIG
+ 
+ dnl  ------------------------------------
+ dnl | check for compiler characteristics |-------------------------------------
+@@ -84,28 +85,6 @@
  
  
  dnl  --------------------------------
@@ -31,7 +39,7 @@ $NetBSD: patch-ad,v 1.2 2007/02/22 16:15:14 joerg Exp $
  dnl | check for readline            |-----------------------------------------
  dnl  --------------------------------
  
-@@ -230,6 +208,26 @@ AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "
+@@ -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)	 
  
@@ -41,12 +49,16 @@ $NetBSD: patch-ad,v 1.2 2007/02/22 16:15:14 joerg Exp $
 +
 +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
diff --git a/math/qalculate/patches/patch-ag b/math/qalculate/patches/patch-ag
new file mode 100644
index 00000000000..37dccbeb40d
--- /dev/null
+++ b/math/qalculate/patches/patch-ag
@@ -0,0 +1,22 @@
+$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) {