cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFH: r557051

Browse Source 
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)
This commit is contained in:
Dima Panov 2020-12-05 12:02:24 +00:00
parent 8d7f96864a
commit 373b40e487
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/branches/2020Q4/; revision=557052
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
editors/libreoffice/Makefile
View File

@ -121,10 +121,12 @@ USES= autoreconf:build bison compiler:c++17-lang cpe desktop-file-utils \
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)

10
editors/libreoffice6/Makefile
View File

@ -120,10 +120,12 @@ USES= autoreconf:build bison compiler:c++14-lang cpe desktop-file-utils \
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