diff --git a/devel/py-moreorless/Makefile b/devel/py-moreorless/Makefile
index 00993857b8f4..ead39e3985ed 100644
--- a/devel/py-moreorless/Makefile
+++ b/devel/py-moreorless/Makefile
@@ -1,24 +1,27 @@
 PORTNAME=	moreorless
-PORTVERSION=	0.5.0
+PORTVERSION=	0.6.0
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Python diff wrapper
 WWW=		https://github.com/thatch/moreorless
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=61.0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools-scm>=8.0:devel/py-setuptools-scm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}click>=0:devel/py-click@${PY_FLAVOR}
 
 USES=		python
 USE_PYTHON=	autoplist concurrent pep517
 
 NO_ARCH=	yes
 
+OPTIONS_DEFINE=	CLI
+
+CLI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}click>=0:devel/py-click@${PY_FLAVOR}
+
 .include <bsd.port.mk>
diff --git a/devel/py-moreorless/distinfo b/devel/py-moreorless/distinfo
index e0d27b6110f2..6c3ab6eb486f 100644
--- a/devel/py-moreorless/distinfo
+++ b/devel/py-moreorless/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1747546516
-SHA256 (moreorless-0.5.0.tar.gz) = 560a04f85006fccd74feaa4b6213a446392ff7b5ec0194a5464b6c30f182fa33
-SIZE (moreorless-0.5.0.tar.gz) = 14093
+TIMESTAMP = 1778677914
+SHA256 (moreorless-0.6.0.tar.gz) = 175e8afa824006c4356353d97b1cc9699a6ef68a851e0859257cde8d00e88a64
+SIZE (moreorless-0.6.0.tar.gz) = 15607
diff --git a/devel/py-moreorless/files/patch-setup.cfg b/devel/py-moreorless/files/patch-setup.cfg
new file mode 100644
index 000000000000..bc647e5f878e
--- /dev/null
+++ b/devel/py-moreorless/files/patch-setup.cfg
@@ -0,0 +1,11 @@
+--- setup.cfg.orig	2026-05-12 06:15:05 UTC
++++ setup.cfg
+@@ -13,7 +13,7 @@ setup_requires = 
+ python_requires = >=3.9
+ setup_requires = 
+ 	setuptools_scm >= 8
+-	setuptools >= 65
++	setuptools >= 61
+ include_package_data = true
+ install_requires = 
+