- Update to 4.6.4

- Back out staging support for the time being because the mime database
  was not being updated properly and was causing packaging failure [1]

Reported by:	QAT, avg (via email) [1]

5 files changed, 32 insertions, 32 deletions

diff --git a/finance/kmymoney-kde4/Makefile b/finance/kmymoney-kde4/Makefile
index 82fbc4429e2e..bbd620f1ea8c 100644
--- a/finance/kmymoney-kde4/Makefile
+++ b/finance/kmymoney-kde4/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	kmymoney
-PORTVERSION=	4.6.3
-PORTREVISION=	3
+PORTVERSION=	4.6.4
 CATEGORIES=	finance kde
 MASTER_SITES=	SF/${PORTNAME}2/KMyMoney-KDE4/${PORTVERSION}
 
@@ -14,13 +13,17 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	libboost_graph.so:${PORTSDIR}/devel/boost-libs \
 		libalkimia.so:${PORTSDIR}/finance/libalkimia
 
-USE_BZIP2=	yes
+USE_XZ=		yes
 USES=		cmake pkgconfig
 USE_QT4=	gui dbus network phonon sql svg xml \
 		qmake_build moc_build rcc_build uic_build
 USE_KDE4=	kdehier kdeprefix automoc4 kdelibs pimlibs sharedmime
 USE_LDCONFIG=	yes
 
+NO_STAGE=	yes
+
+MAN1=		kmymoney.1
+
 OPTIONS_DEFINE=		NLS CALENDAR KBANKING OFX QUOTES
 OPTIONS_DEFAULT=	CALENDAR
 OPTIONS_SUB=		yes
diff --git a/finance/kmymoney-kde4/distinfo b/finance/kmymoney-kde4/distinfo
index f4f1491d2cdb..22628fb3563e 100644
--- a/finance/kmymoney-kde4/distinfo
+++ b/finance/kmymoney-kde4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (kmymoney-4.6.3.tar.bz2) = 94e109992b7e9ebb066b608d56c168216b8a944d62538c95176bc36ea4db542e
-SIZE (kmymoney-4.6.3.tar.bz2) = 22114966
+SHA256 (kmymoney-4.6.4.tar.xz) = 89522fadb4a9f06f3f20e2d6ac47a147f70b4265abad2fdf3aa6672fe2a3c012
+SIZE (kmymoney-4.6.4.tar.xz) = 19917068
diff --git a/finance/kmymoney-kde4/files/patch-kmymoney__CMakeLists.txt b/finance/kmymoney-kde4/files/patch-kmymoney__CMakeLists.txt
new file mode 100644
index 000000000000..aed4782eda51
--- /dev/null
+++ b/finance/kmymoney-kde4/files/patch-kmymoney__CMakeLists.txt
@@ -0,0 +1,10 @@
+--- ./kmymoney/CMakeLists.txt.orig	2013-10-05 10:07:28.000000000 -0400
++++ ./kmymoney/CMakeLists.txt	2013-10-05 10:08:07.000000000 -0400
+@@ -99,7 +99,6 @@
+ INSTALL(FILES x-kmymoney.xml
+   DESTINATION ${XDG_MIME_INSTALL_DIR})
+ 
+-UPDATE_XDG_MIMETYPES(${XDG_MIME_INSTALL_DIR})
+ 
+ ########## Application Icons #############
+ INSTALL(DIRECTORY icons/oxygen
diff --git a/finance/kmymoney-kde4/files/patch-kmymoney_mymoney_mymoneymoney.cpp b/finance/kmymoney-kde4/files/patch-kmymoney_mymoney_mymoneymoney.cpp
deleted file mode 100644
index 22deba5715da..000000000000
--- a/finance/kmymoney-kde4/files/patch-kmymoney_mymoney_mymoneymoney.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-commit 77209f84a85360e98d2e805d412956a8f2a77db3
-Author: Alex Merry <kde@randomguy3.me.uk>
-Date:   Fri Feb 1 15:31:54 2013 +0000
-
-    Fix build with GMP 5.1.0
-    
-    GMP 5.1.0 no longer has implicit conversions to mpz_class from mpq_class
-    or mpf_class.  So we have to have an explicit conversion.
-    
-    BUG: 312481
-
-diff --git a/kmymoney/mymoney/mymoneymoney.cpp b/kmymoney/mymoney/mymoneymoney.cpp
-index aeed135..5de7fa9 100644
---- kmymoney/mymoney/mymoneymoney.cpp
-+++ kmymoney/mymoney/mymoneymoney.cpp
-@@ -158,7 +158,7 @@ QString MyMoneyMoney::formatMoney(const QString& currency, const int prec, bool
-   // be much better than using KGlobal::locale()->formatMoney.
-   bool bNegative = false;
-   mpz_class left = value / static_cast<MyMoneyMoney>(convertDenominator(d)).valueRef().get_den();
--  mpz_class right = (valueRef() - mpq_class(left)) * denom;
-+  mpz_class right = mpz_class((valueRef() - mpq_class(left)) * denom);
- 
-   if (right < 0) {
-     right = -right;
diff --git a/finance/kmymoney-kde4/pkg-plist b/finance/kmymoney-kde4/pkg-plist
index 35d4b4d3f9a6..e312d62f8fcf 100644
--- a/finance/kmymoney-kde4/pkg-plist
+++ b/finance/kmymoney-kde4/pkg-plist
@@ -90,7 +90,6 @@ lib/libkmm_plugin.so.5.0.1
 lib/libkmm_widgets.so
 lib/libkmm_widgets.so.5
 lib/libkmm_widgets.so.5.0.1
-man/man1/kmymoney.1.gz
 share/applications/kde4/kmymoney.desktop
 share/apps/kmm_csvimport/kmm_csvimport.rc
 %%CALENDAR%%share/apps/kmm_icalendarexport/kmm_icalendarexport.rc
@@ -240,7 +239,6 @@ share/apps/kmymoney/icons/oxygen/22x22/actions/institution-edit.png
 share/apps/kmymoney/icons/oxygen/22x22/actions/institution_add.png
 share/apps/kmymoney/icons/oxygen/22x22/actions/investment-add.png
 share/apps/kmymoney/icons/oxygen/22x22/actions/investment-delete.png
-share/apps/kmymoney/icons/oxygen/22x22/actions/investment-edit.png
 share/apps/kmymoney/icons/oxygen/22x22/actions/investment-update-online-all.png
 share/apps/kmymoney/icons/oxygen/22x22/actions/investment-update-online.png
 share/apps/kmymoney/icons/oxygen/22x22/actions/payee-rename.png
@@ -749,15 +747,19 @@ share/apps/kmymoney/templates/zh_TW/business.kmt
 share/apps/kmymoney/tips
 share/config.kcfg/kmymoney.kcfg
 share/config/csvimporterrc
+share/doc/HTML/de/kmymoney/account_edit.png
 share/doc/HTML/de/kmymoney/account_options.png
 share/doc/HTML/de/kmymoney/accwiz1.png
+share/doc/HTML/de/kmymoney/accwiz10.png
 share/doc/HTML/de/kmymoney/accwiz2.png
-share/doc/HTML/de/kmymoney/accwiz3.png
+share/doc/HTML/de/kmymoney/accwiz6.png
+share/doc/HTML/de/kmymoney/accwiz7.png
 share/doc/HTML/de/kmymoney/accwiz8_1.png
 share/doc/HTML/de/kmymoney/accwiz8_2.png
 share/doc/HTML/de/kmymoney/accwiz8_3.png
 share/doc/HTML/de/kmymoney/accwiz8_4.png
 share/doc/HTML/de/kmymoney/accwiz8_5.png
+share/doc/HTML/de/kmymoney/accwiz9.png
 share/doc/HTML/de/kmymoney/categoryedit.png
 share/doc/HTML/de/kmymoney/common
 share/doc/HTML/de/kmymoney/credits.docbook
@@ -790,6 +792,7 @@ share/doc/HTML/de/kmymoney/installation.docbook
 share/doc/HTML/de/kmymoney/institution_options.png
 share/doc/HTML/de/kmymoney/introduction.docbook
 share/doc/HTML/de/kmymoney/investment-transactionform.png
+share/doc/HTML/de/kmymoney/ledgerview-numbered.png
 share/doc/HTML/de/kmymoney/mainwindow_numbered.png
 share/doc/HTML/de/kmymoney/makemostof.docbook
 share/doc/HTML/de/kmymoney/man-kmymoney.1.docbook
@@ -803,7 +806,14 @@ share/doc/HTML/de/kmymoney/newinst.png
 share/doc/HTML/de/kmymoney/newsched_numbered.png
 share/doc/HTML/de/kmymoney/payee_info.png
 share/doc/HTML/de/kmymoney/payee_match.png
+share/doc/HTML/de/kmymoney/reconcile-redo.png
+share/doc/HTML/de/kmymoney/reconcile1.png
+share/doc/HTML/de/kmymoney/reconcile2.png
+share/doc/HTML/de/kmymoney/reconcile3.png
 share/doc/HTML/de/kmymoney/reference.docbook
+share/doc/HTML/de/kmymoney/report_configuration-reporttab.png
+share/doc/HTML/de/kmymoney/report_configuration-rowscolumns.png
+share/doc/HTML/de/kmymoney/reports_view-all.png
 share/doc/HTML/de/kmymoney/select_currency.png
 share/doc/HTML/de/kmymoney/tipofday.png
 share/doc/HTML/de/kmymoney/transactionform.png
@@ -1316,6 +1326,7 @@ share/kde4/servicetypes/kmymoneyplugin.desktop
 %%NLS%%share/locale/ja/LC_MESSAGES/kmymoney.mo
 %%NLS%%share/locale/kk/LC_MESSAGES/kmymoney.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/kmymoney.mo
+%%NLS%%share/locale/mr/LC_MESSAGES/kmymoney.mo
 %%NLS%%share/locale/ms/LC_MESSAGES/kmymoney.mo
 %%NLS%%share/locale/nds/LC_MESSAGES/kmymoney.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/kmymoney.mo