svn commit: r557052 - in branches/2020Q4/editors: libreoffice libreoffice6

[Dima Panov]

Author: fluffy
Date: Sat Dec  5 12:02:24 2020
New Revision: 557052
URL: https://svnweb.freebsd.org/changeset/ports/557052

Log:
  MFH: r557051
  
  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
  
  Approved by:	ports-secteam (fluffy)

Modified:
  branches/2020Q4/editors/libreoffice/Makefile
  branches/2020Q4/editors/libreoffice6/Makefile
Directory Properties:
  branches/2020Q4/   (props changed)

Modified: branches/2020Q4/editors/libreoffice/Makefile
==============================================================================
--- branches/2020Q4/editors/libreoffice/Makefile	Sat Dec  5 12:00:07 2020	(r557051)
+++ branches/2020Q4/editors/libreoffice/Makefile	Sat Dec  5 12:02:24 2020	(r557052)
@@ -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: branches/2020Q4/editors/libreoffice6/Makefile
==============================================================================
--- branches/2020Q4/editors/libreoffice6/Makefile	Sat Dec  5 12:00:07 2020	(r557051)
+++ branches/2020Q4/editors/libreoffice6/Makefile	Sat Dec  5 12:02:24 2020	(r557052)
@@ -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