diff options
| author | asau <asau> | 2009-09-06 15:15:53 +0000 |
|---|---|---|
| committer | asau <asau> | 2009-09-06 15:15:53 +0000 |
| commit | 675ed2f23e670fb057dfbd0030d28f63c7ae80d2 (patch) | |
| tree | d2cf4da73fa251d284ec5f58d81402d8d93fd538 /math | |
| parent | 0a10f486735b968f9dc9cbf409754b43ae995232 (diff) | |
| download | pkgsrc-675ed2f23e670fb057dfbd0030d28f63c7ae80d2.tar.gz | |
Fix build after CLN update.
Diffstat (limited to 'math')
| -rw-r--r-- | math/qalculate-gtk/distinfo | 4 | ||||
| -rw-r--r-- | math/qalculate-gtk/patches/patch-ac | 39 |
2 files changed, 36 insertions, 7 deletions
diff --git a/math/qalculate-gtk/distinfo b/math/qalculate-gtk/distinfo index 090f4720832..e4ca7d0f45a 100644 --- a/math/qalculate-gtk/distinfo +++ b/math/qalculate-gtk/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.9 2007/11/05 20:44:04 drochner Exp $ +$NetBSD: distinfo,v 1.10 2009/09/06 15:15:53 asau 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 (patch-aa) = bccd5b7385652eaa1d7a85eb5396934c14c73b8a -SHA1 (patch-ac) = ff3e3395654b1936dbf6878562e3173c80b5edad +SHA1 (patch-ac) = 298c951ad5e7bc6ebbd3e8479c752ba476b226a0 diff --git a/math/qalculate-gtk/patches/patch-ac b/math/qalculate-gtk/patches/patch-ac index 80cd317e2de..69ac4d500da 100644 --- a/math/qalculate-gtk/patches/patch-ac +++ b/math/qalculate-gtk/patches/patch-ac @@ -1,8 +1,16 @@ -$NetBSD: patch-ac,v 1.2 2007/02/20 15:08:48 adam Exp $ +$NetBSD: patch-ac,v 1.3 2009/09/06 15:15:53 asau Exp $ ---- configure.in.orig 2006-07-16 09:27:50.000000000 +0200 -+++ configure.in -@@ -55,6 +55,35 @@ fi +--- 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 @@ changequote([,])dnl @@ -38,7 +46,28 @@ $NetBSD: patch-ac,v 1.2 2007/02/20 15:08:48 adam Exp $ dnl -------------------------------- dnl | check for neccessary libraries |----------------------------------------- dnl -------------------------------- -@@ -137,35 +166,6 @@ AC_SUBST(QALCULATE_GTK) +@@ -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 @@ AC_SUBST(LN_QALCULATE) |