Skip to content

Commit d33dfbe

Browse files
tcbernertcberner
committed
qt6: do not install empty cmake & pkgconfig directories in Qt-prefix
1 parent fb49e0f commit d33dfbe

12 files changed

Lines changed: 13 additions & 139 deletions

File tree

‎Mk/Uses/qt-dist.mk‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ LICENSE?= LGPL21
6464
DESCR?= ${PORTSDIR}/devel/${_QT_RELNAME}/pkg-descr
6565
. endif
6666

67-
6867
# Stage support.
6968
_QT5_DESTDIRNAME= INSTALL_ROOT
7069
_QT6_DESTDIRNAME= DESTDIR
@@ -286,12 +285,11 @@ PLIST_SUB+= SHORTVER=${_QT_VERSION:R} \
286285
FULLVER=${_QT_VERSION:C/-.*//}
287286

288287
# Handle additional PLIST directories, which should only be used for Qt-dist ports.
289-
. for dir in CMAKE ETC
290-
# Export QT_CMAKEDIR and QT_ETCDIR.
288+
. for dir in ETC
289+
# Export QT_ETCDIR.
291290
PLIST_SUB+= QT_${dir}DIR="${QT_${dir}DIR_REL}"
292291
. endfor
293292

294-
295293
. if ${_QT_VER:M5}
296294
. if ${_QT_DIST} == "base"
297295
# qtbase requires some tools to be symlinked to the build directory.
@@ -376,6 +374,7 @@ _QMAKE= ${CONFIGURE_WRKSRC}/bin/qmake
376374
. endif
377375
. endif
378376

377+
379378
pre-configure: qt5-pre-configure
380379
qt5-pre-configure:
381380
# Qt 5.3.2 introduced a check in mkspecs/features/create_cmake.prf that
@@ -492,6 +491,16 @@ qt-post-install:
492491
. endif # ${QT_CONFIG:N-*}
493492
. endif # M5
494493

494+
. if ${_QT_VER:M6}
495+
post-stage: qt6-post-stage
496+
# Clean-up of empty directories, as we install
497+
# * cmake to ${LOCALBASE}/lib/cmake not ${QT_LIBDIR}/cmake.
498+
# * pkgconfig to ${LOCALBASE}/libexec/pkgconfig not ${QT_LIBDIR}/pkgconfig
499+
qt6-post-stage:
500+
${RM} -r ${STAGEDIR}${QT_LIBDIR}/cmake
501+
${RM} -r ${STAGEDIR}${QT_LIBDIR}/pkgconfig
502+
. endif
503+
495504
qt-create-kde-distfile:
496505
${SH} ${PORTSDIR}/devel/${_QT_RELNAME}/files/create_kde-qt_release.sh \
497506
${_QT_DIST} \

‎devel/qt6-5compat/pkg-plist‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,3 @@ lib/cmake/Qt6Core5Compat/Qt6Core5CompatVersionlessTargets.cmake
7878
%%QT_MKSPECDIR%%/modules/qt_lib_core5compat_private.pri
7979
libdata/pkgconfig/Qt6Core5Compat.pc
8080
%%QT_DATADIR%%/modules/Core5Compat.json
81-
@dir %%QT_CMAKEDIR%%/Qt6BuildInternals/StandaloneTests
82-
@dir %%QT_CMAKEDIR%%/Qt6Core5Compat
83-
@dir %%QT_LIBDIR%%/cmake/Qt6BuildInternals/StandaloneTests
84-
@dir %%QT_LIBDIR%%/cmake/Qt6Core5Compat
85-
@dir %%QT_LIBDIR%%/pkgconfig

‎devel/qt6-base/pkg-plist‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3743,4 +3743,3 @@ libdata/pkgconfig/Qt6Xml.pc
37433743
@dir lib/cmake/Qt6/QtBuildInternals/QtStandaloneTestTemplateProject
37443744
@dir lib/cmake/Qt6/ios
37453745
@dir lib/cmake/Qt6/macos
3746-
@dir %%QT_LIBDIR%%/pkgconfig

‎devel/qt6-tools/pkg-plist‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -407,24 +407,3 @@ libdata/pkgconfig/Qt6UiTools.pc
407407
%%QT_DATADIR%%/phrasebooks/russian.qph
408408
%%QT_DATADIR%%/phrasebooks/spanish.qph
409409
%%QT_DATADIR%%/phrasebooks/swedish.qph
410-
@dir %%QT_CMAKEDIR%%/Qt6BuildInternals/StandaloneTests
411-
@dir %%QT_CMAKEDIR%%/Qt6Designer
412-
@dir %%QT_CMAKEDIR%%/Qt6DesignerComponentsPrivate
413-
@dir %%QT_CMAKEDIR%%/Qt6Help
414-
@dir %%QT_CMAKEDIR%%/Qt6Linguist
415-
@dir %%QT_CMAKEDIR%%/Qt6LinguistTools
416-
@dir %%QT_CMAKEDIR%%/Qt6Tools
417-
@dir %%QT_CMAKEDIR%%/Qt6ToolsTools
418-
@dir %%QT_CMAKEDIR%%/Qt6UiPlugin
419-
@dir %%QT_CMAKEDIR%%/Qt6UiTools
420-
@dir %%QT_LIBDIR%%/cmake/Qt6BuildInternals/StandaloneTests
421-
@dir %%QT_LIBDIR%%/cmake/Qt6Designer
422-
@dir %%QT_LIBDIR%%/cmake/Qt6DesignerComponentsPrivate
423-
@dir %%QT_LIBDIR%%/cmake/Qt6Help
424-
@dir %%QT_LIBDIR%%/cmake/Qt6Linguist
425-
@dir %%QT_LIBDIR%%/cmake/Qt6LinguistTools
426-
@dir %%QT_LIBDIR%%/cmake/Qt6Tools
427-
@dir %%QT_LIBDIR%%/cmake/Qt6ToolsTools
428-
@dir %%QT_LIBDIR%%/cmake/Qt6UiPlugin
429-
@dir %%QT_LIBDIR%%/cmake/Qt6UiTools
430-
@dir %%QT_LIBDIR%%/pkgconfig

‎graphics/qt6-3d/pkg-plist‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1427,32 +1427,3 @@ libdata/pkgconfig/Qt63DRender.pc
14271427
%%QT_DATADIR%%/modules/3DQuickRender.json
14281428
%%QT_DATADIR%%/modules/3DQuickScene2D.json
14291429
%%QT_DATADIR%%/modules/3DRender.json
1430-
@dir %%QT_CMAKEDIR%%/Qt63DAnimation
1431-
@dir %%QT_CMAKEDIR%%/Qt63DCore
1432-
@dir %%QT_CMAKEDIR%%/Qt63DExtras
1433-
@dir %%QT_CMAKEDIR%%/Qt63DInput
1434-
@dir %%QT_CMAKEDIR%%/Qt63DLogic
1435-
@dir %%QT_CMAKEDIR%%/Qt63DQuick
1436-
@dir %%QT_CMAKEDIR%%/Qt63DQuickAnimation
1437-
@dir %%QT_CMAKEDIR%%/Qt63DQuickExtras
1438-
@dir %%QT_CMAKEDIR%%/Qt63DQuickInput
1439-
@dir %%QT_CMAKEDIR%%/Qt63DQuickRender
1440-
@dir %%QT_CMAKEDIR%%/Qt63DQuickScene2D
1441-
@dir %%QT_CMAKEDIR%%/Qt63DRender
1442-
@dir %%QT_CMAKEDIR%%/Qt6BuildInternals/StandaloneTests
1443-
@dir %%QT_CMAKEDIR%%/Qt6Qml/QmlPlugins
1444-
@dir %%QT_LIBDIR%%/cmake/Qt63DAnimation
1445-
@dir %%QT_LIBDIR%%/cmake/Qt63DCore
1446-
@dir %%QT_LIBDIR%%/cmake/Qt63DExtras
1447-
@dir %%QT_LIBDIR%%/cmake/Qt63DInput
1448-
@dir %%QT_LIBDIR%%/cmake/Qt63DLogic
1449-
@dir %%QT_LIBDIR%%/cmake/Qt63DQuick
1450-
@dir %%QT_LIBDIR%%/cmake/Qt63DQuickAnimation
1451-
@dir %%QT_LIBDIR%%/cmake/Qt63DQuickExtras
1452-
@dir %%QT_LIBDIR%%/cmake/Qt63DQuickInput
1453-
@dir %%QT_LIBDIR%%/cmake/Qt63DQuickRender
1454-
@dir %%QT_LIBDIR%%/cmake/Qt63DQuickScene2D
1455-
@dir %%QT_LIBDIR%%/cmake/Qt63DRender
1456-
@dir %%QT_LIBDIR%%/cmake/Qt6BuildInternals/StandaloneTests
1457-
@dir %%QT_LIBDIR%%/cmake/Qt6Qml/QmlPlugins
1458-
@dir %%QT_LIBDIR%%/pkgconfig

‎graphics/qt6-svg/pkg-plist‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,3 @@ libdata/pkgconfig/Qt6Svg.pc
7676
libdata/pkgconfig/Qt6SvgWidgets.pc
7777
%%QT_DATADIR%%/modules/Svg.json
7878
%%QT_DATADIR%%/modules/SvgWidgets.json
79-
@dir %%QT_CMAKEDIR%%/Qt6BuildInternals/StandaloneTests
80-
@dir %%QT_CMAKEDIR%%/Qt6Gui
81-
@dir %%QT_CMAKEDIR%%/Qt6Svg
82-
@dir %%QT_CMAKEDIR%%/Qt6SvgWidgets
83-
@dir %%QT_LIBDIR%%/cmake/Qt6BuildInternals/StandaloneTests
84-
@dir %%QT_LIBDIR%%/cmake/Qt6Gui
85-
@dir %%QT_LIBDIR%%/cmake/Qt6Svg
86-
@dir %%QT_LIBDIR%%/cmake/Qt6SvgWidgets
87-
@dir %%QT_LIBDIR%%/pkgconfig

‎graphics/qt6-wayland/pkg-plist‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -598,24 +598,3 @@ libdata/pkgconfig/Qt6WaylandCompositor.pc
598598
%%QT_DATADIR%%/modules/WaylandEglCompositorHwIntegrationPrivate.json
599599
%%QT_DATADIR%%/modules/WaylandGlobalPrivate.json
600600
%%QT_DATADIR%%/modules/WlShellIntegrationPrivate.json
601-
@dir %%QT_CMAKEDIR%%/Qt6BuildInternals/StandaloneTests
602-
@dir %%QT_CMAKEDIR%%/Qt6Gui
603-
@dir %%QT_CMAKEDIR%%/Qt6Qml/QmlPlugins
604-
@dir %%QT_CMAKEDIR%%/Qt6WaylandClient
605-
@dir %%QT_CMAKEDIR%%/Qt6WaylandCompositor
606-
@dir %%QT_CMAKEDIR%%/Qt6WaylandEglClientHwIntegrationPrivate
607-
@dir %%QT_CMAKEDIR%%/Qt6WaylandEglCompositorHwIntegrationPrivate
608-
@dir %%QT_CMAKEDIR%%/Qt6WaylandGlobalPrivate
609-
@dir %%QT_CMAKEDIR%%/Qt6WaylandScannerTools
610-
@dir %%QT_CMAKEDIR%%/Qt6WlShellIntegrationPrivate
611-
@dir %%QT_LIBDIR%%/cmake/Qt6BuildInternals/StandaloneTests
612-
@dir %%QT_LIBDIR%%/cmake/Qt6Gui
613-
@dir %%QT_LIBDIR%%/cmake/Qt6Qml/QmlPlugins
614-
@dir %%QT_LIBDIR%%/cmake/Qt6WaylandClient
615-
@dir %%QT_LIBDIR%%/cmake/Qt6WaylandCompositor
616-
@dir %%QT_LIBDIR%%/cmake/Qt6WaylandEglClientHwIntegrationPrivate
617-
@dir %%QT_LIBDIR%%/cmake/Qt6WaylandEglCompositorHwIntegrationPrivate
618-
@dir %%QT_LIBDIR%%/cmake/Qt6WaylandGlobalPrivate
619-
@dir %%QT_LIBDIR%%/cmake/Qt6WaylandScannerTools
620-
@dir %%QT_LIBDIR%%/cmake/Qt6WlShellIntegrationPrivate
621-
@dir %%QT_LIBDIR%%/pkgconfig

‎net/qt6-networkauth/pkg-plist‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,3 @@ lib/cmake/Qt6NetworkAuth/Qt6NetworkAuthVersionlessTargets.cmake
4444
%%QT_MKSPECDIR%%/modules/qt_lib_networkauth_private.pri
4545
libdata/pkgconfig/Qt6NetworkAuth.pc
4646
%%QT_DATADIR%%/modules/NetworkAuth.json
47-
@dir %%QT_CMAKEDIR%%/Qt6BuildInternals/StandaloneTests
48-
@dir %%QT_CMAKEDIR%%/Qt6NetworkAuth
49-
@dir %%QT_LIBDIR%%/cmake/Qt6BuildInternals/StandaloneTests
50-
@dir %%QT_LIBDIR%%/cmake/Qt6NetworkAuth
51-
@dir %%QT_LIBDIR%%/pkgconfig

‎x11-toolkits/qt6-declarative/pkg-plist‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2619,4 +2619,3 @@ libdata/pkgconfig/Qt6QuickWidgets.pc
26192619
%%QT_DATADIR%%/modules/QuickTestUtilsPrivate.json
26202620
%%QT_DATADIR%%/modules/QuickWidgets.json
26212621
@dir lib/cmake/Qt6
2622-
@dir %%QT_LIBDIR%%/pkgconfig

‎x11-toolkits/qt6-quick3d/pkg-plist‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -900,32 +900,3 @@ libdata/pkgconfig/Qt6Quick3DUtils.pc
900900
%%QT_DATADIR%%/modules/Quick3DParticles.json
901901
%%QT_DATADIR%%/modules/Quick3DRuntimeRender.json
902902
%%QT_DATADIR%%/modules/Quick3DUtils.json
903-
@dir %%QT_CMAKEDIR%%/Qt6BuildInternals/StandaloneTests
904-
@dir %%QT_CMAKEDIR%%/Qt6Qml/QmlPlugins
905-
@dir %%QT_CMAKEDIR%%/Qt6Quick3D
906-
@dir %%QT_CMAKEDIR%%/Qt6Quick3DAssetImport
907-
@dir %%QT_CMAKEDIR%%/Qt6Quick3DAssetUtils
908-
@dir %%QT_CMAKEDIR%%/Qt6Quick3DEffects
909-
@dir %%QT_CMAKEDIR%%/Qt6Quick3DGlslParserPrivate
910-
@dir %%QT_CMAKEDIR%%/Qt6Quick3DHelpers
911-
@dir %%QT_CMAKEDIR%%/Qt6Quick3DIblBaker
912-
@dir %%QT_CMAKEDIR%%/Qt6Quick3DParticleEffects
913-
@dir %%QT_CMAKEDIR%%/Qt6Quick3DParticles
914-
@dir %%QT_CMAKEDIR%%/Qt6Quick3DRuntimeRender
915-
@dir %%QT_CMAKEDIR%%/Qt6Quick3DTools
916-
@dir %%QT_CMAKEDIR%%/Qt6Quick3DUtils
917-
@dir %%QT_LIBDIR%%/cmake/Qt6BuildInternals/StandaloneTests
918-
@dir %%QT_LIBDIR%%/cmake/Qt6Qml/QmlPlugins
919-
@dir %%QT_LIBDIR%%/cmake/Qt6Quick3D
920-
@dir %%QT_LIBDIR%%/cmake/Qt6Quick3DAssetImport
921-
@dir %%QT_LIBDIR%%/cmake/Qt6Quick3DAssetUtils
922-
@dir %%QT_LIBDIR%%/cmake/Qt6Quick3DEffects
923-
@dir %%QT_LIBDIR%%/cmake/Qt6Quick3DGlslParserPrivate
924-
@dir %%QT_LIBDIR%%/cmake/Qt6Quick3DHelpers
925-
@dir %%QT_LIBDIR%%/cmake/Qt6Quick3DIblBaker
926-
@dir %%QT_LIBDIR%%/cmake/Qt6Quick3DParticleEffects
927-
@dir %%QT_LIBDIR%%/cmake/Qt6Quick3DParticles
928-
@dir %%QT_LIBDIR%%/cmake/Qt6Quick3DRuntimeRender
929-
@dir %%QT_LIBDIR%%/cmake/Qt6Quick3DTools
930-
@dir %%QT_LIBDIR%%/cmake/Qt6Quick3DUtils
931-
@dir %%QT_LIBDIR%%/pkgconfig

0 commit comments

Comments
 (0)