diff --git a/Mk/Uses/qt-dist.mk b/Mk/Uses/qt-dist.mk
index 975390005d6c..209dc7432189 100644
--- a/Mk/Uses/qt-dist.mk
+++ b/Mk/Uses/qt-dist.mk
@@ -1,550 +1,550 @@
 # There are three Qt related USES files with different access to Qt.
 #   - qmake: The port requires Qt's qmake to build -- creates the configure target
 #            - auto includes qt.mk
 #   - qt-dist: The port is a port for a part of Qt
 #            - auto includes qt.mk
 #   - qt.mk  - Dependency handling. USE_QT=foo bar
 #
 #
 # Usage
 #    qt-dist:<version>[,yes|modulename]
 #
 # MAINTAINER:	kde@FreeBSD.org
 
 .if !defined(_QT_DIST_MK_INCLUDED)
 _QT_DIST_MK_INCLUDED=	qt-dist.mk
 
 # Suck in qt.mk and qmake.mk
 qt_ARGS?=	# empty
 .include "${USESDIR}/qt.mk"
 qmake_ARGS?=	# empty
 .include "${USESDIR}/qmake.mk"
 
 # Supported distribution arguments
 _COMMON_DISTS=		3d base charts connectivity datavis3d declarative imageformats location multimedia \
 			networkauth quick3d quicktimeline remoteobjects scxml sensors \
 			serialbus serialport speech svg tools translations virtualkeyboard \
 			wayland webchannel webengine websockets webview
 _QT5_DISTS=		gamepad graphicaleffects quickcontrols \
 			quickcontrols2 script webglplugin \
 			x11extras xmlpatterns
 _QT6_DISTS=		5compat coap doc graphs grpc httpserver languageserver lottie positioning \
 			quick3dphysics quickeffectmaker shadertools
 
 _QT_DISTS=		${_COMMON_DISTS} \
 			${_QT${_QT_VER}_DISTS}
 
 # We only accept one item as an argument. The fetch target further below works
 # around this.
 _QT_DIST=		# empty
 .  for dist in ${_QT_DISTS:O:u}
 .    if ${qt-dist_ARGS:M${dist}}
 .      if empty(_QT_DIST)
 _QT_DIST=		${dist}
 .      else
 IGNORE=		cannot be installed: different Qt dists specified via qt-dist:[${qt-dist_ARGS:S/ /,/g}]
 .      endif
 .    endif
 .  endfor
 
 # Fall back to sensible defaults for _QT_DIST
 .  if empty(_QT_DIST)
 _QT_DIST=		${PORTNAME} # don't force qt-dist to be set for Qt5 ports which 75% of time are ${PORTNAME}
 .  endif
 
 # Check validitiy
 .  if empty(_QT_DISTS:M${_QT_DIST})
 IGNORE=			Unsupported qt-dist ${_QT_DIST} for qt:${_QT_VER}
 .  endif
 ################################################################################
 
 # Set standard bsd.port.mk variables.
 LICENSE?=		LGPL21
 WWW?=		https://www.qt.io/
 
 .  if !exists(${PKGDIR}/pkg-descr)
 DESCR?=			${PORTSDIR}/devel/${_QT_RELNAME}/pkg-descr
 .  endif
 
 # Stage support.
 _QT5_DESTDIRNAME=	INSTALL_ROOT
 _QT6_DESTDIRNAME=	DESTDIR
 DESTDIRNAME=		${_QT${_QT_VER}_DESTDIRNAME}
 
 # Qt's tarballs are xz compressed.
 .  if empty(USES:Mtar)
 EXTRACT_SUFX?=		.tar.xz
 .  endif
 
 # Qt5 specific master sites
 _QT5_MASTER_SITES_kde=		LOCAL
 _QT5_MASTER_SITE_SUBDIR_kde=	kde/KDE/Qt/${_QT_VERSION}
 _QT5_MASTER_SITES=		${MASTER_SITE_QT}
 _QT5_MASTER_SITE_SUBDIR=	official_releases/qt/${_QT_VERSION:R}/${_QT_VERSION}/submodules/
 # Qt6 specific master sites
 _QT6_MASTER_SITES=		${MASTER_SITE_QT}
 _QT6_MASTER_SITE_SUBDIR=	${_QT6_RELEASE_TYPE}_releases/qt/${_QT_VERSION:R}/${_QT_VERSION}/submodules
 
 # Qt5 specific distnames
 .  if ${_QT_DIST} == webengine
 _QT5_DISTNAME=			${_QT_DIST:S,^,qt,:S,$,-everywhere-opensource-src-${DISTVERSION},}
 .  else
 _QT5_DISTNAME=			${_QT_DIST:S,^,qt,:S,$,-everywhere-src-${DISTVERSION},}
 .  endif
 _QT5_DISTNAME_kde=		${_QT_DIST:S,^,kde-qt,:S,$,-${DISTVERSION},}
 # Qt6 specific distnames
 _QT6_DISTNAME=			${_QT_DIST:S,^,qt,:S,$,-everywhere-src-${DISTVERSION},}
 
 # Effective master sites and distfile values
 # net/qt6-coap has no submodule distfile and uses USE_GITHUB
 .  if ${_QT_DIST} != coap
 MASTER_SITES=			${_QT${_QT_VER}_MASTER_SITES${_KDE_${_QT_DIST}:D_kde}}
 MASTER_SITE_SUBDIR=		${_QT${_QT_VER}_MASTER_SITE_SUBDIR${_KDE_${_QT_DIST}:D_kde}}
 DISTNAME=			${_QT${_QT_VER}_DISTNAME${_KDE_${_QT_DIST}:D_kde}}
 DISTFILES=			${DISTNAME:S,$,${EXTRACT_SUFX},}
 .  endif
 DIST_SUBDIR=			KDE/Qt/${_QT_VERSION}
 
 .  if ${_QT_VER:M5}
 # KDE maintains a repository with a patched Qt5 distribution.
 _KDE_3d=		0
 _KDE_base=		127
 _KDE_charts=		0
 _KDE_connectivity=	3
 _KDE_datavis3d=		0
 _KDE_declarative=	25
 _KDE_gamepad=		0
 _KDE_graphicaleffects=	0
 _KDE_imageformats=	4
 _KDE_location=		7
 _KDE_multimedia=	2
 _KDE_networkauth=	1
 _KDE_quick3d=		1
 _KDE_quickcontrols=	0
 _KDE_quickcontrols2=	5
 _KDE_quicktimeline=	0
 _KDE_remoteobjects=	0
 _KDE_script=		0
-_KDE_script_ORIGIN_TAG=	v5.15.17-lts
-_KDE_script_VERSION=	5.15.17
+_KDE_script_ORIGIN_TAG=	v5.15.18-lts
+_KDE_script_VERSION=	5.15.18
 _KDE_scxml=		0
 _KDE_sensors=		0
 _KDE_serialbus=		0
 _KDE_serialport=	0
 _KDE_speech=		1
 _KDE_svg=		5
 _KDE_tools=		3
 _KDE_translations=	0
 _KDE_virtualkeyboard=	0
 _KDE_wayland=		59
 _KDE_webchannel=	3
-_KDE_webengine=			3
+_KDE_webengine=			2
 _KDE_webengine_BRANCH=		5.15
-_KDE_webengine_ORIGIN_TAG=	v5.15.17-lts
-_KDE_webengine_VERSION=		5.15.17
+_KDE_webengine_ORIGIN_TAG=	v5.15.18-lts
+_KDE_webengine_VERSION=		5.15.18
 _KDE_webglplugin=	0
 _KDE_websockets=	2
 _KDE_webview=		0
 _KDE_x11extras=		0
 _KDE_xmlpatterns=	0
 
 .    if defined(_KDE_${_QT_DIST})
 .      if defined(_KDE_${_QT_DIST}_ORIGIN_TAG)
 _KDE_${_QT_DIST}_BRANCH?=	${_KDE_${_QT_DIST}_VERSION}
 .      else
 _KDE_${_QT_DIST}_BRANCH=	kde/5.15
 COMMENT+=			(KDE patched)
 .      endif
 QT5_KDE_PATCH=		p${_KDE_${_QT_DIST}}
 _KDE_${_QT_DIST}_VERSION?=	${_QT_VERSION}
 _KDE_${_QT_DIST}_ORIGIN_TAG?=	v${_KDE_${_QT_DIST}_VERSION}-lts-lgpl
 .    else
 QT5_KDE_PATCH=		#
 .    endif
 .  endif # ${_QT_VER:M5}
 
 # Environment setup for Qt5
 .  if ${_QT_VER:M5}
 # Qt (at least when used with qmake) has a tendency to overlink: some libraries
 # have dependencies on others in the mkspec configurations and the latter are
 # always passed to the linker even if they are not actually used. By passing
 # --as-needed to the linker by default when building the Qt ports we do not
 # have to declare a lot of unnecessary dependencies in USE_QT5.
 LDFLAGS+=		-Wl,--as-needed
 
 .    if ${_QT_DIST} == "base" && ${PORTNAME} != "qmake"
 # Qt configure requires pkg-config to detect dependencies.
 .include "${USESDIR}/pkgconfig.mk"
 .    endif
 
 # -nomake is only used by qtbase's configure script.
 # Other ports from other Qt modules will automatically build examples and
 # tests if the directories exist because of mkspecs/features/qt_parts.prf.
 EXTRACT_AFTER_ARGS?=	${DISTNAME:S,$,/examples,:S,^,--exclude ,} \
 			${DISTNAME:S,$,/tests,:S,^,--exclude ,} \
 			--no-same-owner --no-same-permissions
 .  endif # ! ${_QT_VER:M5}
 
 # Build setup for Qt6
 .  if ${_QT_VER:M6}
 CMAKE_ARGS+=		-DCMAKE_INSTALL_PREFIX=${PREFIX} \
 			-DINSTALL_BINDIR=${PREFIX}/${QT_BINDIR_REL} \
 			-DINSTALL_PUBLICBINDIR=${PREFIX}/bin \
 			-DINSTALL_LIBDIR=${PREFIX}/${QT_LIBDIR_REL} \
 			-DINSTALL_LIBEXECDIR=${PREFIX}/${QT_LIBEXECDIR_REL} \
 			-DINSTALL_DOCDIR=${PREFIX}/${QT_DOCDIR_REL} \
 			-DINSTALL_ARCHDATADIR=${PREFIX}/${QT_ARCHDIR_REL} \
 			-DINSTALL_DATADIR=${PREFIX}/${QT_DATADIR_REL} \
 			-DINSTALL_INCLUDEDIR=${PREFIX}/${QT_INCDIR_REL} \
 			-DINSTALL_MKSPECSDIR=${PREFIX}/${QT_MKSPECDIR_REL} \
 			-DINSTALL_EXAMPLESDIR=${PREFIX}/${QT_EXAMPLEDIR_REL} \
 			-DINSTALL_DESCRIPTIONSDIR=${PREFIX}/${QT_DESCRIPTIONSDIR_REL} \
 			-DQT_QMAKE_TARGET_MKSPEC:String=freebsd-clang \
 			--log-level=TRACE
 .  endif
 
 # Build setup for Qt5
 .  if ${_QT_VER:M5}
 CONFIGURE_ENV+=		MAKE="${MAKE:T}"
 
 CONFIGURE_ARGS+=	-opensource -confirm-license \
 			-no-pch \
 			-prefix ${PREFIX} \
 			-bindir ${PREFIX}/${QT_BINDIR_REL} \
 			-headerdir ${PREFIX}/${QT_INCDIR_REL} \
 			-libdir ${PREFIX}/${QT_LIBDIR_REL} \
 			-plugindir ${PREFIX}/${QT_PLUGINDIR_REL} \
 			-importdir ${PREFIX}/${QT_IMPORTDIR_REL} \
 			-datadir ${PREFIX}/${QT_DATADIR_REL} \
 			-docdir ${PREFIX}/${QT_DOCDIR_REL} \
 			-translationdir ${PREFIX}/${QT_L10NDIR_REL} \
 			-sysconfdir ${PREFIX}/${QT_ETCDIR_REL} \
 			-nomake examples -nomake tests \
 			-platform ${QMAKESPECNAME} \
 			-archdatadir ${PREFIX}/${QT_ARCHDIR_REL} \
 			-libexecdir ${PREFIX}/${QT_LIBEXECDIR_REL} \
 			-qmldir ${PREFIX}/${QT_QMLDIR_REL} \
 			-examplesdir ${PREFIX}/${QT_EXAMPLEDIR_REL} \
 			-testsdir ${PREFIX}/${QT_TESTDIR_REL}
 
 .    if ${ARCH} == i386 && empty(MACHINE_CPU:Msse2)
 CONFIGURE_ARGS+=	-no-sse2
 .    endif
 
 # Work around a bug in current binutils, where the gold linker creates
 # duplicate symbols. See pr 218187. Disable the gold-linker for Qt5 ports.
 CONFIGURE_ARGS+=	-no-use-gold-linker
 # Pass -recheck-all so that multiple calls to the configure script really
 # re-run all checks.
 CONFIGURE_ARGS+=	-recheck-all
 .  endif # ${_QT_VER:M5}
 
 .  if defined(WANT_QT_DEBUG) || defined(WITH_DEBUG)
 WITH_DEBUG=		yes
 STRIP=			# It's done prior to bsd.qt.mk inclusion.
 CONFIGURE_ARGS+=	-debug -separate-debug-info
 # Override configuration in global qconfig.pri.
 QMAKE_ARGS+=		QT_CONFIG+="debug separate_debug_info" \
 			QT_CONFIG-="release"
 .  else
 CONFIGURE_ARGS+=	-release -no-separate-debug-info
 QMAKE_ARGS+=		QT_CONFIG+="release" \
 			QT_CONFIG-="debug separate_debug_info"
 .  endif # defined(WANT_QT_DEBUG) || defined(WITH_DEBUG)
 
 .  if defined(WANT_QT_VERBOSE_CONFIGURE)
 CONFIGURE_ARGS+=	-verbose
 .  endif
 
 .  if ${_QT_DIST} == "base"
 _EXTRA_PATCHES_QT5=	${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_create__cmake.prf \
 			${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_qt__module.prf \
 			${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_common_bsd_bsd.conf \
 			${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_freebsd-clang_qmake.conf
 .    if ${ARCH:Mmips*} || (${ARCH:Mpowerpc*} && !exists(/usr/bin/clang))
 _EXTRA_PATCHES_QT5+=	${PORTSDIR}/devel/${_QT_RELNAME}/files/extra-patch-mkspecs_common_g++-base.conf \
 			${PORTSDIR}/devel/${_QT_RELNAME}/files/extra-patch-mkspecs_common_gcc-base.conf \
 			${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_freebsd-g++_qmake.conf
 USE_GCC=		yes
 .    elif ${ARCH} == armv7 || ${ARCH} == powerpc
 _EXTRA_PATCHES_QT5+=	${PORTSDIR}/devel/${_QT_RELNAME}/files/extra-patch-mkspecs_common_g++-base.conf \
 			${PORTSDIR}/devel/${_QT_RELNAME}/files/extra-patch-mkspecs_common_gcc-base.conf \
 			${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_freebsd-g++_qmake.conf
 .    endif
 .    if ${_QT_VER:M5}
 EXTRA_PATCHES?=		${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-configure \
 			${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-sync.profiles \
 			${_EXTRA_PATCHES_QT5}
 .    endif # ${_QT_VER:M5}
 .  endif #  ${_QT_DIST} == "base"
 
 # Override settings installed in qconfig.h and *.pri files. The flags will be
 # installed along with the port, but have to be passed as arguments while
 # building the port itself. Flags prefixed with "-" (e.g., "-CUPS" and "-cups")
 # are needed to disable some features.
 .  if !defined(${QT_MODNAME}) || empty(${QT_MODNAME})
 # Used for both qconfig-*.h and qt_config_*.pri; it can't be empty.
 QT_MODNAME=		${PORTNAME}
 .  endif
 QT_DEFINES?=		# For qconfig.h flags (without "QT_" prefix).
 QT_CONFIG?=		# For *.pri files QT_CONFIG flags.
 .  if ${QT_DEFINES}
 QMAKE_ARGS+=		DEFINES+="${QT_DEFINES:O:u:C/^([^-])/QT_\1/:C/^-/QT_NO_/:O}"
 .  endif #  ${QT_DEFINES}
 PKGDEINSTALL=		${WRKDIR}/pkg-deinstall
 PKGINSTALL=		${WRKDIR}/pkg-install
 .  if ${QT_CONFIG:N-*}
 QMAKE_ARGS+=		QT_CONFIG+="${QT_CONFIG:N-*:O:u}"
 .  endif
 .  if ${QT_CONFIG:M-*}
 QMAKE_ARGS+=		QT_CONFIG-="${QT_CONFIG:M-*:O:u:C/^-//}"
 .  endif
 
 PLIST_SUB+=		SHORTVER=${_QT_VERSION:R} \
 			FULLVER=${_QT_VERSION:C/-.*//}
 .  if defined(WITH_DEBUG)
 PLIST_SUB+=		DEBUG="" \
 			NO_DEBUG="@comment "
 .  else
 PLIST_SUB+=		DEBUG="@comment " \
 			NO_DEBUG=""
 .  endif
 
 # Handle additional PLIST directories, which should only be used for Qt-dist ports.
 .  for dir in ETC
 # Export QT_ETCDIR.
 PLIST_SUB+=		QT_${dir}DIR="${QT_${dir}DIR_REL}"
 .  endfor
 
 .  if ${_QT_VER:M5}
 .    for dir in CMAKE
 # Export QT_CMAKEDIR.
 PLIST_SUB+=		QT_${dir}DIR="${QT_${dir}DIR_REL}"
 .    endfor
 .  endif
 
 .  if ${_QT_VER:M5}
 .    if ${_QT_DIST} == "base"
 # qtbase requires some tools to be symlinked to the build directory.
 _QT_TOOLS=		# empty
 .      if ${PORTNAME} != "qmake"
 _QT_TOOLS+=		${QMAKE}
 .      endif
 .      if ${PORTNAME} != "buildtools"
 _QT_TOOLS+=		${MOC} ${RCC}
 .      endif
 .      if ${PORTNAME} != "qdoc"
 _QT_TOOLS+=		qdoc
 .      endif
 .      if ${PORTNAME} != "dbus"
 _QT_TOOLS+=		qdbuscpp2xml qdbusxml2cpp
 .      endif
 .      if ${PORTNAME} != "widgets"
 _QT_TOOLS+=		${UIC}
 .      endif
 
 # The list of QtBase components that need to be linked into WRKSRC/lib for
 # other QtBase ports. See below.
 _QT5_BASE=		core dbus gui network sql widgets
 _QT5_ADDITIONAL_LINK?=	# Ensure definition
 
 .      if ${_QT_VER:M5}
 post-patch: gcc-post-patch
 gcc-post-patch:
 	${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/mkspecs/common/gcc-base.conf \
 		${WRKSRC}/mkspecs/freebsd-g++/qmake.conf
 	${REINPLACE_CMD} 's|%%GCC_DEFAULT%%|${GCC_DEFAULT}|g' \
 		${WRKSRC}/mkspecs/common/gcc-base.conf \
 		${WRKSRC}/mkspecs/common/g++-base.conf \
 		${WRKSRC}/mkspecs/common/bsd/bsd.conf \
 		${WRKSRC}/mkspecs/freebsd-g++/qmake.conf
 .      endif
 
 pre-configure: qtbase-pre-configure
 qtbase-pre-configure:
 .      for tool in ${_QT_TOOLS}
 	@${TEST} -e ${QT_BINDIR}/${tool:T} && \
 		${LN} -sf ${QT_BINDIR}/${tool:T} ${CONFIGURE_WRKSRC}/bin/${tool:T} || \
 		${TRUE}
 .      endfor
 
 # The following is a fix for the inplace upgrade problem we faced (see
 # QTBUG-40825 and ports bugs 194088, 195105 and 198720) previously,
 # which previously was adressed by making sure, that ${LOCALBASE}/lib, which
 # would often gets added by pkgconf for the dependencies, was passed after
 # ${WRKSRC}/lib.
 # * We fix the inplace upgrade problem by moving the Qt5 libraries into
 #   ${LOCALBASE}/lib/qt5. Therefore a -L${LOCALBASE}/lib does no harm anymore.
 # * However, this means, that the ports belonging to the split up QtBase package
 #   now no longer can find their depending QtBase libraries. We fix this by
 #   linking these into ${CONFIGURE_WRKSRC}/lib if the given QtBase port depends
 #   on them.
 .      if ${_QT_DIST:Mbase}
 .        for basedep in ${_QT5_BASE}
 .          if ! empty(USE_QT:M${basedep})
 	${LN} -sf ${QT_LIBDIR}/${${basedep}_LIB} ${CONFIGURE_WRKSRC}/lib
 .          endif
 .        endfor
 .      endif
 
 #
 # **** THIS PART IS OBSOLETE FOR THE NEXT QT UPGRADE ****
 #
 # Add ${LOCALBASE}/lib to DEFAULT_LIBDIRS, which we use to filter out
 # certain paths from pkg-config calls (see the explanation in
 # devel/qt5/files/patch-configure) as well as for setting
 # QMAKE_DEFAULT_LIBDIR in mkspecs/qconfig.pri. Part of the solution for
 # ports/194088.
 post-patch: qtbase-post-patch
 qtbase-post-patch:
 	${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/mkspecs/common/bsd/bsd.conf \
 		${WRKSRC}/mkspecs/freebsd-clang/qmake.conf
 
 .      if ${PORTNAME} != "qmake"
 _QMAKE=			${CONFIGURE_WRKSRC}/bin/qmake
 .      endif
 .    endif
 
 
 pre-configure: qt5-pre-configure
 qt5-pre-configure:
 # Qt 5.3.2 introduced a check in mkspecs/features/create_cmake.prf that
 # requires tests/auto/cmake to be present, otherwise the configure stage will
 # fail.
 # Since we cannot extract tests/auto/cmake/ and exclude tests/ at the same
 # time, we have to disable the check in a cache file (the only way to get this
 # value through to the configure script in qtbase).
 	${MKDIR} ${CONFIGURE_WRKSRC}
 	${ECHO_CMD} 'CMAKE_MODULE_TESTS = -' > ${CONFIGURE_WRKSRC}/.qmake.cache
 
 	# configure will run syncqt.pl if it finds a .git entry in the working directory
 	touch ${WRKSRC}/.git
 	# As the patch collection was created after a version bump, all module verisions
 	# are tagged as 5.15.3
 	touch ${WRKSRC}/.qmake.conf # easier than to -f before the sed
 	${REINPLACE_CMD} -e '/MODULE_VERSION/s|5\.15\.\([0-9]*\)|${_QT_VERSION}|g' \
 		${WRKSRC}/.qmake.conf
 
 # **** THIS PART IS OBSOLETE FOR THE NEXT QT UPGRADE ****
 #
 # We piggyback on QMAKE_LIBDIR_FLAGS to make sure -L${WRKSRC}/lib is passed to
 # the linker before -L/usr/local/lib. By default, the opposite happens, which
 # is a problem when a Qt port is being upgraded, since an existing library
 # would end up being picked up instead of those built in ${WRKSRC}/lib. Since
 # qmake appends the value of QMAKE_LIBDIR to QMAKE_LIBDIR_FLAGS, we can use the
 # latter to get the linker path order right. qmake is smart enough to strip
 # occurrences of ${WRKSRC}/lib from .pc and .prl files when installing them.
 # See QTBUG-40825 and ports bugs 194088, 195105 and 198720.
 	${ECHO_CMD} 'QMAKE_LIBDIR_FLAGS = -L${CONFIGURE_WRKSRC}/lib' >> ${CONFIGURE_WRKSRC}/.qmake.cache
 	${ECHO_CMD} 'QMAKE_DEFAULT_LIBDIRS += ${LOCALBASE}/lib /usr/lib /lib' >> ${CONFIGURE_WRKSRC}/.qmake.cache
 	${ECHO_CMD} 'QMAKE_DEFAULT_INCDIRS += ${LOCALBASE}/include /usr/include' >> ${CONFIGURE_WRKSRC}/.qmake.cache
 
 # Allow linking of further libraries to the configure directory.
 .    if !empty(_QT5_ADDITIONAL_LINK)
 .      for dep in ${_QT5_ADDITIONAL_LINK}
 	${MKDIR} ${CONFIGURE_WRKSRC}/lib
 .        if ! empty(USE_QT:M${dep})
 	${LN} -sf ${QT_LIBDIR}/${qt-${dep}_LIB} ${CONFIGURE_WRKSRC}/lib
 .        endif
 .      endfor
 .    endif
 
 .    if ${QT_DEFINES:N-*}
 # There **are** defines, so we need to **add** this port to the
 # qconfig-modules.h header; make @need_add empty and comment out
 # the @need_remove lines in the script (see below in qt-post-install).
 # If there are no defines, do it the other way around.
 _sub_need_add=
 _sub_need_remove=	\#\#
 .    else
 _sub_need_add=		\#\#
 _sub_need_remove=
 .    endif
 # If a port installs Qt version-specific binaries (e.g. "designer" which
 # existed as a Qt4 application and exists as a Qt5 application and will
 # probably be a Qt6 application) the port should set `QT_BINARIES=yes`.
 .    if defined(QT_BINARIES)
 _sub_need_bin=
 .    else
 _sub_need_bin=		\#\#
 .    endif
 .    if ${QT_MODNAME} == core
 # QtCore (e.g. devel/qt5-core) is the one that starts the header,
 # and is also the one that can clean it up when deinstalled.
 _sub_need_clean=
 .    else
 _sub_need_clean=	\#\#
 .    endif
 # The Qt modules have an install- and deinstall-step for wrangling
 # the qconfig-modules.h header, but qmake does not.
 .    if ${PORTNAME} != "qmake"
 post-install: qt-post-install
 .    endif # PORTNAME != qmake
 qt-post-install:
 # We can't use SUB_FILES with the shared pkg-change.in.
 # We need it to be a script instead of a group of @unexecs.
 # Do two steps of processing -- introducing the Qt variables,
 # and replacing the @tags with comment (or nothing) characters
 # according to the port's settings -- in one sed and write
 # to pkg-change.tmp. Then split it up and minify for the
 # install and deinstall step.
 	@${SED} -e 's,%%QT_MODNAME%%,${QT_MODNAME},g' \
 		-e 's,%%QT_INCDIR%%,${QT_INCDIR},g' \
 		-e 's,@need_add,${_sub_need_add},' \
 		-e 's,@need_remove,${_sub_need_remove},' \
 		-e 's,@need_clean,${_sub_need_clean},' \
 		-e 's,@need_bin,${_sub_need_bin},' \
 		${PORTSDIR}/devel/${_QT_RELNAME}/${FILESDIR:T}/pkg-change.in > \
 		${WRKDIR}/pkg-change.tmp
 	@${SED} -e 's,@install,,' -e 's,@deinstall,##,' ${WRKDIR}/pkg-change.tmp | ${SED} -e '/##/d' > ${PKGINSTALL}
 	@${SED} -e 's,@install,##,' -e 's,@deinstall,,' ${WRKDIR}/pkg-change.tmp | ${SED} -e '/##/d' > ${PKGDEINSTALL}
 	# Drop all leading spaces in the script, to minify
 	@${REINPLACE_CMD} 's/^  *//' ${PKGINSTALL} ${PKGDEINSTALL}
 .    if ${QT_DEFINES:N-*}
 	@${MKDIR} ${STAGEDIR}${QT_INCDIR}/QtCore/modules
 	@${ECHO_CMD} -n \
 		> ${STAGEDIR}${QT_INCDIR}/QtCore/modules/qconfig-${QT_MODNAME}.h
 .      for def in ${QT_DEFINES:N-*:O:u:C/=.*$//}
 	@${ECHO_CMD} "#if !defined(QT_${def}) && !defined(QT_NO_${def})" \
 		>> ${STAGEDIR}${QT_INCDIR}/QtCore/modules/qconfig-${QT_MODNAME}.h
 	${ECHO_CMD} "# define QT_${def}" \
 		>> ${STAGEDIR}${QT_INCDIR}/QtCore/modules/qconfig-${QT_MODNAME}.h
 	@${ECHO_CMD} "#endif" \
 		>> ${STAGEDIR}${QT_INCDIR}/QtCore/modules/qconfig-${QT_MODNAME}.h
 	@${ECHO_CMD} \
 		>> ${STAGEDIR}${QT_INCDIR}/QtCore/modules/qconfig-${QT_MODNAME}.h
 .      endfor
 	@${ECHO_CMD} "${PREFIX}/${QT_INCDIR_REL}/QtCore/modules/qconfig-${QT_MODNAME}.h" \
 		>> ${TMPPLIST}
 .    endif # ${QT_DEFINES:N-*}
 .    if ${QT_CONFIG:N-*}
 	@${MKDIR} ${STAGEDIR}${QT_MKSPECDIR}/modules
 	${ECHO_CMD} "QT_CONFIG += ${QT_CONFIG:N-*:O:u}" \
 		> ${STAGEDIR}${QT_MKSPECDIR}/modules/qt_config_${QT_MODNAME}.pri
 	@${ECHO_CMD} "${PREFIX}/${QT_MKSPECDIR_REL}/modules/qt_config_${QT_MODNAME}.pri" \
 		>> ${TMPPLIST}
 .    endif # ${QT_CONFIG:N-*}
 .  endif # M5
 
 .  if ${_QT_VER:M6}
 post-stage:	qt6-post-stage
 # Clean-up of empty directories, as we install
 # * cmake to ${LOCALBASE}/lib/cmake not ${QT_LIBDIR}/cmake.
 # * pkgconfig to ${LOCALBASE}/libexec/pkgconfig not ${QT_LIBDIR}/pkgconfig
 qt6-post-stage:
 	${RM} -r ${STAGEDIR}${QT_LIBDIR}/cmake
 	${RM} -r ${STAGEDIR}${QT_LIBDIR}/pkgconfig
 .  endif
 
 qt-create-kde-distfile:
 	${MKDIR} ${DISTDIR}/${DIST_SUBDIR}
 	${SH} ${PORTSDIR}/devel/${_QT_RELNAME}/files/create_kde-qt_release.sh \
 		${_QT_DIST} \
 		${DISTDIR}/${DIST_SUBDIR} \
 		${_KDE_${_QT_DIST}_VERSION} \
 		${_KDE_${_QT_DIST}_ORIGIN_TAG} \
 		${_KDE_${_QT_DIST}_BRANCH}
 
 .endif # defined(_QT_DIST_MK_INCLUDED)
diff --git a/devel/qt5-script/Makefile b/devel/qt5-script/Makefile
index cd8e2cddefbc..8454e5172ae0 100644
--- a/devel/qt5-script/Makefile
+++ b/devel/qt5-script/Makefile
@@ -1,29 +1,28 @@
 PORTNAME=	script
 PORTVERSION=	${QT5_VERSION}${QT5_KDE_PATCH}
-PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt5-
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt 4-compatible scripting module
 
 USES=		compiler:c++11-lang perl5 qmake qt-dist:5,script
 USE_PERL5=	extract
 USE_QT=		core buildtools:build
 # Keep make(1) from descending into src/script/obj/ (qmake:outsource
 # doesn't work).
 MAKE_ENV=	MAKEOBJDIR=.
 
 # Source version from qt-dist.mk
 QT5_VERSION=	${_KDE_script_VERSION}
 
 post-patch:
 	@${REINPLACE_CMD} -e '/scripttools/ d' \
 		${WRKSRC}/src/src.pro
 
 # Fix version mismatches for CMake
 post-configure:
 	@${REINPLACE_CMD} -e '/${QT5_VERSION} $${_Qt5Script_FIND_VERSION_EXACT}/s|${QT5_VERSION}|'"$$(${MAKE} -C ../qt5-core -VQT5_VERSION)"'|' \
 		${WRKSRC}/lib/cmake/Qt5Script/Qt5ScriptConfig.cmake
 
 .include <bsd.port.mk>
diff --git a/devel/qt5-script/distinfo b/devel/qt5-script/distinfo
index 37bd4374993d..a0dd1440aa8c 100644
--- a/devel/qt5-script/distinfo
+++ b/devel/qt5-script/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1716917189
-SHA256 (KDE/Qt/5.15.17/kde-qtscript-5.15.17p0.tar.xz) = ad1f5d9e74833e96144791304b604924f92cd9486bb05c2243d477524366beeb
-SIZE (KDE/Qt/5.15.17/kde-qtscript-5.15.17p0.tar.xz) = 2623608
+TIMESTAMP = 1730320824
+SHA256 (KDE/Qt/5.15.18/kde-qtscript-5.15.18p0.tar.xz) = 55be08fe19a558cb32ecb459bb06048a016df78921b68cf632b021af555b1da2
+SIZE (KDE/Qt/5.15.18/kde-qtscript-5.15.18p0.tar.xz) = 2633000
diff --git a/www/qt5-webengine/Makefile b/www/qt5-webengine/Makefile
index 9b1dbab6880c..fd800a850d77 100644
--- a/www/qt5-webengine/Makefile
+++ b/www/qt5-webengine/Makefile
@@ -1,173 +1,172 @@
 # QtWebEngine itself is a very thin layer of Qt code on top of a large part of
 # Chromium (everything up to the content/ layer). As such, most of the work in
 # this port revolves around taming Chromium and getting it to build on FreeBSD.
 # While it does build at the moment, there are several items that should be
 # investigated or improved:
 # - We are using several stub files, especially in Chromium's base/ and net/
 #   layers. We should look at implementing the missing bits instead.
 # - We are currently not using any sandboxing mechanism.
 # - We need to see if more "use_system_<FOO>" flags can be passed.
 # - The process of porting QtWebEngine needs to be documented so we can move to
 #   newer releases more easily.
 #
 # Also note that, due to the insane amount of patches this port needs, it tends
 # to lag behind the rest of the official Qt5 ones, which is why we set
 # QT5_VERSION and DISTINFO_FILE here.
 
 # In order to successfully build this port in poudriere you need to add
 # MAX_FILES_qt5_webengine=4096 to /usr/local/etc/poudriere.conf
 
 PORTNAME=	webengine
-DISTVERSION=	${QT5_VERSION}${QT5_KDE_PATCH}
-PORTREVISION=	1
+PORTVERSION=	${QT5_VERSION}${QT5_KDE_PATCH}
 CATEGORIES=	www
 PKGNAMEPREFIX=	qt5-
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt 5 library to render web content
 
 BUILD_DEPENDS=	bison:devel/bison \
 		${LOCALBASE}/include/linux/input.h:devel/evdev-proto \
 		${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \
 		${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib@${PY_FLAVOR}
 LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
 		libdbus-1.so:devel/dbus \
 		libdouble-conversion.so:devel/double-conversion \
 		libevent.so:devel/libevent \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libharfbuzz.so:print/harfbuzz \
 		libjsoncpp.so:devel/jsoncpp \
 		liblcms2.so:graphics/lcms2 \
 		libnspr4.so:devel/nspr \
 		libnss3.so:security/nss \
 		libopenh264.so:multimedia/openh264 \
 		libopus.so:audio/opus \
 		libpci.so:devel/libpci \
 		libpng.so:graphics/png \
 		libre2.so:devel/re2 \
 		libsnappy.so:archivers/snappy \
 		libvpx.so:multimedia/libvpx \
 		libwebp.so:graphics/webp
 
 DISTINFO_FILE=	${.CURDIR}/distinfo
 QT5_VERSION=	${_KDE_webengine_VERSION}
 
 OPTIONS_SINGLE=		AUDIO
 OPTIONS_SINGLE_AUDIO=	ALSA PULSEAUDIO SNDIO
 OPTIONS_DEFAULT=	ALSA
 
 AUDIO_DESC=		Audio backend
 
 # Need the alsa plugins to get sound at runtime, otherwise messages
 # that the pcm_oss plugin can't be opened.
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_RUN_DEPENDS=	alsa-plugins>=0:audio/alsa-plugins
 ALSA_VARS=		QMAKE_CONFIGURE_ARGS+=-alsa
 ALSA_VARS_OFF=		QMAKE_CONFIGURE_ARGS+=-no-alsa
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_VARS=	QMAKE_CONFIGURE_ARGS+=-pulseaudio
 PULSEAUDIO_VARS_OFF=	QMAKE_CONFIGURE_ARGS+=-no-pulseaudio
 SNDIO_LIB_DEPENDS=	libsndio.so:audio/sndio
 SNDIO_VARS=		QMAKE_CONFIGURE_ARGS+=-sndio
 SNDIO_VARS_OFF=		QMAKE_CONFIGURE_ARGS+=-no-sndio
 
 # We pass `norecursive' to USES=qmake because src/plugins/plugins.pro checks
 # whether webenginewidgets is available, which fails when qmake processes all
 # .pro files at once.
 USES=		gl gnome gperf jpeg minizip ninja:build nodejs:build,lts \
 		perl5 pkgconfig python:build qmake:norecursive,outsource \
 		qt-dist:5,webengine shebangfix xorg
 USE_GL=		gl
 USE_GNOME=	glib20 libxml2 libxslt
 USE_PERL5=	build
 USE_QT=		core declarative gui location network printsupport \
 		webchannel widgets \
 		buildtools:build designer:build qmake:build
 USE_XORG=	x11 xcb xcomposite xcursor xdamage xext xfixes xi xkbfile \
 		xorgproto xrandr xrender xscrnsaver xtst
 
 QMAKE_CONFIGURE_ARGS=	-proprietary-codecs -system-ffmpeg
 
 # We could just set it to an empty string as well. "all" does not account for
 # dependencies correctly in the generated Makefiles, use the right target here.
 ALL_TARGET=	first
 
 # We need ar(1) from ports because the Chromium code uses the @file syntax.
 # We then need to ensure ld(1) from ports is used because of the archives ar(1)
 # generated.
 USE_BINUTILS=	yes
 CC+=		"-B${LOCALBASE}/bin"
 CXX+=		"-B${LOCALBASE}/bin"
 
 # The build system reads the environment variable $NINJA_PATH to decide whether
 # to boostrap ninja or not (and also to invoke it afterwards). CC and CXX are
 # read by some Chromium code to determine which compiler to invoke when running
 # some configuration tests.
 # Since we use USES=qmake:norecursive, we also need to pass some variables to
 # MAKE_ENV because part of the configuration process happens during the build.
 CONFIGURE_ENV+=	NINJAFLAGS="-j${MAKE_JOBS_NUMBER}" \
 		NINJA_PATH="${LOCALBASE}/bin/ninja"  \
 		PATH=${CONFIGURE_WRKSRC}/bin:${LOCALBASE}/bin:${PATH}
 MAKE_ENV+=	CC="${CC}" CXX="${CXX}"			\
 		C_INCLUDE_PATH=${LOCALBASE}/include	\
 		CPLUS_INCLUDE_PATH=${LOCALBASE}/include	\
 		${CONFIGURE_ENV}
 
 QT_BINARIES=	yes
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH:Mmips*} || ${ARCH:Mpowerpc*}
 PLIST_SUB+=	BE="" LE="@comment "
 .else
 PLIST_SUB+=	BE="@comment " LE=""
 .endif
 
 post-extract:
 # Install FreeBSD's freebsd.pri file.
 	${CP} ${FILESDIR}/freebsd.pri ${WRKSRC}/src/buildtools/config/freebsd.pri
 
 post-extract-SNDIO-on:
 	@cd ${WRKSRC}/src/3rdparty/chromium/media/audio && ${MKDIR} sndio openbsd
 	@${CP} ${FILESDIR}/sndio_*put.* \
 		${WRKSRC}/src/3rdparty/chromium/media/audio/sndio
 	@${CP} ${FILESDIR}/audio_manager_openbsd.* \
 		${WRKSRC}/src/3rdparty/chromium/media/audio/openbsd
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 		${WRKSRC}/src/3rdparty/chromium/base/linux_util.cc \
 		${WRKSRC}/src/3rdparty/chromium/base/test/BUILD.gn \
 		${WRKSRC}/src/3rdparty/chromium/build/toolchain/gcc_toolchain.gni \
 		${WRKSRC}/src/3rdparty/chromium/chrome/common/chrome_paths.cc \
 		${WRKSRC}/src/3rdparty/chromium/third_party/pdfium/core/fxge/fx_ge_linux.cpp \
 		${WRKSRC}/src/3rdparty/gn/build/gen.py
 	@${REINPLACE_CMD} -E -e 's|^(MODULE_VERSION = ).*|\1${QT5_VERSION}|' \
 		${WRKSRC}/.qmake.conf
 
 .if ${ARCH:Mmips*} || ${ARCH:Mpowerpc*}
 	@${REINPLACE_CMD} -e 's/icudtl.dat/icudtb.dat/' \
 		${WRKSRC}/src/core/core_module.pro
 .endif
 
 pre-configure:
 # Link in ${PYTHON_CMD} to ${CONFIGURE_WRKSRC}/bin -- the scripts hardcode 'python'
 # in too many places to reasonably patch. So just link in ${PYTHON_CMD} to work around
 # $LOCALBASE/bin/python being python3 if the default versions is set to 3.x.
 	${MKDIR} ${CONFIGURE_WRKSRC}/bin && ${LN} -s ${PYTHON_CMD} ${CONFIGURE_WRKSRC}/bin/python
 # Unbundle a few dependencies.
 	cd ${WRKSRC}/src/3rdparty/chromium && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \
 		./build/linux/unbundle/replace_gn_files.py --system-libraries\
 		fontconfig freetype harfbuzz-ng libdrm libevent libpng libwebp libxml libxslt openh264 opus || ${FALSE}
 # Rerun syncqt.pl -- otherwise the resulting package misses some forwarding headers.
 	cd ${WRKSRC} && ${QT_BINDIR}/syncqt.pl -version ${QT5_VERSION}
 
 post-build:
 # Fix version mismatches for CMake
 .for module in Pdf PdfWidgets WebEngine WebEngineCore WebEngineWidgets
 	@${REINPLACE_CMD} -e '/${QT5_VERSION} $${_Qt5${module}_FIND_VERSION_EXACT}/s|${QT5_VERSION}|'"$$(${MAKE} -C ../../devel/qt5-core -VQT5_VERSION)"'|' \
 		${BUILD_WRKSRC}/lib/cmake/Qt5${module}/Qt5${module}Config.cmake
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/www/qt5-webengine/distinfo b/www/qt5-webengine/distinfo
index 2f0150c4e664..51934ea0ca84 100644
--- a/www/qt5-webengine/distinfo
+++ b/www/qt5-webengine/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1725471562
-SHA256 (KDE/Qt/5.15.17/kde-qtwebengine-5.15.17p3.tar.xz) = d7ee8163451b849cf5c571719a5b6028d6c2716b8caa7ff78517f097da1ccdfe
-SIZE (KDE/Qt/5.15.17/kde-qtwebengine-5.15.17p3.tar.xz) = 320971432
+TIMESTAMP = 1730320893
+SHA256 (KDE/Qt/5.15.18/kde-qtwebengine-5.15.18p2.tar.xz) = 273b2d078145d36b1ff2d9d3ab5f9689ca40ac5285bab4ce35d1c7a14bbeeebd
+SIZE (KDE/Qt/5.15.18/kde-qtwebengine-5.15.18p2.tar.xz) = 320954788