From owner-svn-ports-head@freebsd.org Sun Dec 6 20:20:31 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DA29B7CE1; Sun, 6 Dec 2015 20:20:31 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B85441B17; Sun, 6 Dec 2015 20:20:31 +0000 (UTC) (envelope-from rakuco@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tB6KKUDY040694; Sun, 6 Dec 2015 20:20:30 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tB6KKUVT040691; Sun, 6 Dec 2015 20:20:30 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201512062020.tB6KKUVT040691@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Sun, 6 Dec 2015 20:20:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r403155 - in head/devel: py-qt4 py-qt4-dbus py-qt4-dbussupport X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Dec 2015 20:20:32 -0000 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@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@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 +.include + +.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 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