diff --git a/converters/Makefile b/converters/Makefile
index b8da321f1a2..e70bd74e0cf 100644
--- a/converters/Makefile
+++ b/converters/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.106 2021/07/21 18:31:43 sthen Exp $
+# $OpenBSD: Makefile,v 1.107 2021/10/24 09:28:46 sthen Exp $
 
     SUBDIR =
     SUBDIR += base64
@@ -76,7 +76,6 @@
     SUBDIR += pflogx
     SUBDIR += ppmtoTbmp
     SUBDIR += py-html2text,python3
-    SUBDIR += py-num2words
     SUBDIR += py-num2words,python3
     SUBDIR += qprint
     SUBDIR += recode
diff --git a/converters/py-num2words/Makefile b/converters/py-num2words/Makefile
index 2e375bdd21f..71f0cc8aaf5 100644
--- a/converters/py-num2words/Makefile
+++ b/converters/py-num2words/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.4 2021/05/21 19:50:22 kmos Exp $
+# $OpenBSD: Makefile,v 1.5 2021/10/24 09:28:47 sthen Exp $
 
 COMMENT =	convert numbers to words
 
 MODPY_EGG_VERSION =	0.5.10
 DISTNAME =		num2words-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
-REVISION =		1
+REVISION =		2
 
 CATEGORIES =	converters
 
@@ -17,7 +17,7 @@ PERMIT_PACKAGE =	Yes
 MODULES =	lang/python
 
 FLAVORS =	python3
-FLAVOR ?=
+FLAVOR =	python3
 
 MODPY_PI =		Yes
 MODPY_SETUPTOOLS =	Yes
diff --git a/converters/py-num2words/pkg/PLIST b/converters/py-num2words/pkg/PLIST
index b89f1d0aa2f..4c5e0d729be 100644
--- a/converters/py-num2words/pkg/PLIST
+++ b/converters/py-num2words/pkg/PLIST
@@ -1,4 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2019/06/15 12:13:04 robert Exp $
+@comment $OpenBSD: PLIST,v 1.2 2021/10/24 09:28:47 sthen Exp $
+@pkgpath converters/py-num2words
+@conflict py-num2words-*
 bin/num2words
 lib/python${MODPY_VERSION}/site-packages/num2words/
 lib/python${MODPY_VERSION}/site-packages/num2words-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
diff --git a/databases/Makefile b/databases/Makefile
index a460c1f65b4..7a60bafa74a 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.429 2021/10/11 09:36:30 kn Exp $
+# $OpenBSD: Makefile,v 1.430 2021/10/24 09:28:46 sthen Exp $
 
      SUBDIR =
      SUBDIR += architect
@@ -179,7 +179,6 @@
      SUBDIR += py-puppetdb,python3
      SUBDIR += py-pygresql,python3
      SUBDIR += py-pymysql,python3
-     SUBDIR += py-redis
      SUBDIR += py-redis,python3
      SUBDIR += py-sql
      SUBDIR += py-sql,python3
diff --git a/databases/py-redis/Makefile b/databases/py-redis/Makefile
index b4d221b7ce1..f992e7fcac8 100644
--- a/databases/py-redis/Makefile
+++ b/databases/py-redis/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.39 2021/05/21 19:50:22 kmos Exp $
+# $OpenBSD: Makefile,v 1.40 2021/10/24 09:28:47 sthen Exp $
 
 COMMENT =		Python interface to Redis
 
@@ -10,7 +10,7 @@ GH_TAGNAME =		${MODPY_EGG_VERSION}
 
 PKGNAME =		py-redis-${MODPY_EGG_VERSION}
 CATEGORIES =		databases
-REVISION =		0
+REVISION =		1
 
 HOMEPAGE =		https://github.com/andymccurdy/redis-py/
 
@@ -22,7 +22,7 @@ PERMIT_PACKAGE =	Yes
 MODULES =		lang/python
 
 FLAVORS =		python3
-FLAVOR ?=
+FLAVOR =		python3
 
 MODPY_SETUPTOOLS =	Yes
 MODPY_PYTEST =		Yes
diff --git a/databases/py-redis/pkg/PLIST b/databases/py-redis/pkg/PLIST
index 9e82b9de54a..b015c27eed3 100644
--- a/databases/py-redis/pkg/PLIST
+++ b/databases/py-redis/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.10 2020/02/16 13:02:19 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.11 2021/10/24 09:28:47 sthen Exp $
+@pkgpath databases/py-redis
 lib/python${MODPY_VERSION}/site-packages/redis/
 lib/python${MODPY_VERSION}/site-packages/redis-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/redis-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
diff --git a/devel/Makefile b/devel/Makefile
index e1c9a313156..5228e728c69 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2135 2021/10/21 20:41:21 sthen Exp $
+# $OpenBSD: Makefile,v 1.2136 2021/10/24 09:28:46 sthen Exp $
 
      SUBDIR =
      SUBDIR += 64tass
@@ -1331,7 +1331,6 @@
      SUBDIR += py-buildbot
      SUBDIR += py-buildslave
      SUBDIR += py-bytecodeassembler
-     SUBDIR += py-cached-property
      SUBDIR += py-cached-property,python3
      SUBDIR += py-cachetools,python3
      SUBDIR += py-cairocffi
@@ -1364,11 +1363,9 @@
      SUBDIR += py-contextlib2,python3
      SUBDIR += py-cooldict
      SUBDIR += py-cooldict,python3
-     SUBDIR += py-country
      SUBDIR += py-country,python3
      SUBDIR += py-coverage
      SUBDIR += py-coverage,python3
-     SUBDIR += py-coveralls
      SUBDIR += py-coveralls,python3
      SUBDIR += py-cparser
      SUBDIR += py-cparser,python3
@@ -1408,11 +1405,9 @@
      SUBDIR += py-execnet,python3
      SUBDIR += py-extras
      SUBDIR += py-extras,python3
-     SUBDIR += py-fasteners
      SUBDIR += py-fasteners,python3
      SUBDIR += py-fastimport,python3
      SUBDIR += py-faulthandler
-     SUBDIR += py-fields
      SUBDIR += py-fields,python3
      SUBDIR += py-filebytes
      SUBDIR += py-filebytes,python3
@@ -1450,11 +1445,9 @@
      SUBDIR += py-hachoir-metadata
      SUBDIR += py-hachoir-parser
      SUBDIR += py-hamcrest,python3
-     SUBDIR += py-html5lib
      SUBDIR += py-html5lib,python3
      SUBDIR += py-hypothesis
      SUBDIR += py-hypothesis,python3
-     SUBDIR += py-icalendar
      SUBDIR += py-icalendar,python3
      SUBDIR += py-importlib_resources,python3
      SUBDIR += py-importlib-metadata,python3
@@ -1524,13 +1517,11 @@
      SUBDIR += py-nose-warnings-filters,python3
      SUBDIR += py-nosexcover
      SUBDIR += py-nosexcover,python3
-     SUBDIR += py-objgraph
      SUBDIR += py-objgraph,python3
      SUBDIR += py-olefile
      SUBDIR += py-olefile,python3
      SUBDIR += py-parallel
      SUBDIR += py-parallel,python3
-     SUBDIR += py-parsedatetime
      SUBDIR += py-parsedatetime,python3
      SUBDIR += py-parsing
      SUBDIR += py-parsing,python3
@@ -1578,11 +1569,10 @@
      SUBDIR += py-python2-pythondialog
      SUBDIR += py-qt-builder,python3
      SUBDIR += py-r2pipe,python3
-     SUBDIR += py-radix
      SUBDIR += py-radix,python3
      SUBDIR += py-rcsparse
      SUBDIR += py-rcsparse,python3
-     SUBDIR += py-regex,python3 
+     SUBDIR += py-regex,python3
      SUBDIR += py-rencode
      SUBDIR += py-rencode,python3
      SUBDIR += py-resolvelib,python3
@@ -1719,7 +1709,6 @@
      SUBDIR += py-yamllint,python3
      SUBDIR += py-yapf
      SUBDIR += py-yapf,python3
-     SUBDIR += py-zc-lockfile
      SUBDIR += py-zc-lockfile,python3
      SUBDIR += py-zipp,python3
      SUBDIR += py-zopecomponent,python3
diff --git a/devel/py-cached-property/Makefile b/devel/py-cached-property/Makefile
index 77c026f895d..c0e981f2abc 100644
--- a/devel/py-cached-property/Makefile
+++ b/devel/py-cached-property/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.6 2021/05/21 19:50:24 kmos Exp $
+# $OpenBSD: Makefile,v 1.7 2021/10/24 09:28:47 sthen Exp $
 
 COMMENT =	decorator for caching properties in classes
 
 MODPY_EGG_VERSION = 1.5.1
 DISTNAME =	cached-property-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME}
-REVISION =	2
+REVISION =	3
 
 CATEGORIES =	devel
 
@@ -19,7 +19,7 @@ MODPY_PI =		Yes
 MODPY_SETUPTOOLS =	Yes
 
 FLAVORS =	python3
-FLAVOR ?=
+FLAVOR =	python3
 
 TEST_DEPENDS +=		devel/py-freezegun${MODPY_FLAVOR} \
 			devel/py-dateutil${MODPY_FLAVOR}
diff --git a/devel/py-cached-property/pkg/PLIST b/devel/py-cached-property/pkg/PLIST
index a2a0b544d0f..7846395e621 100644
--- a/devel/py-cached-property/pkg/PLIST
+++ b/devel/py-cached-property/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2018/08/16 18:25:10 danj Exp $
+@comment $OpenBSD: PLIST,v 1.2 2021/10/24 09:28:47 sthen Exp $
+@pkgpath devel/py-cached-property
 lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}cached_property.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/cached_property-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/cached_property-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
diff --git a/devel/py-country/Makefile b/devel/py-country/Makefile
index 7384e207b66..73312b80aa4 100644
--- a/devel/py-country/Makefile
+++ b/devel/py-country/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.31 2021/05/21 19:50:24 kmos Exp $
+# $OpenBSD: Makefile,v 1.32 2021/10/24 09:28:47 sthen Exp $
 
 COMMENT =		country, language, currency and scripts definitions
 
 MODPY_EGG_VERSION =	19.8.18
 DISTNAME =		pycountry-${MODPY_EGG_VERSION}
 PKGNAME =		${DISTNAME:S/py/py-/}
-REVISION =		1
+REVISION =		2
 
 CATEGORIES =		devel
 
@@ -21,10 +21,7 @@ MODPY_PYTEST_ARGS =	src
 
 TEST_ENV =		PYTHONPATH=${WRKSRC}/lib
 
-# Upstream has "dropped support" for python2, but it still
-# works, but it should be checked before future updates
-
 FLAVORS =		python3
-FLAVOR ?=
+FLAVOR =		python3
 
 .include <bsd.port.mk>
diff --git a/devel/py-country/pkg/PLIST b/devel/py-country/pkg/PLIST
index 6d6220dbff1..10f19de8a22 100644
--- a/devel/py-country/pkg/PLIST
+++ b/devel/py-country/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.9 2020/01/22 05:53:01 kmos Exp $
+@comment $OpenBSD: PLIST,v 1.10 2021/10/24 09:28:47 sthen Exp $
+@pkgpath devel/py-country
 lib/python${MODPY_VERSION}/site-packages/pycountry/
 lib/python${MODPY_VERSION}/site-packages/pycountry-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/pycountry-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
diff --git a/devel/py-coveralls/Makefile b/devel/py-coveralls/Makefile
index fd7e56d469c..5c77d3ad8d4 100644
--- a/devel/py-coveralls/Makefile
+++ b/devel/py-coveralls/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.17 2021/05/21 19:50:24 kmos Exp $
+# $OpenBSD: Makefile,v 1.18 2021/10/24 09:28:47 sthen Exp $
 
 COMMENT =	display coverage stats online via coveralls.io
 
 MODPY_EGG_VERSION =	1.6.0
 DISTNAME =	coveralls-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME}
-REVISION =	6
+REVISION =	7
 
 CATEGORIES =	devel
 
@@ -17,7 +17,7 @@ PERMIT_PACKAGE =	Yes
 MODULES =		lang/python
 
 FLAVORS =		python3
-FLAVOR ?=
+FLAVOR =		python3
 
 MODPY_PI =		Yes
 MODPY_SETUPTOOLS =	Yes
@@ -28,7 +28,4 @@ RUN_DEPENDS =		devel/py-docopt${MODPY_FLAVOR} \
 
 NO_TEST =		Yes
 
-post-install:
-	mv ${PREFIX}/bin/coveralls ${PREFIX}/bin/coveralls${MODPY_BIN_SUFFIX}
-
 .include <bsd.port.mk>
diff --git a/devel/py-coveralls/pkg/PLIST b/devel/py-coveralls/pkg/PLIST
index 577a9e038f0..9c23af2c53a 100644
--- a/devel/py-coveralls/pkg/PLIST
+++ b/devel/py-coveralls/pkg/PLIST
@@ -1,6 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.8 2021/02/19 23:13:01 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.9 2021/10/24 09:28:47 sthen Exp $
+@pkgpath devel/py-coveralls
 @conflict py-coveralls-<1.6.0p5
-bin/coveralls${MODPY_BIN_SUFFIX}
+bin/coveralls
 lib/python${MODPY_VERSION}/site-packages/coveralls/
 lib/python${MODPY_VERSION}/site-packages/coveralls-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/coveralls-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
diff --git a/devel/py-fasteners/Makefile b/devel/py-fasteners/Makefile
index 59ce81dd53c..71dd3535e9a 100644
--- a/devel/py-fasteners/Makefile
+++ b/devel/py-fasteners/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.9 2021/05/21 19:50:25 kmos Exp $
+# $OpenBSD: Makefile,v 1.10 2021/10/24 09:28:47 sthen Exp $
 
 COMMENT =		python package that provides useful locks
 
 MODPY_EGG_VERSION =	0.15
 DISTNAME =		fasteners-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
-REVISION =		1
+REVISION =		2
 
 CATEGORIES =		devel
 
@@ -22,17 +22,11 @@ MODPY_PYTEST =		Yes
 MODPY_PYTEST_ARGS =	fasteners
 
 FLAVORS =		python3
-FLAVOR ?=
-
+FLAVOR =		python3
 
 RUN_DEPENDS =		devel/py-six${MODPY_FLAVOR}
 
 TEST_DEPENDS =		devel/py-pbr${MODPY_FLAVOR} \
 			devel/py-testtools${MODPY_FLAVOR}
 
-.if !${FLAVOR:Mpython3}
-RUN_DEPENDS  +=		devel/py-monotonic
-TEST_DEPENDS +=		devel/py-futures
-.endif
-
 .include <bsd.port.mk>
diff --git a/devel/py-fasteners/pkg/PLIST b/devel/py-fasteners/pkg/PLIST
index 97342671e16..ec844921b63 100644
--- a/devel/py-fasteners/pkg/PLIST
+++ b/devel/py-fasteners/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2017/07/17 00:22:09 danj Exp $
+@comment $OpenBSD: PLIST,v 1.2 2021/10/24 09:28:47 sthen Exp $
+@pkgpath devel/py-fasteners
 lib/python${MODPY_VERSION}/site-packages/fasteners/
 lib/python${MODPY_VERSION}/site-packages/fasteners-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/fasteners-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
diff --git a/devel/py-fields/Makefile b/devel/py-fields/Makefile
index d0a4b8bd403..2d54bd02a99 100644
--- a/devel/py-fields/Makefile
+++ b/devel/py-fields/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.4 2021/05/21 19:50:25 kmos Exp $
+# $OpenBSD: Makefile,v 1.5 2021/10/24 09:28:47 sthen Exp $
 
 COMMENT =		container class boilerplate killer
 
 MODPY_EGG_VERSION =	5.0.0
 DISTNAME =		fields-${MODPY_EGG_VERSION}
 PKGNAME =		py-fields-${MODPY_EGG_VERSION}
-REVISION =		2
+REVISION =		3
 
 CATEGORIES =		devel
 
@@ -22,7 +22,7 @@ MODPY_PI =		Yes
 MODPY_PYTEST =		Yes
 
 FLAVORS =		python3
-FLAVOR ?=
+FLAVOR =		python3
 
 TEST_DEPENDS =		devel/py-attrs${MODPY_FLAVOR} \
 			devel/py-characteristic${MODPY_FLAVOR} \
diff --git a/devel/py-fields/pkg/PLIST b/devel/py-fields/pkg/PLIST
index 8f0f891a3a6..6789d805b8c 100644
--- a/devel/py-fields/pkg/PLIST
+++ b/devel/py-fields/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2019/12/02 22:41:38 kmos Exp $
+@comment $OpenBSD: PLIST,v 1.2 2021/10/24 09:28:47 sthen Exp $
+@pkgpath devel/py-fields
 lib/python${MODPY_VERSION}/site-packages/fields/
 lib/python${MODPY_VERSION}/site-packages/fields-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/fields-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
diff --git a/devel/py-html5lib/Makefile b/devel/py-html5lib/Makefile
index 895fcdf63e6..97e364abe82 100644
--- a/devel/py-html5lib/Makefile
+++ b/devel/py-html5lib/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2021/05/21 19:50:26 kmos Exp $
+# $OpenBSD: Makefile,v 1.22 2021/10/24 09:28:47 sthen Exp $
 
 COMMENT=		HTML parser/tokeniser based for HTML5
 
@@ -6,7 +6,7 @@ MODPY_EGG_VERSION=	1.0.1
 DISTNAME=		html5lib-${MODPY_EGG_VERSION}
 PKGNAME=		py-${DISTNAME}
 CATEGORIES=		devel www textproc
-REVISION=		1
+REVISION=		2
 
 HOMEPAGE=		https://github.com/html5lib/html5lib-python/
 
@@ -27,6 +27,6 @@ TEST_DEPENDS =		devel/py-mock${MODPY_FLAVOR} \
 			textproc/py-lxml${MODPY_FLAVOR}
 
 FLAVORS =		python3
-FLAVOR ?=
+FLAVOR =		python3
 
 .include <bsd.port.mk>
diff --git a/devel/py-html5lib/pkg/PLIST b/devel/py-html5lib/pkg/PLIST
index 5ce44318aeb..c927d774d78 100644
--- a/devel/py-html5lib/pkg/PLIST
+++ b/devel/py-html5lib/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.3 2017/06/28 18:02:24 shadchin Exp $
+@comment $OpenBSD: PLIST,v 1.4 2021/10/24 09:28:47 sthen Exp $
+@pkgpath devel/py-html5lib
 lib/python${MODPY_VERSION}/site-packages/html5lib/
 lib/python${MODPY_VERSION}/site-packages/html5lib-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/html5lib-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
diff --git a/devel/py-icalendar/Makefile b/devel/py-icalendar/Makefile
index 8d57dcc6dc5..91ff9a31460 100644
--- a/devel/py-icalendar/Makefile
+++ b/devel/py-icalendar/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.11 2021/05/21 19:50:26 kmos Exp $
+# $OpenBSD: Makefile,v 1.12 2021/10/24 09:28:47 sthen Exp $
 
 COMMENT =		parser/generator of iCalendar files
 
 MODPY_EGG_VERSION =	4.0.4
 DISTNAME =		icalendar-${MODPY_EGG_VERSION}
 PKGNAME =		py-icalendar-${MODPY_EGG_VERSION}
-REVISION =		2
+REVISION =		3
 
 CATEGORIES =		devel
 
@@ -29,11 +29,6 @@ TEST_DEPENDS =		devel/py-coverage${MODPY_FLAVOR} \
 			devel/py-hypothesis${MODPY_FLAVOR}
 
 FLAVORS =		python3
-FLAVOR ?=
-
-post-install:
-	for i in ${PREFIX}/bin/*; do \
-		mv $${i} $${i}${MODPY_BIN_SUFFIX} ;\
-	done
+FLAVOR =		python3
 
 .include <bsd.port.mk>
diff --git a/devel/py-icalendar/pkg/PLIST b/devel/py-icalendar/pkg/PLIST
index e40bb3b9c1f..1a959dd01c6 100644
--- a/devel/py-icalendar/pkg/PLIST
+++ b/devel/py-icalendar/pkg/PLIST
@@ -1,6 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.5 2021/02/19 23:13:01 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.6 2021/10/24 09:28:48 sthen Exp $
+@pkgpath devel/py-icalendar
 @conflict py-icalendar-<4.0.4p1
-bin/icalendar${MODPY_BIN_SUFFIX}
+bin/icalendar
 lib/python${MODPY_VERSION}/site-packages/icalendar/
 lib/python${MODPY_VERSION}/site-packages/icalendar-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/icalendar-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
diff --git a/devel/py-objgraph/Makefile b/devel/py-objgraph/Makefile
index cca296a3c58..f046b594407 100644
--- a/devel/py-objgraph/Makefile
+++ b/devel/py-objgraph/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.6 2021/05/21 19:50:27 kmos Exp $
+# $OpenBSD: Makefile,v 1.7 2021/10/24 09:28:48 sthen Exp $
 
 COMMENT =		draw Python object reference graphs
 
 MODPY_EGG_VERSION =	3.4.1
 DISTNAME =		objgraph-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
-REVISION =		2
+REVISION =		3
 
 CATEGORIES =		devel
 
@@ -15,7 +15,7 @@ HOMEPAGE =		https://mg.pov.lt/objgraph/
 PERMIT_PACKAGE =	Yes
 
 FLAVORS =		python3
-FLAVOR ?=
+FLAVOR =		python3
 
 MODULES =		lang/python
 MODPY_PI =		Yes
diff --git a/devel/py-objgraph/pkg/PLIST b/devel/py-objgraph/pkg/PLIST
index 297e002a77d..7360380148f 100644
--- a/devel/py-objgraph/pkg/PLIST
+++ b/devel/py-objgraph/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2019/04/24 21:49:58 kmos Exp $
+@comment $OpenBSD: PLIST,v 1.2 2021/10/24 09:28:48 sthen Exp $
+@pkgpath devel/py-objgraph
 lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}objgraph.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/objgraph-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/objgraph-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
diff --git a/devel/py-parsedatetime/Makefile b/devel/py-parsedatetime/Makefile
index b4ae01d5822..06496c2fb8f 100644
--- a/devel/py-parsedatetime/Makefile
+++ b/devel/py-parsedatetime/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.16 2021/05/21 19:50:27 kmos Exp $
+# $OpenBSD: Makefile,v 1.17 2021/10/24 09:28:48 sthen Exp $
 
 COMMENT=		parse human-readable date/time text
 
 MODPY_EGG_VERSION =	2.5
 DISTNAME=		parsedatetime-${MODPY_EGG_VERSION}
 PKGNAME=		py-${DISTNAME}
-REVISION=		2
+REVISION=		3
 
 CATEGORIES=		devel
 
@@ -13,7 +13,7 @@ CATEGORIES=		devel
 PERMIT_PACKAGE=	Yes
 
 FLAVORS=		python3
-FLAVOR?=
+FLAVOR=			python3
 
 MODULES=		lang/python
 MODPY_PI=		Yes
diff --git a/devel/py-parsedatetime/pkg/PLIST b/devel/py-parsedatetime/pkg/PLIST
index 1ec11808e87..f208bc7d9a9 100644
--- a/devel/py-parsedatetime/pkg/PLIST
+++ b/devel/py-parsedatetime/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.5 2017/04/11 09:28:00 rpointel Exp $
+@comment $OpenBSD: PLIST,v 1.6 2021/10/24 09:28:48 sthen Exp $
+@pkgpath devel/py-parsedatetime
 lib/python${MODPY_VERSION}/site-packages/parsedatetime/
 lib/python${MODPY_VERSION}/site-packages/parsedatetime-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/parsedatetime-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
diff --git a/devel/py-path.py/Makefile b/devel/py-path.py/Makefile
index 686b27e2a7c..8df9a2f1205 100644
--- a/devel/py-path.py/Makefile
+++ b/devel/py-path.py/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.17 2021/05/21 19:50:27 kmos Exp $
+# $OpenBSD: Makefile,v 1.18 2021/10/24 09:28:48 sthen Exp $
 
 COMMENT =		os.path wrapper for Python
 
 MODPY_EGG_VERSION =	10.3.1
 DISTNAME =		path.py-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
-REVISION =		3
+REVISION =		4
 
 CATEGORIES =		devel
 
@@ -25,6 +25,6 @@ BUILD_DEPENDS =		devel/py-setuptools_scm${MODPY_FLAVOR}
 TEST_DEPENDS =		devel/py-appdirs${MODPY_FLAVOR}
 
 FLAVORS =		python3
-FLAVOR ?=
+FLAVOR =		python3
 
 .include <bsd.port.mk>
diff --git a/devel/py-path.py/pkg/PLIST b/devel/py-path.py/pkg/PLIST
index 54dd9f98538..cac0ace5c90 100644
--- a/devel/py-path.py/pkg/PLIST
+++ b/devel/py-path.py/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.3 2017/01/24 09:45:45 shadchin Exp $
+@comment $OpenBSD: PLIST,v 1.4 2021/10/24 09:28:48 sthen Exp $
+@pkgpath devel/py-path.py
 lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}path.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}test_path.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/path.py
diff --git a/devel/py-radix/Makefile b/devel/py-radix/Makefile
index 0143c3ccd33..e16b8118ce1 100644
--- a/devel/py-radix/Makefile
+++ b/devel/py-radix/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.20 2021/05/21 19:50:28 kmos Exp $
+# $OpenBSD: Makefile,v 1.21 2021/10/24 09:28:48 sthen Exp $
 
 COMMENT =		Radix tree implementation for Python
 
 MODPY_EGG_VERSION = 	0.10.0
 DISTNAME =		py-radix-${MODPY_EGG_VERSION}
 CATEGORIES=		devel net
-REVISION =		3
+REVISION =		4
 
 HOMEPAGE =		https://github.com/mjschultz/py-radix/
 
@@ -19,7 +19,7 @@ MODPY_SETUPTOOLS =	Yes
 MODPY_PYTEST =		Yes
 
 FLAVORS=		python3
-FLAVOR?=
+FLAVOR=			python3
 
 MODULES =		lang/python
 WANTLIB +=		${MODPY_WANTLIB} pthread
diff --git a/devel/py-radix/pkg/PLIST b/devel/py-radix/pkg/PLIST
index f442831629e..f385191faac 100644
--- a/devel/py-radix/pkg/PLIST
+++ b/devel/py-radix/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.4 2021/01/04 14:06:30 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.5 2021/10/24 09:28:48 sthen Exp $
+@pkgpath devel/py-radix
 lib/python${MODPY_VERSION}/site-packages/py_radix-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/py_radix-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
 lib/python${MODPY_VERSION}/site-packages/py_radix-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
diff --git a/devel/py-zc-lockfile/Makefile b/devel/py-zc-lockfile/Makefile
index 1f3c6d4f873..47b52024525 100644
--- a/devel/py-zc-lockfile/Makefile
+++ b/devel/py-zc-lockfile/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.3 2021/05/21 19:50:31 kmos Exp $
+# $OpenBSD: Makefile,v 1.4 2021/10/24 09:28:48 sthen Exp $
 
 COMMENT =		basic inter-process locks
 
 MODPY_EGG_VERSION =	2.0
 DISTNAME =		zc.lockfile-${MODPY_EGG_VERSION}
 PKGNAME =		py-zc-lockfile${DISTNAME}
-REVISION =		1
+REVISION =		2
 
 CATEGORIES =		devel
 
@@ -17,7 +17,7 @@ MODPY_PI =		Yes
 MODPY_SETUPTOOLS =	Yes
 
 FLAVORS =		python3
-FLAVOR ?=
+FLAVOR =		python3
 
 # A newer py-zopetesting (which also supports python3) is needed.
 NO_TEST =		Yes
diff --git a/devel/py-zc-lockfile/pkg/PLIST b/devel/py-zc-lockfile/pkg/PLIST
index 0a71a846636..2a7c508adfe 100644
--- a/devel/py-zc-lockfile/pkg/PLIST
+++ b/devel/py-zc-lockfile/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2019/11/23 09:18:15 bket Exp $
+@comment $OpenBSD: PLIST,v 1.2 2021/10/24 09:28:48 sthen Exp $
+@pkgpath devel/py-zc-lockfile
 lib/python${MODPY_VERSION}/site-packages/zc/
 lib/python${MODPY_VERSION}/site-packages/zc.lockfile-${MODPY_EGG_VERSION}-py${MODPY_VERSION}-nspkg.pth
 lib/python${MODPY_VERSION}/site-packages/zc.lockfile-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
diff --git a/math/Makefile b/math/Makefile
index 570715e732a..00f30d32768 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.204 2021/10/13 19:50:18 tracey Exp $
+# $OpenBSD: Makefile,v 1.205 2021/10/24 09:28:46 sthen Exp $
 
      SUBDIR =
      SUBDIR += 4ti2
@@ -120,17 +120,14 @@
      SUBDIR += prover9
      SUBDIR += pspp
      SUBDIR += py-PyWavelets,python3
-     SUBDIR += py-affine
      SUBDIR += py-affine,python3
      SUBDIR += py-bottleneck,python3
      SUBDIR += py-cftime,python3
      SUBDIR += py-cvxopt,python3
      SUBDIR += py-cvxpy,python3
      SUBDIR += py-ecos,python3
-     SUBDIR += py-graphviz
      SUBDIR += py-graphviz,python3
      SUBDIR += py-h5py,python3
-     SUBDIR += py-mpmath
      SUBDIR += py-mpmath,python3
      SUBDIR += py-networkx,python3
      SUBDIR += py-netcdf4
@@ -144,7 +141,6 @@
      SUBDIR += py-scikit-learn,python3
      SUBDIR += py-scipy,python3
      SUBDIR += py-scs,python3
-     SUBDIR += py-pysmt
      SUBDIR += py-pysmt,python3
      SUBDIR += py-snuggs,python3
      SUBDIR += py-statistics
diff --git a/math/py-affine/Makefile b/math/py-affine/Makefile
index 12b6ed00e97..8c5e1371d3d 100644
--- a/math/py-affine/Makefile
+++ b/math/py-affine/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2021/05/21 19:50:32 kmos Exp $
+# $OpenBSD: Makefile,v 1.9 2021/10/24 09:28:48 sthen Exp $
 
 COMMENT =		matrices describing affine transformation of the plane
 
@@ -6,7 +6,7 @@ MODPY_EGG_VERSION =	2.3.0
 DISTNAME =		affine-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
 CATEGORIES =		math
-REVISION =		1
+REVISION =		2
 
 MAINTAINER =		Martin Reindl <martin@catai.org>
 
@@ -22,6 +22,6 @@ MODPY_PYTEST =		Yes
 TEST_DEPENDS =		devel/py-test-cov${MODPY_FLAVOR}
 
 FLAVORS =		python3
-FLAVOR ?=
+FLAVOR =		python3
 
 .include <bsd.port.mk>
diff --git a/math/py-affine/pkg/PLIST b/math/py-affine/pkg/PLIST
index 8a4038212d8..212a0ca05eb 100644
--- a/math/py-affine/pkg/PLIST
+++ b/math/py-affine/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2019/02/22 10:58:40 landry Exp $
+@comment $OpenBSD: PLIST,v 1.2 2021/10/24 09:28:48 sthen Exp $
+@pkgpath math/py-affine
 lib/python${MODPY_VERSION}/site-packages/affine/
 lib/python${MODPY_VERSION}/site-packages/affine-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/affine-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
diff --git a/math/py-graphviz/Makefile b/math/py-graphviz/Makefile
index e574cc7ad8a..e4339bba162 100644
--- a/math/py-graphviz/Makefile
+++ b/math/py-graphviz/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.15 2021/05/21 19:50:32 kmos Exp $
+# $OpenBSD: Makefile,v 1.16 2021/10/24 09:28:48 sthen Exp $
 
 COMMENT =		simple Python interface for Graphviz
 
 MODPY_EGG_VERSION =	0.14.1
 DISTNAME =		graphviz-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
-REVISION =		0
+REVISION =		1
 
 CATEGORIES =		math
 
@@ -20,7 +20,7 @@ MODPY_SETUPTOOLS =	Yes
 MODPY_PYTEST =		Yes
 
 FLAVORS =		python3
-FLAVOR ?=
+FLAVOR =		python3
 
 TEST_DEPENDS =		devel/py-mock${MODPY_FLAVOR} \
 			devel/py-test-cov${MODPY_FLAVOR} \
diff --git a/math/py-graphviz/pkg/PLIST b/math/py-graphviz/pkg/PLIST
index 0eaf8234322..e61ebce4dc4 100644
--- a/math/py-graphviz/pkg/PLIST
+++ b/math/py-graphviz/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.5 2019/10/25 19:24:19 jasper Exp $
+@comment $OpenBSD: PLIST,v 1.6 2021/10/24 09:28:48 sthen Exp $
+@pkgpath math/py-graphviz
 lib/python${MODPY_VERSION}/site-packages/graphviz/
 lib/python${MODPY_VERSION}/site-packages/graphviz-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/graphviz-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
diff --git a/math/py-mpmath/Makefile b/math/py-mpmath/Makefile
index 8f5258ca76d..0c4161fbb99 100644
--- a/math/py-mpmath/Makefile
+++ b/math/py-mpmath/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2020/07/03 21:12:57 sthen Exp $
+# $OpenBSD: Makefile,v 1.8 2021/10/24 09:28:48 sthen Exp $
 
 COMMENT =		library for arbitrary-precision floating-point arithmetic
 
@@ -6,7 +6,7 @@ MODPY_EGG_VERSION =	1.1.0
 DISTNAME =		mpmath-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
 CATEGORIES =		math
-REVISION =		0
+REVISION =		1
 
 HOMEPAGE =		http://mpmath.org/
 
@@ -20,6 +20,6 @@ MODPY_PYTEST =		Yes
 MODPY_PYTEST_ARGS =	mpmath
 
 FLAVORS =		python3
-FLAVOR ?=
+FLAVOR =		python3
 
 .include <bsd.port.mk>
diff --git a/math/py-mpmath/pkg/PLIST b/math/py-mpmath/pkg/PLIST
index 6f88c8db440..041c04994ce 100644
--- a/math/py-mpmath/pkg/PLIST
+++ b/math/py-mpmath/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.2 2019/09/22 15:29:26 kmos Exp $
+@comment $OpenBSD: PLIST,v 1.3 2021/10/24 09:28:48 sthen Exp $
+@pkgpath math/py-mpmath
 lib/python${MODPY_VERSION}/site-packages/mpmath/
 lib/python${MODPY_VERSION}/site-packages/mpmath-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
 lib/python${MODPY_VERSION}/site-packages/mpmath/__init__.py
diff --git a/math/py-pysmt/Makefile b/math/py-pysmt/Makefile
index f7115488b39..f32ca1b2519 100644
--- a/math/py-pysmt/Makefile
+++ b/math/py-pysmt/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.5 2021/05/21 19:50:32 kmos Exp $
+# $OpenBSD: Makefile,v 1.6 2021/10/24 09:28:48 sthen Exp $
 
 COMMENT =		library for SMT formulae manipulation and solving
 
 MODPY_EGG_VERSION =	0.8.0
 DISTNAME =		PySMT-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
-REVISION =		2
+REVISION =		3
 
 CATEGORIES =		math
 
@@ -20,7 +20,7 @@ MODPY_PI =		Yes
 MODPY_SETUPTOOLS =	Yes
 
 FLAVORS =		python3
-FLAVOR ?=
+FLAVOR =		python3
 
 # Explicitly not adding RUN_DEPENDS on all the supported
 # solvers. That would beat the point of this library.
@@ -28,9 +28,6 @@ FLAVOR ?=
 RUN_DEPENDS =		devel/py-six${MODPY_FLAVOR}
 
 post-install:
-.for i in pysmt pysmt-install pysmt-shell
-	mv ${PREFIX}/bin/$i{,${MODPY_BIN_SUFFIX}}
-.endfor
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/${MODPY_PY_PREFIX}pysmt/
 	${INSTALL_DATA} ${WRKSRC}/README.rst \
 	    ${PREFIX}/share/doc/${MODPY_PY_PREFIX}pysmt/
diff --git a/math/py-pysmt/pkg/PLIST b/math/py-pysmt/pkg/PLIST
index 30d54deb33f..8205309e99b 100644
--- a/math/py-pysmt/pkg/PLIST
+++ b/math/py-pysmt/pkg/PLIST
@@ -1,8 +1,9 @@
-@comment $OpenBSD: PLIST,v 1.2 2021/02/19 23:13:04 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.3 2021/10/24 09:28:48 sthen Exp $
+@pkgpath math/py-pysmt
 @conflict py-PySMT-<0.8.0p1
-bin/pysmt${MODPY_BIN_SUFFIX}
-bin/pysmt-install${MODPY_BIN_SUFFIX}
-bin/pysmt-shell${MODPY_BIN_SUFFIX}
+bin/pysmt
+bin/pysmt-install
+bin/pysmt-shell
 lib/python${MODPY_VERSION}/site-packages/PySMT-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/PySMT-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
 lib/python${MODPY_VERSION}/site-packages/PySMT-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
diff --git a/net/Makefile b/net/Makefile
index 20d368ceb7c..1e47a317455 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1272 2021/10/22 20:49:30 sthen Exp $
+# $OpenBSD: Makefile,v 1.1273 2021/10/24 09:28:46 sthen Exp $
 
      SUBDIR =
      SUBDIR += adns
@@ -552,13 +552,11 @@
      SUBDIR += purple-rocketchat
      SUBDIR += putty
      SUBDIR += py-IOSXR,python3
-     SUBDIR += py-IP
      SUBDIR += py-IP,python3
      SUBDIR += py-aiodns,python3
      SUBDIR += py-boto3,python3
      SUBDIR += py-botocore,python3
      SUBDIR += py-cares,python3
-     SUBDIR += py-curl
      SUBDIR += py-curl,python3
      SUBDIR += py-cymruwhois
      SUBDIR += py-cymruwhois,python3
@@ -568,9 +566,7 @@
      SUBDIR += py2-dnspython
      SUBDIR += py-dnspython,python3
      SUBDIR += py-dpkt
-     SUBDIR += py-eapi
      SUBDIR += py-eapi,python3
-     SUBDIR += py-ftpdlib
      SUBDIR += py-ftpdlib,python3
      SUBDIR += py-geventhttpclient,python3
      SUBDIR += py-idna
@@ -588,27 +584,20 @@
      SUBDIR += py-msgpack,python3
      SUBDIR += py-nbxmpp,python3
      SUBDIR += py-ncclient,python3
-     SUBDIR += py-netaddr
      SUBDIR += py-netaddr,python3
-     SUBDIR += py-netifaces
      SUBDIR += py-netifaces,python3
      SUBDIR += py-netmiko,python3
      SUBDIR += py-nmap
      SUBDIR += py-nxos,python3
-     SUBDIR += py-paho-mqtt
      SUBDIR += py-paho-mqtt,python3
      SUBDIR += py-pcapy,python3
-     SUBDIR += py-pf
      SUBDIR += py-pf,python3
-     SUBDIR += py-portend
      SUBDIR += py-portend,python3
      SUBDIR += py-ripe.atlas.cousteau,python3
      SUBDIR += py-ripe.atlas.sagan,python3
      SUBDIR += py-ripe.atlas.tools
-     SUBDIR += py-rrdtool
      SUBDIR += py-rrdtool,python3
      SUBDIR += py-s3transfer,python3
-     SUBDIR += py-simplesoap
      SUBDIR += py-simplesoap,python3
      SUBDIR += py-siphon,python3
      SUBDIR += py-slixmpp,python3
diff --git a/net/py-IP/Makefile b/net/py-IP/Makefile
index 49051ad291b..4d605051e23 100644
--- a/net/py-IP/Makefile
+++ b/net/py-IP/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.39 2020/12/03 08:08:24 benoit Exp $
+# $OpenBSD: Makefile,v 1.40 2021/10/24 09:28:48 sthen Exp $
 
 COMMENT =	Python module to handle IPv4 and IPv6 address
 
 MODPY_EGG_VERSION =	1.01
+REVISION =		0
 DISTNAME =		IPy-${MODPY_EGG_VERSION}
 PKGNAME =		py-IP-${MODPY_EGG_VERSION}
 CATEGORIES =		net
@@ -19,12 +20,10 @@ MODPY_PI =		Yes
 MODULES =		lang/python
 
 FLAVORS =		python3
-FLAVOR ?=
+FLAVOR =		python3
 
 MODPY_DISTUTILS_INSTALLARGS =	-O2
 MODPY_PYOEXTENSION =		opt-2.pyc
 MODPY_PYTEST =			Yes
 
-WRKDIST =		${WRKDIR}/${DISTNAME}
-
 .include <bsd.port.mk>
diff --git a/net/py-IP/pkg/PLIST b/net/py-IP/pkg/PLIST
index 9c227f2b04c..edb91effcd4 100644
--- a/net/py-IP/pkg/PLIST
+++ b/net/py-IP/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.7 2020/12/03 08:08:24 benoit Exp $
+@comment $OpenBSD: PLIST,v 1.8 2021/10/24 09:28:49 sthen Exp $
+@pkgpath net/py-IP
 lib/python${MODPY_VERSION}/site-packages/IPy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
 lib/python${MODPY_VERSION}/site-packages/IPy.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/
diff --git a/net/py-curl/Makefile b/net/py-curl/Makefile
index 26eff139202..725c4f7f102 100644
--- a/net/py-curl/Makefile
+++ b/net/py-curl/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.55 2021/08/16 10:11:44 sthen Exp $
+# $OpenBSD: Makefile,v 1.56 2021/10/24 09:28:49 sthen Exp $
 
 COMMENT=	Python interface to cURL library
 
 MODPY_EGG_VERSION=	7.44.1
+REVISION=	0
 DISTNAME=	pycurl-${MODPY_EGG_VERSION}
 PKGNAME=	py-curl-${MODPY_EGG_VERSION}
 CATEGORIES=	net
@@ -20,9 +21,8 @@ MODULES=	lang/python
 MODPY_PI=	Yes
 MODPY_SETUPTOOLS=	Yes
 
-# py2 used by devel/bzr
 FLAVORS=	python3
-FLAVOR?=
+FLAVOR=		python3
 
 LIB_DEPENDS=	net/curl
 
diff --git a/net/py-curl/pkg/PLIST b/net/py-curl/pkg/PLIST
index 93e81138e3b..2e22b0fde47 100644
--- a/net/py-curl/pkg/PLIST
+++ b/net/py-curl/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.15 2021/08/09 08:47:55 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.16 2021/10/24 09:28:49 sthen Exp $
+@pkgpath net/py-curl
 lib/python${MODPY_VERSION}/site-packages/curl/
 lib/python${MODPY_VERSION}/site-packages/curl/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/curl/${MODPY_PYCACHE}/
diff --git a/net/py-eapi/Makefile b/net/py-eapi/Makefile
index 3d5a9f3f689..150e0cb43d1 100644
--- a/net/py-eapi/Makefile
+++ b/net/py-eapi/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.8 2021/05/21 19:50:33 kmos Exp $
+# $OpenBSD: Makefile,v 1.9 2021/10/24 09:28:49 sthen Exp $
 
 COMMENT =		Python client for Arista eAPI
 
 MODPY_EGG_VERSION =	0.8.3
 DISTNAME =		pyeapi-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME:S/py//}
-REVISION =		2
+REVISION =		3
 
 CATEGORIES =		net
 
@@ -14,7 +14,7 @@ PERMIT_PACKAGE =	Yes
 
 MODULES =		lang/python
 FLAVORS =		python3
-FLAVOR ?=
+FLAVOR =		python3
 
 MODPY_PI =		Yes
 MODPY_SETUPTOOLS =	Yes
diff --git a/net/py-eapi/pkg/PLIST b/net/py-eapi/pkg/PLIST
index b7301777fe2..98a1de5fb2d 100644
--- a/net/py-eapi/pkg/PLIST
+++ b/net/py-eapi/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2018/04/25 14:20:06 jasper Exp $
+@comment $OpenBSD: PLIST,v 1.2 2021/10/24 09:28:49 sthen Exp $
+@pkgpath net/py-eapi
 lib/python${MODPY_VERSION}/site-packages/pyeapi/
 lib/python${MODPY_VERSION}/site-packages/pyeapi-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/pyeapi-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
diff --git a/net/py-ftpdlib/Makefile b/net/py-ftpdlib/Makefile
index c46b1e78898..2282717fa2f 100644
--- a/net/py-ftpdlib/Makefile
+++ b/net/py-ftpdlib/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.26 2021/05/21 19:50:33 kmos Exp $
+# $OpenBSD: Makefile,v 1.27 2021/10/24 09:28:49 sthen Exp $
 
 COMMENT =		FTP server library for Python
 
 MODPY_EGG_VERSION =	1.5.6
 DISTNAME =		pyftpdlib-${MODPY_EGG_VERSION}
 PKGNAME =		py-ftpdlib-${MODPY_EGG_VERSION}
-REVISION =		2
+REVISION =		3
 
 CATEGORIES =		net devel
 
@@ -21,11 +21,8 @@ MODPY_PI =		Yes
 MODPY_SETUPTOOLS =	Yes
 
 FLAVORS =		python3
-FLAVOR ?=
+FLAVOR =		python3
 
 NO_TEST =		Yes
 
-post-install:
-	mv ${PREFIX}/bin/ftpbench ${PREFIX}/bin/ftpbench${MODPY_BIN_SUFFIX}
-
 .include <bsd.port.mk>
diff --git a/net/py-ftpdlib/pkg/PLIST b/net/py-ftpdlib/pkg/PLIST
index c4cebeb46f5..a7746c6619c 100644
--- a/net/py-ftpdlib/pkg/PLIST
+++ b/net/py-ftpdlib/pkg/PLIST
@@ -1,6 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.11 2021/02/19 23:13:05 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.12 2021/10/24 09:28:49 sthen Exp $
+@pkgpath net/py-ftpdlib
 @conflict py-ftpdlib-<1.5.6p1
-bin/ftpbench${MODPY_BIN_SUFFIX}
+bin/ftpbench
 lib/python${MODPY_VERSION}/site-packages/pyftpdlib/
 lib/python${MODPY_VERSION}/site-packages/pyftpdlib-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/pyftpdlib-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
diff --git a/net/py-netaddr/Makefile b/net/py-netaddr/Makefile
index c652fbc9371..337ee4d82d0 100644
--- a/net/py-netaddr/Makefile
+++ b/net/py-netaddr/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.12 2021/05/21 19:50:33 kmos Exp $
+# $OpenBSD: Makefile,v 1.13 2021/10/24 09:28:49 sthen Exp $
 
 COMMENT =		network address representation and manipulation library
 
 MODPY_EGG_VERSION =	0.7.19
 DISTNAME =		netaddr-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
-REVISION =		4
+REVISION =		5
 
 CATEGORIES =		net
 
@@ -19,10 +19,7 @@ MODPY_PI =		Yes
 MODPY_SETUPTOOLS =	Yes
 MODPY_PYTEST =		Yes
 
-FLAVOR ?=
+FLAVOR =		python3
 FLAVORS =		python3
 
-post-install:
-	mv ${PREFIX}/bin/netaddr ${PREFIX}/bin/netaddr${MODPY_BIN_SUFFIX}
-
 .include <bsd.port.mk>
diff --git a/net/py-netaddr/pkg/PLIST b/net/py-netaddr/pkg/PLIST
index 0174b846e91..b2fc880ef5d 100644
--- a/net/py-netaddr/pkg/PLIST
+++ b/net/py-netaddr/pkg/PLIST
@@ -1,6 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.5 2021/02/19 23:13:05 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.6 2021/10/24 09:28:49 sthen Exp $
+@pkgpath net/py-netaddr
 @conflict py-netaddr-<0.7.19p3
-bin/netaddr${MODPY_BIN_SUFFIX}
+bin/netaddr
 lib/python${MODPY_VERSION}/site-packages/netaddr/
 lib/python${MODPY_VERSION}/site-packages/netaddr-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/netaddr-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
diff --git a/net/py-netifaces/Makefile b/net/py-netifaces/Makefile
index 0b1402af477..b5b2ef64a7b 100644
--- a/net/py-netifaces/Makefile
+++ b/net/py-netifaces/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2021/05/21 19:50:33 kmos Exp $
+# $OpenBSD: Makefile,v 1.12 2021/10/24 09:28:49 sthen Exp $
 
 COMMENT =	portable network interface information
 
@@ -7,7 +7,7 @@ CATEGORIES =	net
 MODPY_EGG_VERSION = 0.10.9
 DISTNAME =	netifaces-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME}
-REVISION =	3
+REVISION =	4
 
 # MIT
 PERMIT_PACKAGE =	Yes
@@ -17,7 +17,7 @@ WANTLIB += pthread ${MODPY_WANTLIB}
 MODULES =	lang/python
 
 FLAVORS =	python3
-FLAVOR ?=
+FLAVOR =	python3
 
 MODPY_PI =		Yes
 MODPY_SETUPTOOLS =	Yes
diff --git a/net/py-netifaces/pkg/PLIST b/net/py-netifaces/pkg/PLIST
index 38569d45b76..c6c7270f345 100644
--- a/net/py-netifaces/pkg/PLIST
+++ b/net/py-netifaces/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.2 2021/01/04 14:06:36 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.3 2021/10/24 09:28:49 sthen Exp $
+@pkgpath net/py-netifaces
 lib/python${MODPY_VERSION}/site-packages/netifaces-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/netifaces-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
 lib/python${MODPY_VERSION}/site-packages/netifaces-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
diff --git a/net/py-paho-mqtt/Makefile b/net/py-paho-mqtt/Makefile
index 6df5ebd2c0b..83c97bb622d 100644
--- a/net/py-paho-mqtt/Makefile
+++ b/net/py-paho-mqtt/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.11 2021/05/21 19:50:33 kmos Exp $
+# $OpenBSD: Makefile,v 1.12 2021/10/24 09:28:49 sthen Exp $
 
 COMMENT =		MQTT Python client library
 
 MODPY_EGG_VERSION =	1.5.1
 DISTNAME =		paho-mqtt-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
-REVISION =		0
+REVISION =		1
 
 HOMEPAGE =		http://www.eclipse.org/paho/clients/python/
 
@@ -19,7 +19,7 @@ MODPY_PI =		Yes
 MODPY_SETUPTOOLS =	Yes
 
 FLAVORS =		python3
-FLAVOR ?=
+FLAVOR =		python3
 
 MODPY_ADJ_FILES =	examples/*.py
 
diff --git a/net/py-paho-mqtt/pkg/PLIST b/net/py-paho-mqtt/pkg/PLIST
index f46a28f37f6..ec1d94c4337 100644
--- a/net/py-paho-mqtt/pkg/PLIST
+++ b/net/py-paho-mqtt/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.5 2021/04/23 21:13:07 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.6 2021/10/24 09:28:49 sthen Exp $
+@pkgpath net/py-paho-mqtt
 lib/python${MODPY_VERSION}/site-packages/paho/
 lib/python${MODPY_VERSION}/site-packages/paho/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/paho/${MODPY_PYCACHE}/
diff --git a/net/py-pf/Makefile b/net/py-pf/Makefile
index 8cf74ae1828..afaabbf3b6d 100644
--- a/net/py-pf/Makefile
+++ b/net/py-pf/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2020/07/03 21:13:02 sthen Exp $
+# $OpenBSD: Makefile,v 1.9 2021/10/24 09:28:49 sthen Exp $
 
 COMMENT =		Python module for managing PF
 
@@ -6,7 +6,7 @@ MODPY_EGG_VERSION =	0.2.1
 GH_ACCOUNT =		dotpy
 GH_PROJECT =		py-pf
 GH_TAGNAME =		${MODPY_EGG_VERSION}
-REVISION =		1
+REVISION =		2
 
 # remove with next update; tarball was regenerated at github
 DISTFILES =		${DISTNAME}_1{${DISTNAME}}${EXTRACT_SUFX}
@@ -21,11 +21,7 @@ PERMIT_PACKAGE =	Yes
 MODULES =		lang/python
 
 FLAVORS =		python3
-FLAVOR ?=
-
-.if ${FLAVOR:L:Mpython3}
-PATCH_LIST =		patch-* python3-*
-.endif
+FLAVOR =		python3
 
 BUILD_DEPENDS =		${RUN_DEPENDS}
 RUN_DEPENDS =		devel/py-six${MODPY_FLAVOR}
diff --git a/net/py-pf/pkg/PLIST b/net/py-pf/pkg/PLIST
index a78d966b0da..3511b1877b3 100644
--- a/net/py-pf/pkg/PLIST
+++ b/net/py-pf/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.2 2018/06/15 06:36:30 jasper Exp $
+@comment $OpenBSD: PLIST,v 1.3 2021/10/24 09:28:49 sthen Exp $
+@pkgpath net/py-pf
 lib/python${MODPY_VERSION}/site-packages/pf/
 lib/python${MODPY_VERSION}/site-packages/pf/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pf/${MODPY_PYCACHE}/
diff --git a/net/py-portend/Makefile b/net/py-portend/Makefile
index d7b3b087b3d..03291fe204a 100644
--- a/net/py-portend/Makefile
+++ b/net/py-portend/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.3 2021/05/21 19:50:33 kmos Exp $
+# $OpenBSD: Makefile,v 1.4 2021/10/24 09:28:49 sthen Exp $
 
 COMMENT =		monitor TCP ports for bound or unbound states
 
 MODPY_EGG_VERSION =	2.5
 DISTNAME =		portend-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
-REVISION =		1
+REVISION =		3
 
 CATEGORIES =		net
 
@@ -22,7 +22,7 @@ BUILD_DEPENDS =		devel/py-setuptools_scm${MODPY_FLAVOR}>=1.15.0
 RUN_DEPENDS =		devel/py-tempora${MODPY_FLAVOR}>=1.8
 
 FLAVORS =		python3
-FLAVOR ?=
+FLAVOR =		python3
 
 NO_TEST =		Yes
 
diff --git a/net/py-portend/pkg/PLIST b/net/py-portend/pkg/PLIST
index e0eb853c0dc..90d8e943014 100644
--- a/net/py-portend/pkg/PLIST
+++ b/net/py-portend/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2019/12/17 21:05:17 bket Exp $
+@comment $OpenBSD: PLIST,v 1.2 2021/10/24 09:28:49 sthen Exp $
+@pkgpath net/py-portend
 lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}portend.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/portend-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/portend-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
diff --git a/net/py-rrdtool/Makefile b/net/py-rrdtool/Makefile
index 3f29a0741b6..aba4ff64960 100644
--- a/net/py-rrdtool/Makefile
+++ b/net/py-rrdtool/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.4 2021/05/21 19:50:33 kmos Exp $
+# $OpenBSD: Makefile,v 1.5 2021/10/24 09:28:49 sthen Exp $
 
 COMMENT =	Python bindings for rrdtool
 
 MODPY_EGG_VERSION =	0.1.15
-REVISION =	2
+REVISION =	3
 
 DISTNAME =	rrdtool-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME}
@@ -25,6 +25,6 @@ MODPY_SETUPTOOLS =	Yes
 NO_TEST =		Yes
 
 FLAVORS =	python3
-FLAVOR ?=
+FLAVOR =	python3
 
 .include <bsd.port.mk>
diff --git a/net/py-rrdtool/pkg/PLIST b/net/py-rrdtool/pkg/PLIST
index 5606e16648a..7d929139c98 100644
--- a/net/py-rrdtool/pkg/PLIST
+++ b/net/py-rrdtool/pkg/PLIST
@@ -1,6 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.3 2021/01/04 14:06:36 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.4 2021/10/24 09:28:49 sthen Exp $
 @conflict py-rrd-*
 @pkgpath net/rrdtool,-python
+@pkgpath net/py-rrdtool
 lib/python${MODPY_VERSION}/site-packages/rrdtool-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/rrdtool-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
 lib/python${MODPY_VERSION}/site-packages/rrdtool-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
diff --git a/net/py-simplesoap/Makefile b/net/py-simplesoap/Makefile
index d50c3d98293..6e865bf64b1 100644
--- a/net/py-simplesoap/Makefile
+++ b/net/py-simplesoap/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.4 2020/07/03 21:13:02 sthen Exp $
+# $OpenBSD: Makefile,v 1.5 2021/10/24 09:28:49 sthen Exp $
 
 COMMENT =	simple and lightweight SOAP library
 
 MODPY_EGG_VERSION = 1.16.2
 DISTNAME =	PySimpleSOAP-${MODPY_EGG_VERSION}
 PKGNAME =	py-simplesoap-${MODPY_EGG_VERSION}
-REVISION =	1
+REVISION =	2
 
 CATEGORIES =	net
 
@@ -16,7 +16,7 @@ MODULES =		lang/python
 MODPY_PI =		Yes
 
 FLAVORS =	python3
-FLAVOR ?=
+FLAVOR =	python3
 
 NO_TEST =	Yes
 
diff --git a/net/py-simplesoap/pkg/PLIST b/net/py-simplesoap/pkg/PLIST
index c6ab3a953f1..609ec0f9c76 100644
--- a/net/py-simplesoap/pkg/PLIST
+++ b/net/py-simplesoap/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2018/11/30 07:50:18 semarie Exp $
+@comment $OpenBSD: PLIST,v 1.2 2021/10/24 09:28:50 sthen Exp $
+@pkgpath net/py-simplesoap
 lib/python${MODPY_VERSION}/site-packages/PySimpleSOAP-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
 lib/python${MODPY_VERSION}/site-packages/pysimplesoap/
 lib/python${MODPY_VERSION}/site-packages/pysimplesoap/__init__.py
diff --git a/security/Makefile b/security/Makefile
index 93f014eba69..6b925e80150 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.635 2021/10/05 13:17:35 landry Exp $
+# $OpenBSD: Makefile,v 1.636 2021/10/24 09:28:46 sthen Exp $
 
      SUBDIR =
      SUBDIR += ADMsnmp
@@ -270,7 +270,6 @@
      SUBDIR += py-M2Crypto,python3
      SUBDIR += py-PyNaCl
      SUBDIR += py-PyNaCl,python3
-     SUBDIR += py-aes
      SUBDIR += py-aes,python3
      SUBDIR += py-argon2-cffi,python3
      SUBDIR += py-artifacts,python3
@@ -307,19 +306,15 @@
      SUBDIR += py-pbkdf2,python3
      SUBDIR += py-pefile
      SUBDIR += py-pefile,python3
-     SUBDIR += py-pgpdump
      SUBDIR += py-pgpdump,python3
-     SUBDIR += py-potr
      SUBDIR += py-potr,python3
      SUBDIR += py-pykeepass,python3
      SUBDIR += py-pysha3
      SUBDIR += py-pyscard,python3
-     SUBDIR += py-requests-aws4auth
      SUBDIR += py-requests-aws4auth,python3
      SUBDIR += py-ropper,python3
      SUBDIR += py-rsa,python3
      SUBDIR += py-scp,python3
-     SUBDIR += py-scrypt
      SUBDIR += py-scrypt,python3
      SUBDIR += py-secretstorage,python3
      SUBDIR += py-service_identity,python3
diff --git a/security/py-aes/Makefile b/security/py-aes/Makefile
index f90fd303d1c..b2607351ac8 100644
--- a/security/py-aes/Makefile
+++ b/security/py-aes/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.5 2020/07/03 21:13:06 sthen Exp $
+# $OpenBSD: Makefile,v 1.6 2021/10/24 09:28:50 sthen Exp $
 
 COMMENT =		pure-Python implementation of AES block-cipher
 
 MODPY_EGG_VERSION =	1.6.1
 DISTNAME =		pyaes-${MODPY_EGG_VERSION}
 PKGNAME =		py-aes-${MODPY_EGG_VERSION}
-REVISION =		1
+REVISION =		2
 
 CATEGORIES =		security
 
@@ -16,7 +16,7 @@ MODULES =		lang/python
 MODPY_PI =		Yes
 
 FLAVORS =		python3
-FLAVOR ?=
+FLAVOR =		python3
 
 TEST_DEPENDS =		${FULLPKGNAME}:${FULLPKGPATH}
 
diff --git a/security/py-aes/pkg/PLIST b/security/py-aes/pkg/PLIST
index 147bd4fb881..c34ab4b4eb9 100644
--- a/security/py-aes/pkg/PLIST
+++ b/security/py-aes/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2018/07/09 05:36:45 rsadowski Exp $
+@comment $OpenBSD: PLIST,v 1.2 2021/10/24 09:28:50 sthen Exp $
+@pkgpath security/py-aes
 lib/python${MODPY_VERSION}/site-packages/pyaes/
 lib/python${MODPY_VERSION}/site-packages/pyaes-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
 lib/python${MODPY_VERSION}/site-packages/pyaes/__init__.py
diff --git a/security/py-pgpdump/Makefile b/security/py-pgpdump/Makefile
index 8b745658156..e4290d8a59a 100644
--- a/security/py-pgpdump/Makefile
+++ b/security/py-pgpdump/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.5 2020/07/03 21:13:07 sthen Exp $
+# $OpenBSD: Makefile,v 1.6 2021/10/24 09:28:50 sthen Exp $
 
 COMMENT =		PGP packet parser library for Python
 
 MODPY_EGG_VERSION =	1.5
 DISTNAME =		pgpdump-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
-REVISION =		1
+REVISION =		2
 
 CATEGORIES =		security
 
@@ -18,7 +18,7 @@ MODULES =		lang/python
 MODPY_PI =		Yes
 
 FLAVORS =		python3
-FLAVOR ?=
+FLAVOR =		python3
 
 # test_parse_partial_length fails due to a missing file in the sources
 do-test:
diff --git a/security/py-pgpdump/pkg/PLIST b/security/py-pgpdump/pkg/PLIST
index e369e4a292a..cacaaf135f7 100644
--- a/security/py-pgpdump/pkg/PLIST
+++ b/security/py-pgpdump/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2018/04/25 13:37:26 solene Exp $
+@comment $OpenBSD: PLIST,v 1.2 2021/10/24 09:28:50 sthen Exp $
+@pkgpath security/py-pgpdump
 lib/python${MODPY_VERSION}/site-packages/pgpdump/
 lib/python${MODPY_VERSION}/site-packages/pgpdump-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
 lib/python${MODPY_VERSION}/site-packages/pgpdump/__init__.py
diff --git a/security/py-potr/Makefile b/security/py-potr/Makefile
index b7944adaf5e..2c69c5b94b4 100644
--- a/security/py-potr/Makefile
+++ b/security/py-potr/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2021/07/03 03:05:11 danj Exp $
+# $OpenBSD: Makefile,v 1.10 2021/10/24 09:28:50 sthen Exp $
 
 COMMENT =		pure Python Off-The-Record encryption
 
@@ -6,7 +6,7 @@ MODPY_EGG_VERSION =	1.0.1
 DISTNAME =		python-potr-${MODPY_EGG_VERSION}
 PKGNAME =		py-potr-${MODPY_EGG_VERSION}
 CATEGORIES =		security net
-REVISION =		6
+REVISION =		7
 
 # LGPLv3
 PERMIT_PACKAGE =	Yes
@@ -19,7 +19,7 @@ MODPY_PI =		Yes
 MODPY_SETUPTOOLS =	Yes
 
 FLAVORS =		python3
-FLAVOR ?=
+FLAVOR =		python3
 
 RUN_DEPENDS =		security/py-cryptodome${MODPY_FLAVOR}
 
diff --git a/security/py-potr/pkg/PLIST b/security/py-potr/pkg/PLIST
index 0d2f6ff8b36..63a12e22042 100644
--- a/security/py-potr/pkg/PLIST
+++ b/security/py-potr/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2016/05/07 14:53:13 danj Exp $
+@comment $OpenBSD: PLIST,v 1.2 2021/10/24 09:28:50 sthen Exp $
+@pkgpath security/py-potr
 lib/python${MODPY_VERSION}/site-packages/potr/
 lib/python${MODPY_VERSION}/site-packages/potr/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/potr/${MODPY_PYCACHE}/
diff --git a/security/py-requests-aws4auth/Makefile b/security/py-requests-aws4auth/Makefile
index 47933d05b48..ffeebef5747 100644
--- a/security/py-requests-aws4auth/Makefile
+++ b/security/py-requests-aws4auth/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2021/06/12 02:24:53 daniel Exp $
+# $OpenBSD: Makefile,v 1.7 2021/10/24 09:28:50 sthen Exp $
 
 COMMENT =		AWS v4 authentication for py-requests
 
@@ -6,7 +6,7 @@ MODPY_EGG_VERSION =	0.9
 
 DISTNAME =		requests-aws4auth-${MODPY_EGG_VERSION}
 PKGNAME =		${MODPY_PY_PREFIX}requests-aws4auth-${MODPY_EGG_VERSION}
-REVISION =		2
+REVISION =		3
 
 CATEGORIES =		security
 
@@ -23,7 +23,7 @@ RUN_DEPENDS =		www/py-requests${MODPY_FLAVOR}
 BUILD_DEPENDS =		${RUN_DEPENDS}
 
 FLAVORS =		python3
-FLAVOR ?=
+FLAVOR =		python3
 
 NO_TEST =		Yes
 
diff --git a/security/py-requests-aws4auth/pkg/PLIST b/security/py-requests-aws4auth/pkg/PLIST
index 8d54925a0cb..55c067628ff 100644
--- a/security/py-requests-aws4auth/pkg/PLIST
+++ b/security/py-requests-aws4auth/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2019/02/14 07:13:37 pvk Exp $
+@comment $OpenBSD: PLIST,v 1.2 2021/10/24 09:28:50 sthen Exp $
+@pkgpath security/py-requests-aws4auth
 @comment lib/python${MODPY_VERSION}/site-packages/HISTORY.rst
 @comment lib/python${MODPY_VERSION}/site-packages/LICENSE
 @comment lib/python${MODPY_VERSION}/site-packages/NOTICE
diff --git a/security/py-scrypt/Makefile b/security/py-scrypt/Makefile
index 810210923a2..b7749f287e0 100644
--- a/security/py-scrypt/Makefile
+++ b/security/py-scrypt/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.6 2021/07/15 17:06:27 sthen Exp $
+# $OpenBSD: Makefile,v 1.7 2021/10/24 09:28:50 sthen Exp $
 
 COMMENT =	support for the scrypt key derivation function
 
 MODPY_EGG_VERSION =	0.8.18
+REVISION =	0
 
 DISTNAME =	scrypt-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME}
@@ -22,6 +23,6 @@ MODPY_PYTEST =		Yes
 TEST_ENV =		PY_IGNORE_IMPORTMISMATCH=1
 
 FLAVORS =	python3
-FLAVOR ?=
+FLAVOR =	python3
 
 .include <bsd.port.mk>
diff --git a/security/py-scrypt/pkg/PLIST b/security/py-scrypt/pkg/PLIST
index 2a3e4527956..30850cdff9d 100644
--- a/security/py-scrypt/pkg/PLIST
+++ b/security/py-scrypt/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.3 2021/03/12 21:25:54 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.4 2021/10/24 09:28:50 sthen Exp $
+@pkgpath security/py-scrypt
 @so lib/python${MODPY_VERSION}/site-packages/_scrypt.${MODPY_PYC_MAGIC_TAG}so
 lib/python${MODPY_VERSION}/site-packages/scrypt/
 lib/python${MODPY_VERSION}/site-packages/scrypt-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
diff --git a/textproc/Makefile b/textproc/Makefile
index 11b5cf4902d..e97b7245f76 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.690 2021/10/16 12:47:12 sdk Exp $
+# $OpenBSD: Makefile,v 1.691 2021/10/24 09:28:47 sthen Exp $
 
      SUBDIR =
      SUBDIR += TclXML
@@ -417,7 +417,6 @@
      SUBDIR += py-markdown
      SUBDIR += py-markdown,python3
      SUBDIR += py-m2r,python3
-     SUBDIR += py-mistune
      SUBDIR += py-mistune,python3
      SUBDIR += py-natsort,python3
      SUBDIR += py-nltk,python3
@@ -431,29 +430,22 @@
      SUBDIR += py-pdf
      SUBDIR += py-pdfminer
      SUBDIR += py-podcastparser,python3
-     SUBDIR += py-polib
      SUBDIR += py-polib,python3
      SUBDIR += py-precis_i18n
-     SUBDIR += py-prettytable
      SUBDIR += py-prettytable,python3
      SUBDIR += py-pyRFC3339,python3
-     SUBDIR += py-pyaml
      SUBDIR += py-pyaml,python3
      SUBDIR += py-pygfm,python3
      SUBDIR += py-pygments,python3
-     SUBDIR += py-pykwalify
      SUBDIR += py-pykwalify,python3
      SUBDIR += py-pypandoc,python3
      SUBDIR += py-rebulk,python3
      SUBDIR += py-recommonmark,python3
-     SUBDIR += py-ruamel.yaml
      SUBDIR += py-ruamel.yaml,python3
      SUBDIR += py-signedjson,python3
      SUBDIR += py-semver
      SUBDIR += py-snowballstemmer,python3
-     SUBDIR += py-spdx
      SUBDIR += py-spdx,python3
-     SUBDIR += py-spdx-lookup
      SUBDIR += py-spdx-lookup,python3
      SUBDIR += py-sphinx,python3
      SUBDIR += py-sphinx-intl,python3
@@ -466,18 +458,14 @@
      SUBDIR += py-textfsm,python3
      SUBDIR += py-toml,python3
      SUBDIR += py-unicodecsv,python3
-     SUBDIR += py-unidecode
      SUBDIR += py-unidecode,python3
      SUBDIR += py-unpaddedbase64,python3
-     SUBDIR += py-vobject
      SUBDIR += py-vobject,python3
-     SUBDIR += py-webencodings
      SUBDIR += py-webencodings,python3
      SUBDIR += py-xlrd,python3
      SUBDIR += py-xlwt,python3
      SUBDIR += py-xml
      SUBDIR += py-xmldiff
-     SUBDIR += py-xmltodict
      SUBDIR += py-xmltodict,python3
      SUBDIR += py-yaml
      SUBDIR += py-yaml,python3
diff --git a/textproc/py-mistune/Makefile b/textproc/py-mistune/Makefile
index 0eb3968f5cc..551d78e1e3c 100644
--- a/textproc/py-mistune/Makefile
+++ b/textproc/py-mistune/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.11 2021/05/21 19:50:36 kmos Exp $
+# $OpenBSD: Makefile,v 1.12 2021/10/24 09:28:50 sthen Exp $
 
 COMMENT =		markdown parser for Python
 
 MODPY_EGG_VERSION =	0.8.4
 DISTNAME =		mistune-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
-REVISION =		0
+REVISION =		1
 
 CATEGORIES =		textproc
 
@@ -21,6 +21,6 @@ MODPY_SETUPTOOLS =	Yes
 MODPY_PYTEST =		Yes
 
 FLAVORS =		python3
-FLAVOR ?=
+FLAVOR =		python3
 
 .include <bsd.port.mk>
diff --git a/textproc/py-mistune/pkg/PLIST b/textproc/py-mistune/pkg/PLIST
index 1ef074baefa..507fc34c6af 100644
--- a/textproc/py-mistune/pkg/PLIST
+++ b/textproc/py-mistune/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.2 2016/10/23 13:38:36 shadchin Exp $
+@comment $OpenBSD: PLIST,v 1.3 2021/10/24 09:28:50 sthen Exp $
+@pkgpath textproc/py-mistune
 lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}mistune.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/mistune-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/mistune-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
diff --git a/textproc/py-polib/Makefile b/textproc/py-polib/Makefile
index ad1f1de2922..db14e72a3a6 100644
--- a/textproc/py-polib/Makefile
+++ b/textproc/py-polib/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.19 2021/05/21 19:50:36 kmos Exp $
+# $OpenBSD: Makefile,v 1.20 2021/10/24 09:28:50 sthen Exp $
 
 COMMENT=	Python library to manipulate gettext files
 
 MODPY_EGG_VERSION =	1.1.0
 DISTNAME =	polib-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME}
-REVISION =	2
+REVISION =	3
 
 CATEGORIES=	textproc devel
 
@@ -17,7 +17,7 @@ MODPY_PI=	Yes
 
 MODPY_SETUPTOOLS = Yes
 
-FLAVOR ?=
+FLAVOR =	python3
 FLAVORS =	python3
 
 # only used on test, but poisoned if not in BUILD_DEPENDS
diff --git a/textproc/py-polib/pkg/PLIST b/textproc/py-polib/pkg/PLIST
index 4a267079a06..1e7cd2902a6 100644
--- a/textproc/py-polib/pkg/PLIST
+++ b/textproc/py-polib/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.3 2017/11/02 12:57:13 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.4 2021/10/24 09:28:50 sthen Exp $
+@pkgpath textproc/py-polib
 lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}polib.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/polib-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/polib-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
diff --git a/textproc/py-prettytable/Makefile b/textproc/py-prettytable/Makefile
index 8f50b7e59f5..c218e9e0ada 100644
--- a/textproc/py-prettytable/Makefile
+++ b/textproc/py-prettytable/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2021/05/21 19:50:37 kmos Exp $
+# $OpenBSD: Makefile,v 1.17 2021/10/24 09:28:50 sthen Exp $
 
 COMMENT =	Python library for pretty-printing tabular data
 
@@ -6,14 +6,14 @@ MODPY_EGG_VERSION =	0.7.2
 DISTNAME =		prettytable-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
 CATEGORIES =		textproc devel
-REVISION =		4
+REVISION =		5
 
 MAINTAINER =	Edd Barrett <edd@openbsd.org>
 
 MASTER_SITES =	${MASTER_SITE_GOOGLECODE:=prettytable/}
 HOMEPAGE =	https://code.google.com/p/prettytable/
 
-FLAVOR ?=
+FLAVOR =	python3
 FLAVORS =	python3
 
 # 3 clause BSD
diff --git a/textproc/py-prettytable/pkg/PLIST b/textproc/py-prettytable/pkg/PLIST
index 0109c38448b..8f714267991 100644
--- a/textproc/py-prettytable/pkg/PLIST
+++ b/textproc/py-prettytable/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.2 2018/04/30 15:52:27 edd Exp $
+@comment $OpenBSD: PLIST,v 1.3 2021/10/24 09:28:50 sthen Exp $
+@pkgpath textproc/py-prettytable
 lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}prettytable.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/prettytable-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/prettytable-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
diff --git a/textproc/py-pyaml/Makefile b/textproc/py-pyaml/Makefile
index 59ed565b16f..e43f5d2e449 100644
--- a/textproc/py-pyaml/Makefile
+++ b/textproc/py-pyaml/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.4 2021/05/21 19:50:37 kmos Exp $
+# $OpenBSD: Makefile,v 1.5 2021/10/24 09:28:50 sthen Exp $
 
 COMMENT =		module to produce pretty and readable YAML
 
 MODPY_EGG_VERSION =	19.4.1
-REVISION =		2
+REVISION =		3
 
 DISTNAME =		pyaml-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
@@ -23,7 +23,7 @@ MODPY_PYTEST =		Yes
 MODPY_PYTEST_ARGS =	pyaml/tests/dump.py
 
 FLAVORS =		python3
-FLAVOR ?=
+FLAVOR =		python3
 
 TEST_DEPENDS =		textproc/py-unidecode${MODPY_FLAVOR}
 
diff --git a/textproc/py-pyaml/pkg/PLIST b/textproc/py-pyaml/pkg/PLIST
index 900935af250..02fbf108a2e 100644
--- a/textproc/py-pyaml/pkg/PLIST
+++ b/textproc/py-pyaml/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.2 2019/12/27 17:10:44 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.3 2021/10/24 09:28:50 sthen Exp $
+@pkgpath textproc/py-pyaml
 lib/python${MODPY_VERSION}/site-packages/pyaml/
 lib/python${MODPY_VERSION}/site-packages/pyaml-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/pyaml-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
diff --git a/textproc/py-pykwalify/Makefile b/textproc/py-pykwalify/Makefile
index c0bf831427e..d09f42abe28 100644
--- a/textproc/py-pykwalify/Makefile
+++ b/textproc/py-pykwalify/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.7 2021/05/21 19:50:37 kmos Exp $
+# $OpenBSD: Makefile,v 1.8 2021/10/24 09:28:50 sthen Exp $
 
 COMMENT =		lib/cli for JSON/YAML schema validation
 
 MODPY_EGG_VERSION =	1.6.0
-REVISION =		4
+REVISION =		5
 DISTNAME =		pykwalify-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
 
@@ -17,13 +17,10 @@ MODPY_PI =		Yes
 MODPY_SETUPTOOLS =	Yes
 
 FLAVORS =		python3
-FLAVOR ?=
+FLAVOR =		python3
 
 RUN_DEPENDS =		devel/py-dateutil${MODPY_FLAVOR} \
 			devel/py-docopt${MODPY_FLAVOR} \
 			textproc/py-yaml${MODPY_FLAVOR}
 
-post-install:
-	mv ${PREFIX}/bin/pykwalify{,${MODPY_BIN_SUFFIX}}
-
 .include <bsd.port.mk>
diff --git a/textproc/py-pykwalify/pkg/PLIST b/textproc/py-pykwalify/pkg/PLIST
index 6eaccb53712..5fe31669bb1 100644
--- a/textproc/py-pykwalify/pkg/PLIST
+++ b/textproc/py-pykwalify/pkg/PLIST
@@ -1,6 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.2 2021/02/19 23:13:06 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.3 2021/10/24 09:28:51 sthen Exp $
+@pkgpath textproc/py-pykwalify
 @conflict py-pykwalify-<1.6.0p3
-bin/pykwalify${MODPY_BIN_SUFFIX}
+bin/pykwalify
 lib/python${MODPY_VERSION}/site-packages/pykwalify/
 lib/python${MODPY_VERSION}/site-packages/pykwalify-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/pykwalify-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
diff --git a/textproc/py-ruamel.yaml/Makefile b/textproc/py-ruamel.yaml/Makefile
index 52ec6328ee3..48c2f22afcb 100644
--- a/textproc/py-ruamel.yaml/Makefile
+++ b/textproc/py-ruamel.yaml/Makefile
@@ -1,28 +1,24 @@
-# $OpenBSD: Makefile,v 1.11 2021/05/21 19:50:37 kmos Exp $
+# $OpenBSD: Makefile,v 1.12 2021/10/24 09:28:51 sthen Exp $
 
 COMMENT =		YAML 1.2 loader/dumper package for Python
 
 MODPY_EGG_VERSION =	0.15.92
 DISTNAME =		ruamel.yaml-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
-REVISION =		3
+REVISION =		4
 
 CATEGORIES =		textproc
 
 # MIT
 PERMIT_PACKAGE =	Yes
 
+WANTLIB =		${MODPY_WANTLIB} pthread
+
 MODULES =		lang/python
 MODPY_PI =		Yes
 MODPY_SETUPTOOLS =	Yes
 
 FLAVORS =		python3
-FLAVOR ?=
-
-WANTLIB =		${MODPY_WANTLIB} pthread
-
-.if !${FLAVOR:Mpython3}
-RUN_DEPENDS =		devel/py-ruamel.ordereddict${MODPY_FLAVOR}
-.endif
+FLAVOR =		python3
 
 .include <bsd.port.mk>
diff --git a/textproc/py-ruamel.yaml/pkg/PLIST b/textproc/py-ruamel.yaml/pkg/PLIST
index 40fd4062215..f87e188ef6f 100644
--- a/textproc/py-ruamel.yaml/pkg/PLIST
+++ b/textproc/py-ruamel.yaml/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.5 2021/01/04 14:06:39 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.6 2021/10/24 09:28:51 sthen Exp $
+@pkgpath textproc/py-ruamel.yaml
 @so lib/python${MODPY_VERSION}/site-packages/_ruamel_yaml.${MODPY_PYC_MAGIC_TAG}so
 lib/python${MODPY_VERSION}/site-packages/ruamel/
 lib/python${MODPY_VERSION}/site-packages/ruamel.yaml-${MODPY_EGG_VERSION}-py${MODPY_VERSION}-nspkg.pth
diff --git a/textproc/py-spdx-lookup/Makefile b/textproc/py-spdx-lookup/Makefile
index bee42904b16..43387fc89d1 100644
--- a/textproc/py-spdx-lookup/Makefile
+++ b/textproc/py-spdx-lookup/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.7 2021/05/21 19:50:37 kmos Exp $
+# $OpenBSD: Makefile,v 1.8 2021/10/24 09:28:51 sthen Exp $
 
 COMMENT =		SPDX license list query tool
 
 MODPY_EGG_VERSION =	0.3.2
 DISTNAME =		spdx-lookup-${MODPY_EGG_VERSION}
 PKGNAME =		py-spdx-lookup-${MODPY_EGG_VERSION}
-REVISION =		3
+REVISION =		4
 
 CATEGORIES =		textproc
 
@@ -19,15 +19,10 @@ MODPY_SETUPTOOLS =	Yes
 MODPY_PI =		Yes
 
 FLAVORS =		python3
-FLAVOR ?=
+FLAVOR =		python3
 
 RUN_DEPENDS =		textproc/py-spdx${MODPY_FLAVOR}
 
-post-install:
-	for i in ${PREFIX}/bin/*; do \
-		mv $${i} $${i}${MODPY_BIN_SUFFIX} ;\
-	done
-
 NO_TEST =		No tests written by upstream
 
 .include <bsd.port.mk>
diff --git a/textproc/py-spdx-lookup/pkg/PLIST b/textproc/py-spdx-lookup/pkg/PLIST
index 3a29d8153e8..8e18cd94ea3 100644
--- a/textproc/py-spdx-lookup/pkg/PLIST
+++ b/textproc/py-spdx-lookup/pkg/PLIST
@@ -1,6 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.2 2021/02/19 23:13:06 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.3 2021/10/24 09:28:51 sthen Exp $
+@pkgpath textproc/py-spdx-lookup
 @conflict py-spdx-lookup-<0.3.2p2
-bin/spdx-lookup${MODPY_BIN_SUFFIX}
+bin/spdx-lookup
 lib/python${MODPY_VERSION}/site-packages/spdx_lookup/
 lib/python${MODPY_VERSION}/site-packages/spdx_lookup-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/spdx_lookup-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
diff --git a/textproc/py-spdx/Makefile b/textproc/py-spdx/Makefile
index 94ba275ea20..f3a3e138476 100644
--- a/textproc/py-spdx/Makefile
+++ b/textproc/py-spdx/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.5 2021/05/21 19:50:37 kmos Exp $
+# $OpenBSD: Makefile,v 1.6 2021/10/24 09:28:51 sthen Exp $
 
 COMMENT =		SPDX license list database
 
 MODPY_EGG_VERSION =	2.5.0
 DISTNAME =		spdx-${MODPY_EGG_VERSION}
 PKGNAME =		py-spdx-${MODPY_EGG_VERSION}
-REVISION =		2
+REVISION =		3
 
 CATEGORIES =		textproc
 
@@ -19,6 +19,6 @@ MODPY_SETUPTOOLS =	Yes
 MODPY_PI =		Yes
 
 FLAVORS =		python3
-FLAVOR ?=
+FLAVOR =		python3
 
 .include <bsd.port.mk>
diff --git a/textproc/py-spdx/pkg/PLIST b/textproc/py-spdx/pkg/PLIST
index 0b951ce3d26..cd828e2fd6f 100644
--- a/textproc/py-spdx/pkg/PLIST
+++ b/textproc/py-spdx/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2018/04/24 10:06:26 danj Exp $
+@comment $OpenBSD: PLIST,v 1.2 2021/10/24 09:28:51 sthen Exp $
+@pkgpath textproc/py-spdx
 lib/python${MODPY_VERSION}/site-packages/spdx/
 lib/python${MODPY_VERSION}/site-packages/spdx-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/spdx-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
diff --git a/textproc/py-unidecode/Makefile b/textproc/py-unidecode/Makefile
index 3cc35d137a3..3df14d96391 100644
--- a/textproc/py-unidecode/Makefile
+++ b/textproc/py-unidecode/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.18 2021/05/21 19:50:37 kmos Exp $
+# $OpenBSD: Makefile,v 1.19 2021/10/24 09:28:51 sthen Exp $
 
 COMMENT =		US-ASCII transliterations of Unicode text
 
 MODPY_EGG_VERSION =	1.1.1
 DISTNAME =		Unidecode-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME:L}
-REVISION =		2
+REVISION =		3
 
 CATEGORIES =		textproc devel
 
@@ -21,9 +21,6 @@ MODPY_SETUPTOOLS =	Yes
 MODPY_PYTEST =		Yes
 
 FLAVORS =		python3
-FLAVOR ?=
-
-post-install:
-	mv ${PREFIX}/bin/unidecode{,${MODPY_BIN_SUFFIX}}
+FLAVOR =		python3
 
 .include <bsd.port.mk>
diff --git a/textproc/py-unidecode/pkg/PLIST b/textproc/py-unidecode/pkg/PLIST
index dae23c85f9e..aa45e6e2ab3 100644
--- a/textproc/py-unidecode/pkg/PLIST
+++ b/textproc/py-unidecode/pkg/PLIST
@@ -1,6 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.6 2021/02/19 23:13:07 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.7 2021/10/24 09:28:51 sthen Exp $
+@pkgpath textproc/py-unidecode
 @conflict py-unidecode-<1.1.1p1
-bin/unidecode${MODPY_BIN_SUFFIX}
+bin/unidecode
 lib/python${MODPY_VERSION}/site-packages/Unidecode-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/Unidecode-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
 lib/python${MODPY_VERSION}/site-packages/Unidecode-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
diff --git a/textproc/py-vobject/Makefile b/textproc/py-vobject/Makefile
index 2ef28d9154c..9fe614c576a 100644
--- a/textproc/py-vobject/Makefile
+++ b/textproc/py-vobject/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.20 2021/05/21 19:50:37 kmos Exp $
+# $OpenBSD: Makefile,v 1.21 2021/10/24 09:28:51 sthen Exp $
 
 COMMENT =		iCalendar library for Python
 
 MODPY_EGG_VERSION =	0.9.6.1
 DISTNAME =		vobject-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
-REVISION =		3
+REVISION =		4
 
 CATEGORIES=		textproc devel
 
@@ -19,7 +19,7 @@ MASTER_SITES=		${HOMEPAGE}
 MODULES=		lang/python
 MODPY_PI=		Yes
 FLAVORS =		python3
-FLAVOR ?=
+FLAVOR =		python3
 
 MODPY_SETUPTOOLS=	Yes
 MODPY_PYTEST =		Yes
@@ -29,9 +29,4 @@ BUILD_DEPENDS=		${RUN_DEPENDS}
 RUN_DEPENDS=		devel/py-dateutil${MODPY_FLAVOR} \
 			devel/py-six${MODPY_FLAVOR}
 
-post-install:
-.for b in change_tz ics_diff
-	mv ${PREFIX}/bin/$b{,${MODPY_BIN_SUFFIX}}
-.endfor
-
 .include <bsd.port.mk>
diff --git a/textproc/py-vobject/pkg/PLIST b/textproc/py-vobject/pkg/PLIST
index ddbcadc2ce0..649fc3fc593 100644
--- a/textproc/py-vobject/pkg/PLIST
+++ b/textproc/py-vobject/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.4 2021/02/19 23:13:07 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.5 2021/10/24 09:28:51 sthen Exp $
+@pkgpath textproc/py-vobject
 @conflict py-vobject-<0.9.6.1p2
 bin/change_tz${MODPY_BIN_SUFFIX}
 bin/ics_diff${MODPY_BIN_SUFFIX}
diff --git a/textproc/py-webencodings/Makefile b/textproc/py-webencodings/Makefile
index 9a64d3a165e..21ae3ef3a7c 100644
--- a/textproc/py-webencodings/Makefile
+++ b/textproc/py-webencodings/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2021/05/21 19:50:37 kmos Exp $
+# $OpenBSD: Makefile,v 1.8 2021/10/24 09:28:51 sthen Exp $
 
 COMMENT =		character encoding aliases for legacy web content
 
@@ -6,7 +6,7 @@ MODPY_EGG_VERSION =	0.5.1
 DISTNAME =		webencodings-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
 CATEGORIES =		textproc
-REVISION =		3
+REVISION =		4
 
 # BSD
 PERMIT_PACKAGE =	Yes
@@ -19,6 +19,6 @@ MODPY_PYTEST =		Yes
 MODPY_PYTEST_ARGS =	webencodings/tests.py
 
 FLAVORS =		python3
-FLAVOR ?=
+FLAVOR =		python3
 
 .include <bsd.port.mk>
diff --git a/textproc/py-webencodings/pkg/PLIST b/textproc/py-webencodings/pkg/PLIST
index 607e2653ba7..dfd9bdebb9d 100644
--- a/textproc/py-webencodings/pkg/PLIST
+++ b/textproc/py-webencodings/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2017/05/24 14:54:28 shadchin Exp $
+@comment $OpenBSD: PLIST,v 1.2 2021/10/24 09:28:51 sthen Exp $
+@pkgpath textproc/py-webencodings
 lib/python${MODPY_VERSION}/site-packages/webencodings/
 lib/python${MODPY_VERSION}/site-packages/webencodings-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/webencodings-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
diff --git a/textproc/py-xmltodict/Makefile b/textproc/py-xmltodict/Makefile
index 411db1d9095..4c19febd83a 100644
--- a/textproc/py-xmltodict/Makefile
+++ b/textproc/py-xmltodict/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.7 2021/05/21 19:50:37 kmos Exp $
+# $OpenBSD: Makefile,v 1.8 2021/10/24 09:28:51 sthen Exp $
 
 COMMENT =		makes working with XML feel like orking with JSON
 
 MODPY_EGG_VERSION =	0.12.0
 DISTNAME = 		xmltodict-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
-REVISION =		1
+REVISION =		2
 
 CATEGORIES =		textproc
 
@@ -22,6 +22,6 @@ MODPY_PYTEST =		Yes
 TEST_DEPENDS =		devel/py-coverage${MODPY_FLAVOR}
 
 FLAVORS =		python3
-FLAVOR ?=
+FLAVOR =		python3
 
 .include <bsd.port.mk>
diff --git a/textproc/py-xmltodict/pkg/PLIST b/textproc/py-xmltodict/pkg/PLIST
index ae553d039b3..227e0eada34 100644
--- a/textproc/py-xmltodict/pkg/PLIST
+++ b/textproc/py-xmltodict/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2018/05/04 11:40:32 jasper Exp $
+@comment $OpenBSD: PLIST,v 1.2 2021/10/24 09:28:51 sthen Exp $
+@pkgpath textproc/py-xmltodict
 lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}xmltodict.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/xmltodict-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/xmltodict-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
diff --git a/www/Makefile b/www/Makefile
index 7569cfd9d38..dcdc785d472 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1041 2021/10/23 16:03:20 sthen Exp $
+# $OpenBSD: Makefile,v 1.1042 2021/10/24 09:28:47 sthen Exp $
 
      SUBDIR =
      SUBDIR += analog
@@ -415,26 +415,18 @@
      SUBDIR += privoxy
      SUBDIR += puppetboard
      SUBDIR += purritobin
-     SUBDIR += py-CherryPy
      SUBDIR += py-CherryPy,python3
      SUBDIR += py-adblock,python3
      SUBDIR += py-aiohttp,python3
      SUBDIR += py-autobahn,python3
-     SUBDIR += py-beaker
      SUBDIR += py-beaker,python3
      SUBDIR += py-beautifulsoup4,python3
-     SUBDIR += py-betamax
      SUBDIR += py-betamax,python3
-     SUBDIR += py-bleach
      SUBDIR += py-bleach,python3
      SUBDIR += py-bokeh,python3
-     SUBDIR += py-bottle
      SUBDIR += py-bottle,python3
-     SUBDIR += py-cheroot
      SUBDIR += py-cheroot,python3
-     SUBDIR += py-cookies
      SUBDIR += py-cookies,python3
-     SUBDIR += py-feedgenerator
      SUBDIR += py-feedgenerator,python3
      SUBDIR += py-flask,python3
      SUBDIR += py-flask-cors
@@ -443,7 +435,6 @@
      SUBDIR += py-flask-wtf,python3
      SUBDIR += py-flup
      SUBDIR += py-flup,python3
-     SUBDIR += py-formencode
      SUBDIR += py-formencode,python3
      SUBDIR += py-frozen-flask,python3
      SUBDIR += py-genshi,python3
@@ -451,17 +442,14 @@
      SUBDIR += py-html5-parser,python3
      SUBDIR += py-http_ece,python3
      SUBDIR += py-httpbin,python3
-     SUBDIR += py-httpie
-     SUBDIR += py-httplib2
+     SUBDIR += py-httpie	# standalone py3 cli tool
      SUBDIR += py-httplib2,python3
      SUBDIR += py-hyperlink,python3
      SUBDIR += py-itsdangerous,python3
-     SUBDIR += py-jinja2
      SUBDIR += py-jinja2,python3
      SUBDIR += py-jonpy
      SUBDIR += py-jwt,python3
      SUBDIR += py-macaroons,python3
-     SUBDIR += py-mako
      SUBDIR += py-mako,python3
      SUBDIR += py-mastodon.py
      SUBDIR += py-mechanize,python3
@@ -476,40 +464,29 @@
      SUBDIR += py-query,python3
      SUBDIR += py-quixote
      SUBDIR += py-recaptcha-client
-     SUBDIR += py-repoze-lru
      SUBDIR += py-repoze-lru,python3
-     SUBDIR += py-repoze-profile
      SUBDIR += py-repoze-profile,python3
-     SUBDIR += py-repoze-who
      SUBDIR += py-repoze-who,python3
      SUBDIR += py-requests
      SUBDIR += py-requests,python3
      SUBDIR += py-requests-cache,python3
-     SUBDIR += py-requests-futures
      SUBDIR += py-requests-futures,python3
-     SUBDIR += py-requests-mock
      SUBDIR += py-requests-mock,python3
      SUBDIR += py-requests-oauthlib,python3
-     SUBDIR += py-requests-toolbelt
      SUBDIR += py-requests-toolbelt,python3
      SUBDIR += py-requests-unixsocket,python3
      SUBDIR += py-responses,python3
-     SUBDIR += py-selenium
      SUBDIR += py-selenium,python3
-     SUBDIR += py-soupsieve
      SUBDIR += py-soupsieve,python3
-     SUBDIR += py-tempita
      SUBDIR += py-tempita,python3
      SUBDIR += py-terminado,python3
      SUBDIR += py-tornado,python3
      SUBDIR += py-treq,python3
-     SUBDIR += py-uritemplate
      SUBDIR += py-uritemplate,python3
      SUBDIR += py-urlgrabber,python3
      SUBDIR += py-urllib3
      SUBDIR += py-urllib3,python3
      SUBDIR += py-vcrpy,python3
-     SUBDIR += py-waitress
      SUBDIR += py-waitress,python3
      SUBDIR += py-webob,python3
      SUBDIR += py-webpy,python3
diff --git a/www/py-CherryPy/Makefile b/www/py-CherryPy/Makefile
index 088bfa9ea73..08d91737ea6 100644
--- a/www/py-CherryPy/Makefile
+++ b/www/py-CherryPy/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.29 2021/05/21 19:50:37 kmos Exp $
+# $OpenBSD: Makefile,v 1.30 2021/10/24 09:28:51 sthen Exp $
 
 COMMENT=	pythonic, object-oriented web development framework
 
@@ -6,7 +6,7 @@ MODPY_EGG_VERSION=	17.4.2
 DISTNAME=		CherryPy-${MODPY_EGG_VERSION}
 PKGNAME=		py-${DISTNAME}
 CATEGORIES=		www
-REVISION=		2
+REVISION=		3
 
 HOMEPAGE=	https://www.cherrypy.org/
 
@@ -33,13 +33,6 @@ TEST_DEPENDS=	devel/py-path.py${MODPY_FLAVOR} \
 		www/py-requests-toolbelt${MODPY_FLAVOR}
 
 FLAVORS=	python3
-FLAVOR?=
-
-.if !${FLAVOR:Mpython3}
-TEST_DEPENDS+=	devel/py-mock
-.endif
-
-post-install:
-	mv ${PREFIX}/bin/cherryd ${PREFIX}/bin/cherryd${MODPY_BIN_SUFFIX}
+FLAVOR=		python3
 
 .include <bsd.port.mk>
diff --git a/www/py-CherryPy/pkg/PLIST b/www/py-CherryPy/pkg/PLIST
index dfea15f273b..1e3d5837dd2 100644
--- a/www/py-CherryPy/pkg/PLIST
+++ b/www/py-CherryPy/pkg/PLIST
@@ -1,7 +1,8 @@
-@comment $OpenBSD: PLIST,v 1.13 2021/02/19 23:13:07 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.14 2021/10/24 09:28:51 sthen Exp $
+@pkgpath www/py-CherryPy
 @conflict py-CherryPy-<17.4.2p1
 @conflict py-cherrypy2-*
-bin/cherryd${MODPY_BIN_SUFFIX}
+bin/cherryd
 lib/python${MODPY_VERSION}/site-packages/CherryPy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/CherryPy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
 lib/python${MODPY_VERSION}/site-packages/CherryPy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
diff --git a/www/py-beaker/Makefile b/www/py-beaker/Makefile
index a166ed6b1b0..8710b5a031c 100644
--- a/www/py-beaker/Makefile
+++ b/www/py-beaker/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.31 2021/05/21 19:50:37 kmos Exp $
+# $OpenBSD: Makefile,v 1.32 2021/10/24 09:28:51 sthen Exp $
 
 COMMENT =	session and caching library with wsgi middleware
 
 MODPY_EGG_VERSION = 1.10.0
 DISTNAME =	Beaker-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME:L}
-REVISION =	2
+REVISION =	3
 
 CATEGORIES =	www devel
 
@@ -20,7 +20,7 @@ MODPY_SETUPTOOLS = Yes
 MODULES =	lang/python
 
 FLAVORS=	python3
-FLAVOR?=
+FLAVOR=		python3
 
 RUN_DEPENDS =	security/py-cryptodome${MODPY_FLAVOR} 
 
diff --git a/www/py-beaker/pkg/PLIST b/www/py-beaker/pkg/PLIST
index a8fc69b66c6..3129b6e4b26 100644
--- a/www/py-beaker/pkg/PLIST
+++ b/www/py-beaker/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.4 2018/07/11 10:02:09 jasper Exp $
+@comment $OpenBSD: PLIST,v 1.5 2021/10/24 09:28:51 sthen Exp $
+@pkgpath www/py-beaker
 lib/python${MODPY_VERSION}/site-packages/Beaker-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/Beaker-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
 lib/python${MODPY_VERSION}/site-packages/Beaker-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
diff --git a/www/py-betamax/Makefile b/www/py-betamax/Makefile
index a2a3ec3e31e..f605124444d 100644
--- a/www/py-betamax/Makefile
+++ b/www/py-betamax/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.7 2021/05/21 19:50:37 kmos Exp $
+# $OpenBSD: Makefile,v 1.8 2021/10/24 09:28:52 sthen Exp $
 
 COMMENT =		VCR imitation for python-requests
 
 MODPY_EGG_VERSION =	0.8.1
 DISTNAME =		betamax-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME:L}
-REVISION =		2
+REVISION =		3
 
 CATEGORIES =		www devel
 
@@ -19,7 +19,7 @@ MODPY_SETUPTOOLS =	Yes
 MODPY_PYTEST =		Yes
 
 FLAVORS =		python3
-FLAVOR ?=
+FLAVOR =		python3
 
 RUN_DEPENDS =		www/py-requests${MODPY_FLAVOR}
 
diff --git a/www/py-betamax/pkg/PLIST b/www/py-betamax/pkg/PLIST
index 862c6301da7..cd83f90a8e4 100644
--- a/www/py-betamax/pkg/PLIST
+++ b/www/py-betamax/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2017/03/17 07:39:58 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.2 2021/10/24 09:28:52 sthen Exp $
+@pkgpath www/py-betamax
 lib/python${MODPY_VERSION}/site-packages/betamax/
 lib/python${MODPY_VERSION}/site-packages/betamax-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/betamax-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
diff --git a/www/py-bleach/Makefile b/www/py-bleach/Makefile
index 906e2cb6590..a931bee287c 100644
--- a/www/py-bleach/Makefile
+++ b/www/py-bleach/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2021/05/21 19:50:37 kmos Exp $
+# $OpenBSD: Makefile,v 1.10 2021/10/24 09:28:52 sthen Exp $
 
 COMMENT =		easy whitelist-based HTML-sanitizing tool
 
@@ -6,7 +6,7 @@ MODPY_EGG_VERSION =	2.0.0
 DISTNAME =		bleach-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
 CATEGORIES =		www
-REVISION =		3
+REVISION =		4
 
 HOMEPAGE =		https://github.com/mozilla/bleach
 
@@ -20,7 +20,7 @@ MODPY_SETUPTOOLS =	Yes
 MODPY_PYTEST =		Yes
 
 FLAVORS =		python3
-FLAVOR ?=
+FLAVOR =		python3
 
 RUN_DEPENDS =		devel/py-html5lib${MODPY_FLAVOR} \
 			devel/py-six${MODPY_FLAVOR}
diff --git a/www/py-bleach/pkg/PLIST b/www/py-bleach/pkg/PLIST
index a9fc2a37847..c1ef66f8a04 100644
--- a/www/py-bleach/pkg/PLIST
+++ b/www/py-bleach/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.2 2017/06/28 18:03:20 shadchin Exp $
+@comment $OpenBSD: PLIST,v 1.3 2021/10/24 09:28:52 sthen Exp $
+@pkgpath www/py-bleach
 lib/python${MODPY_VERSION}/site-packages/bleach/
 lib/python${MODPY_VERSION}/site-packages/bleach-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/bleach-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
diff --git a/www/py-bottle/Makefile b/www/py-bottle/Makefile
index 51675478af4..73dfd1b2d64 100644
--- a/www/py-bottle/Makefile
+++ b/www/py-bottle/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.8 2021/07/08 23:57:34 daniel Exp $
+# $OpenBSD: Makefile,v 1.9 2021/10/24 09:28:52 sthen Exp $
 
 COMMENT=		simple WSGI-framework for small web-applications
 
 MODPY_EGG_VERSION=	0.12.19
+REVISION=		0
 DISTNAME=		bottle-${MODPY_EGG_VERSION}
 PKGNAME=		py-bottle-${MODPY_EGG_VERSION}
 
@@ -15,14 +16,11 @@ PERMIT_PACKAGE=	Yes
 
 MODULES=		lang/python
 
-FLAVORS =		python3
-FLAVOR ?=
+FLAVORS=		python3
+FLAVOR=			python3
 
 MODPY_PI=		Yes
 MODPY_SETUPTOOLS=	Yes
 MODPY_PYTEST=		Yes
 
-post-install:
-	mv ${PREFIX}/bin/bottle{,${MODPY_BIN_SUFFIX}}.py
-
 .include <bsd.port.mk>
diff --git a/www/py-bottle/pkg/PLIST b/www/py-bottle/pkg/PLIST
index 06eec1dd1b8..ff3417d6f67 100644
--- a/www/py-bottle/pkg/PLIST
+++ b/www/py-bottle/pkg/PLIST
@@ -1,6 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.2 2021/02/19 23:13:07 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.3 2021/10/24 09:28:52 sthen Exp $
+@pkgpath www/py-bottle
 @conflict py-bottle-<0.12.16p1
-bin/bottle${MODPY_BIN_SUFFIX}.py
+bin/bottle.py
 lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}bottle.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/bottle-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/bottle-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
diff --git a/www/py-cheroot/Makefile b/www/py-cheroot/Makefile
index 70732921781..c9a373a30be 100644
--- a/www/py-cheroot/Makefile
+++ b/www/py-cheroot/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.8 2021/05/21 19:50:38 kmos Exp $
+# $OpenBSD: Makefile,v 1.9 2021/10/24 09:28:52 sthen Exp $
 
 COMMENT = high-performance, pure-Python HTTP server used by CherryPy
 
 MODPY_EGG_VERSION =	8.2.1
 DISTNAME =		cheroot-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
-REVISION =		3
+REVISION =		4
 
 CATEGORIES =		www
 
@@ -15,7 +15,7 @@ HOMEPAGE =		https://github.com/cherrypy/cheroot
 PERMIT_PACKAGE =	Yes
 
 FLAVORS =		python3
-FLAVOR ?=
+FLAVOR =		python3
 
 MODULES =		lang/python
 
@@ -28,13 +28,6 @@ RUN_DEPENDS =		devel/py-jaraco-functools${MODPY_FLAVOR} \
 			devel/py-more-itertools${MODPY_FLAVOR}>=2.6 \
 			devel/py-six${MODPY_FLAVOR}>=1.11.0
 
-.if !${FLAVOR:Mpython3}
-RUN_DEPENDS +=		devel/py-backports-functools-lru-cache
-.endif
-
 NO_TEST =		Yes
 
-post-install:
-	mv ${PREFIX}/bin/cheroot ${PREFIX}/bin/cheroot${MODPY_BIN_SUFFIX}
-
 .include <bsd.port.mk>
diff --git a/www/py-cheroot/pkg/PLIST b/www/py-cheroot/pkg/PLIST
index a90ed1f901d..cf84ba2ab37 100644
--- a/www/py-cheroot/pkg/PLIST
+++ b/www/py-cheroot/pkg/PLIST
@@ -1,6 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.3 2021/02/19 23:13:07 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.4 2021/10/24 09:28:52 sthen Exp $
+@pkgpath www/py-cheroot
 @conflict py-cheroot-<8.2.1p2
-bin/cheroot${MODPY_BIN_SUFFIX}
+bin/cheroot
 lib/python${MODPY_VERSION}/site-packages/cheroot/
 lib/python${MODPY_VERSION}/site-packages/cheroot-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/cheroot-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
diff --git a/www/py-cookies/Makefile b/www/py-cookies/Makefile
index 4617f8218b1..577f3119c6c 100644
--- a/www/py-cookies/Makefile
+++ b/www/py-cookies/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2021/05/21 19:50:38 kmos Exp $
+# $OpenBSD: Makefile,v 1.4 2021/10/24 09:28:52 sthen Exp $
 
 COMMENT =	friendlier RFC 6265-compliant cookie parser/renderer
 
@@ -6,7 +6,7 @@ MODPY_EGG_VERSION =	2.2.1
 
 DISTNAME =		cookies-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
-REVISION =		1
+REVISION =		2
 
 CATEGORIES =		www
 
@@ -25,6 +25,6 @@ MODPY_PYTEST =		Yes
 MODPY_PYTEST_ARGS =	lib
 
 FLAVORS =		python3
-FLAVOR ?=
+FLAVOR =		python3
 
 .include <bsd.port.mk>
diff --git a/www/py-cookies/pkg/PLIST b/www/py-cookies/pkg/PLIST
index e8a01b95e47..6db73230b05 100644
--- a/www/py-cookies/pkg/PLIST
+++ b/www/py-cookies/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2019/11/07 21:50:47 kmos Exp $
+@comment $OpenBSD: PLIST,v 1.2 2021/10/24 09:28:52 sthen Exp $
+@pkgpath www/py-cookies
 lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}cookies.${MODPY_PYC_MAGIC_TAG}pyc
 @comment lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}test_cookies.cpython-37-PYTEST.pyc
 lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}test_cookies.${MODPY_PYC_MAGIC_TAG}pyc
diff --git a/www/py-feedgenerator/Makefile b/www/py-feedgenerator/Makefile
index 019be0ea3bc..88746ec1c1e 100644
--- a/www/py-feedgenerator/Makefile
+++ b/www/py-feedgenerator/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.13 2021/05/21 19:50:38 kmos Exp $
+# $OpenBSD: Makefile,v 1.14 2021/10/24 09:28:52 sthen Exp $
 
 COMMENT =		standalone version of Django's feedgenerator
 
 MODPY_EGG_VERSION =	1.9.1
 DISTNAME =		feedgenerator-${MODPY_EGG_VERSION}
 PKGNAME =		py-feedgenerator-${MODPY_EGG_VERSION}
-REVISION =		0
+REVISION =		1
 
 CATEGORIES =		www textproc
 
@@ -20,7 +20,7 @@ MODPY_PI =		Yes
 MODPY_SETUPTOOLS =	Yes
 
 FLAVORS =		python3
-FLAVOR ?=
+FLAVOR =		python3
 
 RUN_DEPENDS =		devel/py-six${MODPY_FLAVOR} \
 			devel/py-tz${MODPY_FLAVOR}
diff --git a/www/py-feedgenerator/pkg/PLIST b/www/py-feedgenerator/pkg/PLIST
index 0a8e623ec94..7dc2943e0e3 100644
--- a/www/py-feedgenerator/pkg/PLIST
+++ b/www/py-feedgenerator/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.2 2016/11/21 08:07:53 danj Exp $
+@comment $OpenBSD: PLIST,v 1.3 2021/10/24 09:28:52 sthen Exp $
+@pkgpath www/py-feedgenerator
 lib/python${MODPY_VERSION}/site-packages/feedgenerator/
 lib/python${MODPY_VERSION}/site-packages/feedgenerator-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/feedgenerator-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
diff --git a/www/py-formencode/Makefile b/www/py-formencode/Makefile
index 8c4192fbfb4..fdc326e6b74 100644
--- a/www/py-formencode/Makefile
+++ b/www/py-formencode/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.26 2021/05/21 19:50:38 kmos Exp $
+# $OpenBSD: Makefile,v 1.27 2021/10/24 09:28:52 sthen Exp $
 
 COMMENT =		HTML form validation, generation, and conversion
 
 MODPY_EGG_VERSION =	1.3.1
 DISTNAME =		FormEncode-${MODPY_EGG_VERSION}
 PKGNAME =		py-formencode-${MODPY_EGG_VERSION}
-REVISION =		2
+REVISION =		3
 
 CATEGORIES =		www
 
@@ -19,7 +19,7 @@ MODPY_PI =		Yes
 MODULES =		lang/python
 
 FLAVORS =		python3
-FLAVOR ?=
+FLAVOR =		python3
 
 TEST_DEPENDS =		devel/py-nose${MODPY_FLAVOR} \
 			devel/py-country${MODPY_FLAVOR} \
diff --git a/www/py-formencode/pkg/PLIST b/www/py-formencode/pkg/PLIST
index 3aa5fa52fbe..b10da73478e 100644
--- a/www/py-formencode/pkg/PLIST
+++ b/www/py-formencode/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.7 2018/06/12 04:45:07 rpointel Exp $
+@comment $OpenBSD: PLIST,v 1.8 2021/10/24 09:28:52 sthen Exp $
+@pkgpath www/py-formencode
 lib/python${MODPY_VERSION}/site-packages/FormEncode-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/FormEncode-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
 lib/python${MODPY_VERSION}/site-packages/FormEncode-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
diff --git a/www/py-httplib2/Makefile b/www/py-httplib2/Makefile
index b93040689b6..331e4eed64d 100644
--- a/www/py-httplib2/Makefile
+++ b/www/py-httplib2/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.23 2021/05/21 19:50:38 kmos Exp $
+# $OpenBSD: Makefile,v 1.24 2021/10/24 09:28:52 sthen Exp $
 
 COMMENT =		Python HTTP client library
 
 MODPY_EGG_VERSION =	0.10.3
 DISTNAME =		httplib2-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
-REVISION =		3
+REVISION =		4
 
 CATEGORIES =		www net
 
@@ -22,12 +22,7 @@ MODPY_PI =		Yes
 MODPY_SETUPTOOLS =	Yes
 
 FLAVORS =		python3
-FLAVOR ?=
-
-.if !${FLAVOR:Mpython3}
-post-patch:
-	rm -r ${WRKSRC}/python${MODPY_MAJOR_VERSION}/httplib2.egg-info
-.endif
+FLAVOR =		python3
 
 post-install:
 	ln -sf /etc/ssl/cert.pem \
diff --git a/www/py-httplib2/pkg/PLIST b/www/py-httplib2/pkg/PLIST
index a776114702e..99520de4c77 100644
--- a/www/py-httplib2/pkg/PLIST
+++ b/www/py-httplib2/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.4 2016/01/24 11:04:50 shadchin Exp $
+@comment $OpenBSD: PLIST,v 1.5 2021/10/24 09:28:52 sthen Exp $
+@pkgpath www/py-httplib2
 lib/python${MODPY_VERSION}/site-packages/httplib2/
 lib/python${MODPY_VERSION}/site-packages/httplib2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/httplib2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
diff --git a/www/py-jinja2/Makefile b/www/py-jinja2/Makefile
index f65a07a287c..2227ddcb88f 100644
--- a/www/py-jinja2/Makefile
+++ b/www/py-jinja2/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.34 2021/08/31 11:26:08 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.35 2021/10/24 09:28:52 sthen Exp $
 
 COMMENT =		fast, optionally sandboxed, Python template engine
 
 MODPY_EGG_VERSION =	2.11.3
+REVISION =		0
 DISTNAME =		Jinja2-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME:L}
 
@@ -17,7 +18,7 @@ MODULES =		lang/python
 RUN_DEPENDS =		textproc/py-MarkupSafe${MODPY_FLAVOR}
 
 FLAVORS =		python3
-FLAVOR ?=
+FLAVOR =		python3
 
 MODPY_SETUPTOOLS =	Yes
 MODPY_PYTEST =		Yes
diff --git a/www/py-jinja2/pkg/PLIST b/www/py-jinja2/pkg/PLIST
index 00ef4745212..09bcb06b8d2 100644
--- a/www/py-jinja2/pkg/PLIST
+++ b/www/py-jinja2/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.9 2020/06/10 11:19:21 kn Exp $
+@comment $OpenBSD: PLIST,v 1.10 2021/10/24 09:28:52 sthen Exp $
+@pkgpath www/py-jinja2
 lib/python${MODPY_VERSION}/site-packages/Jinja2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/Jinja2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
 lib/python${MODPY_VERSION}/site-packages/Jinja2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
diff --git a/www/py-mako/Makefile b/www/py-mako/Makefile
index 598a7e69f72..5e9dc785c64 100644
--- a/www/py-mako/Makefile
+++ b/www/py-mako/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.30 2021/05/21 19:50:38 kmos Exp $
+# $OpenBSD: Makefile,v 1.31 2021/10/24 09:28:52 sthen Exp $
 
 COMMENT =	super-fast templating language
 
 MODPY_EGG_VERSION = 	1.1.1
 DISTNAME =		Mako-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME:L}
-REVISION =		2
+REVISION =		3
 
 CATEGORIES =		www
 
@@ -21,19 +21,11 @@ MODPY_PYTEST =		Yes
 MODULES =		lang/python
 
 FLAVORS =		python3
-FLAVOR ?=
+FLAVOR =		python3
 
 RUN_DEPENDS =		textproc/py-MarkupSafe${MODPY_FLAVOR} \
 			www/py-beaker${MODPY_FLAVOR}
 
 TEST_DEPENDS =		devel/py-test-cov${MODPY_FLAVOR}
 
-.if !${FLAVOR:Mpython3}
-TEST_DEPENDS +=		devel/py-mock
-.endif
-
-post-install:
-	mv ${PREFIX}/bin/mako-render \
-		${PREFIX}/bin/mako-render${MODPY_BIN_SUFFIX}
-
 .include <bsd.port.mk>
diff --git a/www/py-mako/pkg/PLIST b/www/py-mako/pkg/PLIST
index 021eb6608de..cd2163920af 100644
--- a/www/py-mako/pkg/PLIST
+++ b/www/py-mako/pkg/PLIST
@@ -1,6 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.6 2021/02/19 23:13:07 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.7 2021/10/24 09:28:52 sthen Exp $
+@pkgpath www/py-mako
 @conflict py-mako-<1.1.1p1
-bin/mako-render${MODPY_BIN_SUFFIX}
+bin/mako-render
 lib/python${MODPY_VERSION}/site-packages/Mako-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/Mako-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
 lib/python${MODPY_VERSION}/site-packages/Mako-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
diff --git a/www/py-repoze-lru/Makefile b/www/py-repoze-lru/Makefile
index fdccdea4765..60df8a86224 100644
--- a/www/py-repoze-lru/Makefile
+++ b/www/py-repoze-lru/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.10 2021/05/21 19:50:38 kmos Exp $
+# $OpenBSD: Makefile,v 1.11 2021/10/24 09:28:53 sthen Exp $
 
 COMMENT =	tiny LRU cache implementation and decorator
 
 MODPY_EGG_VERSION = 0.6
 DISTNAME =	repoze.lru-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME:S/./-/}
-REVISION =	3
+REVISION =	4
 
 CATEGORIES =	www devel
 
@@ -15,7 +15,7 @@ PERMIT_PACKAGE =	Yes
 MODULES =	lang/python
 
 FLAVORS =	python3
-FLAVOR ?=
+FLAVOR =	python3
 
 MODPY_PI =		Yes
 MODPY_SETUPTOOLS =	Yes
diff --git a/www/py-repoze-lru/pkg/PLIST b/www/py-repoze-lru/pkg/PLIST
index 706b5438296..cfa6ef7bee3 100644
--- a/www/py-repoze-lru/pkg/PLIST
+++ b/www/py-repoze-lru/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.3 2021/02/27 18:40:40 daniel Exp $
+@comment $OpenBSD: PLIST,v 1.4 2021/10/24 09:28:53 sthen Exp $
+@pkgpath www/py-repoze-lru
 lib/python${MODPY_VERSION}/site-packages/repoze/
 lib/python${MODPY_VERSION}/site-packages/repoze.lru-${MODPY_EGG_VERSION}-py${MODPY_VERSION}-nspkg.pth
 lib/python${MODPY_VERSION}/site-packages/repoze.lru-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
diff --git a/www/py-repoze-profile/Makefile b/www/py-repoze-profile/Makefile
index d587f283e06..02ce5567d05 100644
--- a/www/py-repoze-profile/Makefile
+++ b/www/py-repoze-profile/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.17 2021/05/21 19:50:38 kmos Exp $
+# $OpenBSD: Makefile,v 1.18 2021/10/24 09:28:53 sthen Exp $
 
 COMMENT =	aggregate profiling for wsgi requests
 
 MODPY_EGG_VERSION = 1.4
 DISTNAME =	repoze.profile-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME:S/./-/}
-REVISION =	4
+REVISION =	5
 
 CATEGORIES =	www devel
 
@@ -17,7 +17,7 @@ RUN_DEPENDS =	devel/py-pyprof2calltree${MODPY_FLAVOR}
 MODULES =	lang/python
 
 FLAVORS =	python3
-FLAVOR ?=
+FLAVOR =	python3
 
 MODPY_PI =		Yes
 MODPY_SETUPTOOLS =	Yes
diff --git a/www/py-repoze-profile/pkg/PLIST b/www/py-repoze-profile/pkg/PLIST
index fbbe4ce564e..18715137d26 100644
--- a/www/py-repoze-profile/pkg/PLIST
+++ b/www/py-repoze-profile/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.3 2021/02/27 22:27:16 daniel Exp $
+@comment $OpenBSD: PLIST,v 1.4 2021/10/24 09:28:53 sthen Exp $
+@pkgpath www/py-repoze-profile
 lib/python${MODPY_VERSION}/site-packages/repoze/
 lib/python${MODPY_VERSION}/site-packages/repoze.profile-${MODPY_EGG_VERSION}-py${MODPY_VERSION}-nspkg.pth
 lib/python${MODPY_VERSION}/site-packages/repoze.profile-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
diff --git a/www/py-repoze-who/Makefile b/www/py-repoze-who/Makefile
index 253700d6b42..68f9851431d 100644
--- a/www/py-repoze-who/Makefile
+++ b/www/py-repoze-who/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.11 2021/05/21 19:50:38 kmos Exp $
+# $OpenBSD: Makefile,v 1.12 2021/10/24 09:28:53 sthen Exp $
 
 COMMENT =	identification and authentication framework for WSGI
 
 MODPY_EGG_VERSION = 2.2
 DISTNAME =	repoze.who-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME:S/./-/}
-REVISION =	3
+REVISION =	4
 
 CATEGORIES =	www devel
 
@@ -15,7 +15,7 @@ PERMIT_PACKAGE =	Yes
 MODULES =	lang/python
 
 FLAVORS =	python3
-FLAVOR ?=
+FLAVOR =	python3
 
 MODPY_PI =		Yes
 MODPY_SETUPTOOLS =	Yes
diff --git a/www/py-repoze-who/pkg/PLIST b/www/py-repoze-who/pkg/PLIST
index e68438a4d7f..36831a095eb 100644
--- a/www/py-repoze-who/pkg/PLIST
+++ b/www/py-repoze-who/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.3 2021/02/27 22:28:00 daniel Exp $
+@comment $OpenBSD: PLIST,v 1.4 2021/10/24 09:28:53 sthen Exp $
+@pkgpath www/py-repoze-who
 lib/python${MODPY_VERSION}/site-packages/repoze/
 lib/python${MODPY_VERSION}/site-packages/repoze.who-${MODPY_EGG_VERSION}-py${MODPY_VERSION}-nspkg.pth
 lib/python${MODPY_VERSION}/site-packages/repoze.who-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
diff --git a/www/py-requests-futures/Makefile b/www/py-requests-futures/Makefile
index 0faf790ab5d..f00ef50dd61 100644
--- a/www/py-requests-futures/Makefile
+++ b/www/py-requests-futures/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.5 2021/05/21 19:50:39 kmos Exp $
+# $OpenBSD: Makefile,v 1.6 2021/10/24 09:28:53 sthen Exp $
 
 COMMENT =		small addon for python-requests HTTP library
 
 MODPY_EGG_VERSION =	0.9.7
 DISTNAME =		requests-futures-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
-REVISION =		2
+REVISION =		3
 
 CATEGORIES =		www
 
@@ -20,16 +20,11 @@ MODPY_PI =		Yes
 MODPY_SETUPTOOLS =	Yes
 
 FLAVORS =		python3
-FLAVOR ?=
+FLAVOR =		python3
 
 RUN_DEPENDS +=		www/py-requests${MODPY_FLAVOR}
 
-.if ! ${FLAVOR:Mpython3}
-RUN_DEPENDS +=		devel/py-futures${MODPY_FLAVOR}
-.endif
-
 do-test:
 	cd ${WRKSRC} && ${MODPY_BIN} test_requests_futures.py
 
-
 .include <bsd.port.mk>
diff --git a/www/py-requests-futures/pkg/PLIST b/www/py-requests-futures/pkg/PLIST
index 87070071193..cba906e1f1f 100644
--- a/www/py-requests-futures/pkg/PLIST
+++ b/www/py-requests-futures/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2017/06/05 20:41:53 sebastia Exp $
+@comment $OpenBSD: PLIST,v 1.2 2021/10/24 09:28:53 sthen Exp $
+@pkgpath www/py-requests-futures
 lib/python${MODPY_VERSION}/site-packages/requests_futures/
 lib/python${MODPY_VERSION}/site-packages/requests_futures-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/requests_futures-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
diff --git a/www/py-requests-mock/Makefile b/www/py-requests-mock/Makefile
index f1fefb346cf..54ac46010c2 100644
--- a/www/py-requests-mock/Makefile
+++ b/www/py-requests-mock/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.10 2021/05/21 19:50:39 kmos Exp $
+# $OpenBSD: Makefile,v 1.11 2021/10/24 09:28:53 sthen Exp $
 
 MODPY_EGG_VERSION =	1.5.2
 COMMENT =	mock out responses from py-requests
 DISTNAME =	requests-mock-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME}
 CATEGORIES =	www
-REVISION =	2
+REVISION =	3
 
 MAINTAINER =	Brian Callahan <bcallah@openbsd.org>
 
@@ -17,7 +17,7 @@ MODPY_PI =		Yes
 MODPY_SETUPTOOLS =	Yes
 
 FLAVORS =	python3
-FLAVOR ?=
+FLAVOR =	python3
 
 BUILD_DEPENDS =	devel/py-pbr${MODPY_FLAVOR}
 RUN_DEPENDS =	devel/py-six${MODPY_FLAVOR} \
diff --git a/www/py-requests-mock/pkg/PLIST b/www/py-requests-mock/pkg/PLIST
index 553129629ee..c9e3b6bed30 100644
--- a/www/py-requests-mock/pkg/PLIST
+++ b/www/py-requests-mock/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.3 2018/07/23 03:44:48 bcallah Exp $
+@comment $OpenBSD: PLIST,v 1.4 2021/10/24 09:28:53 sthen Exp $
+@pkgpath www/py-requests-mock
 lib/python${MODPY_VERSION}/site-packages/requests_mock/
 lib/python${MODPY_VERSION}/site-packages/requests_mock-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/requests_mock-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
diff --git a/www/py-requests-toolbelt/Makefile b/www/py-requests-toolbelt/Makefile
index 3509ef2fe49..341cf25f51a 100644
--- a/www/py-requests-toolbelt/Makefile
+++ b/www/py-requests-toolbelt/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.7 2021/05/21 19:50:39 kmos Exp $
+# $OpenBSD: Makefile,v 1.8 2021/10/24 09:28:53 sthen Exp $
 
 COMMENT =		utility belt for advanced users of python-requests
 
 MODPY_EGG_VERSION =	0.9.1
 DISTNAME =		requests-toolbelt-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
-REVISION =		0
+REVISION =		1
 
 CATEGORIES =		www
 
@@ -24,13 +24,9 @@ MODPY_SETUPTOOLS =	Yes
 MODPY_PYTEST =		Yes
 
 FLAVORS =		python3
-FLAVOR ?=
+FLAVOR =		python3
 
 TEST_DEPENDS =		devel/py-mock${MODPY_FLAVOR} \
 			www/py-betamax${MODPY_FLAVOR}
 
-.if !${FLAVOR:Mpython3}
-TEST_DEPENDS +=		security/py-openssl
-.endif
-
 .include <bsd.port.mk>
diff --git a/www/py-requests-toolbelt/pkg/PLIST b/www/py-requests-toolbelt/pkg/PLIST
index 679d08eefcf..7087310a72e 100644
--- a/www/py-requests-toolbelt/pkg/PLIST
+++ b/www/py-requests-toolbelt/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.2 2021/01/07 08:29:55 paco Exp $
+@comment $OpenBSD: PLIST,v 1.3 2021/10/24 09:28:53 sthen Exp $
+@pkgpath www/py-requests-toolbelt
 lib/python${MODPY_VERSION}/site-packages/requests_toolbelt/
 lib/python${MODPY_VERSION}/site-packages/requests_toolbelt-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/requests_toolbelt-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
diff --git a/www/py-selenium/Makefile b/www/py-selenium/Makefile
index a9371349d4f..9a97d0b0e90 100644
--- a/www/py-selenium/Makefile
+++ b/www/py-selenium/Makefile
@@ -1,19 +1,19 @@
-# $OpenBSD: Makefile,v 1.8 2021/05/21 19:50:39 kmos Exp $
+# $OpenBSD: Makefile,v 1.9 2021/10/24 09:28:53 sthen Exp $
 
-COMMENT =		Python bindings for Selenium WebDriver
+COMMENT =	Python bindings for Selenium WebDriver
 
 MODPY_EGG_VERSION =	3.14.1
-DISTNAME =		selenium-${MODPY_EGG_VERSION}
-PKGNAME =		py-${DISTNAME:L}
-CATEGORIES =		www devel
-REVISION =		3
+DISTNAME =	selenium-${MODPY_EGG_VERSION}
+PKGNAME =	py-${DISTNAME:L}
+CATEGORIES =	www devel
+REVISION =	4
 
-HOMEPAGE =		http://www.seleniumhq.org/
+HOMEPAGE =	http://www.seleniumhq.org/
 
-MODPY_PI =		Yes
+MODPY_PI =	Yes
 
 FLAVORS =	python3
-FLAVOR ?=
+FLAVOR =	python3
 
 # Apache
 PERMIT_PACKAGE =	Yes
diff --git a/www/py-selenium/pkg/PLIST b/www/py-selenium/pkg/PLIST
index b107a12fd06..361fa81bdec 100644
--- a/www/py-selenium/pkg/PLIST
+++ b/www/py-selenium/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.3 2018/09/27 11:02:21 rpointel Exp $
+@comment $OpenBSD: PLIST,v 1.4 2021/10/24 09:28:53 sthen Exp $
+@pkgpath www/py-selenium
 lib/python${MODPY_VERSION}/site-packages/selenium/
 lib/python${MODPY_VERSION}/site-packages/selenium-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/selenium-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
diff --git a/www/py-soupsieve/Makefile b/www/py-soupsieve/Makefile
index 68410242a2b..f73a774bd61 100644
--- a/www/py-soupsieve/Makefile
+++ b/www/py-soupsieve/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.4 2021/05/21 19:50:39 kmos Exp $
+# $OpenBSD: Makefile,v 1.5 2021/10/24 09:28:53 sthen Exp $
 
 COMMENT =		modern CSS selector implementation for Beautiful Soup
 
 MODPY_EGG_VERSION =	1.9.5
 DISTNAME =		soupsieve-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
-REVISION =		1
+REVISION =		2
 
 CATEGORIES =		www
 
@@ -21,7 +21,7 @@ MODPY_SETUPTOOLS =	Yes
 MODPY_PYTEST =		Yes
 
 FLAVORS =		python3
-FLAVOR ?=
+FLAVOR =		python3
 
 TEST_DEPENDS =		devel/py-coverage${MODPY_FLAVOR} \
 			devel/py-html5lib${MODPY_FLAVOR} \
@@ -29,8 +29,4 @@ TEST_DEPENDS =		devel/py-coverage${MODPY_FLAVOR} \
 			textproc/py-lxml${MODPY_FLAVOR} \
 			www/py-beautifulsoup4${MODPY_FLAVOR}
 
-.if !${FLAVOR:Mpython3}
-RUN_DEPENDS +=		devel/py-backports-functools-lru-cache
-.endif
-
 .include <bsd.port.mk>
diff --git a/www/py-soupsieve/pkg/PLIST b/www/py-soupsieve/pkg/PLIST
index 331bf868496..f2c7930af15 100644
--- a/www/py-soupsieve/pkg/PLIST
+++ b/www/py-soupsieve/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2019/08/12 23:58:09 kmos Exp $
+@comment $OpenBSD: PLIST,v 1.2 2021/10/24 09:28:53 sthen Exp $
+@pkgpath www/py-soupsieve
 lib/python${MODPY_VERSION}/site-packages/soupsieve/
 lib/python${MODPY_VERSION}/site-packages/soupsieve-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/soupsieve-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
diff --git a/www/py-tempita/Makefile b/www/py-tempita/Makefile
index 17f197e1301..647f42a202a 100644
--- a/www/py-tempita/Makefile
+++ b/www/py-tempita/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.18 2021/05/21 19:50:39 kmos Exp $
+# $OpenBSD: Makefile,v 1.19 2021/10/24 09:28:53 sthen Exp $
 
 COMMENT =	very small text templating language
 
 MODPY_EGG_VERSION = 0.5.2
 DISTNAME =	Tempita-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME:L}
-REVISION =	4
+REVISION =	5
 
 CATEGORIES =	www
 
@@ -19,7 +19,7 @@ MODPY_PI =	Yes
 MODULES =	lang/python
 
 FLAVORS =	python3
-FLAVOR ?=
+FLAVOR =	python3
 
 MODPY_SETUPTOOLS =	Yes
 
diff --git a/www/py-tempita/pkg/PLIST b/www/py-tempita/pkg/PLIST
index b443178cf13..06bf129bfde 100644
--- a/www/py-tempita/pkg/PLIST
+++ b/www/py-tempita/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.5 2018/06/23 17:34:56 landry Exp $
+@comment $OpenBSD: PLIST,v 1.6 2021/10/24 09:28:53 sthen Exp $
+@pkgpath www/py-tempita
 lib/python${MODPY_VERSION}/site-packages/Tempita-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/Tempita-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
 lib/python${MODPY_VERSION}/site-packages/Tempita-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
diff --git a/www/py-uritemplate/Makefile b/www/py-uritemplate/Makefile
index 9135769bbe8..cffa16462a8 100644
--- a/www/py-uritemplate/Makefile
+++ b/www/py-uritemplate/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.7 2021/05/21 19:50:39 kmos Exp $
+# $OpenBSD: Makefile,v 1.8 2021/10/24 09:28:53 sthen Exp $
 
 COMMENT =	URI templates
 
 MODPY_EGG_VERSION = 3.0.1
 DISTNAME =	uritemplate-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME}
-REVISION =	1
+REVISION =	2
 
 CATEGORIES =	www
 
@@ -20,7 +20,7 @@ MODPY_SETUPTOOLS =	Yes
 MODPY_PYTEST =		Yes
 
 FLAVORS =	python3
-FLAVOR ?=
+FLAVOR =	python3
 
 RUN_DEPENDS =	www/py-requests${MODPY_FLAVOR}
 
diff --git a/www/py-uritemplate/pkg/PLIST b/www/py-uritemplate/pkg/PLIST
index c013020ccce..67bc764d21a 100644
--- a/www/py-uritemplate/pkg/PLIST
+++ b/www/py-uritemplate/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.2 2020/02/11 08:16:07 benoit Exp $
+@comment $OpenBSD: PLIST,v 1.3 2021/10/24 09:28:53 sthen Exp $
+@pkgpath www/py-uritemplate
 lib/python${MODPY_VERSION}/site-packages/uritemplate/
 lib/python${MODPY_VERSION}/site-packages/uritemplate-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/uritemplate-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
diff --git a/www/py-waitress/Makefile b/www/py-waitress/Makefile
index f3abc5fac78..f0b844d3370 100644
--- a/www/py-waitress/Makefile
+++ b/www/py-waitress/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.8 2021/05/21 19:50:39 kmos Exp $
+# $OpenBSD: Makefile,v 1.9 2021/10/24 09:28:54 sthen Exp $
 
 COMMENT =		pure-Python WSGI server
 
 MODPY_EGG_VERSION =	1.4.4
 DISTNAME =		waitress-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
-REVISION =		1
+REVISION =		2
 
 CATEGORIES =		www
 
@@ -19,13 +19,10 @@ MODPY_SETUPTOOLS =	Yes
 MODPY_PYTEST =		Yes
 
 FLAVORS =		python3
-FLAVOR ?=
+FLAVOR =		python3
 
 BUILD_DEPENDS =		textproc/py-sphinx,python3
 
 TEST_ENV +=		PYTHONPATH=${WRKSRC}/src/
 
-post-install:
-	mv ${PREFIX}/bin/waitress-serve{,${MODPY_BIN_SUFFIX}}
-
 .include <bsd.port.mk>
diff --git a/www/py-waitress/pkg/PLIST b/www/py-waitress/pkg/PLIST
index 0a0a8ced0b5..cd75960f358 100644
--- a/www/py-waitress/pkg/PLIST
+++ b/www/py-waitress/pkg/PLIST
@@ -1,6 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.4 2021/02/19 23:13:08 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.5 2021/10/24 09:28:54 sthen Exp $
+@pkgpath www/py-waitress
 @conflict py-waitress-<1.4.4p0
-bin/waitress-serve${MODPY_BIN_SUFFIX}
+bin/waitress-serve
 lib/python${MODPY_VERSION}/site-packages/waitress/
 lib/python${MODPY_VERSION}/site-packages/waitress-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/waitress-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO