Convert benchmarks to PORT_OPTIONS:MDOCS

11 files changed, 43 insertions, 33 deletions

diff --git a/benchmarks/blogbench/Makefile b/benchmarks/blogbench/Makefile
index a75e9e1..c17c1e9 100644
--- a/benchmarks/blogbench/Makefile
+++ b/benchmarks/blogbench/Makefile
@@ -18,8 +18,11 @@ PLIST_FILES=	bin/blogbench
 PORTDOCS=	README
 
 NO_STAGE=	yes
+
+.include <bsd.port.options.mk>
+
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${DOCSDIR}
 .endif
diff --git a/benchmarks/httperf/Makefile b/benchmarks/httperf/Makefile
index 0c0170b..bb058ec 100644
--- a/benchmarks/httperf/Makefile
+++ b/benchmarks/httperf/Makefile
@@ -18,14 +18,15 @@ MAKE_ARGS=	LIBUTIL_OBJS=ssl_writev.o \
 		exec_prefix=${PREFIX}
 
 PLIST_FILES=	bin/httperf
-.if !defined(NOPORTDOCS)
 PORTDOCS=	ChangeLog NEWS README TODO
-.endif
 MAN1=		httperf.1
 
 NO_STAGE=	yes
+
+.include <bsd.port.options.mk>
+
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 .for file in ${PORTDOCS}
 	${INSTALL_MAN} ${WRKSRC}/${file} ${DOCSDIR}
diff --git a/benchmarks/imb/Makefile b/benchmarks/imb/Makefile
index 29bf301..6705a52 100644
--- a/benchmarks/imb/Makefile
+++ b/benchmarks/imb/Makefile
@@ -48,7 +48,7 @@ MAKE_ENV+=	MPI_HOME=${LOCALBASE}
 .endif
 
 do-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_MAN} ${WRKDIR}/IMB_3.0/doc/IMB_ug-3.0.pdf ${DOCSDIR}
 	${INSTALL_MAN} ${WRKDIR}/IMB_3.0/license/license.txt ${DOCSDIR}
diff --git a/benchmarks/nbench/Makefile b/benchmarks/nbench/Makefile
index 34b2c4d..5353696 100644
--- a/benchmarks/nbench/Makefile
+++ b/benchmarks/nbench/Makefile
@@ -13,16 +13,13 @@ COMMENT=	BYTE Magazine's native benchmarks
 ALL_TARGET=	# empty
 MAKE_JOBS_UNSAFE=	yes
 
-NO_STAGE=	yes
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/nbench ${PREFIX}/bin
-	@${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/NNET.DAT ${DATADIR}
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/nbench ${STAGEDIR}${PREFIX}/bin
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/NNET.DAT ${STAGEDIR}${DATADIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in README README.submit RESULTS bdoc.txt
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
 .include <bsd.port.mk>
diff --git a/benchmarks/netpipe/Makefile b/benchmarks/netpipe/Makefile
index 601be90..3b59dca 100644
--- a/benchmarks/netpipe/Makefile
+++ b/benchmarks/netpipe/Makefile
@@ -19,6 +19,9 @@ PLIST_FILES=	bin/NPtcp bin/NPtcp6
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME:L}
 
 NO_STAGE=	yes
+
+.include <bsd.port.options.mk>
+
 do-build:
 	cd ${WRKSRC} \
 		&& ${CC} ${CFLAGS} src/netpipe.c src/tcp.c -DTCP -o NPtcp \
@@ -28,7 +31,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/NPtcp ${PREFIX}/bin/NPtcp
 	${INSTALL_PROGRAM} ${WRKSRC}/NPtcp6 ${PREFIX}/bin/NPtcp6
 	${INSTALL_MAN} ${WRKSRC}/dox/netpipe.1 ${MANPREFIX}/man/man1
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 .for doc in ${PORTDOCS}
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/dox/${doc} ${DOCSDIR}
diff --git a/benchmarks/pathchirp/Makefile b/benchmarks/pathchirp/Makefile
index a73a4b1..a578c28 100644
--- a/benchmarks/pathchirp/Makefile
+++ b/benchmarks/pathchirp/Makefile
@@ -17,18 +17,14 @@ MAKE_JOBS_UNSAFE=	yes
 PLIST_FILES=	bin/pathchirp_rcv bin/pathchirp_snd bin/pathchirp_run
 PORTDOCS=	README
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e '/CFLAGS.*O4/d' ${WRKSRC}/configure
 
 do-install:
 .for f in rcv snd run
-	${INSTALL_PROGRAM} ${WRKSRC}/Bin/${ARCH}/${PORTNAME}_${f} ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/Bin/${ARCH}/${PORTNAME}_${f} ${STAGEDIR}${PREFIX}/bin
 .endfor
-
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${DOCSDIR}
-.endif
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/benchmarks/pnetmark/Makefile b/benchmarks/pnetmark/Makefile
index e13fbdf..882f257 100644
--- a/benchmarks/pnetmark/Makefile
+++ b/benchmarks/pnetmark/Makefile
@@ -32,7 +32,7 @@ do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/src/pnetmark.exe ${PREFIX}/bin
 	@${INSTALL_PROGRAM} ${WRKSRC}/linpack/linpack.exe ${PREFIX}/bin
 	@${INSTALL_PROGRAM} ${WRKSRC}/scimark2/scimark2.exe ${PREFIX}/bin
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 .for docfile in ${PORTDOCS}
 	@${INSTALL_DATA} ${WRKSRC}/doc/${docfile} ${DOCSDIR}
diff --git a/benchmarks/pybench/Makefile b/benchmarks/pybench/Makefile
index dc1059e..0dd4fa9 100644
--- a/benchmarks/pybench/Makefile
+++ b/benchmarks/pybench/Makefile
@@ -17,6 +17,9 @@ USE_PYTHON=	yes
 PORTDOCS=	README
 
 NO_STAGE=	yes
+
+.include <bsd.port.options.mk>
+
 do-build:
 	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}
 	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}
@@ -27,7 +30,7 @@ do-install:
 		| (cd ${DATADIR} && ${TAR} --unlink -x -f -)
 	@${PRINTF} '#!/bin/sh\n${PYTHON_CMD} ${DATADIR}/pybench.py "$$@"\n' \
 		> ${WRKDIR}/pybench.sh
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 .for docs in ${PORTDOCS}
 	@${INSTALL_DATA} ${WRKSRC}/${docs} ${DOCSDIR}
diff --git a/benchmarks/thrulay/Makefile b/benchmarks/thrulay/Makefile
index a242143..b03a710 100644
--- a/benchmarks/thrulay/Makefile
+++ b/benchmarks/thrulay/Makefile
@@ -23,6 +23,9 @@ MAKE_JOBS_UNSAFE=	yes
 PORTDOCS=	ChangeLog README thrulay-protocol.txt thrulay-index.html
 
 NO_STAGE=	yes
+
+.include <bsd.port.options.mk>
+
 post-patch:
 	${REINPLACE_CMD} -e '922s,datarootdir,prefix,g' ${WRKSRC}/configure
 
@@ -30,7 +33,7 @@ post-extract:
 	@${CP} ${WRKSRC}/doc/*.[ht]* ${WRKSRC}/
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 .for docs in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${docs} ${DOCSDIR}
diff --git a/benchmarks/ttcp/Makefile b/benchmarks/ttcp/Makefile
index 1039473..9ee4d02 100644
--- a/benchmarks/ttcp/Makefile
+++ b/benchmarks/ttcp/Makefile
@@ -23,10 +23,13 @@ DIST_SUBDIR=	${PORTNAME}
 MAN1=		ttcp.1
 
 NO_STAGE=	yes
+
+.include <bsd.port.options.mk>
+
 post-extract:
-	${CP} ${DISTDIR}/${DIST_SUBDIR}/ttcp.c ${WRKSRC}/
-	${CP} ${DISTDIR}/${DIST_SUBDIR}/ttcp.1 ${WRKSRC}/
-	${CP} ${DISTDIR}/${DIST_SUBDIR}/README ${WRKSRC}/
+	${CP} ${DISTDIR}/${DIST_SUBDIR}/ttcp.c ${WRKSRC}
+	${CP} ${DISTDIR}/${DIST_SUBDIR}/ttcp.1 ${WRKSRC}
+	${CP} ${DISTDIR}/${DIST_SUBDIR}/README ${WRKSRC}
 
 do-build:
 	${CC} ${CFLAGS} -o ${WRKSRC}/ttcp ${WRKSRC}/ttcp.c
@@ -34,9 +37,9 @@ do-build:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ttcp ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/ttcp.1 ${PREFIX}/man/man1
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}/
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/benchmarks/webbench/Makefile b/benchmarks/webbench/Makefile
index 042e873..986c467 100644
--- a/benchmarks/webbench/Makefile
+++ b/benchmarks/webbench/Makefile
@@ -16,19 +16,20 @@ MAKE_ARGS+=	CFLAGS="${CPPFLAGS} ${CFLAGS}"
 MAN1=		webbench.1
 .endif
 
-.if !defined(NOPORTDOCS)
 PORTDOCS=	copyright changelog
-.endif
 
 PLIST_FILES=	bin/webbench
 
 NO_STAGE=	yes
+
+.include <bsd.port.options.mk>
+
 do-install:
 		${INSTALL_PROGRAM} ${WRKSRC}/webbench ${PREFIX}/bin
 .if !defined(NO_INSTALL_MANPAGES)
 		${INSTALL_MAN} ${WRKSRC}/webbench.1 ${MAN1PREFIX}/man/man1
 .endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 		${MKDIR} ${DOCSDIR}
 		${INSTALL_DATA} ${WRKSRC}/debian/copyright ${DOCSDIR}
 		${INSTALL_DATA} ${WRKSRC}/debian/changelog ${DOCSDIR}