From 90d35aefe8a7d51492ad71963a095e2a2647fda2 Mon Sep 17 00:00:00 2001
From: William Grzybowski <wg@FreeBSD.org>
Date: Tue, 5 Aug 2014 14:34:10 +0000
Subject: [PATCH] devel/covtool: support stage and unbreak

---
 devel/covtool/Makefile                | 19 +++++--------------
 devel/covtool/files/patch-covmerge.c  | 10 ++++++++++
 devel/covtool/files/patch-covstream.c | 10 ++++++++++
 devel/covtool/pkg-plist               |  9 ++++++---
 4 files changed, 31 insertions(+), 17 deletions(-)
 create mode 100644 devel/covtool/files/patch-covmerge.c
 create mode 100644 devel/covtool/files/patch-covstream.c

diff --git a/devel/covtool/Makefile b/devel/covtool/Makefile
index dbca046772c9..ffccbc45ff3f 100644
--- a/devel/covtool/Makefile
+++ b/devel/covtool/Makefile
@@ -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 <bsd.port.mk>
diff --git a/devel/covtool/files/patch-covmerge.c b/devel/covtool/files/patch-covmerge.c
new file mode 100644
index 000000000000..d9b4e980a820
--- /dev/null
+++ b/devel/covtool/files/patch-covmerge.c
@@ -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 <read_database.h>
++#include <stdlib.h>
+ 
+ 
+ //
diff --git a/devel/covtool/files/patch-covstream.c b/devel/covtool/files/patch-covstream.c
new file mode 100644
index 000000000000..c3c364e89b8c
--- /dev/null
+++ b/devel/covtool/files/patch-covstream.c
@@ -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 <iostream>
+ #include <unistd.h>
+ #include <algorithm>
++#include <string.h>
+ 
+ using namespace std;
+ 
diff --git a/devel/covtool/pkg-plist b/devel/covtool/pkg-plist
index 6712351ba303..c4f35545b4f6 100644
--- a/devel/covtool/pkg-plist
+++ b/devel/covtool/pkg-plist
@@ -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