From owner-svn-ports-all@FreeBSD.ORG Tue Aug 5 14:34:12 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 411E8BFF for ; Tue, 5 Aug 2014 14:34:12 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1167425CC for ; Tue, 5 Aug 2014 14:34:12 +0000 (UTC) Received: from wg (uid 1317) (envelope-from wg@FreeBSD.org) id 5fa1 by svn.freebsd.org (DragonFly Mail Agent v0.9+); Tue, 05 Aug 2014 14:34:11 +0000 From: William Grzybowski Date: Tue, 5 Aug 2014 14:34:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r364107 - in head/devel/covtool: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <53e0eb64.5fa1.913eb2d@svn.freebsd.org> X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Aug 2014 14:34:12 -0000 Author: wg Date: Tue Aug 5 14:34:10 2014 New Revision: 364107 URL: http://svnweb.freebsd.org/changeset/ports/364107 QAT: https://qat.redports.org/buildarchive/r364107/ Log: devel/covtool: support stage and unbreak Added: head/devel/covtool/files/patch-covmerge.c (contents, props changed) head/devel/covtool/files/patch-covstream.c (contents, props changed) Modified: head/devel/covtool/Makefile head/devel/covtool/pkg-plist Modified: head/devel/covtool/Makefile ============================================================================== --- head/devel/covtool/Makefile Tue Aug 5 14:31:03 2014 (r364106) +++ head/devel/covtool/Makefile Tue Aug 5 14:34:10 2014 (r364107) @@ -7,21 +7,15 @@ PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/rel_2.0 -MAINTAINER= ports@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= C++ test coverage analyzer WRKSRC= ${WRKDIR} USES= gmake zip USE_GCC= yes MAKEFILE= makefile +MAKE_ARGS= CC=${CXX} LN=${CXX} INSTALL_DIR=${STAGEDIR}${PREFIX} -MAN1= cov++.1 \ - covannotate.1 \ - covmerge.1 \ - covtool.1 \ - gen_html.1 - -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ -e 's|%%PORTNAME%%|${PORTNAME}|g' ${WRKSRC}/cov++ @@ -29,11 +23,8 @@ post-patch: ${WRKSRC}/rules.FreeBSD post-install: - @${INSTALL_MAN} ${MAN1:S,^,${WRKSRC}/man/man1/,} \ - ${MANPREFIX}/man/man1/ - @${INSTALL_DATA} ${WRKSRC}/cov++.cfg ${PREFIX}/etc/cov++.cfg.sample - @if [ ! -f ${PREFIX}/etc/cov++.cfg ]; then \ - ${CP} -p ${PREFIX}/etc/cov++.cfg.sample ${PREFIX}/etc/cov++.cfg ; \ - fi + ${INSTALL_MAN} ${WRKSRC}/man/man1/*.1 \ + ${STAGEDIR}${MANPREFIX}/man/man1/ + ${INSTALL_DATA} ${WRKSRC}/cov++.cfg ${STAGEDIR}${PREFIX}/etc/cov++.cfg.sample .include Added: head/devel/covtool/files/patch-covmerge.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/covtool/files/patch-covmerge.c Tue Aug 5 14:34:10 2014 (r364107) @@ -0,0 +1,10 @@ +--- covmerge.c.orig 2014-08-05 11:26:54.373266288 -0300 ++++ covmerge.c 2014-08-05 11:27:07.809636312 -0300 +@@ -18,6 +18,7 @@ + + + #include ++#include + + + // Added: head/devel/covtool/files/patch-covstream.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/covtool/files/patch-covstream.c Tue Aug 5 14:34:10 2014 (r364107) @@ -0,0 +1,10 @@ +--- covstream.c.orig 2014-08-05 11:23:02.593282007 -0300 ++++ covstream.c 2014-08-05 11:23:04.274285503 -0300 +@@ -35,6 +35,7 @@ + #include + #include + #include ++#include + + using namespace std; + Modified: head/devel/covtool/pkg-plist ============================================================================== --- head/devel/covtool/pkg-plist Tue Aug 5 14:31:03 2014 (r364106) +++ head/devel/covtool/pkg-plist Tue Aug 5 14:34:10 2014 (r364107) @@ -3,12 +3,15 @@ bin/covmerge bin/covannotate bin/cov++ bin/gen_html -@unexec if cmp -s %D/etc/cov++.cfg.sample %D/etc/cov++.cfg; then rm -f %D/etc/cov++.cfg; fi -etc/cov++.cfg.sample -@exec if [ ! -f %D/etc/cov++.cfg ] ; then cp -p %D/%F %B/cov++.cfg; fi +@sample etc/cov++.cfg.sample libexec/covtool/covtoolhelper.o libexec/covtool/covtoolhelper_debug.o libexec/covtool/covtoolhelper.c +man/man1/cov++.1.gz +man/man1/covannotate.1.gz +man/man1/covmerge.1.gz +man/man1/covtool.1.gz +man/man1/gen_html.1.gz %%DATADIR%%/README %%DATADIR%%/COPYRIGHT %%DATADIR%%/covtool_version