From nobody Fri Feb 10 16:51:01 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PD09f3F73z3pHgx; Fri, 10 Feb 2023 16:51:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PD09d5P67z4c7S; Fri, 10 Feb 2023 16:51:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676047861; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7+mwRJ0QNgERcaGewbH6xFUIk1JKzl/i0pvIvobAcqs=; b=ejEwHMQ/8jxFR1Wv4jbizutqQTMKM+yAYaJz3wr+UZH7GJXzGVXSaKmk8MbqMFvaeEJR/j GPBWcUMR0OLvzhcPhUGrFl6fU+ZJ8Nu7b5A2a3K0x+dqslvh3GEwWUOWTP5EyIgZUlJbVK 5aVqDhj+nR8ztmavTcY+KJ2y+rJMu2ErHdKBXFelftIowaCNd2PtB4lH4f44ZHj8Zc4Euh oLdDQ1jURmJaAoTthUHMxf5xmqNVcKmocdbyQ+KpiJ91P+b4JaW5Xo9Vj1bynl/cqRvk1s sfxZMNYPaGGn0q6fF2ENnOhoFuddOTUr2m7/0lh72xgjkYWSQaGDKeQbGsanug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676047861; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7+mwRJ0QNgERcaGewbH6xFUIk1JKzl/i0pvIvobAcqs=; b=aXoYKVQE1+3ez+s/D78ZHgsDhCcRHbi8ZFf2aH7HRa4GgHSdU7bn1LkEjvtragz5vM5e84 LkbEhpoiqT1ohV5L8IyuToMHBloVT/l+/0XHI9/a4k2GQRhB5g/ypzmkiQzXHZg8NkxMUO wB9PJofzVzykigIaScMjOTra46IwfdTxKg2tn9ZMocP40I2omG+jJoMMLcdoFW3yhTHnD3 gkZBmPTydpZTNE+M5aMaQHRq0aDCZjjpCX25e1G97zJHIN+gda6NFD9cJGZE3woEVIQvN8 3hIOLt4a1Kzvj6uZqAQqvGvBAyVRek0KkvSTzkPdl7eWfjjT0R1InhIWli70Ig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676047861; a=rsa-sha256; cv=none; b=Q6tKwZAIC8STpKQUPNBP+0yZmP4W83XDF9AyI2OaCnY1Sa7nY6MtBE9NQ5TBuwVTWY53ts HuK50R8eHkAItlyy//O2uhLEifCscp936Pb1CRP7bawNqkDu9YMMiPBAxMs8+hl7MJQoHV v1Z4JUbq9kjNr81SXTgLAqm/IOVUGnmN0A2gyOKo7NgEVgO39ZbPi9JN6zp1xS3wMBRc55 0V3yuG6N77u+NjBkV9ktATqjCSXMdf8gSIXP5uRM8CO9woauJH9bshy4kzxXeHG6ImSSnR zDKBFHChsp1W0VkiM/b2Oqf/HUIXuPnMGvxzWeDLk7fjd1LY36ydQBqYwpyDIA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PD09d4SbwzQdQ; Fri, 10 Feb 2023 16:51:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31AGp1TK023885; Fri, 10 Feb 2023 16:51:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31AGp1Qf023884; Fri, 10 Feb 2023 16:51:01 GMT (envelope-from git) Date: Fri, 10 Feb 2023 16:51:01 GMT Message-Id: <202302101651.31AGp1Qf023884@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: 559056736b25 - main - databases/akonadi: Build Sqlite backend unconditionally. List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 559056736b25a6a8311a1a70e7ab6573097b7535 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=559056736b25a6a8311a1a70e7ab6573097b7535 commit 559056736b25a6a8311a1a70e7ab6573097b7535 Author: Gleb Popov AuthorDate: 2023-01-17 06:32:59 +0000 Commit: Gleb Popov CommitDate: 2023-02-10 16:50:27 +0000 databases/akonadi: Build Sqlite backend unconditionally. This allows switching from Sqlite to MySQL/PostgreSQL backends without recompilng the package. Reviewed by: tcberner, fluffy Differential Revision: https://reviews.freebsd.org/D38095 --- databases/akonadi/Makefile | 54 +++++++++++++-------------------------------- databases/akonadi/pkg-plist | 2 +- 2 files changed, 16 insertions(+), 40 deletions(-) diff --git a/databases/akonadi/Makefile b/databases/akonadi/Makefile index dbcd0057c215..8313b7e73d37 100644 --- a/databases/akonadi/Makefile +++ b/databases/akonadi/Makefile @@ -1,5 +1,6 @@ PORTNAME= akonadi DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= databases kde kde-applications MAINTAINER= kde@FreeBSD.org @@ -15,7 +16,7 @@ BUILD_DEPENDS= xsltproc:textproc/libxslt CONFLICTS= akonadi akonadi-kf5-git USES= cmake compiler:c++11-lib gettext gnome kde:5 qt:5 \ - shared-mime-info tar:xz xorg + shared-mime-info sqlite:3 tar:xz xorg USE_GNOME= libxml2 USE_KDE= auth codecs completion config configwidgets coreaddons crash \ dbusaddons guiaddons i18n iconthemes itemmodels itemviews \ @@ -23,58 +24,33 @@ USE_KDE= auth codecs completion config configwidgets coreaddons crash \ designerplugin:build ecm:build \ designerplugin:run USE_QT= concurrent core dbus designer gui network sql testlib widgets xml \ - buildtools:build qmake:build + buildtools:build qmake:build \ + sql-sqlite3:run USE_XORG= x11 -CMAKE_ARGS+= -DCMAKE_REQUIRED_INCLUDES:STRING="${LOCALBASE}/include" +CMAKE_ARGS+= -DCMAKE_REQUIRED_INCLUDES:STRING="${LOCALBASE}/include" \ + -DMYSQLD_EXECUTABLE:FILEPATH="${LOCALBASE}/libexec/mysqld" \ + -DMYSQLD_SCRIPTS_PATH:PATH="${LOCALBASE}/bin" \ + -DPOSTGRES_PATH:FILEPATH="${LOCALBASE}/bin/pg_ctl" USE_LDCONFIG= yes -OPTIONS_DEFINE= DOCS -OPTIONS_MULTI= DB -OPTIONS_MULTI_DB= MYSQL PGSQL SQLITE -OPTIONS_SUB= yes -OPTIONS_DEFAULT= MYSQL +OPTIONS_DEFINE= DOCS +OPTIONS_GROUP= DB +OPTIONS_GROUP_DB= MYSQL PGSQL MYSQL_DESC= Install MySQL Qt plugin and server -MYSQL_USES= mysql:server qt:5 +MYSQL_USES= mysql:server MYSQL_USE= QT=sql-mysql:run -MYSQL_CMAKE_BOOL= AKONADI_BUILD_MYSQL PGSQL_DESC= Install PostgreSQL Qt plugin -# Do not add a dependency on PostgreSQL server as someone preferring -# it over MySQL might like to use some advanced configuration, like a -# remote server. -#PGSQL_USE= PGSQL=server -PGSQL_USES= qt:5 PGSQL_USE= QT=sql-pgsql:run -PGSQL_CMAKE_BOOL= AKONADI_BUILD_PGSQL - -SQLITE_DESC= Enable SQLite backend -SQLITE_USES= qt:5 sqlite:3 -SQLITE_USE= QT=sql-sqlite3:run -SQLITE_CMAKE_BOOL= AKONADI_BUILD_QSQLITE .include -# Multiple backends may be enabled, but there can be only -# one default. Set a default (the user can change it locally) -# based on the selected backends, preferring MySQL (if enabled). -# -# If you build this port with only a single backend selected, -# that one will be the default. This is useful for users of SQLite. .if ${PORT_OPTIONS:MMYSQL} -CMAKE_ARGS+= -DDATABASE_BACKEND=MYSQL -.else -. if ${PORT_OPTIONS:MPGSQL} -CMAKE_ARGS+= -DDATABASE_BACKEND=POSTGRES -. else -. if ${PORT_OPTIONS:MSQLITE} -CMAKE_ARGS+= -DDATABASE_BACKEND=SQLITE -. else -# Nothing else selected, very odd -CMAKE_ARGS+= -DDATABASE_BACKEND=MYSQL -. endif -. endif +CMAKE_ARGS+= -DDATABASE_BACKEND:STRING="MYSQL" +.elif ${PORT_OPTIONS:MPGSQL} +CMAKE_ARGS+= -DDATABASE_BACKEND:STRING="POSTGRES" .endif post-patch: diff --git a/databases/akonadi/pkg-plist b/databases/akonadi/pkg-plist index d982f768c386..0833bd25662e 100644 --- a/databases/akonadi/pkg-plist +++ b/databases/akonadi/pkg-plist @@ -345,7 +345,7 @@ lib/libKF5AkonadiXml.so.%%KDE_APPLICATIONS_SHLIB_VER%% %%QT_MKSPECDIR%%/modules/qt_AkonadiXml.pri %%QT_PLUGINDIR%%/designer/akonadiwidgets.so %%QT_PLUGINDIR%%/pim5/akonadi/akonadi_test_searchplugin.so -%%SQLITE%%%%QT_PLUGINDIR%%/sqldrivers/libqsqlite3.so +%%QT_PLUGINDIR%%/sqldrivers/libqsqlite3.so %%DATADIR%%/agents/knutresource.desktop share/config.kcfg/resourcebase.kcfg share/dbus-1/interfaces/org.freedesktop.Akonadi.Agent.Control.xml