svn commit: r485614 - in head: Mk/Uses audio/cadence audio/carla audio/picard audio/puddletag cad/py-pyfda comms/gnuradio comms/py-qt5-serialport databases/py-qt4-sql databases/py-qt5-sql deskutils...
Tobias C. Berner
tcberner at FreeBSD.org
Thu Nov 22 20:18:50 UTC 2018
Author: tcberner
Date: Thu Nov 22 20:18:37 2018
New Revision: 485614
URL: https://svnweb.freebsd.org/changeset/ports/485614
Log:
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
Modified:
head/Mk/Uses/pyqt.mk
head/audio/cadence/Makefile
head/audio/carla/Makefile
head/audio/picard/Makefile
head/audio/puddletag/Makefile
head/cad/py-pyfda/Makefile
head/comms/gnuradio/Makefile
head/comms/py-qt5-serialport/Makefile
head/comms/py-qt5-serialport/pkg-plist
head/databases/py-qt4-sql/Makefile
head/databases/py-qt4-sql/pkg-plist
head/databases/py-qt5-sql/Makefile
head/databases/py-qt5-sql/pkg-plist
head/deskutils/calibre/Makefile
head/deskutils/treeline/Makefile
head/devel/hgview/Makefile
head/devel/ninja-ide/Makefile
head/devel/plasma/Makefile
head/devel/py-pykde4-kde4/Makefile
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-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-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-qt5-core/Makefile
head/devel/py-qt5-core/pkg-plist
head/devel/py-qt5-dbus/Makefile
head/devel/py-qt5-dbus/pkg-plist
head/devel/py-qt5-dbussupport/Makefile
head/devel/py-qt5-designer/Makefile
head/devel/py-qt5-designer/pkg-plist
head/devel/py-qt5-designerplugin/Makefile
head/devel/py-qt5-help/Makefile
head/devel/py-qt5-help/pkg-plist
head/devel/py-qt5-qscintilla2/Makefile
head/devel/py-qt5-qscintilla2/pkg-plist
head/devel/py-qt5-test/Makefile
head/devel/py-qt5-test/pkg-plist
head/devel/py-qt5/Makefile
head/devel/py-qt5/distinfo
head/devel/py-sip/Makefile
head/devel/py-spyder/Makefile
head/devel/qbzr/Makefile
head/devel/qct/Makefile
head/devel/qscintilla2-designerplugin-qt5/Makefile
head/devel/qscintilla2-designerplugin/Makefile
head/devel/qscintilla2-qt5/Makefile
head/devel/qscintilla2/Makefile
head/devel/tortoisehg/Makefile
head/devel/vitables/Makefile
head/editors/leo/Makefile
head/emulators/fs-uae-launcher/Makefile
head/emulators/swine/Makefile
head/finance/bitcoin-armory/Makefile
head/finance/electrum/Makefile
head/games/anki/Makefile
head/games/kajongg/Makefile
head/games/py-mnemosyne/Makefile
head/graphics/py-poppler-qt4/Makefile
head/graphics/py-qt4-svg/Makefile
head/graphics/py-qt4-svg/pkg-plist
head/graphics/py-qt5-svg/Makefile
head/graphics/py-qt5-svg/pkg-plist
head/graphics/qgis/Makefile
head/graphics/seexpr/Makefile
head/lang/py-qt5-qml/Makefile
head/lang/py-qt5-qml/pkg-plist
head/math/convertall/Makefile
head/math/py-matplotlib/Makefile
head/math/qtiplot/Makefile
head/math/rpcalc/Makefile
head/misc/orange3/Makefile
head/misc/py-QSpectrumAnalyzer/Makefile
head/misc/py-qt4-demo/Makefile
head/misc/py-qt4-demo/pkg-plist
head/misc/py-qt5-demo/Makefile
head/misc/py-qt5-demo/pkg-plist
head/misc/urh/Makefile
head/multimedia/py-openlp/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/multimedia/py-qt5-multimedia/Makefile
head/multimedia/py-qt5-multimedia/pkg-plist
head/multimedia/py-qt5-multimediawidgets/Makefile
head/multimedia/py-qt5-multimediawidgets/pkg-plist
head/net-im/turpial/Makefile
head/net-mgmt/nagstamon/Makefile
head/net-mgmt/onionlauncher/Makefile
head/net-p2p/bitmessage/Makefile
head/net/py-qt4-network/Makefile
head/net/py-qt4-network/pkg-plist
head/net/py-qt5-network/Makefile
head/net/py-qt5-network/pkg-plist
head/print/hplip/Makefile
head/print/py-qt5-printsupport/Makefile
head/print/py-qt5-printsupport/pkg-plist
head/science/MOOSE-neural-simulator/Makefile
head/science/openstructure/Makefile
head/science/py-pymol/Makefile
head/science/py-veusz/Makefile
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/textproc/py-qt5-xml/Makefile
head/textproc/py-qt5-xml/pkg-plist
head/textproc/py-qt5-xmlpatterns/Makefile
head/textproc/py-qt5-xmlpatterns/pkg-plist
head/textproc/retext/Makefile
head/www/linkchecker/Makefile
head/www/onionshare/Makefile
head/www/py-qt4-webkit/Makefile
head/www/py-qt4-webkit/pkg-plist
head/www/py-qt5-webchannel/Makefile
head/www/py-qt5-webchannel/pkg-plist
head/www/py-qt5-webengine/Makefile
head/www/py-qt5-webkit/Makefile
head/www/py-qt5-webkit/pkg-plist
head/www/py-qt5-webkitwidgets/Makefile
head/www/py-qt5-webkitwidgets/pkg-plist
head/www/py-weboob/Makefile
head/www/qutebrowser/Makefile
head/x11-toolkits/py-qt4-gui/Makefile
head/x11-toolkits/py-qt4-gui/pkg-plist
head/x11-toolkits/py-qt5-gui/Makefile
head/x11-toolkits/py-qt5-gui/pkg-plist
head/x11-toolkits/py-qt5-quick/Makefile
head/x11-toolkits/py-qt5-quick/pkg-plist
head/x11-toolkits/py-qt5-quickwidgets/Makefile
head/x11-toolkits/py-qt5-quickwidgets/pkg-plist
head/x11-toolkits/py-qt5-widgets/Makefile
head/x11-toolkits/py-qt5-widgets/pkg-plist
head/x11/py-qt4-opengl/Makefile
head/x11/py-qt4-opengl/pkg-plist
head/x11/py-qt5-opengl/Makefile
head/x11/py-qt5-opengl/pkg-plist
Modified: head/Mk/Uses/pyqt.mk
==============================================================================
--- head/Mk/Uses/pyqt.mk Thu Nov 22 19:59:46 2018 (r485613)
+++ head/Mk/Uses/pyqt.mk Thu Nov 22 20:18:37 2018 (r485614)
@@ -16,11 +16,10 @@
# * 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.
-#
+# PYQT_SIPDIR - where sip files will be installed to
+# PYQT_APIDIR - where api files will be installed to
+# PYQT_DOCDIR - where doc files will be installed to
+# PYQT_EXAMPLESDIR - where examples will be installed to
.if !defined(_INCLUDE_USES_PYQT_MK)
_INCLUDE_USES_PYQT_MK= yes
@@ -64,7 +63,7 @@ MASTER_SITES_QSCI2= SF/pyqt/QScintilla2/QScintilla-${P
SIP_VERSION= 4.19.8
QSCI2_VERSION= 2.10.4
PYQT4_VERSION= 4.12.1
-PYQT5_VERSION= 5.9.2
+PYQT5_VERSION= 5.10.1
SIP_DISTNAME= sip-${SIP_VERSION}
PYQT4_DISTNAME= PyQt4_gpl_x11-${PYQT4_VERSION}
@@ -205,10 +204,33 @@ py-serialport_DESC= Python bindings for QtSerialPort
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= ${PREFIX}/${SIPDIR_REL}
-PLIST_SUB+= PYQT_SIPDIR=${SIPDIR_REL}
+# The versionned executable of sip
+SIP= ${LOCALBASE}/bin/sip-${PYTHON_VER}
+# Relative directories
+_VERSION_SUBDIR_REL= PyQt${_PYQT_VERSION}/${PYTHON_VER}
+_APIDIR_REL= share/${_VERSION_SUBDIR_REL}/qsci
+_DOCDIR_REL= share/doc/${_VERSION_SUBDIR_REL}
+_EXAMPLEDIR_REL= share/examples/${_VERSION_SUBDIR_REL}
+_SIPDIR_REL= share/${_VERSION_SUBDIR_REL}/sip
+_DESIGNERDIR_REL= ${QT_PLUGINDIR_REL}/designer/${_VERSION_SUBDIR_REL}
+_QMLDIR_REL= ${QT_QMLDIR_REL}/${_VERSION_SUBDIR_REL}
+
+# Absolute direcotries
+PYQT_APIDIR= ${PREFIX}/${_APIDIR_REL}
+PYQT_DOCDIR= ${PREFIX}/${_DOCDIR_REL}
+PYQT_EXAMPLEDIR= ${PREFIX}/${_EXAMPLEDIR_REL}
+PYQT_SIPDIR= ${PREFIX}/${_SIPDIR_REL}
+PYQT_DESIGNERDIR= ${PREFIX}/${_DESIGNERDIR_REL}
+PYQT_QMLDIR= ${PREFIX}/${_QMLDIR_REL}
+
+PLIST_SUB+= PYQT_APIDIR=${_APIDIR_REL} \
+ PYQT_DOCDIR=${_DOCDIR_REL} \
+ PYQT_EXAMPLEDIR=${_EXAMPLEDIR_REL} \
+ PYQT_SIPDIR=${_SIPDIR_REL} \
+ PYQT_DESIGNERDIR=${_DESIGNERDIR_REL} \
+ PYQT_QMLDIR=${_QMLDIR_REL}
+
.if defined(PYQT_DIST)
PORTVERSION= ${PYQT_VERSION}
MASTER_SITES= ${PYQT_MASTERSITES}
@@ -227,14 +249,17 @@ PORTSCOUT?= limit:^${_QT_VERSION:R}
.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 ${LOCALBASE}/bin/sip-${PYTHON_VER} \
- --sipdir ${SIPDIR}
-
+ --sip ${SIP} \
+ --sipdir ${PYQT_SIPDIR}
+# Move the designer plugin and qml libraries to versioned folders.
+.if ${_PYQT_VERSION:M5}
+CONFIGURE_ARGS+=--qml-plugindir ${PYQT_QMLDIR} \
+ --designer-plugindir ${PYQT_DESIGNERDIR}
+.endif
# 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.
Modified: head/audio/cadence/Makefile
==============================================================================
--- head/audio/cadence/Makefile Thu Nov 22 19:59:46 2018 (r485613)
+++ head/audio/cadence/Makefile Thu Nov 22 20:18:37 2018 (r485614)
@@ -4,6 +4,7 @@ PORTNAME= cadence
DISTVERSIONPREFIX= v
DISTVERSION= 0.9.0-7
DISTVERSIONSUFFIX= -g4a5f5b4
+PORTREVISION= 1
CATEGORIES= audio
MAINTAINER= yuri at FreeBSD.org
@@ -23,6 +24,9 @@ USE_QT= core gui widgets buildtools_build
USE_PYQT= core_run gui_run network_run widgets_run sip xml_build
CXXFLAGS+= -DJACKBRIDGE_PROPER_CPP11_SUPPORT=yes
+# Give the Makefile the proper versioned binaries of PyQt
+BINARY_ALIAS= pyuic5=${LOCALBASE}/bin/pyuic5-${PYTHON_VER} \
+ pyrcc5=${LOCALBASE}/bin/pyrcc5-${PYTHON_VER}
post-patch:
@${REINPLACE_CMD} 's|exec $$PYTHON |exec ${PYTHON_CMD} |' ${WRKSRC}/data/cadence
Modified: head/audio/carla/Makefile
==============================================================================
--- head/audio/carla/Makefile Thu Nov 22 19:59:46 2018 (r485613)
+++ head/audio/carla/Makefile Thu Nov 22 20:18:37 2018 (r485614)
@@ -3,7 +3,7 @@
PORTNAME= Carla
DISTVERSIONPREFIX= v
DISTVERSION= 1.9.12
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
MAINTAINER= yuri at FreeBSD.org
@@ -30,7 +30,10 @@ USE_LDCONFIG= ${PREFIX}/lib/carla
SHEBANG_FILES= data/carla-single source/native-plugins/resources/*
MAKE_ARGS= HAVE_QT4=false \
- EXTERNAL_PLUGINS=false
+ EXTERNAL_PLUGINS=false \
+# Give the Makefile the proper versioned binaries of PyQt
+BINARY_ALIAS= pyuic5=${LOCALBASE}/bin/pyuic5-${PYTHON_VER} \
+ pyrcc5=${LOCALBASE}/bin/pyrcc5-${PYTHON_VER}
OPTIONS_DEFINE= FFMPEG FLUIDSYNTH LINUXSAMPLER
OPTIONS_DEFAULT= FFMPEG FLUIDSYNTH JACK LINUXSAMPLER
Modified: head/audio/picard/Makefile
==============================================================================
--- head/audio/picard/Makefile Thu Nov 22 19:59:46 2018 (r485613)
+++ head/audio/picard/Makefile Thu Nov 22 20:18:37 2018 (r485614)
@@ -3,6 +3,7 @@
PORTNAME= picard
PORTVERSION= 2.0.4
+PORTREVISION= 1
CATEGORIES= audio python
MASTER_SITES= http://ftp.musicbrainz.org/pub/musicbrainz/picard/ \
ftp://ftp.musicbrainz.org/pub/musicbrainz/picard/ \
Modified: head/audio/puddletag/Makefile
==============================================================================
--- head/audio/puddletag/Makefile Thu Nov 22 19:59:46 2018 (r485613)
+++ head/audio/puddletag/Makefile Thu Nov 22 20:18:37 2018 (r485614)
@@ -3,7 +3,7 @@
PORTNAME= puddletag
PORTVERSION= 1.2.0
DISTVERSIONPREFIX=v
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= audio python
MAINTAINER= multimedia at FreeBSD.org
Modified: head/cad/py-pyfda/Makefile
==============================================================================
--- head/cad/py-pyfda/Makefile Thu Nov 22 19:59:46 2018 (r485613)
+++ head/cad/py-pyfda/Makefile Thu Nov 22 20:18:37 2018 (r485614)
@@ -2,7 +2,7 @@
PORTNAME= pyfda
PORTVERSION= 0.1
-PORTREVISION= 1
+PORTREVISION= 2
DISTVERSIONSUFFIX= rc6
CATEGORIES= cad python devel
MASTER_SITES= CHEESESHOP
Modified: head/comms/gnuradio/Makefile
==============================================================================
--- head/comms/gnuradio/Makefile Thu Nov 22 19:59:46 2018 (r485613)
+++ head/comms/gnuradio/Makefile Thu Nov 22 20:18:37 2018 (r485614)
@@ -2,6 +2,7 @@
PORTNAME= gnuradio
PORTVERSION= 3.7.13.4
+PORTREVISION= 1
CATEGORIES= comms astro hamradio
MASTER_SITES= http://gnuradio.org/releases/gnuradio/ \
LOCAL/db
Modified: head/comms/py-qt5-serialport/Makefile
==============================================================================
--- head/comms/py-qt5-serialport/Makefile Thu Nov 22 19:59:46 2018 (r485613)
+++ head/comms/py-qt5-serialport/Makefile Thu Nov 22 20:18:37 2018 (r485614)
@@ -1,7 +1,6 @@
# $FreeBSD$
PORTNAME= serialport
-PORTREVISION= 5
CATEGORIES= comms devel python
MAINTAINER= kde at FreeBSD.org
@@ -13,7 +12,7 @@ PYQT_DIST= yes
USES= python pyqt:5 qt:5
USE_GL= gl
USE_PYQT= sip_build core_run
-USE_PYTHON= flavors
+USE_PYTHON= concurrent flavors py3kplist
USE_QT= core gui serialport qmake_build
OPTIONS_DEFINE= API DEBUG
@@ -21,7 +20,7 @@ OPTIONS_DEFAULT=API
OPTIONS_SUB= yes
API_DESC= Install QtSerialPort 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_qt5.so:devel/qscintilla2-qt5
DEBUG_CONFIGURE_ON= --debug --trace
Modified: head/comms/py-qt5-serialport/pkg-plist
==============================================================================
--- head/comms/py-qt5-serialport/pkg-plist Thu Nov 22 19:59:46 2018 (r485613)
+++ head/comms/py-qt5-serialport/pkg-plist Thu Nov 22 20:18:37 2018 (r485614)
@@ -3,4 +3,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_APIDIR%%/api/python/QtSerialPort.api
Modified: head/databases/py-qt4-sql/Makefile
==============================================================================
--- head/databases/py-qt4-sql/Makefile Thu Nov 22 19:59:46 2018 (r485613)
+++ head/databases/py-qt4-sql/Makefile Thu Nov 22 20:18:37 2018 (r485614)
@@ -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
Modified: head/databases/py-qt4-sql/pkg-plist
==============================================================================
--- head/databases/py-qt4-sql/pkg-plist Thu Nov 22 19:59:46 2018 (r485613)
+++ head/databases/py-qt4-sql/pkg-plist Thu Nov 22 20:18:37 2018 (r485614)
@@ -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
Modified: head/databases/py-qt5-sql/Makefile
==============================================================================
--- head/databases/py-qt5-sql/Makefile Thu Nov 22 19:59:46 2018 (r485613)
+++ head/databases/py-qt5-sql/Makefile Thu Nov 22 20:18:37 2018 (r485614)
@@ -1,7 +1,6 @@
# $FreeBSD$
PORTNAME= sql
-PORTREVISION= 5
CATEGORIES= databases devel python
MAINTAINER= kde at FreeBSD.org
@@ -13,7 +12,7 @@ PYQT_DIST= yes
USES= python pyqt:5 qt:5
USE_GL= gl
USE_PYQT= sip_build core_run widgets_run
-USE_PYTHON= flavors
+USE_PYTHON= concurrent flavors py3kplist
USE_QT= core gui sql widgets buildtools_build qmake_build
OPTIONS_DEFINE= API DEBUG
@@ -21,7 +20,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_qt5.so:devel/qscintilla2-qt5
DEBUG_CONFIGURE_ON= --debug --trace
Modified: head/databases/py-qt5-sql/pkg-plist
==============================================================================
--- head/databases/py-qt5-sql/pkg-plist Thu Nov 22 19:59:46 2018 (r485613)
+++ head/databases/py-qt5-sql/pkg-plist Thu Nov 22 20:18:37 2018 (r485614)
@@ -15,4 +15,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_APIDIR%%/api/python/QtSql.api
Modified: head/deskutils/calibre/Makefile
==============================================================================
--- head/deskutils/calibre/Makefile Thu Nov 22 19:59:46 2018 (r485613)
+++ head/deskutils/calibre/Makefile Thu Nov 22 20:18:37 2018 (r485614)
@@ -3,6 +3,7 @@
PORTNAME= calibre
PORTVERSION= 3.34.0
+PORTREVISION= 1
CATEGORIES= deskutils python
MASTER_SITES= http://download.calibre-ebook.com/${PORTVERSION}/
@@ -71,7 +72,8 @@ MAKE_ENV+= FC_INC_DIR="${LOCALBASE}/include/fontconfig
XDG_CONFIG_HOME=${WRKDIR}/xdg-config \
XDG_UTILS_INSTALL_MODE=system \
QMAKE=${QMAKE} \
- SIP_BIN=sip-${PYTHON_VER}
+ SIP_BIN=${SIP} \
+ SIP_DIR=${PYQT_SIPDIR}
post-patch:
@${REINPLACE_CMD} -e "s|#!/usr/bin/env python2|#!${PYTHON_CMD}|" \
Modified: head/deskutils/treeline/Makefile
==============================================================================
--- head/deskutils/treeline/Makefile Thu Nov 22 19:59:46 2018 (r485613)
+++ head/deskutils/treeline/Makefile Thu Nov 22 20:18:37 2018 (r485614)
@@ -3,6 +3,7 @@
PORTNAME= treeline
PORTVERSION= 3.0.2
+PORTREVISION= 1
CATEGORIES= deskutils python
MASTER_SITES= https://github.com/doug-101/TreeLine/releases/download/v${PORTVERSION}/ \
SF/${PORTNAME}/${PORTVERSION}
Modified: head/devel/hgview/Makefile
==============================================================================
--- head/devel/hgview/Makefile Thu Nov 22 19:59:46 2018 (r485613)
+++ head/devel/hgview/Makefile Thu Nov 22 20:18:37 2018 (r485614)
@@ -3,7 +3,7 @@
PORTNAME= hgview
PORTVERSION= 1.9.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel
MASTER_SITES= CHEESESHOP \
http://download.logilab.org/pub/${PORTNAME}/
Modified: head/devel/ninja-ide/Makefile
==============================================================================
--- head/devel/ninja-ide/Makefile Thu Nov 22 19:59:46 2018 (r485613)
+++ head/devel/ninja-ide/Makefile Thu Nov 22 20:18:37 2018 (r485614)
@@ -4,7 +4,7 @@
PORTNAME= ninja-ide
PORTVERSION= 2.3
DISTVERSIONPREFIX= v
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel
MASTER_SITES= http://nivit.altervista.org/FreeBSD/ports/distfiles/
Modified: head/devel/plasma/Makefile
==============================================================================
--- head/devel/plasma/Makefile Thu Nov 22 19:59:46 2018 (r485613)
+++ head/devel/plasma/Makefile Thu Nov 22 20:18:37 2018 (r485614)
@@ -2,6 +2,7 @@
PORTNAME= plasma
DISTVERSION= g20171121
+PORTREVISION= 1
CATEGORIES= devel python
MAINTAINER= freebsd_ports at k-worx.org
@@ -29,7 +30,7 @@ GH_ACCOUNT= plasma-disassembler
GH_PROJECT= plasma
GH_TAGNAME= 8ec3bb7
-USE_PYTHON= distutils flavors autoplist
+USE_PYTHON= distutils noflavors autoplist
SHEBANG_FILES= tests/analyzer/run.sh
SHEBANG_GLOB= *.py
Modified: head/devel/py-pykde4-kde4/Makefile
==============================================================================
--- head/devel/py-pykde4-kde4/Makefile Thu Nov 22 19:59:46 2018 (r485613)
+++ head/devel/py-pykde4-kde4/Makefile Thu Nov 22 20:18:37 2018 (r485614)
@@ -2,7 +2,7 @@
PORTNAME= pykde4
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= devel kde kde-kde4 python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
Modified: head/devel/py-qt4-assistant/Makefile
==============================================================================
--- head/devel/py-qt4-assistant/Makefile Thu Nov 22 19:59:46 2018 (r485613)
+++ head/devel/py-qt4-assistant/Makefile Thu Nov 22 20:18:37 2018 (r485614)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= assistant
-PORTREVISION= 3
+PORTREVISION= 4
PORTEPOCH= 1
CATEGORIES= devel python
@@ -14,7 +14,7 @@ PYQT_DIST= yes
USES= python pyqt:4 qt:4
USE_PYQT= sip_build core_run
-USE_PYTHON= flavors
+USE_PYTHON= concurrent flavors py3kplist
USE_QT= assistantclient corelib gui network \
moc_build qmake_build
@@ -23,7 +23,7 @@ OPTIONS_DEFAULT=API
OPTIONS_SUB= yes
API_DESC= Install QtAssistant 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
Modified: head/devel/py-qt4-assistant/pkg-plist
==============================================================================
--- head/devel/py-qt4-assistant/pkg-plist Thu Nov 22 19:59:46 2018 (r485613)
+++ head/devel/py-qt4-assistant/pkg-plist Thu Nov 22 20:18:37 2018 (r485614)
@@ -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_APIDIR%%/api/python/QtAssistant.api
Modified: head/devel/py-qt4-core/Makefile
==============================================================================
--- head/devel/py-qt4-core/Makefile Thu Nov 22 19:59:46 2018 (r485613)
+++ head/devel/py-qt4-core/Makefile Thu Nov 22 20:18:37 2018 (r485614)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= core
-PORTREVISION= 7
+PORTREVISION= 8
PORTEPOCH= 1
CATEGORIES= devel python
@@ -13,7 +13,7 @@ CONFIGURE_ARGS= --enable QtCore
PYQT_DIST= yes
USES= python pyqt:4 qt:4
-USE_PYTHON= py3kplist flavors
+USE_PYTHON= concurrent flavors py3kplist
USE_PYQT= sip
USE_QT= corelib qmake_build moc_build
@@ -22,7 +22,7 @@ OPTIONS_DEFAULT=API
OPTIONS_SUB= yes
API_DESC= Install QtCore 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
Modified: head/devel/py-qt4-core/pkg-plist
==============================================================================
--- head/devel/py-qt4-core/pkg-plist Thu Nov 22 19:59:46 2018 (r485613)
+++ head/devel/py-qt4-core/pkg-plist Thu Nov 22 20:18:37 2018 (r485614)
@@ -197,4 +197,4 @@ bin/pyuic4
%%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_APIDIR%%/api/python/QtCore.api
Modified: head/devel/py-qt4-dbus/Makefile
==============================================================================
--- head/devel/py-qt4-dbus/Makefile Thu Nov 22 19:59:46 2018 (r485613)
+++ head/devel/py-qt4-dbus/Makefile Thu Nov 22 20:18:37 2018 (r485614)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= dbus
-PORTREVISION= 3
+PORTREVISION= 4
PORTEPOCH= 1
CATEGORIES= devel python
@@ -14,7 +14,7 @@ PYQT_DIST= yes
USES= python pyqt:4 qt:4
USE_PYQT= sip_build core_run
-USE_PYTHON= flavors
+USE_PYTHON= concurrent flavors py3kplist
USE_QT= corelib dbus moc_build qmake_build
OPTIONS_DEFINE= API DEBUG
@@ -22,7 +22,7 @@ OPTIONS_DEFAULT=API
OPTIONS_SUB= yes
API_DESC= Install QtDBus 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
Modified: head/devel/py-qt4-dbus/pkg-plist
==============================================================================
--- head/devel/py-qt4-dbus/pkg-plist Thu Nov 22 19:59:46 2018 (r485613)
+++ head/devel/py-qt4-dbus/pkg-plist Thu Nov 22 20:18:37 2018 (r485614)
@@ -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_APIDIR%%/api/python/QtDBus.api
Modified: head/devel/py-qt4-declarative/Makefile
==============================================================================
--- head/devel/py-qt4-declarative/Makefile Thu Nov 22 19:59:46 2018 (r485613)
+++ head/devel/py-qt4-declarative/Makefile Thu Nov 22 20:18:37 2018 (r485614)
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= declarative
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel python
MAINTAINER= kde at FreeBSD.org
@@ -12,7 +12,7 @@ PYQT_DIST= yes
USES= python pyqt:4 qt:4
USE_PYQT= sip_build core_run gui_run network_run
-USE_PYTHON= flavors
+USE_PYTHON= concurrent flavors py3kplist
USE_QT= corelib declarative gui network script sql svg xmlpatterns \
qmake_build moc_build
@@ -21,7 +21,7 @@ OPTIONS_DEFAULT=API
OPTIONS_SUB= yes
API_DESC= Install QtDeclarative 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
Modified: head/devel/py-qt4-declarative/pkg-plist
==============================================================================
--- head/devel/py-qt4-declarative/pkg-plist Thu Nov 22 19:59:46 2018 (r485613)
+++ head/devel/py-qt4-declarative/pkg-plist Thu Nov 22 20:18:37 2018 (r485614)
@@ -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_APIDIR%%/api/python/QtDeclarative.api
Modified: head/devel/py-qt4-designer/Makefile
==============================================================================
--- head/devel/py-qt4-designer/Makefile Thu Nov 22 19:59:46 2018 (r485613)
+++ head/devel/py-qt4-designer/Makefile Thu Nov 22 20:18:37 2018 (r485614)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= designer
-PORTREVISION= 3
+PORTREVISION= 4
PORTEPOCH= 1
CATEGORIES= 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 designer gui moc_build qmake_build
OPTIONS_DEFINE= API DEBUG
@@ -22,7 +22,7 @@ OPTIONS_DEFAULT=API
OPTIONS_SUB= yes
API_DESC= Install QtDesigner 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
Modified: head/devel/py-qt4-designer/pkg-plist
==============================================================================
--- head/devel/py-qt4-designer/pkg-plist Thu Nov 22 19:59:46 2018 (r485613)
+++ head/devel/py-qt4-designer/pkg-plist Thu Nov 22 20:18:37 2018 (r485614)
@@ -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_APIDIR%%/api/python/QtDesigner.api
Modified: head/devel/py-qt4-help/Makefile
==============================================================================
--- head/devel/py-qt4-help/Makefile Thu Nov 22 19:59:46 2018 (r485613)
+++ head/devel/py-qt4-help/Makefile Thu Nov 22 20:18:37 2018 (r485614)
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= help
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel python
MAINTAINER= kde at FreeBSD.org
@@ -12,7 +12,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 help network sql moc_build qmake_build
OPTIONS_DEFINE= API DEBUG
@@ -20,7 +20,7 @@ OPTIONS_DEFAULT=API
OPTIONS_SUB= yes
API_DESC= Install QtHelp 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
Modified: head/devel/py-qt4-help/pkg-plist
==============================================================================
--- head/devel/py-qt4-help/pkg-plist Thu Nov 22 19:59:46 2018 (r485613)
+++ head/devel/py-qt4-help/pkg-plist Thu Nov 22 20:18:37 2018 (r485614)
@@ -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_APIDIR%%/api/python/QtHelp.api
Modified: head/devel/py-qt4-qscintilla2/Makefile
==============================================================================
--- head/devel/py-qt4-qscintilla2/Makefile Thu Nov 22 19:59:46 2018 (r485613)
+++ head/devel/py-qt4-qscintilla2/Makefile Thu Nov 22 20:18:37 2018 (r485614)
@@ -3,6 +3,7 @@
PORTNAME= qscintilla2
PORTVERSION= ${QSCI2_VERSION}
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= devel python
MASTER_SITES= ${MASTER_SITES_QSCI2}
@@ -21,16 +22,16 @@ HAS_CONFIGURE= yes
USES= python pyqt:4 qmake:no_env qt:4
USE_PYQT= sip core gui
-USE_PYTHON= flavors
+USE_PYTHON= concurrent flavors py3kplist
USE_QT= corelib gui moc_build qmake_build
OPTIONS_DEFINE= DEBUG
DEBUG_CONFIGURE_ON= --debug --trace
-QSCIDIR= ${PREFIX}/share/qt4/qsci
-CONFIGURE_ARGS= --pyqt PyQt4 -d ${PYTHONPREFIX_SITELIBDIR}/PyQt4 -v ${SIPDIR} \
- --apidir ${QSCIDIR} --qmake ${QMAKE} --pyqt-sipdir ${SIPDIR} \
- --sip ${LOCALBASE}/bin/sip-${PYTHON_VER}
+PYQT_APIDIR= ${PREFIX}/share/qt4/qsci
+CONFIGURE_ARGS= --pyqt PyQt4 -d ${PYTHONPREFIX_SITELIBDIR}/PyQt4 -v ${PYQT_SIPDIR} \
+ --apidir ${PYQT_APIDIR} --qmake ${QMAKE} --pyqt-sipdir ${PYQT_SIPDIR} \
+ --sip ${SIP}
WRKSRC= ${WRKDIR}/${DISTNAME}/Python
ALL_TARGET= #empty
Modified: head/devel/py-qt4-qscintilla2/pkg-plist
==============================================================================
--- head/devel/py-qt4-qscintilla2/pkg-plist Thu Nov 22 19:59:46 2018 (r485613)
+++ head/devel/py-qt4-qscintilla2/pkg-plist Thu Nov 22 20:18:37 2018 (r485614)
@@ -54,4 +54,4 @@
%%PYQT_SIPDIR%%/Qsci/qsciscintillabase.sip
%%PYQT_SIPDIR%%/Qsci/qscistyle.sip
%%PYQT_SIPDIR%%/Qsci/qscistyledtext.sip
-share/qt4/qsci/api/python/QScintilla2.api
+%%PYQT_APIDIR%%/api/python/QScintilla2.api
Modified: head/devel/py-qt4-script/Makefile
==============================================================================
--- head/devel/py-qt4-script/Makefile Thu Nov 22 19:59:46 2018 (r485613)
+++ head/devel/py-qt4-script/Makefile Thu Nov 22 20:18:37 2018 (r485614)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= script
-PORTREVISION= 3
+PORTREVISION= 4
PORTEPOCH= 1
CATEGORIES= devel python
@@ -14,7 +14,7 @@ PYQT_DIST= yes
USES= python pyqt:4 qt:4
USE_PYQT= sip_build core_run
-USE_PYTHON= flavors
+USE_PYTHON= concurrent flavors py3kplist
USE_QT= corelib script moc_build qmake_build
OPTIONS_DEFINE= API DEBUG
@@ -22,7 +22,7 @@ OPTIONS_DEFAULT=API
OPTIONS_SUB= yes
API_DESC= Install QtScript 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
Modified: head/devel/py-qt4-script/pkg-plist
==============================================================================
--- head/devel/py-qt4-script/pkg-plist Thu Nov 22 19:59:46 2018 (r485613)
+++ head/devel/py-qt4-script/pkg-plist Thu Nov 22 20:18:37 2018 (r485614)
@@ -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_APIDIR%%/api/python/QtScript.api
Modified: head/devel/py-qt4-scripttools/Makefile
==============================================================================
--- head/devel/py-qt4-scripttools/Makefile Thu Nov 22 19:59:46 2018 (r485613)
+++ head/devel/py-qt4-scripttools/Makefile Thu Nov 22 20:18:37 2018 (r485614)
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= scripttools
-PORTREVISION= 3
+PORTREVISION= 4
PORTEPOCH= 1
CATEGORIES= devel python
@@ -13,7 +13,7 @@ PYQT_DIST= yes
USES= python pyqt:4 qt:4
USE_PYQT= sip_build core_run gui_run script_run
-USE_PYTHON= flavors
+USE_PYTHON= concurrent flavors py3kplist
USE_QT= corelib gui script scripttools moc_build qmake_build
OPTIONS_DEFINE= API DEBUG
@@ -21,7 +21,7 @@ OPTIONS_DEFAULT=API
OPTIONS_SUB= yes
API_DESC= Install QtScriptTools 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
Modified: head/devel/py-qt4-scripttools/pkg-plist
==============================================================================
--- head/devel/py-qt4-scripttools/pkg-plist Thu Nov 22 19:59:46 2018 (r485613)
+++ head/devel/py-qt4-scripttools/pkg-plist Thu Nov 22 20:18:37 2018 (r485614)
@@ -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_APIDIR%%/api/python/QtScriptTools.api
Modified: head/devel/py-qt4-test/Makefile
==============================================================================
--- head/devel/py-qt4-test/Makefile Thu Nov 22 19:59:46 2018 (r485613)
+++ head/devel/py-qt4-test/Makefile Thu Nov 22 20:18:37 2018 (r485614)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= test
-PORTREVISION= 3
+PORTREVISION= 4
PORTEPOCH= 1
CATEGORIES= 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 qtestlib moc_build qmake_build
OPTIONS_DEFINE= API DEBUG
@@ -22,7 +22,7 @@ OPTIONS_DEFAULT=API
OPTIONS_SUB= yes
API_DESC= Install QtTest 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
Modified: head/devel/py-qt4-test/pkg-plist
==============================================================================
--- head/devel/py-qt4-test/pkg-plist Thu Nov 22 19:59:46 2018 (r485613)
+++ head/devel/py-qt4-test/pkg-plist Thu Nov 22 20:18:37 2018 (r485614)
@@ -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_APIDIR%%/api/python/QtTest.api
Modified: head/devel/py-qt4/Makefile
==============================================================================
--- head/devel/py-qt4/Makefile Thu Nov 22 19:59:46 2018 (r485613)
+++ head/devel/py-qt4/Makefile Thu Nov 22 20:18:37 2018 (r485614)
@@ -3,7 +3,7 @@
PORTNAME= qt4
PORTVERSION= ${PYQT4_VERSION}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -11,7 +11,7 @@ MAINTAINER= kde at FreeBSD.org
COMMENT= Python bindings for the Qt 4 toolkit (meta port)
USES= metaport python pyqt:4
-USE_PYTHON= flavors
+USE_PYTHON= concurrent flavors py3kplist
# Keep these synchronized with _USE_PYQT_ALL / _USE_PYQT4_ONLY in Mk/Use/pyqt.mk
OPTIONS_DEFINE= assistant core dbus dbussupport declarative \
Modified: head/devel/py-qt5-core/Makefile
==============================================================================
--- head/devel/py-qt5-core/Makefile Thu Nov 22 19:59:46 2018 (r485613)
+++ head/devel/py-qt5-core/Makefile Thu Nov 22 20:18:37 2018 (r485614)
@@ -1,7 +1,6 @@
# $FreeBSD$
PORTNAME= core
-PORTREVISION= 6
CATEGORIES= devel python
MAINTAINER= kde at FreeBSD.org
@@ -14,7 +13,7 @@ CONFIGURE_ARGS= ${PYQT5_MODULES_ALL:N${PYQT_MODULE}:C/
PYQT_DIST= yes
USES= python pyqt:5 qt:5
-USE_PYTHON= py3kplist flavors
+USE_PYTHON= concurrent flavors py3kplist
USE_PYQT= sip_build
USE_QT= core buildtools_build qmake_build
@@ -23,7 +22,7 @@ OPTIONS_DEFAULT=API
OPTIONS_SUB= yes
API_DESC= Install QtCore 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_qt5.so:devel/qscintilla2-qt5
Modified: head/devel/py-qt5-core/pkg-plist
==============================================================================
--- head/devel/py-qt5-core/pkg-plist Thu Nov 22 19:59:46 2018 (r485613)
+++ head/devel/py-qt5-core/pkg-plist Thu Nov 22 20:18:37 2018 (r485614)
@@ -175,6 +175,7 @@ bin/pyuic5
%%PYQT_SIPDIR%%/QtCore/qpycore_qset.sip
%%PYQT_SIPDIR%%/QtCore/qpycore_qvector.sip
%%PYQT_SIPDIR%%/QtCore/qpycore_virtual_error_handler.sip
+%%PYQT_SIPDIR%%/QtCore/qrandom.sip
%%PYQT_SIPDIR%%/QtCore/qreadwritelock.sip
%%PYQT_SIPDIR%%/QtCore/qrect.sip
%%PYQT_SIPDIR%%/QtCore/qregexp.sip
@@ -220,4 +221,4 @@ bin/pyuic5
%%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_APIDIR%%/api/python/QtCore.api
Modified: head/devel/py-qt5-dbus/Makefile
==============================================================================
--- head/devel/py-qt5-dbus/Makefile Thu Nov 22 19:59:46 2018 (r485613)
+++ head/devel/py-qt5-dbus/Makefile Thu Nov 22 20:18:37 2018 (r485614)
@@ -1,7 +1,6 @@
# $FreeBSD$
PORTNAME= dbus
-PORTREVISION= 5
CATEGORIES= devel python
MAINTAINER= kde at FreeBSD.org
@@ -12,7 +11,7 @@ PYQT_DIST= yes
USES= python pyqt:5 qt:5
USE_PYQT= sip_build core_run
-USE_PYTHON= flavors
+USE_PYTHON= concurrent flavors py3kplist
USE_QT= core dbus qmake_build
OPTIONS_DEFINE= API DEBUG
@@ -20,7 +19,7 @@ OPTIONS_DEFAULT=API
OPTIONS_SUB= yes
API_DESC= Install QtDBus 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_qt5.so:devel/qscintilla2-qt5
DEBUG_CONFIGURE_ON= --debug --trace
Modified: head/devel/py-qt5-dbus/pkg-plist
==============================================================================
--- head/devel/py-qt5-dbus/pkg-plist Thu Nov 22 19:59:46 2018 (r485613)
+++ head/devel/py-qt5-dbus/pkg-plist Thu Nov 22 20:18:37 2018 (r485614)
@@ -15,4 +15,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_APIDIR%%/api/python/QtDBus.api
Modified: head/devel/py-qt5-dbussupport/Makefile
==============================================================================
--- head/devel/py-qt5-dbussupport/Makefile Thu Nov 22 19:59:46 2018 (r485613)
+++ head/devel/py-qt5-dbussupport/Makefile Thu Nov 22 20:18:37 2018 (r485614)
@@ -1,7 +1,6 @@
# $FreeBSD$
PORTNAME= dbussupport
-PORTREVISION= 1
CATEGORIES= devel python
MAINTAINER= kde at FreeBSD.org
@@ -15,7 +14,7 @@ PYQT_DIST= yes
USES= pkgconfig python pyqt:5 qt:5
USE_PYQT= sip_build
-USE_PYTHON= flavors
+USE_PYTHON= concurrent flavors py3kplist
USE_QT= core buildtools_build qmake_build
OPTIONS_DEFINE= DEBUG
Modified: head/devel/py-qt5-designer/Makefile
==============================================================================
--- head/devel/py-qt5-designer/Makefile Thu Nov 22 19:59:46 2018 (r485613)
+++ head/devel/py-qt5-designer/Makefile Thu Nov 22 20:18:37 2018 (r485614)
@@ -1,7 +1,6 @@
# $FreeBSD$
PORTNAME= designer
-PORTREVISION= 5
CATEGORIES= devel python
MAINTAINER= kde at FreeBSD.org
@@ -13,7 +12,7 @@ PYQT_DIST= yes
USES= python pyqt:5 qt:5
USE_GL= yes
USE_PYQT= sip_build core_run widgets_run
-USE_PYTHON= flavors
+USE_PYTHON= concurrent flavors py3kplist
USE_QT= core gui designer widgets xml \
buildtools_build qmake_build
@@ -22,7 +21,7 @@ OPTIONS_DEFAULT=API
OPTIONS_SUB= yes
API_DESC= Install QtDesigner 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_qt5.so:devel/qscintilla2-qt5
DEBUG_CONFIGURE_ON= --debug --trace
Modified: head/devel/py-qt5-designer/pkg-plist
==============================================================================
--- head/devel/py-qt5-designer/pkg-plist Thu Nov 22 19:59:46 2018 (r485613)
+++ head/devel/py-qt5-designer/pkg-plist Thu Nov 22 20:18:37 2018 (r485614)
@@ -25,4 +25,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_APIDIR%%/api/python/QtDesigner.api
Modified: head/devel/py-qt5-designerplugin/Makefile
==============================================================================
--- head/devel/py-qt5-designerplugin/Makefile Thu Nov 22 19:59:46 2018 (r485613)
+++ head/devel/py-qt5-designerplugin/Makefile Thu Nov 22 20:18:37 2018 (r485614)
@@ -1,7 +1,6 @@
# $FreeBSD$
PORTNAME= designerplugin
-PORTREVISION= 1
CATEGORIES= devel python
MAINTAINER= kde at FreeBSD.org
@@ -12,18 +11,19 @@ INSTALL_WRKSRC= ${WRKSRC}/designer
DESTDIRNAME= INSTALL_ROOT
CONFIGURE_ARGS= --enable QtDesigner
+
PYQT_DIST= yes
USES= python pyqt:5 qt:5
USE_GL= gl
USE_PYQT= sip_build
-USE_PYTHON= flavors
+USE_PYTHON= concurrent flavors py3kplist
USE_QT= core designer gui xml widgets \
buildtools_build qmake_build
OPTIONS_DEFINE= DEBUG
DEBUG_CONFIGURE_ON= --debug --trace
-PLIST_FILES= %%QT_PLUGINDIR%%/designer/libpyqt5.so
+PLIST_FILES= ${PYQT_DESIGNERDIR}/libpyqt5.so
.include <bsd.port.mk>
Modified: head/devel/py-qt5-help/Makefile
==============================================================================
--- head/devel/py-qt5-help/Makefile Thu Nov 22 19:59:46 2018 (r485613)
+++ head/devel/py-qt5-help/Makefile Thu Nov 22 20:18:37 2018 (r485614)
@@ -1,7 +1,6 @@
# $FreeBSD$
PORTNAME= help
-PORTREVISION= 6
CATEGORIES= devel python
MAINTAINER= kde at FreeBSD.org
@@ -13,15 +12,15 @@ PYQT_DIST= yes
USES= python pyqt:5 qt:5
USE_GL= gl
USE_PYQT= sip_build core_run widgets_run
-USE_PYTHON= flavors
-USE_QT= core gui widgets help network sql buildtools_build qmake_build xml
+USE_PYTHON= concurrent flavors py3kplist
+USE_QT= core gui widgets help network sql buildtools_build qmake_build xml
OPTIONS_DEFINE= API DEBUG
OPTIONS_DEFAULT=API
OPTIONS_SUB= yes
API_DESC= Install QtHelp 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_qt5.so:devel/qscintilla2-qt5
DEBUG_CONFIGURE_ON= --debug --trace
Modified: head/devel/py-qt5-help/pkg-plist
==============================================================================
--- head/devel/py-qt5-help/pkg-plist Thu Nov 22 19:59:46 2018 (r485613)
+++ head/devel/py-qt5-help/pkg-plist Thu Nov 22 20:18:37 2018 (r485614)
@@ -8,4 +8,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_APIDIR%%/api/python/QtHelp.api
Modified: head/devel/py-qt5-qscintilla2/Makefile
==============================================================================
--- head/devel/py-qt5-qscintilla2/Makefile Thu Nov 22 19:59:46 2018 (r485613)
+++ head/devel/py-qt5-qscintilla2/Makefile Thu Nov 22 20:18:37 2018 (r485614)
@@ -20,16 +20,16 @@ HAS_CONFIGURE= yes
USES= python pyqt:5 qmake:no_env qt:5
USE_GL= gl
USE_PYQT= sip core gui printsupport widgets
-USE_PYTHON= flavors
+USE_PYTHON= concurrent flavors py3kplist
USE_QT= core gui printsupport widgets buildtools_build qmake_build
OPTIONS_DEFINE= DEBUG
DEBUG_CONFIGURE_ON= --debug --trace
QSCIDIR= ${PREFIX}/share/qt5/qsci
-CONFIGURE_ARGS= --pyqt PyQt5 -d ${PYTHONPREFIX_SITELIBDIR}/PyQt5 -v ${SIPDIR} \
- --apidir ${QSCIDIR} --qmake ${QMAKE} --pyqt-sipdir ${SIPDIR} \
- --sip ${LOCALBASE}/bin/sip-${PYTHON_VER}
+CONFIGURE_ARGS= --pyqt PyQt5 -d ${PYTHONPREFIX_SITELIBDIR}/PyQt5 -v ${PYQT_SIPDIR} \
+ --apidir ${PYQT_APIDIR} --qmake ${QMAKE} --pyqt-sipdir ${PYQT_SIPDIR} \
+ --sip ${SIP}
WRKSRC= ${WRKDIR}/${DISTNAME}/Python
ALL_TARGET= #empty
Modified: head/devel/py-qt5-qscintilla2/pkg-plist
==============================================================================
--- head/devel/py-qt5-qscintilla2/pkg-plist Thu Nov 22 19:59:46 2018 (r485613)
+++ head/devel/py-qt5-qscintilla2/pkg-plist Thu Nov 22 20:18:37 2018 (r485614)
@@ -54,4 +54,4 @@
%%PYQT_SIPDIR%%/Qsci/qsciscintillabase.sip
%%PYQT_SIPDIR%%/Qsci/qscistyle.sip
%%PYQT_SIPDIR%%/Qsci/qscistyledtext.sip
-%%QT_DATADIR%%/qsci/api/python/QScintilla2.api
+%%PYQT_APIDIR%%/api/python/QScintilla2.api
Modified: head/devel/py-qt5-test/Makefile
==============================================================================
--- head/devel/py-qt5-test/Makefile Thu Nov 22 19:59:46 2018 (r485613)
+++ head/devel/py-qt5-test/Makefile Thu Nov 22 20:18:37 2018 (r485614)
@@ -1,7 +1,6 @@
# $FreeBSD$
PORTNAME= test
-PORTREVISION= 5
CATEGORIES= devel python
MAINTAINER= kde at FreeBSD.org
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-all
mailing list