From owner-svn-ports-all@freebsd.org Tue Dec 8 16:49:46 2015 Return-Path: Delivered-To: svn-ports-all@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 C4DE89D3E2D; Tue, 8 Dec 2015 16:49:46 +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 6A25F115E; Tue, 8 Dec 2015 16:49:46 +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 tB8GnjLN068335; Tue, 8 Dec 2015 16:49:45 GMT (envelope-from rakuco@FreeBSD.org) Received: (from rakuco@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tB8GnhEB068312; Tue, 8 Dec 2015 16:49:43 GMT (envelope-from rakuco@FreeBSD.org) Message-Id: <201512081649.tB8GnhEB068312@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rakuco set sender to rakuco@FreeBSD.org using -f From: Raphael Kubo da Costa Date: Tue, 8 Dec 2015 16:49:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r403297 - in head: Mk/Uses databases/py-qt4-sql devel/py-qt4 devel/py-qt4-assistant devel/py-qt4-core devel/py-qt4-dbus devel/py-qt4-dbussupport devel/py-qt4-declarative devel/py-qt4-de... X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Dec 2015 16:49:46 -0000 Author: rakuco Date: Tue Dec 8 16:49:43 2015 New Revision: 403297 URL: https://svnweb.freebsd.org/changeset/ports/403297 Log: 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. Added: head/Mk/Uses/pyqt.mk (contents, props changed) Deleted: head/devel/py-qt4/bsd.pyqt.mk Modified: head/databases/py-qt4-sql/Makefile head/databases/py-qt4-sql/pkg-plist head/devel/py-qt4-assistant/Makefile head/devel/py-qt4-assistant/pkg-plist head/devel/py-qt4-core/Makefile head/devel/py-qt4-core/pkg-plist head/devel/py-qt4-dbus/Makefile head/devel/py-qt4-dbus/pkg-plist head/devel/py-qt4-dbussupport/Makefile head/devel/py-qt4-declarative/Makefile head/devel/py-qt4-declarative/pkg-plist head/devel/py-qt4-designer/Makefile head/devel/py-qt4-designer/pkg-plist head/devel/py-qt4-designerplugin/Makefile head/devel/py-qt4-help/Makefile head/devel/py-qt4-help/pkg-plist head/devel/py-qt4-qscintilla2/Makefile head/devel/py-qt4-qscintilla2/pkg-plist head/devel/py-qt4-script/Makefile head/devel/py-qt4-script/pkg-plist head/devel/py-qt4-scripttools/Makefile head/devel/py-qt4-scripttools/pkg-plist head/devel/py-qt4-test/Makefile head/devel/py-qt4-test/pkg-plist head/devel/py-qt4/Makefile head/devel/py-sip/Makefile head/devel/qscintilla2-designerplugin/Makefile head/devel/qscintilla2/Makefile head/graphics/py-qt4-svg/Makefile head/graphics/py-qt4-svg/pkg-plist head/misc/py-qt4-demo/Makefile head/misc/py-qt4-doc/Makefile head/multimedia/py-qt4-multimedia/Makefile head/multimedia/py-qt4-multimedia/pkg-plist head/multimedia/py-qt4-phonon/Makefile head/multimedia/py-qt4-phonon/pkg-plist head/net-im/turpial/Makefile head/net/py-qt4-network/Makefile head/net/py-qt4-network/pkg-plist head/textproc/py-qt4-xml/Makefile head/textproc/py-qt4-xml/pkg-plist head/textproc/py-qt4-xmlpatterns/Makefile head/textproc/py-qt4-xmlpatterns/pkg-plist head/www/py-qt4-webkit/Makefile head/www/py-qt4-webkit/pkg-plist head/x11-toolkits/py-qt4-gui/Makefile head/x11-toolkits/py-qt4-gui/pkg-plist head/x11/py-qt4-opengl/Makefile head/x11/py-qt4-opengl/pkg-plist Added: head/Mk/Uses/pyqt.mk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/Mk/Uses/pyqt.mk Tue Dec 8 16:49:43 2015 (r403297) @@ -0,0 +1,223 @@ +# $FreeBSD$ +# +# Handle PyQt related ports +# +# Feature: pyqt +# Usage: USES=pyqt:ARGS +# Valid ARGS: 4 +# +# MAINTAINER: kde@FreeBSD.org +# +# Internal Port variables for PyQt ports: +# PYQT_DIST - This port is part of PyQt4 itself. Variables and +# targets are then set assuming a certain tarball and +# port layout. +# USE_PYQT - List of PyQt components to depend on +# * foo_build only build depend +# * foo_run only run depend +# * foo both (default) +# SIPDIR - Absolute path where sip files will be installed +# SIPDIR_REL - Relative version of SIPDIR +# +# Also PYQT_SIPDIR=${SIPDIR_REL} will be added to PLIST_SUB. +# + +.if !defined(_INCLUDE_USES_PYQT_MK) +_INCLUDE_USES_PYQT_MK= yes + +# At the moment we support PyQt bindings versions 4, sip +# option is for internal use by the py-sip ports. +_PYQT_SUPPORTED= 4 sip + +.if empty(pyqt_ARGS) +IGNORE= pyqt needs a qt-version (${_PYQT_SUPPORTED}) +.endif + +# At the moment we support PyQt bindings version 4 +.for ver in ${_PYQT_SUPPORTED:O:u} +. if ${pyqt_ARGS:M${ver}} +. if empty(_PYQT_VERSION) +_PYQT_VERSION= ${ver} +. else +IGNORE?= cannot be installed: different PYQT versions specified via pyqt:[${_PYQT_SUPPORTED:S/ //g}] +. endif +. endif +.endfor + +.if empty(_PYQT_VERSION) +IGNORE?= USES=pyqt needs a version number (valid values: ${_PYQT_SUPPORTED}) +.endif + +PYQT_MAINTAINER= kde@FreeBSD.org + +MASTER_SITE_RIVERBANK= http://www.riverbankcomputing.com/static/Downloads/%SUBDIR%/ + +MASTER_SITES_SIP= SF/pyqt/sip/sip-${PORTVERSION} \ + GENTOO +MASTER_SITES_PYQT4= SF/pyqt/PyQt4/PyQt-${PORTVERSION} \ + GENTOO +MASTER_SITES_QSCI2= SF/pyqt/QScintilla2/QScintilla-${PORTVERSION} \ + GENTOO + +SIP_VERSION= 4.16.5 +QSCI2_VERSION= 2.8.4 +PYQT4_VERSION= 4.11.3 + +SIP_DISTNAME= sip-${SIP_VERSION} +PYQT4_DISTNAME= PyQt-x11-gpl-${PYQT4_VERSION} +PYQT4_DISTINFO_FILE= ${.CURDIR}/../../devel/${PYQT_RELNAME}/distinfo +QSCI2_DISTNAME= QScintilla-gpl-${QSCI2_VERSION} + +# PyQt components split up into pyqt4/pyqt5 (upcoming)/... +_USE_PYQT_ALL= core dbus demo designer doc gui \ + multimedia network opengl qscintilla2 \ + sql svg test webkit xml xmlpatterns sip +# List of components only in pyqt4 +_USE_PYQT4_ONLY= assistant declarative dbussupport \ + designerplugin help phonon script \ + scripttools + +# Unversioned variables for the rest of the file +PYQT_VERSION= ${PYQT${_PYQT_VERSION}_VERSION} +PYQT_RELNAME= py-qt${_PYQT_VERSION} +PYQT_PY_RELNAME= ${PYTHON_PKGNAMEPREFIX}qt${_PYQT_VERSION} +PYQT_MASTERSITES= ${MASTER_SITES_PYQT${_PYQT_VERSION}} +PYQT_DISTNAME= ${PYQT${_PYQT_VERSION}_DISTNAME} +PYQT_DISTINFO_FILE= ${PYQT${_PYQT_VERSION}_DISTINFO_FILE} + +py-sip_PATH= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION} + +py-assistant_PATH= ${PYQT_PY_RELNAME}-assistant>=${PYQT_VERSION} +py-core_PATH= ${PYQT_PY_RELNAME}-core>=${PYQT_VERSION} +py-dbus_PATH= ${PYQT_PY_RELNAME}-dbus>=${PYQT_VERSION} +py-dbussupport_PATH= ${PYQT_PY_RELNAME}-dbussupport>=${PYQT_VERSION} +py-declarative_PATH= ${PYQT_PY_RELNAME}-declarative>=${PYQT_VERSION} +py-demo_PATH= ${PYQT_PY_RELNAME}-demo>=${PYQT_VERSION} +py-designer_PATH= ${PYQT_PY_RELNAME}-designer>=${PYQT_VERSION} +py-designerplugin_PATH= ${PYQT_PY_RELNAME}-designerplugin>=${PYQT_VERSION} +py-doc_PATH= ${PYQT_PY_RELNAME}-doc>=${PYQT_VERSION} +py-gui_PATH= ${PYQT_PY_RELNAME}-gui>=${PYQT_VERSION} +py-help_PATH= ${PYQT_PY_RELNAME}-help>=${PYQT_VERSION} +py-multimedia_PATH= ${PYQT_PY_RELNAME}-multimedia>=${PYQT_VERSION} +py-network_PATH= ${PYQT_PY_RELNAME}-network>=${PYQT_VERSION} +py-opengl_PATH= ${PYQT_PY_RELNAME}-opengl>=${PYQT_VERSION} +py-phonon_PATH= ${PYQT_PY_RELNAME}-phonon>=${PYQT_VERSION} +py-qscintilla2_PATH= ${PYQT_PY_RELNAME}-qscintilla2>=${QSCI2_VERSION} +py-script_PATH= ${PYQT_PY_RELNAME}-script>=${PYQT_VERSION} +py-scripttools_PATH= ${PYQT_PY_RELNAME}-scripttools>=${PYQT_VERSION} +py-sql_PATH= ${PYQT_PY_RELNAME}-sql>=${PYQT_VERSION} +py-svg_PATH= ${PYQT_PY_RELNAME}-svg>=${PYQT_VERSION} +py-test_PATH= ${PYQT_PY_RELNAME}-test>=${PYQT_VERSION} +py-webkit_PATH= ${PYQT_PY_RELNAME}-webkit>=${PYQT_VERSION} +py-xml_PATH= ${PYQT_PY_RELNAME}-xml>=${PYQT_VERSION} +py-xmlpatterns_PATH= ${PYQT_PY_RELNAME}-xmlpatterns>=${PYQT_VERSION} + +py-sip_PORT= devel/py-sip + +py-assistant_PORT= devel/${PYQT_RELNAME}-assistant +py-core_PORT= devel/${PYQT_RELNAME}-core +py-dbus_PORT= devel/${PYQT_RELNAME}-dbus +py-dbussupport_PORT= devel/${PYQT_RELNAME}-dbussupport +py-declarative_PORT= devel/${PYQT_RELNAME}-declarative +py-demo_PORT= misc/${PYQT_RELNAME}-demo +py-designer_PORT= devel/${PYQT_RELNAME}-designer +py-designerplugin_PORT= devel/${PYQT_RELNAME}-designerplugin +py-doc_PORT= misc/${PYQT_RELNAME}-doc +py-gui_PORT= x11-toolkits/${PYQT_RELNAME}-gui +py-help_PORT= devel/${PYQT_RELNAME}-help +py-multimedia_PORT= multimedia/${PYQT_RELNAME}-multimedia +py-network_PORT= net/${PYQT_RELNAME}-network +py-opengl_PORT= x11/${PYQT_RELNAME}-opengl +py-phonon_PORT= multimedia/${PYQT_RELNAME}-phonon +py-qscintilla2_PORT= devel/${PYQT_RELNAME}-qscintilla2 +py-script_PORT= devel/${PYQT_RELNAME}-script +py-scripttools_PORT= devel/${PYQT_RELNAME}-scripttools +py-sql_PORT= databases/${PYQT_RELNAME}-sql +py-svg_PORT= graphics/${PYQT_RELNAME}-svg +py-test_PORT= devel/${PYQT_RELNAME}-test +py-webkit_PORT= www/${PYQT_RELNAME}-webkit +py-xml_PORT= textproc/${PYQT_RELNAME}-xml +py-xmlpatterns_PORT= textproc/${PYQT_RELNAME}-xmlpatterns + +py-assistant_DESC= Python bindings for QtAssistant module +py-core_DESC= Python bindings for QtCore module +py-dbus_DESC= Python bindings for QtDBus module +py-dbussupport_DESC= Qt event loop support for dbus-python +py-declarative_DESC= Python bindings for QtDeclarative module +py-demo_DESC= PyQt demo and examples +py-designer_DESC= Python bindings for QtDesigner module +py-designerplugin_DESC= Python bindings for QtDesigner plugin +py-doc_DESC= PyQt documentation +py-gui_DESC= Python bindings for QtGui module +py-help_DESC= Python bindings for QtHelp module +py-multimedia_DESC= Python bindings for Multimedia module +py-network_DESC= Python bindings for QtNetwork module +py-opengl_DESC= Python bindings for QtOpenGL module +py-phonon_DESC= Python bindings for Phonon module +py-qscintilla2_DESC= Python bindings for QScintilla2 +py-script_DESC= Python bindings for QtScript module +py-scripttools_DESC= Python bindings for QtScriptTools module +py-sql_DESC= Python bindings for QtSql module +py-svg_DESC= Python bindings for QtSvg module +py-test_DESC= Python bindings for QtTest module +py-webkit_DESC= Python bindings for QtWebKit module +py-xml_DESC= Python bindings for QtXml module +py-xmlpatterns_DESC= Python bindings for QtXmlPatterns module + +SIPDIR_REL= share/py-sip +SIPDIR= ${PREFIX}/${SIPDIR_REL} +PLIST_SUB+= PYQT_SIPDIR=${SIPDIR_REL} + +.if defined(PYQT_DIST) +PORTVERSION= ${PYQT_VERSION} +MASTER_SITES= ${PYQT_MASTERSITES} +PKGNAMEPREFIX= ${PYQT_PY_RELNAME}- +DISTNAME= ${PYQT_DISTNAME} +DISTINFO_FILE= ${PYQT_DISTINFO_FILE} +HAS_CONFIGURE= yes +QT_NONSTANDARD= yes # Do not add unknown arguments to CONFIGURE_ARGS. + +PATCHDIR= ${.CURDIR}/../../devel/${PYQT_RELNAME}-core/files +QSCIDIR= ${PREFIX}/share/qt${_PYQT_VERSION}/qsci +CONFIGURE_ARGS+=-b ${PREFIX}/bin \ + -d ${PYTHONPREFIX_SITELIBDIR} \ + -q ${QMAKE} \ + --confirm-license \ + --sipdir ${SIPDIR} + +# One of the things PyQt looks for to determine whether to build the Qt DBus +# main loop module (${PYQT_RELNAME}-dbussupport) is whether the dbus/ directory is +# present. Only extract it for that port then. +.if ${PORTNAME} != "dbussupport" +EXTRACT_AFTER_ARGS+= --exclude "${DISTNAME}/dbus" +.endif # ${PORTNAME} != "dbussupport" + +.if !target(do-configure) +do-configure: + cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ + ${PYTHON_CMD} configure.py ${CONFIGURE_ARGS} +.endif # !target(do-configure) +.endif # defined(PYQT_DIST) + +# Set build and run depends -- we need to prefix them internally with "py-" +# else we conflict with the ones defined in bsd.qt.mk with the same name +_USE_PYQT_ALL+= ${_USE_PYQT${_PYQT_VERSION}_ONLY} +.for comp in ${_USE_PYQT_ALL:O:u} +_USE_PYQT_ALL_SUFFIXED+= py-${comp} py-${comp}_build py-${comp}_run +py-${comp}_BUILD_DEPENDS?= ${py-${comp}_PATH}:${PORTSDIR}/${py-${comp}_PORT} +py-${comp}_RUN_DEPENDS?= ${py-${comp}_PATH}:${PORTSDIR}/${py-${comp}_PORT} +py-${comp}_build_BUILD_DEPENDS?= ${py-${comp}_BUILD_DEPENDS} +py-${comp}_run_RUN_DEPENDS?= ${py-${comp}_RUN_DEPENDS} +.endfor + +_USE_PYQT= ${USE_PYQT:O:u} +.for comp in ${_USE_PYQT} +. if ${_USE_PYQT_ALL_SUFFIXED:Mpy-${comp}} +BUILD_DEPENDS+= ${py-${comp}_BUILD_DEPENDS} +RUN_DEPENDS+= ${py-${comp}_RUN_DEPENDS} +. else +IGNORE?= cannot be installed: unknown USE_PYQT component ${comp} #' +. endif +.endfor + +.endif # defined(_INCLUDE_USES_PYQT_MK) Modified: head/databases/py-qt4-sql/Makefile ============================================================================== --- head/databases/py-qt4-sql/Makefile Tue Dec 8 16:48:23 2015 (r403296) +++ head/databases/py-qt4-sql/Makefile Tue Dec 8 16:49:43 2015 (r403297) @@ -8,11 +8,11 @@ CATEGORIES= databases devel python MAINTAINER= kde@FreeBSD.org COMMENT= Python bindings for the Qt4 toolkit, QtSql 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 QtSql -PYQT4_DIST= yes +PYQT_DIST= yes + +USES= python pyqt:4 +USE_PYQT= sip_build gui_run USE_QT4= moc_build gui sql 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 Modified: head/databases/py-qt4-sql/pkg-plist ============================================================================== --- head/databases/py-qt4-sql/pkg-plist Tue Dec 8 16:48:23 2015 (r403296) +++ head/databases/py-qt4-sql/pkg-plist Tue Dec 8 16:49:43 2015 (r403297) @@ -1,16 +1,16 @@ %%PYTHON_SITELIBDIR%%/PyQt4/QtSql.so -share/py-sip/QtSql/QtSqlmod.sip -share/py-sip/QtSql/qsql.sip -share/py-sip/QtSql/qsqldatabase.sip -share/py-sip/QtSql/qsqldriver.sip -share/py-sip/QtSql/qsqlerror.sip -share/py-sip/QtSql/qsqlfield.sip -share/py-sip/QtSql/qsqlindex.sip -share/py-sip/QtSql/qsqlquery.sip -share/py-sip/QtSql/qsqlquerymodel.sip -share/py-sip/QtSql/qsqlrecord.sip -share/py-sip/QtSql/qsqlrelationaldelegate.sip -share/py-sip/QtSql/qsqlrelationaltablemodel.sip -share/py-sip/QtSql/qsqlresult.sip -share/py-sip/QtSql/qsqltablemodel.sip +%%PYQT_SIPDIR%%/QtSql/QtSqlmod.sip +%%PYQT_SIPDIR%%/QtSql/qsql.sip +%%PYQT_SIPDIR%%/QtSql/qsqldatabase.sip +%%PYQT_SIPDIR%%/QtSql/qsqldriver.sip +%%PYQT_SIPDIR%%/QtSql/qsqlerror.sip +%%PYQT_SIPDIR%%/QtSql/qsqlfield.sip +%%PYQT_SIPDIR%%/QtSql/qsqlindex.sip +%%PYQT_SIPDIR%%/QtSql/qsqlquery.sip +%%PYQT_SIPDIR%%/QtSql/qsqlquerymodel.sip +%%PYQT_SIPDIR%%/QtSql/qsqlrecord.sip +%%PYQT_SIPDIR%%/QtSql/qsqlrelationaldelegate.sip +%%PYQT_SIPDIR%%/QtSql/qsqlrelationaltablemodel.sip +%%PYQT_SIPDIR%%/QtSql/qsqlresult.sip +%%PYQT_SIPDIR%%/QtSql/qsqltablemodel.sip %%API%%share/qt4/qsci/api/python/QtSql.api Modified: head/devel/py-qt4-assistant/Makefile ============================================================================== --- head/devel/py-qt4-assistant/Makefile Tue Dec 8 16:48:23 2015 (r403296) +++ head/devel/py-qt4-assistant/Makefile Tue Dec 8 16:49:43 2015 (r403297) @@ -8,12 +8,11 @@ CATEGORIES= devel python MAINTAINER= kde@FreeBSD.org COMMENT= Python bindings for the Qt4 toolkit, QtAssistant module -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip -RUN_DEPENDS= ${PKGNAMEPREFIX}gui>=${PYQT4_VERSION}:${PORTSDIR}/x11-toolkits/py-qt4-gui \ - ${PKGNAMEPREFIX}network>=${PYQT4_VERSION}:${PORTSDIR}/net/py-qt4-network - CONFIGURE_ARGS= --enable QtAssistant -PYQT4_DIST= yes +PYQT_DIST= yes + +USES= python pyqt:4 +USE_PYQT= sip_build gui_run network_run USE_QT4= assistantclient moc_build qmake_build OPTIONS_DEFINE= API DEBUG @@ -26,5 +25,4 @@ API_CONFIGURE_OFF= --no-qsci-api API_LIB_DEPENDS= libqscintilla2.so:${PORTSDIR}/devel/qscintilla2 DEBUG_CONFIGURE_ON= --debug --trace -.include "${.CURDIR}/../py-qt4/bsd.pyqt.mk" .include Modified: head/devel/py-qt4-assistant/pkg-plist ============================================================================== --- head/devel/py-qt4-assistant/pkg-plist Tue Dec 8 16:48:23 2015 (r403296) +++ head/devel/py-qt4-assistant/pkg-plist Tue Dec 8 16:49:43 2015 (r403297) @@ -1,4 +1,4 @@ %%PYTHON_SITELIBDIR%%/PyQt4/QtAssistant.so -share/py-sip/QtAssistant/QtAssistantmod.sip -share/py-sip/QtAssistant/qassistantclient.sip +%%PYQT_SIPDIR%%/QtAssistant/QtAssistantmod.sip +%%PYQT_SIPDIR%%/QtAssistant/qassistantclient.sip %%API%%share/qt4/qsci/api/python/QtAssistant.api Modified: head/devel/py-qt4-core/Makefile ============================================================================== --- head/devel/py-qt4-core/Makefile Tue Dec 8 16:48:23 2015 (r403296) +++ head/devel/py-qt4-core/Makefile Tue Dec 8 16:49:43 2015 (r403297) @@ -8,12 +8,12 @@ CATEGORIES= devel python MAINTAINER= kde@FreeBSD.org COMMENT= Python bindings for the Qt4 toolkit, QtCore module -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip -RUN_DEPENDS:= ${BUILD_DEPENDS} - CONFIGURE_ARGS= --enable QtCore -PYQT4_DIST= yes -USE_PYTHON+= py3kplist +PYQT_DIST= yes + +USES= python pyqt:4 +USE_PYTHON= py3kplist +USE_PYQT= sip USE_QT4= corelib qmake_build moc_build OPTIONS_DEFINE= API DEBUG @@ -26,7 +26,6 @@ API_CONFIGURE_OFF= --no-qsci-api API_LIB_DEPENDS= libqscintilla2.so:${PORTSDIR}/devel/qscintilla2 DEBUG_CONFIGURE_ON= --debug --trace -.include "${.CURDIR}/../py-qt4/bsd.pyqt.mk" .include # Bug 180467: We need to remove the port_v${VERSION} directory that does not Modified: head/devel/py-qt4-core/pkg-plist ============================================================================== --- head/devel/py-qt4-core/pkg-plist Tue Dec 8 16:48:23 2015 (r403296) +++ head/devel/py-qt4-core/pkg-plist Tue Dec 8 16:49:43 2015 (r403297) @@ -99,102 +99,102 @@ bin/pyuic4 %%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins/qtwebkit.py %%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins/qtwebkit.pyc %%PYTHON_SITELIBDIR%%/PyQt4/uic/widget-plugins/qtwebkit.pyo -share/py-sip/QtCore/QtCoremod.sip -share/py-sip/QtCore/qabstractanimation.sip -share/py-sip/QtCore/qabstracteventdispatcher.sip -share/py-sip/QtCore/qabstractfileengine.sip -share/py-sip/QtCore/qabstractitemmodel.sip -share/py-sip/QtCore/qabstractnativeeventfilter.sip -share/py-sip/QtCore/qabstractstate.sip -share/py-sip/QtCore/qabstracttransition.sip -share/py-sip/QtCore/qanimationgroup.sip -share/py-sip/QtCore/qbasictimer.sip -share/py-sip/QtCore/qbitarray.sip -share/py-sip/QtCore/qbuffer.sip -share/py-sip/QtCore/qbytearray.sip -share/py-sip/QtCore/qbytearraymatcher.sip -share/py-sip/QtCore/qchar.sip -share/py-sip/QtCore/qcoreapplication.sip -share/py-sip/QtCore/qcoreevent.sip -share/py-sip/QtCore/qcryptographichash.sip -share/py-sip/QtCore/qdatastream.sip -share/py-sip/QtCore/qdatetime.sip -share/py-sip/QtCore/qdir.sip -share/py-sip/QtCore/qdiriterator.sip -share/py-sip/QtCore/qeasingcurve.sip -share/py-sip/QtCore/qelapsedtimer.sip -share/py-sip/QtCore/qeventloop.sip -share/py-sip/QtCore/qeventtransition.sip -share/py-sip/QtCore/qfile.sip -share/py-sip/QtCore/qfiledevice.sip -share/py-sip/QtCore/qfileinfo.sip -share/py-sip/QtCore/qfilesystemwatcher.sip -share/py-sip/QtCore/qfinalstate.sip -share/py-sip/QtCore/qfsfileengine.sip -share/py-sip/QtCore/qglobal.sip -share/py-sip/QtCore/qhash.sip -share/py-sip/QtCore/qhistorystate.sip -share/py-sip/QtCore/qiodevice.sip -share/py-sip/QtCore/qlibrary.sip -share/py-sip/QtCore/qlibraryinfo.sip -share/py-sip/QtCore/qline.sip -share/py-sip/QtCore/qlist.sip -share/py-sip/QtCore/qlocale.sip -share/py-sip/QtCore/qmap.sip -share/py-sip/QtCore/qmargins.sip -share/py-sip/QtCore/qmetaobject.sip -share/py-sip/QtCore/qmetatype.sip -share/py-sip/QtCore/qmimedata.sip -share/py-sip/QtCore/qmutex.sip -share/py-sip/QtCore/qnamespace.sip -share/py-sip/QtCore/qnumeric.sip -share/py-sip/QtCore/qobject.sip -share/py-sip/QtCore/qobjectcleanuphandler.sip -share/py-sip/QtCore/qobjectdefs.sip -share/py-sip/QtCore/qpair.sip -share/py-sip/QtCore/qparallelanimationgroup.sip -share/py-sip/QtCore/qpauseanimation.sip -share/py-sip/QtCore/qpluginloader.sip -share/py-sip/QtCore/qpoint.sip -share/py-sip/QtCore/qprocess.sip -share/py-sip/QtCore/qpropertyanimation.sip -share/py-sip/QtCore/qpynullvariant.sip -share/py-sip/QtCore/qreadwritelock.sip -share/py-sip/QtCore/qrect.sip -share/py-sip/QtCore/qregexp.sip -share/py-sip/QtCore/qresource.sip -share/py-sip/QtCore/qrunnable.sip -share/py-sip/QtCore/qsemaphore.sip -share/py-sip/QtCore/qsequentialanimationgroup.sip -share/py-sip/QtCore/qset.sip -share/py-sip/QtCore/qsettings.sip -share/py-sip/QtCore/qsharedmemory.sip -share/py-sip/QtCore/qsignalmapper.sip -share/py-sip/QtCore/qsignaltransition.sip -share/py-sip/QtCore/qsize.sip -share/py-sip/QtCore/qsocketnotifier.sip -share/py-sip/QtCore/qstate.sip -share/py-sip/QtCore/qstatemachine.sip -share/py-sip/QtCore/qstring.sip -share/py-sip/QtCore/qstringlist.sip -share/py-sip/QtCore/qstringmatcher.sip -share/py-sip/QtCore/qsystemsemaphore.sip -share/py-sip/QtCore/qtemporaryfile.sip -share/py-sip/QtCore/qtextboundaryfinder.sip -share/py-sip/QtCore/qtextcodec.sip -share/py-sip/QtCore/qtextstream.sip -share/py-sip/QtCore/qthread.sip -share/py-sip/QtCore/qthreadpool.sip -share/py-sip/QtCore/qtimeline.sip -share/py-sip/QtCore/qtimer.sip -share/py-sip/QtCore/qtranslator.sip -share/py-sip/QtCore/qurl.sip -share/py-sip/QtCore/qurlquery.sip -share/py-sip/QtCore/quuid.sip -share/py-sip/QtCore/qvariant.sip -share/py-sip/QtCore/qvariantanimation.sip -share/py-sip/QtCore/qvector.sip -share/py-sip/QtCore/qwaitcondition.sip -share/py-sip/QtCore/qwineventnotifier.sip -share/py-sip/QtCore/qxmlstream.sip +%%PYQT_SIPDIR%%/QtCore/QtCoremod.sip +%%PYQT_SIPDIR%%/QtCore/qabstractanimation.sip +%%PYQT_SIPDIR%%/QtCore/qabstracteventdispatcher.sip +%%PYQT_SIPDIR%%/QtCore/qabstractfileengine.sip +%%PYQT_SIPDIR%%/QtCore/qabstractitemmodel.sip +%%PYQT_SIPDIR%%/QtCore/qabstractnativeeventfilter.sip +%%PYQT_SIPDIR%%/QtCore/qabstractstate.sip +%%PYQT_SIPDIR%%/QtCore/qabstracttransition.sip +%%PYQT_SIPDIR%%/QtCore/qanimationgroup.sip +%%PYQT_SIPDIR%%/QtCore/qbasictimer.sip +%%PYQT_SIPDIR%%/QtCore/qbitarray.sip +%%PYQT_SIPDIR%%/QtCore/qbuffer.sip +%%PYQT_SIPDIR%%/QtCore/qbytearray.sip +%%PYQT_SIPDIR%%/QtCore/qbytearraymatcher.sip +%%PYQT_SIPDIR%%/QtCore/qchar.sip +%%PYQT_SIPDIR%%/QtCore/qcoreapplication.sip +%%PYQT_SIPDIR%%/QtCore/qcoreevent.sip +%%PYQT_SIPDIR%%/QtCore/qcryptographichash.sip +%%PYQT_SIPDIR%%/QtCore/qdatastream.sip +%%PYQT_SIPDIR%%/QtCore/qdatetime.sip +%%PYQT_SIPDIR%%/QtCore/qdir.sip +%%PYQT_SIPDIR%%/QtCore/qdiriterator.sip +%%PYQT_SIPDIR%%/QtCore/qeasingcurve.sip +%%PYQT_SIPDIR%%/QtCore/qelapsedtimer.sip +%%PYQT_SIPDIR%%/QtCore/qeventloop.sip +%%PYQT_SIPDIR%%/QtCore/qeventtransition.sip +%%PYQT_SIPDIR%%/QtCore/qfile.sip +%%PYQT_SIPDIR%%/QtCore/qfiledevice.sip +%%PYQT_SIPDIR%%/QtCore/qfileinfo.sip +%%PYQT_SIPDIR%%/QtCore/qfilesystemwatcher.sip +%%PYQT_SIPDIR%%/QtCore/qfinalstate.sip +%%PYQT_SIPDIR%%/QtCore/qfsfileengine.sip +%%PYQT_SIPDIR%%/QtCore/qglobal.sip +%%PYQT_SIPDIR%%/QtCore/qhash.sip +%%PYQT_SIPDIR%%/QtCore/qhistorystate.sip +%%PYQT_SIPDIR%%/QtCore/qiodevice.sip +%%PYQT_SIPDIR%%/QtCore/qlibrary.sip +%%PYQT_SIPDIR%%/QtCore/qlibraryinfo.sip +%%PYQT_SIPDIR%%/QtCore/qline.sip +%%PYQT_SIPDIR%%/QtCore/qlist.sip +%%PYQT_SIPDIR%%/QtCore/qlocale.sip +%%PYQT_SIPDIR%%/QtCore/qmap.sip +%%PYQT_SIPDIR%%/QtCore/qmargins.sip +%%PYQT_SIPDIR%%/QtCore/qmetaobject.sip +%%PYQT_SIPDIR%%/QtCore/qmetatype.sip +%%PYQT_SIPDIR%%/QtCore/qmimedata.sip +%%PYQT_SIPDIR%%/QtCore/qmutex.sip +%%PYQT_SIPDIR%%/QtCore/qnamespace.sip +%%PYQT_SIPDIR%%/QtCore/qnumeric.sip +%%PYQT_SIPDIR%%/QtCore/qobject.sip +%%PYQT_SIPDIR%%/QtCore/qobjectcleanuphandler.sip +%%PYQT_SIPDIR%%/QtCore/qobjectdefs.sip +%%PYQT_SIPDIR%%/QtCore/qpair.sip +%%PYQT_SIPDIR%%/QtCore/qparallelanimationgroup.sip +%%PYQT_SIPDIR%%/QtCore/qpauseanimation.sip +%%PYQT_SIPDIR%%/QtCore/qpluginloader.sip +%%PYQT_SIPDIR%%/QtCore/qpoint.sip +%%PYQT_SIPDIR%%/QtCore/qprocess.sip +%%PYQT_SIPDIR%%/QtCore/qpropertyanimation.sip +%%PYQT_SIPDIR%%/QtCore/qpynullvariant.sip +%%PYQT_SIPDIR%%/QtCore/qreadwritelock.sip +%%PYQT_SIPDIR%%/QtCore/qrect.sip +%%PYQT_SIPDIR%%/QtCore/qregexp.sip +%%PYQT_SIPDIR%%/QtCore/qresource.sip +%%PYQT_SIPDIR%%/QtCore/qrunnable.sip +%%PYQT_SIPDIR%%/QtCore/qsemaphore.sip +%%PYQT_SIPDIR%%/QtCore/qsequentialanimationgroup.sip +%%PYQT_SIPDIR%%/QtCore/qset.sip +%%PYQT_SIPDIR%%/QtCore/qsettings.sip +%%PYQT_SIPDIR%%/QtCore/qsharedmemory.sip +%%PYQT_SIPDIR%%/QtCore/qsignalmapper.sip +%%PYQT_SIPDIR%%/QtCore/qsignaltransition.sip +%%PYQT_SIPDIR%%/QtCore/qsize.sip +%%PYQT_SIPDIR%%/QtCore/qsocketnotifier.sip +%%PYQT_SIPDIR%%/QtCore/qstate.sip +%%PYQT_SIPDIR%%/QtCore/qstatemachine.sip +%%PYQT_SIPDIR%%/QtCore/qstring.sip +%%PYQT_SIPDIR%%/QtCore/qstringlist.sip +%%PYQT_SIPDIR%%/QtCore/qstringmatcher.sip +%%PYQT_SIPDIR%%/QtCore/qsystemsemaphore.sip +%%PYQT_SIPDIR%%/QtCore/qtemporaryfile.sip +%%PYQT_SIPDIR%%/QtCore/qtextboundaryfinder.sip +%%PYQT_SIPDIR%%/QtCore/qtextcodec.sip +%%PYQT_SIPDIR%%/QtCore/qtextstream.sip +%%PYQT_SIPDIR%%/QtCore/qthread.sip +%%PYQT_SIPDIR%%/QtCore/qthreadpool.sip +%%PYQT_SIPDIR%%/QtCore/qtimeline.sip +%%PYQT_SIPDIR%%/QtCore/qtimer.sip +%%PYQT_SIPDIR%%/QtCore/qtranslator.sip +%%PYQT_SIPDIR%%/QtCore/qurl.sip +%%PYQT_SIPDIR%%/QtCore/qurlquery.sip +%%PYQT_SIPDIR%%/QtCore/quuid.sip +%%PYQT_SIPDIR%%/QtCore/qvariant.sip +%%PYQT_SIPDIR%%/QtCore/qvariantanimation.sip +%%PYQT_SIPDIR%%/QtCore/qvector.sip +%%PYQT_SIPDIR%%/QtCore/qwaitcondition.sip +%%PYQT_SIPDIR%%/QtCore/qwineventnotifier.sip +%%PYQT_SIPDIR%%/QtCore/qxmlstream.sip %%API%%share/qt4/qsci/api/python/QtCore.api Modified: head/devel/py-qt4-dbus/Makefile ============================================================================== --- head/devel/py-qt4-dbus/Makefile Tue Dec 8 16:48:23 2015 (r403296) +++ head/devel/py-qt4-dbus/Makefile Tue Dec 8 16:49:43 2015 (r403297) @@ -9,11 +9,11 @@ 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 -RUN_DEPENDS= ${PKGNAMEPREFIX}core>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-core - CONFIGURE_ARGS= --enable QtDBus -PYQT4_DIST= yes +PYQT_DIST= yes + +USES= python pyqt:4 +USE_PYQT= sip_build core_run USE_QT4= dbus moc_build qmake_build OPTIONS_DEFINE= API DEBUG @@ -26,5 +26,4 @@ API_CONFIGURE_OFF= --no-qsci-api API_LIB_DEPENDS= libqscintilla2.so:${PORTSDIR}/devel/qscintilla2 DEBUG_CONFIGURE_ON= --debug --trace -.include "${.CURDIR}/../py-qt4/bsd.pyqt.mk" .include Modified: head/devel/py-qt4-dbus/pkg-plist ============================================================================== --- head/devel/py-qt4-dbus/pkg-plist Tue Dec 8 16:48:23 2015 (r403296) +++ head/devel/py-qt4-dbus/pkg-plist Tue Dec 8 16:49:43 2015 (r403297) @@ -1,17 +1,17 @@ %%PYTHON_SITELIBDIR%%/PyQt4/QtDBus.so -share/py-sip/QtDBus/QtDBusmod.sip -share/py-sip/QtDBus/qdbusabstractadaptor.sip -share/py-sip/QtDBus/qdbusabstractinterface.sip -share/py-sip/QtDBus/qdbusargument.sip -share/py-sip/QtDBus/qdbusconnection.sip -share/py-sip/QtDBus/qdbusconnectioninterface.sip -share/py-sip/QtDBus/qdbuserror.sip -share/py-sip/QtDBus/qdbusextratypes.sip -share/py-sip/QtDBus/qdbusinterface.sip -share/py-sip/QtDBus/qdbusmessage.sip -share/py-sip/QtDBus/qdbuspendingcall.sip -share/py-sip/QtDBus/qdbusservicewatcher.sip -share/py-sip/QtDBus/qdbusunixfiledescriptor.sip -share/py-sip/QtDBus/qpydbuspendingreply.sip -share/py-sip/QtDBus/qpydbusreply.sip +%%PYQT_SIPDIR%%/QtDBus/QtDBusmod.sip +%%PYQT_SIPDIR%%/QtDBus/qdbusabstractadaptor.sip +%%PYQT_SIPDIR%%/QtDBus/qdbusabstractinterface.sip +%%PYQT_SIPDIR%%/QtDBus/qdbusargument.sip +%%PYQT_SIPDIR%%/QtDBus/qdbusconnection.sip +%%PYQT_SIPDIR%%/QtDBus/qdbusconnectioninterface.sip +%%PYQT_SIPDIR%%/QtDBus/qdbuserror.sip +%%PYQT_SIPDIR%%/QtDBus/qdbusextratypes.sip +%%PYQT_SIPDIR%%/QtDBus/qdbusinterface.sip +%%PYQT_SIPDIR%%/QtDBus/qdbusmessage.sip +%%PYQT_SIPDIR%%/QtDBus/qdbuspendingcall.sip +%%PYQT_SIPDIR%%/QtDBus/qdbusservicewatcher.sip +%%PYQT_SIPDIR%%/QtDBus/qdbusunixfiledescriptor.sip +%%PYQT_SIPDIR%%/QtDBus/qpydbuspendingreply.sip +%%PYQT_SIPDIR%%/QtDBus/qpydbusreply.sip %%API%%share/qt4/qsci/api/python/QtDBus.api Modified: head/devel/py-qt4-dbussupport/Makefile ============================================================================== --- head/devel/py-qt4-dbussupport/Makefile Tue Dec 8 16:48:23 2015 (r403296) +++ head/devel/py-qt4-dbussupport/Makefile Tue Dec 8 16:49:43 2015 (r403297) @@ -7,14 +7,14 @@ CATEGORIES= devel python MAINTAINER= kde@FreeBSD.org COMMENT= Qt event loop support for dbus-python -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip \ - ${PYDBUS} -RUN_DEPENDS= ${PYDBUS} \ - ${PKGNAMEPREFIX}core>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-core +BUILD_DEPENDS= ${PYDBUS} +RUN_DEPENDS= ${PYDBUS} CONFIGURE_ARGS= --enable QtCore -PYQT4_DIST= yes -USES= pkgconfig +PYQT_DIST= yes + +USES= pkgconfig python pyqt:4 +USE_PYQT= sip_build core_run USE_QT4= corelib qmake_build moc_build OPTIONS_DEFINE= DEBUG @@ -25,7 +25,6 @@ INSTALL_WRKSRC= ${WRKSRC}/dbus PLIST_FILES= %%PYTHON_SITELIBDIR%%/dbus/mainloop/qt.so -.include "${.CURDIR}/../py-qt4/bsd.pyqt.mk" .include .if ${PYTHON_MAJOR_VER} == 2 Modified: head/devel/py-qt4-declarative/Makefile ============================================================================== --- head/devel/py-qt4-declarative/Makefile Tue Dec 8 16:48:23 2015 (r403296) +++ head/devel/py-qt4-declarative/Makefile Tue Dec 8 16:49:43 2015 (r403297) @@ -6,12 +6,11 @@ CATEGORIES= devel python MAINTAINER= kde@FreeBSD.org COMMENT= Python bindings for the Qt4 toolkit, QtDeclarative module -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip -RUN_DEPENDS= ${PKGNAMEPREFIX}gui>=${PYQT4_VERSION}:${PORTSDIR}/x11-toolkits/py-qt4-gui \ - ${PKGNAMEPREFIX}network>=${PYQT4_VERSION}:${PORTSDIR}/net/py-qt4-network - CONFIGURE_ARGS= --enable QtDeclarative -PYQT4_DIST= yes +PYQT_DIST= yes + +USES= python pyqt:4 +USE_PYQT= sip_build gui_run network_run USE_QT4= declarative qmake_build moc_build OPTIONS_DEFINE= API DEBUG @@ -24,5 +23,4 @@ API_CONFIGURE_OFF= --no-qsci-api API_LIB_DEPENDS= libqscintilla2.so:${PORTSDIR}/devel/qscintilla2 DEBUG_CONFIGURE_ON= --debug --trace -.include "${.CURDIR}/../py-qt4/bsd.pyqt.mk" .include Modified: head/devel/py-qt4-declarative/pkg-plist ============================================================================== --- head/devel/py-qt4-declarative/pkg-plist Tue Dec 8 16:48:23 2015 (r403296) +++ head/devel/py-qt4-declarative/pkg-plist Tue Dec 8 16:49:43 2015 (r403297) @@ -1,21 +1,21 @@ %%PYTHON_SITELIBDIR%%/PyQt4/QtDeclarative.so -share/py-sip/QtDeclarative/QtDeclarativemod.sip -share/py-sip/QtDeclarative/qdeclarativecomponent.sip -share/py-sip/QtDeclarative/qdeclarativecontext.sip -share/py-sip/QtDeclarative/qdeclarativeengine.sip -share/py-sip/QtDeclarative/qdeclarativeerror.sip -share/py-sip/QtDeclarative/qdeclarativeexpression.sip -share/py-sip/QtDeclarative/qdeclarativeextensionplugin.sip -share/py-sip/QtDeclarative/qdeclarativeimageprovider.sip -share/py-sip/QtDeclarative/qdeclarativeitem.sip -share/py-sip/QtDeclarative/qdeclarativelist.sip -share/py-sip/QtDeclarative/qdeclarativenetworkaccessmanagerfactory.sip -share/py-sip/QtDeclarative/qdeclarativeparserstatus.sip -share/py-sip/QtDeclarative/qdeclarativeproperty.sip -share/py-sip/QtDeclarative/qdeclarativepropertymap.sip -share/py-sip/QtDeclarative/qdeclarativepropertyvaluesource.sip -share/py-sip/QtDeclarative/qdeclarativescriptstring.sip -share/py-sip/QtDeclarative/qdeclarativeview.sip -share/py-sip/QtDeclarative/qpydeclarativelistproperty.sip -share/py-sip/QtDeclarative/qpydeclarativepropertyvaluesource.sip +%%PYQT_SIPDIR%%/QtDeclarative/QtDeclarativemod.sip +%%PYQT_SIPDIR%%/QtDeclarative/qdeclarativecomponent.sip +%%PYQT_SIPDIR%%/QtDeclarative/qdeclarativecontext.sip +%%PYQT_SIPDIR%%/QtDeclarative/qdeclarativeengine.sip +%%PYQT_SIPDIR%%/QtDeclarative/qdeclarativeerror.sip +%%PYQT_SIPDIR%%/QtDeclarative/qdeclarativeexpression.sip +%%PYQT_SIPDIR%%/QtDeclarative/qdeclarativeextensionplugin.sip +%%PYQT_SIPDIR%%/QtDeclarative/qdeclarativeimageprovider.sip +%%PYQT_SIPDIR%%/QtDeclarative/qdeclarativeitem.sip +%%PYQT_SIPDIR%%/QtDeclarative/qdeclarativelist.sip +%%PYQT_SIPDIR%%/QtDeclarative/qdeclarativenetworkaccessmanagerfactory.sip +%%PYQT_SIPDIR%%/QtDeclarative/qdeclarativeparserstatus.sip +%%PYQT_SIPDIR%%/QtDeclarative/qdeclarativeproperty.sip +%%PYQT_SIPDIR%%/QtDeclarative/qdeclarativepropertymap.sip +%%PYQT_SIPDIR%%/QtDeclarative/qdeclarativepropertyvaluesource.sip +%%PYQT_SIPDIR%%/QtDeclarative/qdeclarativescriptstring.sip +%%PYQT_SIPDIR%%/QtDeclarative/qdeclarativeview.sip +%%PYQT_SIPDIR%%/QtDeclarative/qpydeclarativelistproperty.sip +%%PYQT_SIPDIR%%/QtDeclarative/qpydeclarativepropertyvaluesource.sip %%API%%share/qt4/qsci/api/python/QtDeclarative.api Modified: head/devel/py-qt4-designer/Makefile ============================================================================== --- head/devel/py-qt4-designer/Makefile Tue Dec 8 16:48:23 2015 (r403296) +++ head/devel/py-qt4-designer/Makefile Tue Dec 8 16:49:43 2015 (r403297) @@ -8,13 +8,11 @@ CATEGORIES= devel python MAINTAINER= kde@FreeBSD.org COMMENT= Python bindings for the Qt4 toolkit, QtDesigner module -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip -RUN_DEPENDS= ${PKGNAMEPREFIX}gui>=${PYQT4_VERSION}:${PORTSDIR}/x11-toolkits/py-qt4-gui \ - ${PKGNAMEPREFIX}xml>=${PYQT4_VERSION}:${PORTSDIR}/textproc/py-qt4-xml \ - ${PKGNAMEPREFIX}script>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-script - CONFIGURE_ARGS= --enable QtDesigner --no-designer-plugin -PYQT4_DIST= yes +PYQT_DIST= yes + +USES= python pyqt:4 +USE_PYQT= sip_build gui_run script_run xml_run USE_QT4= gui xml designer moc_build qmake_build OPTIONS_DEFINE= API DEBUG @@ -27,5 +25,4 @@ API_CONFIGURE_OFF= --no-qsci-api API_LIB_DEPENDS= libqscintilla2.so:${PORTSDIR}/devel/qscintilla2 DEBUG_CONFIGURE_ON= --debug --trace -.include "${.CURDIR}/../py-qt4/bsd.pyqt.mk" .include Modified: head/devel/py-qt4-designer/pkg-plist ============================================================================== --- head/devel/py-qt4-designer/pkg-plist Tue Dec 8 16:48:23 2015 (r403296) +++ head/devel/py-qt4-designer/pkg-plist Tue Dec 8 16:49:43 2015 (r403297) @@ -1,27 +1,27 @@ %%PYTHON_SITELIBDIR%%/PyQt4/QtDesigner.so -share/py-sip/QtDesigner/QtDesignermod.sip -share/py-sip/QtDesigner/abstractactioneditor.sip -share/py-sip/QtDesigner/abstractformbuilder.sip -share/py-sip/QtDesigner/abstractformeditor.sip -share/py-sip/QtDesigner/abstractformwindow.sip -share/py-sip/QtDesigner/abstractformwindowcursor.sip -share/py-sip/QtDesigner/abstractformwindowmanager.sip -share/py-sip/QtDesigner/abstractobjectinspector.sip -share/py-sip/QtDesigner/abstractpropertyeditor.sip -share/py-sip/QtDesigner/abstractwidgetbox.sip -share/py-sip/QtDesigner/container.sip -share/py-sip/QtDesigner/customwidget.sip -share/py-sip/QtDesigner/default_extensionfactory.sip -share/py-sip/QtDesigner/extension.sip -share/py-sip/QtDesigner/formbuilder.sip -share/py-sip/QtDesigner/membersheet.sip -share/py-sip/QtDesigner/propertysheet.sip -share/py-sip/QtDesigner/qextensionmanager.sip -share/py-sip/QtDesigner/qpydesignercontainerextension.sip -share/py-sip/QtDesigner/qpydesignercustomwidgetcollectionplugin.sip -share/py-sip/QtDesigner/qpydesignercustomwidgetplugin.sip -share/py-sip/QtDesigner/qpydesignermembersheetextension.sip -share/py-sip/QtDesigner/qpydesignerpropertysheetextension.sip -share/py-sip/QtDesigner/qpydesignertaskmenuextension.sip -share/py-sip/QtDesigner/taskmenu.sip +%%PYQT_SIPDIR%%/QtDesigner/QtDesignermod.sip +%%PYQT_SIPDIR%%/QtDesigner/abstractactioneditor.sip +%%PYQT_SIPDIR%%/QtDesigner/abstractformbuilder.sip +%%PYQT_SIPDIR%%/QtDesigner/abstractformeditor.sip +%%PYQT_SIPDIR%%/QtDesigner/abstractformwindow.sip +%%PYQT_SIPDIR%%/QtDesigner/abstractformwindowcursor.sip +%%PYQT_SIPDIR%%/QtDesigner/abstractformwindowmanager.sip +%%PYQT_SIPDIR%%/QtDesigner/abstractobjectinspector.sip +%%PYQT_SIPDIR%%/QtDesigner/abstractpropertyeditor.sip +%%PYQT_SIPDIR%%/QtDesigner/abstractwidgetbox.sip +%%PYQT_SIPDIR%%/QtDesigner/container.sip +%%PYQT_SIPDIR%%/QtDesigner/customwidget.sip +%%PYQT_SIPDIR%%/QtDesigner/default_extensionfactory.sip +%%PYQT_SIPDIR%%/QtDesigner/extension.sip +%%PYQT_SIPDIR%%/QtDesigner/formbuilder.sip +%%PYQT_SIPDIR%%/QtDesigner/membersheet.sip +%%PYQT_SIPDIR%%/QtDesigner/propertysheet.sip +%%PYQT_SIPDIR%%/QtDesigner/qextensionmanager.sip +%%PYQT_SIPDIR%%/QtDesigner/qpydesignercontainerextension.sip +%%PYQT_SIPDIR%%/QtDesigner/qpydesignercustomwidgetcollectionplugin.sip +%%PYQT_SIPDIR%%/QtDesigner/qpydesignercustomwidgetplugin.sip +%%PYQT_SIPDIR%%/QtDesigner/qpydesignermembersheetextension.sip +%%PYQT_SIPDIR%%/QtDesigner/qpydesignerpropertysheetextension.sip +%%PYQT_SIPDIR%%/QtDesigner/qpydesignertaskmenuextension.sip +%%PYQT_SIPDIR%%/QtDesigner/taskmenu.sip %%API%%share/qt4/qsci/api/python/QtDesigner.api Modified: head/devel/py-qt4-designerplugin/Makefile ============================================================================== --- head/devel/py-qt4-designerplugin/Makefile Tue Dec 8 16:48:23 2015 (r403296) +++ head/devel/py-qt4-designerplugin/Makefile Tue Dec 8 16:49:43 2015 (r403297) @@ -8,15 +8,15 @@ CATEGORIES= devel python MAINTAINER= kde@FreeBSD.org COMMENT= Python bindings for the Qt4 toolkit, QtDesigner plugin -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip -RUN_DEPENDS= ${PKGNAMEPREFIX}designer>=${PYQT4_VERSION}:${PORTSDIR}/devel/py-qt4-designer - BUILD_WRKSRC= ${WRKSRC}/designer INSTALL_WRKSRC= ${WRKSRC}/designer +DESTDIRNAME= INSTALL_ROOT CONFIGURE_ARGS= --enable QtDesigner -DESTDIRNAME= INSTALL_ROOT -PYQT4_DIST= yes +PYQT_DIST= yes + +USES= python pyqt:4 +USE_PYQT= sip_build designer_run USE_QT4= gui xml designer moc_build qmake_build OPTIONS_DEFINE= DEBUG @@ -24,5 +24,4 @@ DEBUG_CONFIGURE_ON= --debug --trace PLIST_FILES= %%QT_PLUGINDIR%%/designer/libpyqt4.so -.include "${.CURDIR}/../py-qt4/bsd.pyqt.mk" .include Modified: head/devel/py-qt4-help/Makefile ============================================================================== --- head/devel/py-qt4-help/Makefile Tue Dec 8 16:48:23 2015 (r403296) +++ head/devel/py-qt4-help/Makefile Tue Dec 8 16:49:43 2015 (r403297) @@ -6,11 +6,11 @@ CATEGORIES= devel python MAINTAINER= kde@FreeBSD.org COMMENT= Python bindings for the Qt4 toolkit, QtHelp 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 QtHelp -PYQT4_DIST= yes +PYQT_DIST= yes + +USES= python pyqt:4 +USE_PYQT= sip_build gui_run USE_QT4= help moc_build qmake_build OPTIONS_DEFINE= API DEBUG @@ -23,5 +23,4 @@ API_CONFIGURE_OFF= --no-qsci-api API_LIB_DEPENDS= libqscintilla2.so:${PORTSDIR}/devel/qscintilla2 DEBUG_CONFIGURE_ON= --debug --trace -.include "${.CURDIR}/../py-qt4/bsd.pyqt.mk" .include Modified: head/devel/py-qt4-help/pkg-plist ============================================================================== --- head/devel/py-qt4-help/pkg-plist Tue Dec 8 16:48:23 2015 (r403296) +++ head/devel/py-qt4-help/pkg-plist Tue Dec 8 16:49:43 2015 (r403297) @@ -1,10 +1,10 @@ %%PYTHON_SITELIBDIR%%/PyQt4/QtHelp.so -share/py-sip/QtHelp/QtHelpmod.sip -share/py-sip/QtHelp/qhelpcontentwidget.sip -share/py-sip/QtHelp/qhelpengine.sip -share/py-sip/QtHelp/qhelpenginecore.sip -share/py-sip/QtHelp/qhelpindexwidget.sip -share/py-sip/QtHelp/qhelpsearchengine.sip -share/py-sip/QtHelp/qhelpsearchquerywidget.sip -share/py-sip/QtHelp/qhelpsearchresultwidget.sip +%%PYQT_SIPDIR%%/QtHelp/QtHelpmod.sip +%%PYQT_SIPDIR%%/QtHelp/qhelpcontentwidget.sip +%%PYQT_SIPDIR%%/QtHelp/qhelpengine.sip +%%PYQT_SIPDIR%%/QtHelp/qhelpenginecore.sip +%%PYQT_SIPDIR%%/QtHelp/qhelpindexwidget.sip +%%PYQT_SIPDIR%%/QtHelp/qhelpsearchengine.sip +%%PYQT_SIPDIR%%/QtHelp/qhelpsearchquerywidget.sip +%%PYQT_SIPDIR%%/QtHelp/qhelpsearchresultwidget.sip %%API%%share/qt4/qsci/api/python/QtHelp.api Modified: head/devel/py-qt4-qscintilla2/Makefile ============================================================================== --- head/devel/py-qt4-qscintilla2/Makefile Tue Dec 8 16:48:23 2015 (r403296) +++ head/devel/py-qt4-qscintilla2/Makefile Tue Dec 8 16:49:43 2015 (r403297) @@ -13,30 +13,26 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Python bindings for QScintilla2 (PyQt4), QSci module LIB_DEPENDS= libqscintilla2.so:${PORTSDIR}/devel/qscintilla2 -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sip>=${SIP_VERSION}:${PORTSDIR}/devel/py-sip \ - ${PYTHON_PKGNAMEPREFIX}qt4-core>=${PYQT_VERSION}:${PORTSDIR}/devel/py-qt4-core \ - ${PYTHON_PKGNAMEPREFIX}qt4-gui>=${PYQT_VERSION}:${PORTSDIR}/x11-toolkits/py-qt4-gui -RUN_DEPENDS:= ${BUILD_DEPENDS} +DISTINFO_FILE= ${.CURDIR:H}/qscintilla2/distinfo DESTDIRNAME= INSTALL_ROOT -DISTINFO_FILE= ${QSCI2_DISTINFO_FILE} + HAS_CONFIGURE= yes -USES= python -USE_QT4= gui moc_build qmake_build QT_NONSTANDARD= yes # Do not add unknown arguments to CONFIGURE_ARGS. +USES= python pyqt:4 +USE_PYQT= sip core gui +USE_QT4= gui moc_build qmake_build + OPTIONS_DEFINE= DEBUG DEBUG_CONFIGURE_ON= --debug --trace -SIPDIR= ${PREFIX}/share/py-sip QSCIDIR= ${PREFIX}/share/qt4/qsci CONFIGURE_ARGS= --pyqt PyQt4 -d ${PYTHONPREFIX_SITELIBDIR}/PyQt4 -v ${SIPDIR} \ --apidir ${QSCIDIR} --qmake ${QMAKE} --pyqt-sipdir ${SIPDIR} WRKSRC= ${WRKDIR}/${DISTNAME}/Python ALL_TARGET= #empty -.include "${.CURDIR}/../py-qt4/bsd.pyqt.mk" - do-configure: cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV}\ ${PYTHON_CMD} configure.py ${CONFIGURE_ARGS} Modified: head/devel/py-qt4-qscintilla2/pkg-plist ============================================================================== --- head/devel/py-qt4-qscintilla2/pkg-plist Tue Dec 8 16:48:23 2015 (r403296) +++ head/devel/py-qt4-qscintilla2/pkg-plist Tue Dec 8 16:49:43 2015 (r403297) @@ -1,56 +1,56 @@ %%PYTHON_SITELIBDIR%%/PyQt4/Qsci.so -share/py-sip/Qsci/qsciabstractapis.sip -share/py-sip/Qsci/qsciapis.sip -share/py-sip/Qsci/qscicommand.sip -share/py-sip/Qsci/qscicommandset.sip -share/py-sip/Qsci/qscidocument.sip -share/py-sip/Qsci/qscilexer.sip -share/py-sip/Qsci/qscilexeravs.sip -share/py-sip/Qsci/qscilexerbash.sip -share/py-sip/Qsci/qscilexerbatch.sip -share/py-sip/Qsci/qscilexercmake.sip -share/py-sip/Qsci/qscilexercoffeescript.sip -share/py-sip/Qsci/qscilexercpp.sip -share/py-sip/Qsci/qscilexercsharp.sip -share/py-sip/Qsci/qscilexercss.sip -share/py-sip/Qsci/qscilexercustom.sip -share/py-sip/Qsci/qscilexerd.sip -share/py-sip/Qsci/qscilexerdiff.sip -share/py-sip/Qsci/qscilexerfortran.sip -share/py-sip/Qsci/qscilexerfortran77.sip -share/py-sip/Qsci/qscilexerhtml.sip -share/py-sip/Qsci/qscilexeridl.sip -share/py-sip/Qsci/qscilexerjava.sip -share/py-sip/Qsci/qscilexerjavascript.sip -share/py-sip/Qsci/qscilexerlua.sip -share/py-sip/Qsci/qscilexermakefile.sip -share/py-sip/Qsci/qscilexermatlab.sip -share/py-sip/Qsci/qscilexeroctave.sip -share/py-sip/Qsci/qscilexerpascal.sip -share/py-sip/Qsci/qscilexerperl.sip -share/py-sip/Qsci/qscilexerpo.sip -share/py-sip/Qsci/qscilexerpostscript.sip -share/py-sip/Qsci/qscilexerpov.sip -share/py-sip/Qsci/qscilexerproperties.sip -share/py-sip/Qsci/qscilexerpython.sip -share/py-sip/Qsci/qscilexerruby.sip -share/py-sip/Qsci/qscilexerspice.sip -share/py-sip/Qsci/qscilexersql.sip -share/py-sip/Qsci/qscilexertcl.sip -share/py-sip/Qsci/qscilexertex.sip -share/py-sip/Qsci/qscilexerverilog.sip -share/py-sip/Qsci/qscilexervhdl.sip -share/py-sip/Qsci/qscilexerxml.sip -share/py-sip/Qsci/qscilexeryaml.sip -share/py-sip/Qsci/qscimacro.sip -share/py-sip/Qsci/qscimod3.sip -share/py-sip/Qsci/qscimod4.sip -share/py-sip/Qsci/qscimod5.sip -share/py-sip/Qsci/qscimodcommon.sip -share/py-sip/Qsci/qsciprinter.sip -share/py-sip/Qsci/qsciscintilla.sip -share/py-sip/Qsci/qsciscintillabase3.sip -share/py-sip/Qsci/qsciscintillabase4.sip -share/py-sip/Qsci/qscistyle.sip -share/py-sip/Qsci/qscistyledtext.sip +%%PYQT_SIPDIR%%/Qsci/qsciabstractapis.sip +%%PYQT_SIPDIR%%/Qsci/qsciapis.sip +%%PYQT_SIPDIR%%/Qsci/qscicommand.sip +%%PYQT_SIPDIR%%/Qsci/qscicommandset.sip +%%PYQT_SIPDIR%%/Qsci/qscidocument.sip +%%PYQT_SIPDIR%%/Qsci/qscilexer.sip +%%PYQT_SIPDIR%%/Qsci/qscilexeravs.sip +%%PYQT_SIPDIR%%/Qsci/qscilexerbash.sip +%%PYQT_SIPDIR%%/Qsci/qscilexerbatch.sip +%%PYQT_SIPDIR%%/Qsci/qscilexercmake.sip +%%PYQT_SIPDIR%%/Qsci/qscilexercoffeescript.sip +%%PYQT_SIPDIR%%/Qsci/qscilexercpp.sip +%%PYQT_SIPDIR%%/Qsci/qscilexercsharp.sip +%%PYQT_SIPDIR%%/Qsci/qscilexercss.sip +%%PYQT_SIPDIR%%/Qsci/qscilexercustom.sip +%%PYQT_SIPDIR%%/Qsci/qscilexerd.sip +%%PYQT_SIPDIR%%/Qsci/qscilexerdiff.sip +%%PYQT_SIPDIR%%/Qsci/qscilexerfortran.sip +%%PYQT_SIPDIR%%/Qsci/qscilexerfortran77.sip +%%PYQT_SIPDIR%%/Qsci/qscilexerhtml.sip +%%PYQT_SIPDIR%%/Qsci/qscilexeridl.sip +%%PYQT_SIPDIR%%/Qsci/qscilexerjava.sip +%%PYQT_SIPDIR%%/Qsci/qscilexerjavascript.sip +%%PYQT_SIPDIR%%/Qsci/qscilexerlua.sip +%%PYQT_SIPDIR%%/Qsci/qscilexermakefile.sip +%%PYQT_SIPDIR%%/Qsci/qscilexermatlab.sip +%%PYQT_SIPDIR%%/Qsci/qscilexeroctave.sip +%%PYQT_SIPDIR%%/Qsci/qscilexerpascal.sip +%%PYQT_SIPDIR%%/Qsci/qscilexerperl.sip +%%PYQT_SIPDIR%%/Qsci/qscilexerpo.sip +%%PYQT_SIPDIR%%/Qsci/qscilexerpostscript.sip +%%PYQT_SIPDIR%%/Qsci/qscilexerpov.sip +%%PYQT_SIPDIR%%/Qsci/qscilexerproperties.sip +%%PYQT_SIPDIR%%/Qsci/qscilexerpython.sip +%%PYQT_SIPDIR%%/Qsci/qscilexerruby.sip +%%PYQT_SIPDIR%%/Qsci/qscilexerspice.sip +%%PYQT_SIPDIR%%/Qsci/qscilexersql.sip +%%PYQT_SIPDIR%%/Qsci/qscilexertcl.sip +%%PYQT_SIPDIR%%/Qsci/qscilexertex.sip +%%PYQT_SIPDIR%%/Qsci/qscilexerverilog.sip +%%PYQT_SIPDIR%%/Qsci/qscilexervhdl.sip +%%PYQT_SIPDIR%%/Qsci/qscilexerxml.sip *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***