git: 66b0e0515e2a - main - Qt: Update Qt6 to 6.5.2

From: Jason E. Hale <jhale_at_FreeBSD.org>
Date: Thu, 27 Jul 2023 23:25:01 UTC
The branch main has been updated by jhale:

URL: https://cgit.FreeBSD.org/ports/commit/?id=66b0e0515e2a1a737daf42f4a218d9ad715734ea

commit 66b0e0515e2a1a737daf42f4a218d9ad715734ea
Author:     Jason E. Hale <jhale@FreeBSD.org>
AuthorDate: 2023-07-27 11:24:46 +0000
Commit:     Jason E. Hale <jhale@FreeBSD.org>
CommitDate: 2023-07-27 22:10:42 +0000

    Qt: Update Qt6 to 6.5.2
    
    As a patch release, Qt 6.5.2 does not introduce any new features but
    contains about 290 bug fixes, security updates, and other improvements
    to the top of the Qt 6.5.1 release. See more information about the most
    important changes and bug fixes from Qt 6.5.2 release note.
    
    Announcement:   https://www.qt.io/blog/qt-6.5.2-released-1
    Release note:   https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.5.2/release-note.md
---
 Mk/Uses/qt-dist.mk                                 |   11 +-
 Mk/Uses/qt.mk                                      |   22 +-
 accessibility/qt6-speech/Makefile                  |    1 -
 accessibility/qt6-speech/distinfo                  |    6 +-
 comms/qt6-sensors/distinfo                         |    6 +-
 comms/qt6-sensors/pkg-plist                        |    7 -
 comms/qt6-serialbus/distinfo                       |    6 +-
 comms/qt6-serialport/distinfo                      |    6 +-
 databases/qt6-base_sqldriver/distinfo              |    6 +-
 devel/Makefile                                     |    1 +
 devel/pyside6-tools/Makefile                       |   54 +-
 devel/pyside6-tools/distinfo                       |    6 +-
 devel/pyside6-tools/pkg-plist                      |  137 +-
 devel/pyside6/Makefile                             |   39 +-
 devel/pyside6/distinfo                             |    6 +-
 devel/pyside6/pkg-plist                            |  136 +-
 devel/qt6-5compat/Makefile                         |    1 -
 devel/qt6-5compat/distinfo                         |    6 +-
 devel/qt6-base/Makefile                            |    1 -
 devel/qt6-base/distinfo                            |   10 +-
 devel/qt6-languageserver/distinfo                  |    6 +-
 devel/qt6-location/Makefile                        |   17 +
 devel/qt6-location/distinfo                        |    3 +
 devel/qt6-location/pkg-descr                       |   10 +
 devel/qt6-location/pkg-plist                       |  216 +++
 devel/qt6-positioning/distinfo                     |    6 +-
 devel/qt6-remoteobjects/distinfo                   |    6 +-
 devel/qt6-scxml/distinfo                           |    6 +-
 devel/qt6-tools/Makefile                           |    1 -
 devel/qt6-tools/distinfo                           |    6 +-
 devel/qt6-translations/distinfo                    |    6 +-
 devel/qt6/Makefile                                 |    1 -
 devel/shiboken6/Makefile                           |   52 +-
 devel/shiboken6/distinfo                           |    6 +-
 devel/shiboken6/files/patch-doc_CMakeLists.txt     |    9 -
 devel/shiboken6/pkg-plist                          |    7 +
 graphics/Makefile                                  |    1 +
 graphics/qt6-3d/Makefile                           |   32 +-
 graphics/qt6-3d/distinfo                           |    6 +-
 graphics/qt6-3d/pkg-plist                          |    7 +-
 graphics/qt6-imageformats/Makefile                 |    1 -
 graphics/qt6-imageformats/distinfo                 |    6 +-
 graphics/qt6-lottie/distinfo                       |    6 +-
 graphics/qt6-quickeffectmaker/Makefile             |   17 +
 graphics/qt6-quickeffectmaker/distinfo             |    3 +
 graphics/qt6-quickeffectmaker/pkg-descr            |    2 +
 graphics/qt6-quickeffectmaker/pkg-plist            |  101 ++
 graphics/qt6-svg/Makefile                          |    1 -
 graphics/qt6-svg/distinfo                          |    6 +-
 graphics/qt6-wayland/Makefile                      |    1 -
 graphics/qt6-wayland/distinfo                      |    6 +-
 misc/qt6-doc/Makefile                              |    1 -
 misc/qt6-doc/distinfo                              |    6 +-
 misc/qt6-doc/pkg-plist                             |    2 -
 misc/qt6-examples/distinfo                         |    6 +-
 misc/qt6-examples/pkg-plist                        | 1519 ++++++++++++--------
 multimedia/qt6-multimedia/Makefile                 |    1 -
 multimedia/qt6-multimedia/distinfo                 |    6 +-
 net/qt6-networkauth/Makefile                       |    1 -
 net/qt6-networkauth/distinfo                       |    6 +-
 www/Makefile                                       |    1 +
 www/qt6-httpserver/Makefile                        |   15 +
 www/qt6-httpserver/distinfo                        |    3 +
 www/qt6-httpserver/pkg-descr                       |    3 +
 www/qt6-httpserver/pkg-plist                       |   52 +
 www/qt6-webchannel/distinfo                        |    6 +-
 www/qt6-webengine/Makefile                         |    5 +-
 www/qt6-webengine/distinfo                         |    6 +-
 www/qt6-webengine/files/patch-CMakeLists.txt       |    4 +-
 .../files/patch-cmake_Functions.cmake              |   26 +-
 www/qt6-webengine/files/patch-configure.cmake      |   16 +-
 ...c_3rdparty_chromium_build_config_BUILDCONFIG.gn |    8 +-
 ...rty_chromium_build_toolchain_gcc__toolchain.gni |    4 +-
 ...rty_chromium_components_crash_core_app_BUILD.gn |    4 +-
 ...-src_3rdparty_chromium_content_browser_BUILD.gn |    4 +-
 ...mium_content_public_common_content__features.cc |    8 +-
 ...omium_content_public_common_content__features.h |    4 +-
 ..._3rdparty_chromium_gpu_ipc_service_gpu__init.cc |   38 +-
 .../patch-src_3rdparty_chromium_ipc_ipc__channel.h |    4 +-
 ...src_3rdparty_chromium_ipc_ipc__message__utils.h |    4 +-
 ...rc_3rdparty_chromium_media_base_video__frame.cc |   12 +-
 .../patch-src_3rdparty_chromium_mojo_core_BUILD.gn |    4 +-
 ...atch-src_3rdparty_chromium_mojo_core_channel.cc |    4 +-
 ...3rdparty_chromium_mojo_core_embedder_features.h |    4 +-
 ...rdparty_chromium_mojo_public_c_system_thunks.cc |   10 +-
 ...y_chromium_mojo_public_tools_bindings_mojom.gni |    4 +-
 ...third__party_angle_src_libANGLE_formatutils.cpp |    4 +-
 ...d__party_skia_src_opts_SkRasterPipeline__opts.h |    6 +-
 .../patch-src_3rdparty_chromium_tools_licenses.py  |   11 +
 .../patch-src_3rdparty_chromium_ui_gl_BUILD.gn     |    4 +-
 .../patch-src_3rdparty_chromium_v8_src_api_api.cc  |    4 +-
 .../files/patch-src_core_CMakeLists.txt            |   12 +-
 .../files/patch-src_core_api_configure.cmake       |    8 +-
 .../files/patch-src_core_api_qt__cmdline.cmake     |    4 +-
 .../files/patch-src_core_configure.json            |   56 -
 .../files/patch-src_pdf_CMakeLists.txt             |   10 +-
 www/qt6-websockets/distinfo                        |    6 +-
 x11-toolkits/qt6-charts/distinfo                   |    6 +-
 x11-toolkits/qt6-datavis3d/distinfo                |    6 +-
 x11-toolkits/qt6-declarative/Makefile              |    1 -
 x11-toolkits/qt6-declarative/distinfo              |    6 +-
 x11-toolkits/qt6-quick3d/Makefile                  |    1 -
 x11-toolkits/qt6-quick3d/distinfo                  |    6 +-
 x11-toolkits/qt6-quicktimeline/Makefile            |    1 -
 x11-toolkits/qt6-quicktimeline/distinfo            |    6 +-
 x11-toolkits/qt6-shadertools/Makefile              |    1 -
 x11-toolkits/qt6-shadertools/distinfo              |    6 +-
 x11-toolkits/qt6-virtualkeyboard/distinfo          |    6 +-
 108 files changed, 1918 insertions(+), 1076 deletions(-)

diff --git a/Mk/Uses/qt-dist.mk b/Mk/Uses/qt-dist.mk
index b000cd2b038b..b55254b30447 100644
--- a/Mk/Uses/qt-dist.mk
+++ b/Mk/Uses/qt-dist.mk
@@ -21,14 +21,15 @@ qmake_ARGS?=	# empty
 .include "${USESDIR}/qmake.mk"
 
 # Supported distribution arguments
-_COMMON_DISTS=		3d base charts datavis3d declarative imageformats multimedia \
+_COMMON_DISTS=		3d base charts datavis3d declarative imageformats location multimedia \
 			networkauth quick3d quicktimeline remoteobjects scxml sensors \
 			serialbus serialport speech svg tools translations virtualkeyboard \
 			wayland webchannel webengine websockets
-_QT5_DISTS=		connectivity gamepad graphicaleffects location quickcontrols \
+_QT5_DISTS=		connectivity gamepad graphicaleffects quickcontrols \
 			quickcontrols2 script webglplugin webview \
 			x11extras xmlpatterns
-_QT6_DISTS=		5compat doc languageserver lottie positioning shadertools
+_QT6_DISTS=		5compat doc httpserver languageserver lottie positioning \
+			quickeffectmaker shadertools
 
 _QT_DISTS=		${_COMMON_DISTS} \
 			${_QT${_QT_VER}_DISTS}
@@ -459,9 +460,9 @@ _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"
+.    if ${PORTNAME} != "qmake"
 post-install: qt-post-install
-.  endif # PORTNAME != qmake
+.    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.
diff --git a/Mk/Uses/qt.mk b/Mk/Uses/qt.mk
index 438180abb8fc..517373b04dc0 100644
--- a/Mk/Uses/qt.mk
+++ b/Mk/Uses/qt.mk
@@ -23,8 +23,8 @@ _QT_MK_INCLUDED=	qt.mk
 # Qt versions currently supported by the framework.
 _QT_SUPPORTED?=		5 6
 QT5_VERSION?=		5.15.8
-QT6_VERSION?=		6.5.1
-PYSIDE6_VERSION?=	${QT6_VERSION}.1
+QT6_VERSION?=		6.5.2
+PYSIDE6_VERSION?=	${QT6_VERSION}
 
 # 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)
@@ -131,17 +131,17 @@ _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_COMMON=		3d charts datavis3d declarative doc examples imageformats \
+_USE_QT_COMMON=		3d charts datavis3d declarative doc examples imageformats location \
 			multimedia networkauth quick3d quicktimeline remoteobjects scxml \
-			sensors serialbus serialport svg virtualkeyboard wayland \
+			sensors serialbus serialport speech svg virtualkeyboard wayland \
 			webchannel webengine websockets
 
 _USE_QT5_ONLY=		assistant buildtools concurrent connectivity core dbus \
 			declarative-test designer diag gamepad \
-			graphicaleffects gui help l10n linguist linguisttools location \
+			graphicaleffects gui help l10n linguist linguisttools \
 			network opengl paths phonon4 pixeltool plugininfo printsupport \
 			qdbus qdbusviewer qdoc qdoc-data qev qmake quickcontrols \
-			quickcontrols2 script scripttools speech sql sql-mysql sql-odbc \
+			quickcontrols2 script scripttools sql sql-mysql sql-odbc \
 			sql-pgsql sql-sqlite2 sql-sqlite3 sql-tds testlib uiplugin \
 			uitools webglplugin webkit websockets-qml webview \
 			widgets x11extras xml xmlpatterns
@@ -149,8 +149,8 @@ _USE_QT5_ONLY=		assistant buildtools concurrent connectivity core dbus \
 _USE_QT5_ONLY+=		sql-ibase
 .  endif
 
-_USE_QT6_ONLY=		5compat base languageserver lottie positioning shadertools \
-			tools translations \
+_USE_QT6_ONLY=		5compat base httpserver languageserver lottie positioning \
+			quickeffectmaker shadertools tools translations \
 			sqldriver-sqlite sqldriver-mysql sqldriver-psql sqldriver-odbc
 
 # Dependency tuples: _LIB should be preferred if possible.
@@ -218,6 +218,9 @@ qt-gui_LIB=		libQt${_QT_LIBVER}Gui.so
 qt-help_PORT=		devel/${_QT_RELNAME}-help
 qt-help_LIB=		libQt${_QT_LIBVER}Help.so
 
+qt-httpserver_PORT=	www/${_QT_RELNAME}-httpserver
+qt-httpserver_LIB=	libQt${_QT_LIBVER}HttpServer.so
+
 qt-imageformats_PORT=	graphics/${_QT_RELNAME}-imageformats
 qt-imageformats_PATH=	${LOCALBASE}/${QT_PLUGINDIR_REL}/imageformats/libqtiff.so
 
@@ -297,6 +300,9 @@ qt-quickcontrols_PATH=	${LOCALBASE}/${QT_QMLDIR_REL}/QtQuick/Controls/qmldir
 qt-quickcontrols2_PORT=	x11-toolkits/${_QT_RELNAME}-quickcontrols2
 qt-quickcontrols2_LIB=	libQt${_QT_LIBVER}QuickControls2.so
 
+qt-quickeffectmaker_PORT=	graphics/${_QT_RELNAME}-quickeffectmaker
+qt-quickeffectmaker_PATH=	${LOCALBASE}/${QT_BINDIR_REL}/qqem
+
 qt-quicktimeline_PORT=	x11-toolkits/${_QT_RELNAME}-quicktimeline
 qt-quicktimeline_PATH=	${LOCALBASE}/${QT_QMLDIR_REL}/QtQuick/Timeline/libqtquicktimelineplugin.so
 
diff --git a/accessibility/qt6-speech/Makefile b/accessibility/qt6-speech/Makefile
index a32698900a05..8b7b629f9a13 100644
--- a/accessibility/qt6-speech/Makefile
+++ b/accessibility/qt6-speech/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	speech
 PORTVERSION=	${QT6_VERSION}
-PORTREVISION=	1
 CATEGORIES=	accessibility
 PKGNAMEPREFIX=	qt6-
 
diff --git a/accessibility/qt6-speech/distinfo b/accessibility/qt6-speech/distinfo
index ae54e9644f72..3f826e061502 100644
--- a/accessibility/qt6-speech/distinfo
+++ b/accessibility/qt6-speech/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1687324603
-SHA256 (KDE/Qt/6.5.1/qtspeech-everywhere-src-6.5.1.tar.xz) = 67120ba5f156962713b6fd5aeb109ed789f66d07e8bfbda4fa24d12d653457b6
-SIZE (KDE/Qt/6.5.1/qtspeech-everywhere-src-6.5.1.tar.xz) = 220208
+TIMESTAMP = 1689943801
+SHA256 (KDE/Qt/6.5.2/qtspeech-everywhere-src-6.5.2.tar.xz) = 88ff9c2876f4a76632bfee7f58c3277aab9ff49e24d628e4a19f6b0e7a62d4b2
+SIZE (KDE/Qt/6.5.2/qtspeech-everywhere-src-6.5.2.tar.xz) = 249568
diff --git a/comms/qt6-sensors/distinfo b/comms/qt6-sensors/distinfo
index eee281f72a4f..c99cd57b60d4 100644
--- a/comms/qt6-sensors/distinfo
+++ b/comms/qt6-sensors/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1687324605
-SHA256 (KDE/Qt/6.5.1/qtsensors-everywhere-src-6.5.1.tar.xz) = c95aca8371c2909255d908f4d78a0bfd975a83a73ed882eabc561d444864aba5
-SIZE (KDE/Qt/6.5.1/qtsensors-everywhere-src-6.5.1.tar.xz) = 1485244
+TIMESTAMP = 1689943969
+SHA256 (KDE/Qt/6.5.2/qtsensors-everywhere-src-6.5.2.tar.xz) = 4006bd7cfbb4302a887bda82b7fe3c31633626363a5e6ba9730bdb4fa8ab2aa6
+SIZE (KDE/Qt/6.5.2/qtsensors-everywhere-src-6.5.2.tar.xz) = 1484712
diff --git a/comms/qt6-sensors/pkg-plist b/comms/qt6-sensors/pkg-plist
index e0a23ef38d65..af1fc404005e 100644
--- a/comms/qt6-sensors/pkg-plist
+++ b/comms/qt6-sensors/pkg-plist
@@ -143,12 +143,6 @@ lib/cmake/Qt6Sensors/Qt6SensorsPlugins.cmake
 lib/cmake/Qt6Sensors/Qt6SensorsTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/Qt6Sensors/Qt6SensorsTargets.cmake
 lib/cmake/Qt6Sensors/Qt6SensorsVersionlessTargets.cmake
-lib/cmake/Qt6Sensors/Qt6dummySensorPluginAdditionalTargetInfo.cmake
-lib/cmake/Qt6Sensors/Qt6dummySensorPluginConfig.cmake
-lib/cmake/Qt6Sensors/Qt6dummySensorPluginConfigVersion.cmake
-lib/cmake/Qt6Sensors/Qt6dummySensorPluginConfigVersionImpl.cmake
-lib/cmake/Qt6Sensors/Qt6dummySensorPluginTargets-%%CMAKE_BUILD_TYPE%%.cmake
-lib/cmake/Qt6Sensors/Qt6dummySensorPluginTargets.cmake
 lib/cmake/Qt6Sensors/Qt6genericSensorPluginAdditionalTargetInfo.cmake
 lib/cmake/Qt6Sensors/Qt6genericSensorPluginConfig.cmake
 lib/cmake/Qt6Sensors/Qt6genericSensorPluginConfigVersion.cmake
@@ -177,7 +171,6 @@ lib/cmake/Qt6SensorsQuick/Qt6SensorsQuickVersionlessTargets.cmake
 %%QT_MKSPECDIR%%/modules/qt_lib_sensors_private.pri
 %%QT_MKSPECDIR%%/modules/qt_lib_sensorsquick.pri
 %%QT_MKSPECDIR%%/modules/qt_lib_sensorsquick_private.pri
-%%QT_PLUGINDIR%%/sensors/libqtsensors_dummy.so
 %%QT_PLUGINDIR%%/sensors/libqtsensors_generic.so
 %%QT_QMLDIR%%/QtSensors/libsensorsquickplugin.so
 %%QT_QMLDIR%%/QtSensors/plugins.qmltypes
diff --git a/comms/qt6-serialbus/distinfo b/comms/qt6-serialbus/distinfo
index bc5a2b10a4fb..ad0328a2d4e6 100644
--- a/comms/qt6-serialbus/distinfo
+++ b/comms/qt6-serialbus/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1687324610
-SHA256 (KDE/Qt/6.5.1/qtserialbus-everywhere-src-6.5.1.tar.xz) = dbff967829bf0ac75ed54fb0da4893a7a160309989d9e2da349622a72c5e157f
-SIZE (KDE/Qt/6.5.1/qtserialbus-everywhere-src-6.5.1.tar.xz) = 554324
+TIMESTAMP = 1689944077
+SHA256 (KDE/Qt/6.5.2/qtserialbus-everywhere-src-6.5.2.tar.xz) = f0426307cdc185547ad6331a670187d180cce4c11254d6a26aa997fe03b7cdfe
+SIZE (KDE/Qt/6.5.2/qtserialbus-everywhere-src-6.5.2.tar.xz) = 553888
diff --git a/comms/qt6-serialport/distinfo b/comms/qt6-serialport/distinfo
index 45255619d97a..8da46e754e51 100644
--- a/comms/qt6-serialport/distinfo
+++ b/comms/qt6-serialport/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1687324612
-SHA256 (KDE/Qt/6.5.1/qtserialport-everywhere-src-6.5.1.tar.xz) = c3554d0646d4e2b981a4b17f3d196317def7eabea42b81c97967e355bcb432a6
-SIZE (KDE/Qt/6.5.1/qtserialport-everywhere-src-6.5.1.tar.xz) = 279664
+TIMESTAMP = 1689944134
+SHA256 (KDE/Qt/6.5.2/qtserialport-everywhere-src-6.5.2.tar.xz) = 063c54169aea6b303183b434637ad050e9f67d7f22bb3eff1ede1905eb2ccc9e
+SIZE (KDE/Qt/6.5.2/qtserialport-everywhere-src-6.5.2.tar.xz) = 279364
diff --git a/databases/qt6-base_sqldriver/distinfo b/databases/qt6-base_sqldriver/distinfo
index 5643eb4379fa..b3e54331e490 100644
--- a/databases/qt6-base_sqldriver/distinfo
+++ b/databases/qt6-base_sqldriver/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1687324645
-SHA256 (KDE/Qt/6.5.1/qtbase-everywhere-src-6.5.1.tar.xz) = db56fa1f4303a1189fe33418d25d1924931c7aef237f89eea9de58e858eebfed
-SIZE (KDE/Qt/6.5.1/qtbase-everywhere-src-6.5.1.tar.xz) = 48287392
+TIMESTAMP = 1689944181
+SHA256 (KDE/Qt/6.5.2/qtbase-everywhere-src-6.5.2.tar.xz) = 3db4c729b4d80a9d8fda8dd77128406353baff4755ca619177eda4cddae71269
+SIZE (KDE/Qt/6.5.2/qtbase-everywhere-src-6.5.2.tar.xz) = 48410716
diff --git a/devel/Makefile b/devel/Makefile
index 703b2868cedb..8e46ed3ecd06 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -5921,6 +5921,7 @@
     SUBDIR += qt6-5compat
     SUBDIR += qt6-base
     SUBDIR += qt6-languageserver
+    SUBDIR += qt6-location
     SUBDIR += qt6-positioning
     SUBDIR += qt6-remoteobjects
     SUBDIR += qt6-scxml
diff --git a/devel/pyside6-tools/Makefile b/devel/pyside6-tools/Makefile
index fad8de6906c1..eb710a23659f 100644
--- a/devel/pyside6-tools/Makefile
+++ b/devel/pyside6-tools/Makefile
@@ -1,43 +1,53 @@
-PORTNAME=	pyside6-tools
+PORTNAME=	pyside6
 DISTVERSION=	${PYSIDE6_VERSION}
 CATEGORIES=	devel
 MASTER_SITES=	QT/official_releases/QtForPython/shiboken6/PySide6-${DISTVERSION}-src
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+PKGNAMESUFFIX=	-tools
 DISTNAME=	pyside-setup-everywhere-src-${DISTVERSION}
 
 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Pyside6 development tools
+COMMENT=	PySide6 development tools
 WWW=		https://wiki.qt.io/Qt_for_Python
 
 LICENSE=	BSD3CLAUSE GPLv2
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers \
-		git>0:devel/git
 LIB_DEPENDS=	libshiboken6.abi${PYTHON_MAJOR_VER}.so:devel/shiboken6@${PY_FLAVOR} \
 		libpyside6.abi${PYTHON_MAJOR_VER}.so:devel/pyside6@${PY_FLAVOR} \
 		libxkbcommon.so:x11/libxkbcommon \
-		libzstd.so:archivers/zstd \
-		libLLVM-${LLVM_DEFAULT}.so:devel/llvm${LLVM_DEFAULT}
+		libzstd.so:archivers/zstd
 
-USES=		cmake gl python qt:6 shebangfix tar:xz xorg
+USES=		cmake gl llvm:lib python qt:6 shebangfix tar:xz
 USE_GL=		gl
 USE_PYTHON=	flavors
-USE_QT=		base tools languageserver declarative
+USE_QT=		base declarative languageserver tools
 
 SHEBANG_FILES=	pyside_tool.py qtpy2cpp_lib/tests/baseline/basic_test.py
 
-CMAKE_ARGS+=	-DQT6_INSTALL_PREFIX=${LOCALBASE}/lib/qt6 \
-		-DCMAKE_EXECUTABLE_SUFFIX=6
-
-PLIST_FILES=	bin/pyside_tool.py
-
-.include <bsd.port.pre.mk>
-
-WRKSRC=		${WRKDIR}/pyside-setup-everywhere-src-${QT6_VERSION}/sources/pyside-tools
-
-#.if ${ARCH} == amd64 || ${ARCH} == i386
-#USE_QT+=	webengine
-#.endif
-
-.include <bsd.port.post.mk>
+PLIST_SUB=	PYSIDE_BINDIR_REL=${PYSIDE_BINDIR_REL}
+WRKSRC=		${WRKDIR}/pyside-setup-everywhere-src-${PYSIDE6_VERSION}/sources/pyside-tools
+
+PYSIDE_RELNAME=		${PORTNAME}
+PYSIDE_BINDIR_REL?=	bin/${PYSIDE_RELNAME}
+
+# Move scripts into a dedicated directory. They're too generically named, e.g.:
+# deploy.py and project.py. Unversioned copies of Qt tools like lrelease and
+# rcc are also installed which we probably don't want in PATH by default.
+# Install to: ${PREFIX}/bin/pyside6 by default for now until there are
+# consumers of this and a more fitting location is deemed necessary.
+post-install:
+	@${MV} ${STAGEDIR}${PREFIX}/bin ${STAGEDIR}${PREFIX}/${PYSIDE_RELNAME}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${PYSIDE_BINDIR_REL}
+	@${MV} ${STAGEDIR}${PREFIX}/${PYSIDE_RELNAME} ${STAGEDIR}${PREFIX}/bin
+
+.for d in deploy_lib project qtpy2cpp_lib
+	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
+		-f -d ${PREFIX}/${PYSIDE_BINDIR_REL}/${d} \
+		${STAGEDIR}${PREFIX}/${PYSIDE_BINDIR_REL}/${d}
+	${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
+		-f -d ${PREFIX}/${PYSIDE_BINDIR_REL}/${d} \
+		${STAGEDIR}${PREFIX}/${PYSIDE_BINDIR_REL}/${d}
+.endfor
+
+.include <bsd.port.mk>
diff --git a/devel/pyside6-tools/distinfo b/devel/pyside6-tools/distinfo
index 11650ba11d89..f2854aa44a8d 100644
--- a/devel/pyside6-tools/distinfo
+++ b/devel/pyside6-tools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1687806690
-SHA256 (pyside-setup-everywhere-src-6.5.1.1.tar.xz) = 9741a06f0b7d4b2168818448134bc7e96ddb5efb846a3915b4177ba4159b5b78
-SIZE (pyside-setup-everywhere-src-6.5.1.1.tar.xz) = 13565304
+TIMESTAMP = 1690399287
+SHA256 (pyside-setup-everywhere-src-6.5.2.tar.xz) = 90dbf1d14fcd41c98a7cbea44b8a4951e10d0b798e154749756e4946654d1ba8
+SIZE (pyside-setup-everywhere-src-6.5.2.tar.xz) = 13576204
diff --git a/devel/pyside6-tools/pkg-plist b/devel/pyside6-tools/pkg-plist
index 7427ae8bde18..9b765c5dac21 100644
--- a/devel/pyside6-tools/pkg-plist
+++ b/devel/pyside6-tools/pkg-plist
@@ -1,45 +1,92 @@
-bin/android_deploy.py
-bin/assistant
-bin/deploy.py
-bin/deploy_lib/__init__.py
-bin/deploy_lib/android/__init__.py
-bin/deploy_lib/android/android_helper.py
-bin/deploy_lib/android/buildozer.py
-bin/deploy_lib/android/recipes/PySide6/__init__.tmpl.py
-bin/deploy_lib/android/recipes/shiboken6/__init__.tmpl.py
-bin/deploy_lib/commands.py
-bin/deploy_lib/config.py
-bin/deploy_lib/default.spec
-bin/deploy_lib/deploy_util.py
-bin/deploy_lib/nuitka_helper.py
-bin/deploy_lib/pyside_icon.jpg
-bin/deploy_lib/python_helper.py
-bin/designer
-bin/linguist
-bin/lrelease
-bin/lupdate
-bin/metaobjectdump.py
-bin/project.py
-bin/project/__init__.py
-bin/project/newproject.py
-bin/project/project_data.py
-bin/project/utils.py
-bin/qml.py
-bin/qmlcachegen
-bin/qmlformat
-bin/qmlimportscanner
-bin/qmllint
-bin/qmlls
-bin/qmltyperegistrar
-bin/qtpy2cpp.py
-bin/qtpy2cpp_lib/astdump.py
-bin/qtpy2cpp_lib/formatter.py
-bin/qtpy2cpp_lib/nodedump.py
-bin/qtpy2cpp_lib/qt.py
-bin/qtpy2cpp_lib/tests/baseline/basic_test.cpp
-bin/qtpy2cpp_lib/tests/baseline/basic_test.py
-bin/qtpy2cpp_lib/tests/test_qtpy2cpp.py
-bin/qtpy2cpp_lib/tokenizer.py
-bin/qtpy2cpp_lib/visitor.py
-bin/rcc
-bin/uic
+%%PYSIDE_BINDIR_REL%%/android_deploy.py
+%%PYSIDE_BINDIR_REL%%/assistant
+%%PYSIDE_BINDIR_REL%%/deploy.py
+%%PYSIDE_BINDIR_REL%%/deploy_lib/__init__.py
+%%PYSIDE_BINDIR_REL%%/deploy_lib/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYSIDE_BINDIR_REL%%/deploy_lib/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYSIDE_BINDIR_REL%%/deploy_lib/__pycache__/commands%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYSIDE_BINDIR_REL%%/deploy_lib/__pycache__/commands%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYSIDE_BINDIR_REL%%/deploy_lib/__pycache__/config%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYSIDE_BINDIR_REL%%/deploy_lib/__pycache__/config%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYSIDE_BINDIR_REL%%/deploy_lib/__pycache__/deploy_util%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYSIDE_BINDIR_REL%%/deploy_lib/__pycache__/deploy_util%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYSIDE_BINDIR_REL%%/deploy_lib/__pycache__/nuitka_helper%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYSIDE_BINDIR_REL%%/deploy_lib/__pycache__/nuitka_helper%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYSIDE_BINDIR_REL%%/deploy_lib/__pycache__/python_helper%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYSIDE_BINDIR_REL%%/deploy_lib/__pycache__/python_helper%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYSIDE_BINDIR_REL%%/deploy_lib/android/__init__.py
+%%PYSIDE_BINDIR_REL%%/deploy_lib/android/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYSIDE_BINDIR_REL%%/deploy_lib/android/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYSIDE_BINDIR_REL%%/deploy_lib/android/__pycache__/android_helper%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYSIDE_BINDIR_REL%%/deploy_lib/android/__pycache__/android_helper%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYSIDE_BINDIR_REL%%/deploy_lib/android/__pycache__/buildozer%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYSIDE_BINDIR_REL%%/deploy_lib/android/__pycache__/buildozer%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYSIDE_BINDIR_REL%%/deploy_lib/android/android_helper.py
+%%PYSIDE_BINDIR_REL%%/deploy_lib/android/buildozer.py
+%%PYSIDE_BINDIR_REL%%/deploy_lib/android/recipes/PySide6/__init__.tmpl.py
+%%PYSIDE_BINDIR_REL%%/deploy_lib/android/recipes/PySide6/__pycache__/__init__.tmpl%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYSIDE_BINDIR_REL%%/deploy_lib/android/recipes/PySide6/__pycache__/__init__.tmpl%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYSIDE_BINDIR_REL%%/deploy_lib/android/recipes/shiboken6/__init__.tmpl.py
+%%PYSIDE_BINDIR_REL%%/deploy_lib/android/recipes/shiboken6/__pycache__/__init__.tmpl%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYSIDE_BINDIR_REL%%/deploy_lib/android/recipes/shiboken6/__pycache__/__init__.tmpl%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYSIDE_BINDIR_REL%%/deploy_lib/commands.py
+%%PYSIDE_BINDIR_REL%%/deploy_lib/config.py
+%%PYSIDE_BINDIR_REL%%/deploy_lib/default.spec
+%%PYSIDE_BINDIR_REL%%/deploy_lib/deploy_util.py
+%%PYSIDE_BINDIR_REL%%/deploy_lib/nuitka_helper.py
+%%PYSIDE_BINDIR_REL%%/deploy_lib/pyside_icon.jpg
+%%PYSIDE_BINDIR_REL%%/deploy_lib/python_helper.py
+%%PYSIDE_BINDIR_REL%%/designer
+%%PYSIDE_BINDIR_REL%%/linguist
+%%PYSIDE_BINDIR_REL%%/lrelease
+%%PYSIDE_BINDIR_REL%%/lupdate
+%%PYSIDE_BINDIR_REL%%/metaobjectdump.py
+%%PYSIDE_BINDIR_REL%%/project.py
+%%PYSIDE_BINDIR_REL%%/project/__init__.py
+%%PYSIDE_BINDIR_REL%%/project/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYSIDE_BINDIR_REL%%/project/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYSIDE_BINDIR_REL%%/project/__pycache__/newproject%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYSIDE_BINDIR_REL%%/project/__pycache__/newproject%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYSIDE_BINDIR_REL%%/project/__pycache__/project_data%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYSIDE_BINDIR_REL%%/project/__pycache__/project_data%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYSIDE_BINDIR_REL%%/project/__pycache__/utils%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYSIDE_BINDIR_REL%%/project/__pycache__/utils%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYSIDE_BINDIR_REL%%/project/newproject.py
+%%PYSIDE_BINDIR_REL%%/project/project_data.py
+%%PYSIDE_BINDIR_REL%%/project/utils.py
+%%PYSIDE_BINDIR_REL%%/pyside_tool.py
+%%PYSIDE_BINDIR_REL%%/qml.py
+%%PYSIDE_BINDIR_REL%%/qmlcachegen
+%%PYSIDE_BINDIR_REL%%/qmlformat
+%%PYSIDE_BINDIR_REL%%/qmlimportscanner
+%%PYSIDE_BINDIR_REL%%/qmllint
+%%PYSIDE_BINDIR_REL%%/qmlls
+%%PYSIDE_BINDIR_REL%%/qmltyperegistrar
+%%PYSIDE_BINDIR_REL%%/qtpy2cpp.py
+%%PYSIDE_BINDIR_REL%%/qtpy2cpp_lib/__pycache__/astdump%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYSIDE_BINDIR_REL%%/qtpy2cpp_lib/__pycache__/astdump%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYSIDE_BINDIR_REL%%/qtpy2cpp_lib/__pycache__/formatter%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYSIDE_BINDIR_REL%%/qtpy2cpp_lib/__pycache__/formatter%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYSIDE_BINDIR_REL%%/qtpy2cpp_lib/__pycache__/nodedump%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYSIDE_BINDIR_REL%%/qtpy2cpp_lib/__pycache__/nodedump%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYSIDE_BINDIR_REL%%/qtpy2cpp_lib/__pycache__/qt%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYSIDE_BINDIR_REL%%/qtpy2cpp_lib/__pycache__/qt%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYSIDE_BINDIR_REL%%/qtpy2cpp_lib/__pycache__/tokenizer%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYSIDE_BINDIR_REL%%/qtpy2cpp_lib/__pycache__/tokenizer%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYSIDE_BINDIR_REL%%/qtpy2cpp_lib/__pycache__/visitor%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYSIDE_BINDIR_REL%%/qtpy2cpp_lib/__pycache__/visitor%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYSIDE_BINDIR_REL%%/qtpy2cpp_lib/astdump.py
+%%PYSIDE_BINDIR_REL%%/qtpy2cpp_lib/formatter.py
+%%PYSIDE_BINDIR_REL%%/qtpy2cpp_lib/nodedump.py
+%%PYSIDE_BINDIR_REL%%/qtpy2cpp_lib/qt.py
+%%PYSIDE_BINDIR_REL%%/qtpy2cpp_lib/tests/__pycache__/test_qtpy2cpp%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYSIDE_BINDIR_REL%%/qtpy2cpp_lib/tests/__pycache__/test_qtpy2cpp%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYSIDE_BINDIR_REL%%/qtpy2cpp_lib/tests/baseline/__pycache__/basic_test%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYSIDE_BINDIR_REL%%/qtpy2cpp_lib/tests/baseline/__pycache__/basic_test%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYSIDE_BINDIR_REL%%/qtpy2cpp_lib/tests/baseline/basic_test.cpp
+%%PYSIDE_BINDIR_REL%%/qtpy2cpp_lib/tests/baseline/basic_test.py
+%%PYSIDE_BINDIR_REL%%/qtpy2cpp_lib/tests/test_qtpy2cpp.py
+%%PYSIDE_BINDIR_REL%%/qtpy2cpp_lib/tokenizer.py
+%%PYSIDE_BINDIR_REL%%/qtpy2cpp_lib/visitor.py
+%%PYSIDE_BINDIR_REL%%/rcc
+%%PYSIDE_BINDIR_REL%%/uic
diff --git a/devel/pyside6/Makefile b/devel/pyside6/Makefile
index c059e0f08871..953c5516c23d 100644
--- a/devel/pyside6/Makefile
+++ b/devel/pyside6/Makefile
@@ -11,30 +11,25 @@ WWW=		https://wiki.qt.io/Qt_for_Python
 
 LICENSE=	LGPL3
 
-BUILD_DEPENDS=	${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers \
-		llvm${LLVM_DEFAULT}>0:devel/llvm${LLVM_DEFAULT} \
-		git>0:devel/git \
-		${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx
-LIB_DEPENDS=	libvulkan.so:graphics/vulkan-loader \
-		libLLVM.so:devel/llvm${LLVM_DEFAULT} \
-		libshiboken6.abi${PYTHON_MAJOR_VER}.so:devel/shiboken6@${PY_FLAVOR}
-
-USES=		cmake gl python qt:6 tar:xz
+LIB_DEPENDS=	libshiboken6.abi${PYTHON_MAJOR_VER}.so:devel/shiboken6@${PY_FLAVOR} \
+		libxkbcommon.so:x11/libxkbcommon
+
+USES=		cmake gl llvm:lib python qt:6 tar:xz
 USE_GL=		gl
 USE_LDCONFIG=	yes
 USE_PYTHON=	flavors
-USE_QT=		3d 5compat base declarative doc imageformats positioning \
-		quick3d quicktimeline networkauth serialport shadertools \
-		svg tools translations wayland webchannel websockets
-
-CMAKE_ARGS+=	-DPYTHON_EXECUTABLE=${PYTHON_CMD}
+USE_QT=		3d base charts datavis3d declarative doc httpserver \
+		imageformats location multimedia networkauth positioning \
+		quick3d quicktimeline remoteobjects scxml sensors serialbus \
+		serialport shadertools speech svg tools translations wayland \
+		webchannel websockets
 
-.include <bsd.port.pre.mk>
+CMAKE_ARGS=	-DPYTHON_EXECUTABLE=${PYTHON_CMD}
 
-PLIST_SUB+=	PYVERSTR=.cpython-${PYTHON_SUFFIX}${PYTHON_ABIVER}
-PLIST_SUB+=	DISTVERSION=${DISTVERSION}
+WRKSRC=		${WRKDIR}/pyside-setup-everywhere-src-${PYSIDE6_VERSION}/sources/pyside6
+PLIST_SUB=	DISTVERSION=${DISTVERSION}
 
-WRKSRC=		${WRKDIR}/pyside-setup-everywhere-src-${QT6_VERSION}/sources/pyside6
+.include <bsd.port.pre.mk>
 
 .if ${ARCH} == amd64 || ${ARCH} == i386
 PLIST_SUB+=	WEBENGINE=""
@@ -43,4 +38,12 @@ USE_QT+=	webengine
 PLIST_SUB+=	WEBENGINE="@comment "
 .endif
 
+post-install:
+	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
+		-f -d ${PYTHONPREFIX_SITELIBDIR}/PySide6 \
+		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PySide6
+	${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
+		-f -d ${PYTHONPREFIX_SITELIBDIR}/PySide6 \
+		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PySide6
+
 .include <bsd.port.post.mk>
diff --git a/devel/pyside6/distinfo b/devel/pyside6/distinfo
index d0b7f0ce74e2..5156fe37e15e 100644
--- a/devel/pyside6/distinfo
+++ b/devel/pyside6/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1687806666
-SHA256 (pyside-setup-everywhere-src-6.5.1.1.tar.xz) = 9741a06f0b7d4b2168818448134bc7e96ddb5efb846a3915b4177ba4159b5b78
-SIZE (pyside-setup-everywhere-src-6.5.1.1.tar.xz) = 13565304
+TIMESTAMP = 1690395040
+SHA256 (pyside-setup-everywhere-src-6.5.2.tar.xz) = 90dbf1d14fcd41c98a7cbea44b8a4951e10d0b798e154749756e4946654d1ba8
+SIZE (pyside-setup-everywhere-src-6.5.2.tar.xz) = 13576204
diff --git a/devel/pyside6/pkg-plist b/devel/pyside6/pkg-plist
index 2c5d661d6ba3..41440914c4ac 100644
--- a/devel/pyside6/pkg-plist
+++ b/devel/pyside6/pkg-plist
@@ -4,17 +4,24 @@ include/PySide6/Qt3DExtras/pyside6_qt3dextras_python.h
 include/PySide6/Qt3DInput/pyside6_qt3dinput_python.h
 include/PySide6/Qt3DLogic/pyside6_qt3dlogic_python.h
 include/PySide6/Qt3DRender/pyside6_qt3drender_python.h
+include/PySide6/QtCharts/pyside6_qtcharts_python.h
 include/PySide6/QtConcurrent/pyside6_qtconcurrent_python.h
 include/PySide6/QtCore/pyside6_qtcore_python.h
 include/PySide6/QtCore/qtcorehelper.h
 include/PySide6/QtDBus/pyside6_qtdbus_python.h
 include/PySide6/QtDBus/qtdbushelper.h
+include/PySide6/QtDataVisualization/pyside6_qtdatavisualization_python.h
+include/PySide6/QtDataVisualization/qtdatavisualization_helper.h
 include/PySide6/QtDesigner/pyside6_qtdesigner_python.h
 include/PySide6/QtDesigner/qpydesignerextensions.h
 include/PySide6/QtGui/pyside6_qtgui_python.h
 include/PySide6/QtGui/qpytextobject.h
 include/PySide6/QtGui/qtguihelper.h
 include/PySide6/QtHelp/pyside6_qthelp_python.h
+include/PySide6/QtHttpServer/pyside6_qthttpserver_python.h
+include/PySide6/QtLocation/pyside6_qtlocation_python.h
+include/PySide6/QtMultimedia/pyside6_qtmultimedia_python.h
+include/PySide6/QtMultimediaWidgets/pyside6_qtmultimediawidgets_python.h
 include/PySide6/QtNetwork/pyside6_qtnetwork_python.h
 include/PySide6/QtNetworkAuth/pyside6_qtnetworkauth_python.h
 include/PySide6/QtOpenGL/pyside6_qtopengl_python.h
@@ -28,12 +35,18 @@ include/PySide6/QtQuick/pyside6_qtquick_python.h
 include/PySide6/QtQuick3D/pyside6_qtquick3d_python.h
 include/PySide6/QtQuickControls2/pyside6_qtquickcontrols2_python.h
 include/PySide6/QtQuickWidgets/pyside6_qtquickwidgets_python.h
+include/PySide6/QtRemoteObjects/pyside6_qtremoteobjects_python.h
+include/PySide6/QtScxml/pyside6_qtscxml_python.h
+include/PySide6/QtSensors/pyside6_qtsensors_python.h
 include/PySide6/QtSerialBus/pyside6_qtserialbus_python.h
 include/PySide6/QtSerialPort/pyside6_qtserialport_python.h
+include/PySide6/QtSpatialAudio/pyside6_qtspatialaudio_python.h
 include/PySide6/QtSql/pyside6_qtsql_python.h
+include/PySide6/QtStateMachine/pyside6_qtstatemachine_python.h
 include/PySide6/QtSvg/pyside6_qtsvg_python.h
 include/PySide6/QtSvgWidgets/pyside6_qtsvgwidgets_python.h
 include/PySide6/QtTest/pyside6_qttest_python.h
+include/PySide6/QtTextToSpeech/pyside6_qttexttospeech_python.h
 include/PySide6/QtUiTools/pyside6_qtuitools_python.h
 include/PySide6/QtWebChannel/pyside6_qtwebchannel_python.h
 %%WEBENGINE%%include/PySide6/QtWebEngineCore/pyside6_qtwebenginecore_python.h
@@ -89,72 +102,150 @@ include/PySide6/pysideutils.h
 include/PySide6/pysideweakref.h
 include/PySide6/qobjectconnect.h
 include/PySide6/signalmanager.h
+lib/cmake/PySide6/PySide6Config.abi3.cmake
+lib/cmake/PySide6/PySide6Config.cmake
+lib/cmake/PySide6/PySide6ConfigVersion.cmake
+lib/cmake/PySide6/PySide6Targets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/PySide6/PySide6Targets.cmake
+lib/cmake/PySide6Qml/PySide6QmlConfig.abi3.cmake
+lib/cmake/PySide6Qml/PySide6QmlConfig.cmake
+lib/cmake/PySide6Qml/PySide6QmlConfigVersion.cmake
+lib/cmake/PySide6Qml/PySide6QmlTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/PySide6Qml/PySide6QmlTargets.cmake
+lib/libpyside6.abi3.so
+lib/libpyside6.abi3.so.6.5
+lib/libpyside6.abi3.so.%%DISTVERSION%%
+lib/libpyside6qml.abi3.so
+lib/libpyside6qml.abi3.so.6.5
+lib/libpyside6qml.abi3.so.%%DISTVERSION%%
 %%PYTHON_SITELIBDIR%%/PySide6/Qt3DAnimation.abi3.so
+%%PYTHON_SITELIBDIR%%/PySide6/Qt3DAnimation.pyi
 %%PYTHON_SITELIBDIR%%/PySide6/Qt3DCore.abi3.so
+%%PYTHON_SITELIBDIR%%/PySide6/Qt3DCore.pyi
 %%PYTHON_SITELIBDIR%%/PySide6/Qt3DExtras.abi3.so
+%%PYTHON_SITELIBDIR%%/PySide6/Qt3DExtras.pyi
 %%PYTHON_SITELIBDIR%%/PySide6/Qt3DInput.abi3.so
+%%PYTHON_SITELIBDIR%%/PySide6/Qt3DInput.pyi
 %%PYTHON_SITELIBDIR%%/PySide6/Qt3DLogic.abi3.so
+%%PYTHON_SITELIBDIR%%/PySide6/Qt3DLogic.pyi
 %%PYTHON_SITELIBDIR%%/PySide6/Qt3DRender.abi3.so
+%%PYTHON_SITELIBDIR%%/PySide6/Qt3DRender.pyi
+%%PYTHON_SITELIBDIR%%/PySide6/QtCharts.abi3.so
+%%PYTHON_SITELIBDIR%%/PySide6/QtCharts.pyi
 %%PYTHON_SITELIBDIR%%/PySide6/QtConcurrent.abi3.so
+%%PYTHON_SITELIBDIR%%/PySide6/QtConcurrent.pyi
 %%PYTHON_SITELIBDIR%%/PySide6/QtCore.abi3.so
+%%PYTHON_SITELIBDIR%%/PySide6/QtCore.pyi
 %%PYTHON_SITELIBDIR%%/PySide6/QtDBus.abi3.so
+%%PYTHON_SITELIBDIR%%/PySide6/QtDBus.pyi
+%%PYTHON_SITELIBDIR%%/PySide6/QtDataVisualization.abi3.so
+%%PYTHON_SITELIBDIR%%/PySide6/QtDataVisualization.pyi
 %%PYTHON_SITELIBDIR%%/PySide6/QtDesigner.abi3.so
+%%PYTHON_SITELIBDIR%%/PySide6/QtDesigner.pyi
 %%PYTHON_SITELIBDIR%%/PySide6/QtGui.abi3.so
+%%PYTHON_SITELIBDIR%%/PySide6/QtGui.pyi
 %%PYTHON_SITELIBDIR%%/PySide6/QtHelp.abi3.so
+%%PYTHON_SITELIBDIR%%/PySide6/QtHelp.pyi
+%%PYTHON_SITELIBDIR%%/PySide6/QtHttpServer.abi3.so
+%%PYTHON_SITELIBDIR%%/PySide6/QtHttpServer.pyi
+%%PYTHON_SITELIBDIR%%/PySide6/QtLocation.abi3.so
+%%PYTHON_SITELIBDIR%%/PySide6/QtLocation.pyi
+%%PYTHON_SITELIBDIR%%/PySide6/QtMultimedia.abi3.so
+%%PYTHON_SITELIBDIR%%/PySide6/QtMultimedia.pyi
+%%PYTHON_SITELIBDIR%%/PySide6/QtMultimediaWidgets.abi3.so
+%%PYTHON_SITELIBDIR%%/PySide6/QtMultimediaWidgets.pyi
 %%PYTHON_SITELIBDIR%%/PySide6/QtNetwork.abi3.so
+%%PYTHON_SITELIBDIR%%/PySide6/QtNetwork.pyi
 %%PYTHON_SITELIBDIR%%/PySide6/QtNetworkAuth.abi3.so
+%%PYTHON_SITELIBDIR%%/PySide6/QtNetworkAuth.pyi
 %%PYTHON_SITELIBDIR%%/PySide6/QtOpenGL.abi3.so
+%%PYTHON_SITELIBDIR%%/PySide6/QtOpenGL.pyi
 %%PYTHON_SITELIBDIR%%/PySide6/QtOpenGLWidgets.abi3.so
+%%PYTHON_SITELIBDIR%%/PySide6/QtOpenGLWidgets.pyi
 %%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PySide6/QtPdf.abi3.so
+%%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PySide6/QtPdf.pyi
 %%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PySide6/QtPdfWidgets.abi3.so
+%%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PySide6/QtPdfWidgets.pyi
 %%PYTHON_SITELIBDIR%%/PySide6/QtPositioning.abi3.so
+%%PYTHON_SITELIBDIR%%/PySide6/QtPositioning.pyi
 %%PYTHON_SITELIBDIR%%/PySide6/QtPrintSupport.abi3.so
+%%PYTHON_SITELIBDIR%%/PySide6/QtPrintSupport.pyi
 %%PYTHON_SITELIBDIR%%/PySide6/QtQml.abi3.so
+%%PYTHON_SITELIBDIR%%/PySide6/QtQml.pyi
 %%PYTHON_SITELIBDIR%%/PySide6/QtQuick.abi3.so
+%%PYTHON_SITELIBDIR%%/PySide6/QtQuick.pyi
 %%PYTHON_SITELIBDIR%%/PySide6/QtQuick3D.abi3.so
+%%PYTHON_SITELIBDIR%%/PySide6/QtQuick3D.pyi
 %%PYTHON_SITELIBDIR%%/PySide6/QtQuickControls2.abi3.so
+%%PYTHON_SITELIBDIR%%/PySide6/QtQuickControls2.pyi
 %%PYTHON_SITELIBDIR%%/PySide6/QtQuickWidgets.abi3.so
+%%PYTHON_SITELIBDIR%%/PySide6/QtQuickWidgets.pyi
+%%PYTHON_SITELIBDIR%%/PySide6/QtRemoteObjects.abi3.so
+%%PYTHON_SITELIBDIR%%/PySide6/QtRemoteObjects.pyi
+%%PYTHON_SITELIBDIR%%/PySide6/QtScxml.abi3.so
+%%PYTHON_SITELIBDIR%%/PySide6/QtScxml.pyi
+%%PYTHON_SITELIBDIR%%/PySide6/QtSensors.abi3.so
+%%PYTHON_SITELIBDIR%%/PySide6/QtSensors.pyi
 %%PYTHON_SITELIBDIR%%/PySide6/QtSerialBus.abi3.so
+%%PYTHON_SITELIBDIR%%/PySide6/QtSerialBus.pyi
 %%PYTHON_SITELIBDIR%%/PySide6/QtSerialPort.abi3.so
+%%PYTHON_SITELIBDIR%%/PySide6/QtSerialPort.pyi
+%%PYTHON_SITELIBDIR%%/PySide6/QtSpatialAudio.abi3.so
+%%PYTHON_SITELIBDIR%%/PySide6/QtSpatialAudio.pyi
 %%PYTHON_SITELIBDIR%%/PySide6/QtSql.abi3.so
+%%PYTHON_SITELIBDIR%%/PySide6/QtSql.pyi
+%%PYTHON_SITELIBDIR%%/PySide6/QtStateMachine.abi3.so
+%%PYTHON_SITELIBDIR%%/PySide6/QtStateMachine.pyi
 %%PYTHON_SITELIBDIR%%/PySide6/QtSvg.abi3.so
+%%PYTHON_SITELIBDIR%%/PySide6/QtSvg.pyi
 %%PYTHON_SITELIBDIR%%/PySide6/QtSvgWidgets.abi3.so
+%%PYTHON_SITELIBDIR%%/PySide6/QtSvgWidgets.pyi
 %%PYTHON_SITELIBDIR%%/PySide6/QtTest.abi3.so
+%%PYTHON_SITELIBDIR%%/PySide6/QtTest.pyi
+%%PYTHON_SITELIBDIR%%/PySide6/QtTextToSpeech.abi3.so
+%%PYTHON_SITELIBDIR%%/PySide6/QtTextToSpeech.pyi
 %%PYTHON_SITELIBDIR%%/PySide6/QtUiTools.abi3.so
+%%PYTHON_SITELIBDIR%%/PySide6/QtUiTools.pyi
 %%PYTHON_SITELIBDIR%%/PySide6/QtWebChannel.abi3.so
+%%PYTHON_SITELIBDIR%%/PySide6/QtWebChannel.pyi
 %%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PySide6/QtWebEngineCore.abi3.so
+%%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PySide6/QtWebEngineCore.pyi
 %%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PySide6/QtWebEngineQuick.abi3.so
+%%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PySide6/QtWebEngineQuick.pyi
 %%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PySide6/QtWebEngineWidgets.abi3.so
+%%WEBENGINE%%%%PYTHON_SITELIBDIR%%/PySide6/QtWebEngineWidgets.pyi
 %%PYTHON_SITELIBDIR%%/PySide6/QtWebSockets.abi3.so
+%%PYTHON_SITELIBDIR%%/PySide6/QtWebSockets.pyi
 %%PYTHON_SITELIBDIR%%/PySide6/QtWidgets.abi3.so
+%%PYTHON_SITELIBDIR%%/PySide6/QtWidgets.pyi
 %%PYTHON_SITELIBDIR%%/PySide6/QtXml.abi3.so
+%%PYTHON_SITELIBDIR%%/PySide6/QtXml.pyi
 %%PYTHON_SITELIBDIR%%/PySide6/__init__.py
+%%PYTHON_SITELIBDIR%%/PySide6/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/PySide6/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/PySide6/__pycache__/_config%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/PySide6/__pycache__/_config%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/PySide6/__pycache__/_git_pyside_version%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/PySide6/__pycache__/_git_pyside_version%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/PySide6/_config.py
 %%PYTHON_SITELIBDIR%%/PySide6/_git_pyside_version.py
 %%PYTHON_SITELIBDIR%%/PySide6/support/__init__.py
+%%PYTHON_SITELIBDIR%%/PySide6/support/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/PySide6/support/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/PySide6/support/__pycache__/deprecated%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/PySide6/support/__pycache__/deprecated%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/PySide6/support/__pycache__/generate_pyi%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/PySide6/support/__pycache__/generate_pyi%%PYTHON_EXT_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/PySide6/support/deprecated.py
 %%PYTHON_SITELIBDIR%%/PySide6/support/generate_pyi.py
-lib/cmake/PySide6/PySide6Config.abi3.cmake
-lib/cmake/PySide6/PySide6Config.cmake
-lib/cmake/PySide6/PySide6ConfigVersion.cmake
-lib/cmake/PySide6/PySide6Targets-%%CMAKE_BUILD_TYPE%%.cmake
-lib/cmake/PySide6/PySide6Targets.cmake
-lib/cmake/PySide6Qml/PySide6QmlConfig.abi3.cmake
-lib/cmake/PySide6Qml/PySide6QmlConfig.cmake
-lib/cmake/PySide6Qml/PySide6QmlConfigVersion.cmake
-lib/cmake/PySide6Qml/PySide6QmlTargets-%%CMAKE_BUILD_TYPE%%.cmake
-lib/cmake/PySide6Qml/PySide6QmlTargets.cmake
-lib/libpyside6.abi3.so
-lib/libpyside6.abi3.so.%%DISTVERSION%%
-lib/libpyside6.abi3.so.6.5
-lib/libpyside6qml.abi3.so
-lib/libpyside6qml.abi3.so.%%DISTVERSION%%
-lib/libpyside6qml.abi3.so.6.5
 libdata/pkgconfig/pyside6.pc
 plugins/designer/libPySidePlugin.so
+share/PySide6/glue/qtcharts.cpp
 share/PySide6/glue/qtcore.cpp
+share/PySide6/glue/qtdatavisualization.cpp
 share/PySide6/glue/qtdesigner.cpp
 share/PySide6/glue/qtgui.cpp
+share/PySide6/glue/qtmultimedia.cpp
 share/PySide6/glue/qtnetwork.cpp
 share/PySide6/glue/qtnetworkauth.cpp
 share/PySide6/glue/qtopengl.cpp
@@ -163,6 +254,7 @@ share/PySide6/glue/qtqml.cpp
 share/PySide6/glue/qtquick.cpp
 share/PySide6/glue/qtserialbus.cpp
 share/PySide6/glue/qtsql.cpp
+share/PySide6/glue/qtstatemachine.cpp
 share/PySide6/glue/qttest.cpp
 share/PySide6/glue/qtuitools.cpp
 %%WEBENGINE%%share/PySide6/glue/qtwebenginecore.cpp
@@ -183,10 +275,12 @@ share/PySide6/typesystems/typesystem_3dextras.xml
 share/PySide6/typesystems/typesystem_3dinput.xml
 share/PySide6/typesystems/typesystem_3dlogic.xml
 share/PySide6/typesystems/typesystem_3drender.xml
+share/PySide6/typesystems/typesystem_charts.xml
 share/PySide6/typesystems/typesystem_concurrent.xml
 share/PySide6/typesystems/typesystem_core.xml
 share/PySide6/typesystems/typesystem_core_common.xml
 share/PySide6/typesystems/typesystem_core_win.xml
+share/PySide6/typesystems/typesystem_datavisualization.xml
 share/PySide6/typesystems/typesystem_dbus.xml
 share/PySide6/typesystems/typesystem_designer.xml
 share/PySide6/typesystems/typesystem_glgeti_v_includes.xml
@@ -199,6 +293,10 @@ share/PySide6/typesystems/typesystem_gui_mac.xml
 share/PySide6/typesystems/typesystem_gui_win.xml
 share/PySide6/typesystems/typesystem_gui_x11.xml
 share/PySide6/typesystems/typesystem_help.xml
+share/PySide6/typesystems/typesystem_httpserver.xml
+share/PySide6/typesystems/typesystem_location.xml
+share/PySide6/typesystems/typesystem_multimedia.xml
+share/PySide6/typesystems/typesystem_multimediawidgets.xml
 share/PySide6/typesystems/typesystem_network.xml
 share/PySide6/typesystems/typesystem_networkauth.xml
 share/PySide6/typesystems/typesystem_opengl.xml
@@ -235,12 +333,18 @@ share/PySide6/typesystems/typesystem_quick.xml
 share/PySide6/typesystems/typesystem_quick3d.xml
 share/PySide6/typesystems/typesystem_quickcontrols2.xml
 share/PySide6/typesystems/typesystem_quickwidgets.xml
+share/PySide6/typesystems/typesystem_remoteobjects.xml
+share/PySide6/typesystems/typesystem_scxml.xml
+share/PySide6/typesystems/typesystem_sensors.xml
 share/PySide6/typesystems/typesystem_serialbus.xml
 share/PySide6/typesystems/typesystem_serialport.xml
+share/PySide6/typesystems/typesystem_spatialaudio.xml
 share/PySide6/typesystems/typesystem_sql.xml
+share/PySide6/typesystems/typesystem_statemachine.xml
 share/PySide6/typesystems/typesystem_svg.xml
 share/PySide6/typesystems/typesystem_svgwidgets.xml
 share/PySide6/typesystems/typesystem_test.xml
+share/PySide6/typesystems/typesystem_texttospeech.xml
 share/PySide6/typesystems/typesystem_uitools.xml
 share/PySide6/typesystems/typesystem_webchannel.xml
 %%WEBENGINE%%share/PySide6/typesystems/typesystem_webenginecore.xml
diff --git a/devel/qt6-5compat/Makefile b/devel/qt6-5compat/Makefile
index 7e4e33cf6d49..fb6a908c57e6 100644
--- a/devel/qt6-5compat/Makefile
+++ b/devel/qt6-5compat/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	5compat
 DISTVERSION=	${QT6_VERSION}
-PORTREVISION=	2
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt6-
 
diff --git a/devel/qt6-5compat/distinfo b/devel/qt6-5compat/distinfo
index 867917f4bf96..04601b7474a6 100644
--- a/devel/qt6-5compat/distinfo
+++ b/devel/qt6-5compat/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1687324655
-SHA256 (KDE/Qt/6.5.1/qt5compat-everywhere-src-6.5.1.tar.xz) = ae992b295fefabef2445beb3a8ec31c40fa0fb2c01603eaf2acfdb4a0054fb83
-SIZE (KDE/Qt/6.5.1/qt5compat-everywhere-src-6.5.1.tar.xz) = 14638620
+TIMESTAMP = 1689944263
+SHA256 (KDE/Qt/6.5.2/qt5compat-everywhere-src-6.5.2.tar.xz) = b9abe42ee2055c27a8e7579c7816069e91aae1f9b10649bf572db8ba96fa91c4
+SIZE (KDE/Qt/6.5.2/qt5compat-everywhere-src-6.5.2.tar.xz) = 14638008
diff --git a/devel/qt6-base/Makefile b/devel/qt6-base/Makefile
index 94319a7ed6ce..4217c8c3249a 100644
--- a/devel/qt6-base/Makefile
+++ b/devel/qt6-base/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	base
 DISTVERSION=	${QT6_VERSION}
-PORTREVISION=	2
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt6-
 
diff --git a/devel/qt6-base/distinfo b/devel/qt6-base/distinfo
index 0ea09215296c..d4b243b750f7 100644
--- a/devel/qt6-base/distinfo
+++ b/devel/qt6-base/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1687324657
-SHA256 (KDE/Qt/6.5.1/qtbase-everywhere-src-6.5.1.tar.xz) = db56fa1f4303a1189fe33418d25d1924931c7aef237f89eea9de58e858eebfed
-SIZE (KDE/Qt/6.5.1/qtbase-everywhere-src-6.5.1.tar.xz) = 48287392
-SHA256 (KDE/Qt/6.5.1/3f45905953d57e0174059d7d9d6bc75c3c1c406c.patch) = 61e345f12c6283792e230d3572756e6093d1be0c80d1f3dc0745e19532e28ebc
-SIZE (KDE/Qt/6.5.1/3f45905953d57e0174059d7d9d6bc75c3c1c406c.patch) = 1326
+TIMESTAMP = 1689944224
+SHA256 (KDE/Qt/6.5.2/qtbase-everywhere-src-6.5.2.tar.xz) = 3db4c729b4d80a9d8fda8dd77128406353baff4755ca619177eda4cddae71269
+SIZE (KDE/Qt/6.5.2/qtbase-everywhere-src-6.5.2.tar.xz) = 48410716
+SHA256 (KDE/Qt/6.5.2/3f45905953d57e0174059d7d9d6bc75c3c1c406c.patch) = 61e345f12c6283792e230d3572756e6093d1be0c80d1f3dc0745e19532e28ebc
+SIZE (KDE/Qt/6.5.2/3f45905953d57e0174059d7d9d6bc75c3c1c406c.patch) = 1326
diff --git a/devel/qt6-languageserver/distinfo b/devel/qt6-languageserver/distinfo
index b41ac8daaebd..c58f33e156a8 100644
--- a/devel/qt6-languageserver/distinfo
+++ b/devel/qt6-languageserver/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1687324658
-SHA256 (KDE/Qt/6.5.1/qtlanguageserver-everywhere-src-6.5.1.tar.xz) = 99a6cc6aca124626a2085077dc7f4bb9dbb20da518df6b115056813149832bc9
-SIZE (KDE/Qt/6.5.1/qtlanguageserver-everywhere-src-6.5.1.tar.xz) = 153780
+TIMESTAMP = 1689944580
+SHA256 (KDE/Qt/6.5.2/qtlanguageserver-everywhere-src-6.5.2.tar.xz) = 73b5ec0caa830708c016951a6e27f308f78e95d13810c56ef342317c398bd1a4
+SIZE (KDE/Qt/6.5.2/qtlanguageserver-everywhere-src-6.5.2.tar.xz) = 153824
diff --git a/devel/qt6-location/Makefile b/devel/qt6-location/Makefile
new file mode 100644
index 000000000000..084eb9bebb38
--- /dev/null
+++ b/devel/qt6-location/Makefile
@@ -0,0 +1,17 @@
+PORTNAME=	location
+PORTVERSION=	${QT6_VERSION}
+CATEGORIES=	devel
+PKGNAMEPREFIX=	qt6-
+
+MAINTAINER=	kde@FreeBSD.org
+COMMENT=	Qt 6 API to create viable mapping solutions
+WWW=		https://qt.io
+
+BUILD_DEPENDS=	vulkan-headers>0:graphics/vulkan-headers
+LIB_DEPENDS=	libxkbcommon.so:x11/libxkbcommon
+
+USES=		cmake compiler:c++17-lang gl pkgconfig qt-dist:6
+USE_GL=		gl opengl
+USE_QT=		base declarative positioning
*** 3768 LINES SKIPPED ***