From cc8a667aa283dbd1c377aa55dd4b47568cebc6b9 Mon Sep 17 00:00:00 2001 From: "Tobias C. Berner" Date: Thu, 22 Nov 2018 20:18:37 +0000 Subject: pyqt: Change install directories for Python flavor support * PyQt could not be installed for multiple Python versions at the same time, as there were conflicting files. This patch creates Python-version versioned directories for all these, and further installs binaries with a version number. * Note, there might be some hickups for software that depends on on of the .so's provided by PyQt5, which might not be found anymore autmotically, and maybe need some LD-flaggery. * Update PyQt5 to 5.10.1 * Mark www/py-qt5-webengine broken. It is unforuntately no longer compatible with the old qt5-webengine-5.9.4 we ship. PR: 232745 Exp-run by: antoine Differential Revision: https://reviews.freebsd.org/D8714 --- databases/py-qt4-sql/Makefile | 6 +++--- databases/py-qt4-sql/pkg-plist | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'databases/py-qt4-sql') diff --git a/databases/py-qt4-sql/Makefile b/databases/py-qt4-sql/Makefile index 8f505ba89691..814596a59393 100644 --- a/databases/py-qt4-sql/Makefile +++ b/databases/py-qt4-sql/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= sql -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= databases devel python @@ -14,7 +14,7 @@ PYQT_DIST= yes USES= python pyqt:4 qt:4 USE_PYQT= sip_build core_run gui_run -USE_PYTHON= flavors +USE_PYTHON= concurrent flavors py3kplist USE_QT= corelib gui sql \ moc_build qmake_build @@ -23,7 +23,7 @@ OPTIONS_DEFAULT=API OPTIONS_SUB= yes API_DESC= Install QtSql API for QScintilla2 -API_CONFIGURE_ON= --qsci-api --qsci-api-destdir=${QSCIDIR} +API_CONFIGURE_ON= --qsci-api --qsci-api-destdir=${PYQT_APIDIR} API_CONFIGURE_OFF= --no-qsci-api API_LIB_DEPENDS= libqscintilla2_qt4.so:devel/qscintilla2 DEBUG_CONFIGURE_ON= --debug --trace diff --git a/databases/py-qt4-sql/pkg-plist b/databases/py-qt4-sql/pkg-plist index f4e6a9d52898..a90345c33de3 100644 --- a/databases/py-qt4-sql/pkg-plist +++ b/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_APIDIR%%/api/python/QtSql.api -- cgit v1.2.3