From owner-svn-ports-all@freebsd.org Sat Dec 5 12:00:08 2020 Return-Path: Delivered-To: svn-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 DB334478392; Sat, 5 Dec 2020 12:00:08 +0000 (UTC) (envelope-from fluffy@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Cp7Rr593kz3N1J; Sat, 5 Dec 2020 12:00:08 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9242C1D890; Sat, 5 Dec 2020 12:00:08 +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 0B5C08wu016459; Sat, 5 Dec 2020 12:00:08 GMT (envelope-from fluffy@FreeBSD.org) Received: (from fluffy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0B5C08m1016457; Sat, 5 Dec 2020 12:00:08 GMT (envelope-from fluffy@FreeBSD.org) Message-Id: <202012051200.0B5C08m1016457@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: fluffy set sender to fluffy@FreeBSD.org using -f From: Dima Panov Date: Sat, 5 Dec 2020 12:00:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r557051 - in head/editors: libreoffice libreoffice6 X-SVN-Group: ports-head X-SVN-Commit-Author: fluffy X-SVN-Commit-Paths: in head/editors: libreoffice libreoffice6 X-SVN-Commit-Revision: 557051 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Dec 2020 12:00:09 -0000 Author: fluffy Date: Sat Dec 5 12:00:07 2020 New Revision: 557051 URL: https://svnweb.freebsd.org/changeset/ports/557051 Log: editors/libreoffice: simplify QT5 on FreeBSD < 12 logic - Enables QT5 by default on DragonFly - Enables QT5 when DEFAULT_VERSIONS += ssl=openssl - Doesn't need to be adjusted when 14.0-CURRENT appears PR: 251450 Submitted by: jbeich MFH: 2020Q4 Modified: head/editors/libreoffice/Makefile head/editors/libreoffice6/Makefile Modified: head/editors/libreoffice/Makefile ============================================================================== --- head/editors/libreoffice/Makefile Sat Dec 5 11:43:30 2020 (r557050) +++ head/editors/libreoffice/Makefile Sat Dec 5 12:00:07 2020 (r557051) @@ -121,10 +121,12 @@ USES= autoreconf:build bison compiler:c++17-lang cpe pkgconfig python:3.5+ shebangfix shared-mime-info ssl tar:xz xorg OPTIONS_DEFINE= COINMP CUPS DOCS GNOME GTK3 JAVA KF5 MMEDIA PGSQL QT5 SDK TEST WEBDAV -OPTIONS_DEFAULT= CUPS MMEDIA -OPTIONS_DEFAULT_FreeBSD_12= QT5 -OPTIONS_DEFAULT_FreeBSD_13= QT5 -OPTIONS_DEFAULT+= ${OPTIONS_DEFAULT_${OPSYS}_${OSREL:R}} +OPTIONS_DEFAULT= CUPS MMEDIA QT5 + +.if !defined(DEFAULT_VERSIONS) || ! ${DEFAULT_VERSIONS:Mssl=*} +# Blocked by net/qt5-network: cannot use QT5 with default OpenSSL +OPTIONS_EXCLUDE_FreeBSD_11+= QT5 +.endif COINMP_DESC= Enable CoinMP (deprecated) math solver GTK3_DESC= GTK+ 3 GUI toolkit support (incomplete visual style) Modified: head/editors/libreoffice6/Makefile ============================================================================== --- head/editors/libreoffice6/Makefile Sat Dec 5 11:43:30 2020 (r557050) +++ head/editors/libreoffice6/Makefile Sat Dec 5 12:00:07 2020 (r557051) @@ -120,10 +120,12 @@ USES= autoreconf:build bison compiler:c++14-lang cpe pkgconfig python shebangfix shared-mime-info ssl tar:xz xorg OPTIONS_DEFINE= CUPS DOCS GNOME GTK3 I18N JAVA KF5 MMEDIA PGSQL QT5 SDK TEST WEBDAV -OPTIONS_DEFAULT= CUPS MMEDIA -OPTIONS_DEFAULT_FreeBSD_12= QT5 -OPTIONS_DEFAULT_FreeBSD_13= QT5 -OPTIONS_DEFAULT+= ${OPTIONS_DEFAULT_${OPSYS}_${OSREL:R}} +OPTIONS_DEFAULT= CUPS MMEDIA QT5 + +.if !defined(DEFAULT_VERSIONS) || ! ${DEFAULT_VERSIONS:Mssl=*} +# Blocked by net/qt5-network: cannot use QT5 with default OpenSSL +OPTIONS_EXCLUDE_FreeBSD_11+= QT5 +.endif GTK3_DESC= GTK+ 3 GUI toolkit support (incomplete visual style) I18N_DESC= Build i18n resources