svn commit: r445071 - in head/devel: . cppcheck cppcheck-gui

[Dmitry Marakasov]

Author: amdmi3
Date: Wed Jul  5 10:45:42 2017
New Revision: 445071
URL: https://svnweb.freebsd.org/changeset/ports/445071

Log:
  - Move cppcheck gui into separate port, devel/cppcheck-gui

Added:
  head/devel/cppcheck-gui/
  head/devel/cppcheck-gui/Makefile   (contents, props changed)
  head/devel/cppcheck/pkg-plist-gui   (contents, props changed)
Modified:
  head/devel/Makefile
  head/devel/cppcheck/Makefile
  head/devel/cppcheck/pkg-plist

Modified: head/devel/Makefile
==============================================================================
--- head/devel/Makefile	Wed Jul  5 10:32:13 2017	(r445070)
+++ head/devel/Makefile	Wed Jul  5 10:45:42 2017	(r445071)
@@ -339,6 +339,7 @@
     SUBDIR += cpp-hocon
     SUBDIR += cpp-netlib
     SUBDIR += cppcheck
+    SUBDIR += cppcheck-gui
     SUBDIR += cppi
     SUBDIR += cpprestsdk
     SUBDIR += cpptest

Added: head/devel/cppcheck-gui/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/cppcheck-gui/Makefile	Wed Jul  5 10:45:42 2017	(r445071)
@@ -0,0 +1,8 @@
+# Created by: Dmitry Marakasov <amdmi3 at FreeBSD.org>
+# $FreeBSD$
+
+MASTERDIR=	${.CURDIR}/../cppcheck
+
+GUI_ONLY=	yes
+
+.include "${MASTERDIR}/Makefile"

Modified: head/devel/cppcheck/Makefile
==============================================================================
--- head/devel/cppcheck/Makefile	Wed Jul  5 10:32:13 2017	(r445070)
+++ head/devel/cppcheck/Makefile	Wed Jul  5 10:45:42 2017	(r445071)
@@ -7,18 +7,35 @@ CATEGORIES=	devel
 MASTER_SITES=	SF
 
 MAINTAINER=	amdmi3 at FreeBSD.org
-COMMENT=	Static analysis of C/C++ code
+COMMENT?=	Static analysis of C/C++ code
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_powerpc64=	fails to compile: analyzerinfo.cpp: 'to_string' is not a member of 'std'
 
-USES=		compiler:c++11-lib cmake shebangfix tar:bzip2
-SHEBANG_FILES=	htmlreport/cppcheck-htmlreport
+USES=			compiler:c++11-lib cmake tar:bzip2
 
-OPTIONS_DEFINE=		RULES GUI HTMLREPORT MANPAGES MATCHCOMPILER TEST
-OPTIONS_DEFAULT=	RULES GUI HTMLREPORT MANPAGES MATCHCOMPILER
+.if defined(GUI_ONLY)
+COMMENT=		Static analysis of C/C++ code (GUI)
+
+RUN_DEPENDS=		cppcheck:devel/cppcheck
+
+CMAKE_ARGS=		-DBUILD_GUI=TRUE
+USE_QT4=		corelib gui xml qmake_build moc_build uic_build rcc_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
+
+OPTIONS_DEFINE=		RULES HTMLREPORT MANPAGES MATCHCOMPILER TEST
+OPTIONS_DEFAULT=	RULES HTMLREPORT MANPAGES MATCHCOMPILER
 OPTIONS_SUB=		yes
 
 RULES_DESC=		User-defined rule support (requires PCRE)
@@ -26,9 +43,6 @@ RULES_CMAKE_BOOL=	HAVE_RULES
 RULES_LIB_DEPENDS=	libpcre.so:devel/pcre
 RULES_USES=		localbase:ldflags
 
-GUI_CMAKE_BOOL=		BUILD_GUI
-GUI_USE=		QT4=corelib,gui,xml,qmake_build,moc_build,uic_build,rcc_build,linguisttools_build
-
 TEST_CMAKE_BOOL=	BUILD_TESTS
 
 HTMLREPORT_DESC=	Install cppcheck-htmlreport
@@ -57,5 +71,6 @@ post-install-MANPAGES-on:
 
 do-test-TEST-on:
 	cd ${WRKSRC} && ctest
+.endif
 
 .include <bsd.port.mk>

Modified: head/devel/cppcheck/pkg-plist
==============================================================================
--- head/devel/cppcheck/pkg-plist	Wed Jul  5 10:32:13 2017	(r445070)
+++ head/devel/cppcheck/pkg-plist	Wed Jul  5 10:45:42 2017	(r445071)
@@ -1,20 +1,7 @@
-%%GUI%%bin/cppcheck-gui
 bin/cppcheck
 %%DATADIR%%/avr.cfg
 %%DATADIR%%/gnu.cfg
 %%DATADIR%%/gtk.cfg
-%%GUI%%%%DATADIR%%/lang/cppcheck_de.qm
-%%GUI%%%%DATADIR%%/lang/cppcheck_es.qm
-%%GUI%%%%DATADIR%%/lang/cppcheck_fi.qm
-%%GUI%%%%DATADIR%%/lang/cppcheck_fr.qm
-%%GUI%%%%DATADIR%%/lang/cppcheck_it.qm
-%%GUI%%%%DATADIR%%/lang/cppcheck_ja.qm
-%%GUI%%%%DATADIR%%/lang/cppcheck_ko.qm
-%%GUI%%%%DATADIR%%/lang/cppcheck_nl.qm
-%%GUI%%%%DATADIR%%/lang/cppcheck_ru.qm
-%%GUI%%%%DATADIR%%/lang/cppcheck_sr.qm
-%%GUI%%%%DATADIR%%/lang/cppcheck_sv.qm
-%%GUI%%%%DATADIR%%/lang/cppcheck_zh_CN.qm
 %%DATADIR%%/microsoft_sal.cfg
 %%DATADIR%%/posix.cfg
 %%DATADIR%%/qt.cfg
@@ -24,6 +11,3 @@ bin/cppcheck
 %%DATADIR%%/windows.cfg
 %%DATADIR%%/wxwidgets.cfg
 %%MANPAGES%%man/man1/cppcheck.1.gz
-%%GUI%%share/applications/cppcheck-gui.desktop
-%%GUI%%share/icons/hicolor/64x64/apps/cppcheck-gui.png
-%%GUI%%share/icons/hicolor/scalable/apps/cppcheck-gui.svg

Added: head/devel/cppcheck/pkg-plist-gui
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/cppcheck/pkg-plist-gui	Wed Jul  5 10:45:42 2017	(r445071)
@@ -0,0 +1,16 @@
+bin/cppcheck-gui
+share/applications/cppcheck-gui.desktop
+%%DATADIR%%/lang/cppcheck_de.qm
+%%DATADIR%%/lang/cppcheck_es.qm
+%%DATADIR%%/lang/cppcheck_fi.qm
+%%DATADIR%%/lang/cppcheck_fr.qm
+%%DATADIR%%/lang/cppcheck_it.qm
+%%DATADIR%%/lang/cppcheck_ja.qm
+%%DATADIR%%/lang/cppcheck_ko.qm
+%%DATADIR%%/lang/cppcheck_nl.qm
+%%DATADIR%%/lang/cppcheck_ru.qm
+%%DATADIR%%/lang/cppcheck_sr.qm
+%%DATADIR%%/lang/cppcheck_sv.qm
+%%DATADIR%%/lang/cppcheck_zh_CN.qm
+share/icons/hicolor/64x64/apps/cppcheck-gui.png
+share/icons/hicolor/scalable/apps/cppcheck-gui.svg