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


(asau)
diff -r1.15 -r1.16 pkgsrc/math/qalculate-bases/Makefile
diff -r1.5 -r1.6 pkgsrc/math/qalculate-bases/distinfo
diff -r1.1 -r1.2 pkgsrc/math/qalculate-bases/patches/patch-ab
cvs diff -r1.15 -r1.16 pkgsrc/math/qalculate-bases/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/math/qalculate-bases/Attic/Makefile 2009/08/26 19:57:59 1.15
+++ pkgsrc/math/qalculate-bases/Attic/Makefile 2009/09/06 15:24:38 1.16
@@ -1,22 +1,25 @@ @@ -1,22 +1,25 @@
1# $NetBSD: Makefile,v 1.15 2009/08/26 19:57:59 sno Exp $ 1# $NetBSD: Makefile,v 1.16 2009/09/06 15:24:38 asau Exp $
2 2
3DISTNAME= qalculate-bases-0.9.4 3DISTNAME= qalculate-bases-0.9.4
4PKGREVISION= 1 4PKGREVISION= 2
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= Utility for conversion between number bases using Qalculate 10COMMENT= Utility for conversion between number bases using Qalculate
11 11
12PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
13 13
14USE_LANGUAGES= c c++ 14USE_LANGUAGES= c c++
15USE_LIBTOOL= yes 15USE_LIBTOOL= yes
16USE_PKGLOCALEDIR= yes 16USE_PKGLOCALEDIR= yes
17USE_TOOLS+= gmake intltool msgfmt pkg-config 17USE_TOOLS+= autoconf gmake intltool msgfmt pkg-config
18GNU_CONFIGURE= yes 18GNU_CONFIGURE= yes
19 19
 20pre-configure:
 21 ${RUN} cd ${WRKSRC}; autoconf
 22
20.include "../../math/qalculate/buildlink3.mk" 23.include "../../math/qalculate/buildlink3.mk"
21.include "../../x11/gtk2/buildlink3.mk" 24.include "../../x11/gtk2/buildlink3.mk"
22.include "../../mk/bsd.pkg.mk" 25.include "../../mk/bsd.pkg.mk"
cvs diff -r1.5 -r1.6 pkgsrc/math/qalculate-bases/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/math/qalculate-bases/Attic/distinfo 2006/06/22 18:52:00 1.5
+++ pkgsrc/math/qalculate-bases/Attic/distinfo 2009/09/06 15:24:38 1.6
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.5 2006/06/22 18:52:00 jlam Exp $ 1$NetBSD: distinfo,v 1.6 2009/09/06 15:24:38 asau Exp $
2 2
3SHA1 (qalculate-bases-0.9.4.tar.gz) = 71f4071bfd6217eb30788c41e95c531cca55b610 3SHA1 (qalculate-bases-0.9.4.tar.gz) = 71f4071bfd6217eb30788c41e95c531cca55b610
4RMD160 (qalculate-bases-0.9.4.tar.gz) = be0c2e11eaca3dfce064b751903249486264f857 4RMD160 (qalculate-bases-0.9.4.tar.gz) = be0c2e11eaca3dfce064b751903249486264f857
5Size (qalculate-bases-0.9.4.tar.gz) = 368685 bytes 5Size (qalculate-bases-0.9.4.tar.gz) = 368685 bytes
6SHA1 (patch-aa) = 8bafc00b8daa26fe72c88f7415f8dceaf748b3e1 6SHA1 (patch-aa) = 8bafc00b8daa26fe72c88f7415f8dceaf748b3e1
7SHA1 (patch-ab) = f162586746600d18621068ca6af94c9f00f559dd 7SHA1 (patch-ab) = b72440ffe5fd4b211abef761320666c258a30171
cvs diff -r1.1 -r1.2 pkgsrc/math/qalculate-bases/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/math/qalculate-bases/patches/Attic/patch-ab 2006/06/22 18:52:00 1.1
+++ pkgsrc/math/qalculate-bases/patches/Attic/patch-ab 2009/09/06 15:24:38 1.2
@@ -1,18 +1,26 @@ @@ -1,18 +1,26 @@
1$NetBSD: patch-ab,v 1.1 2006/06/22 18:52:00 jlam Exp $ 1$NetBSD: patch-ab,v 1.2 2009/09/06 15:24:38 asau Exp $
2 2
3--- configure.in.orig 2006-04-18 03:13:35.000000000 -0400 3--- configure.in.orig 2006-04-18 11:13:35.000000000 +0400
4+++ configure.in 4+++ configure.in 2009-09-06 19:17:39.000000000 +0400
5@@ -54,7 +54,33 @@ if test "x$GCC" = "xyes"; then 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@@ -54,7 +55,33 @@
6 fi 14 fi
7 changequote([,])dnl 15 changequote([,])dnl
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-bases 21+GETTEXT_PACKAGE=qalculate-bases
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"
@@ -26,27 +34,48 @@ $NetBSD: patch-ab,v 1.1 2006/06/22 18:52 @@ -26,27 +34,48 @@ $NetBSD: patch-ab,v 1.1 2006/06/22 18:52
26+ PACKAGE_LOCALE_DIR=$prefix/share/locale 34+ PACKAGE_LOCALE_DIR=$prefix/share/locale
27+fi 35+fi
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+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 $< [$]@'  41+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 $< [$]@'
34+AC_SUBST(INTLTOOL_QALCULATE_DEFINITIONS_RULE)  42+AC_SUBST(INTLTOOL_QALCULATE_DEFINITIONS_RULE)
35+  43+
36 dnl -------------------------------- 44 dnl --------------------------------
37 dnl | check for neccessary libraries |----------------------------------------- 45 dnl | check for neccessary libraries |-----------------------------------------
38 dnl -------------------------------- 46 dnl --------------------------------
39@@ -89,33 +115,6 @@ PKG_CHECK_MODULES(QALCULATE, [ 47@@ -63,11 +90,16 @@
 48
 49 AC_LANG([C++])
 50
 51-AC_PATH_CLN(1.1.0, [
 52- LIBS="$LIBS $CLN_LIBS"
 53- CPPFLAGS="$CPPFLAGS $CLN_CPPFLAGS"
 54+if pkg-config --atleast-version=1.1.0 cln; then
 55+ CLN_CPPFLAGS="`pkg-config --cflags cln`"
 56+ CLN_LIBS="`pkg-config --libs cln`"
 57+ LIBS="$LIBS `pkg-config --libs cln`"
 58+ CPPFLAGS="$CPPFLAGS `pkg-config --cflags cln`"
 59 AC_DEFINE(HAVE_LIBCLN,1,[If CLN can be used])
 60-], AC_MSG_ERROR([No suitable installed version of CLN could be found.]))
 61+else AC_MSG_ERROR([No suitable installed version of CLN could be found.])
 62+fi
 63+AC_SUBST(CLN_CPPFLAGS)
 64+AC_SUBST(CLN_LIBS)
 65
 66 PKG_CHECK_MODULES(GLIB, [
 67 glib-2.0 >= 2.4
 68@@ -89,33 +121,6 @@
40 AC_SUBST(QALCULATE_CFLAGS) 69 AC_SUBST(QALCULATE_CFLAGS)
41 AC_SUBST(QALCULATE_LIBS) 70 AC_SUBST(QALCULATE_LIBS)
42  71
43-dnl ------------------------------------- 72-dnl -------------------------------------
44-dnl | internationalization (i18n) support |------------------------------------ 73-dnl | internationalization (i18n) support |------------------------------------
45-dnl ------------------------------------- 74-dnl -------------------------------------
46- 75-
47-GETTEXT_PACKAGE=qalculate-bases 76-GETTEXT_PACKAGE=qalculate-bases
48-AC_SUBST(GETTEXT_PACKAGE) 77-AC_SUBST(GETTEXT_PACKAGE)
49-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[The package name for gettext]) 78-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[The package name for gettext])
50- 79-
51-dnl Please keep this in alphabetical order 80-dnl Please keep this in alphabetical order
52-ALL_LINGUAS="nl sv" 81-ALL_LINGUAS="nl sv"