diff --git a/devel/cli11/Makefile b/devel/cli11/Makefile
index 23b5daf8d8ec..9f0cb727e9ca 100644
--- a/devel/cli11/Makefile
+++ b/devel/cli11/Makefile
@@ -1,21 +1,25 @@
 PORTNAME=	cli11
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.0.0
+DISTVERSION=	2.1.0
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Command line parser for C++11 and beyond
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		cmake compiler:c++11-lang
+TEST_DEPENDS=	${LOCALBASE}/include/boost/optional.hpp:devel/boost-libs
+
+USES=		cmake:testing compiler:c++11-lang
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	CLIUtils
 GH_PROJECT=	CLI11
 
 CMAKE_OFF=	BUILD_TESTING CLI11_BUILD_EXAMPLES
+CMAKE_TESTING_ON=	BUILD_TESTING # CLI11_BOOST # tests fail with Boost, see https://github.com/CLIUtils/CLI11/issues/645
 
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/cli11/distinfo b/devel/cli11/distinfo
index 4acdef9e08f7..8b10c9e84bdf 100644
--- a/devel/cli11/distinfo
+++ b/devel/cli11/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1626681417
-SHA256 (CLIUtils-CLI11-v2.0.0_GH0.tar.gz) = 2c672f17bf56e8e6223a3bfb74055a946fa7b1ff376510371902adb9cb0ab6a3
-SIZE (CLIUtils-CLI11-v2.0.0_GH0.tar.gz) = 280797
+TIMESTAMP = 1632695793
+SHA256 (CLIUtils-CLI11-v2.1.0_GH0.tar.gz) = 2661b0112b02478bad3dc7f1749c4825bfc7e37b440cbb4c8c0e2ffaa3999112
+SIZE (CLIUtils-CLI11-v2.1.0_GH0.tar.gz) = 286192
diff --git a/devel/cli11/pkg-plist b/devel/cli11/pkg-plist
index f86e092fa08d..81d2fa38a207 100644
--- a/devel/cli11/pkg-plist
+++ b/devel/cli11/pkg-plist
@@ -1,18 +1,18 @@
 include/CLI/App.hpp
 include/CLI/CLI.hpp
 include/CLI/Config.hpp
 include/CLI/ConfigFwd.hpp
 include/CLI/Error.hpp
 include/CLI/Formatter.hpp
 include/CLI/FormatterFwd.hpp
 include/CLI/Macros.hpp
 include/CLI/Option.hpp
 include/CLI/Split.hpp
 include/CLI/StringTools.hpp
 include/CLI/Timer.hpp
 include/CLI/TypeTools.hpp
 include/CLI/Validators.hpp
 include/CLI/Version.hpp
-lib/cmake/CLI11/CLI11Config.cmake
-lib/cmake/CLI11/CLI11ConfigVersion.cmake
-libdata/pkgconfig/CLI11.pc
+share/cmake/CLI11/CLI11Config.cmake
+share/cmake/CLI11/CLI11ConfigVersion.cmake
+share/pkgconfig/CLI11.pc