From 2447b762ada630bfd429c970df6b7dbdfeaf0a11 Mon Sep 17 00:00:00 2001 From: rakuco 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. --- net/py-qt4-network/Makefile | 9 +++--- net/py-qt4-network/pkg-plist | 70 ++++++++++++++++++++++---------------------- 2 files changed, 39 insertions(+), 40 deletions(-) (limited to 'net') diff --git a/net/py-qt4-network/Makefile b/net/py-qt4-network/Makefile index 1cd36fd8a31..ed5efaf5e5f 100644 --- a/net/py-qt4-network/Makefile +++ b/net/py-qt4-network/Makefile @@ -8,11 +8,11 @@ CATEGORIES= net devel python MAINTAINER= kde@FreeBSD.org COMMENT= Python bindings for the Qt4 toolkit, QtNetwork module -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 QtNetwork -PYQT4_DIST= yes +PYQT_DIST= yes + +USES= python pyqt:4 +USE_PYQT= sip_build core_run USE_QT4= moc_build network 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/net/py-qt4-network/pkg-plist b/net/py-qt4-network/pkg-plist index 3f5a3cb6b18..41aa276648b 100644 --- a/net/py-qt4-network/pkg-plist +++ b/net/py-qt4-network/pkg-plist @@ -1,37 +1,37 @@ %%PYTHON_SITELIBDIR%%/PyQt4/QtNetwork.so -share/py-sip/QtNetwork/QtNetworkmod.sip -share/py-sip/QtNetwork/qabstractnetworkcache.sip -share/py-sip/QtNetwork/qabstractsocket.sip -share/py-sip/QtNetwork/qauthenticator.sip -share/py-sip/QtNetwork/qdnslookup.sip -share/py-sip/QtNetwork/qftp.sip -share/py-sip/QtNetwork/qhostaddress.sip -share/py-sip/QtNetwork/qhostinfo.sip -share/py-sip/QtNetwork/qhttp.sip -share/py-sip/QtNetwork/qhttpmultipart.sip -share/py-sip/QtNetwork/qlocalserver.sip -share/py-sip/QtNetwork/qlocalsocket.sip -share/py-sip/QtNetwork/qnetworkaccessmanager.sip -share/py-sip/QtNetwork/qnetworkconfigmanager.sip -share/py-sip/QtNetwork/qnetworkconfiguration.sip -share/py-sip/QtNetwork/qnetworkcookie.sip -share/py-sip/QtNetwork/qnetworkcookiejar.sip -share/py-sip/QtNetwork/qnetworkdiskcache.sip -share/py-sip/QtNetwork/qnetworkinterface.sip -share/py-sip/QtNetwork/qnetworkproxy.sip -share/py-sip/QtNetwork/qnetworkreply.sip -share/py-sip/QtNetwork/qnetworkrequest.sip -share/py-sip/QtNetwork/qnetworksession.sip -share/py-sip/QtNetwork/qssl.sip -share/py-sip/QtNetwork/qsslcertificate.sip -share/py-sip/QtNetwork/qsslcertificateextension.sip -share/py-sip/QtNetwork/qsslcipher.sip -share/py-sip/QtNetwork/qsslconfiguration.sip -share/py-sip/QtNetwork/qsslerror.sip -share/py-sip/QtNetwork/qsslkey.sip -share/py-sip/QtNetwork/qsslsocket.sip -share/py-sip/QtNetwork/qtcpserver.sip -share/py-sip/QtNetwork/qtcpsocket.sip -share/py-sip/QtNetwork/qudpsocket.sip -share/py-sip/QtNetwork/qurlinfo.sip +%%PYQT_SIPDIR%%/QtNetwork/QtNetworkmod.sip +%%PYQT_SIPDIR%%/QtNetwork/qabstractnetworkcache.sip +%%PYQT_SIPDIR%%/QtNetwork/qabstractsocket.sip +%%PYQT_SIPDIR%%/QtNetwork/qauthenticator.sip +%%PYQT_SIPDIR%%/QtNetwork/qdnslookup.sip +%%PYQT_SIPDIR%%/QtNetwork/qftp.sip +%%PYQT_SIPDIR%%/QtNetwork/qhostaddress.sip +%%PYQT_SIPDIR%%/QtNetwork/qhostinfo.sip +%%PYQT_SIPDIR%%/QtNetwork/qhttp.sip +%%PYQT_SIPDIR%%/QtNetwork/qhttpmultipart.sip +%%PYQT_SIPDIR%%/QtNetwork/qlocalserver.sip +%%PYQT_SIPDIR%%/QtNetwork/qlocalsocket.sip +%%PYQT_SIPDIR%%/QtNetwork/qnetworkaccessmanager.sip +%%PYQT_SIPDIR%%/QtNetwork/qnetworkconfigmanager.sip +%%PYQT_SIPDIR%%/QtNetwork/qnetworkconfiguration.sip +%%PYQT_SIPDIR%%/QtNetwork/qnetworkcookie.sip +%%PYQT_SIPDIR%%/QtNetwork/qnetworkcookiejar.sip +%%PYQT_SIPDIR%%/QtNetwork/qnetworkdiskcache.sip +%%PYQT_SIPDIR%%/QtNetwork/qnetworkinterface.sip +%%PYQT_SIPDIR%%/QtNetwork/qnetworkproxy.sip +%%PYQT_SIPDIR%%/QtNetwork/qnetworkreply.sip +%%PYQT_SIPDIR%%/QtNetwork/qnetworkrequest.sip +%%PYQT_SIPDIR%%/QtNetwork/qnetworksession.sip +%%PYQT_SIPDIR%%/QtNetwork/qssl.sip +%%PYQT_SIPDIR%%/QtNetwork/qsslcertificate.sip +%%PYQT_SIPDIR%%/QtNetwork/qsslcertificateextension.sip +%%PYQT_SIPDIR%%/QtNetwork/qsslcipher.sip +%%PYQT_SIPDIR%%/QtNetwork/qsslconfiguration.sip +%%PYQT_SIPDIR%%/QtNetwork/qsslerror.sip +%%PYQT_SIPDIR%%/QtNetwork/qsslkey.sip +%%PYQT_SIPDIR%%/QtNetwork/qsslsocket.sip +%%PYQT_SIPDIR%%/QtNetwork/qtcpserver.sip +%%PYQT_SIPDIR%%/QtNetwork/qtcpsocket.sip +%%PYQT_SIPDIR%%/QtNetwork/qudpsocket.sip +%%PYQT_SIPDIR%%/QtNetwork/qurlinfo.sip %%API%%share/qt4/qsci/api/python/QtNetwork.api -- cgit