On Sun Feb 25, 2018 at 12:58:16PM +0100, Björn Ketelaars wrote:
> qscintilla received an update fixing amongst others handling of UTF8
> call tips. Changelog can be found at
> https://www.riverbankcomputing.com/static/Downloads/QScintilla/ChangeLog
>
> Minor number of SHARED_LIBS has been bumped as symbols have been added.
> While here change HOMEPAGE to https.
>
> Successfully build tested a couple of consumers.
>
> OK?
>
>
Hi Björn, Hi ports@,
I've had the following in my tree for some time now. Update
- py-qt4
- py-qt5
- py-sip
- py-qscintilla
I build all consumers but that was a while ago. Would be really nice if
you could help me with that (or anyone else)
Be aware, only for the brave!
Best regards,
Rafael
Index: devel/py-sip/Makefile
===================================================================
RCS file: /cvs/ports/devel/py-sip/Makefile,v
retrieving revision 1.40
diff -u -p -u -p -r1.40 Makefile
--- devel/py-sip/Makefile 13 Nov 2017 19:13:47 -0000 1.40
+++ devel/py-sip/Makefile 19 Feb 2018 15:03:51 -0000
@@ -5,12 +5,11 @@ COMMENT= automatically generate Python b
# XXX Be particularly careful when testing updates.
# API breaks often.
-DISTNAME= sip-4.19.3
+DISTNAME= sip-4.19.7
PKGNAME= py-${DISTNAME}
-REVISION = 2
CATEGORIES= devel
-HOMEPAGE= http://www.riverbankcomputing.co.uk/software/sip/intro
+HOMEPAGE= https://www.riverbankcomputing.co.uk/software/sip/intro
# SIP license (Python like)
PERMIT_PACKAGE_CDROM= Yes
Index: devel/py-sip/distinfo
===================================================================
RCS file: /cvs/ports/devel/py-sip/distinfo,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 distinfo
--- devel/py-sip/distinfo 17 Jul 2017 08:34:39 -0000 1.16
+++ devel/py-sip/distinfo 19 Feb 2018 15:03:51 -0000
@@ -1,2 +1,2 @@
-SHA256 (sip-4.19.3.tar.gz) = dA34RPgMxF3MmyMpSpJJKSO8QDzojmjDV4PyfBd8S3Q=
-SIZE (sip-4.19.3.tar.gz) = 1007481
+SHA256 (sip-4.19.7.tar.gz) = JbUNKd1LcpZeeYDEHjMg5GDv9IGhd77t3r+MO+hLjN4=
+SIZE (sip-4.19.7.tar.gz) = 1022209
Index: devel/py-sip/patches/patch-configure_py
===================================================================
RCS file: /cvs/ports/devel/py-sip/patches/patch-configure_py,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-configure_py
--- devel/py-sip/patches/patch-configure_py 13 Nov 2017 19:13:47 -0000
1.1
+++ devel/py-sip/patches/patch-configure_py 19 Feb 2018 15:03:51 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-configure_py,v 1.1 2017/
Index: configure.py
--- configure.py.orig
+++ configure.py
-@@ -281,7 +281,7 @@ def create_config(module, template, macros):
+@@ -300,7 +300,7 @@ def create_config(module, template, macros):
"sip_version": sip_version,
"sip_version_str": sip_version_str,
"platform": build_platform,
Index: devel/py-sip/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/py-sip/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 PLIST
--- devel/py-sip/pkg/PLIST 17 Jul 2017 08:34:39 -0000 1.9
+++ devel/py-sip/pkg/PLIST 19 Feb 2018 15:03:51 -0000
@@ -1,22 +1,22 @@
@comment $OpenBSD: PLIST,v 1.9 2017/07/17 08:34:39 zhuk Exp $
@bin bin/sip${MODPY_BIN_SUFFIX}
include/python${MODPY_VERSION}${MODPY_LIB_SUFFIX}/sip.h
-lib/python${MODPY_VERSION}/site-packages/sip.pyi
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}sipconfig.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}sipdistutils.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/sip.pyi
lib/python${MODPY_VERSION}/site-packages/sip.so
lib/python${MODPY_VERSION}/site-packages/sipconfig.py
lib/python${MODPY_VERSION}/site-packages/sipdistutils.py
share/doc/${MODPY_PY_PREFIX}sip/
share/doc/${MODPY_PY_PREFIX}sip/annotations.rst.txt
-share/doc/${MODPY_PY_PREFIX}sip/build_system.rst.txt
+share/doc/${MODPY_PY_PREFIX}sip/build_syste${MODPY_LIB_SUFFIX}.rst.txt
share/doc/${MODPY_PY_PREFIX}sip/c_api.rst.txt
-share/doc/${MODPY_PY_PREFIX}sip/command_line.rst.txt
+share/doc/${MODPY_PY_PREFIX}sip/co${MODPY_LIB_SUFFIX}${MODPY_LIB_SUFFIX}and_line.rst.txt
share/doc/${MODPY_PY_PREFIX}sip/directives.rst.txt
share/doc/${MODPY_PY_PREFIX}sip/distutils.rst.txt
-share/doc/${MODPY_PY_PREFIX}sip/embedding.rst.txt
-share/doc/${MODPY_PY_PREFIX}sip/incompatibilities.rst.txt
+share/doc/${MODPY_PY_PREFIX}sip/e${MODPY_LIB_SUFFIX}bedding.rst.txt
+share/doc/${MODPY_PY_PREFIX}sip/inco${MODPY_LIB_SUFFIX}patibilities.rst.txt
share/doc/${MODPY_PY_PREFIX}sip/index.rst.txt
share/doc/${MODPY_PY_PREFIX}sip/installation.rst.txt
share/doc/${MODPY_PY_PREFIX}sip/introduction.rst.txt
Index: editors/py-qscintilla/Makefile
===================================================================
RCS file: /cvs/ports/editors/py-qscintilla/Makefile,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 Makefile
--- editors/py-qscintilla/Makefile 1 Nov 2017 15:01:08 -0000 1.15
+++ editors/py-qscintilla/Makefile 19 Feb 2018 15:03:52 -0000
@@ -2,13 +2,12 @@
COMMENT = Python binding for the Scintilla source code editor
-VERSION = 2.10.1
+VERSION = 2.10.2
DISTNAME = QScintilla_gpl-${VERSION}
PKGNAME = py-qscintilla-${VERSION}
CATEGORIES = editors x11 devel
-REVISION = 0
-HOMEPAGE = http://www.riverbankcomputing.com/software/qscintilla/
+HOMEPAGE = https://www.riverbankcomputing.com/software/qscintilla/
# GPLv2/GPLv3
PERMIT_PACKAGE_CDROM = Yes
Index: editors/py-qscintilla/distinfo
===================================================================
RCS file: /cvs/ports/editors/py-qscintilla/distinfo,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 distinfo
--- editors/py-qscintilla/distinfo 30 Oct 2017 13:51:17 -0000 1.5
+++ editors/py-qscintilla/distinfo 19 Feb 2018 15:03:52 -0000
@@ -1,2 +1,2 @@
-SHA256 (QScintilla_gpl-2.10.1.tar.gz) =
l/mKnZH5CNts43/sxtJB2VWziKHEhxc7YHJsupo9+mQ=
-SIZE (QScintilla_gpl-2.10.1.tar.gz) = 2663446
+SHA256 (QScintilla_gpl-2.10.2.tar.gz) =
FLMdIHF+7ZXqm+pM0W5eG3LO5+usZHy6h44PbbamXtA=
+SIZE (QScintilla_gpl-2.10.2.tar.gz) = 2665138
Index: editors/py-qscintilla/pkg/PLIST
===================================================================
RCS file: /cvs/ports/editors/py-qscintilla/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 PLIST
--- editors/py-qscintilla/pkg/PLIST 30 Oct 2017 13:51:17 -0000 1.4
+++ editors/py-qscintilla/pkg/PLIST 19 Feb 2018 15:03:52 -0000
@@ -1,9 +1,7 @@
@comment $OpenBSD: PLIST,v 1.4 2017/10/30 13:51:17 landry Exp $
-lib/python${MODPY_VERSION}/site-packages/${PYQTVER}/
lib/python${MODPY_VERSION}/site-packages/${PYQTVER}/Qsci.pyi
lib/python${MODPY_VERSION}/site-packages/${PYQTVER}/Qsci.so
lib/${QTVER}/qsci/api/python/QScintilla2.api
-${SIPDIR}/
${SIPDIR}/Qsci/
${SIPDIR}/Qsci/qsciabstractapis.sip
${SIPDIR}/Qsci/qsciapis.sip
Index: editors/qscintilla/Makefile
===================================================================
RCS file: /cvs/ports/editors/qscintilla/Makefile,v
retrieving revision 1.22
diff -u -p -u -p -r1.22 Makefile
--- editors/qscintilla/Makefile 22 Dec 2017 06:27:16 -0000 1.22
+++ editors/qscintilla/Makefile 19 Feb 2018 15:03:52 -0000
@@ -3,14 +3,13 @@
COMMENT = Qt port of the Scintilla source code editor
# XXX update py-qscintilla alongside this port (same distfile).
-VERSION = 2.10.1
+VERSION = 2.10.2
DISTNAME = QScintilla_gpl-${VERSION}
PKGNAME = qscintilla-${VERSION}
-REVISION = 0
CATEGORIES = editors x11
-HOMEPAGE = http://www.riverbankcomputing.com/software/qscintilla/
+HOMEPAGE = https://www.riverbankcomputing.com/software/qscintilla/
# GPLv2/GPLv3
PERMIT_PACKAGE_CDROM = Yes
Index: editors/qscintilla/distinfo
===================================================================
RCS file: /cvs/ports/editors/qscintilla/distinfo,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 distinfo
--- editors/qscintilla/distinfo 30 Oct 2017 13:49:31 -0000 1.7
+++ editors/qscintilla/distinfo 19 Feb 2018 15:03:52 -0000
@@ -1,2 +1,2 @@
-SHA256 (QScintilla_gpl-2.10.1.tar.gz) =
l/mKnZH5CNts43/sxtJB2VWziKHEhxc7YHJsupo9+mQ=
-SIZE (QScintilla_gpl-2.10.1.tar.gz) = 2663446
+SHA256 (QScintilla_gpl-2.10.2.tar.gz) =
FLMdIHF+7ZXqm+pM0W5eG3LO5+usZHy6h44PbbamXtA=
+SIZE (QScintilla_gpl-2.10.2.tar.gz) = 2665138
Index: editors/qscintilla/pkg/PLIST
===================================================================
RCS file: /cvs/ports/editors/qscintilla/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 PLIST
--- editors/qscintilla/pkg/PLIST 30 Oct 2017 13:49:31 -0000 1.6
+++ editors/qscintilla/pkg/PLIST 19 Feb 2018 15:03:52 -0000
@@ -52,7 +52,7 @@ include/X11/${QTVER}/Qsci/qsciscintilla.
include/X11/${QTVER}/Qsci/qsciscintillabase.h
include/X11/${QTVER}/Qsci/qscistyle.h
include/X11/${QTVER}/Qsci/qscistyledtext.h
-@lib lib/libqscintilla2_${QTVER}.so.${LIBqscintilla2_${QTVER}_VERSION}
+@lib lib/libqscintilla2_${QTVER}.so.${LIBqscintilla2_qt4_VERSION}
lib/${QTVER}/mkspecs/features/qscintilla2.prf
lib/${QTVER}/qsci/
lib/${QTVER}/qsci/api/
Index: x11/kde4/libs/patch-kio_kio_kautomount_h
===================================================================
RCS file: x11/kde4/libs/patch-kio_kio_kautomount_h
diff -N x11/kde4/libs/patch-kio_kio_kautomount_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ x11/kde4/libs/patch-kio_kio_kautomount_h 19 Feb 2018 15:04:08 -0000
@@ -0,0 +1,32 @@
+$OpenBSD: patch-kio_kio_kautomount_h,v 1.1 2017/06/17 21:58:59 zhuk Exp $
+Unbreak py-kde4 after devel/py-sip update to 4.19.2.
+
+Index: kio/kio/kautomount.h
+--- kio/kio/kautomount.h.orig
++++ kio/kio/kautomount.h
+@@ -66,9 +66,11 @@ Q_SIGNALS:
+ /** Emitted in case the directory could not been mounted */
+ void error();
+
+-private:
++protected:
+ /** KAutoMount deletes itself. Don't delete it manually. */
+ ~KAutoMount();
++
++private:
+ Q_PRIVATE_SLOT(d, void slotResult( KJob * ))
+ friend class KAutoMountPrivate;
+ KAutoMountPrivate* const d;
+@@ -100,9 +102,11 @@ Q_SIGNALS:
+ /** Emitted in case the directory could not been unmounted */
+ void error();
+
+-private:
++protected:
+ /** KAutoUnmount deletes itself. Don't delete it manually. */
+ ~KAutoUnmount();
++
++private:
+ Q_PRIVATE_SLOT(d, void slotResult( KJob * ))
+ friend class KAutoUnmountPrivate;
+ KAutoUnmountPrivate* const d;
Index: x11/kde4/py-kde/Makefile
===================================================================
RCS file: /cvs/ports/x11/kde4/py-kde/Makefile,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 Makefile
--- x11/kde4/py-kde/Makefile 27 Jul 2017 11:57:50 -0000 1.11
+++ x11/kde4/py-kde/Makefile 19 Feb 2018 15:04:08 -0000
@@ -3,7 +3,7 @@
COMMENT = KDE 4 bindings for Python
DISTNAME = pykde4-${MODKDE4_VERSION}
PKGNAME = py-kde-${MODKDE4_VERSION}
-REVISION = 1
+REVISION = 2
MODULES = lang/python
Index: x11/kde4/py-kde/patches/patch-sip_kdeui_kfontchooser_sip
===================================================================
RCS file: x11/kde4/py-kde/patches/patch-sip_kdeui_kfontchooser_sip
diff -N x11/kde4/py-kde/patches/patch-sip_kdeui_kfontchooser_sip
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ x11/kde4/py-kde/patches/patch-sip_kdeui_kfontchooser_sip 19 Feb 2018
15:04:08 -0000
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+Fixes a build failure with SIP 4.19.6 (possibly other versions > 4.19.2):
+sip: ::KFontChooser ctor argument 5 has an unsupported type for a Python
signature - provide a valid type, %MethodCode and a C++ signature
+Obtained from:
https://anonscm.debian.org/cgit/pkg-kde/kde-sc/pykde4.git/commit/debian/patches?id=9de587a159f47d30068c84127c06917594eaf2e0
+
+Index: sip/kdeui/kfontchooser.sip
+--- sip/kdeui/kfontchooser.sip.orig
++++ sip/kdeui/kfontchooser.sip
+@@ -59,7 +59,7 @@ class KFontChooser : QWidget (public)
+
+ typedef QFlags<KFontChooser::DisplayFlag> DisplayFlags;
+
+- explicit KFontChooser (QWidget* parent /TransferThis/ = 0,
const KFontChooser::DisplayFlags& flags = KFontChooser::DisplayFrame, const
QStringList& fontList = QStringList(), int visibleListSize = 8, Qt::CheckState*
sizeIsRelativeState = 0) [(QWidget* = 0, const KFontChooser::DisplayFlags& =
KFontChooser::DisplayFrame, const QStringList& = QStringList(), int = 8,
Qt::CheckState* = 0)];
++ explicit KFontChooser (QWidget* parent /TransferThis/ = 0, const
KFontChooser::DisplayFlags& flags = KFontChooser::DisplayFrame, const
QStringList& fontList = QStringList(), int visibleListSize = 8, Qt::CheckState
sizeIsRelativeState = Qt::Unchecked) [(QWidget* = 0, const
KFontChooser::DisplayFlags& = KFontChooser::DisplayFrame, const QStringList& =
QStringList(), int = 8, Qt::CheckState* = 0)];
+ %MethodCode
+ Py_BEGIN_ALLOW_THREADS
+ sipCpp = new sipKFontChooser (a0, *a1, *a2, a3, &a4);
Index: x11/kde4/py-kde/patches/patch-sip_kdeui_kfontdialog_sip
===================================================================
RCS file: x11/kde4/py-kde/patches/patch-sip_kdeui_kfontdialog_sip
diff -N x11/kde4/py-kde/patches/patch-sip_kdeui_kfontdialog_sip
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ x11/kde4/py-kde/patches/patch-sip_kdeui_kfontdialog_sip 19 Feb 2018
15:04:08 -0000
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+Fixes a build failure with SIP 4.19.6 (possibly other versions > 4.19.2):
+sip: ::KFontChooser ctor argument 5 has an unsupported type for a Python
signature - provide a valid type, %MethodCode and a C++ signature
+Obtained from:
https://anonscm.debian.org/cgit/pkg-kde/kde-sc/pykde4.git/commit/debian/patches?id=9de587a159f47d30068c84127c06917594eaf2e0
+
+Index: sip/kdeui/kfontdialog.sip
+--- sip/kdeui/kfontdialog.sip.orig
++++ sip/kdeui/kfontdialog.sip
+@@ -28,7 +28,7 @@ class KFontDialog : KDialog
+
+
+ public:
+- explicit KFontDialog (QWidget* parent /TransferThis/ = 0,
const KFontChooser::DisplayFlags& flags = KFontChooser::NoDisplayFlags, const
QStringList& fontlist = QStringList(), Qt::CheckState* sizeIsRelativeState = 0)
[(QWidget* = 0, const KFontChooser::DisplayFlags& =
KFontChooser::NoDisplayFlags, const QStringList& = QStringList(),
Qt::CheckState* = 0)];
++ explicit KFontDialog (QWidget* parent /TransferThis/ = 0, const
KFontChooser::DisplayFlags& flags = KFontChooser::NoDisplayFlags, const
QStringList& fontlist = QStringList(), Qt::CheckState sizeIsRelativeState =
Qt::Unchecked) [(QWidget* = 0, const KFontChooser::DisplayFlags& =
KFontChooser::NoDisplayFlags, const QStringList& = QStringList(),
Qt::CheckState* = 0)];
+ %MethodCode
+ Py_BEGIN_ALLOW_THREADS
+ sipCpp= new sipKFontDialog (a0, *a1, *a2, &a3);
Index: x11/py-qt4/Makefile
===================================================================
RCS file: /cvs/ports/x11/py-qt4/Makefile,v
retrieving revision 1.51
diff -u -p -u -p -r1.51 Makefile
--- x11/py-qt4/Makefile 12 Nov 2017 15:17:47 -0000 1.51
+++ x11/py-qt4/Makefile 19 Feb 2018 15:04:08 -0000
@@ -6,18 +6,16 @@ COMMENT-docs= py-qt4 documentation
# XXX Be particularly careful when testing updates.
# API breaks often - do runtime tests, not just build tests.
-V= 4.12
+V= 4.12.1
DISTNAME= PyQt4_gpl_x11-${V}
PKGNAME= py-qt4-${V}
PKGNAME-main= py-qt4-${V}
PKGNAME-docs= py-qt4-docs-${V}
EPOCH= 0
-REVISION-docs= 0
-REVISION-main= 1
CATEGORIES= x11 devel
-HOMEPAGE= http://www.riverbankcomputing.co.uk/software/pyqt/intro
+HOMEPAGE= https://www.riverbankcomputing.co.uk/software/pyqt/intro
# GPLv2 or v3 with exceptions for use with certain named open-source licenses
PERMIT_PACKAGE_CDROM= Yes
Index: x11/py-qt4/distinfo
===================================================================
RCS file: /cvs/ports/x11/py-qt4/distinfo,v
retrieving revision 1.18
diff -u -p -u -p -r1.18 distinfo
--- x11/py-qt4/distinfo 17 Jul 2017 08:34:39 -0000 1.18
+++ x11/py-qt4/distinfo 19 Feb 2018 15:04:08 -0000
@@ -1,2 +1,2 @@
-SHA256 (PyQt4_gpl_x11-4.12.tar.gz) =
PB1LVTFK2z4RMt6Pwqku7SFtN+WKzu1BKU28ohDKiNs=
-SIZE (PyQt4_gpl_x11-4.12.tar.gz) = 11325395
+SHA256 (PyQt4_gpl_x11-4.12.1.tar.gz) =
RdckRhrliwGbm+lQdsoH4hLrcwhK7JEluyVIJcOgU4M=
+SIZE (PyQt4_gpl_x11-4.12.1.tar.gz) = 11328010
Index: x11/py-qt4/patches/patch-configure_py
===================================================================
RCS file: /cvs/ports/x11/py-qt4/patches/patch-configure_py,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 patch-configure_py
--- x11/py-qt4/patches/patch-configure_py 26 Jun 2015 13:03:59 -0000
1.13
+++ x11/py-qt4/patches/patch-configure_py 19 Feb 2018 15:04:08 -0000
@@ -1,6 +1,7 @@
$OpenBSD: patch-configure_py,v 1.13 2015/06/26 13:03:59 ajacoutot Exp $
---- configure.py.orig Thu Jun 11 17:28:16 2015
-+++ configure.py Fri Jun 26 14:34:11 2015
+Index: configure.py
+--- configure.py.orig
++++ configure.py
@@ -1159,6 +1159,17 @@ def run_command(cmd, envvars=None):
cmd is the command to run.
@@ -19,7 +20,7 @@ $OpenBSD: patch-configure_py,v 1.13 2015
if opts.verbose:
sys.stdout.write(cmd + "\n")
-@@ -1767,7 +1778,7 @@ Type 'no' to decline the terms of the license.
+@@ -1771,7 +1782,7 @@ Type 'no' to decline the terms of the license.
sys.stdout.flush()
try:
Index: x11/py-qt5/Makefile
===================================================================
RCS file: /cvs/ports/x11/py-qt5/Makefile,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 Makefile
--- x11/py-qt5/Makefile 16 Nov 2017 22:23:42 -0000 1.14
+++ x11/py-qt5/Makefile 19 Feb 2018 15:04:08 -0000
@@ -2,14 +2,13 @@
COMMENT = python Qt5 bindings
-V= 5.9
+V= 5.9.2
DISTNAME= PyQt5_gpl-${V}
PKGNAME= py-qt5-${V}
-REVISION = 2
CATEGORIES= x11 devel
-HOMEPAGE= http://www.riverbankcomputing.co.uk/software/pyqt/intro
+HOMEPAGE= https://www.riverbankcomputing.co.uk/software/pyqt/intro
MAINTAINER= KDE porting team <openbsd-...@googlegroups.com>
# GPLv3 with exceptions for use with certain named open-source licenses
@@ -29,7 +28,7 @@ FLAVORS = python3
FLAVOR ?=
BUILD_DEPENDS= ${RUN_DEPENDS}
-RUN_DEPENDS= devel/py-sip${MODPY_FLAVOR}>=4.19.1 \
+RUN_DEPENDS= devel/py-sip${MODPY_FLAVOR}>=4.19.7 \
x11/dbus-python${MODPY_FLAVOR}
LIB_DEPENDS= ${MODPY_LIB_DEPENDS} \
x11/qt5/qtconnectivity \
Index: x11/py-qt5/distinfo
===================================================================
RCS file: /cvs/ports/x11/py-qt5/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- x11/py-qt5/distinfo 17 Jul 2017 08:34:39 -0000 1.3
+++ x11/py-qt5/distinfo 19 Feb 2018 15:04:08 -0000
@@ -1,2 +1,2 @@
-SHA256 (PyQt5_gpl-5.9.tar.gz) = qw55mc8gLMcpYseK7+Rh0WSXs8GoKCq5Zq2QtssnEJY=
-SIZE (PyQt5_gpl-5.9.tar.gz) = 3097557
+SHA256 (PyQt5_gpl-5.9.2.tar.gz) = wZDaxZjJewETyl56N8ccYj8C0dcTCIrd+srErPpLg5Q=
+SIZE (PyQt5_gpl-5.9.2.tar.gz) = 3102848
Index: x11/py-qt5/patches/patch-configure_py
===================================================================
RCS file: /cvs/ports/x11/py-qt5/patches/patch-configure_py,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-configure_py
--- x11/py-qt5/patches/patch-configure_py 30 Aug 2016 16:02:17 -0000
1.2
+++ x11/py-qt5/patches/patch-configure_py 19 Feb 2018 15:04:08 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-configure_py,v 1.2 2016/08/30 16:02:17 landry Exp $
---- configure.py.orig Mon Jul 25 15:55:28 2016
-+++ configure.py Tue Aug 9 07:49:53 2016
-@@ -1984,7 +1984,18 @@ def run_command(cmd, verbose):
+Index: configure.py
+--- configure.py.orig
++++ configure.py
+@@ -1991,7 +1991,18 @@ def run_command(cmd, verbose):
""" Run a command and display the output if requested. cmd is the command
to run. verbose is set if the output is to be displayed.
"""
@@ -20,7 +21,7 @@ $OpenBSD: patch-configure_py,v 1.2 2016/
if verbose:
sys.stdout.write(cmd + "\n")
-@@ -2689,7 +2700,7 @@ Type 'no' to decline the terms of the license.
+@@ -2733,7 +2744,7 @@ Type 'no' to decline the terms of the license.
sys.stdout.flush()
try:
Index: x11/py-qt5/pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/py-qt5/pkg/PLIST,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 PLIST
--- x11/py-qt5/pkg/PLIST 17 Jul 2017 08:34:39 -0000 1.1
+++ x11/py-qt5/pkg/PLIST 19 Feb 2018 15:04:08 -0000
@@ -5,71 +5,71 @@ bin/pyrcc5${MODPY_BIN_SUFFIX}
bin/pyuic5${MODPY_BIN_SUFFIX}
lib/python${MODPY_VERSION}/site-packages/PyQt5/
lib/python${MODPY_VERSION}/site-packages/PyQt5/Qt.so
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/QtBluetooth.pyi
+lib/python${MODPY_VERSION}/site-packages/PyQt5/QtBluetooth.pyi
lib/python${MODPY_VERSION}/site-packages/PyQt5/QtBluetooth.so
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/QtCore.pyi
+lib/python${MODPY_VERSION}/site-packages/PyQt5/QtCore.pyi
lib/python${MODPY_VERSION}/site-packages/PyQt5/QtCore.so
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/QtDBus.pyi
+lib/python${MODPY_VERSION}/site-packages/PyQt5/QtDBus.pyi
lib/python${MODPY_VERSION}/site-packages/PyQt5/QtDBus.so
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/QtDesigner.pyi
+lib/python${MODPY_VERSION}/site-packages/PyQt5/QtDesigner.pyi
lib/python${MODPY_VERSION}/site-packages/PyQt5/QtDesigner.so
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/QtGui.pyi
+lib/python${MODPY_VERSION}/site-packages/PyQt5/QtGui.pyi
lib/python${MODPY_VERSION}/site-packages/PyQt5/QtGui.so
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/QtHelp.pyi
+lib/python${MODPY_VERSION}/site-packages/PyQt5/QtHelp.pyi
lib/python${MODPY_VERSION}/site-packages/PyQt5/QtHelp.so
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/QtLocation.pyi
+lib/python${MODPY_VERSION}/site-packages/PyQt5/QtLocation.pyi
lib/python${MODPY_VERSION}/site-packages/PyQt5/QtLocation.so
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/QtMultimedia.pyi
+lib/python${MODPY_VERSION}/site-packages/PyQt5/QtMultimedia.pyi
lib/python${MODPY_VERSION}/site-packages/PyQt5/QtMultimedia.so
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/QtMultimediaWidgets.pyi
+lib/python${MODPY_VERSION}/site-packages/PyQt5/QtMultimediaWidgets.pyi
lib/python${MODPY_VERSION}/site-packages/PyQt5/QtMultimediaWidgets.so
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/QtNetwork.pyi
+lib/python${MODPY_VERSION}/site-packages/PyQt5/QtNetwork.pyi
lib/python${MODPY_VERSION}/site-packages/PyQt5/QtNetwork.so
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/QtNfc.pyi
+lib/python${MODPY_VERSION}/site-packages/PyQt5/QtNfc.pyi
lib/python${MODPY_VERSION}/site-packages/PyQt5/QtNfc.so
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/QtOpenGL.pyi
+lib/python${MODPY_VERSION}/site-packages/PyQt5/QtOpenGL.pyi
lib/python${MODPY_VERSION}/site-packages/PyQt5/QtOpenGL.so
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/QtPositioning.pyi
+lib/python${MODPY_VERSION}/site-packages/PyQt5/QtPositioning.pyi
lib/python${MODPY_VERSION}/site-packages/PyQt5/QtPositioning.so
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/QtPrintSupport.pyi
+lib/python${MODPY_VERSION}/site-packages/PyQt5/QtPrintSupport.pyi
lib/python${MODPY_VERSION}/site-packages/PyQt5/QtPrintSupport.so
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/QtQml.pyi
+lib/python${MODPY_VERSION}/site-packages/PyQt5/QtQml.pyi
lib/python${MODPY_VERSION}/site-packages/PyQt5/QtQml.so
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/QtQuick.pyi
+lib/python${MODPY_VERSION}/site-packages/PyQt5/QtQuick.pyi
lib/python${MODPY_VERSION}/site-packages/PyQt5/QtQuick.so
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/QtQuickWidgets.pyi
+lib/python${MODPY_VERSION}/site-packages/PyQt5/QtQuickWidgets.pyi
lib/python${MODPY_VERSION}/site-packages/PyQt5/QtQuickWidgets.so
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/QtSensors.pyi
+lib/python${MODPY_VERSION}/site-packages/PyQt5/QtSensors.pyi
lib/python${MODPY_VERSION}/site-packages/PyQt5/QtSensors.so
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/QtSerialPort.pyi
+lib/python${MODPY_VERSION}/site-packages/PyQt5/QtSerialPort.pyi
lib/python${MODPY_VERSION}/site-packages/PyQt5/QtSerialPort.so
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/QtSql.pyi
+lib/python${MODPY_VERSION}/site-packages/PyQt5/QtSql.pyi
lib/python${MODPY_VERSION}/site-packages/PyQt5/QtSql.so
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/QtSvg.pyi
+lib/python${MODPY_VERSION}/site-packages/PyQt5/QtSvg.pyi
lib/python${MODPY_VERSION}/site-packages/PyQt5/QtSvg.so
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/QtTest.pyi
+lib/python${MODPY_VERSION}/site-packages/PyQt5/QtTest.pyi
lib/python${MODPY_VERSION}/site-packages/PyQt5/QtTest.so
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/QtWebChannel.pyi
+lib/python${MODPY_VERSION}/site-packages/PyQt5/QtWebChannel.pyi
lib/python${MODPY_VERSION}/site-packages/PyQt5/QtWebChannel.so
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/QtWebKit.pyi
+lib/python${MODPY_VERSION}/site-packages/PyQt5/QtWebKit.pyi
lib/python${MODPY_VERSION}/site-packages/PyQt5/QtWebKit.so
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/QtWebKitWidgets.pyi
+lib/python${MODPY_VERSION}/site-packages/PyQt5/QtWebKitWidgets.pyi
lib/python${MODPY_VERSION}/site-packages/PyQt5/QtWebKitWidgets.so
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/QtWebSockets.pyi
+lib/python${MODPY_VERSION}/site-packages/PyQt5/QtWebSockets.pyi
lib/python${MODPY_VERSION}/site-packages/PyQt5/QtWebSockets.so
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/QtWidgets.pyi
+lib/python${MODPY_VERSION}/site-packages/PyQt5/QtWidgets.pyi
lib/python${MODPY_VERSION}/site-packages/PyQt5/QtWidgets.so
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/QtX11Extras.pyi
+lib/python${MODPY_VERSION}/site-packages/PyQt5/QtX11Extras.pyi
lib/python${MODPY_VERSION}/site-packages/PyQt5/QtX11Extras.so
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/QtXml.pyi
+lib/python${MODPY_VERSION}/site-packages/PyQt5/QtXml.pyi
lib/python${MODPY_VERSION}/site-packages/PyQt5/QtXml.so
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/QtXmlPatterns.pyi
+lib/python${MODPY_VERSION}/site-packages/PyQt5/QtXmlPatterns.pyi
lib/python${MODPY_VERSION}/site-packages/PyQt5/QtXmlPatterns.so
lib/python${MODPY_VERSION}/site-packages/PyQt5/_QOpenGLFunctions_2_0.so
lib/python${MODPY_VERSION}/site-packages/PyQt5/_QOpenGLFunctions_2_1.so
lib/python${MODPY_VERSION}/site-packages/PyQt5/_QOpenGLFunctions_4_1_Core.so
lib/python${MODPY_VERSION}/site-packages/PyQt5/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/PyQt5/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/PyQt5/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/PyQt5/${MODPY_PYCACHE}pylupdate_main.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/PyQt5/${MODPY_PYCACHE}pyrcc_main.${MODPY_PYC_MAGIC_TAG}pyc
@@ -80,7 +80,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/PyQt5/uic/
lib/python${MODPY_VERSION}/site-packages/PyQt5/uic/Compiler/
lib/python${MODPY_VERSION}/site-packages/PyQt5/uic/Compiler/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/uic/Compiler/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/PyQt5/uic/Compiler/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/PyQt5/uic/Compiler/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/PyQt5/uic/Compiler/${MODPY_PYCACHE}compiler.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/PyQt5/uic/Compiler/${MODPY_PYCACHE}indenter.${MODPY_PYC_MAGIC_TAG}pyc
@@ -96,14 +96,14 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/PyQt5/uic/Compiler/qtproxies.py
lib/python${MODPY_VERSION}/site-packages/PyQt5/uic/Loader/
lib/python${MODPY_VERSION}/site-packages/PyQt5/uic/Loader/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/uic/Loader/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/PyQt5/uic/Loader/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/PyQt5/uic/Loader/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/PyQt5/uic/Loader/${MODPY_PYCACHE}loader.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/PyQt5/uic/Loader/${MODPY_PYCACHE}qobjectcreator.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/PyQt5/uic/Loader/loader.py
lib/python${MODPY_VERSION}/site-packages/PyQt5/uic/Loader/qobjectcreator.py
lib/python${MODPY_VERSION}/site-packages/PyQt5/uic/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/uic/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/PyQt5/uic/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/PyQt5/uic/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/PyQt5/uic/${MODPY_PYCACHE}driver.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/PyQt5/uic/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
@@ -118,7 +118,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/PyQt5/uic/objcreator.py
lib/python${MODPY_VERSION}/site-packages/PyQt5/uic/port_v${MODPY_MAJOR_VERSION}/
lib/python${MODPY_VERSION}/site-packages/PyQt5/uic/port_v${MODPY_MAJOR_VERSION}/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/uic/port_v3/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/PyQt5/uic/port_v${MODPY_MAJOR_VERSION}/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/PyQt5/uic/port_v${MODPY_MAJOR_VERSION}/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/PyQt5/uic/port_v${MODPY_MAJOR_VERSION}/${MODPY_PYCACHE}as_string.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/PyQt5/uic/port_v${MODPY_MAJOR_VERSION}/${MODPY_PYCACHE}ascii_upper.${MODPY_PYC_MAGIC_TAG}pyc
@@ -132,7 +132,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/PyQt5/uic/pyuic.py
lib/python${MODPY_VERSION}/site-packages/PyQt5/uic/uiparser.py
lib/python${MODPY_VERSION}/site-packages/PyQt5/uic/widget-plugins/
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/PyQt5/uic/widget-plugins/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/PyQt5/uic/widget-plugins/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/PyQt5/uic/widget-plugins/${MODPY_PYCACHE}qaxcontainer.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/PyQt5/uic/widget-plugins/${MODPY_PYCACHE}qscintilla.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/PyQt5/uic/widget-plugins/${MODPY_PYCACHE}qtcharts.${MODPY_PYC_MAGIC_TAG}pyc
@@ -167,6 +167,10 @@ share/sip/PyQt5${MODPY_BIN_SUFFIX}/QAxCo
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QAxContainer/qaxbase.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QAxContainer/qaxobject.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QAxContainer/qaxwidget.sip
+share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtAndroidExtras/
+share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtAndroidExtras/QtAndroidExtrasmod.sip
+share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtAndroidExtras/qandroidjniobject.sip
+share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtAndroidExtras/qtandroid.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtBluetooth/
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtBluetooth/QtBluetoothmod.sip
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtBluetooth/qbluetooth.sip
