git: 4ae57550eff8 - main - devel/kf6-extra-cmake-modules: Multiple fixes

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Gleb Popov <arrowd_at_FreeBSD.org>
Date: Fri, 22 Mar 2024 20:20:43 UTC
The branch main has been updated by arrowd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=4ae57550eff8ceec265401f37a1fa738d0b73bc1

commit 4ae57550eff8ceec265401f37a1fa738d0b73bc1
Author:     Gleb Popov <arrowd@FreeBSD.org>
AuthorDate: 2024-03-22 20:17:51 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2024-03-22 20:19:26 +0000

    devel/kf6-extra-cmake-modules: Multiple fixes
    
    - Add LICENSE
    - Fix packaging with different OPTIONS
    - Add testing
    
    PR:             276821
    Based on patch from:    Anton Saietskii <vsasjason@gmail.com>
---
 devel/kf6-extra-cmake-modules/Makefile  |  29 +++--
 devel/kf6-extra-cmake-modules/pkg-plist | 208 ++------------------------------
 2 files changed, 26 insertions(+), 211 deletions(-)

diff --git a/devel/kf6-extra-cmake-modules/Makefile b/devel/kf6-extra-cmake-modules/Makefile
index 5236b0a7ab31..01bb75a2fab0 100644
--- a/devel/kf6-extra-cmake-modules/Makefile
+++ b/devel/kf6-extra-cmake-modules/Makefile
@@ -1,35 +1,44 @@
 PORTNAME=	extra-cmake-modules
 DISTVERSION=	${KDE_FRAMEWORKS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel kde kde-frameworks
 
 COMMENT=	Extra modules and scripts for CMake
 MAINTAINER=	kde@FreeBSD.org
 
-USES=		cmake kde:6 qt:6 shebangfix tar:xz \
+LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/COPYING-CMAKE-SCRIPTS
+
+USES=		cmake:testing kde:6 shebangfix tar:xz \
 		python:build
-USE_QT=		base
-INSTALL_TARGET=	install
+
 SHEBANG_FILES=	kde-modules/kde-git-commit-hooks/json-schema.py
+INSTALL_TARGET=	install # does not have install/strip target
 
 PORTDOCS=	html/*
+DOCSDIR=	${PREFIX}/share/doc/ECM
+NO_ARCH=	yes
 
+SPHINX_DEP=	sphinx-build:textproc/py-sphinx
 ## options
 
 OPTIONS_DEFINE=		DOCS HELP MANPAGES
 OPTIONS_DEFAULT=	HELP MANPAGES
 OPTIONS_SUB=		yes
 
-HELP_DESC=	Generate QtHelp documentation for installed modules
-
-SPHINX_DEP=		sphinx-build:textproc/py-sphinx
 DOCS_BUILD_DEPENDS=	${SPHINX_DEP}
-HELP_BUILD_DEPENDS=	${SPHINX_DEP}
-MANPAGES_BUILD_DEPENDS=	${SPHINX_DEP}
 DOCS_CMAKE_BOOL=	BUILD_HTML_DOCS
+
+HELP_DESC=		Generate QtHelp documentation for installed modules
+HELP_BUILD_DEPENDS=	${SPHINX_DEP}
+HELP_BINARY_ALIAS=	qcollectiongenerator=${LOCALBASE}/libexec/qt6/qhelpgenerator
+HELP_USES=		qt:6
+HELP_USE=		QT=sqldriver-sqlite:build,tools:build
 HELP_CMAKE_BOOL=	BUILD_QTHELP_DOCS
+
+MANPAGES_BUILD_DEPENDS=	${SPHINX_DEP}
 MANPAGES_CMAKE_BOOL=	BUILD_MAN_DOCS
 
-CONFIGURE_ENV+=	CMAKE_PROGRAM_PATH="${LOCALBASE}/bin:${LOCALBASE}/lib/qt5/bin"
-INSTALL_TARGET=	install # does not have install/strip target
+TESTING_UNSAFE=		requires reuse-tool port
 
 .include <bsd.port.mk>
diff --git a/devel/kf6-extra-cmake-modules/pkg-plist b/devel/kf6-extra-cmake-modules/pkg-plist
index 72ea2e4d99d1..33c0333441fc 100644
--- a/devel/kf6-extra-cmake-modules/pkg-plist
+++ b/devel/kf6-extra-cmake-modules/pkg-plist
@@ -130,204 +130,10 @@ share/ECM/toolchain/deployment-file.json.in
 share/ECM/toolchain/generate-fastlane-metadata.py
 share/ECM/toolchain/hasMainSymbol.cmake
 share/ECM/toolchain/specifydependencies.cmake
-share/doc/ECM/html/_sources/find-module/Find7Zip.rst.txt
-share/doc/ECM/html/_sources/find-module/Find7z.rst.txt
-share/doc/ECM/html/_sources/find-module/FindCanberra.rst.txt
-share/doc/ECM/html/_sources/find-module/FindEGL.rst.txt
-share/doc/ECM/html/_sources/find-module/FindGLIB2.rst.txt
-share/doc/ECM/html/_sources/find-module/FindGperf.rst.txt
-share/doc/ECM/html/_sources/find-module/FindGradle.rst.txt
-share/doc/ECM/html/_sources/find-module/FindIcoTool.rst.txt
-share/doc/ECM/html/_sources/find-module/FindInotify.rst.txt
-share/doc/ECM/html/_sources/find-module/FindIsoCodes.rst.txt
-share/doc/ECM/html/_sources/find-module/FindKF5.rst.txt
-share/doc/ECM/html/_sources/find-module/FindLibExiv2.rst.txt
-share/doc/ECM/html/_sources/find-module/FindLibGit2.rst.txt
-share/doc/ECM/html/_sources/find-module/FindLibMount.rst.txt
-share/doc/ECM/html/_sources/find-module/FindLibcap.rst.txt
-share/doc/ECM/html/_sources/find-module/FindOpenEXR.rst.txt
-share/doc/ECM/html/_sources/find-module/FindPhoneNumber.rst.txt
-share/doc/ECM/html/_sources/find-module/FindPoppler.rst.txt
-share/doc/ECM/html/_sources/find-module/FindPulseAudio.rst.txt
-share/doc/ECM/html/_sources/find-module/FindQtWaylandScanner.rst.txt
-share/doc/ECM/html/_sources/find-module/FindSasl2.rst.txt
-share/doc/ECM/html/_sources/find-module/FindSeccomp.rst.txt
-share/doc/ECM/html/_sources/find-module/FindSharedMimeInfo.rst.txt
-share/doc/ECM/html/_sources/find-module/FindTaglib.rst.txt
-share/doc/ECM/html/_sources/find-module/FindUDev.rst.txt
-share/doc/ECM/html/_sources/find-module/FindWayland.rst.txt
-share/doc/ECM/html/_sources/find-module/FindWaylandProtocols.rst.txt
-share/doc/ECM/html/_sources/find-module/FindWaylandScanner.rst.txt
-share/doc/ECM/html/_sources/find-module/FindX11_XCB.rst.txt
-share/doc/ECM/html/_sources/find-module/FindXCB.rst.txt
-share/doc/ECM/html/_sources/find-module/Findepoxy.rst.txt
-share/doc/ECM/html/_sources/find-module/Findgzip.rst.txt
-share/doc/ECM/html/_sources/index.rst.txt
-share/doc/ECM/html/_sources/kde-module/KDECMakeSettings.rst.txt
-share/doc/ECM/html/_sources/kde-module/KDEClangFormat.rst.txt
-share/doc/ECM/html/_sources/kde-module/KDECompilerSettings.rst.txt
-share/doc/ECM/html/_sources/kde-module/KDEFrameworkCompilerSettings.rst.txt
-share/doc/ECM/html/_sources/kde-module/KDEGitCommitHooks.rst.txt
-share/doc/ECM/html/_sources/kde-module/KDEInstallDirs.rst.txt
-share/doc/ECM/html/_sources/kde-module/KDEInstallDirs5.rst.txt
-share/doc/ECM/html/_sources/kde-module/KDEInstallDirs6.rst.txt
-share/doc/ECM/html/_sources/kde-module/KDEMetaInfoPlatformCheck.rst.txt
-share/doc/ECM/html/_sources/kde-module/KDEPackageAppTemplates.rst.txt
-share/doc/ECM/html/_sources/manual/ecm-developer.7.rst.txt
-share/doc/ECM/html/_sources/manual/ecm-find-modules.7.rst.txt
-share/doc/ECM/html/_sources/manual/ecm-kde-modules.7.rst.txt
-share/doc/ECM/html/_sources/manual/ecm-modules.7.rst.txt
-share/doc/ECM/html/_sources/manual/ecm-toolchains.7.rst.txt
-share/doc/ECM/html/_sources/manual/ecm.7.rst.txt
-share/doc/ECM/html/_sources/module/CheckAtomic.rst.txt
-share/doc/ECM/html/_sources/module/ECMAddAndroidApk.rst.txt
-share/doc/ECM/html/_sources/module/ECMAddAppIcon.rst.txt
-share/doc/ECM/html/_sources/module/ECMAddQch.rst.txt
-share/doc/ECM/html/_sources/module/ECMAddQtDesignerPlugin.rst.txt
-share/doc/ECM/html/_sources/module/ECMAddTests.rst.txt
-share/doc/ECM/html/_sources/module/ECMCheckOutboundLicense.rst.txt
-share/doc/ECM/html/_sources/module/ECMConfiguredInstall.rst.txt
-share/doc/ECM/html/_sources/module/ECMCoverageOption.rst.txt
-share/doc/ECM/html/_sources/module/ECMCreateQmFromPoFiles.rst.txt
-share/doc/ECM/html/_sources/module/ECMDeprecationSettings.rst.txt
-share/doc/ECM/html/_sources/module/ECMEnableSanitizers.rst.txt
-share/doc/ECM/html/_sources/module/ECMFindModuleHelpers.rst.txt
-share/doc/ECM/html/_sources/module/ECMFindQmlModule.rst.txt
-share/doc/ECM/html/_sources/module/ECMGenerateDBusServiceFile.rst.txt
-share/doc/ECM/html/_sources/module/ECMGenerateExportHeader.rst.txt
-share/doc/ECM/html/_sources/module/ECMGenerateHeaders.rst.txt
-share/doc/ECM/html/_sources/module/ECMGeneratePkgConfigFile.rst.txt
-share/doc/ECM/html/_sources/module/ECMGeneratePriFile.rst.txt
-share/doc/ECM/html/_sources/module/ECMGenerateQmlTypes.rst.txt
-share/doc/ECM/html/_sources/module/ECMInstallIcons.rst.txt
-share/doc/ECM/html/_sources/module/ECMMarkAsTest.rst.txt
-share/doc/ECM/html/_sources/module/ECMMarkNonGuiExecutable.rst.txt
-share/doc/ECM/html/_sources/module/ECMOptionalAddSubdirectory.rst.txt
-share/doc/ECM/html/_sources/module/ECMPackageConfigHelpers.rst.txt
-share/doc/ECM/html/_sources/module/ECMPoQmTools.rst.txt
-share/doc/ECM/html/_sources/module/ECMQmlModule.rst.txt
-share/doc/ECM/html/_sources/module/ECMQtDeclareLoggingCategory.rst.txt
-share/doc/ECM/html/_sources/module/ECMQueryQt.rst.txt
-share/doc/ECM/html/_sources/module/ECMSetupQtPluginMacroNames.rst.txt
-share/doc/ECM/html/_sources/module/ECMSetupVersion.rst.txt
-share/doc/ECM/html/_sources/module/ECMSourceVersionControl.rst.txt
-share/doc/ECM/html/_sources/module/ECMUninstallTarget.rst.txt
-share/doc/ECM/html/_sources/module/ECMUseFindModules.rst.txt
-share/doc/ECM/html/_sources/module/ECMWinResolveSymlinks.rst.txt
-share/doc/ECM/html/_sources/module/QtVersionOption.rst.txt
-share/doc/ECM/html/_sources/toolchain/Android.rst.txt
-share/doc/ECM/html/_static/_sphinx_javascript_frameworks_compat.js
-share/doc/ECM/html/_static/basic.css
-share/doc/ECM/html/_static/classic.css
-share/doc/ECM/html/_static/default.css
-share/doc/ECM/html/_static/doctools.js
-share/doc/ECM/html/_static/documentation_options.js
-share/doc/ECM/html/_static/ecm.css
-share/doc/ECM/html/_static/file.png
-share/doc/ECM/html/_static/jquery-3.6.0.js
-share/doc/ECM/html/_static/jquery.js
-share/doc/ECM/html/_static/kde-favicon.ico
-share/doc/ECM/html/_static/language_data.js
-share/doc/ECM/html/_static/minus.png
-share/doc/ECM/html/_static/plus.png
-share/doc/ECM/html/_static/pygments.css
-share/doc/ECM/html/_static/searchtools.js
-share/doc/ECM/html/_static/sidebar.js
-share/doc/ECM/html/_static/sphinx_highlight.js
-share/doc/ECM/html/_static/underscore-1.13.1.js
-share/doc/ECM/html/_static/underscore.js
-share/doc/ECM/html/find-module/Find7Zip.html
-share/doc/ECM/html/find-module/Find7z.html
-share/doc/ECM/html/find-module/FindCanberra.html
-share/doc/ECM/html/find-module/FindEGL.html
-share/doc/ECM/html/find-module/FindGLIB2.html
-share/doc/ECM/html/find-module/FindGperf.html
-share/doc/ECM/html/find-module/FindGradle.html
-share/doc/ECM/html/find-module/FindIcoTool.html
-share/doc/ECM/html/find-module/FindInotify.html
-share/doc/ECM/html/find-module/FindIsoCodes.html
-share/doc/ECM/html/find-module/FindKF5.html
-share/doc/ECM/html/find-module/FindLibExiv2.html
-share/doc/ECM/html/find-module/FindLibGit2.html
-share/doc/ECM/html/find-module/FindLibMount.html
-share/doc/ECM/html/find-module/FindLibcap.html
-share/doc/ECM/html/find-module/FindOpenEXR.html
-share/doc/ECM/html/find-module/FindPhoneNumber.html
-share/doc/ECM/html/find-module/FindPoppler.html
-share/doc/ECM/html/find-module/FindPulseAudio.html
-share/doc/ECM/html/find-module/FindQtWaylandScanner.html
-share/doc/ECM/html/find-module/FindSasl2.html
-share/doc/ECM/html/find-module/FindSeccomp.html
-share/doc/ECM/html/find-module/FindSharedMimeInfo.html
-share/doc/ECM/html/find-module/FindTaglib.html
-share/doc/ECM/html/find-module/FindUDev.html
-share/doc/ECM/html/find-module/FindWayland.html
-share/doc/ECM/html/find-module/FindWaylandProtocols.html
-share/doc/ECM/html/find-module/FindWaylandScanner.html
-share/doc/ECM/html/find-module/FindX11_XCB.html
-share/doc/ECM/html/find-module/FindXCB.html
-share/doc/ECM/html/find-module/Findepoxy.html
-share/doc/ECM/html/find-module/Findgzip.html
-share/doc/ECM/html/genindex.html
-share/doc/ECM/html/index.html
-share/doc/ECM/html/kde-module/KDECMakeSettings.html
-share/doc/ECM/html/kde-module/KDEClangFormat.html
-share/doc/ECM/html/kde-module/KDECompilerSettings.html
-share/doc/ECM/html/kde-module/KDEFrameworkCompilerSettings.html
-share/doc/ECM/html/kde-module/KDEGitCommitHooks.html
-share/doc/ECM/html/kde-module/KDEInstallDirs.html
-share/doc/ECM/html/kde-module/KDEInstallDirs5.html
-share/doc/ECM/html/kde-module/KDEInstallDirs6.html
-share/doc/ECM/html/kde-module/KDEMetaInfoPlatformCheck.html
-share/doc/ECM/html/kde-module/KDEPackageAppTemplates.html
-share/doc/ECM/html/manual/ecm-developer.7.html
-share/doc/ECM/html/manual/ecm-find-modules.7.html
-share/doc/ECM/html/manual/ecm-kde-modules.7.html
-share/doc/ECM/html/manual/ecm-modules.7.html
-share/doc/ECM/html/manual/ecm-toolchains.7.html
-share/doc/ECM/html/manual/ecm.7.html
-share/doc/ECM/html/module/CheckAtomic.html
-share/doc/ECM/html/module/ECMAddAndroidApk.html
-share/doc/ECM/html/module/ECMAddAppIcon.html
-share/doc/ECM/html/module/ECMAddQch.html
-share/doc/ECM/html/module/ECMAddQtDesignerPlugin.html
-share/doc/ECM/html/module/ECMAddTests.html
-share/doc/ECM/html/module/ECMCheckOutboundLicense.html
-share/doc/ECM/html/module/ECMConfiguredInstall.html
-share/doc/ECM/html/module/ECMCoverageOption.html
-share/doc/ECM/html/module/ECMCreateQmFromPoFiles.html
-share/doc/ECM/html/module/ECMDeprecationSettings.html
-share/doc/ECM/html/module/ECMEnableSanitizers.html
-share/doc/ECM/html/module/ECMFindModuleHelpers.html
-share/doc/ECM/html/module/ECMFindQmlModule.html
-share/doc/ECM/html/module/ECMGenerateDBusServiceFile.html
-share/doc/ECM/html/module/ECMGenerateExportHeader.html
-share/doc/ECM/html/module/ECMGenerateHeaders.html
-share/doc/ECM/html/module/ECMGeneratePkgConfigFile.html
-share/doc/ECM/html/module/ECMGeneratePriFile.html
-share/doc/ECM/html/module/ECMGenerateQmlTypes.html
-share/doc/ECM/html/module/ECMInstallIcons.html
-share/doc/ECM/html/module/ECMMarkAsTest.html
-share/doc/ECM/html/module/ECMMarkNonGuiExecutable.html
-share/doc/ECM/html/module/ECMOptionalAddSubdirectory.html
-share/doc/ECM/html/module/ECMPackageConfigHelpers.html
-share/doc/ECM/html/module/ECMPoQmTools.html
-share/doc/ECM/html/module/ECMQmlModule.html
-share/doc/ECM/html/module/ECMQtDeclareLoggingCategory.html
-share/doc/ECM/html/module/ECMQueryQt.html
-share/doc/ECM/html/module/ECMSetupQtPluginMacroNames.html
-share/doc/ECM/html/module/ECMSetupVersion.html
-share/doc/ECM/html/module/ECMSourceVersionControl.html
-share/doc/ECM/html/module/ECMUninstallTarget.html
-share/doc/ECM/html/module/ECMUseFindModules.html
-share/doc/ECM/html/module/ECMWinResolveSymlinks.html
-share/doc/ECM/html/module/QtVersionOption.html
-share/doc/ECM/html/search.html
-share/doc/ECM/html/searchindex.js
-share/doc/ECM/html/toolchain/Android.html
-share/man/man7/ecm-developer.7.gz
-share/man/man7/ecm-find-modules.7.gz
-share/man/man7/ecm-kde-modules.7.gz
-share/man/man7/ecm-modules.7.gz
-share/man/man7/ecm-toolchains.7.gz
-share/man/man7/ecm.7.gz
+%%HELP%%%%DOCSDIR%%/ExtraCMakeModules.qch
+%%MANPAGES%%share/man/man7/ecm-developer.7.gz
+%%MANPAGES%%share/man/man7/ecm-find-modules.7.gz
+%%MANPAGES%%share/man/man7/ecm-kde-modules.7.gz
+%%MANPAGES%%share/man/man7/ecm-modules.7.gz
+%%MANPAGES%%share/man/man7/ecm-toolchains.7.gz
+%%MANPAGES%%share/man/man7/ecm.7.gz