devel/cppcheck: update 2.13.4 → 2.14.0

- switch to USES=cmake:testing

5 files changed, 14 insertions, 41 deletions

diff --git a/devel/cppcheck/Makefile b/devel/cppcheck/Makefile
index 5fec5569fbf2..e1169ff283b0 100644
--- a/devel/cppcheck/Makefile
+++ b/devel/cppcheck/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	cppcheck
-PORTVERSION=	2.13.4
+DISTVERSION=	2.14.0
 CATEGORIES=	devel
 
 MAINTAINER=	amdmi3@FreeBSD.org
@@ -12,7 +12,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libtinyxml2.so:textproc/tinyxml2
 
-USES=		compiler:c++11-lib cmake shebangfix tar:bzip2
+USES=		compiler:c++11-lib shebangfix tar:bzip2
 USE_GITHUB=	yes
 GH_ACCOUNT=	danmar
 SHEBANG_FILES=	htmlreport/cppcheck-htmlreport
@@ -32,6 +32,8 @@ RULES_USES=		localbase:ldflags
 TEST_CMAKE_BOOL=	BUILD_TESTS
 TEST_IMPLIES=		GUI
 TEST_USE=		QT=testlib
+TEST_USES=		cmake:testing
+TEST_USES_OFF=		cmake
 
 HTMLREPORT_DESC=	Install cppcheck-htmlreport
 HTMLREPORT_USES=	python:${PYUSE:C/ /,/W}
diff --git a/devel/cppcheck/distinfo b/devel/cppcheck/distinfo
index 196c3a5af8c6..6579a2a02709 100644
--- a/devel/cppcheck/distinfo
+++ b/devel/cppcheck/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1709055380
-SHA256 (danmar-cppcheck-2.13.4_GH0.tar.gz) = d6ea064ebab76c6aa000795440479767d8d814dd29405918df4c1bbfcd6cb86c
-SIZE (danmar-cppcheck-2.13.4_GH0.tar.gz) = 3646131
+TIMESTAMP = 1713805128
+SHA256 (danmar-cppcheck-2.14.0_GH0.tar.gz) = 2d2ead75db10c5993d77c8dfe854dc42b00fac65953611bb6c83e25fc74b9d50
+SIZE (danmar-cppcheck-2.14.0_GH0.tar.gz) = 3716204
diff --git a/devel/cppcheck/files/patch-CMakeLists.txt b/devel/cppcheck/files/patch-CMakeLists.txt
index c09aa766944f..2a0447f44305 100644
--- a/devel/cppcheck/files/patch-CMakeLists.txt
+++ b/devel/cppcheck/files/patch-CMakeLists.txt
@@ -1,9 +1,11 @@
---- CMakeLists.txt.orig	2023-06-22 09:07:56 UTC
+--- CMakeLists.txt.orig	2024-04-20 18:31:07 UTC
 +++ CMakeLists.txt
-@@ -1,5 +1,5 @@
- cmake_minimum_required(VERSION 2.8.12)
--project(Cppcheck)
-+project(cppcheck)
+@@ -3,7 +3,7 @@ cmake_policy(SET CMP0048 NEW) # allow VERSION in proje
+     cmake_minimum_required(VERSION 3.13)
+ endif()
+ cmake_policy(SET CMP0048 NEW) # allow VERSION in project()
+-project(Cppcheck VERSION 2.13.99 LANGUAGES CXX)
++project(cppcheck VERSION 2.13.99 LANGUAGES CXX)
  
  include(cmake/cxx11.cmake)
  use_cxx11()
diff --git a/devel/cppcheck/files/patch-cli_cppcheckexecutor.cpp b/devel/cppcheck/files/patch-cli_cppcheckexecutor.cpp
deleted file mode 100644
index 03645dc3a08b..000000000000
--- a/devel/cppcheck/files/patch-cli_cppcheckexecutor.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
---- cli/cppcheckexecutor.cpp.orig	2024-02-16 08:46:10 UTC
-+++ cli/cppcheckexecutor.cpp
-@@ -64,6 +64,10 @@
- #include <windows.h>
- #endif
- 
-+#if !defined(WIN32) && !defined(__MINGW32__)
-+#include <sys/wait.h> // WIFEXITETED and friends
-+#endif
-+
- class CmdLineLoggerStd : public CmdLineLogger
- {
- public:
diff --git a/devel/cppcheck/files/patch-test_testother.cpp b/devel/cppcheck/files/patch-test_testother.cpp
deleted file mode 100644
index 6ee71403f6f7..000000000000
--- a/devel/cppcheck/files/patch-test_testother.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
---- test/testother.cpp.orig	2024-02-16 08:46:10 UTC
-+++ test/testother.cpp
-@@ -2173,6 +2173,7 @@ class TestOther : public TestFixture { (private)
-               "}\n");
-         ASSERT_EQUALS("[test.cpp:1]: (performance) Function parameter 't' should be passed by const reference.\n", errout.str());
- 
-+#ifndef __i386__
-         check("struct S {\n" // #12138
-               "    union {\n"
-               "        int a = 0;\n"
-@@ -2191,6 +2192,7 @@ class TestOther : public TestFixture { (private)
-               "    if (s.x > s.y) {}\n"
-               "}\n");
-         ASSERT_EQUALS("", errout.str());
-+#endif
- 
-         check("struct S { std::list<int> l; };\n" // #12147
-               "class C { public: std::list<int> l; };\n"