cppcheck: fix package (tinyxml2 issue)

[Thomas Klausner <tk%giga.or.at@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <tk%giga.or.at@localhost>
Pushed By:	wiz
Date:		Tue Jun 23 22:52:48 2020 +0200
Changeset:	b00fb3108eedb1f87dc226d2efd2ce8e909e8204

Modified Files:
	cppcheck/Makefile
	cppcheck/PLIST

Log Message:
cppcheck: fix package (tinyxml2 issue)

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=b00fb3108eedb1f87dc226d2efd2ce8e909e8204

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 cppcheck/Makefile |  39 +++++++-----------
 cppcheck/PLIST    | 119 ++++++++++++++++++++++++++++--------------------------
 2 files changed, 76 insertions(+), 82 deletions(-)

diffs:
diff --git a/cppcheck/Makefile b/cppcheck/Makefile
index da3bb7731a..e4e4a85e55 100644
--- a/cppcheck/Makefile
+++ b/cppcheck/Makefile
@@ -15,27 +15,19 @@ BUILD_DEPENDS+=	docbook-xsl-[0-9]*:../../textproc/docbook-xsl
 DEPENDS+=	${PYPKGPREFIX}-pygments-[0-9]*:../../textproc/py-pygments
 
 USE_LANGUAGES=		c c++0x
-#USE_TOOLS+=		gmake
-USE_CMAKE=		yes
+USE_TOOLS+=		gmake
+#USE_CMAKE=		yes
 
-#BUILD_TARGET=		all man
-#BUILD_MAKE_FLAGS+=	DB2MAN=${PREFIX}/share/xsl/docbook/manpages/docbook.xsl
+BUILD_TARGET=		all man
+BUILD_MAKE_FLAGS+=	DB2MAN=${PREFIX}/share/xsl/docbook/manpages/docbook.xsl
 # tell cppcheck where its CPP files are
-#MAKE_FLAGS+=		FILESDIR=${PREFIX}/share/cppcheck
+MAKE_FLAGS+=		FILESDIR=${PREFIX}/share/cppcheck
 # rules support (needs pcre)
-#MAKE_FLAGS+=		HAVE_RULES=yes
-#MAKE_FLAGS+=		USE_Z3=yes
-
-# use pkgsrc tinyxml2 instead of included copy
-#MAKE_FLAGS+=		TINYXML=
-#MAKE_FLAGS+=		INCLUDE_FOR_LIB="-Ilib -isystem externals -isystem externals/simplecpp"
-#MAKE_FLAGS+=		INCLUDE_FOR_CLI="-Ilib -isystem externals/simplecpp"
-#MAKE_FLAGS+=		INCLUDE_FOR_TEST="-Ilib -Icli -isystem externals/simplecpp"
-#CPPFLAGS+=		-I${BUILDLINK_PREFIX.tinyxml2}/include
-#LDFLAGS+=		${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.tinyxml2}/lib -L${BUILDLINK_PREFIX.tinyxml2}/lib -ltinyxml2
-CMAKE_ARGS+=		-DBUILD_TESTS=ON
-CMAKE_ARGS+=		-DHAVE_RULES=ON
-CMAKE_ARGS+=		-DUSE_Z3=ON
+MAKE_FLAGS+=		HAVE_RULES=yes
+MAKE_FLAGS+=		USE_Z3=yes
+#CMAKE_ARGS+=		-DBUILD_TESTS=ON
+#CMAKE_ARGS+=		-DHAVE_RULES=ON
+#CMAKE_ARGS+=		-DUSE_Z3=ON
 
 .include "../../mk/compiler.mk"
 
@@ -43,7 +35,7 @@ CMAKE_ARGS+=		-DUSE_Z3=ON
 CXXFLAGS+= -include lib/cxx11emu.h
 .endif
 
-#INSTALLATION_DIRS+=	${PKGMANDIR}/man1
+INSTALLATION_DIRS+=	${PKGMANDIR}/man1
 
 REPLACE_PYTHON+=	htmlreport/cppcheck-htmlreport
 
@@ -51,13 +43,12 @@ TEST_TARGET=		test
 
 .include "options.mk"
 
-#.PHONY: man-install
-#post-install: man-install
-#man-install:
-#	${INSTALL_DATA} ${WRKSRC}/cppcheck.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+.PHONY: man-install
+post-install: man-install
+man-install:
+	${INSTALL_DATA} ${WRKSRC}/cppcheck.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../lang/python/application.mk"
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../math/z3/buildlink3.mk"
-.include "../../textproc/tinyxml2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cppcheck/PLIST b/cppcheck/PLIST
index 9e0a5b0027..7c67400f73 100644
--- a/cppcheck/PLIST
+++ b/cppcheck/PLIST
@@ -1,59 +1,62 @@
-@comment $NetBSD$
+@comment $NetBSD: PLIST,v 1.8 2020/04/16 21:50:35 wiz Exp $
 bin/cppcheck
-share/Cppcheck/addons/__init__.py
-share/Cppcheck/addons/cert.py
-share/Cppcheck/addons/cppcheckdata.py
-share/Cppcheck/addons/findcasts.py
-share/Cppcheck/addons/misc.py
-share/Cppcheck/addons/misra.py
-share/Cppcheck/addons/naming.py
-share/Cppcheck/addons/namingng.py
-share/Cppcheck/addons/threadsafety.py
-share/Cppcheck/addons/y2038.py
-share/Cppcheck/cfg/avr.cfg
-share/Cppcheck/cfg/boost.cfg
-share/Cppcheck/cfg/bsd.cfg
-share/Cppcheck/cfg/cairo.cfg
-share/Cppcheck/cfg/cppcheck-lib.cfg
-share/Cppcheck/cfg/cppunit.cfg
-share/Cppcheck/cfg/daca.cfg
-share/Cppcheck/cfg/embedded_sql.cfg
-share/Cppcheck/cfg/gnu.cfg
-share/Cppcheck/cfg/googletest.cfg
-share/Cppcheck/cfg/gtk.cfg
-share/Cppcheck/cfg/kde.cfg
-share/Cppcheck/cfg/libcerror.cfg
-share/Cppcheck/cfg/libcurl.cfg
-share/Cppcheck/cfg/libsigc++.cfg
-share/Cppcheck/cfg/lua.cfg
-share/Cppcheck/cfg/mfc.cfg
-share/Cppcheck/cfg/microsoft_atl.cfg
-share/Cppcheck/cfg/microsoft_sal.cfg
-share/Cppcheck/cfg/motif.cfg
-share/Cppcheck/cfg/nspr.cfg
-share/Cppcheck/cfg/opencv2.cfg
-share/Cppcheck/cfg/opengl.cfg
-share/Cppcheck/cfg/openmp.cfg
-share/Cppcheck/cfg/openssl.cfg
-share/Cppcheck/cfg/posix.cfg
-share/Cppcheck/cfg/python.cfg
-share/Cppcheck/cfg/qt.cfg
-share/Cppcheck/cfg/ruby.cfg
-share/Cppcheck/cfg/sdl.cfg
-share/Cppcheck/cfg/sfml.cfg
-share/Cppcheck/cfg/sqlite3.cfg
-share/Cppcheck/cfg/std.cfg
-share/Cppcheck/cfg/tinyxml2.cfg
-share/Cppcheck/cfg/windows.cfg
-share/Cppcheck/cfg/wxwidgets.cfg
-share/Cppcheck/cfg/zlib.cfg
-share/Cppcheck/platforms/aix_ppc64.xml
-share/Cppcheck/platforms/arm32-wchar_t2.xml
-share/Cppcheck/platforms/arm32-wchar_t4.xml
-share/Cppcheck/platforms/arm64-wchar_t2.xml
-share/Cppcheck/platforms/arm64-wchar_t4.xml
-share/Cppcheck/platforms/avr8.xml
-share/Cppcheck/platforms/cray_sv1.xml
-share/Cppcheck/platforms/msp430_eabi_large_datamodel.xml
-share/Cppcheck/platforms/unix32-unsigned.xml
-share/Cppcheck/platforms/unix64-unsigned.xml
+${PLIST.qt5}bin/cppcheck-gui
+bin/cppcheck-htmlreport
+man/man1/cppcheck.1
+share/cppcheck/addons/__init__.py
+share/cppcheck/addons/cert.py
+share/cppcheck/addons/cppcheckdata.py
+share/cppcheck/addons/findcasts.py
+share/cppcheck/addons/misc.py
+share/cppcheck/addons/misra.py
+share/cppcheck/addons/naming.py
+share/cppcheck/addons/namingng.py
+share/cppcheck/addons/threadsafety.py
+share/cppcheck/addons/y2038.py
+share/cppcheck/cfg/avr.cfg
+share/cppcheck/cfg/boost.cfg
+share/cppcheck/cfg/bsd.cfg
+share/cppcheck/cfg/cairo.cfg
+share/cppcheck/cfg/cppcheck-lib.cfg
+share/cppcheck/cfg/cppunit.cfg
+share/cppcheck/cfg/daca.cfg
+share/cppcheck/cfg/embedded_sql.cfg
+share/cppcheck/cfg/gnu.cfg
+share/cppcheck/cfg/googletest.cfg
+share/cppcheck/cfg/gtk.cfg
+share/cppcheck/cfg/kde.cfg
+share/cppcheck/cfg/libcerror.cfg
+share/cppcheck/cfg/libcurl.cfg
+share/cppcheck/cfg/libsigc++.cfg
+share/cppcheck/cfg/lua.cfg
+share/cppcheck/cfg/mfc.cfg
+share/cppcheck/cfg/microsoft_atl.cfg
+share/cppcheck/cfg/microsoft_sal.cfg
+share/cppcheck/cfg/motif.cfg
+share/cppcheck/cfg/nspr.cfg
+share/cppcheck/cfg/opencv2.cfg
+share/cppcheck/cfg/opengl.cfg
+share/cppcheck/cfg/openmp.cfg
+share/cppcheck/cfg/openssl.cfg
+share/cppcheck/cfg/posix.cfg
+share/cppcheck/cfg/python.cfg
+share/cppcheck/cfg/qt.cfg
+share/cppcheck/cfg/ruby.cfg
+share/cppcheck/cfg/sdl.cfg
+share/cppcheck/cfg/sfml.cfg
+share/cppcheck/cfg/sqlite3.cfg
+share/cppcheck/cfg/std.cfg
+share/cppcheck/cfg/tinyxml2.cfg
+share/cppcheck/cfg/windows.cfg
+share/cppcheck/cfg/wxwidgets.cfg
+share/cppcheck/cfg/zlib.cfg
+share/cppcheck/platforms/aix_ppc64.xml
+share/cppcheck/platforms/arm32-wchar_t2.xml
+share/cppcheck/platforms/arm32-wchar_t4.xml
+share/cppcheck/platforms/arm64-wchar_t2.xml
+share/cppcheck/platforms/arm64-wchar_t4.xml
+share/cppcheck/platforms/avr8.xml
+share/cppcheck/platforms/cray_sv1.xml
+share/cppcheck/platforms/msp430_eabi_large_datamodel.xml
+share/cppcheck/platforms/unix32-unsigned.xml
+share/cppcheck/platforms/unix64-unsigned.xml