diff options
| author | Loïc Bartoletti <lbartoletti@FreeBSD.org> | 2021-03-08 06:49:17 +0000 |
|---|---|---|
| committer | Loïc Bartoletti <lbartoletti@FreeBSD.org> | 2021-03-08 06:49:17 +0000 |
| commit | 108f234f7f692f592a08cd969eef7f74e8cff51f (patch) | |
| tree | 0799882dc637a360900380bd9d4ad99ba969a0eb | |
| parent | 7a8e6f04393be5ff33e8f39b29a6b0d0431f25bf (diff) | |
| download | freebsd-ports-108f234f7f692f592a08cd969eef7f74e8cff51f.zip | |
PyQt5: Update PyQt5 to 5.15.3, QScintilla2 to 2.12.0, py-qtbuilder to 1.9.0
* PyQt5: update to 5.15.3
This is a minor feature and bug-fix release. There are corresponding releases of the other PyQt5-related packages.
- Added the missing QImage.setAlphaChannel().
- Support for the QtNetworkAuth library has been moved to a separate PyQtNetworkAuth package.
- Wheels no longer bundle the corresponding Qt libraries and instead automatically install them from an external wheel.
* QScintilla2: update to 2.12.0
This adds support for Qt6 and removes support for Qt4.
- Change the new distname (again)i due to a conflict
- Use the new sip-build system
* devel/py-qtbuilder: update to 1.9.0
* devel/py-sip: fix flavor for sip-distinfo
PR: 253865
Exp-run by: antoine
98 files changed, 157 insertions, 120 deletions
diff --git a/Mk/Uses/pyqt.mk b/Mk/Uses/pyqt.mk index 7cddc81935ee..e97228df3fa4 100644 --- a/Mk/Uses/pyqt.mk +++ b/Mk/Uses/pyqt.mk @@ -57,25 +57,27 @@ MASTER_SITES_SIP= https://pypi.python.org/packages/source/s/sip/ MASTER_SITES_PYQT5= https://pypi.python.org/packages/source/P/PyQt5/ MASTER_SITES_PYQTSIP= https://pypi.python.org/packages/source/P/PyQt5-sip/ MASTER_SITES_PYQTCHART= https://pypi.python.org/packages/source/P/PyQtChart/ +MASTER_SITES_PYQTNETWORKAUTH= https://pypi.python.org/packages/source/P/PyQtNetworkAuth/ MASTER_SITES_PYQTBUILDER= https://pypi.io/packages/source/P/PyQt-builder/ -#https://www.riverbankcomputing.com/static/Downloads/QScintilla/2.11.4/QScintilla-2.11.4.tar.gz +#https://www.riverbankcomputing.com/static/Downloads/QScintilla/2.12.0/QScintilla_src-2.12.0.tar.gz MASTER_SITES_QSCI2= RIVERBANK/QScintilla/${PORTVERSION} \ SF/pyqt/QScintilla2/QScintilla-${PORTVERSION} \ GENTOO SIP_VERSION= 5.5.0 -QSCI2_VERSION= 2.11.6 -PYQT5_VERSION= 5.15.2 +QSCI2_VERSION= 2.12.0 +PYQT5_VERSION= 5.15.3 PYQTSIP_VERSION= 12.8.1 -PYQTBUILDER_VERSION= 1.8.0 +PYQTBUILDER_VERSION= 1.9.0 SIP_DISTNAME= sip-${SIP_VERSION} PYQT5_DISTNAME= PyQt5-${PYQT5_VERSION} PYQTSIP_DISTNAME= PyQt5_sip-${PYQTSIP_VERSION} PYQTCHART_DISTNAME= PyQtChart-${PYQT_VERSION} +PYQTNETWORKAUTH_DISTNAME= PyQtNetworkAuth-${PYQT_VERSION} PYQTBUILDER_DISTNAME= PyQt-builder-${PYQTBUILDER_VERSION} PYQT5_DISTINFO_FILE= ${.CURDIR:H:H}/devel/${PYQT_RELNAME}/distinfo -QSCI2_DISTNAME= QScintilla-${QSCI2_VERSION} +QSCI2_DISTNAME= QScintilla_src-${QSCI2_VERSION} PYQT5_LICENSE= GPLv3 _USE_PYQT_COMMS= sensors serialport diff --git a/audio/cadence/Makefile b/audio/cadence/Makefile index c38859388e6c..f26026a653c7 100644 --- a/audio/cadence/Makefile +++ b/audio/cadence/Makefile @@ -3,7 +3,7 @@ PORTNAME= cadence DISTVERSIONPREFIX= v DISTVERSION= 0.9.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= audio MAINTAINER= yuri@FreeBSD.org diff --git a/audio/carla/Makefile b/audio/carla/Makefile index afaf2a30f8ec..e87f7a8815f8 100644 --- a/audio/carla/Makefile +++ b/audio/carla/Makefile @@ -3,7 +3,7 @@ PORTNAME= Carla DISTVERSIONPREFIX= v DISTVERSION= 2.2.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= audio MAINTAINER= yuri@FreeBSD.org diff --git a/audio/picard/Makefile b/audio/picard/Makefile index 82001504a2ff..0cc221e2b0ab 100644 --- a/audio/picard/Makefile +++ b/audio/picard/Makefile @@ -3,6 +3,7 @@ PORTNAME= picard PORTVERSION= 2.5.6 +PORTREVISION= 1 CATEGORIES= audio python MASTER_SITES= http://ftp.musicbrainz.org/pub/musicbrainz/picard/ \ ftp://ftp.musicbrainz.org/pub/musicbrainz/picard/ \ diff --git a/biology/py-ete3/Makefile b/biology/py-ete3/Makefile index 715e0848b0a1..382a20b07e8e 100644 --- a/biology/py-ete3/Makefile +++ b/biology/py-ete3/Makefile @@ -2,7 +2,7 @@ PORTNAME= ete3 DISTVERSION= 3.1.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= biology python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/cad/cura/Makefile b/cad/cura/Makefile index 1b8e471c2f05..5d0b650443e1 100644 --- a/cad/cura/Makefile +++ b/cad/cura/Makefile @@ -2,7 +2,7 @@ PORTNAME= Cura DISTVERSION= 4.8.0 -PORTREVISION= 5 +PORTREVISION= 6 PORTEPOCH= 2 CATEGORIES= cad DIST_SUBDIR= Ultimaker diff --git a/cad/openscad-devel/Makefile b/cad/openscad-devel/Makefile index e1f1af834f02..c8ab54a359ff 100644 --- a/cad/openscad-devel/Makefile +++ b/cad/openscad-devel/Makefile @@ -3,6 +3,7 @@ PORTNAME= openscad PORTVERSION= 2021.02.09 +PORTREVISION= 1 #PORTREVISION= 1 CATEGORIES= cad PKGNAMESUFFIX= -devel diff --git a/cad/openscad/Makefile b/cad/openscad/Makefile index 39e81b5aa655..c31efc0f8047 100644 --- a/cad/openscad/Makefile +++ b/cad/openscad/Makefile @@ -3,6 +3,7 @@ PORTNAME= openscad PORTVERSION= 2021.01.01 +PORTREVISION= 1 #PORTREVISION= 1 CATEGORIES= cad diff --git a/cad/py-cq-editor/Makefile b/cad/py-cq-editor/Makefile index 679de1757d0e..10d2b3138a41 100644 --- a/cad/py-cq-editor/Makefile +++ b/cad/py-cq-editor/Makefile @@ -2,7 +2,7 @@ PORTNAME= cq-editor DISTVERSION= 0.1.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= cad PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/cad/py-pyfda/Makefile b/cad/py-pyfda/Makefile index ab88c0d5dcf1..f12cd5760eab 100644 --- a/cad/py-pyfda/Makefile +++ b/cad/py-pyfda/Makefile @@ -2,7 +2,7 @@ PORTNAME= pyfda PORTVERSION= 0.1 -PORTREVISION= 7 +PORTREVISION= 8 DISTVERSIONSUFFIX= rc6 CATEGORIES= cad python devel MASTER_SITES= CHEESESHOP diff --git a/cad/uranium/Makefile b/cad/uranium/Makefile index 36af1cb920dd..12e968204dff 100644 --- a/cad/uranium/Makefile +++ b/cad/uranium/Makefile @@ -2,7 +2,7 @@ PORTNAME= Uranium DISTVERSION= 4.8 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= cad DIST_SUBDIR= Ultimaker diff --git a/comms/gnuradio/Makefile b/comms/gnuradio/Makefile index b185bb6f5597..e87b5cd731a2 100644 --- a/comms/gnuradio/Makefile +++ b/comms/gnuradio/Makefile @@ -3,7 +3,7 @@ PORTNAME= gnuradio DISTVERSIONPREFIX= v DISTVERSION= 3.8.1.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= comms astro hamradio MAINTAINER= hamradio@FreeBSD.org diff --git a/comms/nanovna-saver/Makefile b/comms/nanovna-saver/Makefile index abb1c287e0fd..728791ff573f 100644 --- a/comms/nanovna-saver/Makefile +++ b/comms/nanovna-saver/Makefile @@ -3,6 +3,7 @@ PORTNAME= nanovna-saver DISTVERSIONPREFIX= v DISTVERSION= 0.3.8 +PORTREVISION= 1 CATEGORIES= comms hamradio MAINTAINER= hamradio@FreeBSD.org diff --git a/comms/py-qt5-sensors/Makefile b/comms/py-qt5-sensors/Makefile index f9c15dbcfa68..86c94dc7100d 100644 --- a/comms/py-qt5-sensors/Makefile +++ b/comms/py-qt5-sensors/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PORTNAME= sensors -PORTREVISION= 1 CATEGORIES= comms devel python MAINTAINER= kde@FreeBSD.org diff --git a/comms/py-qt5-serialport/Makefile b/comms/py-qt5-serialport/Makefile index ee70a4c96ef4..1907c3d36c09 100644 --- a/comms/py-qt5-serialport/Makefile +++ b/comms/py-qt5-serialport/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PORTNAME= serialport -PORTREVISION= 1 CATEGORIES= comms devel python MAINTAINER= kde@FreeBSD.org diff --git a/databases/py-qt5-sql/Makefile b/databases/py-qt5-sql/Makefile index ad5a7dbb5804..129b23238f92 100644 --- a/databases/py-qt5-sql/Makefile +++ b/databases/py-qt5-sql/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PORTNAME= sql -PORTREVISION= 1 CATEGORIES= databases devel python MAINTAINER= kde@FreeBSD.org diff --git a/databases/sqlitebrowser/Makefile b/databases/sqlitebrowser/Makefile index ba08324babed..94a99b04bd90 100644 --- a/databases/sqlitebrowser/Makefile +++ b/databases/sqlitebrowser/Makefile @@ -3,7 +3,7 @@ PORTNAME= sqlitebrowser PORTVERSION= 3.12.1 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONPREFIX= v CATEGORIES= databases diff --git a/deskutils/calibre/Makefile b/deskutils/calibre/Makefile index bfb98b4a9761..5efba6a6bf18 100644 --- a/deskutils/calibre/Makefile +++ b/deskutils/calibre/Makefile @@ -3,6 +3,7 @@ PORTNAME= calibre PORTVERSION= 5.12.0 +PORTREVISION= 1 CATEGORIES= deskutils python MASTER_SITES= http://download.calibre-ebook.com/${PORTVERSION}/ diff --git a/deskutils/py-autokey/Makefile b/deskutils/py-autokey/Makefile index 6b695e6e5f46..8a7947e5e31b 100644 --- a/deskutils/py-autokey/Makefile +++ b/deskutils/py-autokey/Makefile @@ -3,7 +3,7 @@ PORTNAME= autokey DISTVERSIONPREFIX= v DISTVERSION= 0.95.9 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= deskutils python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/deskutils/treeline/Makefile b/deskutils/treeline/Makefile index a09600977b7f..e730c4a9db67 100644 --- a/deskutils/treeline/Makefile +++ b/deskutils/treeline/Makefile @@ -3,6 +3,7 @@ PORTNAME= treeline PORTVERSION= 3.1.4 +PORTREVISION= 1 CATEGORIES= deskutils python MASTER_SITES= https://github.com/doug-101/TreeLine/releases/download/v${PORTVERSION}/ \ SF/${PORTNAME}/${PORTVERSION} diff --git a/devel/eric6/Makefile b/devel/eric6/Makefile index 383ca5464061..9cffef2caa98 100644 --- a/devel/eric6/Makefile +++ b/devel/eric6/Makefile @@ -5,7 +5,7 @@ PKGNAMESUFFIX= -qt5-${FLAVOR:U:S/_/-/} DISTNAME= ${PORTNAME}-nolang-${DISTVERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel python BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR} diff --git a/devel/git-cola/Makefile b/devel/git-cola/Makefile index d6c38b831138..bfea21ba4a8d 100644 --- a/devel/git-cola/Makefile +++ b/devel/git-cola/Makefile @@ -4,7 +4,7 @@ PORTNAME= git-cola DISTVERSIONPREFIX= v DISTVERSION= 3.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MAINTAINER= dch@FreeBSD.org diff --git a/devel/libsavitar/Makefile b/devel/libsavitar/Makefile index 089a4d6a7410..32b34532a5e0 100644 --- a/devel/libsavitar/Makefile +++ b/devel/libsavitar/Makefile @@ -2,7 +2,7 @@ PORTNAME= libSavitar DISTVERSION= 4.5.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel cad DIST_SUBDIR= Ultimaker diff --git a/devel/py-pynest2d/Makefile b/devel/py-pynest2d/Makefile index af83034bbfeb..1f0730a5717b 100644 --- a/devel/py-pynest2d/Makefile +++ b/devel/py-pynest2d/Makefile @@ -2,7 +2,7 @@ PORTNAME= pynest2d DISTVERSION= 4.8.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/py-qt5-core/Makefile b/devel/py-qt5-core/Makefile index a3edabdd4530..1f11b1a44a74 100644 --- a/devel/py-qt5-core/Makefile +++ b/devel/py-qt5-core/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PORTNAME= core -PORTREVISION= 1 CATEGORIES= devel python MAINTAINER= kde@FreeBSD.org diff --git a/devel/py-qt5-dbus/Makefile b/devel/py-qt5-dbus/Makefile index 860d551abf55..6821f1b41426 100644 --- a/devel/py-qt5-dbus/Makefile +++ b/devel/py-qt5-dbus/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PORTNAME= dbus -PORTREVISION= 1 CATEGORIES= devel python MAINTAINER= kde@FreeBSD.org diff --git a/devel/py-qt5-designer/Makefile b/devel/py-qt5-designer/Makefile index bb62fa23ed45..856d7364c93d 100644 --- a/devel/py-qt5-designer/Makefile +++ b/devel/py-qt5-designer/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PORTNAME= designer -PORTREVISION= 1 CATEGORIES= devel python MAINTAINER= kde@FreeBSD.org diff --git a/devel/py-qt5-help/Makefile b/devel/py-qt5-help/Makefile index 7e495c826083..510c31e54f57 100644 --- a/devel/py-qt5-help/Makefile +++ b/devel/py-qt5-help/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PORTNAME= help -PORTREVISION= 1 CATEGORIES= devel python MAINTAINER= kde@FreeBSD.org diff --git a/devel/py-qt5-location/Makefile b/devel/py-qt5-location/Makefile index e5196d10bc88..0722dba3d348 100644 --- a/devel/py-qt5-location/Makefile +++ b/devel/py-qt5-location/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PORTNAME= location -PORTREVISION= 1 CATEGORIES= devel python MAINTAINER= kde@FreeBSD.org diff --git a/devel/py-qt5-qscintilla2/Makefile b/devel/py-qt5-qscintilla2/Makefile index dacf49dd30ae..9bdf9ae06de3 100644 --- a/devel/py-qt5-qscintilla2/Makefile +++ b/devel/py-qt5-qscintilla2/Makefile @@ -15,32 +15,28 @@ LIB_DEPENDS= libqscintilla2_qt5.so:devel/qscintilla2-qt5 DISTINFO_FILE= ${.CURDIR:H}/qscintilla2-qt5/distinfo DESTDIRNAME= INSTALL_ROOT -HAS_CONFIGURE= yes - -USES= python:3.5+ pyqt:5 gl qmake:no_env qt:5 +USES= python:3.5+ pyqt:5 gl qt:5 USE_GL= gl -USE_PYQT= core gui printsupport widgets +USE_PYQT= core gui printsupport widgets sip_build qtbuilder 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 ${PYQT_SIPDIR} \ - --apidir ${PYQT_APIDIR} --qmake ${QMAKE} --pyqt-sipdir ${PYQT_SIPDIR} \ - --sip ${SIP} --qsci-sipdir ${PYQT_SIPDIR} --qsci-incdir ${QT_INCDIR} --qsci-libdir ${QT_LIBDIR} WRKSRC= ${WRKDIR}/${DISTNAME}/Python ALL_TARGET= #empty -post-patch: - ${REINPLACE_CMD} -e "s/sip-module/sip-module-${PYTHON_VER}/" ${WRKSRC}/configure.py +post-extract: + ${CP} ${WRKSRC}/pyproject-qt5.toml ${WRKSRC}/pyproject.toml + +do-build: + (cd ${WRKSRC} ; sip-build-${PYTHON_VER} --verbose --no-make --build-dir build ; ${MAKE} -C ./build ) -do-configure: - cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ - ${PYTHON_CMD} configure.py ${CONFIGURE_ARGS} +do-install: + (cd ${WRKSRC} ; ${MAKE} -C ./build install INSTALL_ROOT=${STAGEDIR} ) post-install: - ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/Qsci.so + ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/Qsci.abi3.so .include <bsd.port.mk> diff --git a/devel/py-qt5-qscintilla2/files/patch-project.py b/devel/py-qt5-qscintilla2/files/patch-project.py new file mode 100644 index 000000000000..e3774e734a22 --- /dev/null +++ b/devel/py-qt5-qscintilla2/files/patch-project.py @@ -0,0 +1,20 @@ +--- project.py.orig 2021-03-04 14:24:28 UTC ++++ project.py +@@ -81,7 +81,8 @@ class Qsci(PyQtBindings): + qmake_CONFIG = ['qscintilla2'] + else: + qmake_CONFIG = [] +- ++ ++ self.project = project + super().__init__(project, 'Qsci', qmake_CONFIG=qmake_CONFIG) + + def apply_user_defaults(self, tool): +@@ -125,6 +126,7 @@ class Qsci(PyQtBindings): + + self._add_internal_lib_sources() + ++ self.tags.append("WS_X11") + super().apply_user_defaults(tool) + + def get_options(self): diff --git a/devel/py-qt5-qscintilla2/pkg-plist b/devel/py-qt5-qscintilla2/pkg-plist index ec8424743d38..b0b4788ed6c5 100644 --- a/devel/py-qt5-qscintilla2/pkg-plist +++ b/devel/py-qt5-qscintilla2/pkg-plist @@ -1,8 +1,5 @@ -%%PYTHON_SITELIBDIR%%/QScintilla-%%PYQT_QSCIVERSION%%.dist-info/INSTALLER -%%PYTHON_SITELIBDIR%%/QScintilla-%%PYQT_QSCIVERSION%%.dist-info/METADATA -%%PYTHON_SITELIBDIR%%/QScintilla-%%PYQT_QSCIVERSION%%.dist-info/RECORD -%%PYTHON_SITELIBDIR%%/PyQt5/Qsci.pyi -%%PYTHON_SITELIBDIR%%/PyQt5/Qsci.so +%%PYTHON_SITELIBDIR%%/PyQt5/Qsci.abi3.so +%%PYQT_SIPDIR%%/Qsci/Qsci.toml %%PYQT_SIPDIR%%/Qsci/qsciabstractapis.sip %%PYQT_SIPDIR%%/Qsci/qsciapis.sip %%PYQT_SIPDIR%%/Qsci/qscicommand.sip @@ -20,7 +17,6 @@ %%PYQT_SIPDIR%%/Qsci/qscilexercustom.sip %%PYQT_SIPDIR%%/Qsci/qscilexerd.sip %%PYQT_SIPDIR%%/Qsci/qscilexerdiff.sip -%%PYQT_SIPDIR%%/Qsci/qscilexeredifact.sip %%PYQT_SIPDIR%%/Qsci/qscilexerfortran.sip %%PYQT_SIPDIR%%/Qsci/qscilexerfortran77.sip %%PYQT_SIPDIR%%/Qsci/qscilexerhtml.sip @@ -50,7 +46,6 @@ %%PYQT_SIPDIR%%/Qsci/qscilexerxml.sip %%PYQT_SIPDIR%%/Qsci/qscilexeryaml.sip %%PYQT_SIPDIR%%/Qsci/qscimacro.sip -%%PYQT_SIPDIR%%/Qsci/qscimod4.sip %%PYQT_SIPDIR%%/Qsci/qscimod5.sip %%PYQT_SIPDIR%%/Qsci/qscimodcommon.sip %%PYQT_SIPDIR%%/Qsci/qsciprinter.sip @@ -58,4 +53,6 @@ %%PYQT_SIPDIR%%/Qsci/qsciscintillabase.sip %%PYQT_SIPDIR%%/Qsci/qscistyle.sip %%PYQT_SIPDIR%%/Qsci/qscistyledtext.sip -%%PYQT_APIDIR%%/api/python/QScintilla2.api +%%PYTHON_SITELIBDIR%%/QScintilla-%%PYQT_QSCIVERSION%%.dist-info/INSTALLER +%%PYTHON_SITELIBDIR%%/QScintilla-%%PYQT_QSCIVERSION%%.dist-info/METADATA +%%PYTHON_SITELIBDIR%%/QScintilla-%%PYQT_QSCIVERSION%%.dist-info/RECORD diff --git a/devel/py-qt5-remoteobjects/Makefile b/devel/py-qt5-remoteobjects/Makefile index b6182398d14d..c8dc23562e41 100644 --- a/devel/py-qt5-remoteobjects/Makefile +++ b/devel/py-qt5-remoteobjects/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PORTNAME= remoteobjects -PORTREVISION= 1 CATEGORIES= devel python MAINTAINER= kde@FreeBSD.org diff --git a/devel/py-qt5-test/Makefile b/devel/py-qt5-test/Makefile index a580cec2bbfe..16db5930f247 100644 --- a/devel/py-qt5-test/Makefile +++ b/devel/py-qt5-test/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PORTNAME= test -PORTREVISION= 1 CATEGORIES= devel python MAINTAINER= kde@FreeBSD.org diff --git a/devel/py-qt5/distinfo b/devel/py-qt5/distinfo index 7464b1b0f285..8806ca19ff3c 100644 --- a/devel/py-qt5/distinfo +++ b/devel/py-qt5/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1607460192 -SHA256 (PyQt5-5.15.2.tar.gz) = 372b08dc9321d1201e4690182697c5e7ffb2e0770e6b4a45519025134b12e4fc -SIZE (PyQt5-5.15.2.tar.gz) = 3265445 +TIMESTAMP = 1614187937 +SHA256 (PyQt5-5.15.3.tar.gz) = 965ba50e7029b37f218a54ace24e87c77db3e5a9f0b83baeb21fb57b4154b838 +SIZE (PyQt5-5.15.3.tar.gz) = 3263087 diff --git a/devel/py-qtbuilder/distinfo b/devel/py-qtbuilder/distinfo index e177a00f1770..4fcc2ba9b0f5 100644 --- a/devel/py-qtbuilder/distinfo +++ b/devel/py-qtbuilder/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1613316895 -SHA256 (PyQt-builder-1.8.0.tar.gz) = 30b5fd3d1bdafeae3131070ebdc55481cf72c6a05a1b73ea2b420678bed2650c -SIZE (PyQt-builder-1.8.0.tar.gz) = 5703119 +TIMESTAMP = 1614230561 +SHA256 (PyQt-builder-1.9.0.tar.gz) = 54520b4d40d6e6d1307f9cebab4730ae78e01873c88866aa1e5192c24801005a +SIZE (PyQt-builder-1.9.0.tar.gz) = 5703103 diff --git a/devel/py-sip/Makefile b/devel/py-sip/Makefile index 045b8835bad7..a5822897e686 100644 --- a/devel/py-sip/Makefile +++ b/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} diff --git a/devel/py-sip/files/patch-sipbuild_project.py b/devel/py-sip/files/patch-sipbuild_project.py new file mode 100644 index 000000000000..9af6252a0842 --- /dev/null +++ b/devel/py-sip/files/patch-sipbuild_project.py @@ -0,0 +1,14 @@ +--- sipbuild/project.py.orig 2021-02-25 12:33:48 UTC ++++ sipbuild/project.py +@@ -335,9 +335,9 @@ class Project(AbstractProject, Configurable): + generator=None, wheel_tag=None): + """ Return a sequence of command line arguments to invoke sip-distinfo. + """ +- ++ flavor = '{}-{}.{}'.format(sip_distinfo, self.py_major_version, self.py_minor_version) + args = [ +- sip_distinfo, ++ flavor, + + '--inventory', + inventory, diff --git a/devel/py-spyder/Makefile b/devel/py-spyder/Makefile index 02e0acdae980..7e7be1ebbbd3 100644 --- a/devel/py-spyder/Makefile +++ b/devel/py-spyder/Makefile @@ -4,7 +4,7 @@ PORTNAME= spyder DISTVERSIONPREFIX= v DISTVERSION= 3.2.7 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= devel science python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/devel/qscintilla2-designerplugin-qt5/Makefile b/devel/qscintilla2-designerplugin-qt5/Makefile index ef18eb353b10..921fad51f15f 100644 --- a/devel/qscintilla2-designerplugin-qt5/Makefile +++ b/devel/qscintilla2-designerplugin-qt5/Makefile @@ -18,7 +18,7 @@ USE_GL= gl USE_QT= core designer printsupport gui widgets xml \ buildtools_build qmake_build -WRKSRC= ${WRKDIR}/${DISTNAME}/designer-Qt4Qt5 +WRKSRC= ${WRKDIR}/${DISTNAME}/designer PLIST_FILES= %%QT_PLUGINDIR%%/designer/libqscintillaplugin.so diff --git a/devel/qscintilla2-qt5/Makefile b/devel/qscintilla2-qt5/Makefile index 5667d3a8e8af..90ba84114764 100644 --- a/devel/qscintilla2-qt5/Makefile +++ b/devel/qscintilla2-qt5/Makefile @@ -15,7 +15,7 @@ USE_PYQT= # USE_QT= buildtools_build core gui printsupport widgets USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} -BUILD_WRKSRC= ${WRKSRC}/Qt4Qt5 +BUILD_WRKSRC= ${WRKSRC}/src CONFIGURE_WRKSRC= ${BUILD_WRKSRC} INSTALL_WRKSRC= ${BUILD_WRKSRC} @@ -37,9 +37,9 @@ post-install: cd ${WRKSRC} &&\ ${MKDIR} ${STAGEDIR}${DOCSDIR}/html ${STAGEDIR}${DOCSDIR}/Scintilla &&\ ${INSTALL_DATA} NEWS ${STAGEDIR}${DOCSDIR} &&\ - ${INSTALL_DATA} doc/html-Qt4Qt5/* ${STAGEDIR}${DOCSDIR}/html &&\ + ${INSTALL_DATA} doc/html/* ${STAGEDIR}${DOCSDIR}/html &&\ ${INSTALL_DATA} doc/Scintilla/* ${STAGEDIR}${DOCSDIR}/Scintilla - cd ${WRKSRC}/example-Qt4Qt5 &&\ + cd ${WRKSRC}/example &&\ ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/images &&\ ${INSTALL_DATA} *.* ${STAGEDIR}${EXAMPLESDIR} &&\ ${INSTALL_DATA} images/* ${STAGEDIR}${EXAMPLESDIR}/images diff --git a/devel/qscintilla2-qt5/distinfo b/devel/qscintilla2-qt5/distinfo index 4b2a7d6445a4..e717d5de96b3 100644 --- a/devel/qscintilla2-qt5/distinfo +++ b/devel/qscintilla2-qt5/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1610568353 -SHA256 (QScintilla-2.11.6.tar.gz) = e7346057db47d2fb384467fafccfcb13aa0741373c5d593bc72b55b2f0dd20a7 -SIZE (QScintilla-2.11.6.tar.gz) = 3027764 +TIMESTAMP = 1614188419 +SHA256 (QScintilla_src-2.12.0.tar.gz) = 2116181cce3076aa4897e36182532d0e6768081fb0cf6dcdd5be720519ab1434 +SIZE (QScintilla_src-2.12.0.tar.gz) = 3059053 diff --git a/devel/qscintilla2-qt5/pkg-plist b/devel/qscintilla2-qt5/pkg-plist index 340164525701..3099ae748740 100644 --- a/devel/qscintilla2-qt5/pkg-plist +++ b/devel/qscintilla2-qt5/pkg-plist @@ -54,7 +54,7 @@ %%QT_LIBDIR%%/libqscintilla2_qt5.so %%QT_LIBDIR%%/libqscintilla2_qt5.so.15 %%QT_LIBDIR%%/libqscintilla2_qt5.so.15.0 -%%QT_LIBDIR%%/libqscintilla2_qt5.so.15.0.0 +%%QT_LIBDIR%%/libqscintilla2_qt5.so.15.0.1 %%QT_MKSPECDIR%%/features/qscintilla2.prf %%QT_DATADIR%%/qsci/api/python/Python-2.4.api %%QT_DATADIR%%/qsci/api/python/Python-2.5.api @@ -68,6 +68,7 @@ %%QT_DATADIR%%/qsci/api/python/Python-3.6.api %%QT_DATADIR%%/qsci/api/python/Python-3.7.api %%QT_DATADIR%%/qsci/api/python/Python-3.8.api +%%QT_DATADIR%%/qsci/api/python/Python-3.9.api %%NLS%%%%QT_L10NDIR%%/qscintilla_cs.qm %%NLS%%%%QT_L10NDIR%%/qscintilla_de.qm %%NLS%%%%QT_L10NDIR%%/qscintilla_es.qm diff --git a/devel/tortoisehg/Makefile b/devel/tortoisehg/Makefile index b4fff225e392..ca1420d08b07 100644 --- a/devel/tortoisehg/Makefile +++ b/devel/tortoisehg/Makefile @@ -2,6 +2,7 @@ PORTNAME= tortoisehg DISTVERSION= 5.7.0 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= arrowd@FreeBSD.org diff --git a/devel/vitables/Makefile b/devel/vitables/Makefile index b78a6dca21b6..c473d077ab44 100644 --- a/devel/vitables/Makefile +++ b/devel/vitables/Makefile @@ -3,7 +3,7 @@ PORTNAME= vitables DISTVERSIONPREFIX= v DISTVERSION= 3.0.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= devel science python MAINTAINER= yuri@FreeBSD.org diff --git a/emulators/fs-uae-launcher/Makefile b/emulators/fs-uae-launcher/Makefile index 154de6640b7f..21418011a211 100644 --- a/emulators/fs-uae-launcher/Makefile +++ b/emulators/fs-uae-launcher/Makefile @@ -3,7 +3,7 @@ PORTNAME= fs-uae-launcher PORTVERSION= 3.0.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators MASTER_SITES= https://fs-uae.net/stable/${PORTVERSION}/ diff --git a/games/anki/Makefile b/games/anki/Makefile index d7f5daf6b72b..99a29ee5598d 100644 --- a/games/anki/Makefile +++ b/games/anki/Makefile @@ -3,7 +3,7 @@ PORTNAME= anki DISTVERSION= 2.1.35 -PORTREVISION= 5 +PORTREVISION= 6 # Don't forget to update ${_MY_BUILDHASH} CATEGORIES= games education python MASTER_SITES= LOCAL/kai/:npmcache diff --git a/games/py-mnemosyne/Makefile b/games/py-mnemosyne/Makefile index cf0e5cb399c9..90f3f6ae5837 100644 --- a/games/py-mnemosyne/Makefile +++ b/games/py-mnemosyne/Makefile @@ -3,7 +3,7 @@ PORTNAME= mnemosyne PORTVERSION= 2.7.3 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= games education python MASTER_SITES= SF/mnemosyne-proj/${PORTNAME}/${PORTNAME}-${DISTVERSION} diff --git a/graphics/py-python-poppler-qt5/Makefile b/graphics/py-python-poppler-qt5/Makefile index e0c387ba8bb1..c02d06959bd0 100644 --- a/graphics/py-python-poppler-qt5/Makefile +++ b/graphics/py-python-poppler-qt5/Makefile @@ -3,7 +3,7 @@ PORTNAME= python-poppler-qt5 DISTVERSIONPREFIX= v DISTVERSION= 0.75.0 -PORTREVISION= 14 +PORTREVISION= 15 CATEGORIES= graphics python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/graphics/py-qt5-svg/Makefile b/graphics/py-qt5-svg/Makefile index 28abca31b10c..d27079deed09 100644 --- a/graphics/py-qt5-svg/Makefile +++ b/graphics/py-qt5-svg/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PORTNAME= svg -PORTREVISION= 1 CATEGORIES= graphics devel python MAINTAINER= kde@FreeBSD.org diff --git a/graphics/py-visvis/Makefile b/graphics/py-visvis/Makefile index 5f268fefe8de..6e77427a1e4e 100644 --- a/graphics/py-visvis/Makefile +++ b/graphics/py-visvis/Makefile @@ -3,6 +3,7 @@ PORTNAME= visvis PORTVERSION= 1.13.0 +PORTREVISION= 1 CATEGORIES= graphics python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/graphics/qgis-ltr/Makefile b/graphics/qgis-ltr/Makefile index 5f83f4c267e6..0106df15067d 100644 --- a/graphics/qgis-ltr/Makefile +++ b/graphics/qgis-ltr/Makefile @@ -4,7 +4,7 @@ PORTNAME= qgis DISTVERSIONPREFIX= final- DISTVERSION= 3_10_14 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics geography PKGNAMESUFFIX= -ltr diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile index b7e4f465522b..9a3d602a7e94 100644 --- a/graphics/qgis/Makefile +++ b/graphics/qgis/Makefile @@ -4,7 +4,7 @@ PORTNAME= qgis DISTVERSIONPREFIX= final- DISTVERSION= 3_18_0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics geography PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ diff --git a/graphics/qtqr/Makefile b/graphics/qtqr/Makefile index e92699cc1ea3..cdc48ca9c0e3 100644 --- a/graphics/qtqr/Makefile +++ b/graphics/qtqr/Makefile @@ -3,7 +3,7 @@ PORTNAME= qtqr DISTVERSION= 2.0.bzr39 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics python MASTER_SITES= LOCAL/ehaupt PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/graphics/rapid-photo-downloader/Makefile b/graphics/rapid-photo-downloader/Makefile index 0e9ca681db49..b6926f738c9b 100644 --- a/graphics/rapid-photo-downloader/Makefile +++ b/graphics/rapid-photo-downloader/Makefile @@ -2,6 +2,7 @@ PORTNAME= rapid-photo-downloader DISTVERSION= 0.9.26 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= https://launchpad.net/rapid/pyqt/${PORTVERSION}/+download/ diff --git a/lang/py-qt5-qml/Makefile b/lang/py-qt5-qml/Makefile index 7f748cc930db..4c9ae8f7e843 100644 --- a/lang/py-qt5-qml/Makefile +++ b/lang/py-qt5-qml/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PORTNAME= qml -PORTREVISION= 1 CATEGORIES= lang devel python MAINTAINER= kde@FreeBSD.org diff --git a/math/asymptote/Makefile b/math/asymptote/Makefile index 9d2b624f490c..7a7d63df149b 100644 --- a/math/asymptote/Makefile +++ b/math/asymptote/Makefile @@ -3,7 +3,7 @@ PORTNAME= asymptote PORTVERSION= 2.67 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= math MASTER_SITES= SF/${PORTNAME}/${PORTVERSION} DISTNAME= ${PORTNAME}-${PORTVERSION}.src diff --git a/math/convertall/Makefile b/math/convertall/Makefile index 0cad2d8e6071..b9701284c8da 100644 --- a/math/convertall/Makefile +++ b/math/convertall/Makefile @@ -3,7 +3,7 @@ PORTNAME= convertall PORTVERSION= 0.8.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= math MASTER_SITES= https://github.com/doug-101/ConvertAll/releases/download/v${PORTVERSION}/ diff --git a/math/octave/Makefile b/math/octave/Makefile index c202ced40cd5..94b109bb020e 100644 --- a/math/octave/Makefile +++ b/math/octave/Makefile @@ -3,6 +3,7 @@ PORTNAME= octave PORTVERSION= ${OCTAVE_VERSION} +PORTREVISION= 1 CATEGORIES= math MASTER_SITES= GNU diff --git a/math/rpcalc/Makefile b/math/rpcalc/Makefile index 8a8cee7a760d..5c8f0bc48361 100644 --- a/math/rpcalc/Makefile +++ b/math/rpcalc/Makefile @@ -3,7 +3,7 @@ PORTNAME= rpcalc PORTVERSION= 0.8.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= math MASTER_SITES= SF/${PORTNAME}/${PORTVERSION} diff --git a/misc/orange3/Makefile b/misc/orange3/Makefile index f316c6facde1..3f95943d96ab 100644 --- a/misc/orange3/Makefile +++ b/misc/orange3/Makefile @@ -2,7 +2,7 @@ PORTNAME= orange3 DISTVERSION= 3.19.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= misc python MAINTAINER= yuri@FreeBSD.org diff --git a/misc/py-QSpectrumAnalyzer/Makefile b/misc/py-QSpectrumAnalyzer/Makefile index 960712d63905..d5aedbc08b65 100644 --- a/misc/py-QSpectrumAnalyzer/Makefile +++ b/misc/py-QSpectrumAnalyzer/Makefile @@ -2,7 +2,7 @@ PORTNAME= QSpectrumAnalyzer DISTVERSION= 2.1.0 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= misc hamradio python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/misc/py-qt5-demo/Makefile b/misc/py-qt5-demo/Makefile index f55143493ef2..9b454de104ba 100644 --- a/misc/py-qt5-demo/Makefile +++ b/misc/py-qt5-demo/Makefile @@ -2,7 +2,6 @@ PORTNAME= demo PORTVERSION= ${PYQT5_VERSION} -PORTREVISION= 1 CATEGORIES= misc devel python MASTER_SITES= ${MASTER_SITES_PYQT5} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}qt5- diff --git a/misc/urh/Makefile b/misc/urh/Makefile index b5a4263ec54d..8b2fc4ee5c43 100644 --- a/misc/urh/Makefile +++ b/misc/urh/Makefile @@ -2,6 +2,7 @@ PORTNAME= urh DISTVERSION= 2.9.1 +PORTREVISION= 1 CATEGORIES= misc hamradio python MASTER_SITES= CHEESESHOP diff --git a/multimedia/openshot/Makefile b/multimedia/openshot/Makefile index bd252cfc038e..b0134b4c2ca7 100644 --- a/multimedia/openshot/Makefile +++ b/multimedia/openshot/Makefile @@ -4,6 +4,7 @@ PORTNAME= openshot DISTVERSIONPREFIX= v DISTVERSION= 2.5.1-732 +PORTREVISION= 1 DISTVERSIONSUFFIX= -g14ecc519 CATEGORIES= multimedia diff --git a/multimedia/py-qt5-multimedia/Makefile b/multimedia/py-qt5-multimedia/Makefile index eaa93da38af0..1dcd132f466b 100644 --- a/multimedia/py-qt5-multimedia/Makefile +++ b/multimedia/py-qt5-multimedia/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PORTNAME= multimedia -PORTREVISION= 1 CATEGORIES= multimedia devel python MAINTAINER= kde@FreeBSD.org diff --git a/multimedia/py-qt5-multimediawidgets/Makefile b/multimedia/py-qt5-multimediawidgets/Makefile index dbed05cb4d7b..124b8816cfbf 100644 --- a/multimedia/py-qt5-multimediawidgets/Makefile +++ b/multimedia/py-qt5-multimediawidgets/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PORTNAME= multimediawidgets -PORTREVISION= 1 CATEGORIES= multimedia devel python MAINTAINER= kde@FreeBSD.org diff --git a/net-im/scudcloud/Makefile b/net-im/scudcloud/Makefile index b3c23f2166ae..974ee6a3e776 100644 --- a/net-im/scudcloud/Makefile +++ b/net-im/scudcloud/Makefile @@ -4,7 +4,7 @@ PORTNAME= scudcloud PORTVERSION= 1.65 DISTVERSIONPREFIX= v -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-im MAINTAINER= nivit@FreeBSD.org diff --git a/net-mgmt/nagstamon/Makefile b/net-mgmt/nagstamon/Makefile index fc5f0e385d74..b0fa5b378f25 100644 --- a/net-mgmt/nagstamon/Makefile +++ b/net-mgmt/nagstamon/Makefile @@ -3,7 +3,7 @@ PORTNAME= nagstamon PORTVERSION= 3.4.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net-mgmt python MASTER_SITES= https://nagstamon.ifw-dresden.de/files/stable/ \ LOCAL/ehaupt diff --git a/net/libarcus/Makefile b/net/libarcus/Makefile index 7af65743172f..fc392394cd42 100644 --- a/net/libarcus/Makefile +++ b/net/libarcus/Makefile @@ -2,7 +2,7 @@ PORTNAME= libArcus PORTVERSION= 4.8.0 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= net cad DIST_SUBDIR= Ultimaker diff --git a/net/py-qt5-network/Makefile b/net/py-qt5-network/Makefile index abb19d26b16f..d27589368154 100644 --- a/net/py-qt5-network/Makefile +++ b/net/py-qt5-network/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PORTNAME= network -PORTREVISION= 1 CATEGORIES= net devel python MAINTAINER= kde@FreeBSD.org diff --git a/net/py-qt5-networkauth/Makefile b/net/py-qt5-networkauth/Makefile index a80697e9432e..3de08972382a 100644 --- a/net/py-qt5-networkauth/Makefile +++ b/net/py-qt5-networkauth/Makefile @@ -1,30 +1,47 @@ # $FreeBSD$ PORTNAME= networkauth -PORTREVISION= 1 +PORTVERSION= ${PYQT5_VERSION} CATEGORIES= net devel python +MASTER_SITES= ${MASTER_SITES_PYQTNETWORKAUTH} +PKGNAMEPREFIX= ${PYQT_PY_RELNAME}- +DISTNAME= ${PYQTNETWORKAUTH_DISTNAME} MAINTAINER= kde@FreeBSD.org COMMENT= Python bindings for the Qt5 toolkit, QtNetworkAuth module -CONFIGURE_ARGS= --enable QtNetworkAuth -PYQT_DIST= yes - USES= python:3.5+ pyqt:5 qt:5 -USE_PYQT= sip_build core_run +USE_PYQT= sip_build core gui network widgets USE_PYTHON= concurrent flavors py3kplist -USE_QT= core network networkauth qmake_build +USE_QT= core gui network networkauth qmake_build +USE_GL+= gl + +HAS_CONFIGURE= yes +CONFIGURE_ARGS+= --verbose --no-dist-info \ + -d ${PYTHONPREFIX_SITELIBDIR}/PyQt5 \ + -q ${QMAKE} \ + --sip ${SIP} \ + --pyqt-sipdir=${PYQT_SIPDIR} +DESTDIRNAME= INSTALL_ROOT OPTIONS_DEFINE= API DEBUG OPTIONS_DEFAULT=API OPTIONS_SUB= yes API_DESC= Install QtNetworkAuth API for QScintilla2 -API_CONFIGURE_ON= --qsci-api --qsci-api-destdir=${PYQT_APIDIR} +API_CONFIGURE_ON= --apidir=${PYQT_APIDIR} API_CONFIGURE_OFF= --no-qsci-api API_LIB_DEPENDS= libqscintilla2_qt5.so:devel/qscintilla2-qt5 DEBUG_CONFIGURE_ON= --debug --trace +post-patch: + ${REINPLACE_CMD} -e "s/sip-module/sip-module-${PYTHON_VER}/" ${WRKSRC}/configure.py; + ${REINPLACE_CMD} -e "s/-gui/gui/" ${WRKSRC}/configure.py ${WRKSRC}/pyproject.toml + +do-configure: + cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ + ${PYTHON_CMD} configure.py ${CONFIGURE_ARGS} + post-install: ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/PyQt5/QtNetworkAuth.so diff --git a/net/py-qt5-networkauth/distinfo b/net/py-qt5-networkauth/distinfo new file mode 100644 index 000000000000..d23dd153db18 --- /dev/null +++ b/net/py-qt5-networkauth/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1614867526 +SHA256 (PyQtNetworkAuth-5.15.3.tar.gz) = 2590eae76d4b87ceb9f0d857a5631e13dd14f7fdab2b5e696df61f77e4e3fd82 +SIZE (PyQtNetworkAuth-5.15.3.tar.gz) = 35833 diff --git a/net/py-qt5-networkauth/pkg-plist b/net/py-qt5-networkauth/pkg-plist index aae55df20e83..94d164faa869 100644 --- a/net/py-qt5-networkauth/pkg-plist +++ b/net/py-qt5-networkauth/pkg-plist @@ -1,6 +1,6 @@ %%PYTHON_SITELIBDIR%%/PyQt5/QtNetworkAuth.pyi %%PYTHON_SITELIBDIR%%/PyQt5/QtNetworkAuth.so -%%API%%%%PYQT_APIDIR%%/api/python/QtNetworkAuth.api +%%API%%%%PYQT_APIDIR%%/api/python/PyQtNetworkAuth.api %%PYQT_SIPDIR%%/QtNetworkAuth/QtNetworkAuthmod.sip %%PYQT_SIPDIR%%/QtNetworkAuth/qabstractoauth.sip %%PYQT_SIPDIR%%/QtNetworkAuth/qabstractoauth2.sip diff --git a/print/py-frescobaldi/Makefile b/print/py-frescobaldi/Makefile index 4246523addd8..ce6e215e0903 100644 --- a/print/py-frescobaldi/Makefile +++ b/print/py-frescobaldi/Makefile @@ -4,7 +4,7 @@ PORTNAME= frescobaldi DISTVERSIONPREFIX= v DISTVERSION= 3.1.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= print kde python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/print/py-qt5-printsupport/Makefile b/print/py-qt5-printsupport/Makefile index b892ad9859be..6b9f23d94f7d 100644 --- a/print/py-qt5-printsupport/Makefile +++ b/print/py-qt5-printsupport/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PORTNAME= printsupport -PORTREVISION= 1 CATEGORIES= print python MAINTAINER= kde@FreeBSD.org diff --git a/science/code_saturne/Makefile b/science/code_saturne/Makefile index 5439c10675b8..db8d2c568a07 100644 --- a/science/code_saturne/Makefile +++ b/science/code_saturne/Makefile @@ -3,6 +3,7 @@ PORTNAME= code_saturne PORTVERSION= 6.1.3 +PORTREVISION= 1 DISTVERSIONPREFIX= v CATEGORIES= science parallel diff --git a/science/py-veusz/Makefile b/science/py-veusz/Makefile index 0632ce35a4e8..6b3b6580114d 100644 --- a/science/py-veusz/Makefile +++ b/science/py-veusz/Makefile @@ -4,6 +4,7 @@ PORTNAME= veusz DISTVERSIONPREFIX= ${PORTNAME}- DISTVERSION= 3.3.1 +PORTREVISION= 1 CATEGORIES= science PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/sysutils/angrysearch/Makefile b/sysutils/angrysearch/Makefile index 11e08b98f9d8..2ec6b190bcec 100644 --- a/sysutils/angrysearch/Makefile +++ b/sysutils/angrysearch/Makefile @@ -3,7 +3,7 @@ PORTNAME= angrysearch PORTVERSION= 1.0.2 # untagged, but specified in the setup.py -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= sysutils python MAINTAINER= danfe@FreeBSD.org diff --git a/textproc/py-qt5-xml/Makefile b/textproc/py-qt5-xml/Makefile index f31570dfe966..d77116dd9cc4 100644 --- a/textproc/py-qt5-xml/Makefile +++ b/textproc/py-qt5-xml/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PORTNAME= xml -PORTREVISION= 1 CATEGORIES= textproc devel python MAINTAINER= kde@FreeBSD.org diff --git a/textproc/py-qt5-xmlpatterns/Makefile b/textproc/py-qt5-xmlpatterns/Makefile index 8cd40222cbe0..e20193a7da3f 100644 --- a/textproc/py-qt5-xmlpatterns/Makefile +++ b/textproc/py-qt5-xmlpatterns/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PORTNAME= xmlpatterns -PORTREVISION= 1 CATEGORIES= textproc devel python MAINTAINER= kde@FreeBSD.org diff --git a/textproc/retext/Makefile b/textproc/retext/Makefile index 75dd2a62e89c..4d50b615ce5e 100644 --- a/textproc/retext/Makefile +++ b/textproc/retext/Makefile @@ -2,7 +2,7 @@ PORTNAME= retext DISTVERSION= 7.0.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= textproc MAINTAINER= arved@FreeBSD.org diff --git a/www/onionshare/Makefile b/www/onionshare/Makefile index 70686be8a84e..48a70bf5ee61 100644 --- a/www/onionshare/Makefile +++ b/www/onionshare/Makefile @@ -3,7 +3,7 @@ PORTNAME= onionshare DISTVERSIONPREFIX= v DISTVERSION= 2.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= www python security MAINTAINER= egypcio@FreeBSD.org diff --git a/www/py-qt5-webchannel/Makefile b/www/py-qt5-webchannel/Makefile index 3e22384c9dec..084c433793e5 100644 --- a/www/py-qt5-webchannel/Makefile +++ b/www/py-qt5-webchannel/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PORTNAME= webchannel -PORTREVISION= 1 CATEGORIES= www devel python MAINTAINER= kde@FreeBSD.org diff --git a/www/py-qt5-webengine/Makefile b/www/py-qt5-webengine/Makefile index a6a221edf27c..9cd0771bb8b0 100644 --- a/www/py-qt5-webengine/Makefile +++ b/www/py-qt5-webengine/Makefile @@ -2,7 +2,6 @@ PORTNAME= webengine DISTVERSION= ${PYQT_VERSION} -PORTREVISION= 1 CATEGORIES= www devel python MASTER_SITES= https://pypi.python.org/packages/source/P/PyQtWebEngine/ PKGNAMEPREFIX= ${PYQT_PY_RELNAME}- diff --git a/www/py-qt5-webengine/distinfo b/www/py-qt5-webengine/distinfo index 5c8d21c84a2f..d15385d06a0c 100644 --- a/www/py-qt5-webengine/distinfo +++ b/www/py-qt5-webengine/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1607515582 -SHA256 (PyQtWebEngine-5.15.2.tar.gz) = 4d72fea774071ce6f76e341a3d2c5d595886c9906a9b9493239c841cce54a634 -SIZE (PyQtWebEngine-5.15.2.tar.gz) = 48608 +TIMESTAMP = 1614922541 +SHA256 (PyQtWebEngine-5.15.3.tar.gz) = 0badc56e6c9ee2b7b4baa87511737d2a7f1de5a45f52b1da8f4965fc17dcf0b6 +SIZE (PyQtWebEngine-5.15.3.tar.gz) = 48784 diff --git a/www/py-qt5-webkit/Makefile b/www/py-qt5-webkit/Makefile index 02d3230f9441..34e6d1599fe8 100644 --- a/www/py-qt5-webkit/Makefile +++ b/www/py-qt5-webkit/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PORTNAME= webkit -PORTREVISION= 1 CATEGORIES= www devel python MAINTAINER= kde@FreeBSD.org diff --git a/www/py-qt5-webkitwidgets/Makefile b/www/py-qt5-webkitwidgets/Makefile index df7dbb84e79d..2f14444d63f7 100644 --- a/www/py-qt5-webkitwidgets/Makefile +++ b/www/py-qt5-webkitwidgets/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PORTNAME= webkitwidgets -PORTREVISION= 1 CATEGORIES= www devel python MAINTAINER= kde@FreeBSD.org diff --git a/www/py-qt5-websockets/Makefile b/www/py-qt5-websockets/Makefile index 6eabf1efc6f8..46b0bd604f69 100644 --- a/www/py-qt5-websockets/Makefile +++ b/www/py-qt5-websockets/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PORTNAME= websockets -PORTREVISION= 1 CATEGORIES= www net devel python MAINTAINER= kde@FreeBSD.org diff --git a/www/py-weboob-qt/Makefile b/www/py-weboob-qt/Makefile index f13fbe5747e8..d0ef166ccd4d 100644 --- a/www/py-weboob-qt/Makefile +++ b/www/py-weboob-qt/Makefile @@ -2,6 +2,7 @@ PORTNAME= weboob-qt PORTVERSION= 2.0 +PORTREVISION= 1 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/www/qutebrowser/Makefile b/www/qutebrowser/Makefile index 3f8050c51761..efa6581701b6 100644 --- a/www/qutebrowser/Makefile +++ b/www/qutebrowser/Makefile @@ -2,6 +2,7 @@ PORTNAME= qutebrowser DISTVERSION= 2.0.2 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= CHEESESHOP diff --git a/x11-toolkits/py-qt5-chart/Makefile b/x11-toolkits/py-qt5-chart/Makefile index e1c22f7bf293..9ac959819c94 100644 --- a/x11-toolkits/py-qt5-chart/Makefile +++ b/x11-toolkits/py-qt5-chart/Makefile @@ -2,7 +2,6 @@ PORTNAME= chart PORTVERSION= ${PYQT5_VERSION} -PORTREVISION= 1 CATEGORIES= x11-toolkits devel python MASTER_SITES= ${MASTER_SITES_PYQTCHART} PKGNAMEPREFIX= ${PYQT_PY_RELNAME}- diff --git a/x11-toolkits/py-qt5-chart/distinfo b/x11-toolkits/py-qt5-chart/distinfo index e447fb9fcff1..75acaf69e295 100644 --- a/x11-toolkits/py-qt5-chart/distinfo +++ b/x11-toolkits/py-qt5-chart/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1607515564 -SHA256 (PyQtChart-5.15.2.tar.gz) = 93a6212fb4944d8266ec1f1c10c6e857a06ae6ffb55377ebef58c817b629cbf0 -SIZE (PyQtChart-5.15.2.tar.gz) = 68821 +TIMESTAMP = 1614228730 +SHA256 (PyQtChart-5.15.3.tar.gz) = 5f54d0689a54e50d4cc6ae1a2672d69fbe0831cc3562b61c6b30f34aee84bccf +SIZE (PyQtChart-5.15.3.tar.gz) = 69064 diff --git a/x11-toolkits/py-qt5-quick/Makefile b/x11-toolkits/py-qt5-quick/Makefile index 035814a46b27..2fd055a24f29 100644 --- a/x11-toolkits/py-qt5-quick/Makefile +++ b/x11-toolkits/py-qt5-quick/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PORTNAME= quick -PORTREVISION= 1 CATEGORIES= x11-toolkits devel python MAINTAINER= kde@FreeBSD.org diff --git a/x11-toolkits/py-qt5-quick3d/Makefile b/x11-toolkits/py-qt5-quick3d/Makefile index be641bfc3df1..c94ac45ba337 100644 --- a/x11-toolkits/py-qt5-quick3d/Makefile +++ b/x11-toolkits/py-qt5-quick3d/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PORTNAME= quick3d -PORTREVISION= 1 CATEGORIES= x11-toolkits devel python MAINTAINER= kde@FreeBSD.org diff --git a/x11-toolkits/py-qt5-quickwidgets/Makefile b/x11-toolkits/py-qt5-quickwidgets/Makefile index 2f61d08f5a91..01498dd0a79c 100644 --- a/x11-toolkits/py-qt5-quickwidgets/Makefile +++ b/x11-toolkits/py-qt5-quickwidgets/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PORTNAME= quickwidgets -PORTREVISION= 1 CATEGORIES= x11-toolkits devel python MAINTAINER= kde@FreeBSD.org diff --git a/x11-toolkits/py-qt5-widgets/Makefile b/x11-toolkits/py-qt5-widgets/Makefile index f8914c46d619..80838abd946e 100644 --- a/x11-toolkits/py-qt5-widgets/Makefile +++ b/x11-toolkits/py-qt5-widgets/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PORTNAME= widgets -PORTREVISION= 1 CATEGORIES= x11-toolkits devel python MAINTAINER= kde@FreeBSD.org diff --git a/x11/py-qt5-opengl/Makefile b/x11/py-qt5-opengl/Makefile index 802b37e4208c..fed9d9107930 100644 --- a/x11/py-qt5-opengl/Makefile +++ b/x11/py-qt5-opengl/Makefile @@ -1,7 +1,6 @@ # $FreeBSD$ PORTNAME= opengl -PORTREVISION= 1 CATEGORIES= x11 devel python MAINTAINER= kde@FreeBSD.org |