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

7 files changed, 87 insertions, 71 deletions

diff --git a/math/qalculate-kde/Makefile b/math/qalculate-kde/Makefile
index f227e445595..49f5aa24083 100644
--- a/math/qalculate-kde/Makefile
+++ b/math/qalculate-kde/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2009/08/26 19:57:59 sno Exp $
+# $NetBSD: Makefile,v 1.20 2009/09/06 15:40:49 asau Exp $
 
 DISTNAME=	qalculate-kde-0.9.5
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=qalculate/}
 
@@ -16,9 +16,11 @@ DEPENDS+=	wget>=1.8:../../net/wget
 
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
-USE_TOOLS+=		gmake msgfmt pkg-config perl
+USE_TOOLS+=		autoconf gmake msgfmt pkg-config perl
 GNU_CONFIGURE=		yes
 
+pre-configure:
+	${RUN} cd ${WRKSRC}; autoconf
 
 .include "../../meta-pkgs/kde3/kde3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
diff --git a/math/qalculate-kde/distinfo b/math/qalculate-kde/distinfo
index dab2612d6f9..9bc83ebeb68 100644
--- a/math/qalculate-kde/distinfo
+++ b/math/qalculate-kde/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.7 2007/02/20 15:08:48 adam Exp $
+$NetBSD: distinfo,v 1.8 2009/09/06 15:40:49 asau Exp $
 
 SHA1 (qalculate-kde-0.9.5.tar.gz) = b8c5ae248d630e18933ac80d873df2ee2e6d5fc9
 RMD160 (qalculate-kde-0.9.5.tar.gz) = 1808d53d8f49d7f0222ba2db891391e70ba6d575
 Size (qalculate-kde-0.9.5.tar.gz) = 1562344 bytes
 SHA1 (patch-aa) = 6ee895f1b782d8c06301c74951959a5e0be8b0ba
-SHA1 (patch-ab) = cfa343b2d37d50c54ae6267a1dd7e473965dbd5f
+SHA1 (patch-ac) = 0dd571e91b86052b772a892a2581b4ce8bd1feee
diff --git a/math/qalculate-kde/patches/patch-ab b/math/qalculate-kde/patches/patch-ab
deleted file mode 100644
index 20f86389b08..00000000000
--- a/math/qalculate-kde/patches/patch-ab
+++ /dev/null
@@ -1,56 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2007/02/20 15:08:49 adam Exp $
-
---- configure.orig	2006-12-17 11:57:46.000000000 +0100
-+++ configure
-@@ -29327,13 +29327,13 @@ fi
-   fi
- 
-     if test -z "$LIBPTHREAD"; then
--    { echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
--echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; }
-+    { echo "$as_me:$LINENO: checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
-+echo $ECHO_N "checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6; }
- if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lpthread  $LIBS"
-+LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -29389,7 +29389,7 @@ fi
- { echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
- echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6; }
- if test $ac_cv_lib_pthread_pthread_create = yes; then
--  LIBPTHREAD="-lpthread"
-+  LIBPTHREAD="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
- fi
- 
-   fi
-@@ -33213,13 +33213,13 @@ _ACEOF
- 
- 
- 
--{ echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
--echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; }
-+{ echo "$as_me:$LINENO: checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
-+echo $ECHO_N "checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6; }
- if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lpthread  $LIBS"
-+LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -33275,7 +33275,7 @@ fi
- { echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
- echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6; }
- if test $ac_cv_lib_pthread_pthread_create = yes; then
--  LIBS="$LIBS -lpthread"
-+  LIBS="$LIBS ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
- fi
- 
- 
diff --git a/math/qalculate-kde/patches/patch-ac b/math/qalculate-kde/patches/patch-ac
new file mode 100644
index 00000000000..a931d843752
--- /dev/null
+++ b/math/qalculate-kde/patches/patch-ac
@@ -0,0 +1,38 @@
+$NetBSD: patch-ac,v 1.1 2009/09/06 15:40:49 asau Exp $
+
+--- configure.in.orig	2006-12-17 13:57:31.000000000 +0300
++++ configure.in	2009-09-06 19:35:24.000000000 +0400
+@@ -52,6 +52,7 @@
+ AC_ENABLE_SHARED(yes)
+ AC_ENABLE_STATIC(no)
+ KDE_PROG_LIBTOOL
++PKG_PROG_PKG_CONFIG
+ 
+ dnl for NLS support. Call them in this order!
+ dnl WITH_NLS is for the po files
+@@ -69,15 +70,20 @@
+ AC_C_BIGENDIAN
+ AC_CHECK_KDEMAXPATHLEN
+ 
+-AC_CHECK_LIB(pthread, pthread_create, [LIBS="$LIBS -lpthread"])
++AC_CHECK_LIB(pthread, pthread_create, [LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}  $LIBS"])
+ 
+ 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(QALCULATE, [
+ 	libxml-2.0
diff --git a/math/qalculate-units/Makefile b/math/qalculate-units/Makefile
index d4e304a3702..3205e162f6d 100644
--- a/math/qalculate-units/Makefile
+++ b/math/qalculate-units/Makefile
@@ -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:46:38 asau Exp $
 
 DISTNAME=	qalculate-units-0.9.4
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=qalculate/}
 
@@ -14,9 +14,12 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 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 --git a/math/qalculate-units/distinfo b/math/qalculate-units/distinfo
index a3b08ea576a..78302723ce4 100644
--- a/math/qalculate-units/distinfo
+++ b/math/qalculate-units/distinfo
@@ -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:46:38 asau Exp $
 
 SHA1 (qalculate-units-0.9.4.tar.gz) = 1a6c124e572671973be9d249aba682e745f01f91
 RMD160 (qalculate-units-0.9.4.tar.gz) = 621636ecc487b71a85f7e6f9785e275ed2ac2e17
 Size (qalculate-units-0.9.4.tar.gz) = 375642 bytes
 SHA1 (patch-aa) = b345c2bfdee5c3000ae23f6f77b7ef7e491fa385
-SHA1 (patch-ab) = a5500e60ffd51c40ed266ae7c26faf7b6e441234
+SHA1 (patch-ab) = d781007f3efb881c385e57a9ec68dd616b73d0ab
diff --git a/math/qalculate-units/patches/patch-ab b/math/qalculate-units/patches/patch-ab
index c21745ee4ba..5ab67d84ce0 100644
--- a/math/qalculate-units/patches/patch-ab
+++ b/math/qalculate-units/patches/patch-ab
@@ -1,8 +1,16 @@
-$NetBSD: patch-ab,v 1.1 2006/06/22 18:52:01 jlam Exp $
+$NetBSD: patch-ab,v 1.2 2009/09/06 15:46:38 asau Exp $
 
---- configure.in.orig	2006-04-18 03:13:12.000000000 -0400
-+++ configure.in
-@@ -55,6 +55,33 @@ fi
+--- configure.in.orig	2006-04-18 11:13:12.000000000 +0400
++++ configure.in	2009-09-06 19:44:37.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 @@ $NetBSD: patch-ab,v 1.1 2006/06/22 18:52:01 jlam Exp $
  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)