From owner-svn-ports-head@freebsd.org Mon Nov 23 20:24:28 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 32AD5A362B2; Mon, 23 Nov 2015 20:24:28 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 03DFF1D78; Mon, 23 Nov 2015 20:24:27 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tANKORsZ006916; Mon, 23 Nov 2015 20:24:27 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tANKORfw006914; Mon, 23 Nov 2015 20:24:27 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201511232024.tANKORfw006914@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 23 Nov 2015 20:24:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r402326 - head/devel/cppcheck X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Nov 2015 20:24:28 -0000 Author: amdmi3 Date: Mon Nov 23 20:24:26 2015 New Revision: 402326 URL: https://svnweb.freebsd.org/changeset/ports/402326 Log: - Update to 1.70 - Use options helpers - Use test framework PR: 204325 Submitted by: amdmi3 Approved by: maintainer timeout (bf, 2 weeks) Modified: head/devel/cppcheck/Makefile head/devel/cppcheck/distinfo Modified: head/devel/cppcheck/Makefile ============================================================================== --- head/devel/cppcheck/Makefile Mon Nov 23 20:06:09 2015 (r402325) +++ head/devel/cppcheck/Makefile Mon Nov 23 20:24:26 2015 (r402326) @@ -2,14 +2,14 @@ # $FreeBSD$ PORTNAME= cppcheck -PORTVERSION= 1.69 +PORTVERSION= 1.70 CATEGORIES= devel MASTER_SITES= SF MAINTAINER= bf@FreeBSD.org COMMENT= Static analysis of C/C++ code -LICENSE= GPLv3 +LICENSE= GPLv3 # or later LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libtinyxml2.so:${PORTSDIR}/textproc/tinyxml2 @@ -17,8 +17,12 @@ LIB_DEPENDS= libtinyxml2.so:${PORTSDIR}/ USES= compiler:c++11-lib execinfo gmake tar:bzip2 ALL_TARGET= cppcheck +TEST_TARGET= test LDFLAGS+= -L${LOCALBASE}/lib -lexecinfo -MAKE_ENV+= TINYXML=-ltinyxml2 +MAKE_ENV+= TINYXML=-ltinyxml2 CFGDIR="${DATADIR}/cfg" + +PLIST_FILES= bin/cppcheck bin/cppcheck-htmlreport +PORTDATA= * OPTIONS_DEFINE= MATCHCOMPILER RULES MANPAGES OPTIONS_DEFAULT= MATCHCOMPILER RULES MANPAGES @@ -26,63 +30,46 @@ OPTIONS_DEFAULT= MATCHCOMPILER RULES MAN MATCHCOMPILER_DESC= Build-time optimizations via Python RULES_DESC= User-defined rule support (requires PCRE) -PLIST_FILES= bin/cppcheck bin/cppcheck-htmlreport +MANPAGES_ALL_TARGET= man +MANPAGES_BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt \ + ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl +MANPAGES_MAKE_ENV= DB2MAN="${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl" +MANPAGES_PLIST_FILES= man/man1/cppcheck.1.gz -.include +MATCHCOMPILER_MAKE_ENV= SRCDIR=build +MATCHCOMPILER_USES= python:2,build -MAKE_ENV+= CFGDIR="${DATADIR}/cfg" -PORTDATA= * - -.if ${PORT_OPTIONS:MMANPAGES} -ALL_TARGET+= man -BUILD_DEPENDS+= xsltproc:${PORTSDIR}/textproc/libxslt \ - ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl -MAKE_ENV+= DB2MAN="${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl" - -PLIST_FILES+= man/man1/cppcheck.1.gz - -post-install: - @${INSTALL_MAN} ${WRKSRC}/cppcheck.1 ${STAGEDIR}${PREFIX}/man/man1 -.endif - -.if ${PORT_OPTIONS:MMATCHCOMPILER} -MAKE_ENV+= SRCDIR=build -USES+= python:2,build -.endif - -.if ${PORT_OPTIONS:MRULES} -LIB_DEPENDS+= libpcre.so:${PORTSDIR}/devel/pcre -MAKE_ENV+= HAVE_RULES=yes -.endif +RULES_LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre +RULES_MAKE_ENV= HAVE_RULES=yes post-patch: @${REINPLACE_CMD} \ -e 's|-Iexternals/tinyxml|-I${LOCALBASE}/include|' \ ${WRKSRC}/Makefile -.if ${PORT_OPTIONS:MMANPAGES} + +post-patch-MANPAGES-on: @${REINPLACE_CMD} -e '\|DB2MAN=|d' \ ${WRKSRC}/Makefile -.endif -.if ${PORT_OPTIONS:MMATCHCOMPILER} + +post-patch-MATCHCOMPILER-on: @${REINPLACE_CMD} -e 's|python|${PYTHON_CMD}|' \ ${WRKSRC}/Makefile -.endif -.if ${PORT_OPTIONS:MRULES} + +post-patch-RULES-on: @${REINPLACE_CMD} \ -e '\|CXXFLAGS +=| \ s| -DTIXML_USE_STL $$(shell pcre-config --cflags)||' \ -e '\|$$(SRCDIR)/cppcheck.cpp| \ s|$${INCLUDE_FOR_LIB}|& $$(shell pcre-config --cflags)|' \ ${WRKSRC}/Makefile -.endif do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/cppcheck ${STAGEDIR}${PREFIX}/bin - @${INSTALL_SCRIPT} ${WRKSRC}/htmlreport/cppcheck-htmlreport ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/cppcheck ${STAGEDIR}${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/htmlreport/cppcheck-htmlreport ${STAGEDIR}${PREFIX}/bin @${MKDIR} ${STAGEDIR}${DATADIR}/cfg @cd ${WRKSRC}/cfg; ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/cfg/ -check regression-test test: build - @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test +do-install-MANPAGES-on: + ${INSTALL_MAN} ${WRKSRC}/cppcheck.1 ${STAGEDIR}${PREFIX}/man/man1 .include Modified: head/devel/cppcheck/distinfo ============================================================================== --- head/devel/cppcheck/distinfo Mon Nov 23 20:06:09 2015 (r402325) +++ head/devel/cppcheck/distinfo Mon Nov 23 20:24:26 2015 (r402326) @@ -1,2 +1,2 @@ -SHA256 (cppcheck-1.69.tar.bz2) = 4bd5c8031258ef29764a4c92666384238a625beecbb2aceeb7065ec388c7532e -SIZE (cppcheck-1.69.tar.bz2) = 1052984 +SHA256 (cppcheck-1.70.tar.bz2) = c6aaafd41b4c2050f3fb96a4aa159507007403a163d05361bd9544e5baf18f39 +SIZE (cppcheck-1.70.tar.bz2) = 1111291