diff --git a/sysutils/py-ansible-lint/Makefile b/sysutils/py-ansible-lint/Makefile
index 9fabee581759..3d9d8a09ae8f 100644
--- a/sysutils/py-ansible-lint/Makefile
+++ b/sysutils/py-ansible-lint/Makefile
@@ -1,42 +1,45 @@
 PORTNAME=	ansible-lint
-PORTVERSION=	6.9.1
+PORTVERSION=	6.10.0
 CATEGORIES=	sysutils python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	matthew@FreeBSD.org
 COMMENT=	Checks playbooks for sub-optimal practices and behaviour
 WWW=		https://github.com/willthames/ansible-lint
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ansible-compat>=2.2.6:sysutils/py-ansible-compat@${PY_FLAVOR} \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ansible-compat>=2.2.7:sysutils/py-ansible-compat@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ansible-core>=2.12.0:sysutils/py-ansible-core@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}black>=22.8.0:devel/py-black@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}filelock>=3.3.0:sysutils/py-filelock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}jsonschema>=4.10.0:devel/py-jsonschema@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}packaging>=21.3:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}rich>=12.0.0:textproc/py-rich@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}ruamel.yaml>=0.17.21:devel/py-ruamel.yaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wcmatch>=8.1.2:textproc/py-wcmatch@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=5.4.1:devel/py-yaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yamllint>=1.26.3:devel/py-yamllint@${PY_FLAVOR}
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=42.0.0:devel/py-setuptools@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}setuptools_scm>=3.5.0:devel/py-setuptools_scm@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}setuptools_scm_git_archive>=1.0:devel/py-setuptools_scm_git_archive@${PY_FLAVOR}
+
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=63.0.0:devel/py-setuptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}setuptools_scm>=6.4.2:devel/py-setuptools_scm@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flaky>=3.7.0:devel/py-flaky@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest>=7.2.0:devel/py-pytest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-cov>=2.10.1:devel/py-pytest-cov@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-xdist>=2.1.0:devel/py-pytest-xdist@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR}
 
 USES=		python:3.8+
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
+post-patch:
+	@${CP} ${FILESDIR}/setup.py ${WRKSRC}/
+
 do-test:
 	@(cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest)
 
 .include <bsd.port.mk>
diff --git a/sysutils/py-ansible-lint/distinfo b/sysutils/py-ansible-lint/distinfo
index d6a6eceaa5b4..ddb7bd90b90d 100644
--- a/sysutils/py-ansible-lint/distinfo
+++ b/sysutils/py-ansible-lint/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1670270761
-SHA256 (ansible-lint-6.9.1.tar.gz) = 4c85f0d61700042cab964dd7bdc9227137ba5490249f705acfd9de46eb00a07f
-SIZE (ansible-lint-6.9.1.tar.gz) = 414149
+TIMESTAMP = 1671199743
+SHA256 (ansible-lint-6.10.0.tar.gz) = f5ecec58ebe7b6bfc4976be7d6e400411a8af05b0e1a19f15f25f59f3401348c
+SIZE (ansible-lint-6.10.0.tar.gz) = 421971
diff --git a/sysutils/py-ansible-lint/files/patch-setup.py b/sysutils/py-ansible-lint/files/patch-setup.py
deleted file mode 100644
index 12c9d0596446..000000000000
--- a/sysutils/py-ansible-lint/files/patch-setup.py
+++ /dev/null
@@ -1,8 +0,0 @@
---- setup.py.orig	2019-12-09 07:04:35 UTC
-+++ setup.py
-@@ -0,0 +1,5 @@
-+
-+import setuptools
-+if __name__ == "__main__":
-+    setuptools.setup(use_scm_version=True)
-+
diff --git a/sysutils/py-ansible-lint/files/setup.py b/sysutils/py-ansible-lint/files/setup.py
new file mode 100644
index 000000000000..606849326a40
--- /dev/null
+++ b/sysutils/py-ansible-lint/files/setup.py
@@ -0,0 +1,3 @@
+from setuptools import setup
+
+setup()