git: 12c193069e33 - main - devel/qt6-base: make CUPS support optional (but on by default).

The branch main has been updated by danfe:

URL: https://cgit.FreeBSD.org/ports/commit/?id=12c193069e336351eb9e0a37e0d845bc381baa91

commit 12c193069e336351eb9e0a37e0d845bc381baa91
Author:     Alexey Dokuchaev <danfe@FreeBSD.org>
AuthorDate: 2023-04-02 13:09:54 +0000
Commit:     Alexey Dokuchaev <danfe@FreeBSD.org>
CommitDate: 2023-04-02 13:09:54 +0000

    devel/qt6-base: make CUPS support optional (but on by default).
---
 devel/qt6-base/Makefile  |  8 +++++---
 devel/qt6-base/pkg-plist | 16 ++++++++--------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/devel/qt6-base/Makefile b/devel/qt6-base/Makefile
index 105a99f4f4d1..e4b9af3208e3 100644
--- a/devel/qt6-base/Makefile
+++ b/devel/qt6-base/Makefile
@@ -17,7 +17,6 @@ LIB_DEPENDS=	\
 		libatspi.so:accessibility/at-spi2-core \
 		libavahi-client.so:net/avahi-app \
 		libbrotlidec.so:archivers/brotli \
-		libcups.so:print/cups \
 		libdbus-1.so:devel/dbus \
 		libdouble-conversion.so:devel/double-conversion \
 		libdrm.so:graphics/libdrm \
@@ -80,12 +79,15 @@ 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
 
-#== Option handling
+OPTIONS_DEFINE=		CUPS
 OPTIONS_GROUP=		SQL
 OPTIONS_GROUP_SQL=	IBASE MYSQL ODBC PSQL SQLITE
-OPTIONS_DEFAULT=	SQLITE
+OPTIONS_DEFAULT=	CUPS SQLITE
 OPTIONS_SUB=		yes
 
+CUPS_LIB_DEPENDS=	libcups.so:print/cups
+CUPS_CMAKE_OFF=		-DFEATURE_cups=OFF
+
 IBASE_DESC=		InterBase database support
 IBASE_CMAKE_ON=		-DFEATURE_sql_ibase=ON
 IBASE_CMAKE_OFF=	-DFEATURE_sql_ibase=OFF
diff --git a/devel/qt6-base/pkg-plist b/devel/qt6-base/pkg-plist
index 4609ba9f9665..c7a06dabe10a 100644
--- a/devel/qt6-base/pkg-plist
+++ b/devel/qt6-base/pkg-plist
@@ -2909,16 +2909,16 @@ lib/cmake/Qt6PrintSupport/Qt6PrintSupportConfig.cmake
 lib/cmake/Qt6PrintSupport/Qt6PrintSupportConfigVersion.cmake
 lib/cmake/Qt6PrintSupport/Qt6PrintSupportConfigVersionImpl.cmake
 lib/cmake/Qt6PrintSupport/Qt6PrintSupportDependencies.cmake
-lib/cmake/Qt6PrintSupport/Qt6PrintSupportPlugins.cmake
+%%CUPS%%lib/cmake/Qt6PrintSupport/Qt6PrintSupportPlugins.cmake
 lib/cmake/Qt6PrintSupport/Qt6PrintSupportTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/Qt6PrintSupport/Qt6PrintSupportTargets.cmake
 lib/cmake/Qt6PrintSupport/Qt6PrintSupportVersionlessTargets.cmake
-lib/cmake/Qt6PrintSupport/Qt6QCupsPrinterSupportPluginAdditionalTargetInfo.cmake
-lib/cmake/Qt6PrintSupport/Qt6QCupsPrinterSupportPluginConfig.cmake
-lib/cmake/Qt6PrintSupport/Qt6QCupsPrinterSupportPluginConfigVersion.cmake
-lib/cmake/Qt6PrintSupport/Qt6QCupsPrinterSupportPluginConfigVersionImpl.cmake
-lib/cmake/Qt6PrintSupport/Qt6QCupsPrinterSupportPluginTargets-%%CMAKE_BUILD_TYPE%%.cmake
-lib/cmake/Qt6PrintSupport/Qt6QCupsPrinterSupportPluginTargets.cmake
+%%CUPS%%lib/cmake/Qt6PrintSupport/Qt6QCupsPrinterSupportPluginAdditionalTargetInfo.cmake
+%%CUPS%%lib/cmake/Qt6PrintSupport/Qt6QCupsPrinterSupportPluginConfig.cmake
+%%CUPS%%lib/cmake/Qt6PrintSupport/Qt6QCupsPrinterSupportPluginConfigVersion.cmake
+%%CUPS%%lib/cmake/Qt6PrintSupport/Qt6QCupsPrinterSupportPluginConfigVersionImpl.cmake
+%%CUPS%%lib/cmake/Qt6PrintSupport/Qt6QCupsPrinterSupportPluginTargets-%%CMAKE_BUILD_TYPE%%.cmake
+%%CUPS%%lib/cmake/Qt6PrintSupport/Qt6QCupsPrinterSupportPluginTargets.cmake
 %%MYSQL%%lib/cmake/Qt6Sql/Qt6QMYSQLDriverPluginAdditionalTargetInfo.cmake
 %%MYSQL%%lib/cmake/Qt6Sql/Qt6QMYSQLDriverPluginConfig.cmake
 %%MYSQL%%lib/cmake/Qt6Sql/Qt6QMYSQLDriverPluginConfigVersion.cmake
@@ -3600,7 +3600,7 @@ lib/cmake/Qt6Xml/Qt6XmlVersionlessTargets.cmake
 %%QT_PLUGINDIR%%/platforms/libqxcb.so
 %%QT_PLUGINDIR%%/platformthemes/libqgtk3.so
 %%QT_PLUGINDIR%%/platformthemes/libqxdgdesktopportal.so
-%%QT_PLUGINDIR%%/printsupport/libcupsprintersupport.so
+%%CUPS%%%%QT_PLUGINDIR%%/printsupport/libcupsprintersupport.so
 %%SQLITE%%%%QT_PLUGINDIR%%/sqldrivers/libqsqlite.so
 %%MYSQL%%%%QT_PLUGINDIR%%/sqldrivers/libqsqlmysql.so
 %%ODBC%%%%QT_PLUGINDIR%%/sqldrivers/libqsqlodbc.so