From owner-svn-ports-head@freebsd.org Thu Jan 26 18:09:56 2017 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 6D8FBCC2CDE; Thu, 26 Jan 2017 18:09:56 +0000 (UTC) (envelope-from tcberner@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 237681632; Thu, 26 Jan 2017 18:09:56 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0QI9tIc029398; Thu, 26 Jan 2017 18:09:55 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0QI9shl029395; Thu, 26 Jan 2017 18:09:54 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <201701261809.v0QI9shl029395@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Thu, 26 Jan 2017 18:09:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r432528 - head/finance/skrooge 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: Thu, 26 Jan 2017 18:09:56 -0000 Author: tcberner Date: Thu Jan 26 18:09:54 2017 New Revision: 432528 URL: https://svnweb.freebsd.org/changeset/ports/432528 Log: Update finance/skrooge to 2.7.0 * SQLCipher is no longer optional, so drop the option again. * There is no need for conflicts and suffixes. Reviewed by: rakuco, fluffy Approved by: rakuco (mentor) Differential Revision: https://reviews.freebsd.org/D9336 Modified: head/finance/skrooge/Makefile head/finance/skrooge/distinfo head/finance/skrooge/pkg-plist Modified: head/finance/skrooge/Makefile ============================================================================== --- head/finance/skrooge/Makefile Thu Jan 26 18:05:48 2017 (r432527) +++ head/finance/skrooge/Makefile Thu Jan 26 18:09:54 2017 (r432528) @@ -1,10 +1,9 @@ # $FreeBSD$ PORTNAME= skrooge -PORTVERSION= 2.6.0 +PORTVERSION= 2.7.0 CATEGORIES= finance kde MASTER_SITES= KDE/stable/${PORTNAME} -PKGNAMESUFFIX= -kf5 DIST_SUBDIR= KDE/${PORTNAME} MAINTAINER= kde@FreeBSD.org @@ -15,46 +14,27 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= xsltproc:textproc/libxslt LIB_DEPENDS= libofx.so:finance/libofx \ - libqca-qt5.so:devel/qca-qt5 + libqca-qt5.so:devel/qca-qt5 \ + libsqlcipher.so:databases/sqlcipher USES= cmake:outsource compiler:c++11-lib desktop-file-utils \ - gettext grantlee:5 kde:5 pkgconfig shared-mime-info tar:xz + gettext grantlee:5 kde:5 pkgconfig shared-mime-info \ + sqlite:3 tar:xz USE_KDE= activities archive attica5 auth bookmarks codecs completion \ config configwidgets coreaddons crash dbusaddons \ designerplugin doctools ecm emoticons guiaddons i18n \ iconthemes init itemmodels itemviews jobwidgets \ - kdelibs4support kio newstuff notifications notifyconfig parts \ - runner service solid sonnet textwidgets unitconversion wallet \ - widgetsaddons windowsystem xmlgui + kdelibs4support kio newstuff notifications notifyconfig \ + package parts plasma-framework runner service solid sonnet \ + textwidgets unitconversion wallet widgetsaddons windowsystem \ + xmlgui 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 +PLIST_SUB= SHLIB_VER="${PORTVERSION}" # Skrooge creates several empty directories due to how it calls CMake's # install(DIRECTORY ...) function, so we need some code to remove them. Modified: head/finance/skrooge/distinfo ============================================================================== --- head/finance/skrooge/distinfo Thu Jan 26 18:05:48 2017 (r432527) +++ head/finance/skrooge/distinfo Thu Jan 26 18:09:54 2017 (r432528) @@ -1,3 +1,3 @@ -TIMESTAMP = 1483098093 -SHA256 (KDE/skrooge/skrooge-2.6.0.tar.xz) = f76be3a3033190da5324202da2592550cc64bcc8569c7ad3bcce989e93314d8f -SIZE (KDE/skrooge/skrooge-2.6.0.tar.xz) = 17878228 +TIMESTAMP = 1485371408 +SHA256 (KDE/skrooge/skrooge-2.7.0.tar.xz) = 9dc8275f17f366156f2863501512320bdf6fa0c2a8834a36fd598840954d30f7 +SIZE (KDE/skrooge/skrooge-2.7.0.tar.xz) = 17880592 Modified: head/finance/skrooge/pkg-plist ============================================================================== --- head/finance/skrooge/pkg-plist Thu Jan 26 18:05:48 2017 (r432527) +++ head/finance/skrooge/pkg-plist Thu Jan 26 18:09:54 2017 (r432528) @@ -2,16 +2,12 @@ bin/skrooge bin/skroogeconvert etc/xdg/skrooge_monthly.knsrc etc/xdg/skrooge_unit.knsrc -lib/libskgbankgui.so lib/libskgbankgui.so.2 lib/libskgbankgui.so.%%SHLIB_VER%% -lib/libskgbankmodeler.so lib/libskgbankmodeler.so.2 lib/libskgbankmodeler.so.%%SHLIB_VER%% -lib/libskgbasegui.so lib/libskgbasegui.so.2 lib/libskgbasegui.so.%%SHLIB_VER%% -lib/libskgbasemodeler.so lib/libskgbasemodeler.so.2 lib/libskgbasemodeler.so.%%SHLIB_VER%% %%QT_PLUGINDIR%%/designer/libskgbankguidesigner.so @@ -60,7 +56,7 @@ lib/libskgbasemodeler.so.%%SHLIB_VER%% %%QT_PLUGINDIR%%/skrooge_search.so %%QT_PLUGINDIR%%/skrooge_tracker.so %%QT_PLUGINDIR%%/skrooge_unit.so -%%SQLCIPHER%%%%QT_PLUGINDIR%%/sqldrivers/libskgsqlcipher.so +%%QT_PLUGINDIR%%/sqldrivers/libskgsqlcipher.so share/applications/org.kde.skrooge.desktop share/config.kcfg/skgbasegui_settings.kcfg share/config.kcfg/skgbookmark_settings.kcfg @@ -858,5 +854,4 @@ share/mime/packages/x-skg.xml %%DATADIR%%/quotes/BitcoinCharts.txt %%DATADIR%%/quotes/GrandTrunk.txt %%DATADIR%%/quotes/Skrooge.txt -%%DATADIR%%/quotes/Stooq monthly history.txt %%DATADIR%%/quotes/Stooq.txt