Sun Sep 6 15:15:53 2009 UTC ()
Fix build after CLN update.


(asau)
diff -r1.9 -r1.10 pkgsrc/math/qalculate-gtk/distinfo
diff -r1.2 -r1.3 pkgsrc/math/qalculate-gtk/patches/patch-ac
cvs diff -r1.9 -r1.10 pkgsrc/math/qalculate-gtk/distinfo (expand / switch to unified diff)

--- pkgsrc/math/qalculate-gtk/distinfo 2007/11/05 20:44:04 1.9
+++ pkgsrc/math/qalculate-gtk/distinfo 2009/09/06 15:15:53 1.10
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.9 2007/11/05 20:44:04 drochner Exp $ 1$NetBSD: distinfo,v 1.10 2009/09/06 15:15:53 asau Exp $
2 2
3SHA1 (qalculate-gtk-0.9.6.tar.gz) = 1f69097457f6e28b67d1d767670dc519548876b5 3SHA1 (qalculate-gtk-0.9.6.tar.gz) = 1f69097457f6e28b67d1d767670dc519548876b5
4RMD160 (qalculate-gtk-0.9.6.tar.gz) = 91db6e31407df65f164fcd4adfe97278ff60a303 4RMD160 (qalculate-gtk-0.9.6.tar.gz) = 91db6e31407df65f164fcd4adfe97278ff60a303
5Size (qalculate-gtk-0.9.6.tar.gz) = 1544175 bytes 5Size (qalculate-gtk-0.9.6.tar.gz) = 1544175 bytes
6SHA1 (patch-aa) = bccd5b7385652eaa1d7a85eb5396934c14c73b8a 6SHA1 (patch-aa) = bccd5b7385652eaa1d7a85eb5396934c14c73b8a
7SHA1 (patch-ac) = ff3e3395654b1936dbf6878562e3173c80b5edad 7SHA1 (patch-ac) = 298c951ad5e7bc6ebbd3e8479c752ba476b226a0
cvs diff -r1.2 -r1.3 pkgsrc/math/qalculate-gtk/patches/Attic/patch-ac (expand / switch to unified diff)

--- pkgsrc/math/qalculate-gtk/patches/Attic/patch-ac 2007/02/20 15:08:48 1.2
+++ pkgsrc/math/qalculate-gtk/patches/Attic/patch-ac 2009/09/06 15:15:53 1.3
@@ -1,18 +1,26 @@ @@ -1,18 +1,26 @@
1$NetBSD: patch-ac,v 1.2 2007/02/20 15:08:48 adam Exp $ 1$NetBSD: patch-ac,v 1.3 2009/09/06 15:15:53 asau Exp $
2 2
3--- configure.in.orig 2006-07-16 09:27:50.000000000 +0200 3--- configure.in.orig 2007-05-18 12:36:10.000000000 +0400
4+++ configure.in 4+++ configure.in 2009-09-06 19:11:00.000000000 +0400
5@@ -55,6 +55,35 @@ fi 5@@ -24,6 +24,7 @@
 6 AC_HEADER_STDC
 7 AC_PROG_INTLTOOL
 8 AM_PROG_LIBTOOL
 9+PKG_PROG_PKG_CONFIG
 10
 11 dnl ------------------------------------
 12 dnl | check for compiler characteristics |-------------------------------------
 13@@ -55,6 +56,35 @@
6 changequote([,])dnl 14 changequote([,])dnl
7  15
8  16
9+dnl ------------------------------------- 17+dnl -------------------------------------
10+dnl | internationalization (i18n) support |------------------------------------ 18+dnl | internationalization (i18n) support |------------------------------------
11+dnl ------------------------------------- 19+dnl -------------------------------------
12+ 20+
13+GETTEXT_PACKAGE=qalculate-gtk 21+GETTEXT_PACKAGE=qalculate-gtk
14+AC_SUBST(GETTEXT_PACKAGE) 22+AC_SUBST(GETTEXT_PACKAGE)
15+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[The package name for gettext]) 23+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[The package name for gettext])
16+ 24+
17+dnl Please keep this in alphabetical order 25+dnl Please keep this in alphabetical order
18+ALL_LINGUAS="nl sv" 26+ALL_LINGUAS="nl sv"
@@ -28,27 +36,48 @@ $NetBSD: patch-ac,v 1.2 2007/02/20 15:08 @@ -28,27 +36,48 @@ $NetBSD: patch-ac,v 1.2 2007/02/20 15:08
28+ 36+
29+AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "$PACKAGE_LOCALE_DIR", 37+AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "$PACKAGE_LOCALE_DIR",
30+ [The directory in which qalculate's locale data will be stored]) 38+ [The directory in which qalculate's locale data will be stored])
31+ AC_MSG_RESULT("$PACKAGE_LOCALE_DIR") 39+ AC_MSG_RESULT("$PACKAGE_LOCALE_DIR")
32+ 40+
33+ 41+
34+  42+
35+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 $< [$]@'  43+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 $< [$]@'
36+AC_SUBST(INTLTOOL_QALCULATE_DEFINITIONS_RULE)  44+AC_SUBST(INTLTOOL_QALCULATE_DEFINITIONS_RULE)
37+ 45+
38 dnl -------------------------------- 46 dnl --------------------------------
39 dnl | check for neccessary libraries |----------------------------------------- 47 dnl | check for neccessary libraries |-----------------------------------------
40 dnl -------------------------------- 48 dnl --------------------------------
41@@ -137,35 +166,6 @@ AC_SUBST(QALCULATE_GTK) 49@@ -63,11 +93,16 @@
 50
 51 AC_LANG([C++])
 52
 53-AC_PATH_CLN(1.1.0, [
 54- LIBS="$LIBS $CLN_LIBS"
 55- CPPFLAGS="$CPPFLAGS $CLN_CPPFLAGS"
 56+if pkg-config --atleast-version=1.1.0 cln; then
 57+ CLN_CPPFLAGS="`pkg-config --cflags cln`"
 58+ CLN_LIBS="`pkg-config --libs cln`"
 59+ LIBS="$LIBS `pkg-config --libs cln`"
 60+ CPPFLAGS="$CPPFLAGS `pkg-config --cflags cln`"
 61 AC_DEFINE(HAVE_LIBCLN,1,[If CLN can be used])
 62-], AC_MSG_ERROR([No suitable installed version of CLN could be found.]))
 63+else AC_MSG_ERROR([No suitable installed version of CLN could be found.])
 64+fi
 65+AC_SUBST(CLN_CPPFLAGS)
 66+AC_SUBST(CLN_LIBS)
 67
 68 PKG_CHECK_MODULES(GLIB, [
 69 glib-2.0 >= 2.4
 70@@ -137,35 +172,6 @@
42  71
43 AC_SUBST(LN_QALCULATE) 72 AC_SUBST(LN_QALCULATE)
44  73
45-dnl ------------------------------------- 74-dnl -------------------------------------
46-dnl | internationalization (i18n) support |------------------------------------ 75-dnl | internationalization (i18n) support |------------------------------------
47-dnl ------------------------------------- 76-dnl -------------------------------------
48- 77-
49-GETTEXT_PACKAGE=qalculate-gtk 78-GETTEXT_PACKAGE=qalculate-gtk
50-AC_SUBST(GETTEXT_PACKAGE) 79-AC_SUBST(GETTEXT_PACKAGE)
51-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[The package name for gettext]) 80-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[The package name for gettext])
52- 81-
53-dnl Please keep this in alphabetical order 82-dnl Please keep this in alphabetical order
54-ALL_LINGUAS="nl sv" 83-ALL_LINGUAS="nl sv"