- Update to 4.8.1.1

- Rename the package to make way for the kf5 version of KMyMoney
- Fix LICENSE
- Group plugins options together and improve descriptions
- Turn on QUOTES and OFX by default by request [1]
- Turn on KBANKING by default for parity with finance/gnucash
- WEBOOB is off by default for now since www/py-weboob was added only recently
  and requires additional setup
- Add custom create-plist target to make pkg-plist generation easier

PR:		221483 [1]
Submitted by:	Chris Wells <freebsd@chriswells.io> [1]

8 files changed, 101 insertions, 117 deletions

diff --git a/finance/kmymoney-kde4/Makefile b/finance/kmymoney-kde4/Makefile
index 764485872427..0645460296a3 100644
--- a/finance/kmymoney-kde4/Makefile
+++ b/finance/kmymoney-kde4/Makefile
@@ -1,15 +1,15 @@
 # $FreeBSD$
 
 PORTNAME=	kmymoney
-PORTVERSION=	4.8.0
-PORTREVISION=	13
+PORTVERSION=	4.8.1.1
 CATEGORIES=	finance kde
 MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}/src
+PKGNAMESUFFIX=	-kde4
 
 MAINTAINER=	jhale@FreeBSD.org
 COMMENT=	KDE4 personal finance manager
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libboost_graph.so:devel/boost-libs \
@@ -25,46 +25,61 @@ USE_QT4=	corelib gui dbus declarative network phonon script sql svg xml \
 USE_KDE=	automoc4 kdelibs pimlibs soprano
 USE_LDCONFIG=	yes
 
-SHEBANG_FILES=	kmymoney/misc/financequote.pl
+# Crash occurs when built with Gpgmepp instead of Qgpgme and trying to
+# configure encryption:
+# Settings -> Configure KMyMoney... -> Encryption
+CMAKE_ON=	CMAKE_DISABLE_FIND_PACKAGE_Gpgmepp
 
-# PR: 225266
-# Intermittent failures on build cluster (race condition trying to compile
-# kmymoneysettings.cpp before it is fully generated by kconfig_compiler)
-MAKE_JOBS_UNSAFE=	yes
+SHEBANG_FILES=	kmymoney/misc/financequote.pl
 
-OPTIONS_DEFINE=		NLS CALENDAR KBANKING OFX QUOTES
-OPTIONS_DEFAULT=	CALENDAR
+OPTIONS_GROUP=		PLUGINS
+OPTIONS_GROUP_PLUGINS=	CALENDAR KBANKING OFX WEBOOB
+OPTIONS_DEFINE=		NLS QUOTES
+OPTIONS_DEFAULT=	CALENDAR KBANKING OFX QUOTES
 OPTIONS_SUB=		yes
-NO_OPTIONS_SORT=	yes
 
 NLS_USES=		gettext
-NLS_CMAKE_ON=		-DBUILD_po:BOOL=ON
-NLS_CMAKE_OFF=		-DBUILD_po:BOOL=OFF
+NLS_CMAKE_BOOL=		BUILD_po
 
-CALENDAR_DESC=		Enable Calendar plugin
+CALENDAR_DESC=		iCalendar exporter
 CALENDAR_LIB_DEPENDS=	libical.so:devel/libical
-CALENDAR_CMAKE_ON=	-DENABLE_LIBICAL:BOOL=ON
-CALENDAR_CMAKE_OFF=	-DENABLE_LIBICAL:BOOL=OFF
+CALENDAR_CMAKE_BOOL=	ENABLE_LIBICAL
 
-KBANKING_DESC=		Enable KBanking plugin
+KBANKING_DESC=		Online banking via KBanking (AqBanking)
 KBANKING_LIB_DEPENDS=	libgwenhywfar.so:devel/gwenhywfar \
 			libgwengui-qt4.so:devel/gwenhywfar-qt4 \
 			libaqbanking.so:finance/aqbanking
-KBANKING_CMAKE_ON=	-DENABLE_KBANKING:BOOL=ON
-KBANKING_CMAKE_OFF=	-DENABLE_KBANKING:BOOL=OFF
+KBANKING_CMAKE_BOOL=	ENABLE_KBANKING
 
-OFX_DESC=		Enable OFX plugin
+OFX_DESC=		OFX (Open Financial Exchange) importer
 OFX_LIB_DEPENDS=	libofx.so:finance/libofx
-OFX_CMAKE_ON=		-DENABLE_LIBOFX:BOOL=ON
-OFX_CMAKE_OFF=		-DENABLE_LIBOFX:BOOL=OFF
+OFX_CMAKE_BOOL=		ENABLE_LIBOFX
 
-QUOTES_DESC=		Enable online price quotes
-QUOTES_USES=		perl5
-QUOTES_USE=		PERL5=run
+QUOTES_DESC=		Online stock and currency price quotes
 QUOTES_RUN_DEPENDS=	p5-Date-Manip>=0:devel/p5-Date-Manip \
 			p5-Finance-Quote>=0:finance/p5-Finance-Quote \
 			p5-XML-Parser>=0:textproc/p5-XML-Parser \
 			p5-XML-Writer>=0:textproc/p5-XML-Writer \
 			p5-libwww>=0:www/p5-libwww
+QUOTES_USES=		perl5
+QUOTES_USE=		PERL5=run
+
+WEBOOB_DESC=		Online banking via Web Outside Of Browsers
+WEBOOB_RUN_DEPENDS=	${KDE_PREFIX}/lib/kde4/krosspython.so:devel/py-krosspython-kde4 \
+			${PYTHON_PKGNAMEPREFIX}weboob>=0:www/py-weboob@${PY_FLAVOR}
+WEBOOB_USES=		python:run
+WEBOOB_CMAKE_BOOL=	ENABLE_WEBOOB
+
+.if defined(MAINTAINER_MODE)
+# Apply additional substitutions to pkg-plist generated by the 'makeplist' target
+create-plist: stage
+	@(cd ${.CURDIR} && ${MAKE} makeplist > pkg-plist && \
+	${SED} -i "" -e '1d' \
+		-e '/share\/locale/s|^|%%NLS%%|g' \
+		-e 's|KDE4_KDELIBS_VERSION|KDE4_GENERIC_LIB_VERSION|g' \
+		-e '/icalendar/s|^|%%CALENDAR%%|g' -e '/kbanking/s|^|%%KBANKING%%|g' \
+		-e '/ofximport/s|^|%%OFX%%|g' -e '/weboob/s|^|%%WEBOOB%%|g' \
+		pkg-plist)
+.endif
 
 .include <bsd.port.mk>
diff --git a/finance/kmymoney-kde4/distinfo b/finance/kmymoney-kde4/distinfo
index 1209ce2b0b3b..903dede588a7 100644
--- a/finance/kmymoney-kde4/distinfo
+++ b/finance/kmymoney-kde4/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1476495311
-SHA256 (kmymoney-4.8.0.tar.xz) = c2a635710aafa6925a49803c480e043e0bf4bc5b62430689aa5eb95619f48ac2
-SIZE (kmymoney-4.8.0.tar.xz) = 20785888
+TIMESTAMP = 1523493479
+SHA256 (kmymoney-4.8.1.1.tar.xz) = 2b1cbd141d51a3f4147c30c00c7d21022e761d8121f5a206092cf3548f805a34
+SIZE (kmymoney-4.8.1.1.tar.xz) = 20963444
diff --git a/finance/kmymoney-kde4/files/patch-CMakeLists.txt b/finance/kmymoney-kde4/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..4494bb4e76dd
--- /dev/null
+++ b/finance/kmymoney-kde4/files/patch-CMakeLists.txt
@@ -0,0 +1,15 @@
+Suppress numerous CMake warnings. Upstream has CMP0071 set to OLD behavior
+in the 5.x version, and build fails if set to NEW.
+
+--- CMakeLists.txt.orig	2018-04-12 15:58:03 UTC
++++ CMakeLists.txt
+@@ -9,6 +9,9 @@ set(CMAKE_AUTOMOC TRUE)
+ 
+ # cmake 2.6 proposed to add this policy
+ if(COMMAND cmake_policy)
++  if(POLICY CMP0071)
++    cmake_policy(SET CMP0071 OLD)
++  endif(POLICY CMP0071)
+   if(POLICY CMP0017)
+     cmake_policy(SET CMP0017 NEW)
+   endif(POLICY CMP0017)
diff --git a/finance/kmymoney-kde4/files/patch-kmymoney_CMakeLists.txt b/finance/kmymoney-kde4/files/patch-kmymoney_CMakeLists.txt
index 157ab52f0b32..01ee560f0b82 100644
--- a/finance/kmymoney-kde4/files/patch-kmymoney_CMakeLists.txt
+++ b/finance/kmymoney-kde4/files/patch-kmymoney_CMakeLists.txt
@@ -1,6 +1,8 @@
---- kmymoney/CMakeLists.txt.orig	2015-04-25 17:17:55 UTC
+Don't update XDG mimetypes during build. This is done by the ports framework.
+
+--- kmymoney/CMakeLists.txt.orig	2017-12-23 22:27:53 UTC
 +++ kmymoney/CMakeLists.txt
-@@ -109,7 +109,6 @@ install(PROGRAMS kmymoney.appdata.xml
+@@ -114,7 +114,6 @@ install(FILES org.kde.kmymoney.appdata.xml
  install(FILES x-kmymoney.xml
    DESTINATION ${XDG_MIME_INSTALL_DIR})
  
diff --git a/finance/kmymoney-kde4/files/patch-kmymoney_dialogs_settings_CMakeLists.txt b/finance/kmymoney-kde4/files/patch-kmymoney_dialogs_settings_CMakeLists.txt
deleted file mode 100644
index 60b540826f87..000000000000
--- a/finance/kmymoney-kde4/files/patch-kmymoney_dialogs_settings_CMakeLists.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-The project is actually called 'KMyMoney' not 'KMyMoney2'. Therefore the top-directory variables are:
-  * KMyMoney_BINARY_DIR
-  * KMyMoney_SOURCE_DIR
-
-Further fix the paths to point to the proper subdirectory, and add a custom_target to depend on.
-
---- kmymoney/dialogs/settings/CMakeLists.txt.orig	2016-06-14 19:16:15 UTC
-+++ kmymoney/dialogs/settings/CMakeLists.txt
-@@ -1,12 +1,13 @@
- add_custom_command(
--  OUTPUT ${KMyMoney2_BINARY_DIR}/kmymoneysettings.h  ${KMyMoney2_BINARY_DIR}/kmymoneysettings.cpp
--  DEPENDS ${KMyMoney2_SOURCE_DIR}/kmymoney.kcfg ${KMyMoney2_SOURCE_DIR}/kmymoneysettings.kcfgc
--  COMMAND ${KDE4_KCFGC_EXECUTABLE} -d ${KMyMoney2_BINARY_DIR}/ ${KMyMoney2_SOURCE_DIR}/kmymoney.kcfg ${KMyMoney2_SOURCE_DIR}/kmymoneysettings.kcfgc
-+  OUTPUT ${KMyMoney_BINARY_DIR}/kmymoneysettings.h  ${KMyMoney_BINARY_DIR}/kmymoneysettings.cpp
-+  DEPENDS ${KMyMoney_SOURCE_DIR}/kmymoney/kmymoney.kcfg ${KMyMoney_SOURCE_DIR}/kmymoney/kmymoneysettings.kcfgc
-+  COMMAND ${KDE4_KCFGC_EXECUTABLE} -d ${KMyMoney_BINARY_DIR}/kmymoney ${KMyMoney_SOURCE_DIR}/kmymoney/kmymoney.kcfg ${KMyMoney_SOURCE_DIR}/kmymoney/kmymoneysettings.kcfgc
-   )
- 
-+add_custom_target(generate-kmymoneysettings_h DEPENDS ${KMyMoney_BINARY_DIR}/kmymoneysettings.h)
- 
- set (libsettings_a_SOURCES
--  ${KMyMoney2_BINARY_DIR}/kmymoneysettings.h
-+  ${KMyMoney_BINARY_DIR}/kmymoneysettings.h
-   ksettingscolors.cpp
-   ksettingsfonts.cpp
-   ksettingsforecast.cpp
-@@ -32,4 +33,5 @@ kde4_add_ui_files(libsettings_a_SOURCES ${libsettings_
- 
- kde4_add_library(settings STATIC ${libsettings_a_SOURCES})
- 
-+add_dependencies(settings generate-kmymoneysettings_h)
- add_dependencies(settings widgets kmm_config)
diff --git a/finance/kmymoney-kde4/files/patch-kmymoney_plugins_onlinetasks_national_CMakeLists.txt b/finance/kmymoney-kde4/files/patch-kmymoney_plugins_onlinetasks_national_CMakeLists.txt
deleted file mode 100644
index 21d7fd29deee..000000000000
--- a/finance/kmymoney-kde4/files/patch-kmymoney_plugins_onlinetasks_national_CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
---- kmymoney/plugins/onlinetasks/national/CMakeLists.txt.orig	2017-04-17 10:49:10 UTC
-+++ kmymoney/plugins/onlinetasks/national/CMakeLists.txt
-@@ -20,7 +20,8 @@ kde4_add_ui_files( konlinetasks_national_SCRS
- )
- 
- # Make this plugin unit testable
--automoc4(konlinetasks_national_OBJECTS konlinetasks_national_SCRS)
-+# CMAKE_AUTOMOC is set to TRUE, so don't do it manually too.
-+# automoc4(konlinetasks_national_OBJECTS konlinetasks_national_SCRS)
- add_library( konlinetasks_national_OBJECTS OBJECT ${konlinetasks_national_SCRS} )
- 
- # Add plugin which is not allowed in the unit test
diff --git a/finance/kmymoney-kde4/files/patch-kmymoney_plugins_onlinetasks_sepa_CMakeLists.txt b/finance/kmymoney-kde4/files/patch-kmymoney_plugins_onlinetasks_sepa_CMakeLists.txt
deleted file mode 100644
index 5497d7c317c0..000000000000
--- a/finance/kmymoney-kde4/files/patch-kmymoney_plugins_onlinetasks_sepa_CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
---- kmymoney/plugins/onlinetasks/sepa/CMakeLists.txt.orig	2017-04-17 10:48:39 UTC
-+++ kmymoney/plugins/onlinetasks/sepa/CMakeLists.txt
-@@ -12,7 +12,8 @@ kde4_add_ui_files( sepaOnlineTasks_SRCS
-   ui/sepacredittransferedit.ui
- )
- 
--automoc4( konlinetasks_sepa_OBJECTS sepaOnlineTasks_SRCS)
-+# CMAKE_AUTOMOC is set to TRUE, so don't do it manually too.
-+# automoc4( konlinetasks_sepa_OBJECTS sepaOnlineTasks_SRCS)
- add_library( konlinetasks_sepa_OBJECTS OBJECT ${sepaOnlineTasks_SRCS} )
- 
- # Add actual plugin here it is not part of the objects
diff --git a/finance/kmymoney-kde4/pkg-plist b/finance/kmymoney-kde4/pkg-plist
index be4318f174f0..87cacafe5de9 100644
--- a/finance/kmymoney-kde4/pkg-plist
+++ b/finance/kmymoney-kde4/pkg-plist
@@ -76,8 +76,9 @@ include/kde4/kmymoney/onlinetasks/interfaces/ionlinetasksettings.h
 include/kde4/kmymoney/onlinetasks/interfaces/onlinetask.h
 include/kde4/kmymoney/onlinetasks/interfaces/onlinetaskconverter.h
 include/kde4/kmymoney/onlinetasks/interfaces/onlinetasksettingsfactory.h
-include/kde4/kmymoney/onlinetasks/national/germanonlinetransfer.h
 include/kde4/kmymoney/onlinetasks/sepa/sepaonlinetransfer.h
+include/kde4/kmymoney/payeeidentifier/ibanandbic/ibanbic.h
+include/kde4/kmymoney/payeeidentifier/payeeidentifier.h
 include/kde4/kmymoney/pluginloader.h
 include/kde4/kmymoney/register.h
 include/kde4/kmymoney/registeritem.h
@@ -101,9 +102,8 @@ lib/kde4/kmm_csvimport.so
 %%OFX%%lib/kde4/kmm_ofximport.so
 lib/kde4/kmm_printcheck.so
 lib/kde4/kmm_reconciliationreport.so
-lib/kde4/kmm_weboob.so
-lib/kde4/konlinetasks_national.so
-lib/kde4/konlinetasks_sepa.so
+%%WEBOOB%%lib/kde4/kmm_weboob.so
+lib/kde4/libkonlinetasks_sepa.so
 lib/kde4/payeeidentifier_iban_bic_delegates.so
 lib/kde4/payeeidentifier_ibanbic_storageplugin.so
 lib/kde4/payeeidentifier_nationalAccount_ui.so
@@ -115,6 +115,8 @@ lib/libkmm_mymoney.so
 lib/libkmm_mymoney.so.4
 lib/libkmm_mymoney.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libkmm_payeeidentifier.so
+lib/libkmm_payeeidentifier.so.4
+lib/libkmm_payeeidentifier.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libkmm_plugin.so
 lib/libkmm_plugin.so.4
 lib/libkmm_plugin.so.%%KDE4_GENERIC_LIB_VERSION%%
@@ -130,8 +132,8 @@ lib/libpayeeidentifier_iban_bic_widgets.so.%%KDE4_GENERIC_LIB_VERSION%%
 lib/libpayeeidentifier_nationalAccount.so
 lib/libpayeeidentifier_nationalAccount.so.4
 lib/libpayeeidentifier_nationalAccount.so.%%KDE4_GENERIC_LIB_VERSION%%
-share/applications/kde4/kmymoney.desktop
-share/apps/appdata/kmymoney.appdata.xml
+share/applications/kde4/org.kde.kmymoney.desktop
+share/apps/appdata/org.kde.kmymoney.appdata.xml
 share/apps/kconf_update/kmymoney.upd
 share/apps/kmm_csvexport/kmm_csvexport.rc
 share/apps/kmm_csvimport/kmm_csvimport.rc
@@ -145,8 +147,8 @@ share/apps/kmm_csvimport/kmm_csvimport.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/kmm_weboob/kmm_weboob.rc
-share/apps/kmm_weboob/weboob.py
+%%WEBOOB%%share/apps/kmm_weboob/kmm_weboob.rc
+%%WEBOOB%%share/apps/kmm_weboob/weboob.py
 share/apps/kmymoney/html/images/about_kde.png
 share/apps/kmymoney/html/images/arrow.png
 share/apps/kmymoney/html/images/backarrow.png
@@ -183,7 +185,6 @@ share/apps/kmymoney/html/images/tr.png
 share/apps/kmymoney/html/images/trans_logo.png
 share/apps/kmymoney/html/kmymoney.css
 share/apps/kmymoney/html/welcome.css
-share/apps/kmymoney/ibanbicdata/bankdata.de.db
 share/apps/kmymoney/icons/hicolor/16x16/actions/account-add.png
 share/apps/kmymoney/icons/hicolor/16x16/actions/account-open.png
 share/apps/kmymoney/icons/hicolor/16x16/actions/backup.png
@@ -640,7 +641,9 @@ share/apps/kmymoney/templates/de_DE/otherasset.kmt
 share/apps/kmymoney/templates/de_DE/otherloan.kmt
 share/apps/kmymoney/templates/de_DE/skr03.kmt
 share/apps/kmymoney/templates/de_DE/skr04.kmt
+share/apps/kmymoney/templates/de_DE/skr49.kmt
 share/apps/kmymoney/templates/de_DE/studium.kmt
+share/apps/kmymoney/templates/de_DE/wohnungsw.kmt
 share/apps/kmymoney/templates/dk/car.kmt
 share/apps/kmymoney/templates/dk/common.kmt
 share/apps/kmymoney/templates/dk/homeloan.kmt
@@ -819,23 +822,27 @@ share/apps/kmymoney/templates/it/renter.kmt
 share/apps/kmymoney/templates/it/retiremt.kmt
 share/apps/kmymoney/templates/it/spouseinc.kmt
 share/apps/kmymoney/templates/it/spouseretire.kmt
-share/apps/kmymoney/templates/jp/brokerage.kmt
-share/apps/kmymoney/templates/jp/business.kmt
-share/apps/kmymoney/templates/jp/carloan.kmt
-share/apps/kmymoney/templates/jp/cdmoneymkt.kmt
-share/apps/kmymoney/templates/jp/checkbook.kmt
-share/apps/kmymoney/templates/jp/childcare.kmt
-share/apps/kmymoney/templates/jp/common.kmt
-share/apps/kmymoney/templates/jp/eduloan.kmt
-share/apps/kmymoney/templates/jp/fixedassets.kmt
-share/apps/kmymoney/templates/jp/homeloan.kmt
-share/apps/kmymoney/templates/jp/homeown.kmt
-share/apps/kmymoney/templates/jp/otherloan.kmt
-share/apps/kmymoney/templates/jp/renter.kmt
-share/apps/kmymoney/templates/jp/retiremt.kmt
-share/apps/kmymoney/templates/jp/spouseinc.kmt
-share/apps/kmymoney/templates/jp/spouseretire.kmt
+share/apps/kmymoney/templates/ja_JP/brokerage.kmt
+share/apps/kmymoney/templates/ja_JP/business.kmt
+share/apps/kmymoney/templates/ja_JP/carloan.kmt
+share/apps/kmymoney/templates/ja_JP/cdmoneymkt.kmt
+share/apps/kmymoney/templates/ja_JP/checkbook.kmt
+share/apps/kmymoney/templates/ja_JP/childcare.kmt
+share/apps/kmymoney/templates/ja_JP/common.kmt
+share/apps/kmymoney/templates/ja_JP/eduloan.kmt
+share/apps/kmymoney/templates/ja_JP/fixedassets.kmt
+share/apps/kmymoney/templates/ja_JP/full.kmt
+share/apps/kmymoney/templates/ja_JP/homeloan.kmt
+share/apps/kmymoney/templates/ja_JP/homeown.kmt
+share/apps/kmymoney/templates/ja_JP/otherloan.kmt
+share/apps/kmymoney/templates/ja_JP/renter.kmt
+share/apps/kmymoney/templates/ja_JP/retiremt.kmt
+share/apps/kmymoney/templates/ja_JP/spouseinc.kmt
+share/apps/kmymoney/templates/ja_JP/spouseretire.kmt
+share/apps/kmymoney/templates/nl_NL/checkbook.kmt
 share/apps/kmymoney/templates/nl_NL/default_accounts.kmt
+share/apps/kmymoney/templates/nl_NL/full.kmt
+share/apps/kmymoney/templates/nl_NL/rgs_1.1.kmt
 share/apps/kmymoney/templates/pt_BR/brokerage.kmt
 share/apps/kmymoney/templates/pt_BR/carloan.kmt
 share/apps/kmymoney/templates/pt_BR/cdmoneymkt.kmt
@@ -870,7 +877,11 @@ share/apps/kmymoney/templates/ro_RO/carloan.kmt
 share/apps/kmymoney/templates/ro_RO/common.kmt
 share/apps/kmymoney/templates/ro_RO/default_categories-template.kmt
 share/apps/kmymoney/templates/ro_RO/homeloan.kmt
+share/apps/kmymoney/templates/ru_RU/common.kmt
 share/apps/kmymoney/templates/ru_RU/default_accounts.kmt
+share/apps/kmymoney/templates/ru_RU/homeloan.kmt
+share/apps/kmymoney/templates/ru_RU/homeown.kmt
+share/apps/kmymoney/templates/ru_RU/renter.kmt
 share/apps/kmymoney/templates/sk/brokerage.kmt
 share/apps/kmymoney/templates/sk/carloan.kmt
 share/apps/kmymoney/templates/sk/cdmoneymkt.kmt
@@ -955,6 +966,7 @@ share/doc/HTML/de/kmymoney/details-reports.docbook
 share/doc/HTML/de/kmymoney/details-schedules.docbook
 share/doc/HTML/de/kmymoney/details-search.docbook
 share/doc/HTML/de/kmymoney/details-settings.docbook
+share/doc/HTML/de/kmymoney/details-tags.docbook
 share/doc/HTML/de/kmymoney/details-widgets.docbook
 share/doc/HTML/de/kmymoney/faq.docbook
 share/doc/HTML/de/kmymoney/firsttime.docbook
@@ -1516,6 +1528,7 @@ share/icons/hicolor/128x128/apps/kmymoney.png
 share/icons/hicolor/128x128/mimetypes/application-x-kmymoney.png
 share/icons/hicolor/16x16/apps/kmymoney.png
 share/icons/hicolor/16x16/mimetypes/application-x-kmymoney.png
+share/icons/hicolor/22x22/apps/kmymoney.png
 share/icons/hicolor/22x22/mimetypes/application-x-kmymoney.png
 share/icons/hicolor/32x32/apps/kmymoney.png
 share/icons/hicolor/32x32/mimetypes/application-x-kmymoney.png
@@ -1525,7 +1538,6 @@ share/icons/hicolor/64x64/apps/kmymoney.png
 share/icons/hicolor/64x64/mimetypes/application-x-kmymoney.png
 share/icons/locolor/16x16/apps/kmymoney.png
 share/icons/locolor/32x32/apps/kmymoney.png
-share/kde4/services/ibanbicdata/germany.desktop
 %%CALENDAR%%share/kde4/services/kcm_kmm_icalendarexport.desktop
 share/kde4/services/kcm_kmm_printcheck.desktop
 share/kde4/services/kmm_csvexport.desktop
@@ -1535,14 +1547,11 @@ share/kde4/services/kmm_csvimport.desktop
 %%OFX%%share/kde4/services/kmm_ofximport.desktop
 share/kde4/services/kmm_printcheck.desktop
 share/kde4/services/kmm_reconciliationreport.desktop
-share/kde4/services/kmm_weboob.desktop
+%%WEBOOB%%share/kde4/services/kmm_weboob.desktop
 share/kde4/services/kmymoney-ibanbic-delegate.desktop
 share/kde4/services/kmymoney-ibanbic-storageplugin.desktop
 share/kde4/services/kmymoney-nationalaccount-delegate.desktop
 share/kde4/services/kmymoney-nationalaccount-storageplugin.desktop
-share/kde4/services/kmymoney-nationalorders.desktop
-share/kde4/services/kmymoney-nationalordersui.desktop
-share/kde4/services/kmymoney-nationalstorageplugin.desktop
 share/kde4/services/kmymoney-sepaorders.desktop
 share/kde4/services/kmymoney-sepaordersui.desktop
 share/kde4/services/kmymoney-sepastorageplugin.desktop
@@ -1581,6 +1590,5 @@ share/kde4/servicetypes/kmymoney-sqlstorageplugin.desktop
 %%NLS%%share/locale/sv/LC_MESSAGES/kmymoney.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/kmymoney.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/kmymoney.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/kmymoney.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/kmymoney.mo
 share/mime/packages/x-kmymoney.xml