diff --git a/devel/cppcheck/Makefile b/devel/cppcheck/Makefile index 0a88619f679c..ed85600175ed 100644 --- a/devel/cppcheck/Makefile +++ b/devel/cppcheck/Makefile @@ -1,81 +1,81 @@ # Created by: Gabor Pali PORTNAME= cppcheck -PORTVERSION= 2.7.3 +PORTVERSION= 2.7.4 PORTREVISION?= 0 # devel/cppcheck-gui CATEGORIES= devel MAINTAINER= amdmi3@FreeBSD.org COMMENT?= Static analysis of C/C++ code LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libtinyxml2.so:textproc/tinyxml2 USES= compiler:c++11-lib cmake:insource tar:bzip2 USE_GITHUB= yes GH_ACCOUNT= danmar CMAKE_OFF= USE_BUNDLED_TINYXML2 .if defined(GUI_ONLY) COMMENT= Static analysis of C/C++ code (GUI) RUN_DEPENDS= cppcheck:devel/cppcheck CMAKE_ON+= BUILD_GUI USES+= qt:5 USE_QT= core gui widgets printsupport help 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-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} && ${SETENV} ${TEST_ENV} ctest .endif .include diff --git a/devel/cppcheck/distinfo b/devel/cppcheck/distinfo index 04a2dfdc2555..8eb872490195 100644 --- a/devel/cppcheck/distinfo +++ b/devel/cppcheck/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1647861496 -SHA256 (danmar-cppcheck-2.7.3_GH0.tar.gz) = edda6dc9627ccb2b0132a2e43e7b7deff47e479ae3dc3af1c1fbc8a66699a113 -SIZE (danmar-cppcheck-2.7.3_GH0.tar.gz) = 3940231 +TIMESTAMP = 1648481335 +SHA256 (danmar-cppcheck-2.7.4_GH0.tar.gz) = f0558c497b7807763325f3a821f1c72b743e5d888b037b8d32157dd07d6c26e1 +SIZE (danmar-cppcheck-2.7.4_GH0.tar.gz) = 3940925 diff --git a/devel/cppcheck/files/patch-cmake_findDependencies.cmake b/devel/cppcheck/files/patch-cmake_findDependencies.cmake deleted file mode 100644 index 123511747c71..000000000000 --- a/devel/cppcheck/files/patch-cmake_findDependencies.cmake +++ /dev/null @@ -1,35 +0,0 @@ ---- cmake/findDependencies.cmake.orig 2022-03-19 11:35:06 UTC -+++ cmake/findDependencies.cmake -@@ -1,15 +1,15 @@ - if (BUILD_GUI) - if (BUILD_TESTS) - if (NOT WITH_QCHART) - find_package(Qt5 COMPONENTS Core Gui Widgets PrintSupport LinguistTools Help Test REQUIRED) - else() - find_package(Qt5 COMPONENTS Core Gui Widgets PrintSupport LinguistTools Help Test Charts REQUIRED) - endif() - else() - if (NOT WITH_QCHART) - find_package(Qt5 COMPONENTS Core Gui Widgets PrintSupport LinguistTools Help REQUIRED) - else() - find_package(Qt5 COMPONENTS Core Gui Widgets PrintSupport LinguistTools Help Charts REQUIRED) - endif() - endif() - endif() -@@ -47,7 +43,7 @@ if (NOT USE_MATCHCOMPILER_OPT MATCHES "Off") - endif() - - if (NOT USE_BUNDLED_TINYXML2) -- find_package(tinyxml2 QUIET) -+ find_package(tinyxml2 REQUIRED) - if (NOT tinyxml2_FOUND) - find_library(tinyxml2_LIBRARIES tinyxml2) - if (NOT tinyxml2_LIBRARIES) -@@ -56,5 +52,7 @@ if (NOT USE_BUNDLED_TINYXML2) - message(STATUS "tinyxml2_LIBRARY: ${tinyxml2_LIBRARY}") - set(tinyxml2_FOUND 1) - endif() -+ else() -+ set(tinyxml2_LIBRARIES tinyxml2::tinyxml2) - endif() - endif()