diff --git a/devel/cppcheck/Makefile b/devel/cppcheck/Makefile index c577e143b712..816d00e3e231 100644 --- a/devel/cppcheck/Makefile +++ b/devel/cppcheck/Makefile @@ -1,73 +1,74 @@ PORTNAME= cppcheck -PORTVERSION= 2.9.3 +PORTVERSION= 2.10 CATEGORIES= devel MAINTAINER= amdmi3@FreeBSD.org COMMENT= Tool for static C/C++ code analysis -WWW= https://cppcheck.sourceforge.io/ +WWW= https://cppcheck.sourceforge.io/ \ + https://github.com/danmar/cppcheck LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libtinyxml2.so:textproc/tinyxml2 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 diff --git a/devel/cppcheck/distinfo b/devel/cppcheck/distinfo index e72a1d440397..7e0d3762d4ae 100644 --- a/devel/cppcheck/distinfo +++ b/devel/cppcheck/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1669218988 -SHA256 (danmar-cppcheck-2.9.3_GH0.tar.gz) = 46319ca73e33e4b2bd91981a76a0d4f184cd3f86b62dc18e8938eabacd3ad2e3 -SIZE (danmar-cppcheck-2.9.3_GH0.tar.gz) = 3918291 +TIMESTAMP = 1675081481 +SHA256 (danmar-cppcheck-2.10_GH0.tar.gz) = 785dcbf711048dfe43ae920b6eff2eeebb4a096e88188a40e173ca4c030f57c3 +SIZE (danmar-cppcheck-2.10_GH0.tar.gz) = 3442586 diff --git a/devel/cppcheck/files/patch-cli_CMakeLists.txt b/devel/cppcheck/files/patch-cli_CMakeLists.txt deleted file mode 100644 index 76469f8fbc4f..000000000000 --- a/devel/cppcheck/files/patch-cli_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- cli/CMakeLists.txt.orig 2022-08-28 12:43:18 UTC -+++ cli/CMakeLists.txt -@@ -37,7 +37,7 @@ if(tinyxml2_FOUND AND NOT USE_BUNDLED_TINYXML2) - endif() - endif() - if(tinyxml2_FOUND AND NOT USE_BUNDLED_TINYXML2) -- target_link_libraries(cppcheck ${tinyxml2_LIBRARIES}) -+ target_link_libraries(cppcheck tinyxml2::tinyxml2) - endif() - target_link_libraries(cppcheck ${CMAKE_THREAD_LIBS_INIT}) - diff --git a/devel/cppcheck/files/patch-gui_CMakeLists.txt b/devel/cppcheck/files/patch-gui_CMakeLists.txt index 48bfc79062c7..eff3eece7257 100644 --- a/devel/cppcheck/files/patch-gui_CMakeLists.txt +++ b/devel/cppcheck/files/patch-gui_CMakeLists.txt @@ -1,20 +1,11 @@ --- gui/CMakeLists.txt.orig 2022-08-28 12:43:18 UTC +++ gui/CMakeLists.txt -@@ -34,7 +34,7 @@ if (BUILD_GUI) - target_link_libraries(cppcheck-gui ${PCRE_LIBRARY}) - endif() - if(tinyxml2_FOUND AND NOT USE_BUNDLED_TINYXML2) -- target_link_libraries(cppcheck-gui ${tinyxml2_LIBRARIES}) -+ target_link_libraries(cppcheck-gui tinyxml2::tinyxml2) - endif() - target_link_libraries(cppcheck-gui ${QT_CORE_LIB} ${QT_GUI_LIB} ${QT_WIDGETS_LIB} ${QT_PRINTSUPPORT_LIB} ${QT_HELP_LIB}) - if(WITH_QCHART) @@ -49,7 +49,7 @@ if (BUILD_GUI) endif() install(TARGETS cppcheck-gui RUNTIME DESTINATION ${CMAKE_INSTALL_FULL_BINDIR} COMPONENT applications) - install(FILES ${qms} DESTINATION ${CMAKE_INSTALL_FULL_BINDIR} COMPONENT applications) + install(FILES ${qms} DESTINATION ${CMAKE_INSTALL_FULL_DATAROOTDIR}/${PROJECT_NAME}/lang COMPONENT applications) install(FILES cppcheck-gui.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications) diff --git a/devel/cppcheck/files/patch-gui_test_benchmark_simple_CMakeLists.txt b/devel/cppcheck/files/patch-gui_test_benchmark_simple_CMakeLists.txt deleted file mode 100644 index 0bc2b678c1ca..000000000000 --- a/devel/cppcheck/files/patch-gui_test_benchmark_simple_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- gui/test/benchmark/simple/CMakeLists.txt.orig 2022-08-28 12:43:18 UTC -+++ gui/test/benchmark/simple/CMakeLists.txt -@@ -17,7 +17,7 @@ if(tinyxml2_FOUND AND NOT USE_BUNDLED_TINYXML2) - target_link_libraries(benchmark-simple ${PCRE_LIBRARY}) - endif() - if(tinyxml2_FOUND AND NOT USE_BUNDLED_TINYXML2) -- target_link_libraries(benchmark-simple ${tinyxml2_LIBRARIES}) -+ target_link_libraries(benchmark-simple tinyxml2::tinyxml2) - endif() - - if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") diff --git a/devel/cppcheck/files/patch-gui_test_xmlreportv2_CMakeLists.txt b/devel/cppcheck/files/patch-gui_test_xmlreportv2_CMakeLists.txt deleted file mode 100644 index de51aaf9da44..000000000000 --- a/devel/cppcheck/files/patch-gui_test_xmlreportv2_CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ ---- gui/test/xmlreportv2/CMakeLists.txt.orig 2022-08-28 12:43:18 UTC -+++ gui/test/xmlreportv2/CMakeLists.txt -@@ -21,5 +21,5 @@ if(tinyxml2_FOUND AND NOT USE_BUNDLED_TINYXML2) - target_link_libraries(test-xmlreportv2 ${PCRE_LIBRARY}) - endif() - if(tinyxml2_FOUND AND NOT USE_BUNDLED_TINYXML2) -- target_link_libraries(test-xmlreportv2 ${tinyxml2_LIBRARIES}) -+ target_link_libraries(test-xmlreportv2 tinyxml2::tinyxml2) - endif() diff --git a/devel/cppcheck/files/patch-lib_CMakeLists.txt b/devel/cppcheck/files/patch-lib_CMakeLists.txt deleted file mode 100644 index b3bf45f144a5..000000000000 --- a/devel/cppcheck/files/patch-lib_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/CMakeLists.txt.orig 2022-08-28 12:43:18 UTC -+++ lib/CMakeLists.txt -@@ -36,6 +36,8 @@ if(USE_BUNDLED_TINYXML2) - target_include_directories(lib_objs SYSTEM PRIVATE ${PROJECT_SOURCE_DIR}/externals/) - if(USE_BUNDLED_TINYXML2) - target_include_directories(lib_objs SYSTEM PRIVATE ${PROJECT_SOURCE_DIR}/externals/tinyxml2/) -+else() -+ target_link_libraries(lib_objs PRIVATE tinyxml2::tinyxml2) - endif() - target_include_directories(lib_objs SYSTEM PRIVATE ${PROJECT_SOURCE_DIR}/externals/picojson/) - target_include_directories(lib_objs SYSTEM PRIVATE ${PROJECT_SOURCE_DIR}/externals/simplecpp/) diff --git a/devel/cppcheck/files/patch-oss-fuzz_CMakeLists.txt b/devel/cppcheck/files/patch-oss-fuzz_CMakeLists.txt deleted file mode 100644 index cb5b20f0ca8f..000000000000 --- a/devel/cppcheck/files/patch-oss-fuzz_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- oss-fuzz/CMakeLists.txt.orig 2022-08-28 12:43:18 UTC -+++ oss-fuzz/CMakeLists.txt -@@ -22,7 +22,7 @@ if (ENABLE_OSS_FUZZ AND CMAKE_CXX_COMPILER_ID MATCHES - target_link_libraries(fuzz-client PRIVATE ${PCRE_LIBRARY}) - endif() - if(tinyxml2_FOUND AND NOT USE_BUNDLED_TINYXML2) -- target_link_libraries(fuzz-client PRIVATE ${tinyxml2_LIBRARIES}) -+ target_link_libraries(fuzz-client PRIVATE tinyxml2::tinyxml2) - endif() - - add_executable(translate EXCLUDE_FROM_ALL diff --git a/devel/cppcheck/files/patch-test_CMakeLists.txt b/devel/cppcheck/files/patch-test_CMakeLists.txt deleted file mode 100644 index 7ad2144b350f..000000000000 --- a/devel/cppcheck/files/patch-test_CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ ---- test/CMakeLists.txt.orig 2022-08-28 12:43:18 UTC -+++ test/CMakeLists.txt -@@ -23,7 +23,7 @@ if (BUILD_TESTS) - endif() - endif() - if(tinyxml2_FOUND AND NOT USE_BUNDLED_TINYXML2) -- target_link_libraries(testrunner ${tinyxml2_LIBRARIES}) -+ target_link_libraries(testrunner tinyxml2::tinyxml2) - endif() - target_link_libraries(testrunner ${CMAKE_THREAD_LIBS_INIT}) -