Framework: sync with upstream

Taken from: HardenedBSD
This commit is contained in:
Franco Fichtner 2018-09-10 00:53:50 +02:00
parent 83ae0e93ea
commit 81245f61a5
2 changed files with 4 additions and 1 deletions

3
LEGAL
View File

@ -239,3 +239,6 @@ snes9x-* emulators/snes9x-gtk Commercial users must seek permission from copyri
rainloop-1.*.zip mail/rainloop Redistribution in any form is prohibited
lha-114i.tar.gz archivers/lha Binary only redistribution is prohibited. Non-network redistribution such as CDROM requires prior notification to author. Commercial use whose main purpose is to provide the functions of this program is prohibited.
atom-*.tgz science/atom Redistribution in any form is prohibited
charm-uiuc-* net/charm No commercial use: commercial use requires a commercial license
namd-* science/namd No commercial use: commercial use requires a commercial license
vmd-* science/vmd No commercial use: commercial use requires a commercial license

View File

@ -30,7 +30,7 @@ _QT_MK_INCLUDED= qt.mk
# Qt versions currently supported by the framework.
_QT_SUPPORTED?= 4 5
QT4_VERSION?= 4.8.7
QT5_VERSION?= 5.10.1
QT5_VERSION?= 5.11.1
# We accept the Qt version to be passed by either or all of the three mk files.
. if empty(qt_ARGS) && empty(qmake_ARGS) && empty(qt-dist_ARGS)