- Update to 4.6.0

PR:		ports/160162
Submitted by:	Jason E. Hale <bsdkaffee@gmail.com (maintainer)

3 files changed, 45 insertions, 21 deletions

diff --git a/finance/kmymoney-kde4/Makefile b/finance/kmymoney-kde4/Makefile
index c5c5c0965939..c57446145e15 100644
--- a/finance/kmymoney-kde4/Makefile
+++ b/finance/kmymoney-kde4/Makefile
@@ -6,16 +6,20 @@
 #
 
 PORTNAME=	kmymoney
-PORTVERSION=	4.5.3
-PORTREVISION=	1
+PORTVERSION=	4.6.0
 CATEGORIES=	finance kde
 MASTER_SITES=	SF/${PORTNAME}2/KMyMoney-KDE4/${PORTVERSION}
+DISTFILES=	${PORTNAME}-${PORTVERSION}-2${EXTRACT_SUFX}
 
 MAINTAINER=	bsdkaffee@gmail.com
 COMMENT=	KDE 4.x-based personal finance manager
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 BUILD_DEPENDS=	${LOCALBASE}/share/xml/docbook/4.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-xml
-LIB_DEPENDS=	boost_graph.4:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	boost_graph.4:${PORTSDIR}/devel/boost-libs \
+		alkimia.4:${PORTSDIR}/finance/libalkimia
 
 USE_BZIP2=	yes
 USE_CMAKE=	yes
@@ -29,9 +33,6 @@ MAKE_JOBS_SAFE=	yes
 
 MAN1=		kmymoney.1
 
-LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
-
 OPTIONS=	CALENDAR "Enable Calendar plugin" on \
 		KBANKING "Enable KBanking plugin" off \
 		OFX "Enable OFX plugin" off \
@@ -77,7 +78,7 @@ RUN_DEPENDS+=	${SITE_PERL}/Date/Manip.pm:${PORTSDIR}/devel/p5-Date-Manip \
 .endif
 
 .if !defined(PACKAGE_BUILDING) && defined(WITH_KBANKING) && !exists(${LOCALBASE}/lib/libgwengui-qt4.so)
-IGNORE= Please rebuild devel/gwenhywfar with the WITH_QT4 option set
+IGNORE=		please rebuild devel/gwenhywfar with the WITH_QT4 option set
 .endif
 
 .include <bsd.port.mk>
diff --git a/finance/kmymoney-kde4/distinfo b/finance/kmymoney-kde4/distinfo
index ceab81f18645..ff6aa3b2a523 100644
--- a/finance/kmymoney-kde4/distinfo
+++ b/finance/kmymoney-kde4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (kmymoney-4.5.3.tar.bz2) = a9b37275cf3cdcd5ce865d94391df44c7822639b830fccb9962a54b7fcf76ffb
-SIZE (kmymoney-4.5.3.tar.bz2) = 14937401
+SHA256 (kmymoney-4.6.0-2.tar.bz2) = 659d0798ddb14cbd75ee81f1f1a139ab593f25110a2df35cef6c07a847564792
+SIZE (kmymoney-4.6.0-2.tar.bz2) = 20913881
diff --git a/finance/kmymoney-kde4/pkg-plist b/finance/kmymoney-kde4/pkg-plist
index f08057bd947a..67d12befbd27 100644
--- a/finance/kmymoney-kde4/pkg-plist
+++ b/finance/kmymoney-kde4/pkg-plist
@@ -16,7 +16,6 @@ include/kmymoney/kmymoneyaccountcombo.h
 include/kmymoney/kmymoneyaccountcompletion.h
 include/kmymoney/kmymoneyaccountselector.h
 include/kmymoney/kmymoneycategory.h
-include/kmymoney/kmymoneychecklistitem.h
 include/kmymoney/kmymoneycombo.h
 include/kmymoney/kmymoneycompletion.h
 include/kmymoney/kmymoneycurrencyselector.h
@@ -73,6 +72,7 @@ include/kmymoney/transactionsortoptionimpl.h
 include/kmymoney/viewinterface.h
 %%WITH_CALENDAR%%lib/kde4/kcm_kmm_icalendarexport.so
 lib/kde4/kcm_kmm_printcheck.so
+lib/kde4/kmm_csvimport.so
 %%WITH_CALENDAR%%lib/kde4/kmm_icalendarexport.so
 %%WITH_KBANKING%%lib/kde4/kmm_kbanking.so
 %%WITH_OFX%%lib/kde4/kmm_ofximport.so
@@ -91,10 +91,12 @@ lib/libkmm_widgets.so
 lib/libkmm_widgets.so.5
 lib/libkmm_widgets.so.5.0.1
 share/applications/kde4/kmymoney.desktop
+share/apps/kmm_csvimport/kmm_csvimport.rc
 %%WITH_CALENDAR%%share/apps/kmm_icalendarexport/kmm_icalendarexport.rc
 %%WITH_KBANKING%%share/apps/kmm_kbanking/kmm_kbanking.rc
 %%WITH_OFX%%share/apps/kmm_ofximport/kmm_ofximport.rc
 share/apps/kmm_printcheck/check_template.html
+share/apps/kmm_printcheck/check_template_green_linen.html
 share/apps/kmm_printcheck/kmm_printcheck.rc
 share/apps/kmymoney/html/images/about_kde.png
 share/apps/kmymoney/html/images/arrow.png
@@ -472,6 +474,20 @@ share/apps/kmymoney/templates/dk/homeown.kmt
 share/apps/kmymoney/templates/el_GR/brokerage.kmt
 share/apps/kmymoney/templates/el_GR/carloan.kmt
 share/apps/kmymoney/templates/el_GR/common.kmt
+share/apps/kmymoney/templates/en_CA/automobile.kmt
+share/apps/kmymoney/templates/en_CA/basicaccount.kmt
+share/apps/kmymoney/templates/en_CA/brokerageinvestments.kmt
+share/apps/kmymoney/templates/en_CA/cdgicmoneymarket.kmt
+share/apps/kmymoney/templates/en_CA/checkbook.kmt
+share/apps/kmymoney/templates/en_CA/daycare.kmt
+share/apps/kmymoney/templates/en_CA/fixedassets.kmt
+share/apps/kmymoney/templates/en_CA/homeowner.kmt
+share/apps/kmymoney/templates/en_CA/houserent.kmt
+share/apps/kmymoney/templates/en_CA/income.kmt
+share/apps/kmymoney/templates/en_CA/incomespouse.kmt
+share/apps/kmymoney/templates/en_CA/retimentspouse.kmt
+share/apps/kmymoney/templates/en_CA/retirement.kmt
+share/apps/kmymoney/templates/en_CA/studyloan.kmt
 share/apps/kmymoney/templates/en_GB/brokerage.kmt
 share/apps/kmymoney/templates/en_GB/business.kmt
 share/apps/kmymoney/templates/en_GB/carloan.kmt
@@ -1053,21 +1069,22 @@ share/doc/HTML/uk/kmymoney/newfile.png
 share/doc/HTML/uk/kmymoney/reference.docbook
 share/doc/HTML/uk/kmymoney/tipofday.png
 share/doc/HTML/uk/kmymoney/whatsnew.docbook
+share/icons/hicolor/128x128/apps/kmymoney.png
+share/icons/hicolor/128x128/mimetypes/kmy.png
+share/icons/hicolor/16x16/apps/kmymoney.png
+share/icons/hicolor/16x16/mimetypes/kmy.png
+share/icons/hicolor/22x22/mimetypes/kmy.png
+share/icons/hicolor/32x32/apps/kmymoney.png
+share/icons/hicolor/32x32/mimetypes/kmy.png
+share/icons/hicolor/48x48/apps/kmymoney.png
+share/icons/hicolor/48x48/mimetypes/kmy.png
+share/icons/hicolor/64x64/apps/kmymoney.png
+share/icons/hicolor/64x64/mimetypes/kmy.png
 share/icons/locolor/16x16/apps/kmymoney.png
 share/icons/locolor/32x32/apps/kmymoney.png
-share/icons/oxygen/128x128/apps/kmymoney.png
-share/icons/oxygen/128x128/mimetypes/kmy.png
-share/icons/oxygen/16x16/apps/kmymoney.png
-share/icons/oxygen/16x16/mimetypes/kmy.png
-share/icons/oxygen/22x22/mimetypes/kmy.png
-share/icons/oxygen/32x32/apps/kmymoney.png
-share/icons/oxygen/32x32/mimetypes/kmy.png
-share/icons/oxygen/48x48/apps/kmymoney.png
-share/icons/oxygen/48x48/mimetypes/kmy.png
-share/icons/oxygen/64x64/apps/kmymoney.png
-share/icons/oxygen/64x64/mimetypes/kmy.png
 %%WITH_CALENDAR%%share/kde4/services/kcm_kmm_icalendarexport.desktop
 share/kde4/services/kcm_kmm_printcheck.desktop
+share/kde4/services/kmm_csvimport.desktop
 %%WITH_CALENDAR%%share/kde4/services/kmm_icalendarexport.desktop
 %%WITH_KBANKING%%share/kde4/services/kmm_kbanking.desktop
 %%WITH_OFX%%share/kde4/services/kmm_ofximport.desktop
@@ -1076,6 +1093,7 @@ share/kde4/services/kmm_reconciliationreport.desktop
 share/kde4/servicetypes/kmymoneyimporterplugin.desktop
 share/kde4/servicetypes/kmymoneyplugin.desktop
 share/locale/bg/LC_MESSAGES/kmymoney.mo
+share/locale/bs/LC_MESSAGES/kmymoney.mo
 share/locale/ca/LC_MESSAGES/kmymoney.mo
 share/locale/ca@valencia/LC_MESSAGES/kmymoney.mo
 share/locale/cs/LC_MESSAGES/kmymoney.mo
@@ -1106,11 +1124,14 @@ share/locale/ru/LC_MESSAGES/kmymoney.mo
 share/locale/sk/LC_MESSAGES/kmymoney.mo
 share/locale/sv/LC_MESSAGES/kmymoney.mo
 share/locale/tr/LC_MESSAGES/kmymoney.mo
+share/locale/ug/LC_MESSAGES/kmymoney.mo
 share/locale/uk/LC_MESSAGES/kmymoney.mo
 share/locale/zh_CN/LC_MESSAGES/kmymoney.mo
 share/locale/zh_TW/LC_MESSAGES/kmymoney.mo
 share/mime/application/x-kmymoney.xml
 share/mime/packages/x-kmymoney.xml
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
 @dirrmtry share/icons/locolor/32x32/apps
 @dirrmtry share/icons/locolor/32x32
 @dirrmtry share/icons/locolor/16x16/apps
@@ -1146,6 +1167,7 @@ share/mime/packages/x-kmymoney.xml
 @dirrm share/apps/kmymoney/templates/es_AR
 @dirrm share/apps/kmymoney/templates/en_US
 @dirrm share/apps/kmymoney/templates/en_GB
+@dirrm share/apps/kmymoney/templates/en_CA
 @dirrm share/apps/kmymoney/templates/el_GR
 @dirrm share/apps/kmymoney/templates/dk
 @dirrm share/apps/kmymoney/templates/de_DE
@@ -1191,6 +1213,7 @@ share/mime/packages/x-kmymoney.xml
 %%WITH_OFX%%@dirrm share/apps/kmm_ofximport
 %%WITH_KBANKING%%@dirrm share/apps/kmm_kbanking
 %%WITH_CALENDAR%%@dirrm share/apps/kmm_icalendarexport
+@dirrm share/apps/kmm_csvimport
 @dirrm include/kmymoney
 @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true
 @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true