devel/gwenhywfar:

- Repocopy devel/gwenhywfar to devel/gwenhywfar-{fox16,gtk2,qt4}.
- devel/gwenhywfar is now a master port and new slave ports will allow the
  user to install the GUI libraries separately. This will make packaging
  easier for finance/gnucash and finance/kmymoney-kde4.

finance/aqbanking:
- finance/aqbanking has been updated to 5.0.25 and includes a shlib bump, so
  instead of making the user rebuild twice it is included here.
- Shlib bump aqbanking.33 -> aqbanking.34.
- Fix LICENSE.
- Convert to new OPTIONS framework.

finance/gnucash:
- Adjust LIB_DEPENDS for AQBANKING option so they are installed in the
  correct order.
- Drop unneeded LICENSE_FILE.
- Drop ABI version numbers from all LIB_DEPENDS (if you really want to keep
  them, at least keep the LIB_DEPENDS in the order I changed them to since
  aqbanking should be built last. Also aqbanking.33 -> aqbanking.34).
- Remove BROKEN message now that the dependency problem is solved.

finance/kmymoney-kde4:
- Convert to new OPTIONS framework.
- Drop WITH_* from PLIST_SUB.
- Drop ABI version numbers from all LIB_DEPENDS.
- Add USE_PKGCONFIG=build.
- Remove IGNORE message now that the dependency problem is solved.

Also clean up the header for the touched Makefiles.

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

24 files changed, 416 insertions, 158 deletions

diff --git a/devel/Makefile b/devel/Makefile
index 58cd908565e1..f42aa07ec1f8 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -560,6 +560,9 @@
     SUBDIR += guiloader-c++
     SUBDIR += gvfs
     SUBDIR += gwenhywfar
+    SUBDIR += gwenhywfar-fox16
+    SUBDIR += gwenhywfar-gtk2
+    SUBDIR += gwenhywfar-qt4
     SUBDIR += gzstream
     SUBDIR += hachoir-core
     SUBDIR += hachoir-parser
diff --git a/devel/gwenhywfar-fox16/Makefile b/devel/gwenhywfar-fox16/Makefile
new file mode 100644
index 000000000000..7fe22d5fcc70
--- /dev/null
+++ b/devel/gwenhywfar-fox16/Makefile
@@ -0,0 +1,92 @@
+# $FreeBSD$
+
+PORTNAME=	gwenhywfar
+PORTVERSION=	4.3.3
+PORTREVISION=	1
+CATEGORIES=	devel net security
+MASTER_SITES=	http://www.aquamaniac.de/sites/download/download.php?package=01&release=67&file=01&dummy=/
+
+MAINTAINER=	bsdkaffee@gmail.com
+COMMENT=	Multi-platform helper library for networking and security applications
+
+LICENSE=	LGPL21
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+LIB_DEPENDS=	gcrypt.18:${PORTSDIR}/security/libgcrypt \
+		gnutls.47:${PORTSDIR}/security/gnutls
+
+USE_GMAKE=	yes
+USE_GETTEXT=	yes
+USE_OPENSSL=	yes
+USE_AUTOTOOLS=	libtool
+USE_GNOME=	gnomehack pkgconfig
+
+OPTIONS=	APIDOC "Full API documentation (requires Doxygen)" off \
+		MEMDEBUG "Enable memory debugger statistic" off \
+		FOX16 "Build FOX 1.6 GUI" off \
+		GTK2 "Build GTK 2.x GUI (for GnuCash)" on \
+		QT4 "Build Qt 4.x GUI (for KMyMoney)" on
+
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--enable-release="yes" \
+		--with-guis="${_GWEN_GUIS}"
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+MAKE_JOBS_SAFE=	yes
+
+PLIST_SUB=	GWEN_SHLIB_VER="${GWEN_SHLIB_VER}"
+USE_LDCONFIG=	yes
+
+GWEN_SHLIB_VER=	60
+
+.include <bsd.port.options.mk>
+
+.if !defined(NOPORTDOCS) && defined(WITH_APIDOC)
+BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen \
+		dot:${PORTSDIR}/graphics/graphviz
+CONFIGURE_ARGS+=--enable-full-doc
+PORTDOCS=	apidoc
+.endif
+
+.if defined(WITH_MEMDEBUG)
+CONFIGURE_ARGS+=--enable-memtrace
+.endif
+
+.if defined(WITH_FOX16)
+LIB_DEPENDS+=	FOX-1.6:${PORTSDIR}/x11-toolkits/fox16
+PLIST_SUB+=	WITH_FOX16=""
+_GWEN_GUIS+=	fox16
+.else
+PLIST_SUB+=	WITH_FOX16="@comment "
+.endif
+
+.if defined(WITH_GTK2)
+USE_GNOME+=	gtk20
+PLIST_SUB+=	WITH_GTK2=""
+_GWEN_GUIS+=	gtk2
+.else
+PLIST_SUB+=	WITH_GTK2="@comment "
+.endif
+
+.if defined(WITH_QT4)
+USE_QT4=	gui moc_build uic_build
+QT_NONSTANDARD=	yes
+PLIST_SUB+=	WITH_QT4=""
+_GWEN_GUIS+=	qt4
+.else
+PLIST_SUB+=	WITH_QT4="@comment "
+.endif
+
+post-build:
+.if !defined(NOPORTDOCS) && defined(WITH_APIDOC)
+	@cd ${WRKSRC} && ${GMAKE} srcdoc
+.endif
+
+post-install:
+.if !defined(NOPORTDOCS) && defined(WITH_APIDOC)
+	${MKDIR} ${DOCSDIR}/apidoc
+	cd ${WRKSRC}/apidoc && \
+		${COPYTREE_SHARE} \* ${DOCSDIR}/apidoc
+.endif
+
+.include <bsd.port.mk>
diff --git a/devel/gwenhywfar-fox16/distinfo b/devel/gwenhywfar-fox16/distinfo
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/devel/gwenhywfar-fox16/distinfo
diff --git a/devel/gwenhywfar-fox16/files/patch-configure b/devel/gwenhywfar-fox16/files/patch-configure
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/devel/gwenhywfar-fox16/files/patch-configure
diff --git a/devel/gwenhywfar-fox16/pkg-descr b/devel/gwenhywfar-fox16/pkg-descr
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/devel/gwenhywfar-fox16/pkg-descr
diff --git a/devel/gwenhywfar-fox16/pkg-plist b/devel/gwenhywfar-fox16/pkg-plist
new file mode 100644
index 000000000000..ebadf9c9976f
--- /dev/null
+++ b/devel/gwenhywfar-fox16/pkg-plist
@@ -0,0 +1,14 @@
+include/gwenhywfar4/gwen-gui-fox16/api.h
+include/gwenhywfar4/gwen-gui-fox16/cppdialog.hpp
+include/gwenhywfar4/gwen-gui-fox16/cppgui.hpp
+include/gwenhywfar4/gwen-gui-fox16/fox16_gui.hpp
+include/gwenhywfar4/gwen-gui-fox16/fox16_htmlctx.hpp
+include/gwenhywfar4/gwen-gui-fox16/fox16_htmllabel.hpp
+include/gwenhywfar4/gwen-gui-fox16/fox16_htmltext.hpp
+include/gwenhywfar4/gwen-gui-fox16/theme.h
+lib/libgwengui-fox16.a
+lib/libgwengui-fox16.la
+lib/libgwengui-fox16.so
+lib/libgwengui-fox16.so.0
+libdata/pkgconfig/gwengui-fox16.pc
+@dirrm include/gwenhywfar4/gwen-gui-fox16
diff --git a/devel/gwenhywfar-gtk2/Makefile b/devel/gwenhywfar-gtk2/Makefile
new file mode 100644
index 000000000000..7fe22d5fcc70
--- /dev/null
+++ b/devel/gwenhywfar-gtk2/Makefile
@@ -0,0 +1,92 @@
+# $FreeBSD$
+
+PORTNAME=	gwenhywfar
+PORTVERSION=	4.3.3
+PORTREVISION=	1
+CATEGORIES=	devel net security
+MASTER_SITES=	http://www.aquamaniac.de/sites/download/download.php?package=01&release=67&file=01&dummy=/
+
+MAINTAINER=	bsdkaffee@gmail.com
+COMMENT=	Multi-platform helper library for networking and security applications
+
+LICENSE=	LGPL21
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+LIB_DEPENDS=	gcrypt.18:${PORTSDIR}/security/libgcrypt \
+		gnutls.47:${PORTSDIR}/security/gnutls
+
+USE_GMAKE=	yes
+USE_GETTEXT=	yes
+USE_OPENSSL=	yes
+USE_AUTOTOOLS=	libtool
+USE_GNOME=	gnomehack pkgconfig
+
+OPTIONS=	APIDOC "Full API documentation (requires Doxygen)" off \
+		MEMDEBUG "Enable memory debugger statistic" off \
+		FOX16 "Build FOX 1.6 GUI" off \
+		GTK2 "Build GTK 2.x GUI (for GnuCash)" on \
+		QT4 "Build Qt 4.x GUI (for KMyMoney)" on
+
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--enable-release="yes" \
+		--with-guis="${_GWEN_GUIS}"
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+MAKE_JOBS_SAFE=	yes
+
+PLIST_SUB=	GWEN_SHLIB_VER="${GWEN_SHLIB_VER}"
+USE_LDCONFIG=	yes
+
+GWEN_SHLIB_VER=	60
+
+.include <bsd.port.options.mk>
+
+.if !defined(NOPORTDOCS) && defined(WITH_APIDOC)
+BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen \
+		dot:${PORTSDIR}/graphics/graphviz
+CONFIGURE_ARGS+=--enable-full-doc
+PORTDOCS=	apidoc
+.endif
+
+.if defined(WITH_MEMDEBUG)
+CONFIGURE_ARGS+=--enable-memtrace
+.endif
+
+.if defined(WITH_FOX16)
+LIB_DEPENDS+=	FOX-1.6:${PORTSDIR}/x11-toolkits/fox16
+PLIST_SUB+=	WITH_FOX16=""
+_GWEN_GUIS+=	fox16
+.else
+PLIST_SUB+=	WITH_FOX16="@comment "
+.endif
+
+.if defined(WITH_GTK2)
+USE_GNOME+=	gtk20
+PLIST_SUB+=	WITH_GTK2=""
+_GWEN_GUIS+=	gtk2
+.else
+PLIST_SUB+=	WITH_GTK2="@comment "
+.endif
+
+.if defined(WITH_QT4)
+USE_QT4=	gui moc_build uic_build
+QT_NONSTANDARD=	yes
+PLIST_SUB+=	WITH_QT4=""
+_GWEN_GUIS+=	qt4
+.else
+PLIST_SUB+=	WITH_QT4="@comment "
+.endif
+
+post-build:
+.if !defined(NOPORTDOCS) && defined(WITH_APIDOC)
+	@cd ${WRKSRC} && ${GMAKE} srcdoc
+.endif
+
+post-install:
+.if !defined(NOPORTDOCS) && defined(WITH_APIDOC)
+	${MKDIR} ${DOCSDIR}/apidoc
+	cd ${WRKSRC}/apidoc && \
+		${COPYTREE_SHARE} \* ${DOCSDIR}/apidoc
+.endif
+
+.include <bsd.port.mk>
diff --git a/devel/gwenhywfar-gtk2/distinfo b/devel/gwenhywfar-gtk2/distinfo
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/devel/gwenhywfar-gtk2/distinfo
diff --git a/devel/gwenhywfar-gtk2/files/patch-configure b/devel/gwenhywfar-gtk2/files/patch-configure
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/devel/gwenhywfar-gtk2/files/patch-configure
diff --git a/devel/gwenhywfar-gtk2/pkg-descr b/devel/gwenhywfar-gtk2/pkg-descr
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/devel/gwenhywfar-gtk2/pkg-descr
diff --git a/devel/gwenhywfar-gtk2/pkg-plist b/devel/gwenhywfar-gtk2/pkg-plist
new file mode 100644
index 000000000000..5a5786b037c0
--- /dev/null
+++ b/devel/gwenhywfar-gtk2/pkg-plist
@@ -0,0 +1,7 @@
+include/gwenhywfar4/gwen-gui-gtk2/gtk2_gui.h
+lib/libgwengui-gtk2.a
+lib/libgwengui-gtk2.la
+lib/libgwengui-gtk2.so
+lib/libgwengui-gtk2.so.0
+libdata/pkgconfig/gwengui-gtk2.pc
+@dirrm include/gwenhywfar4/gwen-gui-gtk2
diff --git a/devel/gwenhywfar-qt4/Makefile b/devel/gwenhywfar-qt4/Makefile
new file mode 100644
index 000000000000..7fe22d5fcc70
--- /dev/null
+++ b/devel/gwenhywfar-qt4/Makefile
@@ -0,0 +1,92 @@
+# $FreeBSD$
+
+PORTNAME=	gwenhywfar
+PORTVERSION=	4.3.3
+PORTREVISION=	1
+CATEGORIES=	devel net security
+MASTER_SITES=	http://www.aquamaniac.de/sites/download/download.php?package=01&release=67&file=01&dummy=/
+
+MAINTAINER=	bsdkaffee@gmail.com
+COMMENT=	Multi-platform helper library for networking and security applications
+
+LICENSE=	LGPL21
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+LIB_DEPENDS=	gcrypt.18:${PORTSDIR}/security/libgcrypt \
+		gnutls.47:${PORTSDIR}/security/gnutls
+
+USE_GMAKE=	yes
+USE_GETTEXT=	yes
+USE_OPENSSL=	yes
+USE_AUTOTOOLS=	libtool
+USE_GNOME=	gnomehack pkgconfig
+
+OPTIONS=	APIDOC "Full API documentation (requires Doxygen)" off \
+		MEMDEBUG "Enable memory debugger statistic" off \
+		FOX16 "Build FOX 1.6 GUI" off \
+		GTK2 "Build GTK 2.x GUI (for GnuCash)" on \
+		QT4 "Build Qt 4.x GUI (for KMyMoney)" on
+
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--enable-release="yes" \
+		--with-guis="${_GWEN_GUIS}"
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+MAKE_JOBS_SAFE=	yes
+
+PLIST_SUB=	GWEN_SHLIB_VER="${GWEN_SHLIB_VER}"
+USE_LDCONFIG=	yes
+
+GWEN_SHLIB_VER=	60
+
+.include <bsd.port.options.mk>
+
+.if !defined(NOPORTDOCS) && defined(WITH_APIDOC)
+BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen \
+		dot:${PORTSDIR}/graphics/graphviz
+CONFIGURE_ARGS+=--enable-full-doc
+PORTDOCS=	apidoc
+.endif
+
+.if defined(WITH_MEMDEBUG)
+CONFIGURE_ARGS+=--enable-memtrace
+.endif
+
+.if defined(WITH_FOX16)
+LIB_DEPENDS+=	FOX-1.6:${PORTSDIR}/x11-toolkits/fox16
+PLIST_SUB+=	WITH_FOX16=""
+_GWEN_GUIS+=	fox16
+.else
+PLIST_SUB+=	WITH_FOX16="@comment "
+.endif
+
+.if defined(WITH_GTK2)
+USE_GNOME+=	gtk20
+PLIST_SUB+=	WITH_GTK2=""
+_GWEN_GUIS+=	gtk2
+.else
+PLIST_SUB+=	WITH_GTK2="@comment "
+.endif
+
+.if defined(WITH_QT4)
+USE_QT4=	gui moc_build uic_build
+QT_NONSTANDARD=	yes
+PLIST_SUB+=	WITH_QT4=""
+_GWEN_GUIS+=	qt4
+.else
+PLIST_SUB+=	WITH_QT4="@comment "
+.endif
+
+post-build:
+.if !defined(NOPORTDOCS) && defined(WITH_APIDOC)
+	@cd ${WRKSRC} && ${GMAKE} srcdoc
+.endif
+
+post-install:
+.if !defined(NOPORTDOCS) && defined(WITH_APIDOC)
+	${MKDIR} ${DOCSDIR}/apidoc
+	cd ${WRKSRC}/apidoc && \
+		${COPYTREE_SHARE} \* ${DOCSDIR}/apidoc
+.endif
+
+.include <bsd.port.mk>
diff --git a/devel/gwenhywfar-qt4/distinfo b/devel/gwenhywfar-qt4/distinfo
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/devel/gwenhywfar-qt4/distinfo
diff --git a/devel/gwenhywfar-qt4/files/patch-configure b/devel/gwenhywfar-qt4/files/patch-configure
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/devel/gwenhywfar-qt4/files/patch-configure
diff --git a/devel/gwenhywfar-qt4/pkg-descr b/devel/gwenhywfar-qt4/pkg-descr
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/devel/gwenhywfar-qt4/pkg-descr
diff --git a/devel/gwenhywfar-qt4/pkg-plist b/devel/gwenhywfar-qt4/pkg-plist
new file mode 100644
index 000000000000..12a04f082161
--- /dev/null
+++ b/devel/gwenhywfar-qt4/pkg-plist
@@ -0,0 +1,7 @@
+include/gwenhywfar4/gwen-gui-qt4/qt4_gui.hpp
+lib/libgwengui-qt4.a
+lib/libgwengui-qt4.la
+lib/libgwengui-qt4.so
+lib/libgwengui-qt4.so.0
+libdata/pkgconfig/gwengui-qt4.pc
+@dirrm include/gwenhywfar4/gwen-gui-qt4
diff --git a/devel/gwenhywfar/Makefile b/devel/gwenhywfar/Makefile
index 4fdcd260f2f5..25c114f964ae 100644
--- a/devel/gwenhywfar/Makefile
+++ b/devel/gwenhywfar/Makefile
@@ -1,42 +1,36 @@
-# New ports collection makefile for:	gwenhywfar
-# Date created:		2005-05-05
-# Whom:			Peter Cornelius <pcc.at.gmx.net>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	gwenhywfar
 PORTVERSION=	4.3.3
-PORTREVISION=	1
+PORTREVISION?=	2
 CATEGORIES=	devel net security
 MASTER_SITES=	http://www.aquamaniac.de/sites/download/download.php?package=01&release=67&file=01&dummy=/
 
-MAINTAINER=	bsdkaffee@gmail.com
-COMMENT=	Multi-platform helper library for networking and security applications
+MAINTAINER?=	bsdkaffee@gmail.com
+COMMENT?=	Multi-platform helper library for networking and security applications
 
 LICENSE=	LGPL21
-LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	gcrypt.18:${PORTSDIR}/security/libgcrypt \
-		gnutls.47:${PORTSDIR}/security/gnutls
+LIB_DEPENDS=	gcrypt:${PORTSDIR}/security/libgcrypt \
+		gnutls:${PORTSDIR}/security/gnutls
+
+.if !defined(SLAVEPORT)
+OPTIONS_DEFINE=	DOC MEMDEBUG
+
+MEMDEBUG_DESC=	Enable memory debugger statistic
+.endif
 
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_OPENSSL=	yes
+USE_PKGCONFIG=	build
 USE_AUTOTOOLS=	libtool
-USE_GNOME=	gnomehack pkgconfig
-
-OPTIONS=	APIDOC "Full API documentation (requires Doxygen)" off \
-		MEMDEBUG "Enable memory debugger statistic" off \
-		FOX16 "Build FOX 1.6 GUI" off \
-		GTK2 "Build GTK 2.x GUI (for GnuCash)" on \
-		QT4 "Build Qt 4.x GUI (for KMyMoney)" on
+USE_GNOME=	gnomehack
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-release="yes" \
-		--with-guis="${_GWEN_GUIS}"
-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+		--with-guis="${SLAVEPORT}"
+CPPFLAGS+=	-DGCRYPT_NO_DEPRECATED
 MAKE_JOBS_SAFE=	yes
 
 PLIST_SUB=	GWEN_SHLIB_VER="${GWEN_SHLIB_VER}"
@@ -46,49 +40,51 @@ GWEN_SHLIB_VER=	60
 
 .include <bsd.port.options.mk>
 
-.if !defined(NOPORTDOCS) && defined(WITH_APIDOC)
+.if ${PORT_OPTIONS:MDOC}
 BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen \
 		dot:${PORTSDIR}/graphics/graphviz
 CONFIGURE_ARGS+=--enable-full-doc
 PORTDOCS=	apidoc
 .endif
 
-.if defined(WITH_MEMDEBUG)
+.if ${PORT_OPTIONS:MMEMDEBUG}
 CONFIGURE_ARGS+=--enable-memtrace
 .endif
 
-.if defined(WITH_FOX16)
+.if defined(SLAVEPORT)
+LIB_DEPENDS+=	gwenhywfar:${PORTSDIR}/devel/gwenhywfar
+BUILD_WRKSRC=	${WRKSRC}/gui
+INSTALL_WRKSRC=	${WRKSRC}/gui/${SLAVEPORT}
+
+.if ${SLAVEPORT}=="fox16"
 LIB_DEPENDS+=	FOX-1.6:${PORTSDIR}/x11-toolkits/fox16
-PLIST_SUB+=	WITH_FOX16=""
-_GWEN_GUIS+=	fox16
-.else
-PLIST_SUB+=	WITH_FOX16="@comment "
+CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 .endif
 
-.if defined(WITH_GTK2)
+.if ${SLAVEPORT}=="gtk2"
 USE_GNOME+=	gtk20
-PLIST_SUB+=	WITH_GTK2=""
-_GWEN_GUIS+=	gtk2
-.else
-PLIST_SUB+=	WITH_GTK2="@comment "
 .endif
 
-.if defined(WITH_QT4)
+.if ${SLAVEPORT}=="qt4"
 USE_QT4=	gui moc_build uic_build
 QT_NONSTANDARD=	yes
-PLIST_SUB+=	WITH_QT4=""
-_GWEN_GUIS+=	qt4
-.else
-PLIST_SUB+=	WITH_QT4="@comment "
+.endif
+.endif
+
+post-patch:
+.if defined(SLAVEPORT)
+	@${FIND} ${BUILD_WRKSRC} -name "Makefile.in" -type f | ${XARGS} \
+	${REINPLACE_CMD} -e 's|[$$][(]top_builddir[)]/src/[$$][(]gwenhywfar_internal_libname[)]|$$(gwenhywfar_libs)|g'
 .endif
 
 post-build:
-.if !defined(NOPORTDOCS) && defined(WITH_APIDOC)
+.if ${PORT_OPTIONS:MDOC}
 	@cd ${WRKSRC} && ${GMAKE} srcdoc
 .endif
 
 post-install:
-.if !defined(NOPORTDOCS) && defined(WITH_APIDOC)
+.if ${PORT_OPTIONS:MDOC}
 	${MKDIR} ${DOCSDIR}/apidoc
 	cd ${WRKSRC}/apidoc && \
 		${COPYTREE_SHARE} \* ${DOCSDIR}/apidoc
diff --git a/devel/gwenhywfar/pkg-plist b/devel/gwenhywfar/pkg-plist
index 5a9a3f8d2500..7062ef1be010 100644
--- a/devel/gwenhywfar/pkg-plist
+++ b/devel/gwenhywfar/pkg-plist
@@ -8,16 +8,6 @@ bin/xmlmerge
 include/gwenhywfar4/gwen-gui-cpp/cppdialog.hpp
 include/gwenhywfar4/gwen-gui-cpp/cppgui.hpp
 include/gwenhywfar4/gwen-gui-cpp/cppwidget.hpp
-%%WITH_FOX16%%include/gwenhywfar4/gwen-gui-fox16/api.h
-%%WITH_FOX16%%include/gwenhywfar4/gwen-gui-fox16/cppdialog.hpp
-%%WITH_FOX16%%include/gwenhywfar4/gwen-gui-fox16/cppgui.hpp
-%%WITH_FOX16%%include/gwenhywfar4/gwen-gui-fox16/fox16_gui.hpp
-%%WITH_FOX16%%include/gwenhywfar4/gwen-gui-fox16/fox16_htmlctx.hpp
-%%WITH_FOX16%%include/gwenhywfar4/gwen-gui-fox16/fox16_htmllabel.hpp
-%%WITH_FOX16%%include/gwenhywfar4/gwen-gui-fox16/fox16_htmltext.hpp
-%%WITH_FOX16%%include/gwenhywfar4/gwen-gui-fox16/theme.h
-%%WITH_GTK2%%include/gwenhywfar4/gwen-gui-gtk2/gtk2_gui.h
-%%WITH_QT4%%include/gwenhywfar4/gwen-gui-qt4/qt4_gui.hpp
 include/gwenhywfar4/gwenhywfar/args.h
 include/gwenhywfar4/gwenhywfar/base64.h
 include/gwenhywfar4/gwenhywfar/buffer.h
@@ -151,25 +141,10 @@ lib/gwenhywfar/plugins/%%GWEN_SHLIB_VER%%/dbio/xmldb.la
 lib/gwenhywfar/plugins/%%GWEN_SHLIB_VER%%/dbio/xmldb.so
 lib/gwenhywfar/plugins/%%GWEN_SHLIB_VER%%/dbio/xmldb.so.0
 lib/gwenhywfar/plugins/%%GWEN_SHLIB_VER%%/dbio/xmldb.xml
-%%WITH_FOX16%%lib/libgwengui-fox16.a
-%%WITH_FOX16%%lib/libgwengui-fox16.la
-%%WITH_FOX16%%lib/libgwengui-fox16.so
-%%WITH_FOX16%%lib/libgwengui-fox16.so.0
-%%WITH_GTK2%%lib/libgwengui-gtk2.a
-%%WITH_GTK2%%lib/libgwengui-gtk2.la
-%%WITH_GTK2%%lib/libgwengui-gtk2.so
-%%WITH_GTK2%%lib/libgwengui-gtk2.so.0
-%%WITH_QT4%%lib/libgwengui-qt4.a
-%%WITH_QT4%%lib/libgwengui-qt4.la
-%%WITH_QT4%%lib/libgwengui-qt4.so
-%%WITH_QT4%%lib/libgwengui-qt4.so.0
 lib/libgwenhywfar.a
 lib/libgwenhywfar.la
 lib/libgwenhywfar.so
 lib/libgwenhywfar.so.63
-%%WITH_FOX16%%libdata/pkgconfig/gwengui-fox16.pc
-%%WITH_GTK2%%libdata/pkgconfig/gwengui-gtk2.pc
-%%WITH_QT4%%libdata/pkgconfig/gwengui-qt4.pc
 libdata/pkgconfig/gwenhywfar.pc
 share/aclocal/gwenhywfar.m4
 share/gwenhywfar/ca-bundle.crt
@@ -206,8 +181,5 @@ share/locale/de/LC_MESSAGES/gwenhywfar.mo
 @dirrm lib/gwenhywfar/plugins
 @dirrm lib/gwenhywfar
 @dirrm include/gwenhywfar4/gwenhywfar
-%%WITH_QT4%%@dirrm include/gwenhywfar4/gwen-gui-qt4
-%%WITH_GTK2%%@dirrm include/gwenhywfar4/gwen-gui-gtk2
-%%WITH_FOX16%%@dirrm include/gwenhywfar4/gwen-gui-fox16
 @dirrm include/gwenhywfar4/gwen-gui-cpp
 @dirrm include/gwenhywfar4
diff --git a/finance/aqbanking/Makefile b/finance/aqbanking/Makefile
index 4cdd5308c5b2..351e70a04fc5 100644
--- a/finance/aqbanking/Makefile
+++ b/finance/aqbanking/Makefile
@@ -1,33 +1,30 @@
-# New ports collection makefile for:	aqbanking
-# Date created:		June 2005
-# Whom:                 Sam Lawrance <lawrance@FreeBSD.org>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	aqbanking
-PORTVERSION=	5.0.23
-PORTREVISION=	1
+PORTVERSION=	5.0.25
 CATEGORIES=	finance
-MASTER_SITES=	http://www.aquamaniac.de/sites/download/download.php?package=03&release=93&file=01&dummy=/
+MASTER_SITES=	http://www.aquamaniac.de/sites/download/download.php?package=03&release=95&file=01&dummy=/
 
 MAINTAINER=	bsdkaffee@gmail.com
 COMMENT=	Online banking interface and financial data framework
 
-LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
+LICENSE=	GPLv2 GPLv3
+LICENSE_COMB=	dual
 
-LIB_DEPENDS=	gwenhywfar.63:${PORTSDIR}/devel/gwenhywfar \
-		gmp.10:${PORTSDIR}/math/gmp
+LIB_DEPENDS=	gwenhywfar:${PORTSDIR}/devel/gwenhywfar \
+		gmp:${PORTSDIR}/math/gmp
+
+OPTIONS_DEFINE=		DOCS KTOBLZCHECK PAYPAL
+OPTIONS_DEFAULT=	KTOBLZCHECK
+
+KTOBLZCHECK_DESC=	Enable KtoBlzCheck support
+PAYPAL_DESC=		Build PayPal backend (separate license)
 
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
+USE_PKGCONFIG=	build
 USE_AUTOTOOLS=	libtool
-USE_GNOME=	gnomehack pkgconfig
-
-OPTIONS=	APIDOC "Full API documentation (requires Doxygen)" off \
-		KTOBLZCHECK "KtoBlzCheck support" off \
-		PAYPAL "Build PayPal backend (separate license)" off
+USE_GNOME=	gnomehack
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-release="yes"
@@ -39,23 +36,23 @@ PLIST_SUB=	AQB_SHLIB_VER="${AQB_SHLIB_VER}" \
 		GWEN_SHLIB_VER="${GWEN_SHLIB_VER}"
 USE_LDCONFIG=	yes
 
-AQB_SHLIB_VER=	33
+AQB_SHLIB_VER=	34
 GWEN_SHLIB_VER=	60
 
 .include <bsd.port.options.mk>
 
-.if !defined(NOPORTDOCS) && defined(WITH_APIDOC)
+.if ${PORT_OPTIONS:MDOCS}
 BUILD_DEPENDS+=	doxygen:${PORTSDIR}/devel/doxygen \
 		dot:${PORTSDIR}/graphics/graphviz
 CONFIGURE_ARGS+=--enable-full-doc
 PORTDOCS=	apidoc
 .endif
 
-.if defined(WITH_KTOBLZCHECK) || exists(${LOCALBASE}/lib/libktoblzcheck.so)
+.if ${PORT_OPTIONS:MKTOBLZCHECK} || exists(${LOCALBASE}/lib/libktoblzcheck.so)
 LIB_DEPENDS+=	ktoblzcheck:${PORTSDIR}/finance/ktoblzcheck
 .endif
 
-.if defined(WITH_PAYPAL)
+.if ${PORT_OPTIONS:MPAYPAL}
 CONFIGURE_ARGS+=--with-backends="aqhbci aqnone aqofxconnect aqpaypal"
 PLIST_SUB+=	WITH_PAYPAL=""
 .else
@@ -67,12 +64,12 @@ post-patch:
 		${WRKSRC}/Makefile.in
 
 post-build:
-.if !defined(NOPORTDOCS) && defined(WITH_APIDOC)
+.if ${PORT_OPTIONS:MDOCS}
 	@cd ${WRKSRC} && ${GMAKE} srcdoc
 .endif
 
 post-install:
-.if !defined(NOPORTDOCS) && defined(WITH_APIDOC)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}/apidoc
 	cd ${WRKSRC}/apidoc && \
 		${COPYTREE_SHARE} \* ${DOCSDIR}/apidoc
diff --git a/finance/aqbanking/distinfo b/finance/aqbanking/distinfo
index 132a3b8f8cdd..ca197f62156c 100644
--- a/finance/aqbanking/distinfo
+++ b/finance/aqbanking/distinfo
@@ -1,2 +1,2 @@
-SHA256 (aqbanking-5.0.23.tar.gz) = 04f2a9420513040b0e88c93b746d2e193985af909b58cc4ba99db56570059213
-SIZE (aqbanking-5.0.23.tar.gz) = 3635384
+SHA256 (aqbanking-5.0.25.tar.gz) = bb99f16704200e1ff456574b17895e04ef375479b21e075607454e6bc7c02151
+SIZE (aqbanking-5.0.25.tar.gz) = 3637565
diff --git a/finance/aqbanking/pkg-plist b/finance/aqbanking/pkg-plist
index 84aa379da685..2af8ba4d1e27 100644
--- a/finance/aqbanking/pkg-plist
+++ b/finance/aqbanking/pkg-plist
@@ -315,6 +315,7 @@ share/aqbanking/imexporters/csv/profiles/sparda.conf
 share/aqbanking/imexporters/csv/profiles/spk-aachen.conf
 share/aqbanking/imexporters/csv/profiles/spk-steiermark.conf
 share/aqbanking/imexporters/csv/profiles/tonline-banking.conf
+share/aqbanking/imexporters/csv/profiles/transfers.conf
 share/aqbanking/imexporters/csv/profiles/vrnetworld.conf
 share/aqbanking/imexporters/ctxfile/profiles/default.conf
 share/aqbanking/imexporters/dtaus/profiles/debitnote.conf
diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index b6ac65d2f764..fa069c4291e2 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -1,13 +1,9 @@
-# Ports collection makefile for:  gnucash
-# Date created:			  Mon Feb 03, 1997
-# Whom:				  David O'Brien (obrien@NUXI.com)
-#
 # $FreeBSD$
 #   $MCom: ports/finance/gnucash/Makefile,v 1.26 2008/12/31 03:25:18 mezz Exp $
-#
 
 PORTNAME=	gnucash
 PORTVERSION=	2.4.11
+PORTREVISION=	1
 CATEGORIES=	finance gnome
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20%28stable%29/${PORTVERSION}
 
@@ -15,12 +11,11 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Quicken-like money and finance manager
 
 LICENSE=	GPLv3
-LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	guile>=1.8.6:${PORTSDIR}/lang/guile \
     		${LOCALBASE}/share/guile/1.8/slibcat:${PORTSDIR}/lang/slib-guile
-LIB_DEPENDS=	gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring \
-		goffice-0.8.8:${PORTSDIR}/devel/goffice
+LIB_DEPENDS=	gnome-keyring:${PORTSDIR}/security/libgnome-keyring \
+		goffice-0.8:${PORTSDIR}/devel/goffice
 RUN_DEPENDS=	guile>=1.8.6:${PORTSDIR}/lang/guile \
 		${LOCALBASE}/share/guile/1.8/slibcat:${PORTSDIR}/lang/slib-guile \
 		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
@@ -70,9 +65,10 @@ GCONF_SCHEMAS=	apps_gnucash_dialog_business_common.schemas \
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MAQBANKING}
-LIB_DEPENDS+=	aqbanking.33:${PORTSDIR}/finance/aqbanking \
-		gwengui-gtk2.0:${PORTSDIR}/devel/gwenhywfar \
-		ktoblzcheck.6:${PORTSDIR}/finance/ktoblzcheck
+LIB_DEPENDS+=	gwengui-gtk2:${PORTSDIR}/devel/gwenhywfar-gtk2 \
+		ktoblzcheck:${PORTSDIR}/finance/ktoblzcheck \
+		aqbanking:${PORTSDIR}/finance/aqbanking
+
 GCONF_SCHEMAS+=	apps_gnucash_dialog_hbci.schemas
 CONFIGURE_ARGS+=--enable-aqbanking
 PLIST_SUB+=	AQBANKING=""
@@ -83,7 +79,7 @@ PLIST_SUB+=	AQBANKING="@comment "
 
 .if ${PORT_OPTIONS:MOFX}
 CONFIGURE_ARGS+=--enable-ofx
-LIB_DEPENDS+=	ofx.5:${PORTSDIR}/finance/libofx
+LIB_DEPENDS+=	ofx:${PORTSDIR}/finance/libofx
 PLIST_SUB+=	OFX=""
 .else
 CONFIGURE_ARGS+=--disable-ofx
@@ -92,7 +88,7 @@ PLIST_SUB+=	OFX="@comment "
 
 .if ${PORT_OPTIONS:MDATABASE}
 CONFIGURE_ARGS+=--enable-dbi
-LIB_DEPENDS+=	dbi.1:${PORTSDIR}/databases/libdbi
+LIB_DEPENDS+=	dbi:${PORTSDIR}/databases/libdbi
 PLIST_SUB+=	DATABASE=""
 .else
 CONFIGURE_ARGS+=--disable-dbi
@@ -105,7 +101,7 @@ CONFIGURE_ARGS+=--enable-locale-specific-tax
 
 .if ${PORT_OPTIONS:MWEBKIT}
 CONFIGURE_ARGS+=--with-html-engine=webkit
-LIB_DEPENDS+=	webkitgtk-1.0.0:${PORTSDIR}/www/webkit-gtk2
+LIB_DEPENDS+=	webkitgtk-1.0:${PORTSDIR}/www/webkit-gtk2
 .else
 USE_GNOME+=	gtkhtml3
 .endif
@@ -118,11 +114,6 @@ PLIST_SUB+=	PYTHON=""
 PLIST_SUB+=	PYTHON="@comment "
 .endif
 
-pre-configure:
-.if !defined(PACKAGE_BUILDING) && ${PORT_OPTIONS:MAQBANKING} && !exists(${LOCALBASE}/lib/libgwengui-gtk2.so.0)
-BROKEN=	Please rebuild devel/gwenhywfar with the GTK2 option set
-.endif
-
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/finance/kmymoney-kde4/Makefile b/finance/kmymoney-kde4/Makefile
index 941630349f67..af5634723be4 100644
--- a/finance/kmymoney-kde4/Makefile
+++ b/finance/kmymoney-kde4/Makefile
@@ -1,13 +1,8 @@
-# New ports collection makefile for:	KMyMoney
-# Date created:				21 June 2004
-# Whom:					Alexander Novitsky
-#
 # $FreeBSD$
-#
 
 PORTNAME=	kmymoney
 PORTVERSION=	4.6.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	finance kde
 MASTER_SITES=	SF/${PORTNAME}2/KMyMoney-KDE4/${PORTVERSION}
 
@@ -15,13 +10,21 @@ MAINTAINER=	bsdkaffee@gmail.com
 COMMENT=	KDE 4.x-based personal finance manager
 
 LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	boost_graph.4:${PORTSDIR}/devel/boost-libs \
-		alkimia.4:${PORTSDIR}/finance/libalkimia
+LIB_DEPENDS=	boost_graph:${PORTSDIR}/devel/boost-libs \
+		alkimia:${PORTSDIR}/finance/libalkimia
+
+OPTIONS_DEFINE=	CALENDAR KBANKING OFX QUOTES
+OPTIONS_DEFAULT=CALENDAR
+
+CALENDAR_DESC=	Enable Calendar plugin
+KBANKING_DESC=	Enable KBanking plugin
+OFX_DESC=	Enable OFX plugin
+QUOTES_DESC=	Enable online price quotes
 
 USE_BZIP2=	yes
 USE_CMAKE=	yes
+USE_PKGCONFIG=	build
 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
@@ -31,42 +34,37 @@ MAKE_JOBS_SAFE=	yes
 
 MAN1=		kmymoney.1
 
-OPTIONS=	CALENDAR "Enable Calendar plugin" on \
-		KBANKING "Enable KBanking plugin" off \
-		OFX "Enable OFX plugin" off \
-		QUOTES "Enable online price quotes" off
-
 .include <bsd.port.options.mk>
 
-.if defined(WITH_CALENDAR)
-LIB_DEPENDS+=	ical.44:${PORTSDIR}/devel/libical
+.if ${PORT_OPTIONS:MCALENDAR}
+LIB_DEPENDS+=	ical:${PORTSDIR}/devel/libical
 CMAKE_ARGS+=	-DENABLE_LIBICAL:BOOL=ON
-PLIST_SUB+=	WITH_CALENDAR=""
+PLIST_SUB+=	CALENDAR=""
 .else
 CMAKE_ARGS+=	-DENABLE_LIBICAL:BOOL=OFF
-PLIST_SUB+=	WITH_CALENDAR="@comment "
+PLIST_SUB+=	CALENDAR="@comment "
 .endif
 
-.if defined(WITH_KBANKING)
-LIB_DEPENDS+=	gwengui-qt4.0:${PORTSDIR}/devel/gwenhywfar \
-		aqbanking.33:${PORTSDIR}/finance/aqbanking
+.if ${PORT_OPTIONS:MKBANKING}
+LIB_DEPENDS+=	gwengui-qt4:${PORTSDIR}/devel/gwenhywfar-qt4 \
+		aqbanking:${PORTSDIR}/finance/aqbanking
 CMAKE_ARGS+=	-DENABLE_KBANKING:BOOL=ON
-PLIST_SUB+=	WITH_KBANKING=""
+PLIST_SUB+=	KBANKING=""
 .else
 CMAKE_ARGS+=	-DENABLE_KBANKING:BOOL=OFF
-PLIST_SUB+=	WITH_KBANKING="@comment "
+PLIST_SUB+=	KBANKING="@comment "
 .endif
 
-.if defined(WITH_OFX)
-LIB_DEPENDS+=	ofx.5:${PORTSDIR}/finance/libofx
+.if ${PORT_OPTIONS:MOFX}
+LIB_DEPENDS+=	ofx:${PORTSDIR}/finance/libofx
 CMAKE_ARGS+=	-DENABLE_LIBOFX:BOOL=ON
-PLIST_SUB+=	WITH_OFX=""
+PLIST_SUB+=	OFX=""
 .else
 CMAKE_ARGS+=	-DENABLE_LIBOFX:BOOL=OFF
-PLIST_SUB+=	WITH_OFX="@comment "
+PLIST_SUB+=	OFX="@comment "
 .endif
 
-.if defined(WITH_QUOTES)
+.if ${PORT_OPTIONS:MQUOTES}
 USE_PERL5_RUN=	yes
 RUN_DEPENDS+=	p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip \
 		p5-Finance-Quote>=0:${PORTSDIR}/finance/p5-Finance-Quote \
@@ -75,8 +73,4 @@ RUN_DEPENDS+=	p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip \
 		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
 .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
-.endif
-
 .include <bsd.port.mk>
diff --git a/finance/kmymoney-kde4/pkg-plist b/finance/kmymoney-kde4/pkg-plist
index 7e0eb4ebaf95..6755b33d9b7f 100644
--- a/finance/kmymoney-kde4/pkg-plist
+++ b/finance/kmymoney-kde4/pkg-plist
@@ -70,12 +70,12 @@ include/kmymoney/transactioneditorcontainer.h
 include/kmymoney/transactionform.h
 include/kmymoney/transactionsortoptionimpl.h
 include/kmymoney/viewinterface.h
-%%WITH_CALENDAR%%lib/kde4/kcm_kmm_icalendarexport.so
+%%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
+%%CALENDAR%%lib/kde4/kmm_icalendarexport.so
+%%KBANKING%%lib/kde4/kmm_kbanking.so
+%%OFX%%lib/kde4/kmm_ofximport.so
 lib/kde4/kmm_printcheck.so
 lib/kde4/kmm_reconciliationreport.so
 lib/libkmm_kdchart.so
@@ -92,9 +92,9 @@ 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
+%%CALENDAR%%share/apps/kmm_icalendarexport/kmm_icalendarexport.rc
+%%KBANKING%%share/apps/kmm_kbanking/kmm_kbanking.rc
+%%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
@@ -1251,12 +1251,12 @@ 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
-%%WITH_CALENDAR%%share/kde4/services/kcm_kmm_icalendarexport.desktop
+%%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
+%%CALENDAR%%share/kde4/services/kmm_icalendarexport.desktop
+%%KBANKING%%share/kde4/services/kmm_kbanking.desktop
+%%OFX%%share/kde4/services/kmm_ofximport.desktop
 share/kde4/services/kmm_printcheck.desktop
 share/kde4/services/kmm_reconciliationreport.desktop
 share/kde4/servicetypes/kmymoneyimporterplugin.desktop
@@ -1383,9 +1383,9 @@ share/mime/packages/x-kmymoney.xml
 @dirrm share/apps/kmymoney/html
 @dirrm share/apps/kmymoney
 @dirrm share/apps/kmm_printcheck
-%%WITH_OFX%%@dirrm share/apps/kmm_ofximport
-%%WITH_KBANKING%%@dirrm share/apps/kmm_kbanking
-%%WITH_CALENDAR%%@dirrm share/apps/kmm_icalendarexport
+%%OFX%%@dirrm share/apps/kmm_ofximport
+%%KBANKING%%@dirrm share/apps/kmm_kbanking
+%%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