[pkgsrc/trunk]: pkgsrc/math Fix build after CLN update. Bump revision (autoco...

[asau <asau%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9cbe6414a3ff
branches:  trunk
changeset: 564530:9cbe6414a3ff
user:      asau <asau%pkgsrc.org@localhost>
date:      Sun Sep 06 15:24:38 2009 +0000

description:
Fix build after CLN update. Bump revision (autoconf dependency).

diffstat:

 math/qalculate-bases/Makefile            |   9 ++++--
 math/qalculate-bases/distinfo            |   4 +-
 math/qalculate-bases/patches/patch-ab    |  39 +++++++++++++++++++++++++++----
 math/qalculate-currency/Makefile         |   9 ++++--
 math/qalculate-currency/distinfo         |   4 +-
 math/qalculate-currency/patches/patch-ab |  39 +++++++++++++++++++++++++++----
 6 files changed, 84 insertions(+), 20 deletions(-)

diffs (188 lines):

diff -r 77b62bbb86b3 -r 9cbe6414a3ff math/qalculate-bases/Makefile
--- a/math/qalculate-bases/Makefile     Sun Sep 06 15:22:55 2009 +0000
+++ b/math/qalculate-bases/Makefile     Sun Sep 06 15:24:38 2009 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2009/08/26 19:57:59 sno Exp $
+# $NetBSD: Makefile,v 1.16 2009/09/06 15:24:38 asau Exp $
 
 DISTNAME=      qalculate-bases-0.9.4
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    math
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=qalculate/}
 
@@ -14,9 +14,12 @@
 USE_LANGUAGES=         c c++
 USE_LIBTOOL=           yes
 USE_PKGLOCALEDIR=      yes
-USE_TOOLS+=            gmake intltool msgfmt pkg-config
+USE_TOOLS+=            autoconf gmake intltool msgfmt pkg-config
 GNU_CONFIGURE=         yes
 
+pre-configure:
+       ${RUN} cd ${WRKSRC}; autoconf
+
 .include "../../math/qalculate/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 77b62bbb86b3 -r 9cbe6414a3ff math/qalculate-bases/distinfo
--- a/math/qalculate-bases/distinfo     Sun Sep 06 15:22:55 2009 +0000
+++ b/math/qalculate-bases/distinfo     Sun Sep 06 15:24:38 2009 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2006/06/22 18:52:00 jlam Exp $
+$NetBSD: distinfo,v 1.6 2009/09/06 15:24:38 asau Exp $
 
 SHA1 (qalculate-bases-0.9.4.tar.gz) = 71f4071bfd6217eb30788c41e95c531cca55b610
 RMD160 (qalculate-bases-0.9.4.tar.gz) = be0c2e11eaca3dfce064b751903249486264f857
 Size (qalculate-bases-0.9.4.tar.gz) = 368685 bytes
 SHA1 (patch-aa) = 8bafc00b8daa26fe72c88f7415f8dceaf748b3e1
-SHA1 (patch-ab) = f162586746600d18621068ca6af94c9f00f559dd
+SHA1 (patch-ab) = b72440ffe5fd4b211abef761320666c258a30171
diff -r 77b62bbb86b3 -r 9cbe6414a3ff math/qalculate-bases/patches/patch-ab
--- a/math/qalculate-bases/patches/patch-ab     Sun Sep 06 15:22:55 2009 +0000
+++ b/math/qalculate-bases/patches/patch-ab     Sun Sep 06 15:24:38 2009 +0000
@@ -1,8 +1,16 @@
-$NetBSD: patch-ab,v 1.1 2006/06/22 18:52:00 jlam Exp $
+$NetBSD: patch-ab,v 1.2 2009/09/06 15:24:38 asau Exp $
 
---- configure.in.orig  2006-04-18 03:13:35.000000000 -0400
-+++ configure.in
-@@ -54,7 +54,33 @@ if test "x$GCC" = "xyes"; then
+--- configure.in.orig  2006-04-18 11:13:35.000000000 +0400
++++ configure.in       2009-09-06 19:17:39.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 |-------------------------------------
+@@ -54,7 +55,33 @@
  fi
  changequote([,])dnl
  
@@ -36,7 +44,28 @@
  dnl  --------------------------------
  dnl | check for neccessary libraries |-----------------------------------------
  dnl  --------------------------------
-@@ -89,33 +115,6 @@ PKG_CHECK_MODULES(QALCULATE, [
+@@ -63,11 +90,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
+@@ -89,33 +121,6 @@
  AC_SUBST(QALCULATE_CFLAGS)
  AC_SUBST(QALCULATE_LIBS)
  
diff -r 77b62bbb86b3 -r 9cbe6414a3ff math/qalculate-currency/Makefile
--- a/math/qalculate-currency/Makefile  Sun Sep 06 15:22:55 2009 +0000
+++ b/math/qalculate-currency/Makefile  Sun Sep 06 15:24:38 2009 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2009/08/26 19:57:59 sno Exp $
+# $NetBSD: Makefile,v 1.16 2009/09/06 15:29:53 asau Exp $
 
 DISTNAME=      qalculate-currency-0.9.4
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    math
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=qalculate/}
 
@@ -13,9 +13,12 @@
 
 USE_LANGUAGES=         c c++
 USE_LIBTOOL=           yes
-USE_TOOLS+=            gmake intltool msgfmt pkg-config
+USE_TOOLS+=            autoconf gmake intltool msgfmt pkg-config
 GNU_CONFIGURE=         yes
 
+pre-configure:
+       ${RUN} cd ${WRKSRC}; autoconf
+
 .include "../../math/qalculate/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 77b62bbb86b3 -r 9cbe6414a3ff math/qalculate-currency/distinfo
--- a/math/qalculate-currency/distinfo  Sun Sep 06 15:22:55 2009 +0000
+++ b/math/qalculate-currency/distinfo  Sun Sep 06 15:24:38 2009 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2006/06/22 18:52:00 jlam Exp $
+$NetBSD: distinfo,v 1.6 2009/09/06 15:29:53 asau Exp $
 
 SHA1 (qalculate-currency-0.9.4.tar.gz) = 8352fd1bc8434299e4c3a1111f1b6b275246ee0f
 RMD160 (qalculate-currency-0.9.4.tar.gz) = fa7a52c922ed0c01494e43b6a9c971124a9856cb
 Size (qalculate-currency-0.9.4.tar.gz) = 370506 bytes
 SHA1 (patch-aa) = 40d2dcb92b1affa6df71679cfce4027291fcd894
-SHA1 (patch-ab) = 06824dc714d112ce6ed422f550939ae802e2452b
+SHA1 (patch-ab) = 3ec35d4b6302d76200cb185f0c67fbdfe4e71035
diff -r 77b62bbb86b3 -r 9cbe6414a3ff math/qalculate-currency/patches/patch-ab
--- a/math/qalculate-currency/patches/patch-ab  Sun Sep 06 15:22:55 2009 +0000
+++ b/math/qalculate-currency/patches/patch-ab  Sun Sep 06 15:24:38 2009 +0000
@@ -1,8 +1,16 @@
-$NetBSD: patch-ab,v 1.1 2006/06/22 18:52:00 jlam Exp $
+$NetBSD: patch-ab,v 1.2 2009/09/06 15:29:53 asau Exp $
 
---- configure.in.orig  2006-04-18 03:13:20.000000000 -0400
-+++ configure.in
-@@ -55,6 +55,33 @@ fi
+--- configure.in.orig  2006-04-18 11:13:20.000000000 +0400
++++ configure.in       2009-09-06 19:26:52.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,33 @@
  changequote([,])dnl
  
  
@@ -36,7 +44,28 @@
  dnl  --------------------------------
  dnl | check for neccessary libraries |-----------------------------------------
  dnl  --------------------------------
-@@ -89,33 +116,6 @@ PKG_CHECK_MODULES(QALCULATE, [
+@@ -63,11 +91,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
+@@ -89,33 +122,6 @@
  AC_SUBST(QALCULATE_CFLAGS)
  AC_SUBST(QALCULATE_LIBS)