From 31469ae5656e71f14de03b31cf71b809859573d2 Mon Sep 17 00:00:00 2001 From: Raphael Kubo da Costa Date: Tue, 8 Dec 2015 16:49:43 +0000 Subject: PyQt: Replace bsd.pyqt.mk with Uses/pyqt.mk. In preparation for landing PyQt5 ports, generalize devel/py-qt4's bsd.pyqt.mk and make it a proper file in Uses/. Ports wishing to depend on PyQt4 ports can now do the following: USES= pyqt:4 USE_PYQT= foo bar_build baz_run Other changes include the renaming of the PYQT4_DIST variable to PYQT_DIST and the introduction of the PYQT_SIPDIR plist substitution variable. The rest of the contents of Uses/pyqt.mk are pretty much identical to what we had in bsd.pyqt.mk with additional processing of USE_PYQT. Even though this patch touches files in many different ports, the goal is for it to be a no-op from an end-user perspective (so that the basic infrastructure is landed before the other, riskier changes): no dependencies have been changed, PyQt/SIP/QScintilla have not been upgraded and the plists should remain exactly the same, since PYQT_SIPDIR currently contains the same value that used to be hardcoded in the plists. Huge thanks to Guido Falsi (madpilot@) for spearheading most of the work: he took the initiative to work on PyQt5 and sent D2910 to Phabricator with the original version of this patch. Tobias Berner (tcberner@gmail.com) later applied it to kde@'s experimental area51 repositories and did some more work on it. --- graphics/py-qt4-svg/Makefile | 9 ++++----- graphics/py-qt4-svg/pkg-plist | 10 +++++----- 2 files changed, 9 insertions(+), 10 deletions(-) (limited to 'graphics') diff --git a/graphics/py-qt4-svg/Makefile b/graphics/py-qt4-svg/Makefile index ec8870594f16..d4f6b9cebfa5 100644 --- a/graphics/py-qt4-svg/Makefile +++ b/graphics/py-qt4-svg/Makefile @@ -8,11 +8,11 @@ CATEGORIES= graphics devel python MAINTAINER= kde@FreeBSD.org COMMENT= Python bindings for the Qt4 toolkit, QtSvg module -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip -RUN_DEPENDS= ${PKGNAMEPREFIX}gui>=${PYQT4_VERSION}:${PORTSDIR}/x11-toolkits/py-qt4-gui - CONFIGURE_ARGS= --enable QtSvg -PYQT4_DIST= yes +PYQT_DIST= yes + +USES= python pyqt:4 +USE_PYQT= sip_build gui_run USE_QT4= moc_build svg qmake_build OPTIONS_DEFINE= API DEBUG @@ -25,5 +25,4 @@ API_CONFIGURE_OFF= --no-qsci-api API_LIB_DEPENDS= libqscintilla2.so:${PORTSDIR}/devel/qscintilla2 DEBUG_CONFIGURE_ON= --debug --trace -.include "${.CURDIR}/../../devel/py-qt4/bsd.pyqt.mk" .include diff --git a/graphics/py-qt4-svg/pkg-plist b/graphics/py-qt4-svg/pkg-plist index 67f60be30008..fb3dde8a90ce 100644 --- a/graphics/py-qt4-svg/pkg-plist +++ b/graphics/py-qt4-svg/pkg-plist @@ -1,7 +1,7 @@ %%PYTHON_SITELIBDIR%%/PyQt4/QtSvg.so -share/py-sip/QtSvg/QtSvgmod.sip -share/py-sip/QtSvg/qgraphicssvgitem.sip -share/py-sip/QtSvg/qsvggenerator.sip -share/py-sip/QtSvg/qsvgrenderer.sip -share/py-sip/QtSvg/qsvgwidget.sip +%%PYQT_SIPDIR%%/QtSvg/QtSvgmod.sip +%%PYQT_SIPDIR%%/QtSvg/qgraphicssvgitem.sip +%%PYQT_SIPDIR%%/QtSvg/qsvggenerator.sip +%%PYQT_SIPDIR%%/QtSvg/qsvgrenderer.sip +%%PYQT_SIPDIR%%/QtSvg/qsvgwidget.sip %%API%%share/qt4/qsci/api/python/QtSvg.api -- cgit v1.2.3