head 1.3; access; symbols pkgsrc-2019Q3:1.2.0.84 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.82 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.80 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.78 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.76 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.74 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.72 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.70 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.68 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.64 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.62 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.60 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.58 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.56 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.54 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.52 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.50 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.48 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.46 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.44 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.42 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.40 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.38 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.36 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.34 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.32 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.30 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.28 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.26 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.2.0.24 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.2.0.22 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.20 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.2.0.18 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.16 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.14 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.12 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.10 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.8 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.6 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.4 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.2 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.1.0.30 pkgsrc-2009Q2-base:1.1 pkgsrc-2009Q1:1.1.0.28 pkgsrc-2009Q1-base:1.1 pkgsrc-2008Q4:1.1.0.26 pkgsrc-2008Q4-base:1.1 pkgsrc-2008Q3:1.1.0.24 pkgsrc-2008Q3-base:1.1 cube-native-xorg:1.1.0.22 cube-native-xorg-base:1.1 pkgsrc-2008Q2:1.1.0.20 pkgsrc-2008Q2-base:1.1 cwrapper:1.1.0.18 pkgsrc-2008Q1:1.1.0.16 pkgsrc-2008Q1-base:1.1 pkgsrc-2007Q4:1.1.0.14 pkgsrc-2007Q4-base:1.1 pkgsrc-2007Q3:1.1.0.12 pkgsrc-2007Q3-base:1.1 pkgsrc-2007Q2:1.1.0.10 pkgsrc-2007Q2-base:1.1 pkgsrc-2007Q1:1.1.0.8 pkgsrc-2007Q1-base:1.1 pkgsrc-2006Q4:1.1.0.6 pkgsrc-2006Q4-base:1.1 pkgsrc-2006Q3:1.1.0.4 pkgsrc-2006Q3-base:1.1 pkgsrc-2006Q2:1.1.0.2 pkgsrc-2006Q2-base:1.1; locks; strict; comment @# @; 1.3 date 2019.11.20.22.25.56; author markd; state dead; branches; next 1.2; commitid 0R0s98IeC4TzMDLB; 1.2 date 2009.09.06.15.24.38; author asau; state Exp; branches; next 1.1; 1.1 date 2006.06.22.18.52.00; author jlam; state Exp; branches; next ; desc @@ 1.3 log @qalculate-{bases,currency,units}: remove last release 13 years ago. not part of current qalculate development. @ text @$NetBSD: patch-ab,v 1.2 2009/09/06 15:24:38 asau Exp $ --- configure.in.orig 2006-04-18 11:13:35.000000000 +0400 +++ configure.in 2009-09-06 19:17:39.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 |------------------------------------- @@@@ -54,7 +55,33 @@@@ fi changequote([,])dnl +dnl ------------------------------------- +dnl | internationalization (i18n) support |------------------------------------ +dnl ------------------------------------- + +GETTEXT_PACKAGE=qalculate-bases +AC_SUBST(GETTEXT_PACKAGE) +AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[The package name for gettext]) +dnl Please keep this in alphabetical order +ALL_LINGUAS="nl sv" +AM_GLIB_GNU_GETTEXT + +dnl AM_GLIB_GNU_GETTEXT sets $DATADIRNAME +AC_MSG_CHECKING(locale directory) +if test "x$prefix" = "xNONE"; then + PACKAGE_LOCALE_DIR=$ac_default_prefix/share/locale +else + PACKAGE_LOCALE_DIR=$prefix/share/locale +fi + +AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "$PACKAGE_LOCALE_DIR", + [The directory in which qalculate's locale data will be stored]) + AC_MSG_RESULT("$PACKAGE_LOCALE_DIR") + +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 $< [$]@@' +AC_SUBST(INTLTOOL_QALCULATE_DEFINITIONS_RULE) + dnl -------------------------------- dnl | check for neccessary libraries |----------------------------------------- dnl -------------------------------- @@@@ -63,11 +90,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 +121,6 @@@@ AC_SUBST(QALCULATE_CFLAGS) AC_SUBST(QALCULATE_LIBS) -dnl ------------------------------------- -dnl | internationalization (i18n) support |------------------------------------ -dnl ------------------------------------- - -GETTEXT_PACKAGE=qalculate-bases -AC_SUBST(GETTEXT_PACKAGE) -AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[The package name for gettext]) - -dnl Please keep this in alphabetical order -ALL_LINGUAS="nl sv" -AM_GLIB_GNU_GETTEXT - -dnl AM_GLIB_GNU_GETTEXT sets $DATADIRNAME -AC_MSG_CHECKING(locale directory) -if test "x$prefix" = "xNONE"; then - PACKAGE_LOCALE_DIR=$ac_default_prefix/share/locale -else - PACKAGE_LOCALE_DIR=$prefix/share/locale -fi - -AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "$PACKAGE_LOCALE_DIR", - [The directory in which qalculate's locale data will be stored]) - AC_MSG_RESULT("$PACKAGE_LOCALE_DIR") - -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 $< [$]@@' -AC_SUBST(INTLTOOL_QALCULATE_DEFINITIONS_RULE) - dnl -------- dnl | output |----------------------------------------------------------------- dnl -------- @ 1.2 log @Fix build after CLN update. Bump revision (autoconf dependency). @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.1 2006/06/22 18:52:00 jlam Exp $ @ 1.1 log @Reorder the linker tests in the configure script so that we test for C libraries *before* we throw the AC_LANG([C++]) switch. This makes the generated configure script use the C compiler/linker instead of the C++ compiler/linker when running tests. This avoids errors like these based on not correctly getting the function signature correct: conftest.cc:36: error: nonnull argument with out-of-range operand number (arg 1, operand 2) This error was causing the configure script to not detect *gettext() routines and not building and installing the *.mo files. This fixes the error noted in the bulk build results: http://mail-index.netbsd.org/pkgsrc-bulk/2006/06/20/0000.html @ text @d1 1 a1 1 $NetBSD$ d3 11 a13 3 --- configure.in.orig 2006-04-18 03:13:35.000000000 -0400 +++ configure.in @@@@ -54,7 +54,33 @@@@ if test "x$GCC" = "xyes"; then d47 22 a68 1 @@@@ -89,33 +115,6 @@@@ PKG_CHECK_MODULES(QALCULATE, [ @