*: remove workaround patches for python 3.6

34 files changed, 17 insertions, 371 deletions

diff --git a/cad/py-gds/distinfo b/cad/py-gds/distinfo
index 61f1cb86177..dab17e329c0 100644
--- a/cad/py-gds/distinfo
+++ b/cad/py-gds/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.13 2021/10/26 10:04:15 nia Exp $
+$NetBSD: distinfo,v 1.14 2022/01/14 11:49:41 wiz Exp $
 
 BLAKE2s (gdspy-1.6.zip) = 3b764c09f6f0b0813e6e1e916f740dbe36e60fab979c64f54b363744ee59f02c
 SHA512 (gdspy-1.6.zip) = 7e7a40efdd6ca9eb9685c0d3d07bc169d8c92d990b386b2c733032d0c6dc0c1bef06daf53b5aa864f752bc132671eab5f0557a4103fe1ec57f1db264030173fa
 Size (gdspy-1.6.zip) = 12568268 bytes
-SHA1 (patch-setup.py) = 39d70b0d49aa82a9a98f905883d21f11fe0674a0
diff --git a/cad/py-gds/patches/patch-setup.py b/cad/py-gds/patches/patch-setup.py
deleted file mode 100644
index 401bcd08aa8..00000000000
--- a/cad/py-gds/patches/patch-setup.py
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-setup.py,v 1.2 2020/09/04 16:05:20 mef Exp $
-
-Allow UTF-8 README.md
-
---- setup.py.orig	2020-05-31 17:53:41.141364832 +0000
-+++ setup.py
-@@ -12,7 +12,7 @@ import platform
- from setuptools import setup, Extension
- from distutils.version import LooseVersion
- 
--with open("README.md") as fin:
-+with open("README.md", **({'encoding': 'UTF-8'} if sys.version_info.major>=3 else {})) as fin:
-     long_description = fin.read()
- 
- with open("gdspy/__init__.py") as fin:
diff --git a/comms/py-colorama/distinfo b/comms/py-colorama/distinfo
index 5144d8c1703..e63d50e547c 100644
--- a/comms/py-colorama/distinfo
+++ b/comms/py-colorama/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.11 2021/10/26 10:06:04 nia Exp $
+$NetBSD: distinfo,v 1.12 2022/01/14 11:49:41 wiz Exp $
 
 BLAKE2s (colorama-0.4.4.tar.gz) = a55a983f46c9c8d0a9e487dccc28dc30fd787a53f8cb7452c4ea59025c88a7e0
 SHA512 (colorama-0.4.4.tar.gz) = 84db73bed5a6d4ab1624bdbeea65aef2061126e730f9d4a853f3b2504b9ebf5eb7c0649024ec687b538a89c20c83a5f3365d4fb1aba9fdba3db0b375942c48f4
 Size (colorama-0.4.4.tar.gz) = 27813 bytes
-SHA1 (patch-setup.py) = aba7883e6c6c2514e70d0e0e12417186bc01f1a3
diff --git a/comms/py-colorama/patches/patch-setup.py b/comms/py-colorama/patches/patch-setup.py
deleted file mode 100644
index 9cf2f7f24d4..00000000000
--- a/comms/py-colorama/patches/patch-setup.py
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-setup.py,v 1.1 2021/01/09 00:43:43 mef Exp $
-
-This patch is necessary only for python-3.6
-
-Traceback (most recent call last):
-  File "setup.py", line 36, in <module>
-    long_description=read_file('README.rst'),
-  File "setup.py", line 19, in read_file
-    return fp.read()
-  File "/usr/pkg/lib/python3.6/encodings/ascii.py", line 26, in decode
-    return codecs.ascii_decode(input, self.errors)[0]
-UnicodeDecodeError: 'ascii' codec can't decode byte 0xc2 in position 852: ordinal not in range(128)
-*** Error code 1
-
---- setup.py.orig	2020-10-13 06:22:32.000000000 +0900
-+++ setup.py	2021-01-09 09:24:27.258231596 +0900
-@@ -5,6 +5,8 @@ from __future__ import with_statement
- 
- import os
- import re
-+import sys
-+
- try:
-     from setuptools import setup
- except ImportError:
-@@ -15,7 +17,7 @@ NAME = 'colorama'
- 
- 
- def read_file(path):
--    with open(os.path.join(os.path.dirname(__file__), path)) as fp:
-+    with open(os.path.join(os.path.dirname(__file__), path), **({'encoding': 'UTF-8'} if sys.version_info.major>=3 else {})) as fp:
-         return fp.read()
- 
- def _get_version_match(content):
diff --git a/converters/py-unicode-slugify/distinfo b/converters/py-unicode-slugify/distinfo
index 807969b1ecd..e347b2bb603 100644
--- a/converters/py-unicode-slugify/distinfo
+++ b/converters/py-unicode-slugify/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.4 2021/10/26 10:06:50 nia Exp $
+$NetBSD: distinfo,v 1.5 2022/01/14 11:49:41 wiz Exp $
 
 BLAKE2s (unicode-slugify-0.1.3.tar.gz) = db73f98ecfb833e81420458405fb750580ec6a2cd25ea370bf40245ba7c8cb5e
 SHA512 (unicode-slugify-0.1.3.tar.gz) = 509414c8b3603f3b092390ee29f52b6a22de45d904fcfa5554f2c1188a35ac090781050642b0b7bf068d1b30ce424342878e646db98b592712f47595528911a1
 Size (unicode-slugify-0.1.3.tar.gz) = 4430 bytes
-SHA1 (patch-setup.py) = 3a7d378b2d2881e533b5e04688d60ab2d2853b52
diff --git a/converters/py-unicode-slugify/patches/patch-setup.py b/converters/py-unicode-slugify/patches/patch-setup.py
deleted file mode 100644
index 9d7a157faa4..00000000000
--- a/converters/py-unicode-slugify/patches/patch-setup.py
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-setup.py,v 1.1 2020/05/31 20:49:33 joerg Exp $
-
---- setup.py.orig	2020-05-31 18:05:52.507238288 +0000
-+++ setup.py
-@@ -1,10 +1,11 @@
-+import sys
- from setuptools import setup
- 
- setup(
-     name='unicode-slugify',
-     version='0.1.3',
-     description='A slug generator that turns strings into unicode slugs.',
--    long_description=open('README.md').read(),
-+    long_description=open('README.md', **({'encoding': 'UTF-8'} if sys.version_info.major>=3 else {})).read(),
-     author='Jeff Balogh, Dave Dash',
-     author_email='jbalogh@mozilla.com, dd@mozilla.com',
-     url='http://github.com/mozilla/unicode-slugify',
diff --git a/converters/py-zfec/distinfo b/converters/py-zfec/distinfo
index efea5049f4a..8c870941abf 100644
--- a/converters/py-zfec/distinfo
+++ b/converters/py-zfec/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.11 2021/10/26 10:06:50 nia Exp $
+$NetBSD: distinfo,v 1.12 2022/01/14 11:49:42 wiz Exp $
 
 BLAKE2s (zfec-1.5.5.tar.gz) = 0b29d9831810bb121af9068cb8d9337c3ac2e05ad6c95ae8aab74b9e936e0286
 SHA512 (zfec-1.5.5.tar.gz) = 35fe828b1c18cd3abc8c44f882ade83719d764d0fa62c9d16e9a667d7a096dd6e6a25d55887a2d08e554a5554fc00296dae4c275883d030c854483b26ab3a63b
 Size (zfec-1.5.5.tar.gz) = 80368 bytes
-SHA1 (patch-setup.py) = bbaba4326845d3cdc84dbdfbaf2d8624a366bf2d
diff --git a/converters/py-zfec/patches/patch-setup.py b/converters/py-zfec/patches/patch-setup.py
deleted file mode 100644
index 4d5e821206c..00000000000
--- a/converters/py-zfec/patches/patch-setup.py
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-setup.py,v 1.2 2020/12/19 15:28:05 gdt Exp $
-
-\todo Document this patch.
-\todo File this patch upstream.
-
---- setup.py.orig	2020-09-18 02:16:19.000000000 +0000
-+++ setup.py
-@@ -57,7 +57,7 @@ setup(
-     name="zfec",
-     version=versioneer.get_version(),
-     description="An efficient, portable erasure coding tool",
--    long_description=open('README.rst', 'r').read(),
-+    long_description=open('README.rst', 'rU', **({'encoding': 'UTF-8'} if sys.version_info.major>=3 else {})).read(),
-     url="https://github.com/tahoe-lafs/zfec",
-     install_requires=[
-         "argparse >= 0.8",
diff --git a/devel/py-hexbytes/distinfo b/devel/py-hexbytes/distinfo
index 64a663848ce..5da343936a4 100644
--- a/devel/py-hexbytes/distinfo
+++ b/devel/py-hexbytes/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.5 2021/10/26 10:18:32 nia Exp $
+$NetBSD: distinfo,v 1.6 2022/01/14 11:49:42 wiz Exp $
 
 BLAKE2s (hexbytes-0.2.2.tar.gz) = d01fc56d102d5ed3cb521fc79682b2d8477f3b1113c5e25584d17b6b2a0ffda4
 SHA512 (hexbytes-0.2.2.tar.gz) = 80bed389756dee9eac9bd752733bbe5244dbf8ea1b2c41fa8ef2ca4b19579ec3e18ba41f98b1412a3e37e793941261a3ef1cbf29a2bda35535e44609effc69b2
 Size (hexbytes-0.2.2.tar.gz) = 4709763 bytes
-SHA1 (patch-setup.py) = 64c71cd1e7dd94f5d4e23ec5f45b938b35ea9a66
diff --git a/devel/py-hexbytes/patches/patch-setup.py b/devel/py-hexbytes/patches/patch-setup.py
deleted file mode 100644
index b5434cdd618..00000000000
--- a/devel/py-hexbytes/patches/patch-setup.py
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-setup.py,v 1.1 2021/02/18 14:42:52 mef Exp $
-
-py36 gives following flag
-UnicodeDecodeError: 'ascii' codec can't decode byte 0xe2 in position 2807: ordinal not in range(128)
-
---- setup.py.orig	2021-02-18 23:38:01.453886086 +0900
-+++ setup.py	2021-02-18 23:39:03.415666893 +0900
-@@ -1,5 +1,6 @@
- #!/usr/bin/env python
- # -*- coding: utf-8 -*-
-+import sys
- from setuptools import (
-     setup,
-     find_packages,
-@@ -41,7 +42,7 @@ extras_require['dev'] = (
- )
- 
- 
--with open('./README.md') as readme:
-+with open('./README.md', **({'encoding': 'UTF-8'} if sys.version_info.major>=3 else {})) as readme:
-     long_description = readme.read()
- 
- 
diff --git a/devel/py-hg-git/distinfo b/devel/py-hg-git/distinfo
index 842c6fb5ef8..21807a06244 100644
--- a/devel/py-hg-git/distinfo
+++ b/devel/py-hg-git/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.11 2021/10/26 10:18:32 nia Exp $
+$NetBSD: distinfo,v 1.12 2022/01/14 11:49:42 wiz Exp $
 
 BLAKE2s (hg-git-0.10.0.tar.bz2) = 8f5cd5986b350f94e58c2c95adf8480fe848e4ed8c19d3e762dbb51aad6602be
 SHA512 (hg-git-0.10.0.tar.bz2) = 6f4277bc2b63da97e63531c751465e72467be0dfe92a7b64bfa423412268f89f02985665428597281a53b44f169f1291447e7b1d3a8047d7b0d67d1b1e0e5e27
 Size (hg-git-0.10.0.tar.bz2) = 143518 bytes
-SHA1 (patch-setup.py) = 9255ceda0eb9a34963fc107fb62da8e5d6424ba8
diff --git a/devel/py-hg-git/patches/patch-setup.py b/devel/py-hg-git/patches/patch-setup.py
deleted file mode 100644
index 5fc4dd28d6f..00000000000
--- a/devel/py-hg-git/patches/patch-setup.py
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-setup.py,v 1.1 2021/09/27 02:00:44 mef Exp $
-
-py36 flags:
-UnicodeDecodeError: 'ascii' codec can't decode byte 0xe2 in position 1085: ordinal not in range(128)
-
---- setup.py.orig	2021-01-11 23:58:48.000000000 +0900
-+++ setup.py	2021-09-27 10:51:25.778622523 +0900
-@@ -2,6 +2,8 @@ from __future__ import absolute_import, 
- 
- from os.path import dirname, join
- 
-+import sys
-+
- try:
-     from setuptools import setup
- except:
-@@ -29,7 +31,7 @@ setup(
-     maintainer_email='kbullock+mercurial@ringworld.org',
-     url='http://foss.heptapod.net/mercurial/hg-git',
-     description='push to and pull from a Git repository using Mercurial',
--    long_description=get_file("README.rst"),
-+    long_description=''.join(open('README.rst', **({'encoding': 'UTF-8'} if sys.version_info.major>=3 else {})).readlines()),
-     keywords='hg git mercurial',
-     license='GPLv2',
-     packages=['hggit'],
diff --git a/devel/py-test-xdist/distinfo b/devel/py-test-xdist/distinfo
index cab3fe1d5e1..4b5204a3882 100644
--- a/devel/py-test-xdist/distinfo
+++ b/devel/py-test-xdist/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.30 2021/10/26 10:19:10 nia Exp $
+$NetBSD: distinfo,v 1.31 2022/01/14 11:49:42 wiz Exp $
 
 BLAKE2s (pytest-xdist-1.34.0.tar.gz) = 22f700e9f149b9811ffbb737a7c2c3b620ee665a84a6eeca2d65e286df17859c
 SHA512 (pytest-xdist-1.34.0.tar.gz) = 69e9877ee0268d71d7c0ca202ccc46b3ba1a9271f0e6e4ac4b76602833f9b7012364eb6924ae994e76c1d48d63adf1702d4c5e6ed5b75c52ac7ebae958210e24
 Size (pytest-xdist-1.34.0.tar.gz) = 66151 bytes
-SHA1 (patch-setup.py) = b04fc9f42ec7ec659b993d70760c981a5884e584
diff --git a/devel/py-test-xdist/patches/patch-setup.py b/devel/py-test-xdist/patches/patch-setup.py
deleted file mode 100644
index 1b144ebba26..00000000000
--- a/devel/py-test-xdist/patches/patch-setup.py
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-setup.py,v 1.1 2020/08/27 12:27:00 joerg Exp $
-
---- setup.py.orig	2020-08-26 11:53:27.731267998 +0000
-+++ setup.py
-@@ -1,9 +1,10 @@
- from setuptools import setup, find_packages
-+import sys
- 
- install_requires = ["execnet>=1.1", "pytest>=4.4.0", "pytest-forked", "six"]
- 
- 
--with open("README.rst") as f:
-+with open("README.rst", **({'encoding': 'UTF-8'} if sys.version_info.major>=3 else {})) as f:
-     long_description = f.read()
- 
- setup(
diff --git a/finance/py-eth-hash/distinfo b/finance/py-eth-hash/distinfo
index 3ee24fc84ba..6862f059115 100644
--- a/finance/py-eth-hash/distinfo
+++ b/finance/py-eth-hash/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.6 2021/10/26 10:26:04 nia Exp $
+$NetBSD: distinfo,v 1.7 2022/01/14 11:49:42 wiz Exp $
 
 BLAKE2s (eth-hash-0.3.2.tar.gz) = 08b8bee72091178a266047e6e8b3161b6298bf24a532aa34dbcc6cfea21d9f6a
 SHA512 (eth-hash-0.3.2.tar.gz) = 519255ef7e798c9fcf454215ddba6b2cce4dc81380a5da3d74a6b4aca1c9112b679dca9708f222174b67ae3815aac8b7bb784341a410ee1ca573ea342e5f3b77
 Size (eth-hash-0.3.2.tar.gz) = 5291253 bytes
-SHA1 (patch-setup.py) = 8da4ca9fdd58577c627df6662a3799d88e414138
diff --git a/finance/py-eth-hash/patches/patch-setup.py b/finance/py-eth-hash/patches/patch-setup.py
deleted file mode 100644
index 96b8ceea4b1..00000000000
--- a/finance/py-eth-hash/patches/patch-setup.py
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-setup.py,v 1.1 2021/02/15 14:59:25 mef Exp $
-
-py36 gives following flag:
-UnicodeDecodeError: 'ascii' codec can't decode byte 0xe2 in position 2861: ordinal not in range(128)
-
---- setup.py.orig	2021-01-22 04:52:10.000000000 +0900
-+++ setup.py	2021-02-15 23:50:09.430652835 +0900
-@@ -1,5 +1,6 @@
- #!/usr/bin/env python
- # -*- coding: utf-8 -*-
-+import sys
- from setuptools import (
-     setup,
-     find_packages,
-@@ -46,7 +47,7 @@ extras_require['dev'] = (
- )
- 
- 
--with open('./README.md') as readme:
-+with open("./README.md", **({'encoding': 'UTF-8'} if sys.version_info.major>=3 else {})) as readme:
-     long_description = readme.read()
- 
- 
diff --git a/finance/py-eth-typing/distinfo b/finance/py-eth-typing/distinfo
index 13c4c9c98f8..07d1657dd39 100644
--- a/finance/py-eth-typing/distinfo
+++ b/finance/py-eth-typing/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.5 2021/10/26 10:26:04 nia Exp $
+$NetBSD: distinfo,v 1.6 2022/01/14 11:49:43 wiz Exp $
 
 BLAKE2s (eth-typing-2.2.2.tar.gz) = 38d82fcc788b649c279792fe0610a5cc340a8ba57a9abf0b7bcdcfeea9c49a8b
 SHA512 (eth-typing-2.2.2.tar.gz) = 79185a1a940b776cc350c6b5e3506d6fa27a3cc6d8ea233f59e9b1696589c62f8af777f0b9d90be6ba4045cc456cd0ab972a12c67120ddb2d302cb111e82dffe
 Size (eth-typing-2.2.2.tar.gz) = 5378 bytes
-SHA1 (patch-setup.py) = 674c387c0f6d42829499cfe1ee60bbb1642e46bc
diff --git a/finance/py-eth-typing/patches/patch-setup.py b/finance/py-eth-typing/patches/patch-setup.py
deleted file mode 100644
index f7be93f736b..00000000000
--- a/finance/py-eth-typing/patches/patch-setup.py
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-setup.py,v 1.1 2021/02/15 15:14:56 mef Exp $
-
-UnicodeDecodeError: 'ascii' codec can't decode byte 0xe2 in position 2071: ordinal not in range(128)
-
---- setup.py.orig	2020-09-03 09:31:05.000000000 +0900
-+++ setup.py	2021-02-16 00:03:32.721946377 +0900
-@@ -1,5 +1,6 @@
- #!/usr/bin/env python
- # -*- coding: utf-8 -*-
-+import sys
- from setuptools import (
-     setup,
-     find_packages,
-@@ -38,7 +39,7 @@ extras_require['dev'] = (
- )
- 
- 
--with open('./README.md') as readme:
-+with open("./README.md", **({'encoding': 'UTF-8'} if sys.version_info.major>=3 else {})) as readme:
-     long_description = readme.read()
- 
- 
diff --git a/finance/py-eth-utils/distinfo b/finance/py-eth-utils/distinfo
index 12f7a30f682..5de59cc8128 100644
--- a/finance/py-eth-utils/distinfo
+++ b/finance/py-eth-utils/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.5 2021/10/26 10:26:05 nia Exp $
+$NetBSD: distinfo,v 1.6 2022/01/14 11:49:43 wiz Exp $
 
 BLAKE2s (eth-utils-1.10.0.tar.gz) = 8a989223cd0aa27370c417f310840718702e3c01e44de7044f5dc79f88a7e56b
 SHA512 (eth-utils-1.10.0.tar.gz) = 910f6d1e89c17415141e0d67c9ae915272c1709b6b691a7c5661d308d0a854c84d7d5644f4d968e7c3fba8ff38101fd8ce63134b16f845e640874de1201717f4
 Size (eth-utils-1.10.0.tar.gz) = 4602591 bytes
-SHA1 (patch-setup.py) = 6a7906a300f7d7023bbee0dbc983626c888b06e8
diff --git a/finance/py-eth-utils/patches/patch-setup.py b/finance/py-eth-utils/patches/patch-setup.py
deleted file mode 100644
index e7b92c362dd..00000000000
--- a/finance/py-eth-utils/patches/patch-setup.py
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-setup.py,v 1.1 2021/02/18 12:35:03 mef Exp $
-
-py36 gives following flag:
-UnicodeDecodeError: 'ascii' codec can't decode byte 0xe2 in position 2119: ordinal not in range(128)
-
---- setup.py.orig	2021-01-22 07:56:32.000000000 +0900
-+++ setup.py	2021-02-18 21:31:28.038465408 +0900
-@@ -1,5 +1,6 @@
- #!/usr/bin/env python
- # -*- coding: utf-8 -*-
-+import sys
- from setuptools import (
-     setup,
-     find_packages,
-@@ -42,7 +43,7 @@ extras_require['dev'] = (
- )
- 
- 
--with open('./README.md') as readme:
-+with open("./README.md", **({'encoding': 'UTF-8'} if sys.version_info.major>=3 else {})) as readme:
-     long_description = readme.read()
- 
- 
diff --git a/math/py-ephem/distinfo b/math/py-ephem/distinfo
index 89b6808110f..b4a442f07e6 100644
--- a/math/py-ephem/distinfo
+++ b/math/py-ephem/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.11 2021/10/26 10:56:01 nia Exp $
+$NetBSD: distinfo,v 1.12 2022/01/14 11:49:43 wiz Exp $
 
 BLAKE2s (ephem-3.7.7.1.tar.gz) = 64480898485c2b0d8a2431424c1935d03fd7afb58b99d6a2897bb1d336cc95e6
 SHA512 (ephem-3.7.7.1.tar.gz) = c3f489371febcb65da03da7ba0e08168320a6f5d81fd2355281f621074ecf2be694b2d0cc3ef7863cec617176751a34856bdd22beb66cd64129fbfb915b3dcae
 Size (ephem-3.7.7.1.tar.gz) = 745839 bytes
-SHA1 (patch-setup.py) = ca5c99e7f1a4cf90e53b7d34f63d91210f9e0acf
diff --git a/math/py-ephem/patches/patch-setup.py b/math/py-ephem/patches/patch-setup.py
deleted file mode 100644
index 9cc72b109ee..00000000000
--- a/math/py-ephem/patches/patch-setup.py
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-setup.py,v 1.1 2020/05/31 20:49:33 joerg Exp $
-
-Python 3.6 doesn't default to UTF-8, but still tries to convert to Unicode.
-
---- setup.py.orig	2020-05-31 17:37:01.440042910 +0000
-+++ setup.py
-@@ -24,7 +24,7 @@ libastro_files = glob('libastro-%s/*.c' 
- libastro_data = glob('extensions/data/*.c')
- 
- def read(*filenames):
--    return open(os.path.join(os.path.dirname(__file__), *filenames)).read()
-+    return open(os.path.join(os.path.dirname(__file__), *filenames), **({'encoding': 'UTF-8'} if sys.version_info.major >= 3 else {})).read()
- 
- extensions = [
-     Extension('ephem._libastro',
diff --git a/net/py-ifaddr/distinfo b/net/py-ifaddr/distinfo
index aa35014e40b..d0e1fe1d670 100644
--- a/net/py-ifaddr/distinfo
+++ b/net/py-ifaddr/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.5 2021/10/26 11:06:37 nia Exp $
+$NetBSD: distinfo,v 1.6 2022/01/14 11:49:43 wiz Exp $
 
 BLAKE2s (ifaddr-0.1.7.tar.gz) = 43926a3a349fc3960daaf3570a62836863c8e76f42d06d58d5dac25047ecaaf9
 SHA512 (ifaddr-0.1.7.tar.gz) = 9a428dd6bb022c8f483b77df9e9301f96e9ba64207eda8b3956a7ca5993bfe97f222c451149851135d379db1a819c75d0834566f3b6501456b2f237b0645e300
 Size (ifaddr-0.1.7.tar.gz) = 9281 bytes
-SHA1 (patch-setup.py) = c96e7d5b7c4d31107d163f2868f2712d206eceb1
diff --git a/net/py-ifaddr/patches/patch-setup.py b/net/py-ifaddr/patches/patch-setup.py
deleted file mode 100644
index 043b9e5f3ed..00000000000
--- a/net/py-ifaddr/patches/patch-setup.py
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-setup.py,v 1.1 2020/06/20 02:08:56 mef Exp $
-
-Explicitly read file as UTF-8, thanks joerg@
-
---- setup.py.orig	2020-06-06 18:56:10.000000000 +0000
-+++ setup.py
-@@ -19,10 +19,11 @@
- # IN THE SOFTWARE.
- 
- import os.path
-+import sys
- from setuptools import setup, find_packages
- 
- if os.path.exists('README.rst'):
--    with open('README.rst') as f:
-+    with open('README.rst', **({'encoding': 'UTF-8'} if sys.version_info.major>=3 else {})) as f:
-         long_description = f.read()
- else:
-     long_description = ""
diff --git a/security/py-rsa40/distinfo b/security/py-rsa40/distinfo
index 28a61a4cb91..b8d4806401e 100644
--- a/security/py-rsa40/distinfo
+++ b/security/py-rsa40/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.3 2021/10/26 11:17:49 nia Exp $
+$NetBSD: distinfo,v 1.4 2022/01/14 11:49:44 wiz Exp $
 
 BLAKE2s (rsa-4.0.tar.gz) = d1a1aa66639dc5e0b65d37c877c4eb93dbe649157032fcd436f6b2fb20a3cfef
 SHA512 (rsa-4.0.tar.gz) = e11106741cc4275246c986d39b3f028b5a4df6fbffdd08a78072ac3d3a9a7ade7a39789c504a2705f54d858a9bdbf03981251f32f9c45baba71e4a986e14b24e
 Size (rsa-4.0.tar.gz) = 37385 bytes
-SHA1 (patch-setup.py) = 8335daf31dd1acd8b47512b647f83196cfaa38d5
diff --git a/security/py-rsa40/patches/patch-setup.py b/security/py-rsa40/patches/patch-setup.py
deleted file mode 100644
index 660a691a2f4..00000000000
--- a/security/py-rsa40/patches/patch-setup.py
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-setup.py,v 1.1 2020/09/01 04:06:11 wiz Exp $
-
-Pull in fix from https://github.com/sybrenstuvel/python-rsa/pull/122/files
-
---- setup.py.orig	2018-09-16 11:39:35.000000000 +0000
-+++ setup.py
-@@ -15,8 +15,9 @@
- #  limitations under the License.
- 
- from setuptools import setup
-+from io import open
- 
--with open('README.md') as f:
-+with open('README.md', 'r', encoding='utf-8') as f:
-     long_description = f.read()
- 
- if __name__ == '__main__':
diff --git a/textproc/py-bracex/distinfo b/textproc/py-bracex/distinfo
index ebae5145736..9a076aa33c7 100644
--- a/textproc/py-bracex/distinfo
+++ b/textproc/py-bracex/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.4 2021/10/26 11:23:00 nia Exp $
+$NetBSD: distinfo,v 1.5 2022/01/14 11:49:44 wiz Exp $
 
 BLAKE2s (bracex-2.1.1.tar.gz) = 0a05bc4493026be6c753a226f62ca3aeafb1db18ff2930fc6c31c0bf75f9a618
 SHA512 (bracex-2.1.1.tar.gz) = d34a50e6565e1ecdb1c645d047351d907f57ab73614743be18495eb873449a2604f7dfd528e1221f71f7e709e0651cdb5d19605d24cad578bee85543c4a79c9e
 Size (bracex-2.1.1.tar.gz) = 26628 bytes
-SHA1 (patch-setup.py) = b10cfc0f074d9c61e96cb46c5b78ec05ddc21756
diff --git a/textproc/py-bracex/patches/patch-setup.py b/textproc/py-bracex/patches/patch-setup.py
deleted file mode 100644
index e0cf615e253..00000000000
--- a/textproc/py-bracex/patches/patch-setup.py
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-setup.py,v 1.1 2021/09/26 15:21:30 mef Exp $
-
-UnicodeDecodeError: 'ascii' codec can't decode byte 0xc3 in position 356: ordinal not in range(128)
-*** Error code 1
-
---- setup.py.orig	2021-09-27 00:10:19.151518709 +0900
-+++ setup.py	2021-09-27 00:16:39.319538592 +0900
-@@ -3,6 +3,7 @@
- """Setup package."""
- from setuptools import setup, find_packages
- import os
-+import sys
- import importlib
- 
- 
-@@ -31,7 +32,7 @@ def get_requirements(req):
- def get_description():
-     """Get long description."""
- 
--    with open("README.md", 'r') as f:
-+    with open("README.md", **({'encoding': 'UTF-8'} if sys.version_info.major>=3 else {})) as f:
-         desc = f.read()
-     return desc
- 
diff --git a/textproc/py-markovify/distinfo b/textproc/py-markovify/distinfo
index 15d5f94647b..00cf687df71 100644
--- a/textproc/py-markovify/distinfo
+++ b/textproc/py-markovify/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.7 2021/10/26 11:23:07 nia Exp $
+$NetBSD: distinfo,v 1.8 2022/01/14 11:49:44 wiz Exp $
 
 BLAKE2s (markovify-0.8.3.tar.gz) = 57dee705ce4293b0152dd5e49b863cb90f9859136ed723d448781c22c957686b
 SHA512 (markovify-0.8.3.tar.gz) = 38dc286fe05a08fee94c19c632833736bc3b99c8ef8588c88d8616b0ecceee6c1a965d192d63ec3f4ebf15f6dd381418d0f0df1f582d011e003c8b24399cab5a
 Size (markovify-0.8.3.tar.gz) = 27722 bytes
-SHA1 (patch-setup.py) = 47a72e6ed6f86274862341dc342f4beab93cf50c
diff --git a/textproc/py-markovify/patches/patch-setup.py b/textproc/py-markovify/patches/patch-setup.py
deleted file mode 100644
index 6652145fb5d..00000000000
--- a/textproc/py-markovify/patches/patch-setup.py
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-setup.py,v 1.1 2020/08/11 18:43:20 joerg Exp $
-
---- setup.py.orig	2020-06-17 13:28:07.000000000 +0000
-+++ setup.py
-@@ -8,7 +8,7 @@ version_ns = {}
- with open(os.path.join(HERE, NAME, '__version__.py')) as f:
-     exec(f.read(), {}, version_ns)
- 
--with open(os.path.join(HERE, 'README.md')) as f:
-+with open(os.path.join(HERE, 'README.md'), **({'encoding': 'UTF-8'} if sys.version_info.major>=3 else {})) as f:
-     long_description = f.read()
- 
- setup(
diff --git a/www/py-feedgenerator/distinfo b/www/py-feedgenerator/distinfo
index e8aaf1591f2..0b5e2f9d27d 100644
--- a/www/py-feedgenerator/distinfo
+++ b/www/py-feedgenerator/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.6 2021/10/26 11:30:36 nia Exp $
+$NetBSD: distinfo,v 1.7 2022/01/14 11:49:44 wiz Exp $
 
 BLAKE2s (feedgenerator-1.9.1.tar.gz) = 96b664dd7824d9b574d825f870c35baadafa02967a21e3e3be933d7c259dca16
 SHA512 (feedgenerator-1.9.1.tar.gz) = db3642acb8f0c9fd692f37a79cf5862e60687a1745afbc6593d37a0372adb994de603238a17a8eae95ffcc993195f63037f16122a3cf8771e6922dea492fb5d5
 Size (feedgenerator-1.9.1.tar.gz) = 25677 bytes
-SHA1 (patch-setup.py) = 9e95c78d37aa8500eeb635a7e47dc3b2c18fdffc
diff --git a/www/py-feedgenerator/patches/patch-setup.py b/www/py-feedgenerator/patches/patch-setup.py
deleted file mode 100644
index b5e79a3ecb8..00000000000
--- a/www/py-feedgenerator/patches/patch-setup.py
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-setup.py,v 1.1 2020/08/11 18:41:55 joerg Exp $
-
---- setup.py.orig	2020-02-09 10:45:34.000000000 +0000
-+++ setup.py
-@@ -2,13 +2,13 @@
- 
- # Using setuptools rather than distutils to get the `develop` command
- from setuptools import setup
--
-+import sys
- 
- NAME = 'feedgenerator'
- PACKAGES = ['feedgenerator', 'feedgenerator.django',
-             'feedgenerator.django.utils']
- DESCRIPTION = 'Standalone version of django.utils.feedgenerator'
--LONG_DESCRIPTION = open('README.rst').read()
-+LONG_DESCRIPTION = open('README.rst', **({'encoding': 'UTF-8'} if sys.version_info.major>=3 else {})).read()
- 
- URL = "https://github.com/getpelican/feedgenerator"
- 
diff --git a/www/py-pylint-django/distinfo b/www/py-pylint-django/distinfo
index c6e01d277e2..006ec8ce927 100644
--- a/www/py-pylint-django/distinfo
+++ b/www/py-pylint-django/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.34 2021/10/26 11:30:45 nia Exp $
+$NetBSD: distinfo,v 1.35 2022/01/14 11:49:44 wiz Exp $
 
 BLAKE2s (pylint-django-2.4.4.tar.gz) = be22e2cfc1915b2ab36b50caafa47be21b2daacf22e8ef95f0191c8943f6bf21
 SHA512 (pylint-django-2.4.4.tar.gz) = 08f5953def4b94f8a1c022543b145abb85a83f3fa37ddd2a772883e0a6a8779fd02c3163400f558b6d4e7d07404b1be9a9422a8d24260262bf11d09793f0c80f
 Size (pylint-django-2.4.4.tar.gz) = 67479 bytes
-SHA1 (patch-setup.py) = d03071292db59f9f0f9e0e1500d76e90aef29b84
diff --git a/www/py-pylint-django/patches/patch-setup.py b/www/py-pylint-django/patches/patch-setup.py
deleted file mode 100644
index d2ec07d0ae5..00000000000
--- a/www/py-pylint-django/patches/patch-setup.py
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-setup.py,v 1.5 2020/08/27 12:25:00 joerg Exp $
-
---- setup.py.orig	2020-08-26 11:51:51.672175441 +0000
-+++ setup.py
-@@ -3,8 +3,9 @@
- Setup module for Pylint plugin for Django.
- """
- from setuptools import setup, find_packages
-+import sys
- 
--LONG_DESCRIPTION = open('README.rst').read() + "\n" + open('CHANGELOG.rst').read()
-+LONG_DESCRIPTION = open('README.rst', **({'encoding': 'UTF-8'} if sys.version_info.major>=3 else {})).read() + "\n" + open('CHANGELOG.rst', **({'encoding': 'UTF-8'} if sys.version_info.major>=3 else {})).read()
- 
- setup(
-     name='pylint-django',