svn commit: r463772 - in head: devel/py-qt4-core devel/py-qt5-core textproc/py-qt5-xml
Jason E. Hale
jhale at FreeBSD.org
Wed Mar 7 00:47:00 UTC 2018
Author: jhale
Date: Wed Mar 7 00:46:59 2018
New Revision: 463772
URL: https://svnweb.freebsd.org/changeset/ports/463772
Log:
textproc/py-qt5-xml:
- Install python bytecode to avoid build errors in ports depending on it [1]
devel/py-qt[4|5]-core:
- Fix python bytecode destdir location
Reported by: yuri (via freebsd-ports mailing list) [1]
Reviewed by: antoine, tcberner
Differential Revision: https://reviews.freebsd.org/D14586
Modified:
head/devel/py-qt4-core/Makefile
head/devel/py-qt5-core/Makefile
head/textproc/py-qt5-xml/Makefile
head/textproc/py-qt5-xml/pkg-plist
Modified: head/devel/py-qt4-core/Makefile
==============================================================================
--- head/devel/py-qt4-core/Makefile Tue Mar 6 22:45:36 2018 (r463771)
+++ head/devel/py-qt4-core/Makefile Wed Mar 7 00:46:59 2018 (r463772)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= core
-PORTREVISION= 4
+PORTREVISION= 5
PORTEPOCH= 1
CATEGORIES= devel python
@@ -43,10 +43,10 @@ post-patch:
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 <bsd.port.post.mk>
Modified: head/devel/py-qt5-core/Makefile
==============================================================================
--- head/devel/py-qt5-core/Makefile Tue Mar 6 22:45:36 2018 (r463771)
+++ head/devel/py-qt5-core/Makefile Wed Mar 7 00:46:59 2018 (r463772)
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= core
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel python
MAINTAINER= kde at FreeBSD.org
@@ -45,10 +45,10 @@ post-patch:
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 <bsd.port.post.mk>
Modified: head/textproc/py-qt5-xml/Makefile
==============================================================================
--- head/textproc/py-qt5-xml/Makefile Tue Mar 6 22:45:36 2018 (r463771)
+++ head/textproc/py-qt5-xml/Makefile Wed Mar 7 00:46:59 2018 (r463772)
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= xml
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= textproc devel python
MAINTAINER= kde at FreeBSD.org
@@ -12,7 +12,7 @@ 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
@@ -24,5 +24,13 @@ API_CONFIGURE_ON= --qsci-api --qsci-api-destdir=${QSCI
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 <bsd.port.mk>
Modified: head/textproc/py-qt5-xml/pkg-plist
==============================================================================
--- head/textproc/py-qt5-xml/pkg-plist Tue Mar 6 22:45:36 2018 (r463771)
+++ head/textproc/py-qt5-xml/pkg-plist Wed Mar 7 00:46:59 2018 (r463772)
@@ -4,8 +4,12 @@ bin/pyrcc5
%%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
More information about the svn-ports-head
mailing list