py-cares: update to 4.2.2.

After 4.0:

No longer updated. Please check the commits.

Version 4.0.0
=============
- doc: uppdate README
- core: add support for CAA queries
- core: add support for getaddrinfo()
- doc: update README
- core: add ability to use the system installed c-ares
- misc: set version to 4.0.0
- test: remove TTL tests
- core: update c-ares and use a submodule
- core: drop bundled c-ares version
- misc: drop tasks.py

Version 3.2.0
=============
- misc: add Python 3.9 classifier
- core: drop py3.5 from CI and documentation
- ci: run tests in Python 3.9
- ci: fix SDK path in appveyor
- ci: fix VS linker in appveyor
- ci: update python installer script in appveyor
- misc: add compiled windows dll to gitignore
- test: skip SOA non-ascii test due to changes in remote host
- test: fix broken chunked TXT test due to changes in remote host
- test: skip ANY test due to problems with mac
- ci: add action to release wheels to PyPi
- ci: drop AppVeyor
- ci: don't fail fast
- ci: stop testing on Travis
- test: add generic way to check for a CI
- test: relax check
- test: try to avoid spurious CI failures
- ci: test all platforms on GH actions
- ci: build wheels on GH Actions
- build: fix build error on macOS
- ci: explicitly set Python versions to build wheels for
- ci: update cibuildwheel
- ci: re-add IDNA test

Version 3.1.1
=============
- ffi: new style callbacks

Version 3.1.0
=============
- misc: add Python 3.8 classifier
- (origin/master, origin/HEAD) build: use Travis to build Python Wheels
- ci: use GH Actions to test on macOS
- ci: run tests in Python 3.8 too
- test: remove no longer valid test
- test: remove empty test
- errno: return str from errno.strerror
- core: fix crash when processing .onion queries
- test: fix test_query_txt_multiple_chunked
- doc: fix path of _version.py file
- core: fix support for ARES_OPT_LOOKUPS option
- build: add cygwin support
- core: fix struct in6_addr alignment
- misc: simplify non-ascii txt test example
- core: fix long TXT record with non-ascii bytes
- build: remove extra add_include_dir line on linux
- build: fix testing manylinux wheels

Version 3.0.0
=============
(changes since version 2.x)
 - core: drop C backend in favor of CFFI
 - core: drop Python < 3.5 support
 - core: use None instead of -1 for default values
 - core: add support for ANY queries
 - core: automagically encode query names with IDNA
 - core: add support for ares_search

Version 3.0.0b5
===============
 - core: add support for ares_search

Version 3.0.0b4
===============
 - core: give better errors descriptions for AresError
 - test: add IDNA test using the query() API
 - cffi: simplify destroying ares channel

Version 3.0.0b3
===============
 - core: reorganize package
 - core: automagically encode query names with IDNA

Version 3.0.0b2
===============
 - errno: fix errorcode dictionary

Version 3.0.0b1
===============
 - core: add support for ANY queries
 - cffi: fix memory leak

Version 3.0.0b0
===============
 - core: drop C backend
 - core: drop Python < 3.5 support
 - core: use None instead of -1 for default values
 - core: set TTL to -1 when we cannot parse it

4 files changed, 14 insertions, 37 deletions

diff --git a/net/py-cares/Makefile b/net/py-cares/Makefile
index 8376a7c8281..3307c99bc26 100644
--- a/net/py-cares/Makefile
+++ b/net/py-cares/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2022/01/04 20:54:26 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2022/08/19 13:48:29 wiz Exp $
 
-DISTNAME=	pycares-2.4.0
+DISTNAME=	pycares-4.2.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/^py//}
-PKGREVISION=	1
 CATEGORIES=	net python
 MASTER_SITES=	${MASTER_SITE_PYPI:=p/pycares/}
 
@@ -16,5 +15,7 @@ DEPENDS+=	${PYPKGPREFIX}-cffi>=1.5.0:../../devel/py-cffi
 USE_LANGUAGES=	c
 MAKE_ENV+=	PYCARES_CFFI=1
 
+PYTHON_VERSIONS_INCOMPATIBLE=	27
+
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/py-cares/PLIST b/net/py-cares/PLIST
index d46d4c5d894..a44e6a2fda7 100644
--- a/net/py-cares/PLIST
+++ b/net/py-cares/PLIST
@@ -1,28 +1,23 @@
-@comment $NetBSD: PLIST,v 1.2 2017/07/22 06:44:50 adam Exp $
+@comment $NetBSD: PLIST,v 1.3 2022/08/19 13:48:29 wiz Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/not-zip-safe
 ${PYSITELIB}/${EGG_INFODIR}/requires.txt
 ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
-${PYSITELIB}/_pycares_cffi.so
 ${PYSITELIB}/pycares/__init__.py
 ${PYSITELIB}/pycares/__init__.pyc
 ${PYSITELIB}/pycares/__init__.pyo
 ${PYSITELIB}/pycares/__main__.py
 ${PYSITELIB}/pycares/__main__.pyc
 ${PYSITELIB}/pycares/__main__.pyo
-${PYSITELIB}/pycares/_cfficore/__init__.py
-${PYSITELIB}/pycares/_cfficore/__init__.pyc
-${PYSITELIB}/pycares/_cfficore/__init__.pyo
-${PYSITELIB}/pycares/_cfficore/errno.py
-${PYSITELIB}/pycares/_cfficore/errno.pyc
-${PYSITELIB}/pycares/_cfficore/errno.pyo
-${PYSITELIB}/pycares/_cfficore/pycares_build.py
-${PYSITELIB}/pycares/_cfficore/pycares_build.pyc
-${PYSITELIB}/pycares/_cfficore/pycares_build.pyo
+${PYSITELIB}/pycares/_cares.so
 ${PYSITELIB}/pycares/_version.py
 ${PYSITELIB}/pycares/_version.pyc
 ${PYSITELIB}/pycares/_version.pyo
 ${PYSITELIB}/pycares/errno.py
 ${PYSITELIB}/pycares/errno.pyc
 ${PYSITELIB}/pycares/errno.pyo
+${PYSITELIB}/pycares/utils.py
+${PYSITELIB}/pycares/utils.pyc
+${PYSITELIB}/pycares/utils.pyo
diff --git a/net/py-cares/distinfo b/net/py-cares/distinfo
index cf0e4826877..daebf399dd0 100644
--- a/net/py-cares/distinfo
+++ b/net/py-cares/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.6 2021/10/26 11:06:35 nia Exp $
+$NetBSD: distinfo,v 1.7 2022/08/19 13:48:29 wiz Exp $
 
-BLAKE2s (pycares-2.4.0.tar.gz) = 48976067fa87aec1acda5639fa8335d8295400951d4a7472c13403c81425f0a9
-SHA512 (pycares-2.4.0.tar.gz) = 7770a2b1fd69bb800019a292e5c9fc1f737b044fb4ca5166ead197da3515f2edac55f947a68f3505c9b404745529287114667d742162c98f2ff84b2c330ef295
-Size (pycares-2.4.0.tar.gz) = 214021 bytes
-SHA1 (patch-setup__cares.py) = 05b36350b308b9e3efbfe02a04204f77fe511dac
+BLAKE2s (pycares-4.2.2.tar.gz) = ea1d13ae8bd0fdaa0e71aa4873f9690ae7a48832e43b089ca06ffec6e6e44061
+SHA512 (pycares-4.2.2.tar.gz) = 5d1c60b74880dafef316fa1ca1e962c48a5efc9f018a1bd264d686254e39074a6c7f62bbf267ed7cee38aa6f9588dd0fd5ec329acdef00c872bcd21fcc6cc6b3
+Size (pycares-4.2.2.tar.gz) = 825335 bytes
diff --git a/net/py-cares/patches/patch-setup__cares.py b/net/py-cares/patches/patch-setup__cares.py
deleted file mode 100644
index 056804b5d44..00000000000
--- a/net/py-cares/patches/patch-setup__cares.py
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-setup__cares.py,v 1.2 2019/01/04 08:53:12 adam Exp $
-
-Fix build on SunOS.
-
---- setup_cares.py.orig	2019-01-02 09:16:48.000000000 +0000
-+++ setup_cares.py
-@@ -85,9 +85,10 @@ class cares_build_ext(build_ext):
-         elif sys.platform.startswith('openbsd'):
-             self.compiler.add_include_dir(os.path.join(self.cares_dir, 'src/config_openbsd'))
-         elif sys.platform.startswith('sunos'):
-+            self.compiler.add_include_dir(os.path.join(self.cares_dir, 'src/config_sunos'))
-             self.compiler.add_library('socket')
-             self.compiler.add_library('nsl')
--            self.compiler.add_library('lkstat')
-+            self.compiler.add_library('kstat')
-         elif sys.platform == 'win32':
-             self.compiler.add_include_dir(os.path.join(self.cares_dir, 'src/config_win32'))
-             if "mingw" not in self.compiler.compiler_type: