diff --git a/devel/shiboken2/Makefile b/devel/shiboken2/Makefile
index e9ec5893ae25..1f386c9a3c69 100644
--- a/devel/shiboken2/Makefile
+++ b/devel/shiboken2/Makefile
@@ -1,56 +1,58 @@
 PORTNAME=	shiboken2
 DISTVERSION=	5.15.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel
 MASTER_SITES=	QT/official_releases/QtForPython/shiboken2/PySide2-${DISTVERSION}-src
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	pyside-setup-opensource-src-${DISTVERSION}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python binding generator for C++ libraries
 WWW=		https://wiki.qt.io/PySide2
 
 LICENSE=	GPLv2 LGPL21 LGPL3
 LICENSE_COMB=	multi
 
 BROKEN_riscv64=		fails to compile: __threading_support:135:3: Unsupported architecture
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools_scm>0:devel/py-setuptools_scm@${PY_FLAVOR} \
 		git>0:devel/git
 LIB_DEPENDS=	libxslt.so:textproc/libxslt
 
 USES=		cmake compiler:c++11-lang gnome llvm:lib python:3.5-3.9 qt:5 shebangfix tar:xz
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 USE_PYTHON=	flavors
 USE_QT=		buildtools:build core gui network qmake:build testlib \
 		xml xmlpatterns
 
-SHEBANG_FILES=	shiboken_tool.py
+#SHEBANG_FILES=	shiboken_tool.py
 
 CMAKE_ARGS+=	"-DCMAKE_CXX_FLAGS=-lexecinfo" \
 		"-DCMAKE_STANDARD_LIBRARIES=-lexecinfo" \
 		"-DCMAKE_CXX_STANDARD_LIBRARIES=-lexecinfo" \
 		"-DUSE_PYTHON_VERSION=${PYTHON_VER}" \
 		"-DLLVM_CONFIG=${LLVM_CONFIG}"
 
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 30800
 BROKEN=		does not build (plist issues)
 .endif
 
 PLIST_SUB+=	DISTVERSION=${DISTVERSION}
 PLIST_SUB+=	PYVERSTR=.cpython-${PYTHON_SUFFIX}${PYTHON_ABIVER}
 
 WRKSRC=		${WRKDIR}/pyside-setup-opensource-src-${DISTVERSION:C/^([0-9].[0-9]+.[0-9])(.[0-9])?/\1/}/sources/shiboken2
 
 post-install:
+	${RM} ${STAGEDIR}${PREFIX}/bin/shiboken_tool.py
 	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
 		-f -d ${PYTHONPREFIX_SITELIBDIR} \
 		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 	${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
 		-f -d ${PYTHONPREFIX_SITELIBDIR} \
 		${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
+
 .include <bsd.port.post.mk>
diff --git a/devel/shiboken2/pkg-plist b/devel/shiboken2/pkg-plist
index c9b2ddfc6e91..757275ef2f8b 100644
--- a/devel/shiboken2/pkg-plist
+++ b/devel/shiboken2/pkg-plist
@@ -1,93 +1,92 @@
 bin/shiboken2
-bin/shiboken_tool.py
 include/shiboken2/autodecref.h
 include/shiboken2/basewrapper.h
 include/shiboken2/bindingmanager.h
 include/shiboken2/bufferprocs_py37.h
 include/shiboken2/gilstate.h
 include/shiboken2/helper.h
 include/shiboken2/pep384impl.h
 include/shiboken2/python25compat.h
 include/shiboken2/qapp_macro.h
 include/shiboken2/sbkarrayconverter.h
 include/shiboken2/sbkconverter.h
 include/shiboken2/sbkdbg.h
 include/shiboken2/sbkenum.h
 include/shiboken2/sbkmodule.h
 include/shiboken2/sbkpython.h
 include/shiboken2/sbkstaticstrings.h
 include/shiboken2/sbkstring.h
 include/shiboken2/sbkversion.h
 include/shiboken2/shiboken.h
 include/shiboken2/shibokenbuffer.h
 include/shiboken2/shibokenmacros.h
 include/shiboken2/signature.h
 include/shiboken2/signature_p.h
 include/shiboken2/threadstatesaver.h
 include/shiboken2/typespec.h
 include/shiboken2/voidptr.h
 lib/cmake/Shiboken2-%%DISTVERSION%%/Shiboken2Config%%PYVERSTR%%.cmake
 lib/cmake/Shiboken2-%%DISTVERSION%%/Shiboken2Config.cmake
 lib/cmake/Shiboken2-%%DISTVERSION%%/Shiboken2ConfigVersion.cmake
 lib/cmake/Shiboken2-%%DISTVERSION%%/Shiboken2Targets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/Shiboken2-%%DISTVERSION%%/Shiboken2Targets.cmake
 lib/cmake/Shiboken2-%%DISTVERSION%%/shiboken_helpers.cmake
 lib/libshiboken2%%PYVERSTR%%.so
 lib/libshiboken2%%PYVERSTR%%.so.%%DISTVERSION%%
 lib/libshiboken2%%PYVERSTR%%.so.5.15
 libdata/pkgconfig/shiboken2.pc
 %%PYTHON_SITELIBDIR%%/shiboken2/__init__.py
 %%PYTHON_SITELIBDIR%%/shiboken2/__pycache__/__init__%%PYVERSTR%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/shiboken2/__pycache__/__init__%%PYVERSTR%%.pyc
 %%PYTHON_SITELIBDIR%%/shiboken2/__pycache__/_config%%PYVERSTR%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/shiboken2/__pycache__/_config%%PYVERSTR%%.pyc
 %%PYTHON_SITELIBDIR%%/shiboken2/__pycache__/_git_shiboken_module_version%%PYVERSTR%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/shiboken2/__pycache__/_git_shiboken_module_version%%PYVERSTR%%.pyc
 %%PYTHON_SITELIBDIR%%/shiboken2/_config.py
 %%PYTHON_SITELIBDIR%%/shiboken2/_git_shiboken_module_version.py
 %%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/__feature__.py
 %%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/__init__.py
 %%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/__pycache__/__feature__%%PYVERSTR%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/__pycache__/__feature__%%PYVERSTR%%.pyc
 %%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/__pycache__/__init__%%PYVERSTR%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/__pycache__/__init__%%PYVERSTR%%.pyc
 %%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/__init__.py
 %%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/__pycache__/__init__%%PYVERSTR%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/__pycache__/__init__%%PYVERSTR%%.pyc
 %%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/__pycache__/errorhandler%%PYVERSTR%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/__pycache__/errorhandler%%PYVERSTR%%.pyc
 %%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/__pycache__/importhandler%%PYVERSTR%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/__pycache__/importhandler%%PYVERSTR%%.pyc
 %%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/__pycache__/layout%%PYVERSTR%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/__pycache__/layout%%PYVERSTR%%.pyc
 %%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/__pycache__/loader%%PYVERSTR%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/__pycache__/loader%%PYVERSTR%%.pyc
 %%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/__pycache__/mapping%%PYVERSTR%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/__pycache__/mapping%%PYVERSTR%%.pyc
 %%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/__pycache__/parser%%PYVERSTR%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/__pycache__/parser%%PYVERSTR%%.pyc
 %%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/errorhandler.py
 %%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/importhandler.py
 %%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/layout.py
 %%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/lib/__init__.py
 %%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/lib/__pycache__/__init__%%PYVERSTR%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/lib/__pycache__/__init__%%PYVERSTR%%.pyc
 %%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/lib/__pycache__/enum_sig%%PYVERSTR%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/lib/__pycache__/enum_sig%%PYVERSTR%%.pyc
 %%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/lib/__pycache__/tool%%PYVERSTR%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/lib/__pycache__/tool%%PYVERSTR%%.pyc
 %%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/lib/enum_sig.py
 %%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/lib/tool.py
 %%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/loader.py
 %%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/mapping.py
 %%PYTHON_SITELIBDIR%%/shiboken2/files.dir/shibokensupport/signature/parser.py
 %%PYTHON_SITELIBDIR%%/shiboken2/shiboken2%%PYVERSTR%%.so
 %%PYTHON_SITELIBDIR%%/shiboken2_generator/__init__.py
 %%PYTHON_SITELIBDIR%%/shiboken2_generator/__pycache__/__init__%%PYVERSTR%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/shiboken2_generator/__pycache__/__init__%%PYVERSTR%%.pyc
 %%PYTHON_SITELIBDIR%%/shiboken2_generator/__pycache__/_config%%PYVERSTR%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/shiboken2_generator/__pycache__/_config%%PYVERSTR%%.pyc
 %%PYTHON_SITELIBDIR%%/shiboken2_generator/__pycache__/_git_shiboken_generator_version%%PYVERSTR%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/shiboken2_generator/__pycache__/_git_shiboken_generator_version%%PYVERSTR%%.pyc
 %%PYTHON_SITELIBDIR%%/shiboken2_generator/_config.py
 %%PYTHON_SITELIBDIR%%/shiboken2_generator/_git_shiboken_generator_version.py
diff --git a/devel/shiboken6/Makefile b/devel/shiboken6/Makefile
index 1ac6f98010e1..7ff38e41972e 100644
--- a/devel/shiboken6/Makefile
+++ b/devel/shiboken6/Makefile
@@ -1,46 +1,47 @@
 PORTNAME=	shiboken6
 DISTVERSION=	${QT6_VERSION}
 CATEGORIES=	devel
 MASTER_SITES=	QT/official_releases/QtForPython/${PORTNAME}/PySide6-${DISTVERSION}-src
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	pyside-setup-opensource-src-${DISTVERSION}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Python binding generator for C++ libraries
 
 LICENSE=	GPLv2 LGPL21 LGPL3
 LICENSE_COMB=	multi
 
 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} \
 		libxslt.so:textproc/libxslt
 
 USES=		cmake compiler:c++17-lang gnome localbase python:3.5+ \
 		shebangfix tar:xz qt:6
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 USE_PYTHON=	flavors
 USE_QT=		5compat base declarative doc imageformats quick3d quicktimeline networkauth shadertools svg tools translations wayland
 
-# TODO: avoid a conflict with shiboken2
-SHEBANG_FILES=	shiboken_tool.py
+#SHEBANG_FILES=	shiboken_tool.py
 
 CMAKE_ARGS+=	-DClang_DIR:PATH="${LOCALBASE}/llvm${LLVM_DEFAULT}/lib/cmake/clang" \
 		-DLLVM_DIR:PATH="${LOCALBASE}/llvm${LLVM_DEFAULT}/lib/cmake/llvm" \
 		-DCMAKE_CXX_FLAGS=-lexecinfo \
 		-DCMAKE_STANDARD_LIBRARIES=-lexecinfo \
 		-DCMAKE_CXX_STANDARD_LIBRARIES=-lexecinfo \
 		-DUSE_PYTHON_VERSION=${PYTHON_VER}
 
 
 .include <bsd.port.pre.mk>
 
 PLIST_SUB+=	DISTVERSION=${DISTVERSION}
 PLIST_SUB+=	PYVERSTR=.cpython-${PYTHON_SUFFIX}${PYTHON_ABIVER}
 WRKSRC=		${WRKDIR}/pyside-setup-opensource-src-${DISTVERSION}/sources/shiboken6
 
+post-install:
+	${RM} ${STAGEDIR}${PREFIX}/bin/shiboken_tool.py
 .include <bsd.port.post.mk>
diff --git a/devel/shiboken6/pkg-plist b/devel/shiboken6/pkg-plist
index 25003ef03c6d..16459fef12d3 100644
--- a/devel/shiboken6/pkg-plist
+++ b/devel/shiboken6/pkg-plist
@@ -1,57 +1,56 @@
 bin/shiboken6
-bin/shiboken_tool.py
 include/shiboken6/autodecref.h
 include/shiboken6/basewrapper.h
 include/shiboken6/basewrapper_p.h
 include/shiboken6/bindingmanager.h
 include/shiboken6/bufferprocs_py37.h
 include/shiboken6/gilstate.h
 include/shiboken6/helper.h
 include/shiboken6/pep384impl.h
 include/shiboken6/sbkarrayconverter.h
 include/shiboken6/sbkcontainer.h
 include/shiboken6/sbkconverter.h
 include/shiboken6/sbkcppstring.h
 include/shiboken6/sbkcpptonumpy.h
 include/shiboken6/sbkenum.h
 include/shiboken6/sbkenum_p.h
 include/shiboken6/sbkerrors.h
 include/shiboken6/sbkfeature_base.h
 include/shiboken6/sbkmodule.h
 include/shiboken6/sbknumpycheck.h
 include/shiboken6/sbknumpyview.h
 include/shiboken6/sbkpython.h
 include/shiboken6/sbkstaticstrings.h
 include/shiboken6/sbkstring.h
 include/shiboken6/sbktypefactory.h
 include/shiboken6/sbkversion.h
 include/shiboken6/shiboken.h
 include/shiboken6/shibokenbuffer.h
 include/shiboken6/shibokenmacros.h
 include/shiboken6/signature.h
 include/shiboken6/signature_p.h
 include/shiboken6/threadstatesaver.h
 include/shiboken6/voidptr.h
 lib/cmake/Shiboken6-%%DISTVERSION%%/Shiboken6Config.abi3.cmake
 lib/cmake/Shiboken6-%%DISTVERSION%%/Shiboken6Config.cmake
 lib/cmake/Shiboken6-%%DISTVERSION%%/Shiboken6ConfigVersion.cmake
 lib/cmake/Shiboken6-%%DISTVERSION%%/Shiboken6Targets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/Shiboken6-%%DISTVERSION%%/Shiboken6Targets.cmake
 lib/cmake/Shiboken6-%%DISTVERSION%%/ShibokenHelpers.cmake
 lib/cmake/Shiboken6Tools/Shiboken6ToolsConfig.cmake
 lib/cmake/Shiboken6Tools/Shiboken6ToolsConfigVersion.cmake
 lib/cmake/Shiboken6Tools/Shiboken6ToolsTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/Shiboken6Tools/Shiboken6ToolsTargets.cmake
 lib/libshiboken6.abi3.so
 lib/libshiboken6.abi3.so.6.4
 lib/libshiboken6.abi3.so.%%DISTVERSION%%
 %%PYTHON_SITELIBDIR%%/shiboken6/Shiboken.abi3.so
 %%PYTHON_SITELIBDIR%%/shiboken6/Shiboken.pyi
 %%PYTHON_SITELIBDIR%%/shiboken6/__init__.py
 %%PYTHON_SITELIBDIR%%/shiboken6/_config.py
 %%PYTHON_SITELIBDIR%%/shiboken6/_git_shiboken_module_version.py
 %%PYTHON_SITELIBDIR%%/shiboken6/py.typed
 %%PYTHON_SITELIBDIR%%/shiboken6_generator/__init__.py
 %%PYTHON_SITELIBDIR%%/shiboken6_generator/_config.py
 %%PYTHON_SITELIBDIR%%/shiboken6_generator/_git_shiboken_generator_version.py
 libdata/pkgconfig/shiboken6.pc