git: 4ae5a069234d - 2021Q2 - editors/libreoffice: add an option to build with or without MariaDB driver

Dima Panov fluffy at FreeBSD.org
Sun May 9 16:06:36 UTC 2021


The branch 2021Q2 has been updated by fluffy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=4ae5a069234d3f082dc8d01105ddc4d205443312

commit 4ae5a069234d3f082dc8d01105ddc4d205443312
Author:     Piotr Pawel Stefaniak <pstef at FreeBSD.org>
AuthorDate: 2021-04-07 16:47:04 +0000
Commit:     Dima Panov <fluffy at FreeBSD.org>
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


More information about the dev-commits-ports-all mailing list