From owner-dev-commits-ports-all@freebsd.org Sun May 9 16:06:36 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 65B7963BA6D; Sun, 9 May 2021 16:06:36 +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 4FdTZh2GFFz3Q7X; Sun, 9 May 2021 16:06:36 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 3648D14B2A; Sun, 9 May 2021 16:06:36 +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 149G6amE002478; Sun, 9 May 2021 16:06:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 149G6aNh002477; Sun, 9 May 2021 16:06:36 GMT (envelope-from git) Date: Sun, 9 May 2021 16:06:36 GMT Message-Id: <202105091606.149G6aNh002477@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Dima Panov Subject: git: 4ae5a069234d - 2021Q2 - editors/libreoffice: add an option to build with or without MariaDB driver MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: 4ae5a069234d3f082dc8d01105ddc4d205443312 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 May 2021 16:06:36 -0000 The branch 2021Q2 has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=4ae5a069234d3f082dc8d01105ddc4d205443312 commit 4ae5a069234d3f082dc8d01105ddc4d205443312 Author: Piotr Pawel Stefaniak AuthorDate: 2021-04-07 16:47:04 +0000 Commit: Dima Panov CommitDate: 2021-05-09 16:04:53 +0000 editors/libreoffice: add an option to build with or without MariaDB driver PR: 254273 Approved by: lwhsu (cherry picked from commit fba3dac6cdd8f201a3b0e6d1f33d7727ca31c7cd) --- editors/libreoffice/Makefile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile index c7eb4fadfeb7..0ef3f674cd74 100644 --- a/editors/libreoffice/Makefile +++ b/editors/libreoffice/Makefile @@ -108,15 +108,15 @@ SHEBANG_GLOB= *.py GNU_CONFIGURE= yes USES= autoreconf:build bison compiler:c++17-lang cpe desktop-file-utils \ - gettext-runtime gl gmake gnome jpeg mysql:client perl5 pkgconfig \ - pkgconfig python:3.6+ shebangfix shared-mime-info ssl tar:xz xorg + gettext-runtime gl gmake gnome jpeg perl5 pkgconfig python:3.6+ \ + shebangfix shared-mime-info ssl tar:xz xorg USE_GL= gl glew glu USE_GNOME= cairo glib20 libxml2 libxslt USE_OPENLDAP= yes USE_PERL5= build USE_XORG= ice sm x11 xaw xcb xext xinerama xrandr xrender -OPTIONS_DEFINE= COINMP CUPS DOCS GNOME GTK3 JAVA KF5 LTO MMEDIA PGSQL QT5 SDK TEST WEBDAV +OPTIONS_DEFINE= COINMP CUPS DOCS GNOME GTK3 JAVA KF5 LTO MMEDIA PGSQL MARIADB QT5 SDK TEST WEBDAV OPTIONS_DEFAULT= CUPS MMEDIA QT5 .if !defined(DEFAULT_VERSIONS) || ! ${DEFAULT_VERSIONS:Mssl=*} @@ -130,6 +130,7 @@ JAVA_DESC= Add Java support (XML filters, macros, DB connections) KF5_DESC= KF5/Qt5 GUI toolkit support (implies QT5) MMEDIA_DESC= Enable multimedia backend for Impress PGSQL_DESC= Build with PostgreSQL-SDBC driver +MARIADB_DESC= Build with MariaDB-SDBC driver QT5_DESC= Qt5 GUI toolkit support (default visual style) SDK_DESC= Build with SDK TEST_DESC= Run all regression tests @@ -208,6 +209,9 @@ PGSQL_CONFIGURE_ENABLE= postgresql-sdbc PGSQL_CONFIGURE_WITH= gssapi krb5 PGSQL_USES= pgsql +MARIADB_CONFIGURE_ENABLE= mariadb-sdbc +MARIADB_USES= mysql:client + QT5_CONFIGURE_ENABLE= qt5 QT5_USE= qt=buildtools_build,core,gui,network,qmake_build,widgets,x11extras QT5_USES= qt:5