diff --git a/LEGAL b/LEGAL index 35018156170..a47704935f4 100644 --- a/LEGAL +++ b/LEGAL @@ -208,6 +208,7 @@ ue*dev.zip editors/uemacs Resale allowed for media cost only unifi-5*/UniFi.unix.zip net-mgmt/unifi5 Redistribution of bundled firmware images is not permitted uplink-demo* games/linux-uplink-demo Redistribution is limited, see license uzap.tar.gz editors/uzap This software may not be used to make a profit in any way. +vdbench*.zip benchmarks/linux-vdbench Redistribution is not permitted vdr-markad-* multimedia/vdr-plugin-markad Installs station logos vice-* emulators/vice ROMs are copyrighted by Commodore Business Machines VMware-vSphere-Perl* net/vmware-vsphere-cli May not be redistributed. Must accept license to download. diff --git a/Mk/Uses/objc.mk b/Mk/Uses/objc.mk index 0b3e8305db6..00c76007ba7 100644 --- a/Mk/Uses/objc.mk +++ b/Mk/Uses/objc.mk @@ -10,7 +10,7 @@ .if !defined(_INCLUDE_USES_OBJC_MK) _INCLUDE_USES_OBJC_MK= yes -OBJC_CLANG_VERSION=40 +OBJC_CLANG_VERSION=60 objc_ARGS?= .if !empty(objc_ARGS) && ! ${objc_ARGS:Mcompiler} diff --git a/Mk/Uses/qt.mk b/Mk/Uses/qt.mk index e6fd56f5706..a09fa036c98 100644 --- a/Mk/Uses/qt.mk +++ b/Mk/Uses/qt.mk @@ -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.11.1 +QT5_VERSION?= 5.11.2 # 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)