5 files changed, 42 insertions, 84 deletions

diff --git a/finance/kmymoney-kde4/Makefile b/finance/kmymoney-kde4/Makefile
index fd577154ac8f..f157bf2db2bd 100644
--- a/finance/kmymoney-kde4/Makefile
+++ b/finance/kmymoney-kde4/Makefile
@@ -6,9 +6,8 @@
 #
 
 PORTNAME=	kmymoney
-PORTVERSION=	4.5.2
-PORTREVISION=	1
-CATEGORIES=	finance
+PORTVERSION=	4.5.3
+CATEGORIES=	finance kde
 MASTER_SITES=	SF/${PORTNAME}2/KMyMoney-KDE4/${PORTVERSION}
 
 MAINTAINER=	bsdkaffee@gmail.com
@@ -49,8 +48,8 @@ PLIST_SUB+=	WITH_CALENDAR="@comment "
 .endif
 
 .if defined(WITH_KBANKING)
-LIB_DEPENDS+=	aqbanking.31:${PORTSDIR}/finance/aqbanking
-QT_COMPONENTS+=	qt3support
+LIB_DEPENDS+=	gwengui-qt4.0:${PORTSDIR}/devel/gwenhywfar \
+		aqbanking.33:${PORTSDIR}/finance/aqbanking
 CMAKE_ARGS+=	-DENABLE_KBANKING:BOOL=ON
 PLIST_SUB+=	WITH_KBANKING=""
 .else
@@ -76,4 +75,8 @@ RUN_DEPENDS+=	${SITE_PERL}/Date/Manip.pm:${PORTSDIR}/devel/p5-Date-Manip \
 		${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww
 .endif
 
+.if !defined(PACKAGE_BUILDING) && !exists(${LOCALBASE}/lib/libgwengui-qt4.so)
+BROKEN= 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 41263170f4f3..ceab81f18645 100644
--- a/finance/kmymoney-kde4/distinfo
+++ b/finance/kmymoney-kde4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (kmymoney-4.5.2.tar.bz2) = 546a0742f12c8d9e657cef4e2592af80736664d8d0cece79860b8cc87632fae9
-SIZE (kmymoney-4.5.2.tar.bz2) = 14787884
+SHA256 (kmymoney-4.5.3.tar.bz2) = a9b37275cf3cdcd5ce865d94391df44c7822639b830fccb9962a54b7fcf76ffb
+SIZE (kmymoney-4.5.3.tar.bz2) = 14937401
diff --git a/finance/kmymoney-kde4/files/patch-cmake__modules__FindAqBanking.cmake b/finance/kmymoney-kde4/files/patch-cmake__modules__FindAqBanking.cmake
deleted file mode 100644
index aba97c6aa6b5..000000000000
--- a/finance/kmymoney-kde4/files/patch-cmake__modules__FindAqBanking.cmake
+++ /dev/null
@@ -1,39 +0,0 @@
---- ./cmake/modules/FindAqBanking.cmake.orig	2010-08-16 06:52:14.000000000 -0400
-+++ ./cmake/modules/FindAqBanking.cmake	2010-08-23 03:52:29.000000000 -0400
-@@ -23,11 +23,32 @@
-   set(AQBANKING_FIND_QUIETLY TRUE)
- endif(AQBANKING_INCLUDE_DIRS AND AQBANKING_LIBRARIES)
- 
--PKG_CHECK_MODULES(AQBANKING aqbanking>=${AQBANKING_MIN_VERSION} aqbanking<=${AQBANKING_MAX_VERSION})
-+PKG_CHECK_MODULES(PC_AQBANKING aqbanking>=${AQBANKING_MIN_VERSION} aqbanking<=${AQBANKING_MAX_VERSION})
- 
--if(${AQBANKING_FOUND})
-+find_path(AQBANKING_INCLUDE_DIRS NAMES aqbanking/version.h
-+    HINTS
-+    ${PC_AQBANKING_INCLUDEDIR}
-+    ${PC_AQBANKING_INCLUDE_DIRS}
-+    )
-+
-+find_library(AQBANKING_LIBRARY NAMES aqbanking
-+    HINTS
-+    ${PC_AQBANKING_LIBDIR}
-+    ${PC_AQBANKING_LIBRARY_DIRS}
-+    )
-+
-+find_library(Q4BANKING_LIBRARY NAMES q4banking
-+    HINTS
-+    ${PC_AQBANKING_LIBDIR}
-+    ${PC_AQBANKING_LIBRARY_DIRS}
-+    )
-+
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args(aqbanking DEFAULT_MSG AQBANKING_LIBRARY AQBANKING_INCLUDE_DIRS)
-+
-+if(AQBANKING_FOUND)
-   # if AqBanking has been found make sure to add the q4banking lib
--  set(AQBANKING_LIBRARIES ${AQBANKING_LIBRARIES} q4banking)
--endif(${AQBANKING_FOUND})
-+  set(AQBANKING_LIBRARIES ${AQBANKING_LIBRARY} ${Q4BANKING_LIBRARY})
-+endif(AQBANKING_FOUND)
- 
- mark_as_advanced(AQBANKING_INCLUDE_DIRS AQBANKING_LIBRARIES)
diff --git a/finance/kmymoney-kde4/files/patch-cmake__modules__FindGwenhywfar.cmake b/finance/kmymoney-kde4/files/patch-cmake__modules__FindGwenhywfar.cmake
deleted file mode 100644
index 8c4004cad47d..000000000000
--- a/finance/kmymoney-kde4/files/patch-cmake__modules__FindGwenhywfar.cmake
+++ /dev/null
@@ -1,38 +0,0 @@
---- ./cmake/modules/FindGwenhywfar.cmake.orig	2010-08-16 06:52:14.000000000 -0400
-+++ ./cmake/modules/FindGwenhywfar.cmake	2010-08-23 03:51:38.000000000 -0400
-@@ -16,15 +16,30 @@
-   set(GWENHYWFAR_FIND_QUIETLY TRUE)
- endif(GWENHYWFAR_INCLUDE_DIRS AND GWENHYWFAR_LIBRARIES)
- 
--PKG_CHECK_MODULES(GWENHYWFAR gwenhywfar>=${GWENHYWFAR_MIN_VERSION})
-+PKG_CHECK_MODULES(PC_GWENHYWFAR gwenhywfar>=${GWENHYWFAR_MIN_VERSION})
- 
--if(${GWENHYWFAR_FOUND})
-+find_path(GWENHYWFAR_INCLUDE_DIRS NAMES gwenhywfar/version.h
-+    HINTS
-+    ${PC_GWENHYWFAR_INCLUDEDIR}
-+    ${PC_GWENHYWFAR_INCLUDE_DIRS}
-+    )
-+
-+find_library(GWENHYWFAR_LIBRARY NAMES gwenhywfar
-+    HINTS
-+    ${PC_GWENHYWFAR_LIBDIR}
-+    ${PC_GWENHYWFAR_LIBRARY_DIRS}
-+    )
-+
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args(gwenhywfar DEFAULT_MSG GWENHYWFAR_LIBRARY GWENHYWFAR_INCLUDE_DIRS)
-+
-+if(GWENHYWFAR_FOUND)
-   find_library(GWENHYWFAR_GUI_LIBRARY NAMES gwengui-qt4 libgwengui-qt4
--    HINTS ${GWENHYWFAR_LIBRARY_DIRS})
-+    HINTS ${PC_GWENHYWFAR_LIBRARY_DIRS})
-   if(GWENHYWFAR_GUI_LIBRARY STREQUAL "GWENHYWFAR_GUI_LIBRARY-NOTFOUND")
-     set(GWENHYWFAR_GUI_LIBRARY "")
-   endif(GWENHYWFAR_GUI_LIBRARY STREQUAL "GWENHYWFAR_GUI_LIBRARY-NOTFOUND")
--  set(GWENHYWFAR_LIBRARIES ${GWENHYWFAR_LIBRARIES} ${GWENHYWFAR_GUI_LIBRARY})
--endif(${GWENHYWFAR_FOUND})
-+  set(GWENHYWFAR_LIBRARIES ${GWENHYWFAR_LIBRARY} ${GWENHYWFAR_GUI_LIBRARY})
-+endif(GWENHYWFAR_FOUND)
- 
- mark_as_advanced(GWENHYWFAR_INCLUDE_DIRS GWENHYWFAR_LIBRARIES)
diff --git a/finance/kmymoney-kde4/pkg-plist b/finance/kmymoney-kde4/pkg-plist
index 057e7eed9175..f08057bd947a 100644
--- a/finance/kmymoney-kde4/pkg-plist
+++ b/finance/kmymoney-kde4/pkg-plist
@@ -859,6 +859,37 @@ share/doc/HTML/en/kmymoney/transactionform.png
 share/doc/HTML/en/kmymoney/translist.png
 share/doc/HTML/en/kmymoney/value_widget.png
 share/doc/HTML/en/kmymoney/whatsnew.docbook
+share/doc/HTML/es/kmymoney/common
+share/doc/HTML/es/kmymoney/credits.docbook
+share/doc/HTML/es/kmymoney/details-accounts.docbook
+share/doc/HTML/es/kmymoney/details-budgets.docbook
+share/doc/HTML/es/kmymoney/details-categories.docbook
+share/doc/HTML/es/kmymoney/details-currencies.docbook
+share/doc/HTML/es/kmymoney/details-database.docbook
+share/doc/HTML/es/kmymoney/details-forecast.docbook
+share/doc/HTML/es/kmymoney/details-formats.docbook
+share/doc/HTML/es/kmymoney/details-impexp.docbook
+share/doc/HTML/es/kmymoney/details-institutions.docbook
+share/doc/HTML/es/kmymoney/details-investments.docbook
+share/doc/HTML/es/kmymoney/details-ledgers.docbook
+share/doc/HTML/es/kmymoney/details-loans.docbook
+share/doc/HTML/es/kmymoney/details-payees.docbook
+share/doc/HTML/es/kmymoney/details-reconciliation.docbook
+share/doc/HTML/es/kmymoney/details-reports.docbook
+share/doc/HTML/es/kmymoney/details-schedules.docbook
+share/doc/HTML/es/kmymoney/details-search.docbook
+share/doc/HTML/es/kmymoney/details-settings.docbook
+share/doc/HTML/es/kmymoney/details-widgets.docbook
+share/doc/HTML/es/kmymoney/faq.docbook
+share/doc/HTML/es/kmymoney/firsttime.docbook
+share/doc/HTML/es/kmymoney/index.cache.bz2
+share/doc/HTML/es/kmymoney/index.docbook
+share/doc/HTML/es/kmymoney/installation.docbook
+share/doc/HTML/es/kmymoney/introduction.docbook
+share/doc/HTML/es/kmymoney/makemostof.docbook
+share/doc/HTML/es/kmymoney/man-kmymoney.1.docbook
+share/doc/HTML/es/kmymoney/reference.docbook
+share/doc/HTML/es/kmymoney/whatsnew.docbook
 share/doc/HTML/it/kmymoney/common
 share/doc/HTML/it/kmymoney/credits.docbook
 share/doc/HTML/it/kmymoney/details-accounts.docbook
@@ -1090,6 +1121,7 @@ share/mime/packages/x-kmymoney.xml
 @dirrm share/doc/HTML/pt_BR/kmymoney
 @dirrm share/doc/HTML/pt/kmymoney
 @dirrm share/doc/HTML/it/kmymoney
+@dirrm share/doc/HTML/es/kmymoney
 @dirrm share/doc/HTML/en/kmymoney
 @dirrm share/apps/kmymoney/templates/zh_TW
 @dirrm share/apps/kmymoney/templates/zh_HK