Mon Jun 21 12:44:39 2021 UTC ()
qt5: Add BUILDLINK_FILES workarounds for cmake

Fixes configuring in print/scribus-qt5.


(nia)
diff -r1.43 -r1.44 pkgsrc/x11/qt5-qtbase/buildlink3.mk
diff -r1.52 -r1.53 pkgsrc/x11/qt5-qttools/buildlink3.mk
cvs diff -r1.43 -r1.44 pkgsrc/x11/qt5-qtbase/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qtbase/buildlink3.mk 2021/04/21 11:40:50 1.43
+++ pkgsrc/x11/qt5-qtbase/buildlink3.mk 2021/06/21 12:44:39 1.44
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: buildlink3.mk,v 1.43 2021/04/21 11:40:50 adam Exp $ 1# $NetBSD: buildlink3.mk,v 1.44 2021/06/21 12:44:39 nia Exp $
2 2
3BUILDLINK_TREE+= qt5-qtbase 3BUILDLINK_TREE+= qt5-qtbase
4 4
5.if !defined(QT5_QTBASE_BUILDLINK3_MK) 5.if !defined(QT5_QTBASE_BUILDLINK3_MK)
6QT5_QTBASE_BUILDLINK3_MK:= 6QT5_QTBASE_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.qt5-qtbase+= qt5-qtbase>=5.9.1 8BUILDLINK_API_DEPENDS.qt5-qtbase+= qt5-qtbase>=5.9.1
9BUILDLINK_ABI_DEPENDS.qt5-qtbase+= qt5-qtbase>=5.15.2nb3 9BUILDLINK_ABI_DEPENDS.qt5-qtbase+= qt5-qtbase>=5.15.2nb3
10BUILDLINK_PKGSRCDIR.qt5-qtbase?= ../../x11/qt5-qtbase 10BUILDLINK_PKGSRCDIR.qt5-qtbase?= ../../x11/qt5-qtbase
11 11
12BUILDLINK_INCDIRS.qt5-qtbase+= qt5/include 12BUILDLINK_INCDIRS.qt5-qtbase+= qt5/include
13BUILDLINK_LIBDIRS.qt5-qtbase+= qt5/lib 13BUILDLINK_LIBDIRS.qt5-qtbase+= qt5/lib
14BUILDLINK_LIBDIRS.qt5-qtbase+= qt5/plugins 14BUILDLINK_LIBDIRS.qt5-qtbase+= qt5/plugins
@@ -17,27 +17,38 @@ QTDIR= ${BUILDLINK_PREFIX.qt5-qtbase}/q @@ -17,27 +17,38 @@ QTDIR= ${BUILDLINK_PREFIX.qt5-qtbase}/q
17CMAKE_PREFIX_PATH+= ${QTDIR} 17CMAKE_PREFIX_PATH+= ${QTDIR}
18 18
19CONFIGURE_ENV+= QTDIR=${QTDIR} 19CONFIGURE_ENV+= QTDIR=${QTDIR}
20MAKE_ENV+= QTDIR=${QTDIR} 20MAKE_ENV+= QTDIR=${QTDIR}
21 21
22CONFIGURE_ENV+= MOC="${QTDIR}/bin/moc" 22CONFIGURE_ENV+= MOC="${QTDIR}/bin/moc"
23MAKE_ENV+= MOC="${QTDIR}/bin/moc" 23MAKE_ENV+= MOC="${QTDIR}/bin/moc"
24 24
25PTHREAD_OPTS+= require 25PTHREAD_OPTS+= require
26 26
27pkgbase := qt5-qtbase 27pkgbase := qt5-qtbase
28.include "../../mk/pkg-build-options.mk" 28.include "../../mk/pkg-build-options.mk"
29 29
 30BUILDLINK_FILES.qt5-qtbase+= qt5/bin/moc
 31BUILDLINK_FILES.qt5-qtbase+= qt5/bin/qlalr
 32BUILDLINK_FILES.qt5-qtbase+= qt5/bin/qmake
 33BUILDLINK_FILES.qt5-qtbase+= qt5/bin/qvkgen
 34BUILDLINK_FILES.qt5-qtbase+= qt5/bin/rcc
 35BUILDLINK_FILES.qt5-qtbase+= qt5/bin/syncqt.pl
 36BUILDLINK_FILES.qt5-qtbase+= qt5/bin/tracegen
 37BUILDLINK_FILES.qt5-qtbase+= qt5/bin/uic
 38
30.if ${PKG_BUILD_OPTIONS.qt5-qtbase:Mdbus} 39.if ${PKG_BUILD_OPTIONS.qt5-qtbase:Mdbus}
 40BUILDLINK_FILES.qt5-qtbase+= qt5/bin/qdbuscpp2xml
 41BUILDLINK_FILES.qt5-qtbase+= qt5/bin/qdbusxml2cpp
31.include "../../sysutils/dbus/buildlink3.mk" 42.include "../../sysutils/dbus/buildlink3.mk"
32.endif 43.endif
33 44
34.include "../../converters/libiconv/buildlink3.mk" 45.include "../../converters/libiconv/buildlink3.mk"
35.include "../../databases/sqlite3/buildlink3.mk" 46.include "../../databases/sqlite3/buildlink3.mk"
36.include "../../devel/gettext-lib/buildlink3.mk" 47.include "../../devel/gettext-lib/buildlink3.mk"
37.include "../../devel/glib2/buildlink3.mk" 48.include "../../devel/glib2/buildlink3.mk"
38.include "../../devel/pcre2/buildlink3.mk" 49.include "../../devel/pcre2/buildlink3.mk"
39.include "../../devel/zlib/buildlink3.mk" 50.include "../../devel/zlib/buildlink3.mk"
40.include "../../fonts/harfbuzz/buildlink3.mk" 51.include "../../fonts/harfbuzz/buildlink3.mk"
41.include "../../graphics/freetype2/buildlink3.mk" 52.include "../../graphics/freetype2/buildlink3.mk"
42.include "../../graphics/png/buildlink3.mk" 53.include "../../graphics/png/buildlink3.mk"
43.include "../../security/openssl/buildlink3.mk" 54.include "../../security/openssl/buildlink3.mk"
cvs diff -r1.52 -r1.53 pkgsrc/x11/qt5-qttools/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qttools/buildlink3.mk 2021/04/21 11:40:52 1.52
+++ pkgsrc/x11/qt5-qttools/buildlink3.mk 2021/06/21 12:44:39 1.53
@@ -1,26 +1,66 @@ @@ -1,26 +1,66 @@
1# $NetBSD: buildlink3.mk,v 1.52 2021/04/21 11:40:52 adam Exp $ 1# $NetBSD: buildlink3.mk,v 1.53 2021/06/21 12:44:39 nia Exp $
2 2
3BUILDLINK_TREE+= qt5-qttools 3BUILDLINK_TREE+= qt5-qttools
4 4
5.if !defined(QT5_QTTOOLS_BUILDLINK3_MK) 5.if !defined(QT5_QTTOOLS_BUILDLINK3_MK)
6QT5_QTTOOLS_BUILDLINK3_MK:= 6QT5_QTTOOLS_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.qt5-qttools+= qt5-qttools>=5.9.1 8BUILDLINK_API_DEPENDS.qt5-qttools+= qt5-qttools>=5.9.1
9BUILDLINK_ABI_DEPENDS.qt5-qttools+= qt5-qttools>=5.15.2nb4 9BUILDLINK_ABI_DEPENDS.qt5-qttools+= qt5-qttools>=5.15.2nb4
10BUILDLINK_PKGSRCDIR.qt5-qttools?= ../../x11/qt5-qttools 10BUILDLINK_PKGSRCDIR.qt5-qttools?= ../../x11/qt5-qttools
11 11
12BUILDLINK_INCDIRS.qt5-qttools+= qt5/include 12BUILDLINK_INCDIRS.qt5-qttools+= qt5/include
13BUILDLINK_LIBDIRS.qt5-qttools+= qt5/lib 13BUILDLINK_LIBDIRS.qt5-qttools+= qt5/lib
14BUILDLINK_LIBDIRS.qt5-qttools+= qt5/plugins 14BUILDLINK_LIBDIRS.qt5-qttools+= qt5/plugins
15 15
 16.include "../../mk/bsd.fast.prefs.mk"
 17
 18.if ${OPSYS} != "Darwin"
 19BUILDLINK_FILES.qt5-qttools+= qt5/bin/assistant
 20BUILDLINK_FILES.qt5-qttools+= qt5/bin/designer
 21BUILDLINK_FILES.qt5-qttools+= qt5/bin/linguist
 22.endif
 23
 24.include "../../x11/qt5-qtbase/buildlink3.mk"
 25
 26.if ${PKG_BUILD_OPTIONS.qt5-qtbase:Mdbus}
 27BUILDLINK_FILES.qt5-qttools+= qt5/bin/qdbus
 28BUILDLINK_FILES.qt5-qttools+= qt5/bin/qdbusviewer
 29.endif
 30
 31
 32pkgbase:= qt5-qttools
 33
 34.include "../../mk/pkg-build-options.mk"
 35
 36.if ${PKG_BUILD_OPTIONS.qt5-qttools:Mllvm}
 37BUILDLINK_FILES.qt5-qttools+= qt5/bin/qdoc
 38.endif
 39
 40
 41BUILDLINK_FILES.qt5-qttools+= qt5/bin/lconvert
 42BUILDLINK_FILES.qt5-qttools+= qt5/bin/lprodump
 43BUILDLINK_FILES.qt5-qttools+= qt5/bin/lrelease
 44BUILDLINK_FILES.qt5-qttools+= qt5/bin/lrelease-pro
 45BUILDLINK_FILES.qt5-qttools+= qt5/bin/lupdate
 46BUILDLINK_FILES.qt5-qttools+= qt5/bin/lupdate-pro
 47BUILDLINK_FILES.qt5-qttools+= qt5/bin/pixeltool
 48BUILDLINK_FILES.qt5-qttools+= qt5/bin/qcollectiongenerator
 49BUILDLINK_FILES.qt5-qttools+= qt5/bin/qdistancefieldgenerator
 50BUILDLINK_FILES.qt5-qttools+= qt5/bin/qhelpgenerator
 51BUILDLINK_FILES.qt5-qttools+= qt5/bin/qtattributionsscanner
 52BUILDLINK_FILES.qt5-qttools+= qt5/bin/qtdiag
 53BUILDLINK_FILES.qt5-qttools+= qt5/bin/qtpaths
 54BUILDLINK_FILES.qt5-qttools+= qt5/bin/qtplugininfo
 55
16.include "../../x11/qt5-qtxmlpatterns/buildlink3.mk" 56.include "../../x11/qt5-qtxmlpatterns/buildlink3.mk"
17#.include "../../x11/qt5-qtwebkit/buildlink3.mk" 57#.include "../../x11/qt5-qtwebkit/buildlink3.mk"
18#instead: 58#instead:
19.include "../../x11/qt5-qtdeclarative/buildlink3.mk" 59.include "../../x11/qt5-qtdeclarative/buildlink3.mk"
20.include "../../x11/qt5-qtlocation/buildlink3.mk" 60.include "../../x11/qt5-qtlocation/buildlink3.mk"
21.include "../../x11/qt5-qtmultimedia/buildlink3.mk" 61.include "../../x11/qt5-qtmultimedia/buildlink3.mk"
22.include "../../x11/qt5-qtsensors/buildlink3.mk" 62.include "../../x11/qt5-qtsensors/buildlink3.mk"
23.include "../../x11/qt5-qtwebchannel/buildlink3.mk" 63.include "../../x11/qt5-qtwebchannel/buildlink3.mk"
24.endif # QT5_QTTOOLS_BUILDLINK3_MK 64.endif # QT5_QTTOOLS_BUILDLINK3_MK
25 65
26BUILDLINK_TREE+= -qt5-qttools 66BUILDLINK_TREE+= -qt5-qttools