Commit a3099719 authored by Dmitry Marakasov's avatar Dmitry Marakasov
Browse files

devel/cppcheck: update 2.7.5 → 2.9.1 

- Merge cppcheck-gui into cppcheck to simplify maintenance and testing
- Install manpage into canonical location

PR:		267262
Submitted by:	jailbird@fdf.net
parent 6a63367a

MOVED

+1 −0
Original line number Diff line number Diff line
@@ -17605,3 +17605,4 @@ devel/py-pyxdg|devel/py-xdg|2022-10-28|Remove duplicate port 
lang/chicken5|lang/chicken|2022-10-30|Has expired: Please use lang/chicken instead

devel/py-spyder|devel/spyder|2022-11-06|Spyder is an application, and not a library

www/grafana7||2022-11-07|Has expired: EOLed upstream, unfixed vulnerabilities

devel/cppcheck-gui|devel/cppcheck|2022-11-07|GUI is now included in devel/cppcheck port

devel/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -430,7 +430,6 @@ 
    SUBDIR += cpp-netlib

    SUBDIR += cpp2py

    SUBDIR += cppcheck

    SUBDIR += cppcheck-gui

    SUBDIR += cppi

    SUBDIR += cpplint

    SUBDIR += cpprestsdk

devel/cppcheck-gui/Makefile

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
PORTREVISION=	0



MASTERDIR=	${.CURDIR}/../cppcheck



GUI_ONLY=	yes



.include "${MASTERDIR}/Makefile"

devel/cppcheck/Makefile

+22 −29
Original line number Diff line number Diff line 
PORTNAME=	cppcheck

PORTVERSION=	2.7.5

PORTREVISION?=	0	# devel/cppcheck-gui

PORTVERSION=	2.9.1

CATEGORIES=	devel



MAINTAINER=	amdmi3@FreeBSD.org

COMMENT?=	Tool for static C/C++ code analysis

COMMENT=	Tool for static C/C++ code analysis

WWW=		https://cppcheck.sourceforge.io/



LICENSE=	GPLv3+
@@ -12,34 +11,16 @@ LICENSE_FILE= ${WRKSRC}/COPYING 


LIB_DEPENDS=	libtinyxml2.so:textproc/tinyxml2



USES=		compiler:c++11-lib cmake:insource tar:bzip2

USES=		compiler:c++11-lib cmake shebangfix 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

CMAKE_OFF=	USE_BUNDLED_TINYXML2



PORTDATA=		*



OPTIONS_DEFINE=		RULES HTMLREPORT MANPAGES MATCHCOMPILER TEST

OPTIONS_DEFAULT=	RULES HTMLREPORT MANPAGES MATCHCOMPILER

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)
@@ -48,6 +29,8 @@ 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}
@@ -59,10 +42,21 @@ 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_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
@@ -71,10 +65,9 @@ post-build-MANPAGES-on: 
		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl cppcheck.1.xml



post-install-MANPAGES-on:

	${INSTALL_MAN} ${WRKSRC}/man/cppcheck.1 ${STAGEDIR}${PREFIX}/man/man1

	${INSTALL_MAN} ${WRKSRC}/man/cppcheck.1 ${STAGEDIR}${PREFIX}/share/man/man1



do-test-TEST-on:

	cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ctest

.endif

	cd ${BUILD_WRKSRC} && ${SETENV} ${TEST_ENV} ctest



.include <bsd.port.mk>

devel/cppcheck/distinfo

+3 −3
Original line number Diff line number Diff line 
TIMESTAMP = 1650279480

SHA256 (danmar-cppcheck-2.7.5_GH0.tar.gz) = 6c7ac29e57fa8b3ac7be224510200e579d5a90217e2152591ef46ffc947d8f78

SIZE (danmar-cppcheck-2.7.5_GH0.tar.gz) = 3940968
 
TIMESTAMP = 1667826946

SHA256 (danmar-cppcheck-2.9.1_GH0.tar.gz) = 41059bbb314167df5fd4751fc7c6eae1f14c1d233221b91fcb927d71ba0f2ae5

SIZE (danmar-cppcheck-2.9.1_GH0.tar.gz) = 5471242