diff options
| -rw-r--r-- | finance/kmymoney2/Makefile | 5 | ||||
| -rw-r--r-- | finance/kmymoney2/PLIST | 3 | ||||
| -rw-r--r-- | finance/kmymoney2/distinfo | 5 | ||||
| -rw-r--r-- | finance/kmymoney2/patches/patch-ah | 28 | ||||
| -rw-r--r-- | finance/kmymoney2/patches/patch-kmymoney2_mymoney_mymoneymoney.cpp | 17 |
5 files changed, 50 insertions, 8 deletions
diff --git a/finance/kmymoney2/Makefile b/finance/kmymoney2/Makefile index 2975241a54c..97be476f8c0 100644 --- a/finance/kmymoney2/Makefile +++ b/finance/kmymoney2/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.52 2011/11/01 06:01:11 sbd Exp $ +# $NetBSD: Makefile,v 1.53 2011/12/10 17:50:23 marino Exp $ DISTNAME= kmymoney2-1.0.5 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= finance kde MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kmymoney2/} EXTRACT_SUFX= .tar.bz2 @@ -17,6 +17,7 @@ USE_TOOLS+= gmake msgfmt perl pkg-config bash USE_LANGUAGES= c c++ USE_LIBTOOL= YES GNU_CONFIGURE= YES +MAKE_JOBS_SAFE= NO CONFIG_SHELL= ${BASH} SHLIBTOOL_OVERRIDE= # empty diff --git a/finance/kmymoney2/PLIST b/finance/kmymoney2/PLIST index 177162a2e2e..418b0b446bd 100644 --- a/finance/kmymoney2/PLIST +++ b/finance/kmymoney2/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.13 2010/03/16 09:17:38 wiz Exp $ +@comment $NetBSD: PLIST,v 1.14 2011/12/10 17:50:23 marino Exp $ bin/kmymoney bin/kmymoney2 include/kmymoney/export.h @@ -81,6 +81,7 @@ lib/libkmm_kdchart.la lib/libkmm_mymoney.la lib/libkmm_plugin.la man/man1/kmymoney2.1 +qt3/plugins/sqldrivers/libsqlite3.so share/applications/kde/kmymoney2.desktop share/doc/kde/HTML/en/kmymoney2/account_edit.png share/doc/kde/HTML/en/kmymoney2/account_options.png diff --git a/finance/kmymoney2/distinfo b/finance/kmymoney2/distinfo index 399a2c6b5b0..06c22c62023 100644 --- a/finance/kmymoney2/distinfo +++ b/finance/kmymoney2/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.12 2011/05/16 21:29:04 shattered Exp $ +$NetBSD: distinfo,v 1.13 2011/12/10 17:50:23 marino Exp $ SHA1 (kmymoney2-1.0.5.tar.bz2) = dc496bb95353f0254125faa1de37b1431af06f1e RMD160 (kmymoney2-1.0.5.tar.bz2) = 14a468b54335bd753cae0bc531ca648275cd1bfd @@ -9,4 +9,5 @@ SHA1 (patch-ad) = a9c0796d239fa3143018bd6ed1f2d568acf219ec SHA1 (patch-ae) = 3466df88f68535549172e253ad24142ef1149360 SHA1 (patch-af) = 9228789b4d601a22d77fe7b41e04fa08a068040c SHA1 (patch-ag) = a52dd21ff8c88b3729783d664094c1be00a454d4 -SHA1 (patch-ah) = b300dd6ff582b1d1db9e32dd0cc3785e5449bfff +SHA1 (patch-ah) = d876606dd311f4729d8c3ca262f3e131cc862bf4 +SHA1 (patch-kmymoney2_mymoney_mymoneymoney.cpp) = 55f5cb63772299d92e7cd7ca6f825ff3c2dc9285 diff --git a/finance/kmymoney2/patches/patch-ah b/finance/kmymoney2/patches/patch-ah index df1d1b72679..4102b753a03 100644 --- a/finance/kmymoney2/patches/patch-ah +++ b/finance/kmymoney2/patches/patch-ah @@ -1,7 +1,7 @@ -$NetBSD: patch-ah,v 1.3 2009/09/02 10:05:52 wiz Exp $ +$NetBSD: patch-ah,v 1.4 2011/12/10 17:50:23 marino Exp $ ---- acinclude.m4.orig 2009-05-28 06:44:50.000000000 -0400 -+++ acinclude.m4 2009-05-28 06:45:18.000000000 -0400 +--- acinclude.m4.orig 2010-05-10 19:24:51.000000000 +0000 ++++ acinclude.m4 @@ -612,7 +612,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS], KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""]) @@ -11,3 +11,25 @@ $NetBSD: patch-ah,v 1.3 2009/09/02 10:05:52 wiz Exp $ test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs" AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET) if test "$KDE_XSL_STYLESHEET" = "NO"; then +@@ -12173,6 +12173,7 @@ AC_DEFUN([AC_SQLITE3], [ + rm -rf qt-sqlite3-0.2 + gunzip -c `dirname -- ${0}`/23011-qt-sqlite3-0.2.tar.gz | tar -xf - + cd qt-sqlite3-0.2 ++ sed -i s/QTDIR/\(QTDIR\)/ sqlite3/sqlite3.pro + ${ac_qmake} QMAKE=${ac_qmake} + SQLITE3=qt-sqlite3-0.2 + sed -i s/^install:.*$// Makefile +@@ -12197,11 +12198,11 @@ install: + if test ! x$SQLITE3 = x; then \ + if test "x\$(DESTDIR)" = "x" -a "${prefix:0-5}" = "_inst"; then \ + /bin/sh ../$ac_aux_dir/mkinstalldirs \`dirname ${prefix}${LIBSQLITE3}\`; \ +- ${INSTALL} sqldrivers/libqsqlite3.so ${prefix}${LIBSQLITE3}; \ ++ ${INSTALL} sqldrivers/.libs/libqsqlite3.so ${prefix}${LIBSQLITE3}; \ + chmod 755 ${prefix}${LIBSQLITE3}; \ + else \ + /bin/sh ../$ac_aux_dir/mkinstalldirs \`dirname \$(DESTDIR)${LIBSQLITE3}\`; \ +- ${INSTALL} sqldrivers/libqsqlite3.so \$(DESTDIR)${LIBSQLITE3}; \ ++ ${INSTALL} sqldrivers/.libs/libqsqlite3.so \$(DESTDIR)${LIBSQLITE3}; \ + chmod 755 \$(DESTDIR)${LIBSQLITE3}; \ + fi \ + fi diff --git a/finance/kmymoney2/patches/patch-kmymoney2_mymoney_mymoneymoney.cpp b/finance/kmymoney2/patches/patch-kmymoney2_mymoney_mymoneymoney.cpp new file mode 100644 index 00000000000..198b1d3f481 --- /dev/null +++ b/finance/kmymoney2/patches/patch-kmymoney2_mymoney_mymoneymoney.cpp @@ -0,0 +1,17 @@ +$NetBSD: patch-kmymoney2_mymoney_mymoneymoney.cpp,v 1.1 2011/12/10 17:50:23 marino Exp $ + +--- kmymoney2/mymoney/mymoneymoney.cpp.orig 2010-03-02 09:45:39.000000000 +0000 ++++ kmymoney2/mymoney/mymoneymoney.cpp +@@ -46,9 +46,9 @@ bool MyMoneyMoney::_positivePrefixCurren + + MyMoneyMoney::fileVersionE MyMoneyMoney::_fileVersion = MyMoneyMoney::FILE_4_BYTE_VALUE; + +-MyMoneyMoney MyMoneyMoney::maxValue = MyMoneyMoney(INT64_MAX,100); +-MyMoneyMoney MyMoneyMoney::minValue = MyMoneyMoney(INT64_MIN,100); +-MyMoneyMoney MyMoneyMoney::autoCalc = MyMoneyMoney(INT64_MIN+1,100); ++MyMoneyMoney MyMoneyMoney::maxValue = MyMoneyMoney((signed64)INT64_MAX,100); ++MyMoneyMoney MyMoneyMoney::minValue = MyMoneyMoney((signed64)INT64_MIN,100); ++MyMoneyMoney MyMoneyMoney::autoCalc = MyMoneyMoney((signed64)INT64_MIN+1,100); + + void MyMoneyMoney::setNegativePrefixCurrencySymbol(const bool flag) + { |