CVS commit: pkgsrc/x11

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Jun 21 12:44:39 UTC 2021

Modified Files:
        pkgsrc/x11/qt5-qtbase: buildlink3.mk
        pkgsrc/x11/qt5-qttools: buildlink3.mk

Log Message:
qt5: Add BUILDLINK_FILES workarounds for cmake

Fixes configuring in print/scribus-qt5.


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 pkgsrc/x11/qt5-qtbase/buildlink3.mk
cvs rdiff -u -r1.52 -r1.53 pkgsrc/x11/qt5-qttools/buildlink3.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/qt5-qtbase/buildlink3.mk
diff -u pkgsrc/x11/qt5-qtbase/buildlink3.mk:1.43 pkgsrc/x11/qt5-qtbase/buildlink3.mk:1.44
--- pkgsrc/x11/qt5-qtbase/buildlink3.mk:1.43    Wed Apr 21 11:40:50 2021
+++ pkgsrc/x11/qt5-qtbase/buildlink3.mk Mon Jun 21 12:44:39 2021
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.43 2021/04/21 11:40:50 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.44 2021/06/21 12:44:39 nia Exp $
 
 BUILDLINK_TREE+=       qt5-qtbase
 
@@ -27,7 +27,18 @@ PTHREAD_OPTS+=       require
 pkgbase := qt5-qtbase
 .include "../../mk/pkg-build-options.mk"
 
+BUILDLINK_FILES.qt5-qtbase+=   qt5/bin/moc
+BUILDLINK_FILES.qt5-qtbase+=   qt5/bin/qlalr
+BUILDLINK_FILES.qt5-qtbase+=   qt5/bin/qmake
+BUILDLINK_FILES.qt5-qtbase+=   qt5/bin/qvkgen
+BUILDLINK_FILES.qt5-qtbase+=   qt5/bin/rcc
+BUILDLINK_FILES.qt5-qtbase+=   qt5/bin/syncqt.pl
+BUILDLINK_FILES.qt5-qtbase+=   qt5/bin/tracegen
+BUILDLINK_FILES.qt5-qtbase+=   qt5/bin/uic
+
 .if ${PKG_BUILD_OPTIONS.qt5-qtbase:Mdbus}
+BUILDLINK_FILES.qt5-qtbase+=   qt5/bin/qdbuscpp2xml
+BUILDLINK_FILES.qt5-qtbase+=   qt5/bin/qdbusxml2cpp
 .include "../../sysutils/dbus/buildlink3.mk"
 .endif
 

Index: pkgsrc/x11/qt5-qttools/buildlink3.mk
diff -u pkgsrc/x11/qt5-qttools/buildlink3.mk:1.52 pkgsrc/x11/qt5-qttools/buildlink3.mk:1.53
--- pkgsrc/x11/qt5-qttools/buildlink3.mk:1.52   Wed Apr 21 11:40:52 2021
+++ pkgsrc/x11/qt5-qttools/buildlink3.mk        Mon Jun 21 12:44:39 2021
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.52 2021/04/21 11:40:52 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.53 2021/06/21 12:44:39 nia Exp $
 
 BUILDLINK_TREE+=       qt5-qttools
 
@@ -13,6 +13,46 @@ BUILDLINK_INCDIRS.qt5-qttools+=      qt5/incl
 BUILDLINK_LIBDIRS.qt5-qttools+=        qt5/lib
 BUILDLINK_LIBDIRS.qt5-qttools+=        qt5/plugins
 
+.include "../../mk/bsd.fast.prefs.mk"
+
+.if ${OPSYS} != "Darwin"
+BUILDLINK_FILES.qt5-qttools+=  qt5/bin/assistant
+BUILDLINK_FILES.qt5-qttools+=  qt5/bin/designer
+BUILDLINK_FILES.qt5-qttools+=  qt5/bin/linguist
+.endif
+
+.include "../../x11/qt5-qtbase/buildlink3.mk"
+
+.if ${PKG_BUILD_OPTIONS.qt5-qtbase:Mdbus}
+BUILDLINK_FILES.qt5-qttools+=  qt5/bin/qdbus
+BUILDLINK_FILES.qt5-qttools+=  qt5/bin/qdbusviewer
+.endif
+
+
+pkgbase:= qt5-qttools
+
+.include "../../mk/pkg-build-options.mk"
+
+.if ${PKG_BUILD_OPTIONS.qt5-qttools:Mllvm}
+BUILDLINK_FILES.qt5-qttools+=  qt5/bin/qdoc
+.endif
+
+
+BUILDLINK_FILES.qt5-qttools+=  qt5/bin/lconvert
+BUILDLINK_FILES.qt5-qttools+=  qt5/bin/lprodump
+BUILDLINK_FILES.qt5-qttools+=  qt5/bin/lrelease
+BUILDLINK_FILES.qt5-qttools+=  qt5/bin/lrelease-pro
+BUILDLINK_FILES.qt5-qttools+=  qt5/bin/lupdate
+BUILDLINK_FILES.qt5-qttools+=  qt5/bin/lupdate-pro
+BUILDLINK_FILES.qt5-qttools+=  qt5/bin/pixeltool
+BUILDLINK_FILES.qt5-qttools+=  qt5/bin/qcollectiongenerator
+BUILDLINK_FILES.qt5-qttools+=  qt5/bin/qdistancefieldgenerator
+BUILDLINK_FILES.qt5-qttools+=  qt5/bin/qhelpgenerator
+BUILDLINK_FILES.qt5-qttools+=  qt5/bin/qtattributionsscanner
+BUILDLINK_FILES.qt5-qttools+=  qt5/bin/qtdiag
+BUILDLINK_FILES.qt5-qttools+=  qt5/bin/qtpaths
+BUILDLINK_FILES.qt5-qttools+=  qt5/bin/qtplugininfo
+
 .include "../../x11/qt5-qtxmlpatterns/buildlink3.mk"
 #.include "../../x11/qt5-qtwebkit/buildlink3.mk"
 #instead: