- Update Skrooge to 2.6.0 release

- Allow to select encrypted db engine via options

4 files changed, 35 insertions, 26 deletions

diff --git a/finance/skrooge/Makefile b/finance/skrooge/Makefile
index 2d86aeea3f09..1d030cd3e4b1 100644
--- a/finance/skrooge/Makefile
+++ b/finance/skrooge/Makefile
@@ -1,9 +1,11 @@
 # $FreeBSD$
 
 PORTNAME=	skrooge
-PORTVERSION=	2.5.0
+PORTVERSION=	2.6.0
 CATEGORIES=	finance kde
 MASTER_SITES=	KDE/stable/${PORTNAME}
+PKGNAMESUFFIX=	-kf5
+DIST_SUBDIR=	KDE/${PORTNAME}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE personal finance manager
@@ -13,8 +15,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	xsltproc:textproc/libxslt
 LIB_DEPENDS=	libofx.so:finance/libofx \
-		libqca-qt5.so:devel/qca-qt5 \
-		libsqlcipher.so:databases/sqlcipher
+		libqca-qt5.so:devel/qca-qt5
 
 USES=		cmake:outsource compiler:c++11-lib desktop-file-utils \
 		gettext grantlee:5 kde:5 pkgconfig shared-mime-info tar:xz
@@ -29,11 +30,32 @@ USE_QT5=	concurrent core dbus designer gui network printsupport qml \
 		quick script sql svg webkit widgets xml \
 		qmake_build buildtools_build
 
+CONFLICTS_INSTALL=	${PORTNAME}-kde4-*
+
 USE_LDCONFIG=	yes
 
 PLIST_SUB=	SHLIB_VER=${PORTVERSION} \
 		SHLIB_SHVER=${PORTVERSION:R:R}
 
+OPTIONS_SINGLE=		SQL
+OPTIONS_SINGLE_SQL=	SQLITE SQLCIPHER
+OPTIONS_SUB=		YES
+OPTIONS_DEFAULT=	SQLITE
+
+SQLITE_USES=		sqlite:3
+SQLITE_CMAKE_ON=	-DSKG_CIPHER:BOOL=OFF
+SQLCIPHER_DESC=		Use encrypted database
+SQLCIPHER_LIB_DEPENDS=	libsqlcipher.so:databases/sqlcipher
+SQLCIPHER_CMAKE_ON=	-DSKG_CIPHER:BOOL=ON
+SQLCIPHER_PLIST_SUB+=	SQLCIPHER=""
+SQLCIPHER_PLIST_SUB_OFF+=	SQLCIPHER="@comment "
+
+post-patch:
+.for i in skgbankgui skgbankmodeler skgbasegui skgbasemodeler skroogeakonadi
+	${REINPLACE_CMD} -e 's|LIBRARY NAMELINK_SKIP||g' \
+		${PATCH_WRKSRC}/${i}/CMakeLists.txt
+.endfor
+
 # Skrooge creates several empty directories due to how it calls CMake's
 # install(DIRECTORY ...) function, so we need some code to remove them.
 post-install:
diff --git a/finance/skrooge/distinfo b/finance/skrooge/distinfo
index f27c63a8df21..10d12be7de5e 100644
--- a/finance/skrooge/distinfo
+++ b/finance/skrooge/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1481787844
-SHA256 (skrooge-2.5.0.tar.xz) = 97bebb1b3f1cd791160292bd4689e584c4054db14f0f88039541e67c72ce5e0d
-SIZE (skrooge-2.5.0.tar.xz) = 17603860
+TIMESTAMP = 1483098093
+SHA256 (KDE/skrooge/skrooge-2.6.0.tar.xz) = f76be3a3033190da5324202da2592550cc64bcc8569c7ad3bcce989e93314d8f
+SIZE (KDE/skrooge/skrooge-2.6.0.tar.xz) = 17878228
diff --git a/finance/skrooge/files/patch-CMakeLists.txt b/finance/skrooge/files/patch-CMakeLists.txt
deleted file mode 100644
index e5fd5f496a23..000000000000
--- a/finance/skrooge/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
---- CMakeLists.txt.orig	2016-09-25 07:13:38 UTC
-+++ CMakeLists.txt
-@@ -86,6 +86,7 @@ IF(SKG_CIPHER)
-     SET(SQLITE_LIBRARIES ${SQLCIPHER_LIBRARIES})
-     SET(SQLITE_INCLUDE_DIR ${SQLCIPHER_INCLUDE_DIRS})
-     ADD_DEFINITIONS(-DSKGCIPHER)
-+    link_directories(${SQLCIPHER_LIBRARY_DIRS})
- ELSE(SKG_CIPHER)
-     FIND_PACKAGE(Sqlite 3.7.0 REQUIRED)
-     MESSAGE( STATUS "     Mode SQLITE enabled")
diff --git a/finance/skrooge/pkg-plist b/finance/skrooge/pkg-plist
index af21ef6c7644..6c3ca4d65f97 100644
--- a/finance/skrooge/pkg-plist
+++ b/finance/skrooge/pkg-plist
@@ -30,6 +30,7 @@ lib/libskgbasemodeler.so.%%SHLIB_VER%%
 %%QT_PLUGINDIR%%/skg_selectall.so
 %%QT_PLUGINDIR%%/skg_statistic.so
 %%QT_PLUGINDIR%%/skg_undoredo.so
+%%QT_PLUGINDIR%%/skrooge_add_operation.so
 %%QT_PLUGINDIR%%/skrooge_bank.so
 %%QT_PLUGINDIR%%/skrooge_budget.so
 %%QT_PLUGINDIR%%/skrooge_calculator.so
@@ -59,7 +60,7 @@ lib/libskgbasemodeler.so.%%SHLIB_VER%%
 %%QT_PLUGINDIR%%/skrooge_search.so
 %%QT_PLUGINDIR%%/skrooge_tracker.so
 %%QT_PLUGINDIR%%/skrooge_unit.so
-%%QT_PLUGINDIR%%/sqldrivers/libskgsqlcipher.so
+%%SQLCIPHER%%%%QT_PLUGINDIR%%/sqldrivers/libskgsqlcipher.so
 share/applications/org.kde.skrooge.desktop
 share/config.kcfg/skgbasegui_settings.kcfg
 share/config.kcfg/skgbookmark_settings.kcfg
@@ -266,15 +267,6 @@ share/icons/breeze/actions/22/skrooge_much_more.svgz
 share/icons/breeze/actions/22/skrooge_type.svgz
 share/icons/breeze/actions/22/view-categories-expenditures.svgz
 share/icons/breeze/actions/22/view-categories-incomes.svgz
-share/icons/breeze/apps/22/skrooge.svgz
-share/icons/breeze/mimetypes/16/application-x-skg.svgz
-share/icons/breeze/mimetypes/16/application-x-skgc.svgz
-share/icons/breeze/mimetypes/22/application-x-skg.svgz
-share/icons/breeze/mimetypes/22/application-x-skgc.svgz
-share/icons/breeze/mimetypes/32/application-x-skg.svgz
-share/icons/breeze/mimetypes/32/application-x-skgc.svgz
-share/icons/breeze/mimetypes/64/application-x-skg.svgz
-share/icons/breeze/mimetypes/64/application-x-skgc.svgz
 share/icons/hicolor/128x128/actions/skg-chart-bubble.png
 share/icons/hicolor/128x128/actions/skrooge_credit_card.png
 share/icons/hicolor/128x128/actions/skrooge_less.png
@@ -376,6 +368,7 @@ share/icons/hicolor/scalable/apps/skrooge.svgz
 share/icons/hicolor/scalable/mimetypes/application-x-skg.svgz
 share/icons/hicolor/scalable/mimetypes/application-x-skgc.svgz
 share/knotifications5/skrooge.notifyrc
+share/kservices5/org.kde.plasma-runner-skrooge-add-operation.desktop
 share/kservices5/org.kde.skg-plugin-advice.desktop
 share/kservices5/org.kde.skg-plugin-bookmark.desktop
 share/kservices5/org.kde.skg-plugin-dashboard.desktop
@@ -719,6 +712,8 @@ share/mime/packages/x-skg.xml
 %%DATADIR%%/html/default/account_table.html
 %%DATADIR%%/html/default/account_table.qml
 %%DATADIR%%/html/default/advices_table.html
+%%DATADIR%%/html/default/alarm.html
+%%DATADIR%%/html/default/alarm.qml
 %%DATADIR%%/html/default/bank_table.html
 %%DATADIR%%/html/default/bank_table.qml
 %%DATADIR%%/html/default/bank_table_light.html
@@ -736,6 +731,8 @@ share/mime/packages/x-skg.xml
 %%DATADIR%%/html/default/highlighted_operations.qml
 %%DATADIR%%/html/default/income_vs_expenditure.qml
 %%DATADIR%%/html/default/income_vs_expenditure_table.html
+%%DATADIR%%/html/default/interests.html
+%%DATADIR%%/html/default/interests.qml
 %%DATADIR%%/html/default/personal_finance_score.html
 %%DATADIR%%/html/default/personal_finance_score.qml
 %%DATADIR%%/html/default/portfolio.html