diff --git a/textproc/py-wcmatch/Makefile b/textproc/py-wcmatch/Makefile
index 9cb0f07b092e..9df8a0ea6e2b 100644
--- a/textproc/py-wcmatch/Makefile
+++ b/textproc/py-wcmatch/Makefile
@@ -1,29 +1,45 @@
 PORTNAME=	wcmatch
-PORTVERSION=	8.3
-PORTREVISION=	1
+PORTVERSION=	8.4.1
 CATEGORIES=	textproc python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	matthew@FreeBSD.org
 COMMENT=	Wildcard/glob file name matcher
 WWW=		https://pypi.org/project/wcmatch/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}hatchling>=0.21.1:devel/py-hatchling@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pip>=22.2:devel/py-pip@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}bracex>=2.1.1:textproc/py-bracex@${PY_FLAVOR}
 
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-cov>0:devel/py-pytest-cov@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${PY_FLAVOR}
 
-USES=		python:3.6+
-USE_PYTHON=	autoplist distutils
+USES=		python:3.7+
+USE_PYTHON=	flavors
+
+
+# PYTHON_EXT_SUFFIX could be used here, except that it is
+# special-cased for python3.7 which we don't want.
+PYCACHE_SUFFIX=	.cpython-${PYTHON_SUFFIX}.pyc
+
+PLIST_SUB+=	PORTVERSION=${PORTVERSION} PYCACHE_SUFFIX=${PYCACHE_SUFFIX}
 
 NO_ARCH=	yes
 
+do-build:
+	cd ${WRKSRC} && ${PYTHON_CMD} -m hatchling build -t wheel
+
+do-install:
+	${PYTHON_CMD} -m pip --no-cache-dir install --no-deps --ignore-installed \
+	  --disable-pip-version-check --target ${STAGEDIR}${PYTHON_SITELIBDIR} \
+	  ${WRKSRC}/dist/${PORTNAME}-${PORTVERSION}-py3-none-any.whl
+
 do-test:
 	@(cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest)
 
 .include <bsd.port.mk>
diff --git a/textproc/py-wcmatch/distinfo b/textproc/py-wcmatch/distinfo
index ff8bf4e9ac12..8d36b0959c37 100644
--- a/textproc/py-wcmatch/distinfo
+++ b/textproc/py-wcmatch/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1636198668
-SHA256 (wcmatch-8.3.tar.gz) = 371072912398af61d1e4e78609e18801c6faecd3cb36c54c82556a60abc965db
-SIZE (wcmatch-8.3.tar.gz) = 118523
+TIMESTAMP = 1669241366
+SHA256 (wcmatch-8.4.1.tar.gz) = b1f042a899ea4c458b7321da1b5e3331e3e0ec781583434de1301946ceadb943
+SIZE (wcmatch-8.4.1.tar.gz) = 114362
diff --git a/textproc/py-wcmatch/pkg-plist b/textproc/py-wcmatch/pkg-plist
new file mode 100644
index 000000000000..751f7c1af749
--- /dev/null
+++ b/textproc/py-wcmatch/pkg-plist
@@ -0,0 +1,28 @@
+%%PYTHON_LIBDIR%%/site-packages/wcmatch-%%PORTVERSION%%.dist-info/WHEEL
+%%PYTHON_LIBDIR%%/site-packages/wcmatch-%%PORTVERSION%%.dist-info/REQUESTED
+%%PYTHON_LIBDIR%%/site-packages/wcmatch-%%PORTVERSION%%.dist-info/RECORD
+%%PYTHON_LIBDIR%%/site-packages/wcmatch-%%PORTVERSION%%.dist-info/INSTALLER
+%%PYTHON_LIBDIR%%/site-packages/wcmatch-%%PORTVERSION%%.dist-info/direct_url.json
+%%PYTHON_LIBDIR%%/site-packages/wcmatch-%%PORTVERSION%%.dist-info/METADATA
+%%PYTHON_LIBDIR%%/site-packages/wcmatch-%%PORTVERSION%%.dist-info/licenses/LICENSE.md
+%%PYTHON_LIBDIR%%/site-packages/wcmatch/fnmatch.py
+%%PYTHON_LIBDIR%%/site-packages/wcmatch/_wcparse.py
+%%PYTHON_LIBDIR%%/site-packages/wcmatch/posix.py
+%%PYTHON_LIBDIR%%/site-packages/wcmatch/__pycache__/_wcparse%%PYCACHE_SUFFIX%%
+%%PYTHON_LIBDIR%%/site-packages/wcmatch/__pycache__/glob%%PYCACHE_SUFFIX%%
+%%PYTHON_LIBDIR%%/site-packages/wcmatch/__pycache__/fnmatch%%PYCACHE_SUFFIX%%
+%%PYTHON_LIBDIR%%/site-packages/wcmatch/__pycache__/_wcmatch%%PYCACHE_SUFFIX%%
+%%PYTHON_LIBDIR%%/site-packages/wcmatch/__pycache__/wcmatch%%PYCACHE_SUFFIX%%
+%%PYTHON_LIBDIR%%/site-packages/wcmatch/__pycache__/pathlib%%PYCACHE_SUFFIX%%
+%%PYTHON_LIBDIR%%/site-packages/wcmatch/__pycache__/__init__%%PYCACHE_SUFFIX%%
+%%PYTHON_LIBDIR%%/site-packages/wcmatch/__pycache__/__meta__%%PYCACHE_SUFFIX%%
+%%PYTHON_LIBDIR%%/site-packages/wcmatch/__pycache__/posix%%PYCACHE_SUFFIX%%
+%%PYTHON_LIBDIR%%/site-packages/wcmatch/__pycache__/util%%PYCACHE_SUFFIX%%
+%%PYTHON_LIBDIR%%/site-packages/wcmatch/glob.py
+%%PYTHON_LIBDIR%%/site-packages/wcmatch/__init__.py
+%%PYTHON_LIBDIR%%/site-packages/wcmatch/__meta__.py
+%%PYTHON_LIBDIR%%/site-packages/wcmatch/util.py
+%%PYTHON_LIBDIR%%/site-packages/wcmatch/_wcmatch.py
+%%PYTHON_LIBDIR%%/site-packages/wcmatch/py.typed
+%%PYTHON_LIBDIR%%/site-packages/wcmatch/pathlib.py
+%%PYTHON_LIBDIR%%/site-packages/wcmatch/wcmatch.py