Sun Sep 6 15:40:49 2009 UTC ()
Fix build after CLN update. Bump revision (autoconf dependency).


(asau)
diff -r1.19 -r1.20 pkgsrc/math/qalculate-kde/Makefile
diff -r1.7 -r1.8 pkgsrc/math/qalculate-kde/distinfo
diff -r1.2 -r0 pkgsrc/math/qalculate-kde/patches/patch-ab
diff -r0 -r1.1 pkgsrc/math/qalculate-kde/patches/patch-ac
cvs diff -r1.19 -r1.20 pkgsrc/math/qalculate-kde/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/math/qalculate-kde/Attic/Makefile 2009/08/26 19:57:59 1.19
+++ pkgsrc/math/qalculate-kde/Attic/Makefile 2009/09/06 15:40:49 1.20
@@ -1,27 +1,29 @@ @@ -1,27 +1,29 @@
1# $NetBSD: Makefile,v 1.19 2009/08/26 19:57:59 sno Exp $ 1# $NetBSD: Makefile,v 1.20 2009/09/06 15:40:49 asau Exp $
2 2
3DISTNAME= qalculate-kde-0.9.5 3DISTNAME= qalculate-kde-0.9.5
4PKGREVISION= 4 4PKGREVISION= 5
5CATEGORIES= math 5CATEGORIES= math
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=qalculate/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=qalculate/}
7 7
8MAINTAINER= adam@NetBSD.org 8MAINTAINER= adam@NetBSD.org
9HOMEPAGE= http://qalculate.sourceforge.net/ 9HOMEPAGE= http://qalculate.sourceforge.net/
10COMMENT= Modern multi-purpose desktop calculator (KDE version) 10COMMENT= Modern multi-purpose desktop calculator (KDE version)
11 11
12PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
13 13
14DEPENDS+= gnuplot>=3.7:../../graphics/gnuplot 14DEPENDS+= gnuplot>=3.7:../../graphics/gnuplot
15DEPENDS+= wget>=1.8:../../net/wget 15DEPENDS+= wget>=1.8:../../net/wget
16 16
17USE_LANGUAGES= c c++ 17USE_LANGUAGES= c c++
18USE_LIBTOOL= yes 18USE_LIBTOOL= yes
19USE_TOOLS+= gmake msgfmt pkg-config perl 19USE_TOOLS+= autoconf gmake msgfmt pkg-config perl
20GNU_CONFIGURE= yes 20GNU_CONFIGURE= yes
21 21
 22pre-configure:
 23 ${RUN} cd ${WRKSRC}; autoconf
22 24
23.include "../../meta-pkgs/kde3/kde3.mk" 25.include "../../meta-pkgs/kde3/kde3.mk"
24.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 26.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
25.include "../../math/qalculate/buildlink3.mk" 27.include "../../math/qalculate/buildlink3.mk"
26.include "../../x11/kdelibs3/buildlink3.mk" 28.include "../../x11/kdelibs3/buildlink3.mk"
27.include "../../mk/bsd.pkg.mk" 29.include "../../mk/bsd.pkg.mk"
cvs diff -r1.7 -r1.8 pkgsrc/math/qalculate-kde/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/math/qalculate-kde/Attic/distinfo 2007/02/20 15:08:48 1.7
+++ pkgsrc/math/qalculate-kde/Attic/distinfo 2009/09/06 15:40:49 1.8
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.7 2007/02/20 15:08:48 adam Exp $ 1$NetBSD: distinfo,v 1.8 2009/09/06 15:40:49 asau Exp $
2 2
3SHA1 (qalculate-kde-0.9.5.tar.gz) = b8c5ae248d630e18933ac80d873df2ee2e6d5fc9 3SHA1 (qalculate-kde-0.9.5.tar.gz) = b8c5ae248d630e18933ac80d873df2ee2e6d5fc9
4RMD160 (qalculate-kde-0.9.5.tar.gz) = 1808d53d8f49d7f0222ba2db891391e70ba6d575 4RMD160 (qalculate-kde-0.9.5.tar.gz) = 1808d53d8f49d7f0222ba2db891391e70ba6d575
5Size (qalculate-kde-0.9.5.tar.gz) = 1562344 bytes 5Size (qalculate-kde-0.9.5.tar.gz) = 1562344 bytes
6SHA1 (patch-aa) = 6ee895f1b782d8c06301c74951959a5e0be8b0ba 6SHA1 (patch-aa) = 6ee895f1b782d8c06301c74951959a5e0be8b0ba
7SHA1 (patch-ab) = cfa343b2d37d50c54ae6267a1dd7e473965dbd5f 7SHA1 (patch-ac) = 0dd571e91b86052b772a892a2581b4ce8bd1feee
File Deleted: pkgsrc/math/qalculate-kde/patches/Attic/patch-ab
File Added: pkgsrc/math/qalculate-kde/patches/Attic/patch-ac
$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