mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-12 03:00:28 +00:00
Code Issues Releases Activity

qt6: do not install empty cmake & pkgconfig directories in Qt-prefix

Browse Source
This commit is contained in:
Tobias C. Berner 2022-08-22 13:30:01 +02:00
parent fb49e0f87b
commit d33dfbef9f
12 changed files with 13 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Mk/Uses/qt-dist.mk
View File

@ -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} \

5
devel/qt6-5compat/pkg-plist
View File

@ -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

1
devel/qt6-base/pkg-plist
View File

@ -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

21
devel/qt6-tools/pkg-plist
View File

@ -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

29
graphics/qt6-3d/pkg-plist
View File

@ -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

9
graphics/qt6-svg/pkg-plist
View File

@ -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

21
graphics/qt6-wayland/pkg-plist
View File

@ -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

5
net/qt6-networkauth/pkg-plist
View File

@ -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

1
x11-toolkits/qt6-declarative/pkg-plist
View File

@ -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

29
x11-toolkits/qt6-quick3d/pkg-plist
View File

@ -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

7
x11-toolkits/qt6-quicktimeline/pkg-plist
View File

@ -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

7
x11-toolkits/qt6-shadertools/pkg-plist
View File

@ -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