diff --git a/devel/cppcheck/Makefile b/devel/cppcheck/Makefile
index 5065e238bf84..a5bcfcf64dc3 100644
--- a/devel/cppcheck/Makefile
+++ b/devel/cppcheck/Makefile
@@ -1,76 +1,76 @@
 PORTNAME=	cppcheck
-PORTVERSION=	2.10.3
+PORTVERSION=	2.12.1
 CATEGORIES=	devel
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Tool for static C/C++ code analysis
 WWW=		https://cppcheck.sourceforge.io/ \
 		https://github.com/danmar/cppcheck
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libtinyxml2.so:textproc/tinyxml2
 
 BROKEN_FreeBSD_14=	fails to compile: static_assert failed due to requirement
 
 USES=		compiler:c++11-lib cmake shebangfix tar:bzip2
 USE_GITHUB=	yes
 GH_ACCOUNT=	danmar
 SHEBANG_FILES=	htmlreport/cppcheck-htmlreport
 CMAKE_OFF=	USE_BUNDLED_TINYXML2
 
 PORTDATA=		*
 
 OPTIONS_DEFINE=		RULES HTMLREPORT MANPAGES MATCHCOMPILER GUI CHARTS TEST
 OPTIONS_DEFAULT=	RULES HTMLREPORT MANPAGES MATCHCOMPILER GUI
 OPTIONS_SUB=		yes
 
 RULES_DESC=		User-defined rule support (requires PCRE)
 RULES_CMAKE_BOOL=	HAVE_RULES
 RULES_LIB_DEPENDS=	libpcre.so:devel/pcre
 RULES_USES=		localbase:ldflags
 
 TEST_CMAKE_BOOL=	BUILD_TESTS
 TEST_IMPLIES=		GUI
 TEST_USE=		QT=testlib
 
 HTMLREPORT_DESC=	Install cppcheck-htmlreport
 HTMLREPORT_USES=	python:${PYUSE:C/ /,/W}
 HTMLREPORT_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR}
 HTMLREPORT_PLIST_FILES=	bin/cppcheck-htmlreport
 HTMLREPORT_VARS=	PYUSE+=run
 
 MANPAGES_BUILD_DEPENDS=	xsltproc:textproc/libxslt \
 			${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl
 
 MATCHCOMPILER_DESC=	Build-time optimizations via Python
 MATCHCOMPILER_CMAKE_ON=	-DUSE_MATCHCOMPILER=On
 MATCHCOMPILER_CMAKE_OFF=-DUSE_MATCHCOMPILER=Off
 MATCHCOMPILER_USES=	python:${PYUSE:C/ /,/W}
 MATCHCOMPILER_VARS=	PYUSE+=build
 
 GUI_DESC=		Build the Qt GUI application
 GUI_CMAKE_BOOL=		BUILD_GUI
 GUI_USES=		qt:5
 GUI_USE=		QT=core,gui,widgets,printsupport,help,network,qmake:build,buildtools:build,linguisttools:build
 
 CHARTS_DESC=		Enable QtCharts usage in the GUI
 CHARTS_CMAKE_BOOL=	WITH_QCHART
 CHARTS_IMPLIES=		GUI
 CHARTS_USE=		QT=charts
 
 post-install-HTMLREPORT-on:
 	${INSTALL_SCRIPT} ${WRKSRC}/htmlreport/cppcheck-htmlreport ${STAGEDIR}${PREFIX}/bin
 
 post-build-MANPAGES-on:
 	cd ${WRKSRC}/man && ${LOCALBASE}/bin/xsltproc --nonet --param man.charmap.use.subset "0" \
 		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl cppcheck.1.xml
 
 post-install-MANPAGES-on:
 	${INSTALL_MAN} ${WRKSRC}/man/cppcheck.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 do-test-TEST-on:
 	cd ${BUILD_WRKSRC} && ${SETENV} ${TEST_ENV} ctest
 
 .include <bsd.port.mk>
diff --git a/devel/cppcheck/distinfo b/devel/cppcheck/distinfo
index 2b41c893c8dd..0d6560fcceb6 100644
--- a/devel/cppcheck/distinfo
+++ b/devel/cppcheck/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1679426311
-SHA256 (danmar-cppcheck-2.10.3_GH0.tar.gz) = 8aae5e116daeaaf5d19f3efa61b91c06f161cb97412a1d1af6e1e20686e48967
-SIZE (danmar-cppcheck-2.10.3_GH0.tar.gz) = 3447010
+TIMESTAMP = 1695753260
+SHA256 (danmar-cppcheck-2.12.1_GH0.tar.gz) = 2a3d4ba1179419612183ab3d6aed6d3b18be75e98cd6f138ea8e2020905dced2
+SIZE (danmar-cppcheck-2.12.1_GH0.tar.gz) = 3579702
diff --git a/devel/cppcheck/files/patch-CMakeLists.txt b/devel/cppcheck/files/patch-CMakeLists.txt
index 71a0b515cdb8..c09aa766944f 100644
--- a/devel/cppcheck/files/patch-CMakeLists.txt
+++ b/devel/cppcheck/files/patch-CMakeLists.txt
@@ -1,9 +1,9 @@
---- CMakeLists.txt.orig	2020-05-10 09:31:19 UTC
+--- CMakeLists.txt.orig	2023-06-22 09:07:56 UTC
 +++ CMakeLists.txt
 @@ -1,5 +1,5 @@
  cmake_minimum_required(VERSION 2.8.12)
 -project(Cppcheck)
 +project(cppcheck)
  
- set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
- 
+ include(cmake/cxx11.cmake)
+ use_cxx11()
diff --git a/devel/cppcheck/files/patch-test_testpath.cpp b/devel/cppcheck/files/patch-test_testpath.cpp
new file mode 100644
index 000000000000..2b21c01bc0d4
--- /dev/null
+++ b/devel/cppcheck/files/patch-test_testpath.cpp
@@ -0,0 +1,14 @@
+This test requires /proc to be mounted
+
+--- test/testpath.cpp.orig	2023-06-22 09:07:56 UTC
++++ test/testpath.cpp
+@@ -74,7 +74,9 @@ class TestPath : public TestFixture { (private)
+     }
+ 
+     void getCurrentExecutablePath() const {
++#ifndef __FreeBSD__
+         ASSERT_EQUALS(false, Path::getCurrentExecutablePath("").empty());
++#endif
+     }
+ 
+     void isAbsolute() const {