py-qt5: fix PLIST for python2 and note dependency on py-dbus

2 files changed, 29 insertions, 28 deletions

diff --git a/x11/py-qt5/Makefile b/x11/py-qt5/Makefile
index 2da5f68ef7a..c704b0d51fc 100644
--- a/x11/py-qt5/Makefile
+++ b/x11/py-qt5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2018/01/17 19:39:57 markd Exp $
+# $NetBSD: Makefile,v 1.26 2018/01/21 23:32:45 markd Exp $
 
 DISTNAME=	PyQt5_gpl-${PYQT_VERSION}
 PKGNAME=	${PYPKGPREFIX}-qt5-${PYQT_VERSION}
@@ -71,6 +71,7 @@ do-configure:
 
 .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.4
 .include "../../x11/py-sip/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
diff --git a/x11/py-qt5/PLIST b/x11/py-qt5/PLIST
index fe9cee22fa3..b6e1c05e0d4 100644
--- a/x11/py-qt5/PLIST
+++ b/x11/py-qt5/PLIST
@@ -1,59 +1,59 @@
-@comment $NetBSD: PLIST,v 1.4 2018/01/17 19:39:57 markd Exp $
+@comment $NetBSD: PLIST,v 1.5 2018/01/21 23:32:45 markd Exp $
 bin/pylupdate5
 bin/pyrcc5
 bin/pyuic5
 ${PYSITELIB}/PyQt5/Qt.so
-${PYSITELIB}/PyQt5/QtCore.pyi
+${PLIST.py3x}${PYSITELIB}/PyQt5/QtCore.pyi
 ${PYSITELIB}/PyQt5/QtCore.so
-${PYSITELIB}/PyQt5/QtDBus.pyi
+${PLIST.py3x}${PYSITELIB}/PyQt5/QtDBus.pyi
 ${PYSITELIB}/PyQt5/QtDBus.so
-${PYSITELIB}/PyQt5/QtDesigner.pyi
+${PLIST.py3x}${PYSITELIB}/PyQt5/QtDesigner.pyi
 ${PYSITELIB}/PyQt5/QtDesigner.so
-${PYSITELIB}/PyQt5/QtGui.pyi
+${PLIST.py3x}${PYSITELIB}/PyQt5/QtGui.pyi
 ${PYSITELIB}/PyQt5/QtGui.so
-${PYSITELIB}/PyQt5/QtHelp.pyi
+${PLIST.py3x}${PYSITELIB}/PyQt5/QtHelp.pyi
 ${PYSITELIB}/PyQt5/QtHelp.so
-${PYSITELIB}/PyQt5/QtLocation.pyi
+${PLIST.py3x}${PYSITELIB}/PyQt5/QtLocation.pyi
 ${PYSITELIB}/PyQt5/QtLocation.so
-${PYSITELIB}/PyQt5/QtMultimedia.pyi
+${PLIST.py3x}${PYSITELIB}/PyQt5/QtMultimedia.pyi
 ${PYSITELIB}/PyQt5/QtMultimedia.so
-${PYSITELIB}/PyQt5/QtMultimediaWidgets.pyi
+${PLIST.py3x}${PYSITELIB}/PyQt5/QtMultimediaWidgets.pyi
 ${PYSITELIB}/PyQt5/QtMultimediaWidgets.so
-${PYSITELIB}/PyQt5/QtNetwork.pyi
+${PLIST.py3x}${PYSITELIB}/PyQt5/QtNetwork.pyi
 ${PYSITELIB}/PyQt5/QtNetwork.so
-${PYSITELIB}/PyQt5/QtOpenGL.pyi
+${PLIST.py3x}${PYSITELIB}/PyQt5/QtOpenGL.pyi
 ${PYSITELIB}/PyQt5/QtOpenGL.so
-${PYSITELIB}/PyQt5/QtPositioning.pyi
+${PLIST.py3x}${PYSITELIB}/PyQt5/QtPositioning.pyi
 ${PYSITELIB}/PyQt5/QtPositioning.so
-${PYSITELIB}/PyQt5/QtPrintSupport.pyi
+${PLIST.py3x}${PYSITELIB}/PyQt5/QtPrintSupport.pyi
 ${PYSITELIB}/PyQt5/QtPrintSupport.so
-${PYSITELIB}/PyQt5/QtQml.pyi
+${PLIST.py3x}${PYSITELIB}/PyQt5/QtQml.pyi
 ${PYSITELIB}/PyQt5/QtQml.so
-${PYSITELIB}/PyQt5/QtQuick.pyi
+${PLIST.py3x}${PYSITELIB}/PyQt5/QtQuick.pyi
 ${PYSITELIB}/PyQt5/QtQuick.so
-${PYSITELIB}/PyQt5/QtQuickWidgets.pyi
+${PLIST.py3x}${PYSITELIB}/PyQt5/QtQuickWidgets.pyi
 ${PYSITELIB}/PyQt5/QtQuickWidgets.so
-${PYSITELIB}/PyQt5/QtSensors.pyi
+${PLIST.py3x}${PYSITELIB}/PyQt5/QtSensors.pyi
 ${PYSITELIB}/PyQt5/QtSensors.so
-${PYSITELIB}/PyQt5/QtSql.pyi
+${PLIST.py3x}${PYSITELIB}/PyQt5/QtSql.pyi
 ${PYSITELIB}/PyQt5/QtSql.so
-${PYSITELIB}/PyQt5/QtSvg.pyi
+${PLIST.py3x}${PYSITELIB}/PyQt5/QtSvg.pyi
 ${PYSITELIB}/PyQt5/QtSvg.so
-${PYSITELIB}/PyQt5/QtTest.pyi
+${PLIST.py3x}${PYSITELIB}/PyQt5/QtTest.pyi
 ${PYSITELIB}/PyQt5/QtTest.so
-${PYSITELIB}/PyQt5/QtWebChannel.pyi
+${PLIST.py3x}${PYSITELIB}/PyQt5/QtWebChannel.pyi
 ${PYSITELIB}/PyQt5/QtWebChannel.so
-${PYSITELIB}/PyQt5/QtWebKit.pyi
+${PLIST.py3x}${PYSITELIB}/PyQt5/QtWebKit.pyi
 ${PYSITELIB}/PyQt5/QtWebKit.so
-${PYSITELIB}/PyQt5/QtWebKitWidgets.pyi
+${PLIST.py3x}${PYSITELIB}/PyQt5/QtWebKitWidgets.pyi
 ${PYSITELIB}/PyQt5/QtWebKitWidgets.so
-${PYSITELIB}/PyQt5/QtWebSockets.pyi
+${PLIST.py3x}${PYSITELIB}/PyQt5/QtWebSockets.pyi
 ${PYSITELIB}/PyQt5/QtWebSockets.so
-${PYSITELIB}/PyQt5/QtWidgets.pyi
+${PLIST.py3x}${PYSITELIB}/PyQt5/QtWidgets.pyi
 ${PYSITELIB}/PyQt5/QtWidgets.so
-${PYSITELIB}/PyQt5/QtXml.pyi
+${PLIST.py3x}${PYSITELIB}/PyQt5/QtXml.pyi
 ${PYSITELIB}/PyQt5/QtXml.so
-${PYSITELIB}/PyQt5/QtXmlPatterns.pyi
+${PLIST.py3x}${PYSITELIB}/PyQt5/QtXmlPatterns.pyi
 ${PYSITELIB}/PyQt5/QtXmlPatterns.so
 ${PYSITELIB}/PyQt5/_QOpenGLFunctions_2_0.so
 ${PYSITELIB}/PyQt5/_QOpenGLFunctions_2_1.so