Date: Mon, 22 Aug 2022 11:53:37 GMT From: "Tobias C. Berner" <tcberner@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: d33dfbef9f9f - main - qt6: do not install empty cmake & pkgconfig directories in Qt-prefix Message-ID: <202208221153.27MBrbOp072838@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=d33dfbef9f9f8317bc753217a757a433265c4bd4 commit d33dfbef9f9f8317bc753217a757a433265c4bd4 Author: Tobias C. Berner <tcberner@FreeBSD.org> AuthorDate: 2022-08-22 11:30:01 +0000 Commit: Tobias C. Berner <tcberner@FreeBSD.org> CommitDate: 2022-08-22 11:52:45 +0000 qt6: do not install empty cmake & pkgconfig directories in Qt-prefix --- Mk/Uses/qt-dist.mk | 17 +++++++++++++---- devel/qt6-5compat/pkg-plist | 5 ----- devel/qt6-base/pkg-plist | 1 - devel/qt6-tools/pkg-plist | 21 --------------------- graphics/qt6-3d/pkg-plist | 29 ----------------------------- graphics/qt6-svg/pkg-plist | 9 --------- graphics/qt6-wayland/pkg-plist | 21 --------------------- net/qt6-networkauth/pkg-plist | 5 ----- x11-toolkits/qt6-declarative/pkg-plist | 1 - x11-toolkits/qt6-quick3d/pkg-plist | 29 ----------------------------- x11-toolkits/qt6-quicktimeline/pkg-plist | 7 ------- x11-toolkits/qt6-shadertools/pkg-plist | 7 ------- 12 files changed, 13 insertions(+), 139 deletions(-) diff --git a/Mk/Uses/qt-dist.mk b/Mk/Uses/qt-dist.mk index 7a8ed434bf0b..a963233bf159 100644 --- a/Mk/Uses/qt-dist.mk +++ b/Mk/Uses/qt-dist.mk @@ -64,7 +64,6 @@ LICENSE?= LGPL21 DESCR?= ${PORTSDIR}/devel/${_QT_RELNAME}/pkg-descr . endif - # Stage support. _QT5_DESTDIRNAME= INSTALL_ROOT _QT6_DESTDIRNAME= DESTDIR @@ -286,12 +285,11 @@ PLIST_SUB+= SHORTVER=${_QT_VERSION:R} \ FULLVER=${_QT_VERSION:C/-.*//} # Handle additional PLIST directories, which should only be used for Qt-dist ports. -. for dir in CMAKE ETC -# Export QT_CMAKEDIR and QT_ETCDIR. +. for dir in ETC +# Export QT_ETCDIR. PLIST_SUB+= QT_${dir}DIR="${QT_${dir}DIR_REL}" . endfor - . if ${_QT_VER:M5} . if ${_QT_DIST} == "base" # qtbase requires some tools to be symlinked to the build directory. @@ -376,6 +374,7 @@ _QMAKE= ${CONFIGURE_WRKSRC}/bin/qmake . endif . endif + pre-configure: qt5-pre-configure qt5-pre-configure: # Qt 5.3.2 introduced a check in mkspecs/features/create_cmake.prf that @@ -492,6 +491,16 @@ qt-post-install: . endif # ${QT_CONFIG:N-*} . endif # M5 +. if ${_QT_VER:M6} +post-stage: qt6-post-stage +# Clean-up of empty directories, as we install +# * cmake to ${LOCALBASE}/lib/cmake not ${QT_LIBDIR}/cmake. +# * pkgconfig to ${LOCALBASE}/libexec/pkgconfig not ${QT_LIBDIR}/pkgconfig +qt6-post-stage: + ${RM} -r ${STAGEDIR}${QT_LIBDIR}/cmake + ${RM} -r ${STAGEDIR}${QT_LIBDIR}/pkgconfig +. endif + qt-create-kde-distfile: ${SH} ${PORTSDIR}/devel/${_QT_RELNAME}/files/create_kde-qt_release.sh \ ${_QT_DIST} \ diff --git a/devel/qt6-5compat/pkg-plist b/devel/qt6-5compat/pkg-plist index 37836dea775f..80e8d60d7800 100644 --- a/devel/qt6-5compat/pkg-plist +++ b/devel/qt6-5compat/pkg-plist @@ -78,8 +78,3 @@ lib/cmake/Qt6Core5Compat/Qt6Core5CompatVersionlessTargets.cmake %%QT_MKSPECDIR%%/modules/qt_lib_core5compat_private.pri libdata/pkgconfig/Qt6Core5Compat.pc %%QT_DATADIR%%/modules/Core5Compat.json -@dir %%QT_CMAKEDIR%%/Qt6BuildInternals/StandaloneTests -@dir %%QT_CMAKEDIR%%/Qt6Core5Compat -@dir %%QT_LIBDIR%%/cmake/Qt6BuildInternals/StandaloneTests -@dir %%QT_LIBDIR%%/cmake/Qt6Core5Compat -@dir %%QT_LIBDIR%%/pkgconfig diff --git a/devel/qt6-base/pkg-plist b/devel/qt6-base/pkg-plist index 60595f5486d9..e37db724c026 100644 --- a/devel/qt6-base/pkg-plist +++ b/devel/qt6-base/pkg-plist @@ -3743,4 +3743,3 @@ libdata/pkgconfig/Qt6Xml.pc @dir lib/cmake/Qt6/QtBuildInternals/QtStandaloneTestTemplateProject @dir lib/cmake/Qt6/ios @dir lib/cmake/Qt6/macos -@dir %%QT_LIBDIR%%/pkgconfig diff --git a/devel/qt6-tools/pkg-plist b/devel/qt6-tools/pkg-plist index 79d61d18cdd0..cf2864dc6192 100644 --- a/devel/qt6-tools/pkg-plist +++ b/devel/qt6-tools/pkg-plist @@ -407,24 +407,3 @@ libdata/pkgconfig/Qt6UiTools.pc %%QT_DATADIR%%/phrasebooks/russian.qph %%QT_DATADIR%%/phrasebooks/spanish.qph %%QT_DATADIR%%/phrasebooks/swedish.qph -@dir %%QT_CMAKEDIR%%/Qt6BuildInternals/StandaloneTests -@dir %%QT_CMAKEDIR%%/Qt6Designer -@dir %%QT_CMAKEDIR%%/Qt6DesignerComponentsPrivate -@dir %%QT_CMAKEDIR%%/Qt6Help -@dir %%QT_CMAKEDIR%%/Qt6Linguist -@dir %%QT_CMAKEDIR%%/Qt6LinguistTools -@dir %%QT_CMAKEDIR%%/Qt6Tools -@dir %%QT_CMAKEDIR%%/Qt6ToolsTools -@dir %%QT_CMAKEDIR%%/Qt6UiPlugin -@dir %%QT_CMAKEDIR%%/Qt6UiTools -@dir %%QT_LIBDIR%%/cmake/Qt6BuildInternals/StandaloneTests -@dir %%QT_LIBDIR%%/cmake/Qt6Designer -@dir %%QT_LIBDIR%%/cmake/Qt6DesignerComponentsPrivate -@dir %%QT_LIBDIR%%/cmake/Qt6Help -@dir %%QT_LIBDIR%%/cmake/Qt6Linguist -@dir %%QT_LIBDIR%%/cmake/Qt6LinguistTools -@dir %%QT_LIBDIR%%/cmake/Qt6Tools -@dir %%QT_LIBDIR%%/cmake/Qt6ToolsTools -@dir %%QT_LIBDIR%%/cmake/Qt6UiPlugin -@dir %%QT_LIBDIR%%/cmake/Qt6UiTools -@dir %%QT_LIBDIR%%/pkgconfig diff --git a/graphics/qt6-3d/pkg-plist b/graphics/qt6-3d/pkg-plist index 81c1be959aad..4ac378097f9f 100644 --- a/graphics/qt6-3d/pkg-plist +++ b/graphics/qt6-3d/pkg-plist @@ -1427,32 +1427,3 @@ libdata/pkgconfig/Qt63DRender.pc %%QT_DATADIR%%/modules/3DQuickRender.json %%QT_DATADIR%%/modules/3DQuickScene2D.json %%QT_DATADIR%%/modules/3DRender.json -@dir %%QT_CMAKEDIR%%/Qt63DAnimation -@dir %%QT_CMAKEDIR%%/Qt63DCore -@dir %%QT_CMAKEDIR%%/Qt63DExtras -@dir %%QT_CMAKEDIR%%/Qt63DInput -@dir %%QT_CMAKEDIR%%/Qt63DLogic -@dir %%QT_CMAKEDIR%%/Qt63DQuick -@dir %%QT_CMAKEDIR%%/Qt63DQuickAnimation -@dir %%QT_CMAKEDIR%%/Qt63DQuickExtras -@dir %%QT_CMAKEDIR%%/Qt63DQuickInput -@dir %%QT_CMAKEDIR%%/Qt63DQuickRender -@dir %%QT_CMAKEDIR%%/Qt63DQuickScene2D -@dir %%QT_CMAKEDIR%%/Qt63DRender -@dir %%QT_CMAKEDIR%%/Qt6BuildInternals/StandaloneTests -@dir %%QT_CMAKEDIR%%/Qt6Qml/QmlPlugins -@dir %%QT_LIBDIR%%/cmake/Qt63DAnimation -@dir %%QT_LIBDIR%%/cmake/Qt63DCore -@dir %%QT_LIBDIR%%/cmake/Qt63DExtras -@dir %%QT_LIBDIR%%/cmake/Qt63DInput -@dir %%QT_LIBDIR%%/cmake/Qt63DLogic -@dir %%QT_LIBDIR%%/cmake/Qt63DQuick -@dir %%QT_LIBDIR%%/cmake/Qt63DQuickAnimation -@dir %%QT_LIBDIR%%/cmake/Qt63DQuickExtras -@dir %%QT_LIBDIR%%/cmake/Qt63DQuickInput -@dir %%QT_LIBDIR%%/cmake/Qt63DQuickRender -@dir %%QT_LIBDIR%%/cmake/Qt63DQuickScene2D -@dir %%QT_LIBDIR%%/cmake/Qt63DRender -@dir %%QT_LIBDIR%%/cmake/Qt6BuildInternals/StandaloneTests -@dir %%QT_LIBDIR%%/cmake/Qt6Qml/QmlPlugins -@dir %%QT_LIBDIR%%/pkgconfig diff --git a/graphics/qt6-svg/pkg-plist b/graphics/qt6-svg/pkg-plist index 15202e5620d8..1dd398947c9f 100644 --- a/graphics/qt6-svg/pkg-plist +++ b/graphics/qt6-svg/pkg-plist @@ -76,12 +76,3 @@ libdata/pkgconfig/Qt6Svg.pc libdata/pkgconfig/Qt6SvgWidgets.pc %%QT_DATADIR%%/modules/Svg.json %%QT_DATADIR%%/modules/SvgWidgets.json -@dir %%QT_CMAKEDIR%%/Qt6BuildInternals/StandaloneTests -@dir %%QT_CMAKEDIR%%/Qt6Gui -@dir %%QT_CMAKEDIR%%/Qt6Svg -@dir %%QT_CMAKEDIR%%/Qt6SvgWidgets -@dir %%QT_LIBDIR%%/cmake/Qt6BuildInternals/StandaloneTests -@dir %%QT_LIBDIR%%/cmake/Qt6Gui -@dir %%QT_LIBDIR%%/cmake/Qt6Svg -@dir %%QT_LIBDIR%%/cmake/Qt6SvgWidgets -@dir %%QT_LIBDIR%%/pkgconfig diff --git a/graphics/qt6-wayland/pkg-plist b/graphics/qt6-wayland/pkg-plist index 07f92d69ca8d..dd2a8c5581f4 100644 --- a/graphics/qt6-wayland/pkg-plist +++ b/graphics/qt6-wayland/pkg-plist @@ -598,24 +598,3 @@ libdata/pkgconfig/Qt6WaylandCompositor.pc %%QT_DATADIR%%/modules/WaylandEglCompositorHwIntegrationPrivate.json %%QT_DATADIR%%/modules/WaylandGlobalPrivate.json %%QT_DATADIR%%/modules/WlShellIntegrationPrivate.json -@dir %%QT_CMAKEDIR%%/Qt6BuildInternals/StandaloneTests -@dir %%QT_CMAKEDIR%%/Qt6Gui -@dir %%QT_CMAKEDIR%%/Qt6Qml/QmlPlugins -@dir %%QT_CMAKEDIR%%/Qt6WaylandClient -@dir %%QT_CMAKEDIR%%/Qt6WaylandCompositor -@dir %%QT_CMAKEDIR%%/Qt6WaylandEglClientHwIntegrationPrivate -@dir %%QT_CMAKEDIR%%/Qt6WaylandEglCompositorHwIntegrationPrivate -@dir %%QT_CMAKEDIR%%/Qt6WaylandGlobalPrivate -@dir %%QT_CMAKEDIR%%/Qt6WaylandScannerTools -@dir %%QT_CMAKEDIR%%/Qt6WlShellIntegrationPrivate -@dir %%QT_LIBDIR%%/cmake/Qt6BuildInternals/StandaloneTests -@dir %%QT_LIBDIR%%/cmake/Qt6Gui -@dir %%QT_LIBDIR%%/cmake/Qt6Qml/QmlPlugins -@dir %%QT_LIBDIR%%/cmake/Qt6WaylandClient -@dir %%QT_LIBDIR%%/cmake/Qt6WaylandCompositor -@dir %%QT_LIBDIR%%/cmake/Qt6WaylandEglClientHwIntegrationPrivate -@dir %%QT_LIBDIR%%/cmake/Qt6WaylandEglCompositorHwIntegrationPrivate -@dir %%QT_LIBDIR%%/cmake/Qt6WaylandGlobalPrivate -@dir %%QT_LIBDIR%%/cmake/Qt6WaylandScannerTools -@dir %%QT_LIBDIR%%/cmake/Qt6WlShellIntegrationPrivate -@dir %%QT_LIBDIR%%/pkgconfig diff --git a/net/qt6-networkauth/pkg-plist b/net/qt6-networkauth/pkg-plist index a1478ac663d7..2ebe8b8f2fe9 100644 --- a/net/qt6-networkauth/pkg-plist +++ b/net/qt6-networkauth/pkg-plist @@ -44,8 +44,3 @@ lib/cmake/Qt6NetworkAuth/Qt6NetworkAuthVersionlessTargets.cmake %%QT_MKSPECDIR%%/modules/qt_lib_networkauth_private.pri libdata/pkgconfig/Qt6NetworkAuth.pc %%QT_DATADIR%%/modules/NetworkAuth.json -@dir %%QT_CMAKEDIR%%/Qt6BuildInternals/StandaloneTests -@dir %%QT_CMAKEDIR%%/Qt6NetworkAuth -@dir %%QT_LIBDIR%%/cmake/Qt6BuildInternals/StandaloneTests -@dir %%QT_LIBDIR%%/cmake/Qt6NetworkAuth -@dir %%QT_LIBDIR%%/pkgconfig diff --git a/x11-toolkits/qt6-declarative/pkg-plist b/x11-toolkits/qt6-declarative/pkg-plist index f5a0f4402802..c5b5f2f3a5da 100644 --- a/x11-toolkits/qt6-declarative/pkg-plist +++ b/x11-toolkits/qt6-declarative/pkg-plist @@ -2619,4 +2619,3 @@ libdata/pkgconfig/Qt6QuickWidgets.pc %%QT_DATADIR%%/modules/QuickTestUtilsPrivate.json %%QT_DATADIR%%/modules/QuickWidgets.json @dir lib/cmake/Qt6 -@dir %%QT_LIBDIR%%/pkgconfig diff --git a/x11-toolkits/qt6-quick3d/pkg-plist b/x11-toolkits/qt6-quick3d/pkg-plist index 50142957a45e..71af4ca9c96e 100644 --- a/x11-toolkits/qt6-quick3d/pkg-plist +++ b/x11-toolkits/qt6-quick3d/pkg-plist @@ -900,32 +900,3 @@ libdata/pkgconfig/Qt6Quick3DUtils.pc %%QT_DATADIR%%/modules/Quick3DParticles.json %%QT_DATADIR%%/modules/Quick3DRuntimeRender.json %%QT_DATADIR%%/modules/Quick3DUtils.json -@dir %%QT_CMAKEDIR%%/Qt6BuildInternals/StandaloneTests -@dir %%QT_CMAKEDIR%%/Qt6Qml/QmlPlugins -@dir %%QT_CMAKEDIR%%/Qt6Quick3D -@dir %%QT_CMAKEDIR%%/Qt6Quick3DAssetImport -@dir %%QT_CMAKEDIR%%/Qt6Quick3DAssetUtils -@dir %%QT_CMAKEDIR%%/Qt6Quick3DEffects -@dir %%QT_CMAKEDIR%%/Qt6Quick3DGlslParserPrivate -@dir %%QT_CMAKEDIR%%/Qt6Quick3DHelpers -@dir %%QT_CMAKEDIR%%/Qt6Quick3DIblBaker -@dir %%QT_CMAKEDIR%%/Qt6Quick3DParticleEffects -@dir %%QT_CMAKEDIR%%/Qt6Quick3DParticles -@dir %%QT_CMAKEDIR%%/Qt6Quick3DRuntimeRender -@dir %%QT_CMAKEDIR%%/Qt6Quick3DTools -@dir %%QT_CMAKEDIR%%/Qt6Quick3DUtils -@dir %%QT_LIBDIR%%/cmake/Qt6BuildInternals/StandaloneTests -@dir %%QT_LIBDIR%%/cmake/Qt6Qml/QmlPlugins -@dir %%QT_LIBDIR%%/cmake/Qt6Quick3D -@dir %%QT_LIBDIR%%/cmake/Qt6Quick3DAssetImport -@dir %%QT_LIBDIR%%/cmake/Qt6Quick3DAssetUtils -@dir %%QT_LIBDIR%%/cmake/Qt6Quick3DEffects -@dir %%QT_LIBDIR%%/cmake/Qt6Quick3DGlslParserPrivate -@dir %%QT_LIBDIR%%/cmake/Qt6Quick3DHelpers -@dir %%QT_LIBDIR%%/cmake/Qt6Quick3DIblBaker -@dir %%QT_LIBDIR%%/cmake/Qt6Quick3DParticleEffects -@dir %%QT_LIBDIR%%/cmake/Qt6Quick3DParticles -@dir %%QT_LIBDIR%%/cmake/Qt6Quick3DRuntimeRender -@dir %%QT_LIBDIR%%/cmake/Qt6Quick3DTools -@dir %%QT_LIBDIR%%/cmake/Qt6Quick3DUtils -@dir %%QT_LIBDIR%%/pkgconfig diff --git a/x11-toolkits/qt6-quicktimeline/pkg-plist b/x11-toolkits/qt6-quicktimeline/pkg-plist index 0a43f02fb15c..a54587c60eea 100644 --- a/x11-toolkits/qt6-quicktimeline/pkg-plist +++ b/x11-toolkits/qt6-quicktimeline/pkg-plist @@ -37,10 +37,3 @@ lib/cmake/Qt6QuickTimeline/Qt6QuickTimelineVersionlessTargets.cmake %%QT_QMLDIR%%/QtQuick/Timeline/qmldir libdata/pkgconfig/Qt6QuickTimeline.pc %%QT_DATADIR%%/modules/QuickTimeline.json -@dir %%QT_CMAKEDIR%%/Qt6BuildInternals/StandaloneTests -@dir %%QT_CMAKEDIR%%/Qt6Qml/QmlPlugins -@dir %%QT_CMAKEDIR%%/Qt6QuickTimeline -@dir %%QT_LIBDIR%%/cmake/Qt6BuildInternals/StandaloneTests -@dir %%QT_LIBDIR%%/cmake/Qt6Qml/QmlPlugins -@dir %%QT_LIBDIR%%/cmake/Qt6QuickTimeline -@dir %%QT_LIBDIR%%/pkgconfig diff --git a/x11-toolkits/qt6-shadertools/pkg-plist b/x11-toolkits/qt6-shadertools/pkg-plist index 8db504711b62..0de10833e275 100644 --- a/x11-toolkits/qt6-shadertools/pkg-plist +++ b/x11-toolkits/qt6-shadertools/pkg-plist @@ -39,10 +39,3 @@ lib/cmake/Qt6ShaderToolsTools/Qt6ShaderToolsToolsVersionlessTargets.cmake %%QT_MKSPECDIR%%/modules/qt_lib_shadertools_private.pri libdata/pkgconfig/Qt6ShaderTools.pc %%QT_DATADIR%%/modules/ShaderTools.json -@dir %%QT_CMAKEDIR%%/Qt6BuildInternals/StandaloneTests -@dir %%QT_CMAKEDIR%%/Qt6ShaderTools -@dir %%QT_CMAKEDIR%%/Qt6ShaderToolsTools -@dir %%QT_LIBDIR%%/cmake/Qt6BuildInternals/StandaloneTests -@dir %%QT_LIBDIR%%/cmake/Qt6ShaderTools -@dir %%QT_LIBDIR%%/cmake/Qt6ShaderToolsTools -@dir %%QT_LIBDIR%%/pkgconfig
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202208221153.27MBrbOp072838>