devel/qt6-base: make X11 optional

===>   qt6-base-6.4.2_2 depends on shared library: libGL.so - not found
===>   Installing existing package /packages/All/libglvnd-1.6.0.pkg
Installing libglvnd-1.6.0...
the most recent version of libglvnd-1.6.0 is already installed
===>   qt6-base-6.4.2_2 depends on shared library: libGL.so - not found
*** Error code 1

2 files changed, 50 insertions, 48 deletions

diff --git a/devel/qt6-base/Makefile b/devel/qt6-base/Makefile
index e15d9474c250..66a5f7884244 100644
--- a/devel/qt6-base/Makefile
+++ b/devel/qt6-base/Makefile
@@ -53,21 +53,13 @@ LIB_DEPENDS=	\
 		libvulkan.so:graphics/vulkan-loader \
 		libwacom.so:x11/libwacom \
 		libwayland-client.so:graphics/wayland \
-		libxcb-cursor.so:x11/xcb-util-cursor \
-		libxcb-ewmh.so:x11/xcb-util-wm \
-		libxcb-image.so:x11/xcb-util-image \
-		libxcb-keysyms.so:x11/xcb-util-keysyms \
-		libxcb-render-util.so:x11/xcb-util-renderutil \
-		libxcb-util.so:x11/xcb-util \
 		libxkbcommon.so:x11/libxkbcommon \
 		libzstd.so:archivers/zstd
 
 USES=		cmake compiler:c++17-lang gl gnome jpeg perl5 pkgconfig python \
-		qt-dist:6 shebangfix xorg
-USE_GL=		egl gl
+		qt-dist:6 shebangfix
+USE_GL=		egl opengl
 USE_GNOME=	cairo gdkpixbuf2 glib20 gtk30 pango
-USE_XORG=	ice pixman sm x11 xau xcb xcomposite xcursor xdamage xdmcp \
-		xext xfixes xi xinerama xrandr xrender
 CMAKE_ON=	QT_AVOID_CMAKE_ARCHIVING_API \
 		QT_FIND_ALL_PACKAGES_ALWAYS
 CMAKE_OFF=	QT_FEATURE_eglfs \
@@ -88,13 +80,23 @@ USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
 # zstd from base fails to compress files during the build (error 11: unsupported argument)
 BINARY_ALIAS=	zstd=${LOCALBASE}/bin/zstd
 
-OPTIONS_DEFINE=		CUPS
-OPTIONS_DEFAULT=	CUPS
+OPTIONS_DEFINE=		CUPS X11
+OPTIONS_DEFAULT=	CUPS X11
 OPTIONS_SUB=		yes
 
 CUPS_LIB_DEPENDS=	libcups.so:print/cups
 CUPS_CMAKE_OFF=		-DFEATURE_cups=OFF
 
+X11_USES=		xorg
+X11_USE=		XORG=ice,pixman,sm,x11,xau,xcb,xcomposite,xcursor,xdamage,xdmcp,xext,xfixes,xi,xinerama,xrandr,xrender
+X11_CMAKE_BOOL=		FEATURE_xcb FEATURE_xlib
+X11_LIB_DEPENDS=	libxcb-cursor.so:x11/xcb-util-cursor \
+			libxcb-icccm.so:x11/xcb-util-wm \
+			libxcb-image.so:x11/xcb-util-image \
+			libxcb-keysyms.so:x11/xcb-util-keysyms \
+			libxcb-render-util.so:x11/xcb-util-renderutil \
+			libxcb-util.so:x11/xcb-util
+
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "armv6" || ${ARCH} == "armv7"
diff --git a/devel/qt6-base/pkg-plist b/devel/qt6-base/pkg-plist
index e7d50074d235..ebc90e4c0cce 100644
--- a/devel/qt6-base/pkg-plist
+++ b/devel/qt6-base/pkg-plist
@@ -2812,24 +2812,24 @@ lib/cmake/Qt6Gui/Qt6QVncIntegrationPluginConfigVersion.cmake
 lib/cmake/Qt6Gui/Qt6QVncIntegrationPluginConfigVersionImpl.cmake
 lib/cmake/Qt6Gui/Qt6QVncIntegrationPluginTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/Qt6Gui/Qt6QVncIntegrationPluginTargets.cmake
-lib/cmake/Qt6Gui/Qt6QXcbEglIntegrationPluginAdditionalTargetInfo.cmake
-lib/cmake/Qt6Gui/Qt6QXcbEglIntegrationPluginConfig.cmake
-lib/cmake/Qt6Gui/Qt6QXcbEglIntegrationPluginConfigVersion.cmake
-lib/cmake/Qt6Gui/Qt6QXcbEglIntegrationPluginConfigVersionImpl.cmake
-lib/cmake/Qt6Gui/Qt6QXcbEglIntegrationPluginTargets-%%CMAKE_BUILD_TYPE%%.cmake
-lib/cmake/Qt6Gui/Qt6QXcbEglIntegrationPluginTargets.cmake
-lib/cmake/Qt6Gui/Qt6QXcbGlxIntegrationPluginAdditionalTargetInfo.cmake
-lib/cmake/Qt6Gui/Qt6QXcbGlxIntegrationPluginConfig.cmake
-lib/cmake/Qt6Gui/Qt6QXcbGlxIntegrationPluginConfigVersion.cmake
-lib/cmake/Qt6Gui/Qt6QXcbGlxIntegrationPluginConfigVersionImpl.cmake
-lib/cmake/Qt6Gui/Qt6QXcbGlxIntegrationPluginTargets-%%CMAKE_BUILD_TYPE%%.cmake
-lib/cmake/Qt6Gui/Qt6QXcbGlxIntegrationPluginTargets.cmake
-lib/cmake/Qt6Gui/Qt6QXcbIntegrationPluginAdditionalTargetInfo.cmake
-lib/cmake/Qt6Gui/Qt6QXcbIntegrationPluginConfig.cmake
-lib/cmake/Qt6Gui/Qt6QXcbIntegrationPluginConfigVersion.cmake
-lib/cmake/Qt6Gui/Qt6QXcbIntegrationPluginConfigVersionImpl.cmake
-lib/cmake/Qt6Gui/Qt6QXcbIntegrationPluginTargets-%%CMAKE_BUILD_TYPE%%.cmake
-lib/cmake/Qt6Gui/Qt6QXcbIntegrationPluginTargets.cmake
+%%X11%%lib/cmake/Qt6Gui/Qt6QXcbEglIntegrationPluginAdditionalTargetInfo.cmake
+%%X11%%lib/cmake/Qt6Gui/Qt6QXcbEglIntegrationPluginConfig.cmake
+%%X11%%lib/cmake/Qt6Gui/Qt6QXcbEglIntegrationPluginConfigVersion.cmake
+%%X11%%lib/cmake/Qt6Gui/Qt6QXcbEglIntegrationPluginConfigVersionImpl.cmake
+%%X11%%lib/cmake/Qt6Gui/Qt6QXcbEglIntegrationPluginTargets-%%CMAKE_BUILD_TYPE%%.cmake
+%%X11%%lib/cmake/Qt6Gui/Qt6QXcbEglIntegrationPluginTargets.cmake
+%%X11%%lib/cmake/Qt6Gui/Qt6QXcbGlxIntegrationPluginAdditionalTargetInfo.cmake
+%%X11%%lib/cmake/Qt6Gui/Qt6QXcbGlxIntegrationPluginConfig.cmake
+%%X11%%lib/cmake/Qt6Gui/Qt6QXcbGlxIntegrationPluginConfigVersion.cmake
+%%X11%%lib/cmake/Qt6Gui/Qt6QXcbGlxIntegrationPluginConfigVersionImpl.cmake
+%%X11%%lib/cmake/Qt6Gui/Qt6QXcbGlxIntegrationPluginTargets-%%CMAKE_BUILD_TYPE%%.cmake
+%%X11%%lib/cmake/Qt6Gui/Qt6QXcbGlxIntegrationPluginTargets.cmake
+%%X11%%lib/cmake/Qt6Gui/Qt6QXcbIntegrationPluginAdditionalTargetInfo.cmake
+%%X11%%lib/cmake/Qt6Gui/Qt6QXcbIntegrationPluginConfig.cmake
+%%X11%%lib/cmake/Qt6Gui/Qt6QXcbIntegrationPluginConfigVersion.cmake
+%%X11%%lib/cmake/Qt6Gui/Qt6QXcbIntegrationPluginConfigVersionImpl.cmake
+%%X11%%lib/cmake/Qt6Gui/Qt6QXcbIntegrationPluginTargets-%%CMAKE_BUILD_TYPE%%.cmake
+%%X11%%lib/cmake/Qt6Gui/Qt6QXcbIntegrationPluginTargets.cmake
 lib/cmake/Qt6Gui/Qt6QXdgDesktopPortalThemePluginAdditionalTargetInfo.cmake
 lib/cmake/Qt6Gui/Qt6QXdgDesktopPortalThemePluginConfig.cmake
 lib/cmake/Qt6Gui/Qt6QXdgDesktopPortalThemePluginConfigVersion.cmake
@@ -2952,14 +2952,14 @@ lib/cmake/Qt6WidgetsTools/Qt6WidgetsToolsDependencies.cmake
 lib/cmake/Qt6WidgetsTools/Qt6WidgetsToolsTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/Qt6WidgetsTools/Qt6WidgetsToolsTargets.cmake
 lib/cmake/Qt6WidgetsTools/Qt6WidgetsToolsVersionlessTargets.cmake
-lib/cmake/Qt6XcbQpaPrivate/Qt6XcbQpaPrivateAdditionalTargetInfo.cmake
-lib/cmake/Qt6XcbQpaPrivate/Qt6XcbQpaPrivateConfig.cmake
-lib/cmake/Qt6XcbQpaPrivate/Qt6XcbQpaPrivateConfigVersion.cmake
-lib/cmake/Qt6XcbQpaPrivate/Qt6XcbQpaPrivateConfigVersionImpl.cmake
-lib/cmake/Qt6XcbQpaPrivate/Qt6XcbQpaPrivateDependencies.cmake
-lib/cmake/Qt6XcbQpaPrivate/Qt6XcbQpaPrivateTargets-%%CMAKE_BUILD_TYPE%%.cmake
-lib/cmake/Qt6XcbQpaPrivate/Qt6XcbQpaPrivateTargets.cmake
-lib/cmake/Qt6XcbQpaPrivate/Qt6XcbQpaPrivateVersionlessTargets.cmake
+%%X11%%lib/cmake/Qt6XcbQpaPrivate/Qt6XcbQpaPrivateAdditionalTargetInfo.cmake
+%%X11%%lib/cmake/Qt6XcbQpaPrivate/Qt6XcbQpaPrivateConfig.cmake
+%%X11%%lib/cmake/Qt6XcbQpaPrivate/Qt6XcbQpaPrivateConfigVersion.cmake
+%%X11%%lib/cmake/Qt6XcbQpaPrivate/Qt6XcbQpaPrivateConfigVersionImpl.cmake
+%%X11%%lib/cmake/Qt6XcbQpaPrivate/Qt6XcbQpaPrivateDependencies.cmake
+%%X11%%lib/cmake/Qt6XcbQpaPrivate/Qt6XcbQpaPrivateTargets-%%CMAKE_BUILD_TYPE%%.cmake
+%%X11%%lib/cmake/Qt6XcbQpaPrivate/Qt6XcbQpaPrivateTargets.cmake
+%%X11%%lib/cmake/Qt6XcbQpaPrivate/Qt6XcbQpaPrivateVersionlessTargets.cmake
 lib/cmake/Qt6Xml/Qt6XmlAdditionalTargetInfo.cmake
 lib/cmake/Qt6Xml/Qt6XmlConfig.cmake
 lib/cmake/Qt6Xml/Qt6XmlConfigVersion.cmake
@@ -3033,10 +3033,10 @@ lib/cmake/Qt6Xml/Qt6XmlVersionlessTargets.cmake
 %%QT_LIBDIR%%/libQt6Widgets.so
 %%QT_LIBDIR%%/libQt6Widgets.so.6
 %%QT_LIBDIR%%/libQt6Widgets.so.%%FULLVER%%
-%%QT_LIBDIR%%/libQt6XcbQpa.prl
-%%QT_LIBDIR%%/libQt6XcbQpa.so
-%%QT_LIBDIR%%/libQt6XcbQpa.so.6
-%%QT_LIBDIR%%/libQt6XcbQpa.so.%%FULLVER%%
+%%X11%%%%QT_LIBDIR%%/libQt6XcbQpa.prl
+%%X11%%%%QT_LIBDIR%%/libQt6XcbQpa.so
+%%X11%%%%QT_LIBDIR%%/libQt6XcbQpa.so.6
+%%X11%%%%QT_LIBDIR%%/libQt6XcbQpa.so.%%FULLVER%%
 %%QT_LIBDIR%%/libQt6Xml.prl
 %%QT_LIBDIR%%/libQt6Xml.so
 %%QT_LIBDIR%%/libQt6Xml.so.6
@@ -3056,7 +3056,7 @@ lib/cmake/Qt6Xml/Qt6XmlVersionlessTargets.cmake
 %%QT_LIBDIR%%/metatypes/qt6sql_%%CMAKE_BUILD_TYPE%%_metatypes.json
 %%QT_LIBDIR%%/metatypes/qt6test_%%CMAKE_BUILD_TYPE%%_metatypes.json
 %%QT_LIBDIR%%/metatypes/qt6widgets_%%CMAKE_BUILD_TYPE%%_metatypes.json
-%%QT_LIBDIR%%/metatypes/qt6xcbqpaprivate_%%CMAKE_BUILD_TYPE%%_metatypes.json
+%%X11%%%%QT_LIBDIR%%/metatypes/qt6xcbqpaprivate_%%CMAKE_BUILD_TYPE%%_metatypes.json
 %%QT_LIBDIR%%/metatypes/qt6xml_%%CMAKE_BUILD_TYPE%%_metatypes.json
 %%QT_MKSPECDIR%%/aix-g++-64/qmake.conf
 %%QT_MKSPECDIR%%/aix-g++-64/qplatformdefs.h
@@ -3493,7 +3493,7 @@ lib/cmake/Qt6Xml/Qt6XmlVersionlessTargets.cmake
 %%QT_MKSPECDIR%%/modules/qt_lib_testlib_private.pri
 %%QT_MKSPECDIR%%/modules/qt_lib_widgets.pri
 %%QT_MKSPECDIR%%/modules/qt_lib_widgets_private.pri
-%%QT_MKSPECDIR%%/modules/qt_lib_xcb_qpa_lib_private.pri
+%%X11%%%%QT_MKSPECDIR%%/modules/qt_lib_xcb_qpa_lib_private.pri
 %%QT_MKSPECDIR%%/modules/qt_lib_xml.pri
 %%QT_MKSPECDIR%%/modules/qt_lib_xml_private.pri
 %%QT_MKSPECDIR%%/netbsd-g++/qmake.conf
@@ -3572,14 +3572,14 @@ lib/cmake/Qt6Xml/Qt6XmlVersionlessTargets.cmake
 %%QT_PLUGINDIR%%/platforms/libqoffscreen.so
 %%QT_PLUGINDIR%%/platforms/libqvkkhrdisplay.so
 %%QT_PLUGINDIR%%/platforms/libqvnc.so
-%%QT_PLUGINDIR%%/platforms/libqxcb.so
+%%X11%%%%QT_PLUGINDIR%%/platforms/libqxcb.so
 %%QT_PLUGINDIR%%/platformthemes/libqgtk3.so
 %%QT_PLUGINDIR%%/platformthemes/libqxdgdesktopportal.so
 %%CUPS%%%%QT_PLUGINDIR%%/printsupport/libcupsprintersupport.so
 %%QT_PLUGINDIR%%/tls/libqcertonlybackend.so
 %%QT_PLUGINDIR%%/tls/libqopensslbackend.so
-%%QT_PLUGINDIR%%/xcbglintegrations/libqxcb-egl-integration.so
-%%QT_PLUGINDIR%%/xcbglintegrations/libqxcb-glx-integration.so
+%%X11%%%%QT_PLUGINDIR%%/xcbglintegrations/libqxcb-egl-integration.so
+%%X11%%%%QT_PLUGINDIR%%/xcbglintegrations/libqxcb-glx-integration.so
 libdata/pkgconfig/Qt6Concurrent.pc
 libdata/pkgconfig/Qt6Core.pc
 libdata/pkgconfig/Qt6DBus.pc
@@ -3744,7 +3744,7 @@ libdata/pkgconfig/Qt6Xml.pc
 %%QT_DATADIR%%/modules/Sql.json
 %%QT_DATADIR%%/modules/Test.json
 %%QT_DATADIR%%/modules/Widgets.json
-%%QT_DATADIR%%/modules/XcbQpaPrivate.json
+%%X11%%%%QT_DATADIR%%/modules/XcbQpaPrivate.json
 %%QT_DATADIR%%/modules/Xml.json
 @dir lib/cmake/Qt6/QtBuildInternals/QtStandaloneTestTemplateProject
 @dir lib/cmake/Qt6/ios