diff --git a/devel/py-recordclass/Makefile b/devel/py-recordclass/Makefile
index aeccdd546bc6..1b69d0a153f3 100644
--- a/devel/py-recordclass/Makefile
+++ b/devel/py-recordclass/Makefile
@@ -1,23 +1,23 @@
 PORTNAME=	recordclass
-PORTVERSION=	0.21.1
+PORTVERSION=	0.22
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Mutable variants of tuple and collections.namedtuple
 WWW=		https://github.com/intellimath/recordclass
 
 LICENSE=	MIT
 
 USES=		python:3.9+
 USE_PYTHON=	distutils
 
 .if ! defined(WITH_DEBUG)
 LDFLAGS+=	-s
 .endif
 
 do-test: install
 	(cd ${WRKSRC} && ${PYTHON_CMD} ./test_all.py)
 
 .include <bsd.port.mk>
diff --git a/devel/py-recordclass/distinfo b/devel/py-recordclass/distinfo
index 2d91fc743f3a..8db01421a813 100644
--- a/devel/py-recordclass/distinfo
+++ b/devel/py-recordclass/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1701599533
-SHA256 (recordclass-0.21.1.tar.gz) = fa2343dc24ef457f5f1c09e34fccada2d9074f582287f9fedb195bfbc1a9af92
-SIZE (recordclass-0.21.1.tar.gz) = 1321641
+TIMESTAMP = 1719149888
+SHA256 (recordclass-0.22.tar.gz) = ca36384c22c29045a022ce87de23f2233f51523275fc83390a0cf75407340ce0
+SIZE (recordclass-0.22.tar.gz) = 1332255
diff --git a/devel/py-recordclass/pkg-plist b/devel/py-recordclass/pkg-plist
index 347c1d71f212..bbb0b8285c37 100644
--- a/devel/py-recordclass/pkg-plist
+++ b/devel/py-recordclass/pkg-plist
@@ -1,73 +1,82 @@
 %%PYTHON_SITELIBDIR%%/recordclass/__init__.py
 %%PYTHON_SITELIBDIR%%/recordclass/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/recordclass/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/recordclass/__pycache__/adapter.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/recordclass/__pycache__/adapter.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/recordclass/__pycache__/arrayclass.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/recordclass/__pycache__/arrayclass.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/recordclass/__pycache__/dataclass.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/recordclass/__pycache__/dataclass.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/recordclass/__pycache__/datatype.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/recordclass/__pycache__/datatype.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/recordclass/__pycache__/dictclass.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/recordclass/__pycache__/dictclass.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/recordclass/__pycache__/recordclass.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/recordclass/__pycache__/recordclass.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/recordclass/__pycache__/utils.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/recordclass/__pycache__/utils.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/recordclass/_dataobject%%PYTHON_EXT_SUFFIX%%.so
 %%PYTHON_SITELIBDIR%%/recordclass/_linkedlist%%PYTHON_EXT_SUFFIX%%.so
 %%PYTHON_SITELIBDIR%%/recordclass/_litelist%%PYTHON_EXT_SUFFIX%%.so
 %%PYTHON_SITELIBDIR%%/recordclass/_litetuple%%PYTHON_EXT_SUFFIX%%.so
 %%PYTHON_SITELIBDIR%%/recordclass/adapter.py
 %%PYTHON_SITELIBDIR%%/recordclass/arrayclass.py
 %%PYTHON_SITELIBDIR%%/recordclass/dataclass.py
 %%PYTHON_SITELIBDIR%%/recordclass/datatype.py
 %%PYTHON_SITELIBDIR%%/recordclass/dictclass.py
 %%PYTHON_SITELIBDIR%%/recordclass/recordclass.py
 %%PYTHON_SITELIBDIR%%/recordclass/test/__init__.py
 %%PYTHON_SITELIBDIR%%/recordclass/test/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/recordclass/test/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/recordclass/test/__pycache__/test_arrayclass.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/recordclass/test/__pycache__/test_arrayclass.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/recordclass/test/__pycache__/test_dataobject.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/recordclass/test/__pycache__/test_dataobject.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/recordclass/test/__pycache__/test_litelist.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/recordclass/test/__pycache__/test_litelist.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/recordclass/test/__pycache__/test_litetuple.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/recordclass/test/__pycache__/test_litetuple.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/recordclass/test/__pycache__/test_recordclass.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/recordclass/test/__pycache__/test_recordclass.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/recordclass/test/__pycache__/test_sqlite.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/recordclass/test/__pycache__/test_sqlite.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/recordclass/test/match/__init__.py
+%%PYTHON_SITELIBDIR%%/recordclass/test/match/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/recordclass/test/match/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/recordclass/test/match/__pycache__/test_dataobject_match.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/recordclass/test/match/__pycache__/test_dataobject_match.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/recordclass/test/match/test_dataobject_match.py
 %%PYTHON_SITELIBDIR%%/recordclass/test/test_arrayclass.py
 %%PYTHON_SITELIBDIR%%/recordclass/test/test_dataobject.py
 %%PYTHON_SITELIBDIR%%/recordclass/test/test_litelist.py
 %%PYTHON_SITELIBDIR%%/recordclass/test/test_litetuple.py
 %%PYTHON_SITELIBDIR%%/recordclass/test/test_recordclass.py
 %%PYTHON_SITELIBDIR%%/recordclass/test/test_sqlite.py
 %%PYTHON_SITELIBDIR%%/recordclass/test/typing/__init__.py
 %%PYTHON_SITELIBDIR%%/recordclass/test/typing/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/recordclass/test/typing/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/recordclass/test/typing/__pycache__/test_dataobject.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/recordclass/test/typing/__pycache__/test_dataobject.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/recordclass/test/typing/__pycache__/test_datastruct.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/recordclass/test/typing/__pycache__/test_datastruct.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/recordclass/test/typing/__pycache__/test_recordclass.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/recordclass/test/typing/__pycache__/test_recordclass.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/recordclass/test/typing/test_dataobject.py
+%%PYTHON_SITELIBDIR%%/recordclass/test/typing/test_datastruct.py
 %%PYTHON_SITELIBDIR%%/recordclass/test/typing/test_recordclass.py
 %%PYTHON_SITELIBDIR%%/recordclass/tools/__init__.py
 %%PYTHON_SITELIBDIR%%/recordclass/tools/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/recordclass/tools/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/recordclass/tools/__pycache__/csv_dataobject.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/recordclass/tools/__pycache__/csv_dataobject.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/recordclass/tools/__pycache__/perfcounts.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/recordclass/tools/__pycache__/perfcounts.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/recordclass/tools/__pycache__/sqlite.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/recordclass/tools/__pycache__/sqlite.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/recordclass/tools/csv_dataobject.py
 %%PYTHON_SITELIBDIR%%/recordclass/tools/perfcounts.py
 %%PYTHON_SITELIBDIR%%/recordclass/tools/sqlite.py
 %%PYTHON_SITELIBDIR%%/recordclass/typing/__init__.py
 %%PYTHON_SITELIBDIR%%/recordclass/typing/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/recordclass/typing/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/recordclass/utils.py