diff --git a/x11/qt5/qtcanvas3d/Makefile b/x11/qt5/qtcanvas3d/Makefile
deleted file mode 100644
index 17075ef9c72..00000000000
--- a/x11/qt5/qtcanvas3d/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# $OpenBSD: Makefile,v 1.10 2020/03/13 16:53:50 rsadowski Exp $
-
-QT5NAME =		QtCanvas3D
-COMMENT-main =		QML types for the Qt5 Canvas 3D API
-
-MULTI_PACKAGES =	-main -examples
-
-WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui Qt5Network Qt5Qml
-WANTLIB += Qt5Quick m
-
-LIB_DEPENDS =		x11/qt5/qtdeclarative>=${QT5_VERSION},<${QT5_NEXT_VERSION}
-
-FLAVORS =		debug
-
-.include <bsd.port.mk>
diff --git a/x11/qt5/qtcanvas3d/distinfo b/x11/qt5/qtcanvas3d/distinfo
deleted file mode 100644
index c368e2d0921..00000000000
--- a/x11/qt5/qtcanvas3d/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (qt/qtcanvas3d-opensource-src-5.9.8.tar.xz) = lEeMaKu/CBWB7aWT/cDWn/ExQ14FUNqho23Gs+ryGm8=
-SIZE (qt/qtcanvas3d-opensource-src-5.9.8.tar.xz) = 10890748
diff --git a/x11/qt5/qtcanvas3d/pkg/DESCR-examples b/x11/qt5/qtcanvas3d/pkg/DESCR-examples
deleted file mode 100644
index 33c8efa9920..00000000000
--- a/x11/qt5/qtcanvas3d/pkg/DESCR-examples
+++ /dev/null
@@ -1,3 +0,0 @@
-QtCanvas3D consists of QML types for the Qt Canvas 3D API.
-
-This package contains sources for QtCanvas3D usage examples.
diff --git a/x11/qt5/qtcanvas3d/pkg/DESCR-main b/x11/qt5/qtcanvas3d/pkg/DESCR-main
deleted file mode 100644
index 6d9c476be18..00000000000
--- a/x11/qt5/qtcanvas3d/pkg/DESCR-main
+++ /dev/null
@@ -1,3 +0,0 @@
-QtCanvas3D consists of QML types for the Qt Canvas 3D API.
-
-This package contains actual QML types to be used in apps.
diff --git a/x11/qt5/qtcanvas3d/pkg/PLIST-examples b/x11/qt5/qtcanvas3d/pkg/PLIST-examples
deleted file mode 100644
index 16f4ff03e2a..00000000000
--- a/x11/qt5/qtcanvas3d/pkg/PLIST-examples
+++ /dev/null
@@ -1,239 +0,0 @@
-@comment $OpenBSD: PLIST-examples,v 1.2 2017/07/17 08:34:38 zhuk Exp $
-lib/qt5/examples/canvas3d/
-lib/qt5/examples/canvas3d/3rdparty/
-lib/qt5/examples/canvas3d/3rdparty/ThreeJSLoader.js
-lib/qt5/examples/canvas3d/3rdparty/gl-matrix.js
-lib/qt5/examples/canvas3d/3rdparty/three.js
-lib/qt5/examples/canvas3d/3rdparty/threex.planets.js
-lib/qt5/examples/canvas3d/canvas3d.pro
-lib/qt5/examples/canvas3d/framebuffer/
-lib/qt5/examples/canvas3d/framebuffer/doc/
-lib/qt5/examples/canvas3d/framebuffer/doc/images/
-lib/qt5/examples/canvas3d/framebuffer/doc/images/framebuffer-example.png
-lib/qt5/examples/canvas3d/framebuffer/doc/src/
-lib/qt5/examples/canvas3d/framebuffer/doc/src/framebuffer.qdoc
-lib/qt5/examples/canvas3d/framebuffer/framebuffer.pro
-lib/qt5/examples/canvas3d/framebuffer/framebuffer.qrc
-lib/qt5/examples/canvas3d/framebuffer/main.cpp
-lib/qt5/examples/canvas3d/framebuffer/qml/
-lib/qt5/examples/canvas3d/framebuffer/qml/framebuffer/
-lib/qt5/examples/canvas3d/framebuffer/qml/framebuffer/framebuffer.js
-lib/qt5/examples/canvas3d/framebuffer/qml/framebuffer/main.qml
-lib/qt5/examples/canvas3d/framebuffer/qml/framebuffer/qtlogo.png
-lib/qt5/examples/canvas3d/interaction/
-lib/qt5/examples/canvas3d/interaction/3dmodels.txt
-lib/qt5/examples/canvas3d/interaction/doc/
-lib/qt5/examples/canvas3d/interaction/doc/images/
-lib/qt5/examples/canvas3d/interaction/doc/images/interaction-example.png
-lib/qt5/examples/canvas3d/interaction/doc/src/
-lib/qt5/examples/canvas3d/interaction/doc/src/interaction.qdoc
-lib/qt5/examples/canvas3d/interaction/interaction.pro
-lib/qt5/examples/canvas3d/interaction/interaction.qrc
-lib/qt5/examples/canvas3d/interaction/main.cpp
-lib/qt5/examples/canvas3d/interaction/qml/
-lib/qt5/examples/canvas3d/interaction/qml/interaction/
-lib/qt5/examples/canvas3d/interaction/qml/interaction/barrel.jpg
-lib/qt5/examples/canvas3d/interaction/qml/interaction/barrel.json
-lib/qt5/examples/canvas3d/interaction/qml/interaction/interaction.js
-lib/qt5/examples/canvas3d/interaction/qml/interaction/main.qml
-lib/qt5/examples/canvas3d/interaction/readme.txt
-lib/qt5/examples/canvas3d/jsonmodels/
-lib/qt5/examples/canvas3d/jsonmodels/3dmodels.txt
-lib/qt5/examples/canvas3d/jsonmodels/doc/
-lib/qt5/examples/canvas3d/jsonmodels/doc/images/
-lib/qt5/examples/canvas3d/jsonmodels/doc/images/jsonmodels-example.png
-lib/qt5/examples/canvas3d/jsonmodels/doc/src/
-lib/qt5/examples/canvas3d/jsonmodels/doc/src/jsonmodels.qdoc
-lib/qt5/examples/canvas3d/jsonmodels/jsonmodels.pro
-lib/qt5/examples/canvas3d/jsonmodels/main.cpp
-lib/qt5/examples/canvas3d/jsonmodels/qml/
-lib/qt5/examples/canvas3d/jsonmodels/qml.qrc
-lib/qt5/examples/canvas3d/jsonmodels/qml/jsonmodels/
-lib/qt5/examples/canvas3d/jsonmodels/qml/jsonmodels/bush.json
-lib/qt5/examples/canvas3d/jsonmodels/qml/jsonmodels/bush.png
-lib/qt5/examples/canvas3d/jsonmodels/qml/jsonmodels/gold.jpg
-lib/qt5/examples/canvas3d/jsonmodels/qml/jsonmodels/gold.json
-lib/qt5/examples/canvas3d/jsonmodels/qml/jsonmodels/jsonmodels.js
-lib/qt5/examples/canvas3d/jsonmodels/qml/jsonmodels/jsonmodels.qml
-lib/qt5/examples/canvas3d/jsonmodels/qml/jsonmodels/pallet.jpg
-lib/qt5/examples/canvas3d/jsonmodels/qml/jsonmodels/pallet.json
-lib/qt5/examples/canvas3d/jsonmodels/qml/jsonmodels/rock.jpg
-lib/qt5/examples/canvas3d/jsonmodels/qml/jsonmodels/rock.json
-lib/qt5/examples/canvas3d/jsonmodels/qml/jsonmodels/woodbox.jpg
-lib/qt5/examples/canvas3d/jsonmodels/qml/jsonmodels/woodbox.json
-lib/qt5/examples/canvas3d/jsonmodels/readme.txt
-lib/qt5/examples/canvas3d/quickitemtexture/
-lib/qt5/examples/canvas3d/quickitemtexture/doc/
-lib/qt5/examples/canvas3d/quickitemtexture/doc/images/
-lib/qt5/examples/canvas3d/quickitemtexture/doc/images/quickitemtexture-example.png
-lib/qt5/examples/canvas3d/quickitemtexture/doc/src/
-lib/qt5/examples/canvas3d/quickitemtexture/doc/src/quickitemtexture.qdoc
-lib/qt5/examples/canvas3d/quickitemtexture/main.cpp
-lib/qt5/examples/canvas3d/quickitemtexture/qml/
-lib/qt5/examples/canvas3d/quickitemtexture/qml/quickitemtexture/
-lib/qt5/examples/canvas3d/quickitemtexture/qml/quickitemtexture/main.qml
-lib/qt5/examples/canvas3d/quickitemtexture/qml/quickitemtexture/quickitemtexture.js
-lib/qt5/examples/canvas3d/quickitemtexture/quickitemtexture.pro
-lib/qt5/examples/canvas3d/quickitemtexture/quickitemtexture.qrc
-lib/qt5/examples/canvas3d/textureandlight/
-lib/qt5/examples/canvas3d/textureandlight/doc/
-lib/qt5/examples/canvas3d/textureandlight/doc/images/
-lib/qt5/examples/canvas3d/textureandlight/doc/images/textureandlight-example.png
-lib/qt5/examples/canvas3d/textureandlight/doc/src/
-lib/qt5/examples/canvas3d/textureandlight/doc/src/textureandlight.qdoc
-lib/qt5/examples/canvas3d/textureandlight/main.cpp
-lib/qt5/examples/canvas3d/textureandlight/qml/
-lib/qt5/examples/canvas3d/textureandlight/qml/textureandlight/
-lib/qt5/examples/canvas3d/textureandlight/qml/textureandlight/main.qml
-lib/qt5/examples/canvas3d/textureandlight/qml/textureandlight/qtlogo.png
-lib/qt5/examples/canvas3d/textureandlight/qml/textureandlight/textureandlight.js
-lib/qt5/examples/canvas3d/textureandlight/textureandlight.pro
-lib/qt5/examples/canvas3d/textureandlight/textureandlight.qrc
-lib/qt5/examples/canvas3d/threejs/
-lib/qt5/examples/canvas3d/threejs/cellphone/
-lib/qt5/examples/canvas3d/threejs/cellphone/cellphone.pro
-lib/qt5/examples/canvas3d/threejs/cellphone/cellphone.qrc
-lib/qt5/examples/canvas3d/threejs/cellphone/doc/
-lib/qt5/examples/canvas3d/threejs/cellphone/doc/images/
-lib/qt5/examples/canvas3d/threejs/cellphone/doc/images/cellphone-example.png
-lib/qt5/examples/canvas3d/threejs/cellphone/doc/src/
-lib/qt5/examples/canvas3d/threejs/cellphone/doc/src/cellphone.qdoc
-lib/qt5/examples/canvas3d/threejs/cellphone/images/
-lib/qt5/examples/canvas3d/threejs/cellphone/images/calendar.png
-lib/qt5/examples/canvas3d/threejs/cellphone/images/camera.png
-lib/qt5/examples/canvas3d/threejs/cellphone/images/clock.png
-lib/qt5/examples/canvas3d/threejs/cellphone/images/contacts.png
-lib/qt5/examples/canvas3d/threejs/cellphone/images/gallery.png
-lib/qt5/examples/canvas3d/threejs/cellphone/images/games.png
-lib/qt5/examples/canvas3d/threejs/cellphone/images/lock.png
-lib/qt5/examples/canvas3d/threejs/cellphone/images/mail.png
-lib/qt5/examples/canvas3d/threejs/cellphone/images/maps.png
-lib/qt5/examples/canvas3d/threejs/cellphone/images/menu_background.jpg
-lib/qt5/examples/canvas3d/threejs/cellphone/images/music.png
-lib/qt5/examples/canvas3d/threejs/cellphone/images/plutomap1k.jpg
-lib/qt5/examples/canvas3d/threejs/cellphone/images/qtlogo_with_alpha.png
-lib/qt5/examples/canvas3d/threejs/cellphone/images/settings.png
-lib/qt5/examples/canvas3d/threejs/cellphone/images/todo.png
-lib/qt5/examples/canvas3d/threejs/cellphone/images/videos.png
-lib/qt5/examples/canvas3d/threejs/cellphone/main.cpp
-lib/qt5/examples/canvas3d/threejs/cellphone/qml/
-lib/qt5/examples/canvas3d/threejs/cellphone/qml/cellphone/
-lib/qt5/examples/canvas3d/threejs/cellphone/qml/cellphone/cellphone.js
-lib/qt5/examples/canvas3d/threejs/cellphone/qml/cellphone/cellphone_case.json
-lib/qt5/examples/canvas3d/threejs/cellphone/qml/cellphone/cellphone_front.json
-lib/qt5/examples/canvas3d/threejs/cellphone/qml/cellphone/cellphone_icon.json
-lib/qt5/examples/canvas3d/threejs/cellphone/qml/cellphone/cellphoneapp.qml
-lib/qt5/examples/canvas3d/threejs/cellphone/qml/cellphone/cellphonecanvas.qml
-lib/qt5/examples/canvas3d/threejs/cellphone/qml/cellphone/colorselector.qml
-lib/qt5/examples/canvas3d/threejs/cellphone/qml/cellphone/fpsdisplay.qml
-lib/qt5/examples/canvas3d/threejs/cellphone/qml/cellphone/main.qml
-lib/qt5/examples/canvas3d/threejs/controls/
-lib/qt5/examples/canvas3d/threejs/controls/ControlEventSource.qml
-lib/qt5/examples/canvas3d/threejs/oneqt/
-lib/qt5/examples/canvas3d/threejs/oneqt/ImageCube.qml
-lib/qt5/examples/canvas3d/threejs/oneqt/InfoSheet.qml
-lib/qt5/examples/canvas3d/threejs/oneqt/Navibutton.qml
-lib/qt5/examples/canvas3d/threejs/oneqt/SwipeArea.qml
-lib/qt5/examples/canvas3d/threejs/oneqt/doc/
-lib/qt5/examples/canvas3d/threejs/oneqt/doc/images/
-lib/qt5/examples/canvas3d/threejs/oneqt/doc/images/oneqt-example.png
-lib/qt5/examples/canvas3d/threejs/oneqt/doc/src/
-lib/qt5/examples/canvas3d/threejs/oneqt/doc/src/oneqt.qdoc
-lib/qt5/examples/canvas3d/threejs/oneqt/imagecube.js
-lib/qt5/examples/canvas3d/threejs/oneqt/ios/
-lib/qt5/examples/canvas3d/threejs/oneqt/ios/Info.plist
-lib/qt5/examples/canvas3d/threejs/oneqt/ios/OneQtIcon29x29.png
-lib/qt5/examples/canvas3d/threejs/oneqt/ios/OneQtIcon29x29@2x.png
-lib/qt5/examples/canvas3d/threejs/oneqt/ios/OneQtIcon29x29@2x~ipad.png
-lib/qt5/examples/canvas3d/threejs/oneqt/ios/OneQtIcon29x29~ipad.png
-lib/qt5/examples/canvas3d/threejs/oneqt/ios/OneQtIcon40x40@2x.png
-lib/qt5/examples/canvas3d/threejs/oneqt/ios/OneQtIcon40x40@2x~ipad.png
-lib/qt5/examples/canvas3d/threejs/oneqt/ios/OneQtIcon40x40~ipad.png
-lib/qt5/examples/canvas3d/threejs/oneqt/ios/OneQtIcon50x50@2x~ipad.png
-lib/qt5/examples/canvas3d/threejs/oneqt/ios/OneQtIcon50x50~ipad.png
-lib/qt5/examples/canvas3d/threejs/oneqt/ios/OneQtIcon57x57.png
-lib/qt5/examples/canvas3d/threejs/oneqt/ios/OneQtIcon57x57@2x.png
-lib/qt5/examples/canvas3d/threejs/oneqt/ios/OneQtIcon60x60@2x.png
-lib/qt5/examples/canvas3d/threejs/oneqt/ios/OneQtIcon72x72@2x~ipad.png
-lib/qt5/examples/canvas3d/threejs/oneqt/ios/OneQtIcon72x72~ipad.png
-lib/qt5/examples/canvas3d/threejs/oneqt/ios/OneQtIcon76x76@2x~ipad.png
-lib/qt5/examples/canvas3d/threejs/oneqt/ios/OneQtIcon76x76~ipad.png
-lib/qt5/examples/canvas3d/threejs/oneqt/main.cpp
-lib/qt5/examples/canvas3d/threejs/oneqt/oneqt.pro
-lib/qt5/examples/canvas3d/threejs/oneqt/oneqt.qml
-lib/qt5/examples/canvas3d/threejs/oneqt/oneqt.qrc
-lib/qt5/examples/canvas3d/threejs/oneqt/textures/
-lib/qt5/examples/canvas3d/threejs/oneqt/textures/dataviz.jpg
-lib/qt5/examples/canvas3d/threejs/oneqt/textures/devices.png
-lib/qt5/examples/canvas3d/threejs/oneqt/textures/embedded.png
-lib/qt5/examples/canvas3d/threejs/oneqt/textures/iot.png
-lib/qt5/examples/canvas3d/threejs/oneqt/textures/multiscreen.png
-lib/qt5/examples/canvas3d/threejs/oneqt/textures/puzzle-pieces.png
-lib/qt5/examples/canvas3d/threejs/oneqt/textures/qtlogo.png
-lib/qt5/examples/canvas3d/threejs/oneqt/textures/qtlogosmall.png
-lib/qt5/examples/canvas3d/threejs/planets/
-lib/qt5/examples/canvas3d/threejs/planets/FpsDisplay.qml
-lib/qt5/examples/canvas3d/threejs/planets/InfoSheet.qml
-lib/qt5/examples/canvas3d/threejs/planets/PlanetButton.qml
-lib/qt5/examples/canvas3d/threejs/planets/StyledSlider.qml
-lib/qt5/examples/canvas3d/threejs/planets/doc/
-lib/qt5/examples/canvas3d/threejs/planets/doc/images/
-lib/qt5/examples/canvas3d/threejs/planets/doc/images/planets-example.jpg
-lib/qt5/examples/canvas3d/threejs/planets/doc/src/
-lib/qt5/examples/canvas3d/threejs/planets/doc/src/planets.qdoc
-lib/qt5/examples/canvas3d/threejs/planets/images/
-lib/qt5/examples/canvas3d/threejs/planets/images/earth.png
-lib/qt5/examples/canvas3d/threejs/planets/images/earthbump1k.jpg
-lib/qt5/examples/canvas3d/threejs/planets/images/earthcloudmapcolortrans.png
-lib/qt5/examples/canvas3d/threejs/planets/images/earthmap1k.jpg
-lib/qt5/examples/canvas3d/threejs/planets/images/earthspec1k.jpg
-lib/qt5/examples/canvas3d/threejs/planets/images/galaxy_starfield.png
-lib/qt5/examples/canvas3d/threejs/planets/images/jupiter.png
-lib/qt5/examples/canvas3d/threejs/planets/images/jupitermap.jpg
-lib/qt5/examples/canvas3d/threejs/planets/images/mars.png
-lib/qt5/examples/canvas3d/threejs/planets/images/marsbump1k.jpg
-lib/qt5/examples/canvas3d/threejs/planets/images/marsmap1k.jpg
-lib/qt5/examples/canvas3d/threejs/planets/images/mercury.png
-lib/qt5/examples/canvas3d/threejs/planets/images/mercurybump.jpg
-lib/qt5/examples/canvas3d/threejs/planets/images/mercurymap.jpg
-lib/qt5/examples/canvas3d/threejs/planets/images/moonbump1k.jpg
-lib/qt5/examples/canvas3d/threejs/planets/images/moonmap1k.jpg
-lib/qt5/examples/canvas3d/threejs/planets/images/neptune.png
-lib/qt5/examples/canvas3d/threejs/planets/images/neptunemap.jpg
-lib/qt5/examples/canvas3d/threejs/planets/images/plutobump1k.jpg
-lib/qt5/examples/canvas3d/threejs/planets/images/plutomap1k.jpg
-lib/qt5/examples/canvas3d/threejs/planets/images/saturn.png
-lib/qt5/examples/canvas3d/threejs/planets/images/saturnmap.jpg
-lib/qt5/examples/canvas3d/threejs/planets/images/saturnringcolortrans.png
-lib/qt5/examples/canvas3d/threejs/planets/images/sun.png
-lib/qt5/examples/canvas3d/threejs/planets/images/sunmap.jpg
-lib/qt5/examples/canvas3d/threejs/planets/images/uranus.png
-lib/qt5/examples/canvas3d/threejs/planets/images/uranusmap.jpg
-lib/qt5/examples/canvas3d/threejs/planets/images/uranusringcolortrans.png
-lib/qt5/examples/canvas3d/threejs/planets/images/venus.png
-lib/qt5/examples/canvas3d/threejs/planets/images/venusbump.jpg
-lib/qt5/examples/canvas3d/threejs/planets/images/venusmap.jpg
-lib/qt5/examples/canvas3d/threejs/planets/ios/
-lib/qt5/examples/canvas3d/threejs/planets/ios/AppIcon29x29.png
-lib/qt5/examples/canvas3d/threejs/planets/ios/AppIcon29x29@2x.png
-lib/qt5/examples/canvas3d/threejs/planets/ios/AppIcon29x29@2x~ipad.png
-lib/qt5/examples/canvas3d/threejs/planets/ios/AppIcon29x29~ipad.png
-lib/qt5/examples/canvas3d/threejs/planets/ios/AppIcon40x40@2x.png
-lib/qt5/examples/canvas3d/threejs/planets/ios/AppIcon40x40@2x~ipad.png
-lib/qt5/examples/canvas3d/threejs/planets/ios/AppIcon40x40~ipad.png
-lib/qt5/examples/canvas3d/threejs/planets/ios/AppIcon50x50@2x~ipad.png
-lib/qt5/examples/canvas3d/threejs/planets/ios/AppIcon50x50~ipad.png
-lib/qt5/examples/canvas3d/threejs/planets/ios/AppIcon57x57.png
-lib/qt5/examples/canvas3d/threejs/planets/ios/AppIcon57x57@2x.png
-lib/qt5/examples/canvas3d/threejs/planets/ios/AppIcon60x60@2x.png
-lib/qt5/examples/canvas3d/threejs/planets/ios/AppIcon72x72@2x~ipad.png
-lib/qt5/examples/canvas3d/threejs/planets/ios/AppIcon72x72~ipad.png
-lib/qt5/examples/canvas3d/threejs/planets/ios/AppIcon76x76@2x~ipad.png
-lib/qt5/examples/canvas3d/threejs/planets/ios/AppIcon76x76~ipad.png
-lib/qt5/examples/canvas3d/threejs/planets/ios/Info.plist
-lib/qt5/examples/canvas3d/threejs/planets/main.cpp
-lib/qt5/examples/canvas3d/threejs/planets/planets.js
-lib/qt5/examples/canvas3d/threejs/planets/planets.pro
-lib/qt5/examples/canvas3d/threejs/planets/planets.qml
-lib/qt5/examples/canvas3d/threejs/planets/planets.qrc
-lib/qt5/examples/canvas3d/threejs/threejs.pro
diff --git a/x11/qt5/qtcanvas3d/pkg/PLIST-main b/x11/qt5/qtcanvas3d/pkg/PLIST-main
deleted file mode 100644
index 70244be90a4..00000000000
--- a/x11/qt5/qtcanvas3d/pkg/PLIST-main
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $OpenBSD: PLIST-main,v 1.3 2020/03/13 16:53:50 rsadowski Exp $
-lib/qt5/qml/QtCanvas3D/
-lib/qt5/qml/QtCanvas3D/libqtcanvas3d.so
-lib/qt5/qml/QtCanvas3D/plugins.qmltypes
-lib/qt5/qml/QtCanvas3D/qmldir