PyQt: Unconditionally install the .pyi files

r460809 started installing .pyi with the %%PYTHON3%% substitution in the
plists. Support for .pyi files was added in Python 3.5, and PyQt's configure.py
only installs the files on Python >= 3.5.

This patch removes the version checks from configure.py (the files are just
unused in earlier Python versions), as it is easier than checking Python 3's
version in each PyQt port's Makefile (or to add the logic to Mk/Uses/pyqt.mk).

PR:		225773
Reviewed by:	tcberner
Differential Revision:	https://reviews.freebsd.org/D14361

44 files changed, 76 insertions, 47 deletions

diff --git a/comms/py-qt5-serialport/Makefile b/comms/py-qt5-serialport/Makefile
index 5697103aa502..1f691009f80d 100644
--- a/comms/py-qt5-serialport/Makefile
+++ b/comms/py-qt5-serialport/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	serialport
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	comms devel python
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/comms/py-qt5-serialport/pkg-plist b/comms/py-qt5-serialport/pkg-plist
index 8275e4c5f6d2..5ef09db64906 100644
--- a/comms/py-qt5-serialport/pkg-plist
+++ b/comms/py-qt5-serialport/pkg-plist
@@ -1,5 +1,5 @@
 %%PYTHON_SITELIBDIR%%/PyQt5/QtSerialPort.so
-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PyQt5/QtSerialPort.pyi
+%%PYTHON_SITELIBDIR%%/PyQt5/QtSerialPort.pyi
 %%PYQT_SIPDIR%%/QtSerialPort/QtSerialPortmod.sip
 %%PYQT_SIPDIR%%/QtSerialPort/qserialport.sip
 %%PYQT_SIPDIR%%/QtSerialPort/qserialportinfo.sip
diff --git a/databases/py-qt5-sql/Makefile b/databases/py-qt5-sql/Makefile
index 8eb60c7e7f80..d39a6a28458d 100644
--- a/databases/py-qt5-sql/Makefile
+++ b/databases/py-qt5-sql/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	sql
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases devel python
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/databases/py-qt5-sql/pkg-plist b/databases/py-qt5-sql/pkg-plist
index fe74c3995eaf..970c8d5f96d2 100644
--- a/databases/py-qt5-sql/pkg-plist
+++ b/databases/py-qt5-sql/pkg-plist
@@ -1,5 +1,5 @@
 %%PYTHON_SITELIBDIR%%/PyQt5/QtSql.so
-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PyQt5/QtSql.pyi
+%%PYTHON_SITELIBDIR%%/PyQt5/QtSql.pyi
 %%PYQT_SIPDIR%%/QtSql/QtSqlmod.sip
 %%PYQT_SIPDIR%%/QtSql/qsql.sip
 %%PYQT_SIPDIR%%/QtSql/qsqldatabase.sip
diff --git a/devel/py-qt5-core/Makefile b/devel/py-qt5-core/Makefile
index 3201f0ca8f55..c8db96c45b95 100644
--- a/devel/py-qt5-core/Makefile
+++ b/devel/py-qt5-core/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	core
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/devel/py-qt5-core/files/patch-configure.py b/devel/py-qt5-core/files/patch-configure.py
index 92757330e69a..7ed553fe6fa0 100644
--- a/devel/py-qt5-core/files/patch-configure.py
+++ b/devel/py-qt5-core/files/patch-configure.py
@@ -10,6 +10,8 @@ by pkg-config --cflags dbus-1 .
 Also fixes the build of www/py-qt5-webengine@py36 by adding printsupport to
 QtWebEngineWidgets.
 
+Also causes .pyi files to be installed regardless of the Python version to
+simplify plist handling.
 --- configure.py.orig	2017-11-23 14:44:03 UTC
 +++ configure.py
 @@ -98,7 +98,7 @@ MODULE_METADATA = {
@@ -39,7 +41,7 @@ QtWebEngineWidgets.
              self.prot_is_public = True
  
          self.vend_inc_dir = self.py_venv_inc_dir
-@@ -1450,8 +1450,9 @@ def generate_makefiles(target_config, ve
+@@ -1450,8 +1450,9 @@ def generate_makefiles(target_config, verbose, parts, 
  
      # Add the internal modules if they are required.
      if not target_config.no_tools:
@@ -51,7 +53,7 @@ QtWebEngineWidgets.
  
      for mname in pyqt_modules:
          metadata = MODULE_METADATA[mname]
-@@ -1493,20 +1494,17 @@ def generate_makefiles(target_config, ve
+@@ -1493,20 +1494,17 @@ def generate_makefiles(target_config, verbose, parts, 
  
      f.close()
  
@@ -81,7 +83,7 @@ QtWebEngineWidgets.
                  generate_tool_wrapper(target_config, 'pyuic5',
                          'PyQt5.uic.pyuic')))
  
-@@ -1524,23 +1522,6 @@ def generate_makefiles(target_config, ve
+@@ -1524,23 +1522,6 @@ def generate_makefiles(target_config, verbose, parts, 
                      source_path('examples', 'quick', 'tutorials', 'extending',
                              'chapter6-plugins'))
  
@@ -105,7 +107,7 @@ QtWebEngineWidgets.
      # Generate the Python dbus module.
      if target_config.pydbus_module_dir != '':
          mname = 'dbus'
-@@ -1568,14 +1549,18 @@ def generate_makefiles(target_config, ve
+@@ -1568,14 +1549,18 @@ def generate_makefiles(target_config, verbose, parts, 
      out_f.write('''TEMPLATE = subdirs
  CONFIG += ordered nostrip
  SUBDIRS = %s
@@ -136,6 +138,15 @@ QtWebEngineWidgets.
              if metadata.public and mname != 'Qt':
                  sip_files = matching_files(source_path('sip', mname, '*.sip'))
  
+@@ -1618,7 +1605,7 @@ INSTALLS += sip%s
+ ))
+ 
+     # Install the stub files.
+-    if target_config.py_version >= 0x030500 and target_config.pyqt_stubs_dir:
++    if target_config.pyqt_stubs_dir:
+         out_f.write('''
+ pep484_stubs.files = %s Qt.pyi
+ pep484_stubs.path = %s
 @@ -1628,11 +1615,12 @@ INSTALLS += pep484_stubs
  
      # Install the QScintilla .api file.
@@ -151,6 +162,24 @@ QtWebEngineWidgets.
  
      out_f.close()
  
+@@ -1864,7 +1852,7 @@ def inform_user(target_config, sip_version):
+                         os.path.join(
+                                 target_config.qsci_api_dir, 'api', 'python'))
+ 
+-    if target_config.py_version >= 0x030500 and target_config.pyqt_stubs_dir:
++    if target_config.pyqt_stubs_dir:
+         inform("The PyQt5 PEP 484 stub files will be installed in %s." %
+                 target_config.pyqt_stubs_dir)
+ 
+@@ -2431,7 +2419,7 @@ def generate_sip_module_code(target_config, verbose, p
+             argv.append('-a')
+             argv.append(mname + '.api')
+ 
+-        if target_config.py_version >= 0x030500 and target_config.pyqt_stubs_dir:
++        if target_config.pyqt_stubs_dir:
+             argv.append('-y')
+             argv.append(mname + '.pyi')
+ 
 @@ -2604,7 +2592,7 @@ target.files = $$PY_MODULE
      pro_lines.append('INSTALLS += target')
  
diff --git a/devel/py-qt5-core/pkg-plist b/devel/py-qt5-core/pkg-plist
index c6cf898a8ed2..263494e9be9c 100644
--- a/devel/py-qt5-core/pkg-plist
+++ b/devel/py-qt5-core/pkg-plist
@@ -3,7 +3,7 @@ bin/pyuic5
 %%PYTHON_SITELIBDIR%%/PyQt5/Qt.pyc
 %%PYTHON_SITELIBDIR%%/PyQt5/Qt.pyo
 %%PYTHON_SITELIBDIR%%/PyQt5/QtCore.so
-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PyQt5/QtCore.pyi
+%%PYTHON_SITELIBDIR%%/PyQt5/QtCore.pyi
 %%PYTHON_SITELIBDIR%%/PyQt5/__init__.py
 %%PYTHON_SITELIBDIR%%/PyQt5/__init__.pyc
 %%PYTHON_SITELIBDIR%%/PyQt5/__init__.pyo
diff --git a/devel/py-qt5-dbus/Makefile b/devel/py-qt5-dbus/Makefile
index 7b3a84071afc..17c521b45423 100644
--- a/devel/py-qt5-dbus/Makefile
+++ b/devel/py-qt5-dbus/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	dbus
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/devel/py-qt5-dbus/pkg-plist b/devel/py-qt5-dbus/pkg-plist
index 9a021f6cd50b..aff2cb6bfb44 100644
--- a/devel/py-qt5-dbus/pkg-plist
+++ b/devel/py-qt5-dbus/pkg-plist
@@ -1,5 +1,5 @@
 %%PYTHON_SITELIBDIR%%/PyQt5/QtDBus.so
-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PyQt5/QtDBus.pyi
+%%PYTHON_SITELIBDIR%%/PyQt5/QtDBus.pyi
 %%PYQT_SIPDIR%%/QtDBus/QtDBusmod.sip
 %%PYQT_SIPDIR%%/QtDBus/qdbusabstractadaptor.sip
 %%PYQT_SIPDIR%%/QtDBus/qdbusabstractinterface.sip
diff --git a/devel/py-qt5-designer/Makefile b/devel/py-qt5-designer/Makefile
index 9be0e5395911..05a268894ebd 100644
--- a/devel/py-qt5-designer/Makefile
+++ b/devel/py-qt5-designer/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	designer
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/devel/py-qt5-designer/pkg-plist b/devel/py-qt5-designer/pkg-plist
index 082ffe8f69ec..c5e569942d12 100644
--- a/devel/py-qt5-designer/pkg-plist
+++ b/devel/py-qt5-designer/pkg-plist
@@ -1,5 +1,5 @@
 %%PYTHON_SITELIBDIR%%/PyQt5/QtDesigner.so
-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PyQt5/QtDesigner.pyi
+%%PYTHON_SITELIBDIR%%/PyQt5/QtDesigner.pyi
 %%PYQT_SIPDIR%%/QtDesigner/QtDesignermod.sip
 %%PYQT_SIPDIR%%/QtDesigner/abstractactioneditor.sip
 %%PYQT_SIPDIR%%/QtDesigner/abstractformbuilder.sip
diff --git a/devel/py-qt5-help/Makefile b/devel/py-qt5-help/Makefile
index 981dad415073..7e0bd803a18f 100644
--- a/devel/py-qt5-help/Makefile
+++ b/devel/py-qt5-help/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	help
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel python
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/devel/py-qt5-help/pkg-plist b/devel/py-qt5-help/pkg-plist
index d07043fa46b9..4ec7063ed9db 100644
--- a/devel/py-qt5-help/pkg-plist
+++ b/devel/py-qt5-help/pkg-plist
@@ -1,5 +1,5 @@
 %%PYTHON_SITELIBDIR%%/PyQt5/QtHelp.so
-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PyQt5/QtHelp.pyi
+%%PYTHON_SITELIBDIR%%/PyQt5/QtHelp.pyi
 %%PYQT_SIPDIR%%/QtHelp/QtHelpmod.sip
 %%PYQT_SIPDIR%%/QtHelp/qhelpcontentwidget.sip
 %%PYQT_SIPDIR%%/QtHelp/qhelpengine.sip
diff --git a/devel/py-qt5-qscintilla2/Makefile b/devel/py-qt5-qscintilla2/Makefile
index ec06716f2a6e..930c92ae68ae 100644
--- a/devel/py-qt5-qscintilla2/Makefile
+++ b/devel/py-qt5-qscintilla2/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	qscintilla2
 PORTVERSION=	${QSCI2_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	${MASTER_SITES_QSCI2}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}qt5-
diff --git a/devel/py-qt5-test/Makefile b/devel/py-qt5-test/Makefile
index f3298a6c6bf9..f465a9857960 100644
--- a/devel/py-qt5-test/Makefile
+++ b/devel/py-qt5-test/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	test
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/devel/py-qt5-test/pkg-plist b/devel/py-qt5-test/pkg-plist
index ccf636ef8ad0..fc7e99ee524e 100644
--- a/devel/py-qt5-test/pkg-plist
+++ b/devel/py-qt5-test/pkg-plist
@@ -1,5 +1,5 @@
 %%PYTHON_SITELIBDIR%%/PyQt5/QtTest.so
-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PyQt5/QtTest.pyi
+%%PYTHON_SITELIBDIR%%/PyQt5/QtTest.pyi
 %%PYQT_SIPDIR%%/QtTest/QtTestmod.sip
 %%PYQT_SIPDIR%%/QtTest/qsignalspy.sip
 %%PYQT_SIPDIR%%/QtTest/qtestcase.sip
diff --git a/graphics/py-qt5-svg/Makefile b/graphics/py-qt5-svg/Makefile
index 863e8de197c1..036d80c8743e 100644
--- a/graphics/py-qt5-svg/Makefile
+++ b/graphics/py-qt5-svg/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	svg
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics devel python
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/graphics/py-qt5-svg/pkg-plist b/graphics/py-qt5-svg/pkg-plist
index adb7fc0ff9ee..176cad3c2bd4 100644
--- a/graphics/py-qt5-svg/pkg-plist
+++ b/graphics/py-qt5-svg/pkg-plist
@@ -1,5 +1,5 @@
 %%PYTHON_SITELIBDIR%%/PyQt5/QtSvg.so
-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PyQt5/QtSvg.pyi
+%%PYTHON_SITELIBDIR%%/PyQt5/QtSvg.pyi
 %%PYQT_SIPDIR%%/QtSvg/QtSvgmod.sip
 %%PYQT_SIPDIR%%/QtSvg/qgraphicssvgitem.sip
 %%PYQT_SIPDIR%%/QtSvg/qsvggenerator.sip
diff --git a/lang/py-qt5-qml/Makefile b/lang/py-qt5-qml/Makefile
index 380ffed63fb5..164a84a13831 100644
--- a/lang/py-qt5-qml/Makefile
+++ b/lang/py-qt5-qml/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	qml
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang devel python
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/lang/py-qt5-qml/pkg-plist b/lang/py-qt5-qml/pkg-plist
index 5514d7ba3a73..17d9aee3966b 100644
--- a/lang/py-qt5-qml/pkg-plist
+++ b/lang/py-qt5-qml/pkg-plist
@@ -1,5 +1,5 @@
 %%PYTHON_SITELIBDIR%%/PyQt5/QtQml.so
-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PyQt5/QtQml.pyi
+%%PYTHON_SITELIBDIR%%/PyQt5/QtQml.pyi
 %%QT_PLUGINDIR%%/PyQt5/libpyqt5qmlplugin.so
 %%PYQT_SIPDIR%%/QtQml/QtQmlmod.sip
 %%PYQT_SIPDIR%%/QtQml/qjsengine.sip
diff --git a/multimedia/py-qt5-multimedia/Makefile b/multimedia/py-qt5-multimedia/Makefile
index 11fa656dd2aa..6c4fdd38a170 100644
--- a/multimedia/py-qt5-multimedia/Makefile
+++ b/multimedia/py-qt5-multimedia/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	multimedia
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia devel python
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/multimedia/py-qt5-multimedia/pkg-plist b/multimedia/py-qt5-multimedia/pkg-plist
index 3b6d619687e5..bc1739259c0d 100644
--- a/multimedia/py-qt5-multimedia/pkg-plist
+++ b/multimedia/py-qt5-multimedia/pkg-plist
@@ -1,5 +1,5 @@
 %%PYTHON_SITELIBDIR%%/PyQt5/QtMultimedia.so
-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PyQt5/QtMultimedia.pyi
+%%PYTHON_SITELIBDIR%%/PyQt5/QtMultimedia.pyi
 %%PYQT_SIPDIR%%/QtMultimedia/QtMultimediamod.sip
 %%PYQT_SIPDIR%%/QtMultimedia/qabstractvideobuffer.sip
 %%PYQT_SIPDIR%%/QtMultimedia/qabstractvideofilter.sip
diff --git a/multimedia/py-qt5-multimediawidgets/Makefile b/multimedia/py-qt5-multimediawidgets/Makefile
index 24f22e76645b..e4b125d317c8 100644
--- a/multimedia/py-qt5-multimediawidgets/Makefile
+++ b/multimedia/py-qt5-multimediawidgets/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	multimediawidgets
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia devel python
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/multimedia/py-qt5-multimediawidgets/pkg-plist b/multimedia/py-qt5-multimediawidgets/pkg-plist
index 598659403d9f..5bc517fcd2f3 100644
--- a/multimedia/py-qt5-multimediawidgets/pkg-plist
+++ b/multimedia/py-qt5-multimediawidgets/pkg-plist
@@ -1,5 +1,5 @@
 %%PYTHON_SITELIBDIR%%/PyQt5/QtMultimediaWidgets.so
-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PyQt5/QtMultimediaWidgets.pyi
+%%PYTHON_SITELIBDIR%%/PyQt5/QtMultimediaWidgets.pyi
 %%PYQT_SIPDIR%%/QtMultimediaWidgets/QtMultimediaWidgetsmod.sip
 %%PYQT_SIPDIR%%/QtMultimediaWidgets/qcameraviewfinder.sip
 %%PYQT_SIPDIR%%/QtMultimediaWidgets/qgraphicsvideoitem.sip
diff --git a/net/py-qt5-network/Makefile b/net/py-qt5-network/Makefile
index 116711c9d074..2f1e2f6d1c01 100644
--- a/net/py-qt5-network/Makefile
+++ b/net/py-qt5-network/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	network
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net devel python
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/net/py-qt5-network/pkg-plist b/net/py-qt5-network/pkg-plist
index 37071bf2cf9d..72000fa0bcba 100644
--- a/net/py-qt5-network/pkg-plist
+++ b/net/py-qt5-network/pkg-plist
@@ -1,5 +1,5 @@
 %%PYTHON_SITELIBDIR%%/PyQt5/QtNetwork.so
-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PyQt5/QtNetwork.pyi
+%%PYTHON_SITELIBDIR%%/PyQt5/QtNetwork.pyi
 %%PYQT_SIPDIR%%/QtNetwork/QtNetworkmod.sip
 %%PYQT_SIPDIR%%/QtNetwork/qabstractnetworkcache.sip
 %%PYQT_SIPDIR%%/QtNetwork/qabstractsocket.sip
diff --git a/print/py-qt5-printsupport/Makefile b/print/py-qt5-printsupport/Makefile
index 730f77f2f4c4..7853aa6a3885 100644
--- a/print/py-qt5-printsupport/Makefile
+++ b/print/py-qt5-printsupport/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	printsupport
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print python
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/print/py-qt5-printsupport/pkg-plist b/print/py-qt5-printsupport/pkg-plist
index 55b569c31fc0..5c9854802759 100644
--- a/print/py-qt5-printsupport/pkg-plist
+++ b/print/py-qt5-printsupport/pkg-plist
@@ -1,5 +1,5 @@
 %%PYTHON_SITELIBDIR%%/PyQt5/QtPrintSupport.so
-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PyQt5/QtPrintSupport.pyi
+%%PYTHON_SITELIBDIR%%/PyQt5/QtPrintSupport.pyi
 %%PYQT_SIPDIR%%/QtPrintSupport/QtPrintSupportmod.sip
 %%PYQT_SIPDIR%%/QtPrintSupport/qabstractprintdialog.sip
 %%PYQT_SIPDIR%%/QtPrintSupport/qpagesetupdialog.sip
diff --git a/textproc/py-qt5-xml/Makefile b/textproc/py-qt5-xml/Makefile
index 2783a0b6bb3a..88b737a03994 100644
--- a/textproc/py-qt5-xml/Makefile
+++ b/textproc/py-qt5-xml/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	xml
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc devel python
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/textproc/py-qt5-xml/pkg-plist b/textproc/py-qt5-xml/pkg-plist
index 35eb25e1a3e4..e606a8e1869a 100644
--- a/textproc/py-qt5-xml/pkg-plist
+++ b/textproc/py-qt5-xml/pkg-plist
@@ -1,7 +1,7 @@
 bin/pylupdate5
 bin/pyrcc5
 %%PYTHON_SITELIBDIR%%/PyQt5/QtXml.so
-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PyQt5/QtXml.pyi
+%%PYTHON_SITELIBDIR%%/PyQt5/QtXml.pyi
 %%PYTHON_SITELIBDIR%%/PyQt5/pylupdate.so
 %%PYTHON_SITELIBDIR%%/PyQt5/pylupdate_main.py
 %%PYTHON_SITELIBDIR%%/PyQt5/pyrcc.so
diff --git a/textproc/py-qt5-xmlpatterns/Makefile b/textproc/py-qt5-xmlpatterns/Makefile
index c34693371fab..7d3e6fa24ffd 100644
--- a/textproc/py-qt5-xmlpatterns/Makefile
+++ b/textproc/py-qt5-xmlpatterns/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	xmlpatterns
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc devel python
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/textproc/py-qt5-xmlpatterns/pkg-plist b/textproc/py-qt5-xmlpatterns/pkg-plist
index a1946d9b6fdd..c12bac01f0ef 100644
--- a/textproc/py-qt5-xmlpatterns/pkg-plist
+++ b/textproc/py-qt5-xmlpatterns/pkg-plist
@@ -1,5 +1,5 @@
 %%PYTHON_SITELIBDIR%%/PyQt5/QtXmlPatterns.so
-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PyQt5/QtXmlPatterns.pyi
+%%PYTHON_SITELIBDIR%%/PyQt5/QtXmlPatterns.pyi
 %%PYQT_SIPDIR%%/QtXmlPatterns/QtXmlPatternsmod.sip
 %%PYQT_SIPDIR%%/QtXmlPatterns/qabstractmessagehandler.sip
 %%PYQT_SIPDIR%%/QtXmlPatterns/qabstracturiresolver.sip
diff --git a/www/py-qt5-webkit/Makefile b/www/py-qt5-webkit/Makefile
index 021d74f513c7..370cab45eed3 100644
--- a/www/py-qt5-webkit/Makefile
+++ b/www/py-qt5-webkit/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	webkit
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www devel python
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/www/py-qt5-webkit/pkg-plist b/www/py-qt5-webkit/pkg-plist
index 45bea07009e2..32063932a360 100644
--- a/www/py-qt5-webkit/pkg-plist
+++ b/www/py-qt5-webkit/pkg-plist
@@ -1,5 +1,5 @@
 %%PYTHON_SITELIBDIR%%/PyQt5/QtWebKit.so
-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PyQt5/QtWebKit.pyi
+%%PYTHON_SITELIBDIR%%/PyQt5/QtWebKit.pyi
 %%PYQT_SIPDIR%%/QtWebKit/QtWebKitmod.sip
 %%PYQT_SIPDIR%%/QtWebKit/qwebdatabase.sip
 %%PYQT_SIPDIR%%/QtWebKit/qwebelement.sip
diff --git a/www/py-qt5-webkitwidgets/Makefile b/www/py-qt5-webkitwidgets/Makefile
index 713f2cf1892e..e1753aa0df06 100644
--- a/www/py-qt5-webkitwidgets/Makefile
+++ b/www/py-qt5-webkitwidgets/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	webkitwidgets
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www devel python
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/www/py-qt5-webkitwidgets/pkg-plist b/www/py-qt5-webkitwidgets/pkg-plist
index fbcc0b505bef..76fc914ad247 100644
--- a/www/py-qt5-webkitwidgets/pkg-plist
+++ b/www/py-qt5-webkitwidgets/pkg-plist
@@ -1,5 +1,5 @@
 %%PYTHON_SITELIBDIR%%/PyQt5/QtWebKitWidgets.so
-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PyQt5/QtWebKitWidgets.pyi
+%%PYTHON_SITELIBDIR%%/PyQt5/QtWebKitWidgets.pyi
 %%PYQT_SIPDIR%%/QtWebKitWidgets/QtWebKitWidgetsmod.sip
 %%PYQT_SIPDIR%%/QtWebKitWidgets/qgraphicswebview.sip
 %%PYQT_SIPDIR%%/QtWebKitWidgets/qwebframe.sip
diff --git a/x11-toolkits/py-qt5-gui/Makefile b/x11-toolkits/py-qt5-gui/Makefile
index 49e3ec542646..0450f2d2714d 100644
--- a/x11-toolkits/py-qt5-gui/Makefile
+++ b/x11-toolkits/py-qt5-gui/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	gui
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits devel python
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/x11-toolkits/py-qt5-gui/pkg-plist b/x11-toolkits/py-qt5-gui/pkg-plist
index b5564067ae99..a45373f23e45 100644
--- a/x11-toolkits/py-qt5-gui/pkg-plist
+++ b/x11-toolkits/py-qt5-gui/pkg-plist
@@ -1,5 +1,5 @@
 %%PYTHON_SITELIBDIR%%/PyQt5/QtGui.so
-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PyQt5/QtGui.pyi
+%%PYTHON_SITELIBDIR%%/PyQt5/QtGui.pyi
 %%PYQT_SIPDIR%%/QtGui/QtGuimod.sip
 %%PYQT_SIPDIR%%/QtGui/opengl_types.sip
 %%PYQT_SIPDIR%%/QtGui/qabstracttextdocumentlayout.sip
diff --git a/x11-toolkits/py-qt5-quick/Makefile b/x11-toolkits/py-qt5-quick/Makefile
index 9a11f7758d35..753c322afb2c 100644
--- a/x11-toolkits/py-qt5-quick/Makefile
+++ b/x11-toolkits/py-qt5-quick/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	quick
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits devel python
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/x11-toolkits/py-qt5-quick/pkg-plist b/x11-toolkits/py-qt5-quick/pkg-plist
index bafdbe3d5252..7caf3ab52f56 100644
--- a/x11-toolkits/py-qt5-quick/pkg-plist
+++ b/x11-toolkits/py-qt5-quick/pkg-plist
@@ -1,5 +1,5 @@
 %%PYTHON_SITELIBDIR%%/PyQt5/QtQuick.so
-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PyQt5/QtQuick.pyi
+%%PYTHON_SITELIBDIR%%/PyQt5/QtQuick.pyi
 %%PYQT_SIPDIR%%/QtQuick/QtQuickmod.sip
 %%PYQT_SIPDIR%%/QtQuick/qquickframebufferobject.sip
 %%PYQT_SIPDIR%%/QtQuick/qquickimageprovider.sip
diff --git a/x11-toolkits/py-qt5-widgets/Makefile b/x11-toolkits/py-qt5-widgets/Makefile
index 1bee75400a55..557858121e45 100644
--- a/x11-toolkits/py-qt5-widgets/Makefile
+++ b/x11-toolkits/py-qt5-widgets/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	widgets
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits devel python
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/x11-toolkits/py-qt5-widgets/pkg-plist b/x11-toolkits/py-qt5-widgets/pkg-plist
index 17ab7a9b7533..f35843e196d7 100644
--- a/x11-toolkits/py-qt5-widgets/pkg-plist
+++ b/x11-toolkits/py-qt5-widgets/pkg-plist
@@ -1,5 +1,5 @@
 %%PYTHON_SITELIBDIR%%/PyQt5/QtWidgets.so
-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PyQt5/QtWidgets.pyi
+%%PYTHON_SITELIBDIR%%/PyQt5/QtWidgets.pyi
 %%PYQT_SIPDIR%%/QtWidgets/QtWidgetsmod.sip
 %%PYQT_SIPDIR%%/QtWidgets/qabstractbutton.sip
 %%PYQT_SIPDIR%%/QtWidgets/qabstractitemdelegate.sip
diff --git a/x11/py-qt5-opengl/Makefile b/x11/py-qt5-opengl/Makefile
index b89bfed3c973..b203e287e80f 100644
--- a/x11/py-qt5-opengl/Makefile
+++ b/x11/py-qt5-opengl/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	opengl
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 devel python
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/x11/py-qt5-opengl/pkg-plist b/x11/py-qt5-opengl/pkg-plist
index fcba5e3f82a4..01722625d143 100644
--- a/x11/py-qt5-opengl/pkg-plist
+++ b/x11/py-qt5-opengl/pkg-plist
@@ -1,5 +1,5 @@
 %%PYTHON_SITELIBDIR%%/PyQt5/QtOpenGL.so
-%%PYTHON3%%%%PYTHON_SITELIBDIR%%/PyQt5/QtOpenGL.pyi
+%%PYTHON_SITELIBDIR%%/PyQt5/QtOpenGL.pyi
 %%PYQT_SIPDIR%%/QtOpenGL/QtOpenGLmod.sip
 %%PYQT_SIPDIR%%/QtOpenGL/qgl.sip
 %%API%%share/qt5/qsci/api/python/QtOpenGL.api