From owner-svn-ports-head@freebsd.org Fri Dec 30 14:26:13 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 54B29C97708; Fri, 30 Dec 2016 14:26:13 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2EB041CCD; Fri, 30 Dec 2016 14:26:13 +0000 (UTC) (envelope-from fluffy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBUEQCVx026806; Fri, 30 Dec 2016 14:26:12 GMT (envelope-from fluffy@FreeBSD.org) Received: (from fluffy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBUEQCwu026803; Fri, 30 Dec 2016 14:26:12 GMT (envelope-from fluffy@FreeBSD.org) Message-Id: <201612301426.uBUEQCwu026803@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: fluffy set sender to fluffy@FreeBSD.org using -f From: Dima Panov Date: Fri, 30 Dec 2016 14:26:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r429991 - in head/finance/skrooge: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Dec 2016 14:26:13 -0000 Author: fluffy Date: Fri Dec 30 14:26:11 2016 New Revision: 429991 URL: https://svnweb.freebsd.org/changeset/ports/429991 Log: - Update Skrooge to 2.6.0 release - Allow to select encrypted db engine via options Deleted: head/finance/skrooge/files/patch-CMakeLists.txt Modified: head/finance/skrooge/Makefile head/finance/skrooge/distinfo head/finance/skrooge/pkg-plist Modified: head/finance/skrooge/Makefile ============================================================================== --- head/finance/skrooge/Makefile Fri Dec 30 14:06:49 2016 (r429990) +++ head/finance/skrooge/Makefile Fri Dec 30 14:26:11 2016 (r429991) @@ -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 g 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: Modified: head/finance/skrooge/distinfo ============================================================================== --- head/finance/skrooge/distinfo Fri Dec 30 14:06:49 2016 (r429990) +++ head/finance/skrooge/distinfo Fri Dec 30 14:26:11 2016 (r429991) @@ -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 Modified: head/finance/skrooge/pkg-plist ============================================================================== --- head/finance/skrooge/pkg-plist Fri Dec 30 14:06:49 2016 (r429990) +++ head/finance/skrooge/pkg-plist Fri Dec 30 14:26:11 2016 (r429991) @@ -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_mu 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/skroog 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