diff --git a/devel/cppcheck/Makefile b/devel/cppcheck/Makefile
index 1e85b4f6dfe9..965080130f98 100644
--- a/devel/cppcheck/Makefile
+++ b/devel/cppcheck/Makefile
@@ -1,82 +1,82 @@
 # Created by: Gabor Pali <pgj@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	cppcheck
-PORTVERSION=	2.0
+PORTVERSION=	2.1
 PORTREVISION?=	0	# devel/cppcheck-gui
 CATEGORIES=	devel
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT?=	Static analysis of C/C++ code
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		compiler:c++11-lib cmake:insource tar:bzip2
 USE_GITHUB=	yes
 GH_ACCOUNT=	danmar
 
 .if defined(GUI_ONLY)
 COMMENT=		Static analysis of C/C++ code (GUI)
 
 RUN_DEPENDS=		cppcheck:devel/cppcheck
 
 CMAKE_ARGS=		-DBUILD_GUI=TRUE
 USES+=			qt:5
 USE_QT=			core gui widgets printsupport qmake_build buildtools_build linguisttools_build
 
 BUILD_WRKSRC=		${WRKSRC}/gui
 INSTALL_WRKSRC=		${WRKSRC}/gui
 
 PLIST=			${PKGDIR}/pkg-plist-gui
 
 PKGNAMESUFFIX=		-gui
 .else
 USES+=			shebangfix
 SHEBANG_FILES=		htmlreport/cppcheck-htmlreport
 
 PORTDATA=		*
 
 OPTIONS_DEFINE=		RULES HTMLREPORT MANPAGES MATCHCOMPILER TEST
 OPTIONS_DEFAULT=	RULES HTMLREPORT MANPAGES MATCHCOMPILER
 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
 
 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_BOOL=	USE_MATCHCOMPILER
 MATCHCOMPILER_USES=	python:${PYUSE:C/ /,/W}
 MATCHCOMPILER_VARS=	PYUSE+=build
 
 post-patch:
 	@${REINPLACE_CMD} -e '/find_package(Qt5/ d' ${WRKSRC}/cmake/findDependencies.cmake
 
 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}/man/man1
 
 do-test-TEST-on:
 	cd ${WRKSRC} && ctest
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/cppcheck/distinfo b/devel/cppcheck/distinfo
index 2767f6febeea..06c6ea0cfd44 100644
--- a/devel/cppcheck/distinfo
+++ b/devel/cppcheck/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1589923482
-SHA256 (danmar-cppcheck-2.0_GH0.tar.gz) = fdba69d9f8db4bbe27ee00bb88839d212b6a848372add7ad8f567236deb0f00f
-SIZE (danmar-cppcheck-2.0_GH0.tar.gz) = 3086627
+TIMESTAMP = 1592150684
+SHA256 (danmar-cppcheck-2.1_GH0.tar.gz) = 447d44bbaa555fa78b89dd2cb0203fd4c6f18269db8a78638b968ba7c72cb02e
+SIZE (danmar-cppcheck-2.1_GH0.tar.gz) = 3119847
diff --git a/devel/cppcheck/files/patch-cmake_versions.cmake b/devel/cppcheck/files/patch-cmake_versions.cmake
deleted file mode 100644
index f298c04cb9e8..000000000000
--- a/devel/cppcheck/files/patch-cmake_versions.cmake
+++ /dev/null
@@ -1,9 +0,0 @@
---- cmake/versions.cmake.orig	2020-05-10 09:31:19 UTC
-+++ cmake/versions.cmake
-@@ -1,5 +1,5 @@
- # Version for libraries CPP
--SET(VERSION "2.0")
-+SET(VERSION "2.0.0")
- STRING(REGEX MATCHALL "[0-9]" VERSION_PARTS "${VERSION}")
- LIST(GET VERSION_PARTS 0 VERSION_MAJOR)
- LIST(GET VERSION_PARTS 1 VERSION_MINOR)