Index: head/devel/py-qt4-core/Makefile =================================================================== --- head/devel/py-qt4-core/Makefile (revision 463771) +++ head/devel/py-qt4-core/Makefile (revision 463772) @@ -1,52 +1,52 @@ # Created by: Danny Pansters # $FreeBSD$ PORTNAME= core -PORTREVISION= 4 +PORTREVISION= 5 PORTEPOCH= 1 CATEGORIES= devel python MAINTAINER= kde@FreeBSD.org COMMENT= Python bindings for the Qt4 toolkit, QtCore module CONFIGURE_ARGS= --enable QtCore PYQT_DIST= yes USES= python pyqt:4 USE_PYTHON= py3kplist flavors USE_PYQT= sip USE_QT4= corelib qmake_build moc_build OPTIONS_DEFINE= API DEBUG OPTIONS_DEFAULT=API OPTIONS_SUB= yes API_DESC= Install QtCore API for QScintilla2 API_CONFIGURE_ON= --qsci-api --qsci-api-destdir=${QSCIDIR} API_CONFIGURE_OFF= --no-qsci-api API_LIB_DEPENDS= libqscintilla2_qt4.so:devel/qscintilla2 DEBUG_CONFIGURE_ON= --debug --trace .include # Bug 180467: We need to remove the port_v${VERSION} directory that does not # correspond to the Python version being used to avoid failures in the # bytecompilation calls in post-install. PLIST_SUB+= PYTHON_MAJOR_VER="${PYTHON_MAJOR_VER}" post-patch: .if ${PYTHON_MAJOR_VER} == "2" ${RM} -r ${WRKSRC}/pyuic/uic/port_v3 .elif ${PYTHON_MAJOR_VER} == "3" ${RM} -r ${WRKSRC}/pyuic/uic/port_v2 .endif post-install: ${INSTALL_DATA} ${FILESDIR}/Qt.py ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt4 ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \ - -f -d ${PYTHONPREFIX_SITELIBDIR} \ + -f -d ${PYTHONPREFIX_SITELIBDIR}/PyQt4 \ ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt4 ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \ - -f -d ${PYTHONPREFIX_SITELIBDIR} \ + -f -d ${PYTHONPREFIX_SITELIBDIR}/PyQt4 \ ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt4 .include Index: head/devel/py-qt5-core/Makefile =================================================================== --- head/devel/py-qt5-core/Makefile (revision 463771) +++ head/devel/py-qt5-core/Makefile (revision 463772) @@ -1,54 +1,54 @@ # $FreeBSD$ PORTNAME= core -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel python MAINTAINER= kde@FreeBSD.org COMMENT= Python bindings for the Qt5 toolkit, QtCore module PYQT_MODULE= QtCore CONFIGURE_ARGS= ${PYQT5_MODULES_ALL:N${PYQT_MODULE}:C/.*/--disable=&/} \ --enable=${PYQT_MODULE} PYQT_DIST= yes USES= python pyqt:5 USE_PYTHON= py3kplist flavors USE_PYQT= sip_build USE_QT5= core buildtools_build qmake_build OPTIONS_DEFINE= API DEBUG OPTIONS_DEFAULT=API OPTIONS_SUB= yes API_DESC= Install QtCore API for QScintilla2 API_CONFIGURE_ON= --qsci-api --qsci-api-destdir=${QSCIDIR} API_CONFIGURE_OFF= --no-qsci-api API_LIB_DEPENDS= libqscintilla2_qt5.so:devel/qscintilla2-qt5 DEBUG_CONFIGURE_ON= --debug --trace .include # Bug 180467: We need to remove the port_v${VERSION} directory that does not # correspond to the Python version being used to avoid failures in the # bytecompilation calls in post-install. PLIST_SUB+= PYTHON_MAJOR_VER="${PYTHON_MAJOR_VER}" post-patch: .if ${PYTHON_MAJOR_VER} == "2" ${RM} -r ${WRKSRC}/pyuic/uic/port_v3 .elif ${PYTHON_MAJOR_VER} == "3" ${RM} -r ${WRKSRC}/pyuic/uic/port_v2 .endif post-install: ${INSTALL_DATA} ${FILESDIR}/Qt.py ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5 ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \ - -f -d ${PYTHONPREFIX_SITELIBDIR} \ + -f -d ${PYTHONPREFIX_SITELIBDIR}/PyQt5 \ ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5 ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \ - -f -d ${PYTHONPREFIX_SITELIBDIR} \ + -f -d ${PYTHONPREFIX_SITELIBDIR}/PyQt5 \ ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5 .include Index: head/textproc/py-qt5-xml/Makefile =================================================================== --- head/textproc/py-qt5-xml/Makefile (revision 463771) +++ head/textproc/py-qt5-xml/Makefile (revision 463772) @@ -1,28 +1,36 @@ # $FreeBSD$ PORTNAME= xml -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= textproc devel python MAINTAINER= kde@FreeBSD.org COMMENT= Python bindings for the Qt5 toolkit, QtXml module CONFIGURE_ARGS= --enable QtXml PYQT_DIST= yes USES= python pyqt:5 USE_PYQT= sip_build core_run -USE_PYTHON= flavors +USE_PYTHON= flavors py3kplist USE_QT5= core xml buildtools_build qmake_build OPTIONS_DEFINE= API DEBUG OPTIONS_DEFAULT=API OPTIONS_SUB= yes API_DESC= Install QtXml API for QScintilla2 API_CONFIGURE_ON= --qsci-api --qsci-api-destdir=${QSCIDIR} API_CONFIGURE_OFF= --no-qsci-api API_LIB_DEPENDS= libqscintilla2_qt5.so:devel/qscintilla2-qt5 DEBUG_CONFIGURE_ON= --debug --trace + +post-install: + ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \ + -f -d ${PYTHONPREFIX_SITELIBDIR}/PyQt5 \ + ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5 + ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \ + -f -d ${PYTHONPREFIX_SITELIBDIR}/PyQt5 \ + ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5 .include Index: head/textproc/py-qt5-xml/pkg-plist =================================================================== --- head/textproc/py-qt5-xml/pkg-plist (revision 463771) +++ head/textproc/py-qt5-xml/pkg-plist (revision 463772) @@ -1,12 +1,16 @@ bin/pylupdate5 bin/pyrcc5 %%PYTHON_SITELIBDIR%%/PyQt5/QtXml.so %%PYTHON_SITELIBDIR%%/PyQt5/QtXml.pyi %%PYTHON_SITELIBDIR%%/PyQt5/pylupdate.so %%PYTHON_SITELIBDIR%%/PyQt5/pylupdate_main.py +%%PYTHON_SITELIBDIR%%/PyQt5/pylupdate_main.pyc +%%PYTHON_SITELIBDIR%%/PyQt5/pylupdate_main.pyo %%PYTHON_SITELIBDIR%%/PyQt5/pyrcc.so %%PYTHON_SITELIBDIR%%/PyQt5/pyrcc_main.py +%%PYTHON_SITELIBDIR%%/PyQt5/pyrcc_main.pyc +%%PYTHON_SITELIBDIR%%/PyQt5/pyrcc_main.pyo %%PYQT_SIPDIR%%/QtXml/QtXmlmod.sip %%PYQT_SIPDIR%%/QtXml/qdom.sip %%PYQT_SIPDIR%%/QtXml/qxml.sip %%API%%share/qt5/qsci/api/python/QtXml.api