Index: Mk/Uses/pyqt.mk =================================================================== --- Mk/Uses/pyqt.mk +++ Mk/Uses/pyqt.mk @@ -192,9 +192,12 @@ py-webkitwidgets_DESC= Python bindings for QtWebKitWidgets module py-widgets_DESC= Python bindings for QTWidgets module -SIPDIR_REL= share/py-sip/PyQt${_PYQT_VERSION} +SIPDIR_REL= share/py-sip-${PYTHON_VER}/PyQt${_PYQT_VERSION} +QSCIDIR_REL= share/qt${_PYQT_VERSION}/qsci-${PYTHON_VER} SIPDIR= ${PREFIX}/${SIPDIR_REL} -PLIST_SUB+= PYQT_SIPDIR=${SIPDIR_REL} +QSCIDIR= ${PREFIX}/${QSCIDIR_REL} +PLIST_SUB+= PYQT_SIPDIR=${SIPDIR_REL} \ + PYQT_QSCIDIR=${QSCIDIR_REL} .if defined(PYQT_DIST) PORTVERSION= ${PYQT_VERSION} @@ -214,11 +217,11 @@ .endif 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 \ + --sip=${PREFIX}/bin/sip-${PYTHON_VER} \ --sipdir ${SIPDIR} # One of the things PyQt looks for to determine whether to build the Qt DBus Index: comms/py-qt5-serialport/Makefile =================================================================== --- comms/py-qt5-serialport/Makefile +++ comms/py-qt5-serialport/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ PORTNAME= serialport +PORTREVISION= 1 CATEGORIES= comms devel python MAINTAINER= kde@FreeBSD.org Index: comms/py-qt5-serialport/pkg-plist =================================================================== --- comms/py-qt5-serialport/pkg-plist +++ comms/py-qt5-serialport/pkg-plist @@ -2,4 +2,4 @@ %%PYQT_SIPDIR%%/QtSerialPort/QtSerialPortmod.sip %%PYQT_SIPDIR%%/QtSerialPort/qserialport.sip %%PYQT_SIPDIR%%/QtSerialPort/qserialportinfo.sip -%%API%%share/qt5/qsci/api/python/QtSerialPort.api +%%API%%%%PYQT_QSCIDIR%%/api/python/QtSerialPort.api Index: databases/py-qt4-sql/Makefile =================================================================== --- databases/py-qt4-sql/Makefile +++ databases/py-qt4-sql/Makefile @@ -2,6 +2,7 @@ # $FreeBSD$ PORTNAME= sql +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= databases devel python Index: databases/py-qt4-sql/pkg-plist =================================================================== --- databases/py-qt4-sql/pkg-plist +++ databases/py-qt4-sql/pkg-plist @@ -13,4 +13,4 @@ %%PYQT_SIPDIR%%/QtSql/qsqlrelationaltablemodel.sip %%PYQT_SIPDIR%%/QtSql/qsqlresult.sip %%PYQT_SIPDIR%%/QtSql/qsqltablemodel.sip -%%API%%share/qt4/qsci/api/python/QtSql.api +%%API%%%%PYQT_QSCIDIR%%/api/python/QtSql.api Index: databases/py-qt5-sql/Makefile =================================================================== --- databases/py-qt5-sql/Makefile +++ databases/py-qt5-sql/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ PORTNAME= sql +PORTREVISION= 1 CATEGORIES= databases devel python MAINTAINER= kde@FreeBSD.org Index: databases/py-qt5-sql/pkg-plist =================================================================== --- databases/py-qt5-sql/pkg-plist +++ databases/py-qt5-sql/pkg-plist @@ -13,4 +13,4 @@ %%PYQT_SIPDIR%%/QtSql/qsqlrelationaltablemodel.sip %%PYQT_SIPDIR%%/QtSql/qsqlresult.sip %%PYQT_SIPDIR%%/QtSql/qsqltablemodel.sip -%%API%%share/qt5/qsci/api/python/QtSql.api +%%API%%%%PYQT_QSCIDIR%%/api/python/QtSql.api Index: devel/py-qt4-assistant/Makefile =================================================================== --- devel/py-qt4-assistant/Makefile +++ devel/py-qt4-assistant/Makefile @@ -2,6 +2,7 @@ # $FreeBSD$ PORTNAME= assistant +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel python Index: devel/py-qt4-assistant/pkg-plist =================================================================== --- devel/py-qt4-assistant/pkg-plist +++ devel/py-qt4-assistant/pkg-plist @@ -1,4 +1,4 @@ %%PYTHON_SITELIBDIR%%/PyQt4/QtAssistant.so %%PYQT_SIPDIR%%/QtAssistant/QtAssistantmod.sip %%PYQT_SIPDIR%%/QtAssistant/qassistantclient.sip -%%API%%share/qt4/qsci/api/python/QtAssistant.api +%%API%%%%PYQT_QSCIDIR%%/api/python/QtAssistant.api Index: devel/py-qt4-core/Makefile =================================================================== --- devel/py-qt4-core/Makefile +++ devel/py-qt4-core/Makefile @@ -2,6 +2,7 @@ # $FreeBSD$ PORTNAME= core +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel python @@ -12,7 +13,7 @@ PYQT_DIST= yes USES= python pyqt:4 -USE_PYTHON= py3kplist +USE_PYTHON= concurrent py3kplist USE_PYQT= sip USE_QT4= corelib qmake_build moc_build Index: devel/py-qt4-core/pkg-plist =================================================================== --- devel/py-qt4-core/pkg-plist +++ devel/py-qt4-core/pkg-plist @@ -197,4 +197,4 @@ %%PYQT_SIPDIR%%/QtCore/qwaitcondition.sip %%PYQT_SIPDIR%%/QtCore/qwineventnotifier.sip %%PYQT_SIPDIR%%/QtCore/qxmlstream.sip -%%API%%share/qt4/qsci/api/python/QtCore.api +%%API%%%%PYQT_QSCIDIR%%/api/python/QtCore.api Index: devel/py-qt4-dbus/Makefile =================================================================== --- devel/py-qt4-dbus/Makefile +++ devel/py-qt4-dbus/Makefile @@ -2,6 +2,7 @@ # $FreeBSD$ PORTNAME= dbus +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel python Index: devel/py-qt4-dbus/pkg-plist =================================================================== --- devel/py-qt4-dbus/pkg-plist +++ devel/py-qt4-dbus/pkg-plist @@ -14,4 +14,4 @@ %%PYQT_SIPDIR%%/QtDBus/qdbusunixfiledescriptor.sip %%PYQT_SIPDIR%%/QtDBus/qpydbuspendingreply.sip %%PYQT_SIPDIR%%/QtDBus/qpydbusreply.sip -%%API%%share/qt4/qsci/api/python/QtDBus.api +%%API%%%%PYQT_QSCIDIR%%/api/python/QtDBus.api Index: devel/py-qt4-dbussupport/Makefile =================================================================== --- devel/py-qt4-dbussupport/Makefile +++ devel/py-qt4-dbussupport/Makefile @@ -2,6 +2,7 @@ PORTNAME= dbussupport PORTREVISION= 1 +PORTREVISION= 1 CATEGORIES= devel python MAINTAINER= kde@FreeBSD.org Index: devel/py-qt4-declarative/Makefile =================================================================== --- devel/py-qt4-declarative/Makefile +++ devel/py-qt4-declarative/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ PORTNAME= declarative +PORTREVISION= 1 CATEGORIES= devel python MAINTAINER= kde@FreeBSD.org Index: devel/py-qt4-declarative/pkg-plist =================================================================== --- devel/py-qt4-declarative/pkg-plist +++ devel/py-qt4-declarative/pkg-plist @@ -18,4 +18,4 @@ %%PYQT_SIPDIR%%/QtDeclarative/qdeclarativeview.sip %%PYQT_SIPDIR%%/QtDeclarative/qpydeclarativelistproperty.sip %%PYQT_SIPDIR%%/QtDeclarative/qpydeclarativepropertyvaluesource.sip -%%API%%share/qt4/qsci/api/python/QtDeclarative.api +%%API%%%%PYQT_QSCIDIR%%/api/python/QtDeclarative.api Index: devel/py-qt4-designer/Makefile =================================================================== --- devel/py-qt4-designer/Makefile +++ devel/py-qt4-designer/Makefile @@ -2,6 +2,7 @@ # $FreeBSD$ PORTNAME= designer +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel python Index: devel/py-qt4-designer/pkg-plist =================================================================== --- devel/py-qt4-designer/pkg-plist +++ devel/py-qt4-designer/pkg-plist @@ -24,4 +24,4 @@ %%PYQT_SIPDIR%%/QtDesigner/qpydesignerpropertysheetextension.sip %%PYQT_SIPDIR%%/QtDesigner/qpydesignertaskmenuextension.sip %%PYQT_SIPDIR%%/QtDesigner/taskmenu.sip -%%API%%share/qt4/qsci/api/python/QtDesigner.api +%%API%%%%PYQT_QSCIDIR%%/api/python/QtDesigner.api Index: devel/py-qt4-designerplugin/Makefile =================================================================== --- devel/py-qt4-designerplugin/Makefile +++ devel/py-qt4-designerplugin/Makefile @@ -2,6 +2,7 @@ # $FreeBSD$ PORTNAME= designerplugin +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel python Index: devel/py-qt4-help/Makefile =================================================================== --- devel/py-qt4-help/Makefile +++ devel/py-qt4-help/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ PORTNAME= help +PORTREVISION= 1 CATEGORIES= devel python MAINTAINER= kde@FreeBSD.org Index: devel/py-qt4-help/pkg-plist =================================================================== --- devel/py-qt4-help/pkg-plist +++ devel/py-qt4-help/pkg-plist @@ -7,4 +7,4 @@ %%PYQT_SIPDIR%%/QtHelp/qhelpsearchengine.sip %%PYQT_SIPDIR%%/QtHelp/qhelpsearchquerywidget.sip %%PYQT_SIPDIR%%/QtHelp/qhelpsearchresultwidget.sip -%%API%%share/qt4/qsci/api/python/QtHelp.api +%%API%%%%PYQT_QSCIDIR%%/api/python/QtHelp.api Index: devel/py-qt4-qscintilla2/Makefile =================================================================== --- devel/py-qt4-qscintilla2/Makefile +++ devel/py-qt4-qscintilla2/Makefile @@ -3,6 +3,7 @@ PORTNAME= qscintilla2 PORTVERSION= ${QSCI2_VERSION} +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel python MASTER_SITES= ${MASTER_SITES_QSCI2} Index: devel/py-qt4-qscintilla2/pkg-plist =================================================================== --- devel/py-qt4-qscintilla2/pkg-plist +++ devel/py-qt4-qscintilla2/pkg-plist @@ -51,4 +51,4 @@ %%PYQT_SIPDIR%%/Qsci/qsciscintillabase.sip %%PYQT_SIPDIR%%/Qsci/qscistyle.sip %%PYQT_SIPDIR%%/Qsci/qscistyledtext.sip -share/qt4/qsci/api/python/QScintilla2.api +%%PYQT_QSCIDIR%%/api/python/QScintilla2.api Index: devel/py-qt4-script/Makefile =================================================================== --- devel/py-qt4-script/Makefile +++ devel/py-qt4-script/Makefile @@ -2,6 +2,7 @@ # $FreeBSD$ PORTNAME= script +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel python Index: devel/py-qt4-script/pkg-plist =================================================================== --- devel/py-qt4-script/pkg-plist +++ devel/py-qt4-script/pkg-plist @@ -9,4 +9,4 @@ %%PYQT_SIPDIR%%/QtScript/qscriptstring.sip %%PYQT_SIPDIR%%/QtScript/qscriptvalue.sip %%PYQT_SIPDIR%%/QtScript/qscriptvalueiterator.sip -%%API%%share/qt4/qsci/api/python/QtScript.api +%%API%%%%PYQT_QSCIDIR%%/api/python/QtScript.api Index: devel/py-qt4-scripttools/Makefile =================================================================== --- devel/py-qt4-scripttools/Makefile +++ devel/py-qt4-scripttools/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ PORTNAME= scripttools +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel python Index: devel/py-qt4-scripttools/pkg-plist =================================================================== --- devel/py-qt4-scripttools/pkg-plist +++ devel/py-qt4-scripttools/pkg-plist @@ -1,4 +1,4 @@ %%PYTHON_SITELIBDIR%%/PyQt4/QtScriptTools.so %%PYQT_SIPDIR%%/QtScriptTools/QtScriptToolsmod.sip %%PYQT_SIPDIR%%/QtScriptTools/qscriptenginedebugger.sip -%%API%%share/qt4/qsci/api/python/QtScriptTools.api +%%API%%%%PYQT_QSCIDIR%%/api/python/QtScriptTools.api Index: devel/py-qt4-test/Makefile =================================================================== --- devel/py-qt4-test/Makefile +++ devel/py-qt4-test/Makefile @@ -2,6 +2,7 @@ # $FreeBSD$ PORTNAME= test +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel python Index: devel/py-qt4-test/pkg-plist =================================================================== --- devel/py-qt4-test/pkg-plist +++ devel/py-qt4-test/pkg-plist @@ -4,4 +4,4 @@ %%PYQT_SIPDIR%%/QtTest/qtestkeyboard.sip %%PYQT_SIPDIR%%/QtTest/qtestmouse.sip %%PYQT_SIPDIR%%/QtTest/qtestsystem.sip -%%API%%share/qt4/qsci/api/python/QtTest.api +%%API%%%%PYQT_QSCIDIR%%/api/python/QtTest.api Index: devel/py-qt4/Makefile =================================================================== --- devel/py-qt4/Makefile +++ devel/py-qt4/Makefile @@ -3,6 +3,7 @@ PORTNAME= qt4 PORTVERSION= ${PYQT4_VERSION} +PORTREVISION= 1 CATEGORIES= devel python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} Index: devel/py-qt5-core/Makefile =================================================================== --- devel/py-qt5-core/Makefile +++ devel/py-qt5-core/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ PORTNAME= core +PORTREVISION= 1 CATEGORIES= devel python MAINTAINER= kde@FreeBSD.org @@ -10,7 +11,7 @@ PYQT_DIST= yes USES= python pyqt:5 -USE_PYTHON= py3kplist +USE_PYTHON= concurrent py3kplist USE_PYQT= sip_build USE_QT5= core qmake_build Index: devel/py-qt5-core/pkg-plist =================================================================== --- devel/py-qt5-core/pkg-plist +++ devel/py-qt5-core/pkg-plist @@ -217,4 +217,4 @@ %%PYQT_SIPDIR%%/QtCore/qwaitcondition.sip %%PYQT_SIPDIR%%/QtCore/qwineventnotifier.sip %%PYQT_SIPDIR%%/QtCore/qxmlstream.sip -%%API%%share/qt5/qsci/api/python/QtCore.api +%%API%%%%PYQT_QSCIDIR%%/api/python/QtCore.api Index: devel/py-qt5-dbus/Makefile =================================================================== --- devel/py-qt5-dbus/Makefile +++ devel/py-qt5-dbus/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ PORTNAME= dbus +PORTREVISION= 1 CATEGORIES= devel python MAINTAINER= kde@FreeBSD.org Index: devel/py-qt5-dbus/pkg-plist =================================================================== --- devel/py-qt5-dbus/pkg-plist +++ devel/py-qt5-dbus/pkg-plist @@ -14,4 +14,4 @@ %%PYQT_SIPDIR%%/QtDBus/qdbusunixfiledescriptor.sip %%PYQT_SIPDIR%%/QtDBus/qpydbuspendingreply.sip %%PYQT_SIPDIR%%/QtDBus/qpydbusreply.sip -%%API%%share/qt5/qsci/api/python/QtDBus.api +%%API%%%%PYQT_QSCIDIR%%/api/python/QtDBus.api Index: devel/py-qt5-dbussupport/Makefile =================================================================== --- devel/py-qt5-dbussupport/Makefile +++ devel/py-qt5-dbussupport/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ PORTNAME= dbussupport +PORTREVISION= 1 CATEGORIES= devel python MAINTAINER= kde@FreeBSD.org Index: devel/py-qt5-designer/Makefile =================================================================== --- devel/py-qt5-designer/Makefile +++ devel/py-qt5-designer/Makefile @@ -2,6 +2,7 @@ PORTNAME= designer PORTREVISION= 1 +PORTREVISION= 1 CATEGORIES= devel python MAINTAINER= kde@FreeBSD.org Index: devel/py-qt5-designer/pkg-plist =================================================================== --- devel/py-qt5-designer/pkg-plist +++ devel/py-qt5-designer/pkg-plist @@ -24,4 +24,4 @@ %%PYQT_SIPDIR%%/QtDesigner/qpydesignerpropertysheetextension.sip %%PYQT_SIPDIR%%/QtDesigner/qpydesignertaskmenuextension.sip %%PYQT_SIPDIR%%/QtDesigner/taskmenu.sip -%%API%%share/qt5/qsci/api/python/QtDesigner.api +%%API%%%%PYQT_QSCIDIR%%/api/python/QtDesigner.api Index: devel/py-qt5-designerplugin/Makefile =================================================================== --- devel/py-qt5-designerplugin/Makefile +++ devel/py-qt5-designerplugin/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ PORTNAME= designerplugin +PORTREVISION= 1 CATEGORIES= devel python MAINTAINER= kde@FreeBSD.org Index: devel/py-qt5-help/Makefile =================================================================== --- devel/py-qt5-help/Makefile +++ devel/py-qt5-help/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ PORTNAME= help +PORTREVISION= 1 CATEGORIES= devel python MAINTAINER= kde@FreeBSD.org @@ -12,7 +13,7 @@ USES= python pyqt:5 USE_GL= gl USE_PYQT= sip_build core_run widgets_run -USE_QT5= core gui widgets help network sql buildtools_build qmake_build xml +USE_QT5= core gui widgets help network sql buildtools_build qmake_build xml OPTIONS_DEFINE= API DEBUG OPTIONS_DEFAULT=API Index: devel/py-qt5-help/pkg-plist =================================================================== --- devel/py-qt5-help/pkg-plist +++ devel/py-qt5-help/pkg-plist @@ -7,4 +7,4 @@ %%PYQT_SIPDIR%%/QtHelp/qhelpsearchengine.sip %%PYQT_SIPDIR%%/QtHelp/qhelpsearchquerywidget.sip %%PYQT_SIPDIR%%/QtHelp/qhelpsearchresultwidget.sip -%%API%%share/qt5/qsci/api/python/QtHelp.api +%%API%%%%PYQT_QSCIDIR%%/api/python/QtHelp.api Index: devel/py-qt5-qscintilla2/Makefile =================================================================== --- devel/py-qt5-qscintilla2/Makefile +++ devel/py-qt5-qscintilla2/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ PORTNAME= qscintilla2 +PORTREVISION= 1 PORTVERSION= ${QSCI2_VERSION} CATEGORIES= devel python MASTER_SITES= ${MASTER_SITES_QSCI2} Index: devel/py-qt5-qscintilla2/pkg-plist =================================================================== --- devel/py-qt5-qscintilla2/pkg-plist +++ devel/py-qt5-qscintilla2/pkg-plist @@ -51,4 +51,4 @@ %%PYQT_SIPDIR%%/Qsci/qsciscintillabase.sip %%PYQT_SIPDIR%%/Qsci/qscistyle.sip %%PYQT_SIPDIR%%/Qsci/qscistyledtext.sip -%%QT_DATADIR%%/qsci/api/python/QScintilla2.api +%%PYQT_QSCIDIR%%/api/python/QScintilla2.api Index: devel/py-qt5-test/Makefile =================================================================== --- devel/py-qt5-test/Makefile +++ devel/py-qt5-test/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ PORTNAME= test +PORTREVISION= 1 CATEGORIES= devel python MAINTAINER= kde@FreeBSD.org Index: devel/py-qt5-test/pkg-plist =================================================================== --- devel/py-qt5-test/pkg-plist +++ devel/py-qt5-test/pkg-plist @@ -6,4 +6,4 @@ %%PYQT_SIPDIR%%/QtTest/qtestmouse.sip %%PYQT_SIPDIR%%/QtTest/qtestsystem.sip %%PYQT_SIPDIR%%/QtTest/qtesttouch.sip -%%API%%share/qt5/qsci/api/python/QtTest.api +%%API%%%%PYQT_QSCIDIR%%/api/python/QtTest.api Index: devel/py-qt5/Makefile =================================================================== --- devel/py-qt5/Makefile +++ devel/py-qt5/Makefile @@ -2,6 +2,7 @@ PORTNAME= qt5 PORTVERSION= ${PYQT5_VERSION} +PORTREVISION= 1 CATEGORIES= devel python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} Index: devel/py-sip/Makefile =================================================================== --- devel/py-sip/Makefile +++ devel/py-sip/Makefile @@ -3,6 +3,7 @@ PORTNAME= sip PORTVERSION= ${SIP_VERSION} +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel python MASTER_SITES= ${MASTER_SITES_SIP} Index: devel/qscintilla2-designerplugin-qt5/Makefile =================================================================== --- devel/qscintilla2-designerplugin-qt5/Makefile +++ devel/qscintilla2-designerplugin-qt5/Makefile @@ -2,6 +2,7 @@ PORTNAME= designerplugin-qt5 PORTVERSION= ${QSCI2_VERSION} +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITES_QSCI2} PKGNAMEPREFIX= qscintilla2- Index: devel/qscintilla2-designerplugin/Makefile =================================================================== --- devel/qscintilla2-designerplugin/Makefile +++ devel/qscintilla2-designerplugin/Makefile @@ -3,6 +3,7 @@ PORTNAME= designerplugin PORTVERSION= ${QSCI2_VERSION} +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITES_QSCI2} Index: devel/qscintilla2-qt5/Makefile =================================================================== --- devel/qscintilla2-qt5/Makefile +++ devel/qscintilla2-qt5/Makefile @@ -2,6 +2,7 @@ PORTNAME= qscintilla2-qt5 PORTVERSION= ${QSCI2_VERSION} +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITES_QSCI2} DISTNAME= ${QSCI2_DISTNAME} Index: devel/qscintilla2/Makefile =================================================================== --- devel/qscintilla2/Makefile +++ devel/qscintilla2/Makefile @@ -3,6 +3,7 @@ PORTNAME= qscintilla2 PORTVERSION= ${QSCI2_VERSION} +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITES_QSCI2} Index: graphics/py-qt4-svg/Makefile =================================================================== --- graphics/py-qt4-svg/Makefile +++ graphics/py-qt4-svg/Makefile @@ -2,6 +2,7 @@ # $FreeBSD$ PORTNAME= svg +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= graphics devel python Index: graphics/py-qt4-svg/pkg-plist =================================================================== --- graphics/py-qt4-svg/pkg-plist +++ graphics/py-qt4-svg/pkg-plist @@ -4,4 +4,4 @@ %%PYQT_SIPDIR%%/QtSvg/qsvggenerator.sip %%PYQT_SIPDIR%%/QtSvg/qsvgrenderer.sip %%PYQT_SIPDIR%%/QtSvg/qsvgwidget.sip -%%API%%share/qt4/qsci/api/python/QtSvg.api +%%API%%%%PYQT_QSCIDIR%%/api/python/QtSvg.api Index: graphics/py-qt5-svg/Makefile =================================================================== --- graphics/py-qt5-svg/Makefile +++ graphics/py-qt5-svg/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ PORTNAME= svg +PORTREVISION= 1 CATEGORIES= graphics devel python MAINTAINER= kde@FreeBSD.org Index: graphics/py-qt5-svg/pkg-plist =================================================================== --- graphics/py-qt5-svg/pkg-plist +++ graphics/py-qt5-svg/pkg-plist @@ -4,4 +4,4 @@ %%PYQT_SIPDIR%%/QtSvg/qsvggenerator.sip %%PYQT_SIPDIR%%/QtSvg/qsvgrenderer.sip %%PYQT_SIPDIR%%/QtSvg/qsvgwidget.sip -%%API%%share/qt5/qsci/api/python/QtSvg.api +%%API%%%%PYQT_QSCIDIR%%/api/python/QtSvg.api Index: lang/py-qt5-qml/Makefile =================================================================== --- lang/py-qt5-qml/Makefile +++ lang/py-qt5-qml/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ PORTNAME= qml +PORTREVISION= 1 CATEGORIES= lang devel python MAINTAINER= kde@FreeBSD.org Index: lang/py-qt5-qml/pkg-plist =================================================================== --- lang/py-qt5-qml/pkg-plist +++ lang/py-qt5-qml/pkg-plist @@ -24,4 +24,4 @@ %%PYQT_SIPDIR%%/QtQml/qqmlpropertymap.sip %%PYQT_SIPDIR%%/QtQml/qqmlpropertyvaluesource.sip %%PYQT_SIPDIR%%/QtQml/qqmlscriptstring.sip -%%API%%share/qt5/qsci/api/python/QtQml.api +%%API%%%%PYQT_QSCIDIR%%/api/python/QtQml.api Index: misc/py-qt4-demo/Makefile =================================================================== --- misc/py-qt4-demo/Makefile +++ misc/py-qt4-demo/Makefile @@ -3,6 +3,7 @@ PORTNAME= demo PORTVERSION= ${PYQT4_VERSION} +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= misc devel python MASTER_SITES= ${MASTER_SITES_PYQT4} Index: misc/py-qt4-doc/Makefile =================================================================== --- misc/py-qt4-doc/Makefile +++ misc/py-qt4-doc/Makefile @@ -3,6 +3,7 @@ PORTNAME= doc PORTVERSION= ${PYQT4_VERSION} +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= misc devel python MASTER_SITES= ${MASTER_SITES_PYQT4} Index: misc/py-qt5-demo/Makefile =================================================================== --- misc/py-qt5-demo/Makefile +++ misc/py-qt5-demo/Makefile @@ -2,6 +2,7 @@ PORTNAME= demo PORTVERSION= ${PYQT5_VERSION} +PORTREVISION= 1 CATEGORIES= misc devel python MASTER_SITES= ${MASTER_SITES_PYQT5} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}qt5- Index: misc/py-qt5-doc/Makefile =================================================================== --- misc/py-qt5-doc/Makefile +++ misc/py-qt5-doc/Makefile @@ -2,6 +2,7 @@ PORTNAME= doc PORTVERSION= ${PYQT5_VERSION} +PORTREVISION= 1 CATEGORIES= misc devel python MASTER_SITES= ${MASTER_SITES_PYQT5} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}qt5- Index: multimedia/py-qt4-multimedia/Makefile =================================================================== --- multimedia/py-qt4-multimedia/Makefile +++ multimedia/py-qt4-multimedia/Makefile @@ -2,6 +2,7 @@ # $FreeBSD$ PORTNAME= multimedia +PORTREVISION= 1 CATEGORIES= multimedia devel python MAINTAINER= kde@FreeBSD.org Index: multimedia/py-qt4-multimedia/pkg-plist =================================================================== --- multimedia/py-qt4-multimedia/pkg-plist +++ multimedia/py-qt4-multimedia/pkg-plist @@ -9,4 +9,4 @@ %%PYQT_SIPDIR%%/QtMultimedia/qaudiooutput.sip %%PYQT_SIPDIR%%/QtMultimedia/qvideoframe.sip %%PYQT_SIPDIR%%/QtMultimedia/qvideosurfaceformat.sip -%%API%%share/qt4/qsci/api/python/QtMultimedia.api +%%API%%%%PYQT_QSCIDIR%%/api/python/QtMultimedia.api Index: multimedia/py-qt4-phonon/Makefile =================================================================== --- multimedia/py-qt4-phonon/Makefile +++ multimedia/py-qt4-phonon/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ PORTNAME= phonon +PORTREVISION= 1 CATEGORIES= multimedia devel python MAINTAINER= kde@FreeBSD.org Index: multimedia/py-qt4-phonon/pkg-plist =================================================================== --- multimedia/py-qt4-phonon/pkg-plist +++ multimedia/py-qt4-phonon/pkg-plist @@ -18,4 +18,4 @@ %%PYQT_SIPDIR%%/phonon/videoplayer.sip %%PYQT_SIPDIR%%/phonon/videowidget.sip %%PYQT_SIPDIR%%/phonon/volumeslider.sip -%%API%%share/qt4/qsci/api/python/phonon.api +%%API%%%%PYQT_QSCIDIR%%/api/python/phonon.api Index: multimedia/py-qt5-multimedia/Makefile =================================================================== --- multimedia/py-qt5-multimedia/Makefile +++ multimedia/py-qt5-multimedia/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ PORTNAME= multimedia +PORTREVISION= 1 CATEGORIES= multimedia devel python MAINTAINER= kde@FreeBSD.org Index: multimedia/py-qt5-multimedia/pkg-plist =================================================================== --- multimedia/py-qt5-multimedia/pkg-plist +++ multimedia/py-qt5-multimedia/pkg-plist @@ -40,4 +40,4 @@ %%PYQT_SIPDIR%%/QtMultimedia/qvideoframe.sip %%PYQT_SIPDIR%%/QtMultimedia/qvideoprobe.sip %%PYQT_SIPDIR%%/QtMultimedia/qvideosurfaceformat.sip -%%API%%share/qt5/qsci/api/python/QtMultimedia.api +%%API%%%%PYQT_QSCIDIR%%/api/python/QtMultimedia.api Index: multimedia/py-qt5-multimediawidgets/Makefile =================================================================== --- multimedia/py-qt5-multimediawidgets/Makefile +++ multimedia/py-qt5-multimediawidgets/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ PORTNAME= multimediawidgets +PORTREVISION= 1 CATEGORIES= multimedia devel python MAINTAINER= kde@FreeBSD.org Index: multimedia/py-qt5-multimediawidgets/pkg-plist =================================================================== --- multimedia/py-qt5-multimediawidgets/pkg-plist +++ multimedia/py-qt5-multimediawidgets/pkg-plist @@ -3,4 +3,4 @@ %%PYQT_SIPDIR%%/QtMultimediaWidgets/qcameraviewfinder.sip %%PYQT_SIPDIR%%/QtMultimediaWidgets/qgraphicsvideoitem.sip %%PYQT_SIPDIR%%/QtMultimediaWidgets/qvideowidget.sip -%%API%%share/qt5/qsci/api/python/QtMultimediaWidgets.api +%%API%%%%PYQT_QSCIDIR%%/api/python/QtMultimediaWidgets.api Index: net/py-qt4-network/Makefile =================================================================== --- net/py-qt4-network/Makefile +++ net/py-qt4-network/Makefile @@ -2,6 +2,7 @@ # $FreeBSD$ PORTNAME= network +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= net devel python Index: net/py-qt4-network/pkg-plist =================================================================== --- net/py-qt4-network/pkg-plist +++ net/py-qt4-network/pkg-plist @@ -34,4 +34,4 @@ %%PYQT_SIPDIR%%/QtNetwork/qtcpsocket.sip %%PYQT_SIPDIR%%/QtNetwork/qudpsocket.sip %%PYQT_SIPDIR%%/QtNetwork/qurlinfo.sip -%%API%%share/qt4/qsci/api/python/QtNetwork.api +%%API%%%%PYQT_QSCIDIR%%/api/python/QtNetwork.api Index: net/py-qt5-network/Makefile =================================================================== --- net/py-qt5-network/Makefile +++ net/py-qt5-network/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ PORTNAME= network +PORTREVISION= 1 CATEGORIES= net devel python MAINTAINER= kde@FreeBSD.org Index: net/py-qt5-network/pkg-plist =================================================================== --- net/py-qt5-network/pkg-plist +++ net/py-qt5-network/pkg-plist @@ -35,4 +35,4 @@ %%PYQT_SIPDIR%%/QtNetwork/qtcpserver.sip %%PYQT_SIPDIR%%/QtNetwork/qtcpsocket.sip %%PYQT_SIPDIR%%/QtNetwork/qudpsocket.sip -%%API%%share/qt5/qsci/api/python/QtNetwork.api +%%API%%%%PYQT_QSCIDIR%%/api/python/QtNetwork.api Index: print/py-qt5-printsupport/Makefile =================================================================== --- print/py-qt5-printsupport/Makefile +++ print/py-qt5-printsupport/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ PORTNAME= printsupport +PORTREVISION= 1 CATEGORIES= print python MAINTAINER= kde@FreeBSD.org Index: print/py-qt5-printsupport/pkg-plist =================================================================== --- print/py-qt5-printsupport/pkg-plist +++ print/py-qt5-printsupport/pkg-plist @@ -9,4 +9,4 @@ %%PYQT_SIPDIR%%/QtPrintSupport/qprintpreviewdialog.sip %%PYQT_SIPDIR%%/QtPrintSupport/qprintpreviewwidget.sip %%PYQT_SIPDIR%%/QtPrintSupport/qpyprintsupport_qlist.sip -%%API%%share/qt5/qsci/api/python/QtPrintSupport.api +%%API%%%%PYQT_QSCIDIR%%/api/python/QtPrintSupport.api Index: textproc/py-qt4-xml/Makefile =================================================================== --- textproc/py-qt4-xml/Makefile +++ textproc/py-qt4-xml/Makefile @@ -2,6 +2,7 @@ # $FreeBSD$ PORTNAME= xml +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= textproc devel python Index: textproc/py-qt4-xml/pkg-plist =================================================================== --- textproc/py-qt4-xml/pkg-plist +++ textproc/py-qt4-xml/pkg-plist @@ -5,4 +5,4 @@ %%PYQT_SIPDIR%%/QtXml/qdom.sip %%PYQT_SIPDIR%%/QtXml/qxml.sip %%PYQT_SIPDIR%%/QtXml/qxmlstream.sip -%%API%%share/qt4/qsci/api/python/QtXml.api +%%API%%%%PYQT_QSCIDIR%%/api/python/QtXml.api Index: textproc/py-qt4-xmlpatterns/Makefile =================================================================== --- textproc/py-qt4-xmlpatterns/Makefile +++ textproc/py-qt4-xmlpatterns/Makefile @@ -2,6 +2,7 @@ # $FreeBSD$ PORTNAME= xmlpatterns +PORTREVISION= 1 CATEGORIES= textproc devel python MAINTAINER= kde@FreeBSD.org Index: textproc/py-qt4-xmlpatterns/pkg-plist =================================================================== --- textproc/py-qt4-xmlpatterns/pkg-plist +++ textproc/py-qt4-xmlpatterns/pkg-plist @@ -14,4 +14,4 @@ %%PYQT_SIPDIR%%/QtXmlPatterns/qxmlschema.sip %%PYQT_SIPDIR%%/QtXmlPatterns/qxmlschemavalidator.sip %%PYQT_SIPDIR%%/QtXmlPatterns/qxmlserializer.sip -%%API%%share/qt4/qsci/api/python/QtXmlPatterns.api +%%API%%%%PYQT_QSCIDIR%%/api/python/QtXmlPatterns.api Index: textproc/py-qt5-xml/Makefile =================================================================== --- textproc/py-qt5-xml/Makefile +++ textproc/py-qt5-xml/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ PORTNAME= xml +PORTREVISION= 1 CATEGORIES= textproc devel python MAINTAINER= kde@FreeBSD.org Index: textproc/py-qt5-xml/pkg-plist =================================================================== --- textproc/py-qt5-xml/pkg-plist +++ textproc/py-qt5-xml/pkg-plist @@ -4,4 +4,4 @@ %%PYQT_SIPDIR%%/QtXml/QtXmlmod.sip %%PYQT_SIPDIR%%/QtXml/qdom.sip %%PYQT_SIPDIR%%/QtXml/qxml.sip -%%API%%share/qt5/qsci/api/python/QtXml.api +%%API%%%%PYQT_QSCIDIR%%/api/python/QtXml.api Index: textproc/py-qt5-xmlpatterns/Makefile =================================================================== --- textproc/py-qt5-xmlpatterns/Makefile +++ textproc/py-qt5-xmlpatterns/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ PORTNAME= xmlpatterns +PORTREVISION= 1 CATEGORIES= textproc devel python MAINTAINER= kde@FreeBSD.org Index: textproc/py-qt5-xmlpatterns/pkg-plist =================================================================== --- textproc/py-qt5-xmlpatterns/pkg-plist +++ textproc/py-qt5-xmlpatterns/pkg-plist @@ -14,4 +14,4 @@ %%PYQT_SIPDIR%%/QtXmlPatterns/qxmlschema.sip %%PYQT_SIPDIR%%/QtXmlPatterns/qxmlschemavalidator.sip %%PYQT_SIPDIR%%/QtXmlPatterns/qxmlserializer.sip -%%API%%share/qt5/qsci/api/python/QtXmlPatterns.api +%%API%%%%PYQT_QSCIDIR%%/api/python/QtXmlPatterns.api Index: www/py-qt4-webkit/Makefile =================================================================== --- www/py-qt4-webkit/Makefile +++ www/py-qt4-webkit/Makefile @@ -2,6 +2,8 @@ # $FreeBSD$ PORTNAME= webkit +PORTREVISION= 1 +PORTREVISION= 1 CATEGORIES= www devel python MAINTAINER= kde@FreeBSD.org Index: www/py-qt4-webkit/pkg-plist =================================================================== --- www/py-qt4-webkit/pkg-plist +++ www/py-qt4-webkit/pkg-plist @@ -14,4 +14,4 @@ %%PYQT_SIPDIR%%/QtWebKit/qwebsecurityorigin.sip %%PYQT_SIPDIR%%/QtWebKit/qwebsettings.sip %%PYQT_SIPDIR%%/QtWebKit/qwebview.sip -%%API%%share/qt4/qsci/api/python/QtWebKit.api +%%API%%%%PYQT_QSCIDIR%%/api/python/QtWebKit.api Index: www/py-qt5-webkit/Makefile =================================================================== --- www/py-qt5-webkit/Makefile +++ www/py-qt5-webkit/Makefile @@ -1,6 +1,8 @@ # $FreeBSD$ PORTNAME= webkit +PORTREVISION= 1 +PORTREVISION= 1 CATEGORIES= www devel python MAINTAINER= kde@FreeBSD.org Index: www/py-qt5-webkit/pkg-plist =================================================================== --- www/py-qt5-webkit/pkg-plist +++ www/py-qt5-webkit/pkg-plist @@ -8,4 +8,4 @@ %%PYQT_SIPDIR%%/QtWebKit/qwebpluginfactory.sip %%PYQT_SIPDIR%%/QtWebKit/qwebsecurityorigin.sip %%PYQT_SIPDIR%%/QtWebKit/qwebsettings.sip -%%API%%share/qt5/qsci/api/python/QtWebKit.api +%%API%%%%PYQT_QSCIDIR%%/api/python/QtWebKit.api Index: www/py-qt5-webkitwidgets/Makefile =================================================================== --- www/py-qt5-webkitwidgets/Makefile +++ www/py-qt5-webkitwidgets/Makefile @@ -1,6 +1,8 @@ # $FreeBSD$ PORTNAME= webkitwidgets +PORTREVISION= 1 +PORTREVISION= 1 CATEGORIES= www devel python MAINTAINER= kde@FreeBSD.org Index: www/py-qt5-webkitwidgets/pkg-plist =================================================================== --- www/py-qt5-webkitwidgets/pkg-plist +++ www/py-qt5-webkitwidgets/pkg-plist @@ -5,4 +5,4 @@ %%PYQT_SIPDIR%%/QtWebKitWidgets/qwebinspector.sip %%PYQT_SIPDIR%%/QtWebKitWidgets/qwebpage.sip %%PYQT_SIPDIR%%/QtWebKitWidgets/qwebview.sip -%%API%%share/qt5/qsci/api/python/QtWebKitWidgets.api +%%API%%%%PYQT_QSCIDIR%%/api/python/QtWebKitWidgets.api Index: x11-toolkits/py-qt4-gui/Makefile =================================================================== --- x11-toolkits/py-qt4-gui/Makefile +++ x11-toolkits/py-qt4-gui/Makefile @@ -2,6 +2,7 @@ # $FreeBSD$ PORTNAME= gui +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= x11-toolkits devel python Index: x11-toolkits/py-qt4-gui/pkg-plist =================================================================== --- x11-toolkits/py-qt4-gui/pkg-plist +++ x11-toolkits/py-qt4-gui/pkg-plist @@ -204,4 +204,4 @@ %%PYQT_SIPDIR%%/QtGui/qworkspace.sip %%PYQT_SIPDIR%%/QtGui/qx11embed_x11.sip %%PYQT_SIPDIR%%/QtGui/qx11info_x11.sip -%%API%%share/qt4/qsci/api/python/QtGui.api +%%API%%%%PYQT_QSCIDIR%%/api/python/QtGui.api Index: x11-toolkits/py-qt5-gui/Makefile =================================================================== --- x11-toolkits/py-qt5-gui/Makefile +++ x11-toolkits/py-qt5-gui/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ PORTNAME= gui +PORTREVISION= 1 CATEGORIES= x11-toolkits devel python MAINTAINER= kde@FreeBSD.org Index: x11-toolkits/py-qt5-gui/pkg-plist =================================================================== --- x11-toolkits/py-qt5-gui/pkg-plist +++ x11-toolkits/py-qt5-gui/pkg-plist @@ -92,4 +92,4 @@ %%PYQT_SIPDIR%%/QtGui/qvector4d.sip %%PYQT_SIPDIR%%/QtGui/qwindow.sip %%PYQT_SIPDIR%%/QtGui/qwindowdefs.sip -%%API%%share/qt5/qsci/api/python/QtGui.api +%%API%%%%PYQT_QSCIDIR%%/api/python/QtGui.api Index: x11-toolkits/py-qt5-quick/Makefile =================================================================== --- x11-toolkits/py-qt5-quick/Makefile +++ x11-toolkits/py-qt5-quick/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ PORTNAME= quick +PORTREVISION= 1 CATEGORIES= x11-toolkits devel python MAINTAINER= kde@FreeBSD.org Index: x11-toolkits/py-qt5-quick/pkg-plist =================================================================== --- x11-toolkits/py-qt5-quick/pkg-plist +++ x11-toolkits/py-qt5-quick/pkg-plist @@ -21,4 +21,4 @@ %%PYQT_SIPDIR%%/QtQuick/qsgtexturematerial.sip %%PYQT_SIPDIR%%/QtQuick/qsgtextureprovider.sip %%PYQT_SIPDIR%%/QtQuick/qsgvertexcolormaterial.sip -%%API%%share/qt5/qsci/api/python/QtQuick.api +%%API%%%%PYQT_QSCIDIR%%/api/python/QtQuick.api Index: x11-toolkits/py-qt5-widgets/Makefile =================================================================== --- x11-toolkits/py-qt5-widgets/Makefile +++ x11-toolkits/py-qt5-widgets/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ PORTNAME= widgets +PORTREVISION= 1 CATEGORIES= x11-toolkits devel python MAINTAINER= kde@FreeBSD.org Index: x11-toolkits/py-qt5-widgets/pkg-plist =================================================================== --- x11-toolkits/py-qt5-widgets/pkg-plist +++ x11-toolkits/py-qt5-widgets/pkg-plist @@ -124,4 +124,4 @@ %%PYQT_SIPDIR%%/QtWidgets/qwidget.sip %%PYQT_SIPDIR%%/QtWidgets/qwidgetaction.sip %%PYQT_SIPDIR%%/QtWidgets/qwizard.sip -%%API%%share/qt5/qsci/api/python/QtWidgets.api +%%API%%%%PYQT_QSCIDIR%%/api/python/QtWidgets.api Index: x11/py-qt4-opengl/Makefile =================================================================== --- x11/py-qt4-opengl/Makefile +++ x11/py-qt4-opengl/Makefile @@ -2,6 +2,7 @@ # $FreeBSD$ PORTNAME= opengl +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= x11 devel python Index: x11/py-qt4-opengl/pkg-plist =================================================================== --- x11/py-qt4-opengl/pkg-plist +++ x11/py-qt4-opengl/pkg-plist @@ -6,4 +6,4 @@ %%PYQT_SIPDIR%%/QtOpenGL/qglframebufferobject.sip %%PYQT_SIPDIR%%/QtOpenGL/qglpixelbuffer.sip %%PYQT_SIPDIR%%/QtOpenGL/qglshaderprogram.sip -%%API%%share/qt4/qsci/api/python/QtOpenGL.api +%%API%%%%PYQT_QSCIDIR%%/api/python/QtOpenGL.api Index: x11/py-qt5-opengl/Makefile =================================================================== --- x11/py-qt5-opengl/Makefile +++ x11/py-qt5-opengl/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ PORTNAME= opengl +PORTREVISION= 1 CATEGORIES= x11 devel python MAINTAINER= kde@FreeBSD.org Index: x11/py-qt5-opengl/pkg-plist =================================================================== --- x11/py-qt5-opengl/pkg-plist +++ x11/py-qt5-opengl/pkg-plist @@ -1,4 +1,4 @@ %%PYTHON_SITELIBDIR%%/PyQt5/QtOpenGL.so %%PYQT_SIPDIR%%/QtOpenGL/QtOpenGLmod.sip %%PYQT_SIPDIR%%/QtOpenGL/qgl.sip -%%API%%share/qt5/qsci/api/python/QtOpenGL.api +%%API%%%%PYQT_QSCIDIR%%/api/python/QtOpenGL.api