svn commit: r403155 - in head/devel: py-qt4 py-qt4-dbus py-qt4-dbussupport
Raphael Kubo da Costa
rakuco at FreeBSD.org
Sun Dec 6 20:20:32 UTC 2015
Author: rakuco
Date: Sun Dec 6 20:20:30 2015
New Revision: 403155
URL: https://svnweb.freebsd.org/changeset/ports/403155
Log:
PyQt4: Finalise splitting py-qt4-dbus and py-qt4-dbussupport.
py-qt4-dbus is a wrapper for QtBus classes, while py-qt4-dbussupport
provides Qt event loop support for py-dbus.
devel/py-qt4-dbus:
- Remove dependency on devel/py-dbus.
devel/py-qt4-dbussupport:
- Update comment.
- Remove old CONFLICTS_INSTALL.
- Pull devel/py-dbus or devel/py3-dbus depending on Python version.
bsd.pyqt.mk:
- Update description for the py-qt4-dbussupport port.
The original commit is from makc@ and was made to kde@'s experimental area51
repository. I am landing it myself in preparation for other commits adding
support for PyQt5 and updating the existing ports.
Modified:
head/devel/py-qt4-dbus/Makefile
head/devel/py-qt4-dbussupport/Makefile
head/devel/py-qt4/bsd.pyqt.mk
Modified: head/devel/py-qt4-dbus/Makefile
==============================================================================
--- head/devel/py-qt4-dbus/Makefile Sun Dec 6 20:12:58 2015 (r403154)
+++ head/devel/py-qt4-dbus/Makefile Sun Dec 6 20:20:30 2015 (r403155)
@@ -2,16 +2,15 @@
# $FreeBSD$
PORTNAME= dbus
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= devel python
MAINTAINER= kde at FreeBSD.org
COMMENT= Python bindings for the Qt4 toolkit, QtDBus module
-BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip \
- ${PYTHON_PKGNAMEPREFIX}dbus>=0.8:${PORTSDIR}/devel/py-dbus
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.8:${PORTSDIR}/devel/py-dbus \
- ${PKGNAMEPREFIX}core>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-core
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip
+RUN_DEPENDS= ${PKGNAMEPREFIX}core>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-core
CONFIGURE_ARGS= --enable QtDBus
PYQT4_DIST= yes
Modified: head/devel/py-qt4-dbussupport/Makefile
==============================================================================
--- head/devel/py-qt4-dbussupport/Makefile Sun Dec 6 20:12:58 2015 (r403154)
+++ head/devel/py-qt4-dbussupport/Makefile Sun Dec 6 20:20:30 2015 (r403155)
@@ -1,16 +1,15 @@
# $FreeBSD$
PORTNAME= dbussupport
+PORTREVISION= 1
CATEGORIES= devel python
MAINTAINER= kde at FreeBSD.org
-COMMENT= Python bindings for the Qt4 toolkit, D-BUS module
-
-CONFLICTS_INSTALL= py*-qt4-dbus-4.9.1*
+COMMENT= Qt event loop support for dbus-python
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip \
- ${PYTHON_PKGNAMEPREFIX}dbus>=0.8:${PORTSDIR}/devel/py-dbus
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.8:${PORTSDIR}/devel/py-dbus \
+ ${PYDBUS}
+RUN_DEPENDS= ${PYDBUS} \
${PKGNAMEPREFIX}core>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-core
CONFIGURE_ARGS= --enable QtCore
@@ -27,4 +26,12 @@ INSTALL_WRKSRC= ${WRKSRC}/dbus
PLIST_FILES= %%PYTHON_SITELIBDIR%%/dbus/mainloop/qt.so
.include "${.CURDIR}/../py-qt4/bsd.pyqt.mk"
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_MAJOR_VER} == 2
+PYDBUS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.8:${PORTSDIR}/devel/py-dbus
+.elif ${PYTHON_MAJOR_VER} == 3
+PYDBUS= ${PYTHON_PKGNAMEPREFIX}dbus>=0.8:${PORTSDIR}/devel/py3-dbus
+.endif
+
+.include <bsd.port.post.mk>
Modified: head/devel/py-qt4/bsd.pyqt.mk
==============================================================================
--- head/devel/py-qt4/bsd.pyqt.mk Sun Dec 6 20:12:58 2015 (r403154)
+++ head/devel/py-qt4/bsd.pyqt.mk Sun Dec 6 20:20:30 2015 (r403155)
@@ -63,7 +63,7 @@ xmlpatterns_PORT= textproc/py-qt4-xmlpat
assistant_DESC= Python bindings for QtAssistant module
core_DESC= Python bindings for QtCore module
dbus_DESC= Python bindings for QtDBus module
-dbussupport_DESC= Python bindings for D-Bus
+dbussupport_DESC= Qt event loop support for dbus-python
declarative_DESC= Python bindings for QtDeclarative module
demo_DESC= PyQt4 demo and examples
designer_DESC= Python bindings for QtDesigner module
More information about the svn-ports-all
mailing list