- Update to 4.6.3

- Make COMMENT more concise
- Make NLS optional

Approved by:	avilla (mentor)

5 files changed, 104 insertions, 79 deletions

diff --git a/finance/kmymoney-kde4/Makefile b/finance/kmymoney-kde4/Makefile
index e856d25e9244..97e8b35106f7 100644
--- a/finance/kmymoney-kde4/Makefile
+++ b/finance/kmymoney-kde4/Makefile
@@ -1,21 +1,21 @@
 # $FreeBSD$
 
 PORTNAME=	kmymoney
-PORTVERSION=	4.6.2
-PORTREVISION=	3
+PORTVERSION=	4.6.3
 CATEGORIES=	finance kde
 MASTER_SITES=	SF/${PORTNAME}2/KMyMoney-KDE4/${PORTVERSION}
 
 MAINTAINER=	jhale@FreeBSD.org
-COMMENT=	KDE 4.x-based personal finance manager
+COMMENT=	KDE4 personal finance manager
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	boost_graph:${PORTSDIR}/devel/boost-libs \
 		alkimia:${PORTSDIR}/finance/libalkimia
 
-OPTIONS_DEFINE=	CALENDAR KBANKING OFX QUOTES
+OPTIONS_DEFINE=	NLS CALENDAR KBANKING OFX QUOTES
 OPTIONS_DEFAULT=CALENDAR
+NO_OPTIONS_SORT=yes
 
 CALENDAR_DESC=	Enable Calendar plugin
 KBANKING_DESC=	Enable KBanking plugin
@@ -29,13 +29,20 @@ 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
 USE_LDCONFIG=	yes
-USE_GETTEXT=	yes
 MAKE_JOBS_SAFE=	yes
 
 MAN1=		kmymoney.1
 
 .include <bsd.port.options.mk>
 
+.if ${PORT_OPTIONS:MNLS}
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.else
+CMAKE_ARGS+=	-DENABLE_NLS:BOOL=OFF
+PLIST_SUB+=	NLS="@comment "
+.endif
+
 .if ${PORT_OPTIONS:MCALENDAR}
 LIB_DEPENDS+=	ical:${PORTSDIR}/devel/libical
 CMAKE_ARGS+=	-DENABLE_LIBICAL:BOOL=ON
diff --git a/finance/kmymoney-kde4/distinfo b/finance/kmymoney-kde4/distinfo
index 8e6e7bfcaf7b..f4f1491d2cdb 100644
--- a/finance/kmymoney-kde4/distinfo
+++ b/finance/kmymoney-kde4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (kmymoney-4.6.2.tar.bz2) = add8acba2f0d4c212ac1c7fbbdad2fd43a24caceed586b13d90dcd2a20a12b75
-SIZE (kmymoney-4.6.2.tar.bz2) = 22762330
+SHA256 (kmymoney-4.6.3.tar.bz2) = 94e109992b7e9ebb066b608d56c168216b8a944d62538c95176bc36ea4db542e
+SIZE (kmymoney-4.6.3.tar.bz2) = 22114966
diff --git a/finance/kmymoney-kde4/files/patch-CMakeLists.txt b/finance/kmymoney-kde4/files/patch-CMakeLists.txt
index 8aab30dadc4d..94350740859d 100644
--- a/finance/kmymoney-kde4/files/patch-CMakeLists.txt
+++ b/finance/kmymoney-kde4/files/patch-CMakeLists.txt
@@ -1,8 +1,8 @@
---- ./CMakeLists.txt.orig	2010-08-16 06:55:14.000000000 -0400
-+++ ./CMakeLists.txt	2010-08-23 03:51:38.000000000 -0400
-@@ -78,13 +78,6 @@
-   ADD_CUSTOM_TARGET(apidoc ${DOXYGEN} ${CMAKE_CURRENT_BINARY_DIR}/kmymoney.doxygen)
- ENDIF(DOXYGEN_FOUND)
+--- ./CMakeLists.txt.orig	2012-08-31 09:48:09.000000000 -0400
++++ ./CMakeLists.txt	2012-09-09 19:17:33.000000000 -0400
+@@ -94,13 +94,6 @@
+ FIND_PACKAGE(GMP REQUIRED)
+ FIND_PACKAGE(LibAlkimia 4.3.1 REQUIRED)
  
 -# check for PkgConfig
 -FIND_PACKAGE(PkgConfig)
@@ -14,7 +14,7 @@
  # check some functions
  INCLUDE (CheckFunctionExists) 
  CHECK_FUNCTION_EXISTS(atoll HAVE_ATOLL)
-@@ -113,7 +106,6 @@
+@@ -129,7 +122,6 @@
  CHECK_TYPE_SIZE(short SIZEOF_SHORT)
  CHECK_TYPE_SIZE(size_t SIZEOF_SIZE_T)
  CHECK_TYPE_SIZE("unsigned long" SIZEOF_UNSIGNED_LONG)
@@ -22,3 +22,17 @@
  
  MARK_AS_ADVANCED(
    KDE4_KCFGC_EXECUTABLE KDE4_KDECORE_LIBRARY KDECONFIG_EXECUTABLE)
+@@ -411,7 +403,10 @@
+ message("Good - your configure finished.
+ Now type 'make' to build KMyMoney. For more help, consult README.cmake
+ ")
+-find_package(Msgfmt REQUIRED)
+-find_package(Gettext REQUIRED)
+-add_subdirectory( po )
++option(ENABLE_NLS "NLS Support" ON)
++if(ENABLE_NLS)
++  find_package(Msgfmt REQUIRED)
++  find_package(Gettext REQUIRED)
++  add_subdirectory( po )
++endif(ENABLE_NLS)
+ add_subdirectory( doc-translations )
diff --git a/finance/kmymoney-kde4/files/patch-libkdchart__src__KDChartBackgroundAttributes.cpp b/finance/kmymoney-kde4/files/patch-libkdchart__src__KDChartBackgroundAttributes.cpp
deleted file mode 100644
index 7b15df7bbb4b..000000000000
--- a/finance/kmymoney-kde4/files/patch-libkdchart__src__KDChartBackgroundAttributes.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-commit 8324cfb9657d8c03f83691402386e8c5bfb29981
-Author: Christoph Feck <christoph@maxiom.de>
-Date:   Thu Nov 10 12:34:20 2011 +0100
-
-    Fix compile with Qt 4.8
-    
-    Sideported commits f42a0a3d878afebb298609c9886851858c56cc15 and
-    fe74b25bf3b78c42e95569fe467a397876bc9c04 from massif-visualizer
-
-diff --git a/libkdchart/src/KDChartBackgroundAttributes.cpp b/libkdchart/src/KDChartBackgroundAttributes.cpp
-index f9f1520..3b86000 100644
---- ./libkdchart/src/KDChartBackgroundAttributes.cpp
-+++ ./libkdchart/src/KDChartBackgroundAttributes.cpp
-@@ -22,6 +22,7 @@
- 
- #include "KDChartBackgroundAttributes.h"
- #include <QPixmap>
-+#include <QVariant>
- 
- #include <KDABLibFakes>
- 
-@@ -150,7 +151,7 @@ QDebug operator<<(QDebug dbg, const KDChart::BackgroundAttributes& ba)
- 	<< "visible="<<ba.isVisible()
- 	<< "brush="<<ba.brush()
- 	<< "pixmapmode="<<ba.pixmapMode()
--	<< "pixmap="<<ba.pixmap()
-+	<< "pixmap="<<QVariant(ba.pixmap())
- 	<< ")";
-     return dbg;
- }
diff --git a/finance/kmymoney-kde4/pkg-plist b/finance/kmymoney-kde4/pkg-plist
index 6755b33d9b7f..d3c3b79a32d5 100644
--- a/finance/kmymoney-kde4/pkg-plist
+++ b/finance/kmymoney-kde4/pkg-plist
@@ -747,6 +747,7 @@ share/apps/kmymoney/templates/zh_HK/business.kmt
 share/apps/kmymoney/templates/zh_TW/business.kmt
 share/apps/kmymoney/tips
 share/config.kcfg/kmymoney.kcfg
+share/config/csvimporterrc
 share/doc/HTML/de/kmymoney/account_options.png
 share/doc/HTML/de/kmymoney/accwiz1.png
 share/doc/HTML/de/kmymoney/accwiz2.png
@@ -1106,6 +1107,37 @@ share/doc/HTML/it/kmymoney/makemostof.docbook
 share/doc/HTML/it/kmymoney/man-kmymoney.1.docbook
 share/doc/HTML/it/kmymoney/reference.docbook
 share/doc/HTML/it/kmymoney/whatsnew.docbook
+share/doc/HTML/nl/kmymoney/common
+share/doc/HTML/nl/kmymoney/credits.docbook
+share/doc/HTML/nl/kmymoney/details-accounts.docbook
+share/doc/HTML/nl/kmymoney/details-budgets.docbook
+share/doc/HTML/nl/kmymoney/details-categories.docbook
+share/doc/HTML/nl/kmymoney/details-currencies.docbook
+share/doc/HTML/nl/kmymoney/details-database.docbook
+share/doc/HTML/nl/kmymoney/details-forecast.docbook
+share/doc/HTML/nl/kmymoney/details-formats.docbook
+share/doc/HTML/nl/kmymoney/details-impexp.docbook
+share/doc/HTML/nl/kmymoney/details-institutions.docbook
+share/doc/HTML/nl/kmymoney/details-investments.docbook
+share/doc/HTML/nl/kmymoney/details-ledgers.docbook
+share/doc/HTML/nl/kmymoney/details-loans.docbook
+share/doc/HTML/nl/kmymoney/details-payees.docbook
+share/doc/HTML/nl/kmymoney/details-reconciliation.docbook
+share/doc/HTML/nl/kmymoney/details-reports.docbook
+share/doc/HTML/nl/kmymoney/details-schedules.docbook
+share/doc/HTML/nl/kmymoney/details-search.docbook
+share/doc/HTML/nl/kmymoney/details-settings.docbook
+share/doc/HTML/nl/kmymoney/details-widgets.docbook
+share/doc/HTML/nl/kmymoney/faq.docbook
+share/doc/HTML/nl/kmymoney/firsttime.docbook
+share/doc/HTML/nl/kmymoney/index.cache.bz2
+share/doc/HTML/nl/kmymoney/index.docbook
+share/doc/HTML/nl/kmymoney/installation.docbook
+share/doc/HTML/nl/kmymoney/introduction.docbook
+share/doc/HTML/nl/kmymoney/makemostof.docbook
+share/doc/HTML/nl/kmymoney/man-kmymoney.1.docbook
+share/doc/HTML/nl/kmymoney/reference.docbook
+share/doc/HTML/nl/kmymoney/whatsnew.docbook
 share/doc/HTML/pt/kmymoney/common
 share/doc/HTML/pt/kmymoney/credits.docbook
 share/doc/HTML/pt/kmymoney/details-accounts.docbook
@@ -1261,42 +1293,43 @@ share/kde4/services/kmm_printcheck.desktop
 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
-share/locale/da/LC_MESSAGES/kmymoney.mo
-share/locale/de/LC_MESSAGES/kmymoney.mo
-share/locale/el/LC_MESSAGES/kmymoney.mo
-share/locale/en_GB/LC_MESSAGES/kmymoney.mo
-share/locale/eo/LC_MESSAGES/kmymoney.mo
-share/locale/es/LC_MESSAGES/kmymoney.mo
-share/locale/et/LC_MESSAGES/kmymoney.mo
-share/locale/eu/LC_MESSAGES/kmymoney.mo
-share/locale/fi/LC_MESSAGES/kmymoney.mo
-share/locale/fr/LC_MESSAGES/kmymoney.mo
-share/locale/ga/LC_MESSAGES/kmymoney.mo
-share/locale/gl/LC_MESSAGES/kmymoney.mo
-share/locale/hu/LC_MESSAGES/kmymoney.mo
-share/locale/it/LC_MESSAGES/kmymoney.mo
-share/locale/ja/LC_MESSAGES/kmymoney.mo
-share/locale/lt/LC_MESSAGES/kmymoney.mo
-share/locale/ms/LC_MESSAGES/kmymoney.mo
-share/locale/nds/LC_MESSAGES/kmymoney.mo
-share/locale/nl/LC_MESSAGES/kmymoney.mo
-share/locale/pl/LC_MESSAGES/kmymoney.mo
-share/locale/pt/LC_MESSAGES/kmymoney.mo
-share/locale/pt_BR/LC_MESSAGES/kmymoney.mo
-share/locale/ro/LC_MESSAGES/kmymoney.mo
-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
+%%NLS%%share/locale/bg/LC_MESSAGES/kmymoney.mo
+%%NLS%%share/locale/bs/LC_MESSAGES/kmymoney.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/kmymoney.mo
+%%NLS%%share/locale/ca@valencia/LC_MESSAGES/kmymoney.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/kmymoney.mo
+%%NLS%%share/locale/da/LC_MESSAGES/kmymoney.mo
+%%NLS%%share/locale/de/LC_MESSAGES/kmymoney.mo
+%%NLS%%share/locale/el/LC_MESSAGES/kmymoney.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/kmymoney.mo
+%%NLS%%share/locale/eo/LC_MESSAGES/kmymoney.mo
+%%NLS%%share/locale/es/LC_MESSAGES/kmymoney.mo
+%%NLS%%share/locale/et/LC_MESSAGES/kmymoney.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/kmymoney.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/kmymoney.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/kmymoney.mo
+%%NLS%%share/locale/ga/LC_MESSAGES/kmymoney.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/kmymoney.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/kmymoney.mo
+%%NLS%%share/locale/it/LC_MESSAGES/kmymoney.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/kmymoney.mo
+%%NLS%%share/locale/kk/LC_MESSAGES/kmymoney.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/kmymoney.mo
+%%NLS%%share/locale/ms/LC_MESSAGES/kmymoney.mo
+%%NLS%%share/locale/nds/LC_MESSAGES/kmymoney.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/kmymoney.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/kmymoney.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/kmymoney.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/kmymoney.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/kmymoney.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/kmymoney.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/kmymoney.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/kmymoney.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/kmymoney.mo
+%%NLS%%share/locale/ug/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/application/x-kmymoney.xml
 share/mime/packages/x-kmymoney.xml
 @dirrmtry share/icons/locolor/32x32/apps
@@ -1308,6 +1341,7 @@ share/mime/packages/x-kmymoney.xml
 @dirrm share/doc/HTML/sv/kmymoney
 @dirrm share/doc/HTML/pt_BR/kmymoney
 @dirrm share/doc/HTML/pt/kmymoney
+@dirrm share/doc/HTML/nl/kmymoney
 @dirrm share/doc/HTML/it/kmymoney
 @dirrm share/doc/HTML/fr/kmymoney
 @dirrm share/doc/HTML/es/kmymoney