CVS commit: pkgsrc/x11/qt5-qttools

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Wed Mar 18 23:04:21 UTC 2020

Modified Files:
        pkgsrc/x11/qt5-qttools: Makefile PLIST

Log Message:
qt5-qttools: fix build when the base package was built w/o dbus support


To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 pkgsrc/x11/qt5-qttools/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/x11/qt5-qttools/PLIST

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-qttools/Makefile
diff -u pkgsrc/x11/qt5-qttools/Makefile:1.61 pkgsrc/x11/qt5-qttools/Makefile:1.62
--- pkgsrc/x11/qt5-qttools/Makefile:1.61        Tue Mar 10 22:09:15 2020
+++ pkgsrc/x11/qt5-qttools/Makefile     Wed Mar 18 23:04:21 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2020/03/10 22:09:15 wiz Exp $
+# $NetBSD: Makefile,v 1.62 2020/03/18 23:04:21 tnn Exp $
 
 DISTNAME=      qttools-everywhere-src-${QTVERSION}
 PKGNAME=       qt5-qttools-${QTVERSION}
@@ -34,6 +34,11 @@ post-install:
        ${LN} -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i}
 .endfor
 
+.include "../../x11/qt5-qtbase/buildlink3.mk"
+PLIST_VARS+=   dbus
+.if ${PKG_BUILD_OPTIONS.qt5-qtbase:Mdbus}
+PLIST.dbus=    yes
+.endif
 .include "../../x11/qt5-qtdeclarative/buildlink3.mk"
 .include "../../x11/qt5-qtlocation/buildlink3.mk"
 .include "../../x11/qt5-qtmultimedia/buildlink3.mk"

Index: pkgsrc/x11/qt5-qttools/PLIST
diff -u pkgsrc/x11/qt5-qttools/PLIST:1.18 pkgsrc/x11/qt5-qttools/PLIST:1.19
--- pkgsrc/x11/qt5-qttools/PLIST:1.18   Wed Mar 18 21:55:24 2020
+++ pkgsrc/x11/qt5-qttools/PLIST        Wed Mar 18 23:04:21 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2020/03/18 21:55:24 tnn Exp $
+@comment $NetBSD: PLIST,v 1.19 2020/03/18 23:04:21 tnn Exp $
 lib/pkgconfig/Qt5Designer.pc
 lib/pkgconfig/Qt5Help.pc
 lib/pkgconfig/Qt5UiTools.pc
@@ -13,8 +13,8 @@ qt5/bin/lupdate
 qt5/bin/lupdate-pro
 qt5/bin/pixeltool
 qt5/bin/qcollectiongenerator
-qt5/bin/qdbus
-qt5/bin/qdbusviewer
+${PLIST.dbus}qt5/bin/qdbus
+${PLIST.dbus}qt5/bin/qdbusviewer
 qt5/bin/qdistancefieldgenerator
 ${PLIST.llvm}qt5/bin/qdoc
 qt5/bin/qhelpgenerator