7 files changed, 14 insertions, 30 deletions
diff --git a/Mk/Uses/gssapi.mk b/Mk/Uses/gssapi.mk
index f1e76ffc40b3..c09051ef2554 100644
--- a/Mk/Uses/gssapi.mk
+++ b/Mk/Uses/gssapi.mk
@@ -79,7 +79,6 @@ _HEIMDAL_DEPENDS=${GSSAPILIBDIR}/libgssapi.so:security/heimdal
 _MITKRB5_DEPENDS=${GSSAPILIBDIR}/libkrb5support.so:security/krb5
 _HEADERS=	sys/types.h sys/stat.h stdint.h
 
-.undef _FIXUP_KRB5CONFIG
 .if empty(gssapi_ARGS)
 gssapi_ARGS=	base
 .endif
@@ -97,9 +96,6 @@ _HEADERS+=	gssapi/gssapi.h gssapi/gssapi_krb5.h krb5.h
 GSSAPICPPFLAGS=	-I"${GSSAPIINCDIR}"
 GSSAPILIBS=	-lkrb5 -lgssapi -lgssapi_krb5
 GSSAPILDFLAGS=	-L"${GSSAPILIBDIR}"
-.if empty(OSREL:N9.3)
-_FIXUP_KRB5CONFIG=	yes
-.endif
 .elif ${_local} == "heimdal"
 HEIMDAL_HOME?=	${LOCALBASE}
 GSSAPIBASEDIR=	${HEIMDAL_HOME}
@@ -141,18 +137,7 @@ IGNORE=	USES=gssapi - invalid args: [${_local}] specified
 .endif
 .endfor
 
-# Fix up krb5-config if broken.  This script included in 9.X prior to
-# r271474 and in 10.X prior to r271473 are broken because
-# libgssapi_krb5 for some interfaces of GSS-API is missing.
-.if defined(_FIXUP_KRB5CONFIG)
-KRB5CONFIG=${WRKDIR}/krb5-config
-_USES_configure+=	290:krb5config-fix
-krb5config-fix:
-	${SED} -e 's,\$$lib_flags -lgssapi -lheimntlm,\$$lib_flags -lgssapi -lgssapi_krb5 -lheimntlm,' < ${GSSAPIBASEDIR}/bin/krb5-config > ${KRB5CONFIG}
-	${CHMOD} a+rx ${KRB5CONFIG}
-.else
 KRB5CONFIG=${GSSAPIBASEDIR}/bin/krb5-config
-.endif
 
 # Fix up -Wl,-rpath in LDFLAGS
 .if defined(_RPATH) && !empty(_RPATH)
diff --git a/Mk/Uses/kde.mk b/Mk/Uses/kde.mk
index 9bdf08817519..95ed73bae103 100644
--- a/Mk/Uses/kde.mk
+++ b/Mk/Uses/kde.mk
@@ -74,8 +74,8 @@ KDE_FRAMEWORKS_VERSION?=	5.51.0
 KDE_FRAMEWORKS_BRANCH?= 	stable
 
 # Current KDE applications.
-KDE_APPLICATIONS_VERSION?=	18.08.2
-KDE_APPLICATIONS_SHLIB_VER?=	5.9.2
+KDE_APPLICATIONS_VERSION?=	18.08.3
+KDE_APPLICATIONS_SHLIB_VER?=	5.9.3
 KDE_APPLICATIONS_BRANCH?=	stable
 # Upstream moves old software to Attic/. Specify the newest applications release there.
 # Only the major version is used for the comparison.
diff --git a/Mk/Uses/meson.mk b/Mk/Uses/meson.mk
index e8afcabe30e3..d3904c104db4 100644
--- a/Mk/Uses/meson.mk
+++ b/Mk/Uses/meson.mk
@@ -35,7 +35,8 @@ BUILD_DEPENDS+=		meson:devel/meson
 USE_LOCALE?=	en_US.UTF-8
 
 CONFIGURE_ARGS+=	--prefix ${PREFIX} \
-			--mandir man
+			--mandir man \
+			--infodir ${INFO_PATH}
 
 # meson has it own strip mechanic
 INSTALL_TARGET=		install
diff --git a/Mk/Uses/pear.mk b/Mk/Uses/pear.mk
index 62fc26f835a0..7bd88b2e9d4b 100644
--- a/Mk/Uses/pear.mk
+++ b/Mk/Uses/pear.mk
@@ -20,7 +20,7 @@ _valid_pear_ARGS=		env
 # Sanity check
 .  for arg in ${pear_ARGS}
 .    if empty(_valid_pear_ARGS:M${arg})
-IGNORE=	Incorrect 'USES+= pear:${cmake_ARGS}' usage: argument [${arg}] is not recognized
+IGNORE=	Incorrect 'USES+= pear:${pear_ARGS}' usage: argument [${arg}] is not recognized
 .    endif
 .  endfor
 
diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk
index 1c40c843be3c..ff7f14d0e9a0 100644
--- a/Mk/Uses/python.mk
+++ b/Mk/Uses/python.mk
@@ -613,7 +613,7 @@ add-plist-pymod:
 .if ${PYTHON_REL} >= 3200 && defined(_PYTHON_FEATURE_PY3KPLIST)
 # When Python version is 3.2+ we rewrite all the filenames
 # of TMPPLIST that end with .py[co], so that they conform
-# to PEP 3147 (see http://www.python.org/dev/peps/pep-3147/)
+# to PEP 3147 (see https://www.python.org/dev/peps/pep-3147/)
 PYMAGICTAG=		${PYTHON_CMD} -c 'import imp; print(imp.get_tag())'
 _USES_stage+=	935:add-plist-python
 add-plist-python:
diff --git a/Mk/Uses/qt.mk b/Mk/Uses/qt.mk
index b06963f26fbb..93643f864451 100644
--- a/Mk/Uses/qt.mk
+++ b/Mk/Uses/qt.mk
@@ -137,7 +137,7 @@ _USES_POST+=		qt
 _QT_MK_POST_INCLUDED=	qt.mk
 
 # The Qt components supported by qt.mk: list of shared, and version specific ones
-_USE_QT_ALL=		assistant dbus designer doc gui help \
+_USE_QT_ALL=		assistant dbus declarative designer doc gui help \
 			imageformats l10n linguist linguisttools multimedia \
 			network opengl pixeltool qdbusviewer qmake script \
 			scripttools sql sql-ibase sql-mysql sql-odbc sql-pgsql \
@@ -145,7 +145,7 @@ _USE_QT_ALL=		assistant dbus designer doc gui help \
 			xml xmlpatterns
 
 _USE_QT4_ONLY=		accessible assistant-adp assistantclient clucene codecs-cn codecs-jp \
-			codecs-kr codecs-tw corelib declarative demo graphicssystems-opengl \
+			codecs-kr codecs-tw corelib demo graphicssystems-opengl \
 			help-tools iconengines inputmethods makeqpf moc phonon \
 			phonon-gst porting qdoc3 qmlviewer qt3support qtconfig \
 			qtestlib qvfb rcc uic uic3 xmlpatterns-tool
@@ -153,7 +153,7 @@ _USE_QT4_ONLY=		accessible assistant-adp assistantclient clucene codecs-cn codec
 _USE_QT5_ONLY=		3d buildtools canvas3d charts concurrent connectivity \
 			core datavis3d diag examples gamepad \
 			graphicaleffects location paths phonon4 plugininfo printsupport \
-			qdbus qdoc qdoc-data qev qml quick quickcontrols \
+			qdbus qdoc qdoc-data qev quickcontrols \
 			quickcontrols2 scxml sensors serialbus serialport speech \
 			sql-tds uiplugin uitools virtualkeyboard wayland webchannel \
 			webengine websockets websockets-qml widgets x11extras
@@ -217,7 +217,11 @@ dbus_PORT=		devel/${_QT_RELNAME}-dbus
 dbus_LIB=		libQt${_QT_LIBVER}DBus.so
 
 declarative_PORT=	x11-toolkits/${_QT_RELNAME}-declarative
+.  if ${_QT_VER:M4}
 declarative_LIB=	libQt${_QT_LIBVER}Declarative.so
+.  else
+declarative_LIB=	libQt${_QT_LIBVER}Qml.so
+.  endif
 
 demo_PORT=		misc/${_QT_RELNAME}-qtdemo
 demo_PATH=		${LOCALBASE}/${QT_BINDIR_REL}/qtdemo
@@ -333,9 +337,6 @@ qev_PATH=		${LOCALBASE}/${QT_BINDIR_REL}/qev
 qmake_PORT=		devel/${_QT_RELNAME}-qmake
 qmake_PATH=		${LOCALBASE}/${QT_BINDIR_REL}/qmake
 
-qml_PORT=		lang/${_QT_RELNAME}-qml
-qml_LIB=		libQt${_QT_LIBVER}Qml.so
-
 qmlviewer_PORT=		devel/${_QT_RELNAME}-qmlviewer
 qmlviewer_PATH=		${LOCALBASE}/${QT_BINDIR_REL}/qmlviewer
 
@@ -348,9 +349,6 @@ qtconfig_PATH=		${LOCALBASE}/${QT_BINDIR_REL}/qtconfig
 qtestlib_PORT=		${testlib_PORT}
 qtestlib_LIB=		${testlib_LIB}
 
-quick_PORT=		x11-toolkits/${_QT_RELNAME}-quick
-quick_LIB=		libQt${_QT_LIBVER}Quick.so
-
 quickcontrols_PORT=	x11-toolkits/${_QT_RELNAME}-quickcontrols
 quickcontrols_PATH=	${LOCALBASE}/${QT_QMLDIR_REL}/QtQuick/Controls/qmldir
 
diff --git a/Mk/Uses/ssl.mk b/Mk/Uses/ssl.mk
index 941467a18de1..4e5d48099d8c 100644
--- a/Mk/Uses/ssl.mk
+++ b/Mk/Uses/ssl.mk
@@ -10,7 +10,7 @@
 #
 # DEFAULT_VERSIONS+=	ssl=<openssl variant>
 #
-# Variants being base, openssl, openssl-devel, openssl111, libressl, and libressl-devel.
+# Variants being base, openssl, openssl111, libressl, and libressl-devel.
 #
 # The Makefile sets these variables:
 # OPENSSLBASE		- "/usr" or ${LOCALBASE}