svn commit: r461841 - in head: comms/py-qt5-serialport databases/py-qt5-sql devel/py-qt5-core devel/py-qt5-core/files devel/py-qt5-dbus devel/py-qt5-designer devel/py-qt5-help devel/py-qt5-qscintil...

Wed Feb 14 21:30:20 UTC 2018

Author: rakuco
Date: Wed Feb 14 21:30:14 2018
New Revision: 461841
URL: https://svnweb.freebsd.org/changeset/ports/461841

Log:
  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

Modified:
  head/comms/py-qt5-serialport/Makefile
  head/comms/py-qt5-serialport/pkg-plist
  head/databases/py-qt5-sql/Makefile
  head/databases/py-qt5-sql/pkg-plist
  head/devel/py-qt5-core/Makefile
  head/devel/py-qt5-core/files/patch-configure.py
  head/devel/py-qt5-core/pkg-plist
  head/devel/py-qt5-dbus/Makefile
  head/devel/py-qt5-dbus/pkg-plist
  head/devel/py-qt5-designer/Makefile
  head/devel/py-qt5-designer/pkg-plist
  head/devel/py-qt5-help/Makefile
  head/devel/py-qt5-help/pkg-plist
  head/devel/py-qt5-qscintilla2/Makefile
  head/devel/py-qt5-test/Makefile
  head/devel/py-qt5-test/pkg-plist
  head/graphics/py-qt5-svg/Makefile
  head/graphics/py-qt5-svg/pkg-plist
  head/lang/py-qt5-qml/Makefile
  head/lang/py-qt5-qml/pkg-plist
  head/multimedia/py-qt5-multimedia/Makefile
  head/multimedia/py-qt5-multimedia/pkg-plist
  head/multimedia/py-qt5-multimediawidgets/Makefile
  head/multimedia/py-qt5-multimediawidgets/pkg-plist
  head/net/py-qt5-network/Makefile
  head/net/py-qt5-network/pkg-plist
  head/print/py-qt5-printsupport/Makefile
  head/print/py-qt5-printsupport/pkg-plist
  head/textproc/py-qt5-xml/Makefile
  head/textproc/py-qt5-xml/pkg-plist
  head/textproc/py-qt5-xmlpatterns/Makefile
  head/textproc/py-qt5-xmlpatterns/pkg-plist
  head/www/py-qt5-webkit/Makefile
  head/www/py-qt5-webkit/pkg-plist
  head/www/py-qt5-webkitwidgets/Makefile
  head/www/py-qt5-webkitwidgets/pkg-plist
  head/x11-toolkits/py-qt5-gui/Makefile
  head/x11-toolkits/py-qt5-gui/pkg-plist
  head/x11-toolkits/py-qt5-quick/Makefile
  head/x11-toolkits/py-qt5-quick/pkg-plist
  head/x11-toolkits/py-qt5-widgets/Makefile
  head/x11-toolkits/py-qt5-widgets/pkg-plist
  head/x11/py-qt5-opengl/Makefile
  head/x11/py-qt5-opengl/pkg-plist

Modified: head/comms/py-qt5-serialport/Makefile
==============================================================================

--- head/comms/py-qt5-serialport/Makefile	Wed Feb 14 21:25:50 2018	(r461840)
+++ head/comms/py-qt5-serialport/Makefile	Wed Feb 14 21:30:14 2018	(r461841)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	serialport
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	comms devel python
 
 MAINTAINER=	kde at FreeBSD.org

Modified: head/comms/py-qt5-serialport/pkg-plist
==============================================================================
--- head/comms/py-qt5-serialport/pkg-plist	Wed Feb 14 21:25:50 2018	(r461840)
+++ head/comms/py-qt5-serialport/pkg-plist	Wed Feb 14 21:30:14 2018	(r461841)
@@ -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

Modified: head/databases/py-qt5-sql/Makefile
==============================================================================
--- head/databases/py-qt5-sql/Makefile	Wed Feb 14 21:25:50 2018	(r461840)
+++ head/databases/py-qt5-sql/Makefile	Wed Feb 14 21:30:14 2018	(r461841)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	sql
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases devel python
 
 MAINTAINER=	kde at FreeBSD.org

Modified: head/databases/py-qt5-sql/pkg-plist
==============================================================================
--- head/databases/py-qt5-sql/pkg-plist	Wed Feb 14 21:25:50 2018	(r461840)
+++ head/databases/py-qt5-sql/pkg-plist	Wed Feb 14 21:30:14 2018	(r461841)
@@ -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

Modified: head/devel/py-qt5-core/Makefile
==============================================================================
--- head/devel/py-qt5-core/Makefile	Wed Feb 14 21:25:50 2018	(r461840)
+++ head/devel/py-qt5-core/Makefile	Wed Feb 14 21:30:14 2018	(r461841)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	core
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 
 MAINTAINER=	kde at FreeBSD.org

Modified: head/devel/py-qt5-core/files/patch-configure.py
==============================================================================
--- head/devel/py-qt5-core/files/patch-configure.py	Wed Feb 14 21:25:50 2018	(r461840)
+++ head/devel/py-qt5-core/files/patch-configure.py	Wed Feb 14 21:30:14 2018	(r461841)
@@ -10,6 +10,8 @@ by pkg-config --cflags dbus-1 .
 Also fixes the build of www/py-qt5-webengine at 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.
@@ -150,6 +161,24 @@ QtWebEngineWidgets.
 +''' % (api_list, qmake_quote(target_config.qsci_api_dir + '/api/python')))
  
      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')

Modified: head/devel/py-qt5-core/pkg-plist
==============================================================================
--- head/devel/py-qt5-core/pkg-plist	Wed Feb 14 21:25:50 2018	(r461840)
+++ head/devel/py-qt5-core/pkg-plist	Wed Feb 14 21:30:14 2018	(r461841)
@@ -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

Modified: head/devel/py-qt5-dbus/Makefile
==============================================================================
--- head/devel/py-qt5-dbus/Makefile	Wed Feb 14 21:25:50 2018	(r461840)
+++ head/devel/py-qt5-dbus/Makefile	Wed Feb 14 21:30:14 2018	(r461841)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	dbus
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 
 MAINTAINER=	kde at FreeBSD.org

Modified: head/devel/py-qt5-dbus/pkg-plist
==============================================================================
--- head/devel/py-qt5-dbus/pkg-plist	Wed Feb 14 21:25:50 2018	(r461840)
+++ head/devel/py-qt5-dbus/pkg-plist	Wed Feb 14 21:30:14 2018	(r461841)
@@ -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

Modified: head/devel/py-qt5-designer/Makefile
==============================================================================
--- head/devel/py-qt5-designer/Makefile	Wed Feb 14 21:25:50 2018	(r461840)
+++ head/devel/py-qt5-designer/Makefile	Wed Feb 14 21:30:14 2018	(r461841)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	designer
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 
 MAINTAINER=	kde at FreeBSD.org

Modified: head/devel/py-qt5-designer/pkg-plist
==============================================================================
--- head/devel/py-qt5-designer/pkg-plist	Wed Feb 14 21:25:50 2018	(r461840)
+++ head/devel/py-qt5-designer/pkg-plist	Wed Feb 14 21:30:14 2018	(r461841)
@@ -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

Modified: head/devel/py-qt5-help/Makefile
==============================================================================
--- head/devel/py-qt5-help/Makefile	Wed Feb 14 21:25:50 2018	(r461840)
+++ head/devel/py-qt5-help/Makefile	Wed Feb 14 21:30:14 2018	(r461841)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	help
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel python
 
 MAINTAINER=	kde at FreeBSD.org

Modified: head/devel/py-qt5-help/pkg-plist
==============================================================================
--- head/devel/py-qt5-help/pkg-plist	Wed Feb 14 21:25:50 2018	(r461840)
+++ head/devel/py-qt5-help/pkg-plist	Wed Feb 14 21:30:14 2018	(r461841)
@@ -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

Modified: head/devel/py-qt5-qscintilla2/Makefile
==============================================================================
--- head/devel/py-qt5-qscintilla2/Makefile	Wed Feb 14 21:25:50 2018	(r461840)
+++ head/devel/py-qt5-qscintilla2/Makefile	Wed Feb 14 21:30:14 2018	(r461841)
@@ -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-

Modified: head/devel/py-qt5-test/Makefile
==============================================================================
--- head/devel/py-qt5-test/Makefile	Wed Feb 14 21:25:50 2018	(r461840)
+++ head/devel/py-qt5-test/Makefile	Wed Feb 14 21:30:14 2018	(r461841)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	test
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 
 MAINTAINER=	kde at FreeBSD.org

Modified: head/devel/py-qt5-test/pkg-plist
==============================================================================
--- head/devel/py-qt5-test/pkg-plist	Wed Feb 14 21:25:50 2018	(r461840)
+++ head/devel/py-qt5-test/pkg-plist	Wed Feb 14 21:30:14 2018	(r461841)
@@ -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

Modified: head/graphics/py-qt5-svg/Makefile
==============================================================================
--- head/graphics/py-qt5-svg/Makefile	Wed Feb 14 21:25:50 2018	(r461840)
+++ head/graphics/py-qt5-svg/Makefile	Wed Feb 14 21:30:14 2018	(r461841)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	svg
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics devel python
 
 MAINTAINER=	kde at FreeBSD.org

Modified: head/graphics/py-qt5-svg/pkg-plist
==============================================================================
--- head/graphics/py-qt5-svg/pkg-plist	Wed Feb 14 21:25:50 2018	(r461840)
+++ head/graphics/py-qt5-svg/pkg-plist	Wed Feb 14 21:30:14 2018	(r461841)
@@ -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

Modified: head/lang/py-qt5-qml/Makefile
==============================================================================
--- head/lang/py-qt5-qml/Makefile	Wed Feb 14 21:25:50 2018	(r461840)
+++ head/lang/py-qt5-qml/Makefile	Wed Feb 14 21:30:14 2018	(r461841)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	qml
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang devel python
 
 MAINTAINER=	kde at FreeBSD.org

Modified: head/lang/py-qt5-qml/pkg-plist
==============================================================================
--- head/lang/py-qt5-qml/pkg-plist	Wed Feb 14 21:25:50 2018	(r461840)
+++ head/lang/py-qt5-qml/pkg-plist	Wed Feb 14 21:30:14 2018	(r461841)
@@ -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

Modified: head/multimedia/py-qt5-multimedia/Makefile
==============================================================================
--- head/multimedia/py-qt5-multimedia/Makefile	Wed Feb 14 21:25:50 2018	(r461840)
+++ head/multimedia/py-qt5-multimedia/Makefile	Wed Feb 14 21:30:14 2018	(r461841)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	multimedia
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia devel python
 
 MAINTAINER=	kde at FreeBSD.org

Modified: head/multimedia/py-qt5-multimedia/pkg-plist
==============================================================================
--- head/multimedia/py-qt5-multimedia/pkg-plist	Wed Feb 14 21:25:50 2018	(r461840)
+++ head/multimedia/py-qt5-multimedia/pkg-plist	Wed Feb 14 21:30:14 2018	(r461841)
@@ -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

Modified: head/multimedia/py-qt5-multimediawidgets/Makefile
==============================================================================
--- head/multimedia/py-qt5-multimediawidgets/Makefile	Wed Feb 14 21:25:50 2018	(r461840)
+++ head/multimedia/py-qt5-multimediawidgets/Makefile	Wed Feb 14 21:30:14 2018	(r461841)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	multimediawidgets
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia devel python
 
 MAINTAINER=	kde at FreeBSD.org

Modified: head/multimedia/py-qt5-multimediawidgets/pkg-plist
==============================================================================
--- head/multimedia/py-qt5-multimediawidgets/pkg-plist	Wed Feb 14 21:25:50 2018	(r461840)
+++ head/multimedia/py-qt5-multimediawidgets/pkg-plist	Wed Feb 14 21:30:14 2018	(r461841)
@@ -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

Modified: head/net/py-qt5-network/Makefile
==============================================================================
--- head/net/py-qt5-network/Makefile	Wed Feb 14 21:25:50 2018	(r461840)
+++ head/net/py-qt5-network/Makefile	Wed Feb 14 21:30:14 2018	(r461841)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	network
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net devel python
 
 MAINTAINER=	kde at FreeBSD.org

Modified: head/net/py-qt5-network/pkg-plist
==============================================================================
--- head/net/py-qt5-network/pkg-plist	Wed Feb 14 21:25:50 2018	(r461840)
+++ head/net/py-qt5-network/pkg-plist	Wed Feb 14 21:30:14 2018	(r461841)
@@ -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

Modified: head/print/py-qt5-printsupport/Makefile
==============================================================================
--- head/print/py-qt5-printsupport/Makefile	Wed Feb 14 21:25:50 2018	(r461840)
+++ head/print/py-qt5-printsupport/Makefile	Wed Feb 14 21:30:14 2018	(r461841)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	printsupport
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print python
 
 MAINTAINER=	kde at FreeBSD.org

Modified: head/print/py-qt5-printsupport/pkg-plist
==============================================================================
--- head/print/py-qt5-printsupport/pkg-plist	Wed Feb 14 21:25:50 2018	(r461840)
+++ head/print/py-qt5-printsupport/pkg-plist	Wed Feb 14 21:30:14 2018	(r461841)
@@ -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

Modified: head/textproc/py-qt5-xml/Makefile
==============================================================================
--- head/textproc/py-qt5-xml/Makefile	Wed Feb 14 21:25:50 2018	(r461840)
+++ head/textproc/py-qt5-xml/Makefile	Wed Feb 14 21:30:14 2018	(r461841)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	xml
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc devel python
 
 MAINTAINER=	kde at FreeBSD.org

Modified: head/textproc/py-qt5-xml/pkg-plist
==============================================================================
--- head/textproc/py-qt5-xml/pkg-plist	Wed Feb 14 21:25:50 2018	(r461840)
+++ head/textproc/py-qt5-xml/pkg-plist	Wed Feb 14 21:30:14 2018	(r461841)
@@ -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

Modified: head/textproc/py-qt5-xmlpatterns/Makefile
==============================================================================
--- head/textproc/py-qt5-xmlpatterns/Makefile	Wed Feb 14 21:25:50 2018	(r461840)
+++ head/textproc/py-qt5-xmlpatterns/Makefile	Wed Feb 14 21:30:14 2018	(r461841)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	xmlpatterns
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc devel python
 
 MAINTAINER=	kde at FreeBSD.org

Modified: head/textproc/py-qt5-xmlpatterns/pkg-plist
==============================================================================
--- head/textproc/py-qt5-xmlpatterns/pkg-plist	Wed Feb 14 21:25:50 2018	(r461840)
+++ head/textproc/py-qt5-xmlpatterns/pkg-plist	Wed Feb 14 21:30:14 2018	(r461841)
@@ -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

Modified: head/www/py-qt5-webkit/Makefile
==============================================================================
--- head/www/py-qt5-webkit/Makefile	Wed Feb 14 21:25:50 2018	(r461840)
+++ head/www/py-qt5-webkit/Makefile	Wed Feb 14 21:30:14 2018	(r461841)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	webkit
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www devel python
 
 MAINTAINER=	kde at FreeBSD.org

Modified: head/www/py-qt5-webkit/pkg-plist
==============================================================================
--- head/www/py-qt5-webkit/pkg-plist	Wed Feb 14 21:25:50 2018	(r461840)
+++ head/www/py-qt5-webkit/pkg-plist	Wed Feb 14 21:30:14 2018	(r461841)
@@ -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

Modified: head/www/py-qt5-webkitwidgets/Makefile
==============================================================================
--- head/www/py-qt5-webkitwidgets/Makefile	Wed Feb 14 21:25:50 2018	(r461840)
+++ head/www/py-qt5-webkitwidgets/Makefile	Wed Feb 14 21:30:14 2018	(r461841)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	webkitwidgets
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www devel python
 
 MAINTAINER=	kde at FreeBSD.org

Modified: head/www/py-qt5-webkitwidgets/pkg-plist
==============================================================================
--- head/www/py-qt5-webkitwidgets/pkg-plist	Wed Feb 14 21:25:50 2018	(r461840)
+++ head/www/py-qt5-webkitwidgets/pkg-plist	Wed Feb 14 21:30:14 2018	(r461841)
@@ -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

Modified: head/x11-toolkits/py-qt5-gui/Makefile
==============================================================================
--- head/x11-toolkits/py-qt5-gui/Makefile	Wed Feb 14 21:25:50 2018	(r461840)
+++ head/x11-toolkits/py-qt5-gui/Makefile	Wed Feb 14 21:30:14 2018	(r461841)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	gui
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits devel python
 
 MAINTAINER=	kde at FreeBSD.org

Modified: head/x11-toolkits/py-qt5-gui/pkg-plist
==============================================================================
--- head/x11-toolkits/py-qt5-gui/pkg-plist	Wed Feb 14 21:25:50 2018	(r461840)
+++ head/x11-toolkits/py-qt5-gui/pkg-plist	Wed Feb 14 21:30:14 2018	(r461841)
@@ -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

Modified: head/x11-toolkits/py-qt5-quick/Makefile
==============================================================================
--- head/x11-toolkits/py-qt5-quick/Makefile	Wed Feb 14 21:25:50 2018	(r461840)
+++ head/x11-toolkits/py-qt5-quick/Makefile	Wed Feb 14 21:30:14 2018	(r461841)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	quick
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits devel python
 
 MAINTAINER=	kde at FreeBSD.org

Modified: head/x11-toolkits/py-qt5-quick/pkg-plist
==============================================================================
--- head/x11-toolkits/py-qt5-quick/pkg-plist	Wed Feb 14 21:25:50 2018	(r461840)
+++ head/x11-toolkits/py-qt5-quick/pkg-plist	Wed Feb 14 21:30:14 2018	(r461841)
@@ -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

Modified: head/x11-toolkits/py-qt5-widgets/Makefile
==============================================================================
--- head/x11-toolkits/py-qt5-widgets/Makefile	Wed Feb 14 21:25:50 2018	(r461840)
+++ head/x11-toolkits/py-qt5-widgets/Makefile	Wed Feb 14 21:30:14 2018	(r461841)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	widgets
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits devel python
 
 MAINTAINER=	kde at FreeBSD.org

Modified: head/x11-toolkits/py-qt5-widgets/pkg-plist
==============================================================================
--- head/x11-toolkits/py-qt5-widgets/pkg-plist	Wed Feb 14 21:25:50 2018	(r461840)
+++ head/x11-toolkits/py-qt5-widgets/pkg-plist	Wed Feb 14 21:30:14 2018	(r461841)
@@ -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

Modified: head/x11/py-qt5-opengl/Makefile
==============================================================================
--- head/x11/py-qt5-opengl/Makefile	Wed Feb 14 21:25:50 2018	(r461840)
+++ head/x11/py-qt5-opengl/Makefile	Wed Feb 14 21:30:14 2018	(r461841)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	opengl
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 devel python
 
 MAINTAINER=	kde at FreeBSD.org

Modified: head/x11/py-qt5-opengl/pkg-plist
==============================================================================
--- head/x11/py-qt5-opengl/pkg-plist	Wed Feb 14 21:25:50 2018	(r461840)
+++ head/x11/py-qt5-opengl/pkg-plist	Wed Feb 14 21:30:14 2018	(r461841)
@@ -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
