CVS commit: pkgsrc/x11/py-qt5

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

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sun Aug  2 00:25:20 UTC 2020

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

Log Message:
py-qt5: make dbus option actually do something


To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 pkgsrc/x11/py-qt5/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/x11/py-qt5/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/py-qt5/Makefile
diff -u pkgsrc/x11/py-qt5/Makefile:1.58 pkgsrc/x11/py-qt5/Makefile:1.59
--- pkgsrc/x11/py-qt5/Makefile:1.58     Thu Jun 11 14:50:33 2020
+++ pkgsrc/x11/py-qt5/Makefile  Sun Aug  2 00:25:20 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2020/06/11 14:50:33 adam Exp $
+# $NetBSD: Makefile,v 1.59 2020/08/02 00:25:20 tnn Exp $
 
 DISTNAME=      PyQt5-5.15.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/PyQt5/qt5/}
@@ -77,14 +77,16 @@ PKG_SUGGESTED_OPTIONS+=     dbus
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=   dbus
+PLIST_VARS+=           dbus
 .if !empty(PKG_OPTIONS:Mdbus)
-PLIST.dbus=    yes
+PLIST.dbus=            yes
+.include "../../sysutils/dbus-python-common/buildlink3.mk"
+.include "../../sysutils/py-dbus/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --no-python-dbus
 .endif
 
 .include "../../lang/python/extension.mk"
-.include "../../sysutils/dbus-python-common/buildlink3.mk"
-.include "../../sysutils/py-dbus/buildlink3.mk"
 BUILDLINK_API_DEPENDS.py-sip+= ${PYPKGPREFIX}-sip>=4.19.23
 .include "../../x11/py-sip/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"

Index: pkgsrc/x11/py-qt5/PLIST
diff -u pkgsrc/x11/py-qt5/PLIST:1.17 pkgsrc/x11/py-qt5/PLIST:1.18
--- pkgsrc/x11/py-qt5/PLIST:1.17        Thu Jun 11 14:50:33 2020
+++ pkgsrc/x11/py-qt5/PLIST     Sun Aug  2 00:25:20 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2020/06/11 14:50:33 adam Exp $
+@comment $NetBSD: PLIST,v 1.18 2020/08/02 00:25:20 tnn Exp $
 bin/pylupdate5-${PYVERSSUFFIX}
 bin/pyrcc5-${PYVERSSUFFIX}
 bin/pyuic5-${PYVERSSUFFIX}
@@ -107,7 +107,7 @@ ${PYSITELIB}/PyQt5/uic/widget-plugins/qt
 ${PYSITELIB}/PyQt5/uic/widget-plugins/qtquickwidgets.py
 ${PYSITELIB}/PyQt5/uic/widget-plugins/qtwebenginewidgets.py
 ${PYSITELIB}/PyQt5/uic/widget-plugins/qtwebkit.py
-${PYSITELIB}/dbus/mainloop/pyqt5.so
+${PLIST.dbus}${PYSITELIB}/dbus/mainloop/pyqt5.so
 qt5/plugins/PyQt5-${PYVERSSUFFIX}/libpyqt5qmlplugin.so
 qt5/plugins/designer${PYVERSSUFFIX}/libpyqt5.so
 qt5/qsci${PYVERSSUFFIX}/api/python/PyQt5.api