25 files changed, 87 insertions, 300 deletions

diff --git a/finance/kmymoney-kde4/Makefile b/finance/kmymoney-kde4/Makefile
index 0b558be20557..306106c60c3f 100644
--- a/finance/kmymoney-kde4/Makefile
+++ b/finance/kmymoney-kde4/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	kmymoney2
-PORTVERSION=	0.7.5
-PORTREVISION=	2
+PORTVERSION=	0.8.2
 CATEGORIES=	finance
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,6 +14,24 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	alecn2002@yandex.ru
 COMMENT=	KDE-based personal finance assistant
 
+LIB_DEPENDS=	osp.3:${PORTSDIR}/textproc/opensp
+BUILD_DEPENDS=	${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash
+
+# Currently no possibility to enable OFX; requires additional work
+.undef WITH_OFX
+WITHOUT_OFX=	yes
+
+.if defined(WITH_OFX)
+LIB_DEPENDS+=	ofx.2:${PORTSDIR}/finance/libofx
+CONFIGURE_ARGS=	--enable-ofxplugin
+OFXPLUGIN=
+.else
+CONFIGURE_ARGS=	--enable-ofxplugin=no
+OFXPLUGIN=	"@comment "
+.endif
+
+PLIST_SUB+=	OFXPLUGIN=${OFXPLUGIN}
+
 USE_KDELIBS_VER=	3
 USE_GMAKE=		yes
 USE_AUTOTOOLS=		libtool:15
@@ -31,7 +48,10 @@ DOCSDIR=		${PREFIX}/share/doc/HTML/en/${PORTNAME}
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 500000
-BROKEN=		"Does not build on 4.x"
+BROKEN=		Does not build on 4.x
 .endif
 
+post-patch:
+	${REINPLACE_CMD} -E -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/configure
+
 .include <bsd.port.post.mk>
diff --git a/finance/kmymoney-kde4/distinfo b/finance/kmymoney-kde4/distinfo
index 4b28ef4bf897..64c1e107740d 100644
--- a/finance/kmymoney-kde4/distinfo
+++ b/finance/kmymoney-kde4/distinfo
@@ -1,3 +1,3 @@
-MD5 (kmymoney2-0.7.5.tar.bz2) = 40a5667476a06cb2fbc30e7f9417ebbf
-SHA256 (kmymoney2-0.7.5.tar.bz2) = 09afb2f66a274cf76f56301b7c9936d133413e48fe628a5ea7ed426cc8f34c6a
-SIZE (kmymoney2-0.7.5.tar.bz2) = 5668425
+MD5 (kmymoney2-0.8.2.tar.bz2) = ffb09eaba4f93cd47e9600a2cb6b02c5
+SHA256 (kmymoney2-0.8.2.tar.bz2) = e9bb08f768d89b6839864920ba087a1fa37eb9ed7adfc9adb088b7267b29e530
+SIZE (kmymoney2-0.8.2.tar.bz2) = 6061389
diff --git a/finance/kmymoney-kde4/files/patch-configure b/finance/kmymoney-kde4/files/patch-configure
new file mode 100644
index 000000000000..eb8f73fda1ed
--- /dev/null
+++ b/finance/kmymoney-kde4/files/patch-configure
@@ -0,0 +1,47 @@
+--- configure.orig	Fri Dec 30 14:52:51 2005
++++ configure	Tue Jan  3 19:44:57 2006
+@@ -1,4 +1,4 @@
+-#! /bin/sh
++#! %%LOCALBASE%%/bin/bash
+ # Guess values for system-dependent variables and create Makefiles.
+ # Generated by GNU Autoconf 2.59.
+ #
+@@ -34022,7 +34022,7 @@
+   have_new_ofx="no"
+ fi
+ 
+-    if test "$have_new_ofx" == "yes"; then
++    if test "$have_new_ofx" = "yes"; then
+       ofx_importerplugin="ofximport"
+       ofx_libs="-lofx"
+     fi
+@@ -34242,7 +34242,7 @@
+   have_new_ofx="no"
+ fi
+ 
+-    if test "$have_new_ofx" == "yes"; then
++    if test "$have_new_ofx" = "yes"; then
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define USE_OFX_DIRECTCONNECT "1"
+@@ -34275,7 +34275,7 @@
+   pushd $DIR > /dev/null
+   CD=`pwd`
+   popd > /dev/null
+-  if test "$srcdir" == "." -o ${CD:0:${#CURDIR}} != $CURDIR; then
++  if test "$srcdir" = "." -o ${CD:0:${#CURDIR}} != $CURDIR; then
+     HFILES=$(grep -v noinst_HEADERS $mfile | grep _HEADERS)
+     for HFILE in $HFILES; do
+       case $HFILE in
+@@ -36104,11 +36104,6 @@
+ 
+ { (exit 0); exit 0; }
+ _ACEOF
+-if test "x$with_fast_perl" = "xyes"; then    
+-  perl -i.bak $ac_aux_dir/conf.change.pl $CONFIG_STATUS    \
+-    || mv $CONFIG_STATUS.bak $CONFIG_STATUS    
+-  rm -f $CONFIG_STATUS.bak
+-fi    
+ chmod +x $CONFIG_STATUS
+ ac_clean_files=$ac_clean_files_save
+ 
diff --git a/finance/kmymoney-kde4/files/patch-kmymoney2_dialogs-kcurrencycalculatordecl.ui b/finance/kmymoney-kde4/files/patch-kmymoney2_dialogs-kcurrencycalculatordecl.ui
deleted file mode 100644
index ac0d5aa0d7f6..000000000000
--- a/finance/kmymoney-kde4/files/patch-kmymoney2_dialogs-kcurrencycalculatordecl.ui
+++ /dev/null
@@ -1,11 +0,0 @@
---- kmymoney2/dialogs/kcurrencycalculatordecl.ui.orig	Tue Sep 27 22:55:46 2005
-+++ kmymoney2/dialogs/kcurrencycalculatordecl.ui	Tue Sep 27 23:00:12 2005
-@@ -378,8 +378,4 @@
-     <tabstop>m_cancelButton</tabstop>
- </tabstops>
- <layoutdefaults spacing="6" margin="11"/>
--<includehints>
--    <includehint>kmymoneyedit.h</includehint>
--    <includehint>kmymoneyedit.h</includehint>
--</includehints>
- </UI>
diff --git a/finance/kmymoney-kde4/files/patch-kmymoney2_dialogs-kcurrencyeditdlgdecl.ui b/finance/kmymoney-kde4/files/patch-kmymoney2_dialogs-kcurrencyeditdlgdecl.ui
deleted file mode 100644
index fdf103fe770b..000000000000
--- a/finance/kmymoney-kde4/files/patch-kmymoney2_dialogs-kcurrencyeditdlgdecl.ui
+++ /dev/null
@@ -1,10 +0,0 @@
---- kmymoney2/dialogs/kcurrencyeditdlgdecl.ui.orig	Tue Sep 27 23:06:09 2005
-+++ kmymoney2/dialogs/kcurrencyeditdlgdecl.ui	Tue Sep 27 23:06:17 2005
-@@ -301,7 +301,4 @@
-     </image>
- </images>
- <layoutdefaults spacing="6" margin="11"/>
--<includehints>
--    <includehint>kmymoneylineedit.h</includehint>
--</includehints>
- </UI>
diff --git a/finance/kmymoney-kde4/files/patch-kmymoney2_dialogs-keditequityentrydecl.ui b/finance/kmymoney-kde4/files/patch-kmymoney2_dialogs-keditequityentrydecl.ui
deleted file mode 100644
index 5b326e8a16ac..000000000000
--- a/finance/kmymoney-kde4/files/patch-kmymoney2_dialogs-keditequityentrydecl.ui
+++ /dev/null
@@ -1,11 +0,0 @@
---- kmymoney2/dialogs/keditequityentrydecl.ui.orig	Tue Sep 27 23:09:14 2005
-+++ kmymoney2/dialogs/keditequityentrydecl.ui	Tue Sep 27 23:09:23 2005
-@@ -303,8 +303,4 @@
-     </image>
- </images>
- <layoutdefaults spacing="6" margin="11"/>
--<includehints>
--    <includehint>kmymoneyedit.h</includehint>
--    <includehint>kmymoneypriceview.h</includehint>
--</includehints>
- </UI>
diff --git a/finance/kmymoney-kde4/files/patch-kmymoney2_dialogs-keditschedtransdlgdecl.ui b/finance/kmymoney-kde4/files/patch-kmymoney2_dialogs-keditschedtransdlgdecl.ui
deleted file mode 100644
index 4aeb090327d5..000000000000
--- a/finance/kmymoney-kde4/files/patch-kmymoney2_dialogs-keditschedtransdlgdecl.ui
+++ /dev/null
@@ -1,21 +0,0 @@
---- kmymoney2/dialogs/keditschedtransdlgdecl.ui.orig	Tue Sep 27 23:12:08 2005
-+++ kmymoney2/dialogs/keditschedtransdlgdecl.ui	Tue Sep 27 23:13:09 2005
-@@ -856,18 +856,6 @@
- </tabstops>
- <layoutdefaults spacing="6" margin="11"/>
- <includehints>
--    <includehint>kmymoneydateinput.h</includehint>
--    <includehint>kmymoneyaccountcombo.h</includehint>
--    <includehint>kmymoneycombo.h</includehint>
--    <includehint>kmymoneycombo.h</includehint>
--    <includehint>kmymoneyaccountcombo.h</includehint>
--    <includehint>kmymoneypayee.h</includehint>
--    <includehint>kmymoneyedit.h</includehint>
--    <includehint>kmymoneycategory.h</includehint>
--    <includehint>kpushbutton.h</includehint>
--    <includehint>kmymoneydateinput.h</includehint>
--    <includehint>kpushbutton.h</includehint>
--    <includehint>kpushbutton.h</includehint>
-     <includehint>kpushbutton.h</includehint>
- </includehints>
- </UI>
diff --git a/finance/kmymoney-kde4/files/patch-kmymoney2_dialogs-kendingbalancedlgdecl.ui b/finance/kmymoney-kde4/files/patch-kmymoney2_dialogs-kendingbalancedlgdecl.ui
deleted file mode 100644
index 662e9f1bef31..000000000000
--- a/finance/kmymoney-kde4/files/patch-kmymoney2_dialogs-kendingbalancedlgdecl.ui
+++ /dev/null
@@ -1,22 +0,0 @@
---- kmymoney2/dialogs/kendingbalancedlgdecl.ui.orig	Tue Sep 27 23:15:38 2005
-+++ kmymoney2/dialogs/kendingbalancedlgdecl.ui	Tue Sep 27 23:16:14 2005
-@@ -1060,19 +1060,4 @@
-     </image>
- </images>
- <layoutdefaults spacing="6" margin="11"/>
--<includehints>
--    <includehint>kmymoneydateinput.h</includehint>
--    <includehint>kmymoneydateinput.h</includehint>
--    <includehint>kmymoneyedit.h</includehint>
--    <includehint>kmymoneyedit.h</includehint>
--    <includehint>kmymoneyaccountselector.h</includehint>
--    <includehint>kmymoneyaccountselector.h</includehint>
--    <includehint>kmymoneydateinput.h</includehint>
--    <includehint>kmymoneyedit.h</includehint>
--    <includehint>kmymoneyedit.h</includehint>
--    <includehint>kmymoneyedit.h</includehint>
--    <includehint>kmymoneycategory.h</includehint>
--    <includehint>kmymoneyedit.h</includehint>
--    <includehint>kmymoneycategory.h</includehint>
--</includehints>
- </UI>
diff --git a/finance/kmymoney-kde4/files/patch-kmymoney2_dialogs-kenterscheduledialogdecl.ui b/finance/kmymoney-kde4/files/patch-kmymoney2_dialogs-kenterscheduledialogdecl.ui
deleted file mode 100644
index af9060ba6b6d..000000000000
--- a/finance/kmymoney-kde4/files/patch-kmymoney2_dialogs-kenterscheduledialogdecl.ui
+++ /dev/null
@@ -1,15 +0,0 @@
---- kmymoney2/dialogs/kenterscheduledialogdecl.ui.orig	Tue Sep 27 23:21:51 2005
-+++ kmymoney2/dialogs/kenterscheduledialogdecl.ui	Tue Sep 27 23:22:25 2005
-@@ -655,12 +655,4 @@
-     </connection>
- </connections>
- <layoutdefaults spacing="6" margin="11"/>
--<includehints>
--    <includehint>kmymoneypayee.h</includehint>
--    <includehint>kmymoneyedit.h</includehint>
--    <includehint>kmymoneycategory.h</includehint>
--    <includehint>kmymoneydateinput.h</includehint>
--    <includehint>kmymoneyaccountcombo.h</includehint>
--    <includehint>kmymoneyaccountcombo.h</includehint>
--</includehints>
- </UI>
diff --git a/finance/kmymoney-kde4/files/patch-kmymoney2_dialogs-kexportdlgdecl.ui b/finance/kmymoney-kde4/files/patch-kmymoney2_dialogs-kexportdlgdecl.ui
deleted file mode 100644
index eccdb8cdf05f..000000000000
--- a/finance/kmymoney-kde4/files/patch-kmymoney2_dialogs-kexportdlgdecl.ui
+++ /dev/null
@@ -1,15 +0,0 @@
---- kmymoney2/dialogs/kexportdlgdecl.ui.orig	Tue Sep 27 23:24:19 2005
-+++ kmymoney2/dialogs/kexportdlgdecl.ui	Tue Sep 27 23:25:22 2005
-@@ -506,12 +506,6 @@
- <layoutdefaults spacing="6" margin="11"/>
- <includehints>
-     <includehint>kpushbutton.h</includehint>
--    <includehint>kmymoneyaccountcombo.h</includehint>
-     <includehint>kcombobox.h</includehint>
--    <includehint>kpushbutton.h</includehint>
--    <includehint>kmymoneydateinput.h</includehint>
--    <includehint>kmymoneydateinput.h</includehint>
--    <includehint>kpushbutton.h</includehint>
--    <includehint>kpushbutton.h</includehint>
- </includehints>
- </UI>
diff --git a/finance/kmymoney-kde4/files/patch-kmymoney2_dialogs-kfindtransactiondlgdecl.ui b/finance/kmymoney-kde4/files/patch-kmymoney2_dialogs-kfindtransactiondlgdecl.ui
deleted file mode 100644
index 9004ae931cc5..000000000000
--- a/finance/kmymoney-kde4/files/patch-kmymoney2_dialogs-kfindtransactiondlgdecl.ui
+++ /dev/null
@@ -1,20 +0,0 @@
---- kmymoney2/dialogs/kfindtransactiondlgdecl.ui.orig	Tue Sep 27 23:27:03 2005
-+++ kmymoney2/dialogs/kfindtransactiondlgdecl.ui	Tue Sep 27 23:28:18 2005
-@@ -1302,17 +1302,4 @@
-     </image>
- </images>
- <layoutdefaults spacing="6" margin="11"/>
--<includehints>
--    <includehint>kmymoneyaccountselector.h</includehint>
--    <includehint>kmymoneydateinput.h</includehint>
--    <includehint>kmymoneydateinput.h</includehint>
--    <includehint>kmymoneyedit.h</includehint>
--    <includehint>kmymoneyedit.h</includehint>
--    <includehint>kmymoneyedit.h</includehint>
--    <includehint>kmymoneyaccountselector.h</includehint>
--    <includehint>kmymoneylineedit.h</includehint>
--    <includehint>kmymoneylineedit.h</includehint>
--    <includehint>kmymoneylineedit.h</includehint>
--    <includehint>kmymoneyregistersearch.h</includehint>
--</includehints>
- </UI>
diff --git a/finance/kmymoney-kde4/files/patch-kmymoney2_dialogs-kmymoneypricedlgdecl.ui b/finance/kmymoney-kde4/files/patch-kmymoney2_dialogs-kmymoneypricedlgdecl.ui
deleted file mode 100644
index 3d706950cf66..000000000000
--- a/finance/kmymoney-kde4/files/patch-kmymoney2_dialogs-kmymoneypricedlgdecl.ui
+++ /dev/null
@@ -1,10 +0,0 @@
---- kmymoney2/dialogs/kmymoneypricedlgdecl.ui.orig	Tue Sep 27 23:32:32 2005
-+++ kmymoney2/dialogs/kmymoneypricedlgdecl.ui	Tue Sep 27 23:32:42 2005
-@@ -217,7 +217,4 @@
-     <tabstop>m_closeButton</tabstop>
- </tabstops>
- <layoutdefaults spacing="6" margin="11"/>
--<includehints>
--    <includehint>kmymoneypriceview.h</includehint>
--</includehints>
- </UI>
diff --git a/finance/kmymoney-kde4/files/patch-kmymoney2_dialogs-knewaccountdlgdecl.ui b/finance/kmymoney-kde4/files/patch-kmymoney2_dialogs-knewaccountdlgdecl.ui
deleted file mode 100644
index c854cc37785e..000000000000
--- a/finance/kmymoney-kde4/files/patch-kmymoney2_dialogs-knewaccountdlgdecl.ui
+++ /dev/null
@@ -1,14 +0,0 @@
---- kmymoney2/dialogs/knewaccountdlgdecl.ui.orig	Tue Sep 27 23:37:32 2005
-+++ kmymoney2/dialogs/knewaccountdlgdecl.ui	Tue Sep 27 23:37:45 2005
-@@ -763,11 +763,4 @@
-     <tabstop>cancelButton</tabstop>
- </tabstops>
- <layoutdefaults spacing="6" margin="11"/>
--<includehints>
--    <includehint>kmymoneydateinput.h</includehint>
--    <includehint>kmymoneyequity.h</includehint>
--    <includehint>kmymoneycurrencyselector.h</includehint>
--    <includehint>kmymoneyedit.h</includehint>
--    <includehint>kmymoneyaccountselector.h</includehint>
--</includehints>
- </UI>
diff --git a/finance/kmymoney-kde4/files/patch-kmymoney2_dialogs-knewaccountwizarddecl.ui b/finance/kmymoney-kde4/files/patch-kmymoney2_dialogs-knewaccountwizarddecl.ui
deleted file mode 100644
index 56dafcd9241f..000000000000
--- a/finance/kmymoney-kde4/files/patch-kmymoney2_dialogs-knewaccountwizarddecl.ui
+++ /dev/null
@@ -1,16 +0,0 @@
---- kmymoney2/dialogs/knewaccountwizarddecl.ui.orig	Tue Sep 27 23:41:35 2005
-+++ kmymoney2/dialogs/knewaccountwizarddecl.ui	Tue Sep 27 23:41:59 2005
-@@ -1519,13 +1519,4 @@
-     <tabstop>m_method</tabstop>
- </tabstops>
- <layoutdefaults spacing="6" margin="11"/>
--<includehints>
--    <includehint>kmymoneyedit.h</includehint>
--    <includehint>kmymoneydateinput.h</includehint>
--    <includehint>kmymoneycurrencyselector.h</includehint>
--    <includehint>kmymoneyedit.h</includehint>
--    <includehint>kmymoneydateinput.h</includehint>
--    <includehint>kmymoneypayee.h</includehint>
--    <includehint>kmymoneycombo.h</includehint>
--</includehints>
- </UI>
diff --git a/finance/kmymoney-kde4/files/patch-kmymoney2_dialogs-knewequityentrydecl.ui b/finance/kmymoney-kde4/files/patch-kmymoney2_dialogs-knewequityentrydecl.ui
deleted file mode 100644
index 140956929797..000000000000
--- a/finance/kmymoney-kde4/files/patch-kmymoney2_dialogs-knewequityentrydecl.ui
+++ /dev/null
@@ -1,10 +0,0 @@
---- kmymoney2/dialogs/knewequityentrydecl.ui.orig	Tue Sep 27 23:49:15 2005
-+++ kmymoney2/dialogs/knewequityentrydecl.ui	Tue Sep 27 23:49:33 2005
-@@ -233,7 +233,4 @@
-     <tabstop>btnCancel</tabstop>
- </tabstops>
- <layoutdefaults spacing="6" margin="11"/>
--<includehints>
--    <includehint>kmymoneyedit.h</includehint>
--</includehints>
- </UI>
diff --git a/finance/kmymoney-kde4/files/patch-kmymoney2_dialogs-knewinvestmentwizarddecl.ui b/finance/kmymoney-kde4/files/patch-kmymoney2_dialogs-knewinvestmentwizarddecl.ui
deleted file mode 100644
index 58db01a8f5cb..000000000000
--- a/finance/kmymoney-kde4/files/patch-kmymoney2_dialogs-knewinvestmentwizarddecl.ui
+++ /dev/null
@@ -1,14 +0,0 @@
---- kmymoney2/dialogs/knewinvestmentwizarddecl.ui.orig	Tue Sep 27 23:52:33 2005
-+++ kmymoney2/dialogs/knewinvestmentwizarddecl.ui	Tue Sep 27 23:52:52 2005
-@@ -503,11 +503,4 @@
-     <tabstop>m_onlineSourceCombo</tabstop>
- </tabstops>
- <layoutdefaults spacing="6" margin="11"/>
--<includehints>
--    <includehint>kmymoneylineedit.h</includehint>
--    <includehint>kmymoneylineedit.h</includehint>
--    <includehint>kmymoneyedit.h</includehint>
--    <includehint>kmymoneycurrencyselector.h</includehint>
--    <includehint>kmymoneylineedit.h</includehint>
--</includehints>
- </UI>
diff --git a/finance/kmymoney-kde4/files/patch-kmymoney2_dialogs-knewloanwizarddecl.ui b/finance/kmymoney-kde4/files/patch-kmymoney2_dialogs-knewloanwizarddecl.ui
deleted file mode 100644
index 8080142ef1ac..000000000000
--- a/finance/kmymoney-kde4/files/patch-kmymoney2_dialogs-knewloanwizarddecl.ui
+++ /dev/null
@@ -1,28 +0,0 @@
---- kmymoney2/dialogs/knewloanwizarddecl.ui.orig	Tue Sep 27 23:54:48 2005
-+++ kmymoney2/dialogs/knewloanwizarddecl.ui	Tue Sep 27 23:56:21 2005
-@@ -5547,25 +5547,6 @@
- </images>
- <layoutdefaults spacing="6" margin="11"/>
- <includehints>
--    <includehint>kmymoneydateinput.h</includehint>
--    <includehint>kmymoneylineedit.h</includehint>
--    <includehint>kmymoneypayee.h</includehint>
--    <includehint>kmymoneydateinput.h</includehint>
-     <includehint>knuminput.h</includehint>
--    <includehint>kmymoneycombo.h</includehint>
--    <includehint>kmymoneyedit.h</includehint>
--    <includehint>kmymoneyedit.h</includehint>
--    <includehint>kmymoneydateinput.h</includehint>
--    <includehint>kmymoneyedit.h</includehint>
--    <includehint>kmymoneyedit.h</includehint>
--    <includehint>knuminput.h</includehint>
--    <includehint>kmymoneycombo.h</includehint>
--    <includehint>kmymoneyedit.h</includehint>
--    <includehint>kmymoneyedit.h</includehint>
--    <includehint>kmymoneyaccountselector.h</includehint>
--    <includehint>kmymoneyaccountselector.h</includehint>
--    <includehint>kmymoneydateinput.h</includehint>
--    <includehint>kmymoneyaccountselector.h</includehint>
--    <includehint>kmymoneydateinput.h</includehint>
- </includehints>
- </UI>
diff --git a/finance/kmymoney-kde4/files/patch-kmymoney2_dialogs-ksplittransactiondlgdecl.ui b/finance/kmymoney-kde4/files/patch-kmymoney2_dialogs-ksplittransactiondlgdecl.ui
deleted file mode 100644
index 42d49a083592..000000000000
--- a/finance/kmymoney-kde4/files/patch-kmymoney2_dialogs-ksplittransactiondlgdecl.ui
+++ /dev/null
@@ -1,10 +0,0 @@
---- kmymoney2/dialogs/ksplittransactiondlgdecl.ui.orig	Tue Sep 27 23:58:38 2005
-+++ kmymoney2/dialogs/ksplittransactiondlgdecl.ui	Tue Sep 27 23:58:50 2005
-@@ -382,7 +382,4 @@
-     </image>
- </images>
- <layoutdefaults spacing="6" margin="11"/>
--<includehints>
--    <includehint>kmymoneysplittable.h</includehint>
--</includehints>
- </UI>
diff --git a/finance/kmymoney-kde4/files/patch-kmymoney2_dialogs-kupdatestockpricedlgdecl.ui b/finance/kmymoney-kde4/files/patch-kmymoney2_dialogs-kupdatestockpricedlgdecl.ui
deleted file mode 100644
index b660cf66f87a..000000000000
--- a/finance/kmymoney-kde4/files/patch-kmymoney2_dialogs-kupdatestockpricedlgdecl.ui
+++ /dev/null
@@ -1,12 +0,0 @@
---- kmymoney2/dialogs/kupdatestockpricedlgdecl.ui.orig	Wed Sep 28 00:00:28 2005
-+++ kmymoney2/dialogs/kupdatestockpricedlgdecl.ui	Wed Sep 28 00:00:44 2005
-@@ -310,9 +310,4 @@
-     </image>
- </images>
- <layoutdefaults spacing="6" margin="11"/>
--<includehints>
--    <includehint>kmymoneydateinput.h</includehint>
--    <includehint>kmymoneycurrencyselector.h</includehint>
--    <includehint>kmymoneysecurityselector.h</includehint>
--</includehints>
- </UI>
diff --git a/finance/kmymoney-kde4/files/patch-kmymoney2_views-kbankviewdecl.ui b/finance/kmymoney-kde4/files/patch-kmymoney2_views-kbankviewdecl.ui
deleted file mode 100644
index 62061cda4429..000000000000
--- a/finance/kmymoney-kde4/files/patch-kmymoney2_views-kbankviewdecl.ui
+++ /dev/null
@@ -1,11 +0,0 @@
---- kmymoney2/views/kbankviewdecl.ui.orig	Wed Sep 28 00:43:39 2005
-+++ kmymoney2/views/kbankviewdecl.ui	Wed Sep 28 00:45:06 2005
-@@ -196,8 +196,4 @@
-     </image>
- </images>
- <layoutdefaults spacing="6" margin="11"/>
--<includehints>
--    <includehint>kmymoneytitlelabel.h</includehint>
--    <includehint>kmymoneyaccounttree.h</includehint>
--</includehints>
- </UI>
diff --git a/finance/kmymoney-kde4/files/patch-kmymoney2_views-kcategoriesviewdecl.ui b/finance/kmymoney-kde4/files/patch-kmymoney2_views-kcategoriesviewdecl.ui
deleted file mode 100644
index 6774c378c344..000000000000
--- a/finance/kmymoney-kde4/files/patch-kmymoney2_views-kcategoriesviewdecl.ui
+++ /dev/null
@@ -1,11 +0,0 @@
---- kmymoney2/views/kcategoriesviewdecl.ui.orig	Wed Sep 28 00:36:31 2005
-+++ kmymoney2/views/kcategoriesviewdecl.ui	Wed Sep 28 00:38:23 2005
-@@ -165,8 +165,4 @@
- <tabstops>
- </tabstops>
- <layoutdefaults spacing="6" margin="11"/>
--<includehints>
--    <includehint>kmymoneyaccounttree.h</includehint>
--    <includehint>kmymoneytitlelabel.h</includehint>
--</includehints>
- </UI>
diff --git a/finance/kmymoney-kde4/files/patch-kmymoney2_views-kinvestmentviewdecl.ui b/finance/kmymoney-kde4/files/patch-kmymoney2_views-kinvestmentviewdecl.ui
deleted file mode 100644
index 87d80c6d7de2..000000000000
--- a/finance/kmymoney-kde4/files/patch-kmymoney2_views-kinvestmentviewdecl.ui
+++ /dev/null
@@ -1,11 +0,0 @@
---- kmymoney2/views/kinvestmentviewdecl.ui.orig	Wed Sep 28 00:13:37 2005
-+++ kmymoney2/views/kinvestmentviewdecl.ui	Wed Sep 28 00:13:48 2005
-@@ -173,8 +173,4 @@
-     </image>
- </images>
- <layoutdefaults spacing="6" margin="11"/>
--<includehints>
--    <includehint>kmymoneyaccountcombo.h</includehint>
--    <includehint>kmymoneytitlelabel.h</includehint>
--</includehints>
- </UI>
diff --git a/finance/kmymoney-kde4/files/patch-kmymoney2_views-kpayeesviewdecl.ui b/finance/kmymoney-kde4/files/patch-kmymoney2_views-kpayeesviewdecl.ui
deleted file mode 100644
index ac7d9fd2c32d..000000000000
--- a/finance/kmymoney-kde4/files/patch-kmymoney2_views-kpayeesviewdecl.ui
+++ /dev/null
@@ -1,10 +0,0 @@
---- kmymoney2/views/kpayeesviewdecl.ui.orig	Wed Sep 28 00:30:13 2005
-+++ kmymoney2/views/kpayeesviewdecl.ui	Wed Sep 28 00:30:29 2005
-@@ -535,7 +535,4 @@
-     </image>
- </images>
- <layoutdefaults spacing="6" margin="11"/>
--<includehints>
--    <includehint>kmymoneytitlelabel.h</includehint>
--</includehints>
- </UI>
diff --git a/finance/kmymoney-kde4/files/patch-kmymoney2_views-kscheduledviewdecl.ui b/finance/kmymoney-kde4/files/patch-kmymoney2_views-kscheduledviewdecl.ui
deleted file mode 100644
index 3250e0865e56..000000000000
--- a/finance/kmymoney-kde4/files/patch-kmymoney2_views-kscheduledviewdecl.ui
+++ /dev/null
@@ -1,12 +0,0 @@
---- kmymoney2/views/kscheduledviewdecl.ui.orig	Wed Sep 28 00:23:20 2005
-+++ kmymoney2/views/kscheduledviewdecl.ui	Wed Sep 28 00:23:47 2005
-@@ -193,9 +193,6 @@
- <includehints>
-     <includehint>qwidget.h</includehint>
-     <includehint>kpushbutton.h</includehint>
--    <includehint>kpushbutton.h</includehint>
-     <includehint>klistview.h</includehint>
--    <includehint>kmymoneyscheduledcalendar.h</includehint>
--    <includehint>kmymoneytitlelabel.h</includehint>
- </includehints>
- </UI>
diff --git a/finance/kmymoney-kde4/pkg-plist b/finance/kmymoney-kde4/pkg-plist
index bdd1f22db8a6..7aabb3c55913 100644
--- a/finance/kmymoney-kde4/pkg-plist
+++ b/finance/kmymoney-kde4/pkg-plist
@@ -29,6 +29,7 @@ include/kmymoney/mymoneytransactionfilter.h
 include/kmymoney/mymoneyutils.h
 include/kmymoney/statementinterface.h
 include/kmymoney/viewinterface.h
+%%OFXPLUGIN%%lib/kde3/kmm_ofximport.so
 lib/libkmm_mymoney.a
 lib/libkmm_mymoney.la
 lib/libkmm_mymoney.so
@@ -210,6 +211,8 @@ share/applications/kde/kmymoney2.desktop
 %%DOCSDIR%%/common
 %%DOCSDIR%%/confirmenter.png
 %%DOCSDIR%%/credits.docbook
+%%DOCSDIR%%/currency_newpriceentry.png
+%%DOCSDIR%%/currency_priceeditor.png
 %%DOCSDIR%%/date_widget.png
 %%DOCSDIR%%/default_prompt.png
 %%DOCSDIR%%/details-accounts.docbook
@@ -256,6 +259,7 @@ share/applications/kde/kmymoney2.desktop
 %%DOCSDIR%%/investment-onlineupdate.png
 %%DOCSDIR%%/investment-currencywarning.png
 %%DOCSDIR%%/investment-exchangerateeditor.png
+%%DOCSDIR%%/investments_summarytab.png
 %%DOCSDIR%%/investments_view.png
 %%DOCSDIR%%/kmt.png
 %%DOCSDIR%%/ledger_more.png
@@ -275,6 +279,9 @@ share/applications/kde/kmymoney2.desktop
 %%DOCSDIR%%/payees_view.png
 %%DOCSDIR%%/payeeview.png
 %%DOCSDIR%%/qif_report.png
+%%DOCSDIR%%/qifimport-export.png
+%%DOCSDIR%%/qifimport-qifprofiledate.png
+%%DOCSDIR%%/qifimport-qifprofileeditor.png
 %%DOCSDIR%%/qifimportverify.png
 %%DOCSDIR%%/qifopen.png
 %%DOCSDIR%%/reconcile.png
@@ -284,7 +291,10 @@ share/applications/kde/kmymoney2.desktop
 %%DOCSDIR%%/reconcile4.png
 %%DOCSDIR%%/reference.docbook
 %%DOCSDIR%%/register.png
+%%DOCSDIR%%/report_configuration-reporttab.png
+%%DOCSDIR%%/report_configuration-rowscolumns.png
 %%DOCSDIR%%/reports_view.png
+%%DOCSDIR%%/reports_view-all.png
 %%DOCSDIR%%/schedcaltypes.png
 %%DOCSDIR%%/schedmonthday.png
 %%DOCSDIR%%/schedpopup.png
@@ -317,10 +327,12 @@ share/icons/hicolor/16x16/mimetypes/kmy.png
 share/icons/hicolor/32x32/apps/kmymoney2.png
 share/icons/hicolor/32x32/mimetypes/kmy.png
 share/icons/hicolor/48x48/mimetypes/kmy.png
+share/icons/hicolor/48x48/apps/kmymoney2.png
 share/icons/hicolor/64x64/apps/kmymoney2.png
 share/icons/hicolor/64x64/mimetypes/kmy.png
 share/icons/locolor/16x16/apps/kmymoney2.png
 share/icons/locolor/32x32/apps/kmymoney2.png
+share/locale/da/LC_MESSAGES/kmymoney2.mo
 share/locale/de/LC_MESSAGES/kmymoney2.mo
 share/locale/en_GB/LC_MESSAGES/kmymoney2.mo
 share/locale/es/LC_MESSAGES/kmymoney2.mo
@@ -331,6 +343,7 @@ share/locale/pt_BR/LC_MESSAGES/kmymoney2.mo
 share/locale/pt_PT/LC_MESSAGES/kmymoney2.mo
 share/locale/ru/LC_MESSAGES/kmymoney2.mo
 share/mimelnk/application/x-kmymoney2.desktop
+%%OFXPLUGIN%%share/services/kmm_ofximport.desktop
 share/servicetypes/kmymoneyimporterplugin.desktop
 share/servicetypes/kmymoneyplugin.desktop
 @dirrm include/kmymoney
@@ -360,3 +373,4 @@ share/servicetypes/kmymoneyplugin.desktop
 @dirrm %%DATADIR%%/html/images
 @dirrm %%DATADIR%%/html
 @dirrm %%DATADIR%%
+@dirrm %%DOCSDIR%%