Omit mentions of python 34 and 35, after those were removed.

- Includes some whitespace changes, to be handled in a separate commit.

84 files changed, 169 insertions, 171 deletions

diff --git a/devel/ExmanIDE/Makefile b/devel/ExmanIDE/Makefile
index aa8e0574ce5..4b2349ca298 100644
--- a/devel/ExmanIDE/Makefile
+++ b/devel/ExmanIDE/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2019/04/25 07:32:42 maya Exp $
+# $NetBSD: Makefile,v 1.28 2019/04/26 13:13:48 maya Exp $
 
 DISTNAME=	ExmanIDE-0.9.4
 PKGREVISION=	8
@@ -17,7 +17,7 @@ WRKSRC=		${WRKDIR}/${PKGBASE}
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
 
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # py-wxWidgets
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37 # py-wxWidgets
 
 SUBST_CLASSES+=		mod
 SUBST_MESSAGE.mod=	Fixing deprecated module names.
diff --git a/devel/RBTools/Makefile b/devel/RBTools/Makefile
index dbb6a7d7aa5..c0a5d1c2fcc 100644
--- a/devel/RBTools/Makefile
+++ b/devel/RBTools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2019/04/25 07:32:42 maya Exp $
+# $NetBSD: Makefile,v 1.16 2019/04/26 13:13:48 maya Exp $
 
 DISTNAME=	RBTools-0.7.6
 PKGREVISION=	1
@@ -14,7 +14,7 @@ USE_LANGUAGES=	# none
 
 REPLACE_PYTHON=		ez_setup.py setup.py rbtools/postreview.py
 REPLACE_PYTHON+=	contrib/internal/release.py
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # not yet ported as of 0.2
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37 # not yet ported as of 0.2
 
 DEPENDS+=   ${PYPKGPREFIX}-six>=1.8.0:../../lang/py-six
 
diff --git a/devel/accerciser/Makefile b/devel/accerciser/Makefile
index cdef615869a..e097cd88ced 100644
--- a/devel/accerciser/Makefile
+++ b/devel/accerciser/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2019/04/25 07:32:42 maya Exp $
+# $NetBSD: Makefile,v 1.30 2019/04/26 13:13:48 maya Exp $
 
 DISTNAME=	accerciser-1.12.1
 PKGREVISION=	4
@@ -16,7 +16,7 @@ DEPENDS+=	${PYPKGPREFIX}-gtk2>=2.8:../../x11/py-gtk2
 DEPENDS+=	${PYPKGPREFIX}-at-spi>=1.23.4:../../devel/py-at-spi
 DEPENDS+=	${PYPKGPREFIX}-ipython<0.11:../../devel/py-ipython010
 
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # py-ORBit via py-gnome2, py-ipython, py-gtk2
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37 # py-ORBit via py-gnome2, py-ipython, py-gtk2
 
 USE_TOOLS+=		gmake intltool msgfmt pkg-config
 USE_PKGLOCALEDIR=	yes
diff --git a/devel/boa-constructor/Makefile b/devel/boa-constructor/Makefile
index 5a1da0c10e7..6354bac7fca 100644
--- a/devel/boa-constructor/Makefile
+++ b/devel/boa-constructor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2019/04/25 07:32:43 maya Exp $
+# $NetBSD: Makefile,v 1.44 2019/04/26 13:13:48 maya Exp $
 
 VERSION=		0.6.1
 DISTNAME=		boa-constructor-${VERSION}.src
@@ -24,7 +24,7 @@ SEDSUBSTS=	-e "s|@PYTHONBIN@|${PYTHONBIN}|"
 SEDSUBSTS+=	-e "s|@PREFIX@|${PREFIX}|"
 SEDSUBSTS+=	-e "s|@VERSION@|${VERSION}|"
 
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # py-wxWidgets
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37 # py-wxWidgets
 
 REPLACE_PYTHON+=	Boa.py
 REPLACE_PYTHON+=	Examples/advanced/FramePanels/wxApp1.py
diff --git a/devel/bzr-explorer/Makefile b/devel/bzr-explorer/Makefile
index 2c5d1dbffa8..e7105c84e66 100644
--- a/devel/bzr-explorer/Makefile
+++ b/devel/bzr-explorer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2019/04/25 07:32:43 maya Exp $
+# $NetBSD: Makefile,v 1.21 2019/04/26 13:13:48 maya Exp $
 
 DISTNAME=	bzr-explorer-${VER}
 PKGREVISION=	3
@@ -16,7 +16,7 @@ DEPENDS+=	${PYPKGPREFIX}-qt4>=4.4:../../x11/py-qt4
 
 USE_TOOLS+=	msgfmt
 
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # qbzr
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37 # qbzr
 
 EGG_NAME=	${DISTNAME:S/bzr-//}
 
diff --git a/devel/bzr-gtk/Makefile b/devel/bzr-gtk/Makefile
index e533e456c49..66d91fb2013 100644
--- a/devel/bzr-gtk/Makefile
+++ b/devel/bzr-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2019/04/25 07:32:43 maya Exp $
+# $NetBSD: Makefile,v 1.27 2019/04/26 13:13:48 maya Exp $
 
 DISTNAME=	bzr-gtk-${VER}
 PKGREVISION=	2
@@ -15,7 +15,7 @@ DEPENDS+=	${PYPKGPREFIX}-gtk2>=2.8:../../x11/py-gtk2
 DEPENDS+=	${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
 
 PYDISTUTILSPKG=	yes
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # py-gtk2
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37 # py-gtk2
 REPLACE_PYTHON=	create-credits.py info.py
 
 USE_TOOLS+=	msgfmt
diff --git a/devel/bzr-svn/Makefile b/devel/bzr-svn/Makefile
index bf143cb8790..4d6b8ea3b30 100644
--- a/devel/bzr-svn/Makefile
+++ b/devel/bzr-svn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2019/04/25 07:32:43 maya Exp $
+# $NetBSD: Makefile,v 1.37 2019/04/26 13:13:48 maya Exp $
 
 DISTNAME=	bzr-svn-${VER}
 PKGREVISION=	1
@@ -26,7 +26,7 @@ USE_LANGUAGES=	#none
 #TEST_DEPENDS+=	${PYPKGPREFIX}-paramiko-[0-9]*:../../security/py-paramiko
 #TEST_TARGET=	check-verbose
 
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # py-subvertpy
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37 # py-subvertpy
 
 .include "../../devel/bzr/plugin.mk"
 .include "../../lang/python/application.mk"
diff --git a/devel/bzr/Makefile b/devel/bzr/Makefile
index 09efa3880f9..02fa807eb47 100644
--- a/devel/bzr/Makefile
+++ b/devel/bzr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2019/04/25 07:32:43 maya Exp $
+# $NetBSD: Makefile,v 1.73 2019/04/26 13:13:48 maya Exp $
 
 DISTNAME=	bzr-2.6.0
 PKGREVISION=	2
@@ -18,7 +18,7 @@ USE_TOOLS+=		gmake msgfmt
 
 PY_PATCHPLIST=		yes
 PYDISTUTILSPKG=		yes
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # py-pyrex
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37 # py-pyrex
 
 REPLACE_PYTHON=		bzr bzrlib/weave.py
 REPLACE_PYTHON+=		bzrlib/patiencediff.py bzrlib/_patiencediff_py.py
diff --git a/devel/bzrtools/Makefile b/devel/bzrtools/Makefile
index a53a95361f5..596c882651a 100644
--- a/devel/bzrtools/Makefile
+++ b/devel/bzrtools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2019/04/25 07:32:43 maya Exp $
+# $NetBSD: Makefile,v 1.29 2019/04/26 13:13:49 maya Exp $
 
 PKGNAME=	bzrtools-${VER}
 PKGREVISION=	1
@@ -13,7 +13,7 @@ COMMENT=	Collection of plugins for Bazaar
 LICENSE=	gnu-gpl-v2
 
 REPLACE_PYTHON= check-release.py test.py
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # not yet ported as of 2.5.0
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37 # not yet ported as of 2.5.0
 
 WRKSRC=		${WRKDIR}/bzrtools
 
diff --git a/devel/codeville/Makefile b/devel/codeville/Makefile
index 1faa3072307..b5c049c121f 100644
--- a/devel/codeville/Makefile
+++ b/devel/codeville/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2019/04/25 07:32:43 maya Exp $
+# $NetBSD: Makefile,v 1.33 2019/04/26 13:13:49 maya Exp $
 
 DISTNAME=	Codeville-0.8.0
 PKGNAME=	codeville-0.8.0
@@ -13,7 +13,7 @@ LICENSE=	modified-bsd
 
 REPLACE_PYTHON=		*.py
 REPLACE_PYTHON+=	*/*.py
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # not yet ported as of 0.8.0
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37 # not yet ported as of 0.8.0
 
 BUILD_DEFS+=		VARBASE
 BUILD_DEFS_EFFECTS+=	CODEVILLE_DATADIR
diff --git a/devel/cvs2svn/Makefile b/devel/cvs2svn/Makefile
index f93d37d5a17..a597100e8d8 100644
--- a/devel/cvs2svn/Makefile
+++ b/devel/cvs2svn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2019/04/25 07:32:44 maya Exp $
+# $NetBSD: Makefile,v 1.37 2019/04/26 13:13:49 maya Exp $
 
 DISTNAME=	cvs2svn-2.3.0
 PKGREVISION=	3
@@ -16,7 +16,7 @@ CONFLICTS+=	py*-subversion<1.0.1
 PYDISTUTILSPKG=			yes
 REPLACE_PYTHON=		run-tests.py cvs2svn_rcsparse/run-tests.py \
 				cvs2svn_rcsparse/parse_rcs_file.py
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # not yet ported as of 2.3.0
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37 # not yet ported as of 2.3.0
 #USE_TOOLS+=			gtar
 #EXTRACT_USING=			gtar
 
diff --git a/devel/diffuse/Makefile b/devel/diffuse/Makefile
index 3389570dd9b..b1830291597 100644
--- a/devel/diffuse/Makefile
+++ b/devel/diffuse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2019/04/25 07:32:44 maya Exp $
+# $NetBSD: Makefile,v 1.42 2019/04/26 13:13:49 maya Exp $
 
 DISTNAME=	diffuse-0.4.8
 PKGREVISION=	1
@@ -12,7 +12,7 @@ COMMENT=	Graphical tool for merging and comparing text files
 LICENSE=	gnu-gpl-v2
 
 DEPENDS+=	${PYPKGPREFIX}-gtk2>=2.10:../../x11/py-gtk2
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # py-gtk2
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37 # py-gtk2
 
 USE_TOOLS+=	msgfmt
 USE_LANGUAGES=	# none
diff --git a/devel/eric4/Makefile b/devel/eric4/Makefile
index ad92779fc22..6efdf1a1e30 100644
--- a/devel/eric4/Makefile
+++ b/devel/eric4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2019/04/25 07:32:44 maya Exp $
+# $NetBSD: Makefile,v 1.52 2019/04/26 13:13:49 maya Exp $
 
 VERS=			4.5.24
 DISTNAME=		eric4-${VERS}
@@ -15,7 +15,7 @@ NO_BUILD=		yes
 EXTRACT_USING=		bsdtar
 
 PY_PATCHPLIST=			yes
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # not yet ported as of 4.5.18
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37 # not yet ported as of 4.5.18
 
 CONFIGURE_ARGS+=		-b ${PREFIX}/bin
 CONFIGURE_ARGS+=		-d ${PREFIX}/${PYSITELIB}
diff --git a/devel/gdb/options.mk b/devel/gdb/options.mk
index b2488902a77..d4c1bce75f5 100644
--- a/devel/gdb/options.mk
+++ b/devel/gdb/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2018/07/03 05:03:09 adam Exp $
+# $NetBSD: options.mk,v 1.6 2019/04/26 13:13:49 maya Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gdb
 PKG_SUPPORTED_OPTIONS=	python
@@ -8,6 +8,6 @@ PKG_SUGGESTED_OPTIONS=	python
 
 .if !empty(PKG_OPTIONS:Mpython)
 CONFIGURE_ARGS+=	--with-python=${PYTHONBIN}
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37
 .include "../../lang/python/application.mk"
 .endif
diff --git a/devel/gdb7/options.mk b/devel/gdb7/options.mk
index f62ce7541a6..7f14a97fd58 100644
--- a/devel/gdb7/options.mk
+++ b/devel/gdb7/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2018/07/03 05:03:09 adam Exp $
+# $NetBSD: options.mk,v 1.3 2019/04/26 13:13:49 maya Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gdb
 PKG_SUPPORTED_OPTIONS=	python
@@ -8,6 +8,6 @@ PKG_SUGGESTED_OPTIONS=	python
 
 .if !empty(PKG_OPTIONS:Mpython)
 CONFIGURE_ARGS+=	--with-python=${PYTHONBIN}
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37
 .include "../../lang/python/application.mk"
 .endif
diff --git a/devel/gnatpython/Makefile b/devel/gnatpython/Makefile
index f751c7c6066..424a9168df5 100644
--- a/devel/gnatpython/Makefile
+++ b/devel/gnatpython/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2019/04/25 07:32:46 maya Exp $
+# $NetBSD: Makefile,v 1.18 2019/04/26 13:13:49 maya Exp $
 
 DISTNAME=	gnatpython-${SNAPSHOT}
 PKGREVISION=	3
@@ -14,7 +14,7 @@ SNAPSHOT=	20110912
 
 EGG_NAME=	gnatpython-1.2
 
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # not yet ported as of 20110912
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37 # not yet ported as of 20110912
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/distutils.mk"
diff --git a/devel/gps/options.mk b/devel/gps/options.mk
index eb7cd9c1cc8..52ec065d5f6 100644
--- a/devel/gps/options.mk
+++ b/devel/gps/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.12 2018/07/03 05:03:09 adam Exp $
+# $NetBSD: options.mk,v 1.13 2019/04/26 13:13:49 maya Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gps
 PKG_SUPPORTED_OPTIONS=	syslog sqlite readline python pgsql
@@ -60,7 +60,7 @@ CONFIGURE_ARGS+= --without-python --disable-pygtk --disable-pygobject
 .else
 MY_CONFIGURE_ENV+=	PYTHON=${PYTHONBIN}
 CONFIGURE_ARGS+=	--with-python=${PREFIX}
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # py-gtk2
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37 # py-gtk2
 .include "../../lang/python/pyversion.mk"
 .include "../../x11/py-gtk2/buildlink3.mk"
 .endif
diff --git a/devel/gyp/Makefile b/devel/gyp/Makefile
index ce427dc51db..281d0854712 100644
--- a/devel/gyp/Makefile
+++ b/devel/gyp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2018/07/03 05:03:09 adam Exp $
+# $NetBSD: Makefile,v 1.19 2019/04/26 13:13:49 maya Exp $
 
 GIT_VERSION=	20161117.940a15ee3f1c89f193cb4c19373b3f6e9ad15b95
 DIST_VERSION=	0.1
@@ -12,7 +12,7 @@ HOMEPAGE=	https://gyp.gsrc.io/
 COMMENT=	GYP can Generate Your Projects
 LICENSE=	modified-bsd
 
-PYTHON_VERSIONS_INCOMPATIBLE=  34 35 36 37 # not yet ported as of 0.1pre20161117.940a15ee3f1c89f193cb4c19373b3f6e9ad15b95
+PYTHON_VERSIONS_INCOMPATIBLE=   36 37 # not yet ported as of 0.1pre20161117.940a15ee3f1c89f193cb4c19373b3f6e9ad15b95
 EGG_NAME=	gyp-${DIST_VERSION}
 
 WRKSRC=		${WRKDIR}/gyp
diff --git a/devel/ko-po-check/Makefile b/devel/ko-po-check/Makefile
index 50e114cc23e..6c9dedfccd9 100644
--- a/devel/ko-po-check/Makefile
+++ b/devel/ko-po-check/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2019/04/25 07:32:47 maya Exp $
+# $NetBSD: Makefile,v 1.19 2019/04/26 13:13:49 maya Exp $
 
 DISTNAME=	ko-po-check-0.8
 PKGREVISION=	4
@@ -14,7 +14,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	PYTHON=${PYTHONBIN:Q}
 
 REPLACE_PYTHON=	scripts/ko-po-check.in
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # not yet ported as of 0.8
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37 # not yet ported as of 0.8
 
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/lettuce/Makefile b/devel/lettuce/Makefile
index f8303443d5e..994e0d807ca 100644
--- a/devel/lettuce/Makefile
+++ b/devel/lettuce/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2019/04/25 07:32:47 maya Exp $
+# $NetBSD: Makefile,v 1.13 2019/04/26 13:13:50 maya Exp $
 
 DISTNAME=	lettuce-0.2.18
 PKGREVISION=	1
@@ -11,7 +11,7 @@ COMMENT=	Behaviour-driven development test tool
 LICENSE=	gnu-gpl-v3
 
 REPLACE_PYTHON=	lettuce/bin.py lettuce/plugins/autopdb.py
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # not yet ported as of 0.2.18
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37 # not yet ported as of 0.2.18
 
 .include "../../lang/python/application.mk"
 .include "../../lang/python/egg.mk"
diff --git a/devel/libappindicator/Makefile b/devel/libappindicator/Makefile
index 3fb500d0b70..998e10e2ee8 100644
--- a/devel/libappindicator/Makefile
+++ b/devel/libappindicator/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2018/11/14 22:21:15 kleink Exp $
+# $NetBSD: Makefile,v 1.12 2019/04/26 13:13:50 maya Exp $
 
 USE_GTK_VERSION=		2
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # py-gtk2
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37 # py-gtk2
 
 PKGREVISION= 7
 .include "Makefile.common"
diff --git a/devel/libappindicator3/Makefile b/devel/libappindicator3/Makefile
index 9e127dc811f..b051d2aa734 100644
--- a/devel/libappindicator3/Makefile
+++ b/devel/libappindicator3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2018/11/14 22:21:15 kleink Exp $
+# $NetBSD: Makefile,v 1.14 2019/04/26 13:13:50 maya Exp $
 
 USE_GTK_VERSION=		3
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # py-gtk2
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37 # py-gtk2
 
 PKGREVISION= 8
 .include "../../devel/libappindicator/Makefile.common"
diff --git a/devel/libftdi1/Makefile b/devel/libftdi1/Makefile
index a6dfa6145dd..802a2495e5b 100644
--- a/devel/libftdi1/Makefile
+++ b/devel/libftdi1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2019/04/25 07:32:47 maya Exp $
+# $NetBSD: Makefile,v 1.29 2019/04/26 13:13:50 maya Exp $
 
 DISTNAME=	libftdi1-1.1
 PKGREVISION=	13
@@ -17,7 +17,7 @@ USE_CMAKE=	yes
 USE_TOOLS+=	pkg-config cmake
 USE_LANGUAGES=	c c++
 
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # not yet ported as of 1.0
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37 # not yet ported as of 1.0
 
 BUILD_DEPENDS+=libusb1-[0-9]*:../../devel/libusb1
 # It is better off to have doxygen, but
diff --git a/devel/nsis/Makefile b/devel/nsis/Makefile
index 3e2432bb975..1d1714143de 100644
--- a/devel/nsis/Makefile
+++ b/devel/nsis/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2019/01/02 21:35:57 tnn Exp $
+# $NetBSD: Makefile,v 1.21 2019/04/26 13:13:50 maya Exp $
 #
 
 DISTNAME=	nsis-${NSIS_VER}
@@ -15,7 +15,7 @@ COMMENT=	Scriptable system to build Windows installers
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	pax
 
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37	# as of 3.04
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37	# as of 3.04
 
 NSIS_SRC=	${DISTNAME:=-src}
 NSIS_VER=	3.04
diff --git a/devel/py-InlineEgg/Makefile b/devel/py-InlineEgg/Makefile
index bf5a2888488..2282a918c9e 100644
--- a/devel/py-InlineEgg/Makefile
+++ b/devel/py-InlineEgg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2018/07/03 05:03:10 adam Exp $
+# $NetBSD: Makefile,v 1.24 2019/04/26 13:13:50 maya Exp $
 
 DISTNAME=		InlineEgg-1.08
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME}
@@ -17,7 +17,7 @@ REPLACE_PYTHON=		examples/example1.py examples/example2.py \
 				xored_shell_client.py
 
 PYTHON_SELF_CONFLICT=		yes
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # not yet ported as of 1.08
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37 # not yet ported as of 1.08
 
 INSTALLATION_DIRS=	share/doc/InlineEgg share/examples/InlineEgg
 
diff --git a/devel/py-Optik/Makefile b/devel/py-Optik/Makefile
index a88b34d99b5..08dab4b4e80 100644
--- a/devel/py-Optik/Makefile
+++ b/devel/py-Optik/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2018/07/03 05:03:10 adam Exp $
+# $NetBSD: Makefile,v 1.23 2019/04/26 13:13:50 maya Exp $
 
 DISTNAME=	optik-1.5.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/optik/Optik/}
@@ -13,7 +13,7 @@ LICENSE=	modified-bsd
 
 USE_LANGUAGES=	#none
 
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37
 
 do-test:
 	cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHONBIN} test/test_optik.py
diff --git a/devel/py-aiofiles/Makefile b/devel/py-aiofiles/Makefile
index a4ad5f58a95..6547064ac45 100644
--- a/devel/py-aiofiles/Makefile
+++ b/devel/py-aiofiles/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2018/08/19 11:16:25 adam Exp $
+# $NetBSD: Makefile,v 1.4 2019/04/26 13:13:50 maya Exp $
 
 DISTNAME=	aiofiles-0.4.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -10,7 +10,7 @@ HOMEPAGE=	https://github.com/Tinche/aiofiles
 COMMENT=	File support for asyncio
 LICENSE=	apache-2.0
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 34
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 USE_LANGUAGES=	# none
 
diff --git a/devel/py-async-timeout/Makefile b/devel/py-async-timeout/Makefile
index ce6c1ed7c39..fcfbc52af01 100644
--- a/devel/py-async-timeout/Makefile
+++ b/devel/py-async-timeout/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2018/12/27 16:04:24 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2019/04/26 13:13:50 maya Exp $
 
 DISTNAME=	async-timeout-3.0.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -12,7 +12,7 @@ LICENSE=	apache-2.0
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 34
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 .include "../../lang/python/pyversion.mk"
 
diff --git a/devel/py-at-spi/Makefile b/devel/py-at-spi/Makefile
index 867d7bf2a9c..d23e12cea9c 100644
--- a/devel/py-at-spi/Makefile
+++ b/devel/py-at-spi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2018/07/03 05:03:10 adam Exp $
+# $NetBSD: Makefile,v 1.33 2019/04/26 13:13:50 maya Exp $
 
 DISTNAME=		at-spi-1.32.0
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME}
@@ -20,7 +20,7 @@ USE_LANGUAGES=		#none
 NO_BUILD=	yes
 PY_PATCHPLIST=	yes
 
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # py-ORBit, py-gnome2
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37 # py-ORBit, py-gnome2
 
 PYATSPIDIR=		${PREFIX}/${PYSITELIB}/pyatspi
 INSTALLATION_DIRS=	${PYATSPIDIR}
diff --git a/devel/py-bcolz/Makefile b/devel/py-bcolz/Makefile
index 6fc17488c43..490ffa168b1 100644
--- a/devel/py-bcolz/Makefile
+++ b/devel/py-bcolz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2018/04/17 15:19:51 minskim Exp $
+# $NetBSD: Makefile,v 1.7 2019/04/26 13:13:51 maya Exp $
 
 DISTNAME=	bcolz-1.2.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -12,8 +12,6 @@ LICENSE=	modified-bsd
 
 BUILD_DEPENDS+=	${PYPKGPREFIX}-setuptools_scm>=1.15.0:../../devel/py-setuptools_scm
 
-PYTHON_VERSIONS_INCOMPATIBLE=	34
-
 MAKE_ENV+=	BLOSC_DIR=${BUILDLINK_PREFIX.blosc}
 
 .include "../../devel/blosc/buildlink3.mk"
diff --git a/devel/py-checker/Makefile b/devel/py-checker/Makefile
index f04257fb5dc..de3a1405fbc 100644
--- a/devel/py-checker/Makefile
+++ b/devel/py-checker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2018/07/03 05:03:10 adam Exp $
+# $NetBSD: Makefile,v 1.26 2019/04/26 13:13:51 maya Exp $
 
 DISTNAME=	pychecker-0.8.19
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -12,7 +12,7 @@ LICENSE=	modified-bsd
 
 PLIST_SUBST+=	PYPKGPREFIX=${PYPKGPREFIX:Q}
 
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # not yet ported as of 0.8.19
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37 # not yet ported as of 0.8.19
 
 post-install:
 	${MV} ${DESTDIR}${PREFIX}/bin/pychecker ${DESTDIR}${PREFIX}/bin/pychecker${PYVERSSUFFIX} || ${TRUE}
diff --git a/devel/py-cheetah/Makefile b/devel/py-cheetah/Makefile
index 428aeb6d207..983afaaff2a 100644
--- a/devel/py-cheetah/Makefile
+++ b/devel/py-cheetah/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2018/07/03 05:03:10 adam Exp $
+# $NetBSD: Makefile,v 1.23 2019/04/26 13:13:51 maya Exp $
 
 DISTNAME=	Cheetah-2.4.4
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
@@ -15,7 +15,7 @@ DEPENDS+=	${PYPKGPREFIX}-markdown>=2.0.1:../../textproc/py-markdown
 
 USE_LANGUAGES=		c
 
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # not yet ported as of 2.4.4
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37 # not yet ported as of 2.4.4
 
 REPLACE_PYTHON+=	SetupTools.py
 REPLACE_PYTHON+=	bin/cheetah
diff --git a/devel/py-compizconfig/Makefile b/devel/py-compizconfig/Makefile
index 45c93060ae6..278727f5f2c 100644
--- a/devel/py-compizconfig/Makefile
+++ b/devel/py-compizconfig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2019/04/03 00:32:39 ryoon Exp $
+# $NetBSD: Makefile,v 1.72 2019/04/26 13:13:51 maya Exp $
 
 PKGVER=			0.8.4
 DISTNAME=		compizconfig-python-${PKGVER}
@@ -19,7 +19,7 @@ USE_LIBTOOL=		yes
 USE_TOOLS+=		pkg-config gmake
 
 PY_PATCHPLIST=		yes
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # py-pyrex
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37 # py-pyrex
 
 .include "../../wm/compiz/buildlink3.mk"
 .include "../../devel/libcompizconfig/buildlink3.mk"
diff --git a/devel/py-darcsver/Makefile b/devel/py-darcsver/Makefile
index a25b2986153..a2eeff1c462 100644
--- a/devel/py-darcsver/Makefile
+++ b/devel/py-darcsver/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2018/07/03 05:03:10 adam Exp $
+# $NetBSD: Makefile,v 1.11 2019/04/26 13:13:51 maya Exp $
 
 DISTNAME=	darcsver-1.7.4
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -14,7 +14,7 @@ DEPENDS+=		${PYPKGPREFIX}-expat>=0:../../textproc/py-expat
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # not yet ported as of 1.7.4
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37 # not yet ported as of 1.7.4
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-dialog2/Makefile b/devel/py-dialog2/Makefile
index dd78dd0ccc2..c7584ef2d55 100644
--- a/devel/py-dialog2/Makefile
+++ b/devel/py-dialog2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2018/07/03 05:03:10 adam Exp $
+# $NetBSD: Makefile,v 1.8 2019/04/26 13:13:51 maya Exp $
 
 VERSION=	3.4.0
 DISTNAME=	python2-pythondialog-${VERSION}
@@ -11,7 +11,7 @@ HOMEPAGE=	http://pythondialog.sourceforge.net/
 COMMENT=	Python wrapper for the dialog utility
 LICENSE=	gnu-lgpl-v2.1
 
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37
 
 .include "../../misc/dialog/buildlink3.mk"
 .include "../../lang/python/distutils.mk"
diff --git a/devel/py-expect/Makefile b/devel/py-expect/Makefile
index 096b7d070d0..5794088996f 100644
--- a/devel/py-expect/Makefile
+++ b/devel/py-expect/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2018/07/03 05:03:10 adam Exp $
+# $NetBSD: Makefile,v 1.27 2019/04/26 13:13:51 maya Exp $
 
 DISTNAME=	ExpectPy-1.9b1
 PKGNAME=	${PYPKGPREFIX}-expect-1.9b1
@@ -20,7 +20,7 @@ CONFIGURE_ENV+=	PYTH_CONFIGDIR=${BUILDLINK_PREFIX.${PYPACKAGE}}/${PYLIB}/config
 INSTALL_TARGET=	installshared
 PY_PATCHPLIST=	yes
 PLIST_SUBST+=	PYLIB=${PYLIB:Q} PYPKGPREFIX=${PYPKGPREFIX:Q}
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # not yet ported as of 1.9b1
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37 # not yet ported as of 1.9b1
 
 EXAMPLESDIR=	${PREFIX}/share/examples/${PYPKGPREFIX}-expect
 EXAMPLESFILES=	ask.py glob.py ping.py telnet.py xping.py
diff --git a/devel/py-futures/Makefile b/devel/py-futures/Makefile
index ba94ffa14cb..033c7a80d20 100644
--- a/devel/py-futures/Makefile
+++ b/devel/py-futures/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2018/07/03 05:03:11 adam Exp $
+# $NetBSD: Makefile,v 1.7 2019/04/26 13:13:51 maya Exp $
 
 DISTNAME=	futures-3.2.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -10,7 +10,7 @@ HOMEPAGE=	https://github.com/agronholm/pythonfutures
 COMMENT=	Library brings asynchronous computations from Python 3.x
 LICENSE=	python-software-foundation
 
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # included in 3+
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37 # included in 3+
 
 USE_LANGUAGES=	# none
 
diff --git a/devel/py-google-apputils/Makefile b/devel/py-google-apputils/Makefile
index 07b6baba91b..acc479752a5 100644
--- a/devel/py-google-apputils/Makefile
+++ b/devel/py-google-apputils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2018/07/03 05:03:11 adam Exp $
+# $NetBSD: Makefile,v 1.8 2019/04/26 13:13:51 maya Exp $
 
 DISTNAME=	google-apputils-0.4.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -11,7 +11,7 @@ HOMEPAGE=	https://github.com/google/google-apputils
 COMMENT=	Google Application Utilities for Python
 LICENSE=	apache-2.0
 
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37
 
 # https://github.com/google/google-apputils/issues/4
 post-extract:
diff --git a/devel/py-hg-evolve/Makefile b/devel/py-hg-evolve/Makefile
index c89d52b496f..7666a769cf5 100644
--- a/devel/py-hg-evolve/Makefile
+++ b/devel/py-hg-evolve/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2019/04/11 13:27:55 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2019/04/26 13:13:51 maya Exp $
 
 DISTNAME=	hg-evolve-8.4.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -13,7 +13,7 @@ LICENSE=	gnu-gpl-v2
 
 DEPENDS+=	${PYPKGPREFIX}-mercurial>=4.3.1:../../devel/py-mercurial
 
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # See Mercurial itself.
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37 # See Mercurial itself.
 
 post-install:
 	rm -f ${DESTDIR}${PREFIX}/${PYSITELIB}/hgext3rd/__init__.py*
diff --git a/devel/py-hg-fastimport/Makefile b/devel/py-hg-fastimport/Makefile
index c2cb7f744b8..c9e91cf390f 100644
--- a/devel/py-hg-fastimport/Makefile
+++ b/devel/py-hg-fastimport/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2018/07/03 05:03:11 adam Exp $
+# $NetBSD: Makefile,v 1.9 2019/04/26 13:13:51 maya Exp $
 
 DISTNAME=	danielj7-hg-fastimport-d41a42894dfa
 PKGNAME=	${PYPKGPREFIX}-hg-fastimport-20170211
@@ -19,7 +19,7 @@ USE_LANGUAGES=	# none
 
 INSTALLATION_DIRS+=	${PYSITELIB}/hgfastimport share/doc/py-hg-fastimport
 
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # py-mercurial
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37 # py-mercurial
 PY_PATCHPLIST=			yes
 
 do-build:
diff --git a/devel/py-hg-git/Makefile b/devel/py-hg-git/Makefile
index 9be5e05eed2..7a87e3a1143 100644
--- a/devel/py-hg-git/Makefile
+++ b/devel/py-hg-git/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2018/07/03 05:03:11 adam Exp $
+# $NetBSD: Makefile,v 1.11 2019/04/26 13:13:52 maya Exp $
 
 DISTNAME=	0.8.10
 PKGNAME=	${PYPKGPREFIX}-hg-git-${DISTNAME}
@@ -18,7 +18,7 @@ WRKSRC=		${WRKDIR}/durin42-hg-git-6ef27582bfa5
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # as of 0.8.3
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37 # as of 0.8.3
 EGG_NAME=	hg_git-${DISTNAME}
 
 .include "../../lang/python/egg.mk"
diff --git a/devel/py-hglist/Makefile b/devel/py-hglist/Makefile
index 29886e31870..13659bef3bc 100644
--- a/devel/py-hglist/Makefile
+++ b/devel/py-hglist/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2018/07/03 05:03:11 adam Exp $
+# $NetBSD: Makefile,v 1.7 2019/04/26 13:13:52 maya Exp $
 
 DISTNAME=	hglist-0.3
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -14,7 +14,7 @@ USE_LANGUAGES=	# none
 
 DEPENDS+=	${PYPKGPREFIX}-mercurial-[0-9]*:../../devel/py-mercurial
 
-PYTHON_VERSIONS_INCOMPATIBLE=   34 35 36 37
+PYTHON_VERSIONS_INCOMPATIBLE=    36 37
 
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-hgnested/Makefile b/devel/py-hgnested/Makefile
index 4c37e005d1c..4d110c0d3ca 100644
--- a/devel/py-hgnested/Makefile
+++ b/devel/py-hgnested/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2018/07/03 05:03:11 adam Exp $
+# $NetBSD: Makefile,v 1.11 2019/04/26 13:13:52 maya Exp $
 
 DISTNAME=	hgnested-0.8
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -14,7 +14,7 @@ USE_LANGUAGES=	# none
 
 DEPENDS+=	${PYPKGPREFIX}-mercurial>=1.6:../../devel/py-mercurial
 
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37	# XXX: devel/py-mercurial
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37	# XXX: devel/py-mercurial
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-hgview/Makefile b/devel/py-hgview/Makefile
index 7cb5dd00efc..f374a32816c 100644
--- a/devel/py-hgview/Makefile
+++ b/devel/py-hgview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2018/07/03 05:03:11 adam Exp $
+# $NetBSD: Makefile,v 1.20 2019/04/26 13:13:52 maya Exp $
 
 DISTNAME=	hgview-1.8.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -17,7 +17,7 @@ BUILD_DEPENDS+=	asciidoc-[0-9]*:../../textproc/asciidoc
 BUILD_DEPENDS+=	xmlto-[0-9]*:../../textproc/xmlto
 
 REPLACE_PYTHON= *.py
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # not yet ported as of 1.8.0
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37 # not yet ported as of 1.8.0
 
 USE_TOOLS+=	gmake
 
diff --git a/devel/py-ipaddr/Makefile b/devel/py-ipaddr/Makefile
index 02aae98cbac..c0eaa54559a 100644
--- a/devel/py-ipaddr/Makefile
+++ b/devel/py-ipaddr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2018/07/03 05:03:11 adam Exp $
+# $NetBSD: Makefile,v 1.13 2019/04/26 13:13:52 maya Exp $
 
 DISTNAME=	ipaddr-2.2.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -11,7 +11,7 @@ HOMEPAGE=	https://github.com/google/ipaddr-py
 COMMENT=	Google open source IPv4/IPv6 manipulation library in Python
 LICENSE=	apache-2.0
 
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # not yet ported as of 2.1.10
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37 # not yet ported as of 2.1.10
 REPLACE_PYTHON+=		ipaddr.py
 
 .include "../../lang/python/distutils.mk"
diff --git a/devel/py-ipython010/Makefile b/devel/py-ipython010/Makefile
index e4acb84aa3b..56c58977ef9 100644
--- a/devel/py-ipython010/Makefile
+++ b/devel/py-ipython010/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2018/07/03 05:03:12 adam Exp $
+# $NetBSD: Makefile,v 1.7 2019/04/26 13:13:52 maya Exp $
 
 DISTNAME=	ipython-0.10.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -15,7 +15,7 @@ DEPENDS+=	${PYPKGPREFIX}-readline-[0-9]*:../../devel/py-readline
 DEPENDS+=	${PYPKGPREFIX}-pexpect-[0-9]*:../../devel/py-pexpect
 
 PYTHON_SELF_CONFLICT=	yes
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # not yet ported as of 0.10.2 (1.0 is out)
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37 # not yet ported as of 0.10.2 (1.0 is out)
 
 USE_LANGUAGES=	# none
 USE_TOOLS+=	gunzip
diff --git a/devel/py-jersey/Makefile b/devel/py-jersey/Makefile
index ff5f145d266..871f5b809cb 100644
--- a/devel/py-jersey/Makefile
+++ b/devel/py-jersey/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2018/07/03 05:03:12 adam Exp $
+# $NetBSD: Makefile,v 1.16 2019/04/26 13:13:52 maya Exp $
 
 DISTNAME=	jersey-0.1.5
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -15,7 +15,7 @@ LICENSE=	modified-bsd
 DEPENDS+=	${PYPKGPREFIX}-twisted>=10.0.0:../../net/py-twisted
 DEPENDS+=	${PYPKGPREFIX}-automat-[0-9]*:../../devel/py-automat
 
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # as of 0.1.5
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37 # as of 0.1.5
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-kjbuckets/Makefile b/devel/py-kjbuckets/Makefile
index dd5f256bd5f..9c724bbf326 100644
--- a/devel/py-kjbuckets/Makefile
+++ b/devel/py-kjbuckets/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2018/07/03 05:03:12 adam Exp $
+# $NetBSD: Makefile,v 1.19 2019/04/26 13:13:52 maya Exp $
 
 DISTNAME=	gadfly-1.0.0
 PKGNAME=	${PYPKGPREFIX}-kjbuckets-2.2
@@ -15,7 +15,7 @@ EXTRACT_ELEMENTS+=	${DISTNAME}/doc/kjbuckets.txt
 WRKSRC=			${WRKDIR}/${DISTNAME}/kjbuckets
 
 PLIST_SUBST+=	PYPKGPREFIX=${PYPKGPREFIX:Q}
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # not yet ported as of 1.0.0 resp. 2.2
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37 # not yet ported as of 1.0.0 resp. 2.2
 
 KJBDOCDIR=	${PREFIX}/share/doc/${PYPKGPREFIX}-kjbuckets
 
diff --git a/devel/py-kqueue/Makefile b/devel/py-kqueue/Makefile
index 97f98dbe66d..0428cffcfca 100644
--- a/devel/py-kqueue/Makefile
+++ b/devel/py-kqueue/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2018/07/03 05:03:12 adam Exp $
+# $NetBSD: Makefile,v 1.20 2019/04/26 13:13:52 maya Exp $
 
 DISTNAME=	py-kqueue-2.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/py-//}
@@ -18,7 +18,7 @@ PKG_SKIP_REASON+= "${PKGNAME} is not available for ${MACHINE_PLATFORM}; needs OS
 .endif
 
 EGG_NAME=	${DISTNAME:S/py-//}
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # not yet ported as of 2.0
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37 # not yet ported as of 2.0
 
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-mercurial/Makefile.version b/devel/py-mercurial/Makefile.version
index 5cc121c0fd4..17675fcda29 100644
--- a/devel/py-mercurial/Makefile.version
+++ b/devel/py-mercurial/Makefile.version
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.version,v 1.69 2019/03/26 06:20:17 wiz Exp $
+# $NetBSD: Makefile.version,v 1.70 2019/04/26 13:13:52 maya Exp $
 
 VERSION=	4.9.1
 
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # not yet ported as of 4.9.1
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37 # not yet ported as of 4.9.1
 # see also https://www.mercurial-scm.org/wiki/SupportedPythonVersions
 # and https://www.mercurial-scm.org/wiki/Python3
 #
diff --git a/devel/py-meson/Makefile b/devel/py-meson/Makefile
index 9175f5e89cc..300d79b18a4 100644
--- a/devel/py-meson/Makefile
+++ b/devel/py-meson/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2019/03/13 12:51:13 prlw1 Exp $
+# $NetBSD: Makefile,v 1.20 2019/04/26 13:13:52 maya Exp $
 
 DISTNAME=	meson-0.50.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -12,7 +12,7 @@ LICENSE=	apache-2.0
 
 DEPENDS+=	ninja-build-[0-9]*:../../devel/ninja-build
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 34
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 # c++ for tests
 USE_LANGUAGES=	c c++
diff --git a/devel/py-meson/build.mk b/devel/py-meson/build.mk
index 500f44b8308..76e401db139 100644
--- a/devel/py-meson/build.mk
+++ b/devel/py-meson/build.mk
@@ -1,4 +1,4 @@
-# $NetBSD: build.mk,v 1.7 2019/03/13 12:51:13 prlw1 Exp $
+# $NetBSD: build.mk,v 1.8 2019/04/26 13:13:52 maya Exp $
 
 BUILD_DEPENDS+=	${PYPKGPREFIX}-meson-[0-9]*:../../devel/py-meson
 
@@ -19,6 +19,6 @@ meson-install:
 	fi
 	cd ${WRKSRC} && ${SETENV} ${INSTALL_ENV} ninja -C output install
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 34
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 .include "../../lang/python/application.mk"
diff --git a/devel/py-newt/Makefile b/devel/py-newt/Makefile
index 34e3c5a4a31..2c8f77e9757 100644
--- a/devel/py-newt/Makefile
+++ b/devel/py-newt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2018/07/03 05:03:12 adam Exp $
+# $NetBSD: Makefile,v 1.17 2019/04/26 13:13:53 maya Exp $
 
 DISTNAME=	newt-0.52.16
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -19,7 +19,7 @@ USE_LIBTOOL=		yes
 PKGCONFIG_OVERRIDE+=	libnewt.pc.in
 
 PY_PATCHPLIST=		yes
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37
 
 pre-configure:
 	cd ${WRKSRC}; \
diff --git a/devel/py-ode/Makefile b/devel/py-ode/Makefile
index e4f74240f78..496b1f5070d 100644
--- a/devel/py-ode/Makefile
+++ b/devel/py-ode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2018/07/03 05:03:12 adam Exp $
+# $NetBSD: Makefile,v 1.5 2019/04/26 13:13:53 maya Exp $
 
 DISTNAME=	PyODE-1.2.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/Py//:tl}
@@ -11,7 +11,7 @@ HOMEPAGE=	http://pyode.sourceforge.net/
 COMMENT=	Python wrapper for the Open Dynamics Engine
 LICENSE=	modified-bsd OR gnu-lgpl-v2.1
 
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # as of 1.2.1
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37 # as of 1.2.1
 
 .include "../../devel/ode/buildlink3.mk"
 .include "../../lang/python/distutils.mk"
diff --git a/devel/py-open-vcdiff/Makefile b/devel/py-open-vcdiff/Makefile
index 18956b89e98..8966f7f188f 100644
--- a/devel/py-open-vcdiff/Makefile
+++ b/devel/py-open-vcdiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2018/07/03 05:03:12 adam Exp $
+# $NetBSD: Makefile,v 1.8 2019/04/26 13:13:53 maya Exp $
 
 DISTNAME=	06d46e3de6f7
 PKGNAME=	${PYPKGPREFIX}-open-vcdiff-0.1pre${DISTNAME}
@@ -16,7 +16,7 @@ WRKSRC=		${WRKDIR}/bluehorn-openvcdiff-python-${DISTNAME}
 
 USE_LANGUAGES=	c c++
 
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # not yet ported as of 06d46e3de6f7
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37 # not yet ported as of 06d46e3de6f7
 
 .include "../../devel/open-vcdiff/buildlink3.mk"
 .include "../../lang/python/egg.mk"
diff --git a/devel/py-pqueue/Makefile b/devel/py-pqueue/Makefile
index 83d529fe8c5..b3d7d697e0d 100644
--- a/devel/py-pqueue/Makefile
+++ b/devel/py-pqueue/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2018/07/03 05:03:12 adam Exp $
+# $NetBSD: Makefile,v 1.21 2019/04/26 13:13:53 maya Exp $
 
 DISTNAME=		PQueue-0.2
 PKGNAME=		${PYPKGPREFIX}-pqueue-0.2
@@ -19,7 +19,7 @@ BUILD_TARGET=		default
 
 PY_PATCHPLIST=	yes
 PLIST_SUBST+=	PYPKGPREFIX=${PYPKGPREFIX:Q}
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # not yet ported as of 0.2
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37 # not yet ported as of 0.2
 
 PYQ_DOCDIR=	${PREFIX}/share/doc/${PYPKGPREFIX}-PQueue
 
diff --git a/devel/py-proteus/options.mk b/devel/py-proteus/options.mk
index 0b74f9f4ce8..1b66048d7fc 100644
--- a/devel/py-proteus/options.mk
+++ b/devel/py-proteus/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2018/07/03 05:03:12 adam Exp $
+# $NetBSD: options.mk,v 1.7 2019/04/26 13:13:53 maya Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.py-proteus
 PKG_SUPPORTED_OPTIONS+=	cdecimal simplejson
@@ -12,7 +12,7 @@ PKG_SUGGESTED_OPTIONS+=	simplejson
 # XXX python-Levenshtein (http://github.com/miohtama/python-Levenshtein) options
 
 .if !empty(PKG_OPTIONS:Mcdecimal)
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # py-cdecimal is obsolete for that version and thus not available
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37 # py-cdecimal is obsolete for that version and thus not available
 DEPENDS+=		${PYPKGPREFIX}-cdecimal-[0-9]*:../../math/py-cdecimal
 .endif
 
diff --git a/devel/py-pytemplate/Makefile b/devel/py-pytemplate/Makefile
index 1b277964170..761cb3f9181 100644
--- a/devel/py-pytemplate/Makefile
+++ b/devel/py-pytemplate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2018/07/03 05:03:12 adam Exp $
+# $NetBSD: Makefile,v 1.12 2019/04/26 13:13:53 maya Exp $
 
 DISTNAME=	pytemplate-1.5.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -13,7 +13,7 @@ COMMENT=	Pytemplate gives python developpers a starting framework
 USE_LANGUAGES=			# none
 
 REPLACE_PYTHON=			${WRKSRC}/*.py
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # not yet ported as of 1.5.1
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37 # not yet ported as of 1.5.1
 
 EGDIR=				${PREFIX}/share/examples/${PYPKGPREFIX}-pytemplate
 
diff --git a/devel/py-pyutil/Makefile b/devel/py-pyutil/Makefile
index f5eaa4d06ff..9fef7afb2b7 100644
--- a/devel/py-pyutil/Makefile
+++ b/devel/py-pyutil/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2018/07/03 05:03:12 adam Exp $
+# $NetBSD: Makefile,v 1.21 2019/04/26 13:13:53 maya Exp $
 
 DISTNAME=	pyutil-3.1.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -17,7 +17,7 @@ TEST_DEPENDS+=	${PYPKGPREFIX}-twisted>=15.5.0:../../net/py-twisted
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # py-zbase32
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37 # py-zbase32
 
 post-extract:
 	${FIND} ${WRKSRC} -name __pycache__ -or -name '*.pyc' -exec ${RM} -R {} +
diff --git a/devel/py-quixote/Makefile b/devel/py-quixote/Makefile
index 44bb186e0c7..d982106f87f 100644
--- a/devel/py-quixote/Makefile
+++ b/devel/py-quixote/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2018/07/03 05:03:13 adam Exp $
+# $NetBSD: Makefile,v 1.12 2019/04/26 13:13:53 maya Exp $
 
 DISTNAME=	Quixote-2.9.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:tl}
@@ -10,7 +10,7 @@ HOMEPAGE=	http://quixote.ca/
 COMMENT=	Framework for writing Python web application
 LICENSE=	mit
 
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # v3.0 is for Python 3.x only
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37 # v3.0 is for Python 3.x only
 
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-stompclient/Makefile b/devel/py-stompclient/Makefile
index 97a143f3134..6720830f84b 100644
--- a/devel/py-stompclient/Makefile
+++ b/devel/py-stompclient/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2018/07/03 05:03:13 adam Exp $
+# $NetBSD: Makefile,v 1.13 2019/04/26 13:13:53 maya Exp $
 
 DISTNAME=	stompclient-0.3.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -11,7 +11,7 @@ COMMENT=	Lightweight and extensible STOMP messaging client
 LICENSE=	apache-2.0
 
 USE_LANGUAGES=	# none
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-subvertpy/Makefile b/devel/py-subvertpy/Makefile
index 2fc5e243846..b6aa5667790 100644
--- a/devel/py-subvertpy/Makefile
+++ b/devel/py-subvertpy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2019/04/03 00:32:39 ryoon Exp $
+# $NetBSD: Makefile,v 1.48 2019/04/26 13:13:53 maya Exp $
 
 DISTNAME=	subvertpy-0.9.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -13,7 +13,7 @@ LICENSE=	gnu-lgpl-v2.1
 
 MAKE_ENV+=	SVN_PREFIX=${BUILDLINK_PREFIX.subversion-base}
 
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # not yet ported as of 0.9.1
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37 # not yet ported as of 0.9.1
 
 .include "../../devel/subversion-base/buildlink3.mk"
 .include "../../lang/python/distutils.mk"
diff --git a/devel/py-tabular/Makefile b/devel/py-tabular/Makefile
index 51007374e3f..1425b6fe6f2 100644
--- a/devel/py-tabular/Makefile
+++ b/devel/py-tabular/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2018/07/03 05:03:13 adam Exp $
+# $NetBSD: Makefile,v 1.12 2019/04/26 13:13:53 maya Exp $
 
 DISTNAME=	tabular-0.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -12,7 +12,7 @@ LICENSE=	mit
 
 DEPENDS+=	${PYPKGPREFIX}-matplotlib-[0-9]*:../../graphics/py-matplotlib
 
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # not yet ported as of 0.1
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37 # not yet ported as of 0.1
 
 BUILDLINK_API_DEPENDS.pynumpy+=	${PYPKGPREFIX}-numpy>=1.6
 .include "../../math/py-numpy/buildlink3.mk"
diff --git a/devel/py-test-asyncio/Makefile b/devel/py-test-asyncio/Makefile
index a2ca1ee3c28..97389334d75 100644
--- a/devel/py-test-asyncio/Makefile
+++ b/devel/py-test-asyncio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2019/01/08 09:10:11 adam Exp $
+# $NetBSD: Makefile,v 1.4 2019/04/26 13:13:54 maya Exp $
 
 DISTNAME=	pytest-asyncio-0.10.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/py//}
@@ -19,7 +19,7 @@ DEPENDS+=	${PYPKGPREFIX}-async_generator>=1.3:../../devel/py-async_generator
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 34
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-tortoisehg/Makefile b/devel/py-tortoisehg/Makefile
index 18f9bc7beef..72b1e0eb2a5 100644
--- a/devel/py-tortoisehg/Makefile
+++ b/devel/py-tortoisehg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2018/07/03 05:03:13 adam Exp $
+# $NetBSD: Makefile,v 1.53 2019/04/26 13:13:54 maya Exp $
 
 DISTNAME=		tortoisehg-4.5.3
 PKGNAME=		${PYPKGPREFIX}-${DISTNAME}
@@ -17,7 +17,7 @@ DEPENDS+=	${PYPKGPREFIX}-iniparse>=0.4:../../textproc/py-iniparse
 DEPENDS+=	${PYPKGPREFIX}-pygments>=1.6:../../textproc/py-pygments
 DEPENDS+=	${PYPKGPREFIX}-mercurial>=2.8.1:../../devel/py-mercurial
 
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # py-iniparse, py-mercurial
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37 # py-iniparse, py-mercurial
 
 thg_icon=		/share/pixmaps/tortoisehg/icons/thg_logo.ico
 SUBST_CLASSES+=		df
diff --git a/devel/py-tryton/Makefile b/devel/py-tryton/Makefile
index 97f8050e534..f1b7eea4d5e 100644
--- a/devel/py-tryton/Makefile
+++ b/devel/py-tryton/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2018/11/14 22:21:20 kleink Exp $
+# $NetBSD: Makefile,v 1.35 2019/04/26 13:13:54 maya Exp $
 TRYTON_MODULE_NAME=	tryton
 PKGREVISION= 6
 .include "../../devel/py-trytond/Makefile.common"
@@ -11,7 +11,7 @@ LICENSE=	gnu-gpl-v3
 
 USE_LANGUAGES=		# none
 
-PYTHON_VERSIONS_INCOMPATIBLE=   34 35 36 37
+PYTHON_VERSIONS_INCOMPATIBLE=    36 37
 
 .include "options.mk"
 
diff --git a/devel/py-tryton/options.mk b/devel/py-tryton/options.mk
index 3d568c7fdc0..1b4b37734f2 100644
--- a/devel/py-tryton/options.mk
+++ b/devel/py-tryton/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.9 2018/07/03 05:03:13 adam Exp $
+# $NetBSD: options.mk,v 1.10 2019/04/26 13:13:54 maya Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.py-tryton
 PKG_SUPPORTED_OPTIONS=	cdecimal goocalendar pytz simplejson
@@ -7,12 +7,12 @@ PKG_SUGGESTED_OPTIONS+=	cdecimal pytz simplejson
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mcdecimal)
-PYTHON_VERSIONS_INCOMPATIBLE+=	34 35 36 37 # py-cdecimal not available because obsolete
+PYTHON_VERSIONS_INCOMPATIBLE+=	 36 37 # py-cdecimal not available because obsolete
 DEPENDS+=		${PYPKGPREFIX}-cdecimal-[0-9]*:../../math/py-cdecimal
 .endif
 
 .if !empty(PKG_OPTIONS:Mgoocalendar)
-PYTHON_VERSIONS_INCOMPATIBLE+=	34 35 36 37 # py-gtk2 via py-goocanvas via py-goocalendar
+PYTHON_VERSIONS_INCOMPATIBLE+=	 36 37 # py-gtk2 via py-goocanvas via py-goocalendar
 DEPENDS+=		${PYPKGPREFIX}-goocalendar-[0-9]*:../../time/py-goocalendar
 .endif
 
diff --git a/devel/py-trytond/Makefile.common b/devel/py-trytond/Makefile.common
index 493fec0dd14..fea7e74a2c6 100644
--- a/devel/py-trytond/Makefile.common
+++ b/devel/py-trytond/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.14 2018/07/03 05:03:13 adam Exp $
+# $NetBSD: Makefile.common,v 1.15 2019/04/26 13:13:54 maya Exp $
 
 # used by databases/py-ldap-authentication/Makefile
 # used by devel/py-proteus/Makefile
@@ -255,7 +255,7 @@ MASTER_SITES=   ${TRYTON_SITES}
 
 DIST_SUBDIR=	tryton-${TRYTON_BASEVER}
 
-PYTHON_VERSIONS_INCOMPATIBLE=   34 35 36 37 # py-gtk2 via py-pycha via py-relatorio
+PYTHON_VERSIONS_INCOMPATIBLE=    36 37 # py-gtk2 via py-pycha via py-relatorio
 # predefine these so modules don't have to.
 PY_PATCHPLIST=	yes
 PLIST_SUBST+=	PYVERSSUFFIX=${PYVERSSUFFIX}
diff --git a/devel/py-trytond/options.mk b/devel/py-trytond/options.mk
index 2f8dd8a21fb..4810e23845e 100644
--- a/devel/py-trytond/options.mk
+++ b/devel/py-trytond/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.12 2018/07/03 05:03:13 adam Exp $
+# $NetBSD: options.mk,v 1.13 2019/04/26 13:13:54 maya Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.py-trytond
 PKG_SUPPORTED_OPTIONS=	cdecimal mysql pydot psycopg pytz simplejson sphinx
@@ -10,12 +10,12 @@ PKG_SUGGESTED_OPTIONS+=	psycopg pytz simplejson sphinx
 # XXX: python-Levenshtein (http://github.com/miohtama/python-Levenshtein) option
 
 .if !empty(PKG_OPTIONS:Mcdecimal)
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # py-cdecimal is obsolete for that version and thus not available
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37 # py-cdecimal is obsolete for that version and thus not available
 DEPENDS+=		${PYPKGPREFIX}-cdecimal-[0-9]*:../../math/py-cdecimal
 .endif
 
 .if !empty(PKG_OPTIONS:Mmysql)
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # py-mysqldb
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37 # py-mysqldb
 DEPENDS+=		${PYPKGPREFIX}-mysqldb-[0-9]*:../../databases/py-mysqldb
 .endif
 
diff --git a/devel/py-typing/Makefile b/devel/py-typing/Makefile
index f407cf09009..a10f15d3de6 100644
--- a/devel/py-typing/Makefile
+++ b/devel/py-typing/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2018/08/27 06:15:13 adam Exp $
+# $NetBSD: Makefile,v 1.8 2019/04/26 13:13:54 maya Exp $
 
 DISTNAME=	typing-3.6.6
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -12,7 +12,7 @@ LICENSE=	python-software-foundation
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_INCOMPATIBLE=	35 36 37	# introduced in Python 3.5
+PYTHON_VERSIONS_INCOMPATIBLE=	36 37	# introduced in Python 3.5
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-unit/Makefile b/devel/py-unit/Makefile
index d664e6e8e9a..2cfae74314b 100644
--- a/devel/py-unit/Makefile
+++ b/devel/py-unit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2018/07/03 05:03:13 adam Exp $
+# $NetBSD: Makefile,v 1.22 2019/04/26 13:13:54 maya Exp $
 
 DISTNAME=	pyunit-1.4.1
 PKGNAME=	${PYPKGPREFIX}-unit-1.4.1
@@ -13,7 +13,7 @@ COMMENT=	Unit testing framework for python
 EGG_NAME=	PyUnit-${PKGVERSION_NOREV}
 
 PYTHON_SELF_CONFLICT=	yes
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37
 
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-unitgui/Makefile b/devel/py-unitgui/Makefile
index 559a91bc5c9..7413f147d94 100644
--- a/devel/py-unitgui/Makefile
+++ b/devel/py-unitgui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2018/07/03 05:03:13 adam Exp $
+# $NetBSD: Makefile,v 1.22 2019/04/26 13:13:54 maya Exp $
 
 DISTNAME=	pyunit-1.4.1
 PKGNAME=	${PYPKGPREFIX}-unitgui-1.4.1
@@ -14,7 +14,7 @@ DEPENDS+=	${PYPKGPREFIX}-Tk-[0-9]*:../../x11/py-Tk
 
 EGG_NAME=	PyUnit-${PKGVERSION_NOREV}
 
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37
 
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-usb/Makefile b/devel/py-usb/Makefile
index dab49a5c7c2..ff791035c0e 100644
--- a/devel/py-usb/Makefile
+++ b/devel/py-usb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2018/07/03 05:03:13 adam Exp $
+# $NetBSD: Makefile,v 1.18 2019/04/26 13:13:54 maya Exp $
 
 VERSION=	1.0.0
 PKGREVISION=	1
@@ -15,7 +15,7 @@ LICENSE=	modified-bsd
 
 CFLAGS.SunOS+=	-Du_int8_t=uint8_t -Du_int16_t=uint16_t -Du_int32_t=uint32_t
 
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # not yet ported as of 0.4.2
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37 # not yet ported as of 0.4.2
 
 .include "../../mk/libusb.buildlink3.mk"
 .include "../../lang/python/distutils.mk"
diff --git a/devel/py-uuid/Makefile b/devel/py-uuid/Makefile
index dbf19b8a18c..146fb8d4242 100644
--- a/devel/py-uuid/Makefile
+++ b/devel/py-uuid/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2018/07/03 05:03:14 adam Exp $
+# $NetBSD: Makefile,v 1.5 2019/04/26 13:13:54 maya Exp $
 
 DISTNAME=	uuid-1.30
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -13,7 +13,7 @@ LICENSE=	generic-nonlicense
 
 USE_LANGUAGES=	# none
 
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # not yet ported as of 1.30
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37 # not yet ported as of 1.30
 
 .include "../../lang/python/distutils.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-uvloop/Makefile b/devel/py-uvloop/Makefile
index eb7e2f6c826..9d50bbf9092 100644
--- a/devel/py-uvloop/Makefile
+++ b/devel/py-uvloop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2019/03/21 10:15:41 adam Exp $
+# $NetBSD: Makefile,v 1.18 2019/04/26 13:13:54 maya Exp $
 
 DISTNAME=	uvloop-0.12.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -12,7 +12,7 @@ LICENSE=	mit AND apache-2.0
 
 BUILD_DEPENDS+=	${PYPKGPREFIX}-cython-[0-9]*:../../devel/py-cython
 
-PYTHON_VERSIONS_INCOMPATIBLE=	27 34
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 .include "../../devel/libuv/buildlink3.mk"
 .include "../../lang/python/egg.mk"
diff --git a/devel/py-windbg/Makefile b/devel/py-windbg/Makefile
index c19c20065ba..caca8004327 100644
--- a/devel/py-windbg/Makefile
+++ b/devel/py-windbg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2018/07/03 05:03:14 adam Exp $
+# $NetBSD: Makefile,v 1.18 2019/04/26 13:13:55 maya Exp $
 
 DISTNAME=	winpdb-1.4.6
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -13,7 +13,7 @@ LICENSE=	gnu-gpl-v2 # or later
 
 DEPENDS+=	${PYPKGPREFIX}-wxWidgets>=2.6:../../x11/py-wxWidgets
 
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # py-wxWidgets
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37 # py-wxWidgets
 
 USE_LANGUAGES=	#none
 
diff --git a/devel/py-zanata-python-client/Makefile b/devel/py-zanata-python-client/Makefile
index 1bfef9c730f..0d5bbc7e9ca 100644
--- a/devel/py-zanata-python-client/Makefile
+++ b/devel/py-zanata-python-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2018/07/03 05:03:14 adam Exp $
+# $NetBSD: Makefile,v 1.12 2019/04/26 13:13:55 maya Exp $
 
 DISTNAME=	zanata-python-client-1.5.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -17,7 +17,7 @@ DEPENDS+=	${PYPKGPREFIX}-polib-[0-9]*:../../devel/py-polib
 DEPENDS+=	${PYPKGPREFIX}-lxml-[0-9]*:../../textproc/py-lxml
 
 # Marked for 2.6 and 2.7 only
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37
 USE_LANGUAGES=	# none
 
 SUBST_CLASSES+=			version
diff --git a/devel/qbzr/Makefile b/devel/qbzr/Makefile
index 6d1fdb3eadf..8c1f7978280 100644
--- a/devel/qbzr/Makefile
+++ b/devel/qbzr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2019/04/25 07:32:49 maya Exp $
+# $NetBSD: Makefile,v 1.26 2019/04/26 13:13:55 maya Exp $
 
 DISTNAME=	qbzr-${VER}
 PKGREVISION=	4
@@ -17,7 +17,7 @@ USE_TOOLS+=	msgfmt
 
 WRKSRC=		${WRKDIR}/qbzr
 
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # not yet ported as of 0.22.1
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37 # not yet ported as of 0.22.1
 REPLACE_PYTHON=		lib/uifactory.py
 
 .include "../../devel/bzr/plugin.mk"
diff --git a/devel/roundup/Makefile b/devel/roundup/Makefile
index 5e41073309e..14a559c5e4e 100644
--- a/devel/roundup/Makefile
+++ b/devel/roundup/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2019/04/25 07:32:49 maya Exp $
+# $NetBSD: Makefile,v 1.54 2019/04/26 13:13:55 maya Exp $
 
 DISTNAME=	roundup-1.4.19
 PKGREVISION=	3
@@ -13,7 +13,7 @@ LICENSE=	mit AND zpl-2.0
 USE_LANGUAGES=	# empty
 USE_TOOLS+=	pax
 
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # not yet ported as of 1.4.19
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37 # not yet ported as of 1.4.19
 REPLACE_PYTHON+=	cgi-bin/roundup.cgi demo.py roundup/admin.py
 REPLACE_PYTHON+=	frontends/roundup.cgi
 REPLACE_PYTHON+=	roundup/backends/locking.py
diff --git a/devel/rox-lib/Makefile b/devel/rox-lib/Makefile
index 4a91daf699c..4a9e606572c 100644
--- a/devel/rox-lib/Makefile
+++ b/devel/rox-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2019/04/25 07:32:50 maya Exp $
+# $NetBSD: Makefile,v 1.28 2019/04/26 13:13:55 maya Exp $
 
 DISTNAME=	rox-lib-2.0.2
 PKGREVISION=	15
@@ -24,7 +24,7 @@ USE_TOOLS+=	pax
 REPLACE_PYTHON=	AppRun MakeDist
 REPLACE_PYTHON+=	python/make_docs.py
 REPLACE_PYTHON+=	tests/python/*.py
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # py-gtk2
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37 # py-gtk2
 
 INSTALLATION_DIRS=	share/rox/ROX-Lib2
 
diff --git a/devel/stgit/Makefile b/devel/stgit/Makefile
index 130066ed2dd..1362e769724 100644
--- a/devel/stgit/Makefile
+++ b/devel/stgit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2019/04/25 07:32:50 maya Exp $
+# $NetBSD: Makefile,v 1.38 2019/04/26 13:13:55 maya Exp $
 
 DISTNAME=	stgit-0.17.1
 PKGREVISION=	13
@@ -24,7 +24,7 @@ REPLACE_BASH=	contrib/stg-*
 
 REPLACE_PYTHON=	*.py stgit/*.py stg
 PYSETUPINSTALLARGS=	--prefix=${PREFIX}
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # not yet ported as of 0.17.1
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37 # not yet ported as of 0.17.1
 
 MAKE_ENV+=	ASCIIDOC=${PREFIX}/bin/asciidoc
 
diff --git a/devel/tailor/Makefile b/devel/tailor/Makefile
index 9607c9f39f4..1becc55f6f8 100644
--- a/devel/tailor/Makefile
+++ b/devel/tailor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2019/04/25 07:32:50 maya Exp $
+# $NetBSD: Makefile,v 1.30 2019/04/26 13:13:55 maya Exp $
 
 DISTNAME=		tailor-0.9.35
 PKGREVISION=		6
@@ -12,7 +12,7 @@ LICENSE=		gnu-gpl-v3
 
 USE_LANGUAGES=		#none
 
-PYTHON_VERSIONS_INCOMPATIBLE=  34 35 36 37 # not yet ported as of 0.9.35
+PYTHON_VERSIONS_INCOMPATIBLE=   36 37 # not yet ported as of 0.9.35
 REPLACE_PYTHON=		tailor
 
 AUTO_MKDIRS=		yes
diff --git a/devel/umbrello/Makefile b/devel/umbrello/Makefile
index 01d4e69aca9..125de473a5f 100644
--- a/devel/umbrello/Makefile
+++ b/devel/umbrello/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.46 2019/04/25 07:32:50 maya Exp $
+# $NetBSD: Makefile,v 1.47 2019/04/26 13:13:55 maya Exp $
 
 DISTNAME=	umbrello-${_KDE_VERSION}
 PKGREVISION=	13
 CATEGORIES=	devel
 COMMENT=	UML Modeller
 
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 37 # not yet ported as of 4.11.3
+PYTHON_VERSIONS_INCOMPATIBLE=	 36 37 # not yet ported as of 4.11.3
 
 .include "../../meta-pkgs/kde4/Makefile.kde4"
 
diff --git a/devel/xulrunner192/mozilla-common.mk b/devel/xulrunner192/mozilla-common.mk
index 5c47ff790c1..7ffecc36421 100644
--- a/devel/xulrunner192/mozilla-common.mk
+++ b/devel/xulrunner192/mozilla-common.mk
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.14 2018/07/18 00:06:13 joerg Exp $
+# $NetBSD: mozilla-common.mk,v 1.15 2019/04/26 13:13:55 maya Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -48,7 +48,7 @@ CONFIG_SUB_OVERRIDE+=		${MOZILLA_DIR}nsprpub/build/autoconf/config.sub
 CONFIG_SUB_OVERRIDE+=		${MOZILLA_DIR}/js/ctypes/libffi/config.sub
 
 PYTHON_FOR_BUILD_ONLY=		yes
-PYTHON_VERSIONS_INCOMPATIBLE=  34 35 36 37 # not yet ported as of 1.9.2.28
+PYTHON_VERSIONS_INCOMPATIBLE=   36 37 # not yet ported as of 1.9.2.28
 .include "../../lang/python/application.mk"
 CONFIGURE_ENV+=		PYTHON=${PYTHONBIN:Q}