From owner-svn-ports-all@FreeBSD.ORG Fri Jan 3 15:34:16 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 21C74CE7; Fri, 3 Jan 2014 15:34:16 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 0BD5B1746; Fri, 3 Jan 2014 15:34:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s03FYF1j016210; Fri, 3 Jan 2014 15:34:15 GMT (envelope-from adamw@svn.freebsd.org) Received: (from adamw@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s03FYDCU016195; Fri, 3 Jan 2014 15:34:13 GMT (envelope-from adamw@svn.freebsd.org) Message-Id: <201401031534.s03FYDCU016195@svn.freebsd.org> From: Adam Weinberger Date: Fri, 3 Jan 2014 15:34:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r338548 - in head/benchmarks: blogbench httperf imb nbench netpipe pathchirp pnetmark pybench thrulay ttcp webbench X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 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: Fri, 03 Jan 2014 15:34:16 -0000 Author: adamw Date: Fri Jan 3 15:34:13 2014 New Revision: 338548 URL: http://svnweb.freebsd.org/changeset/ports/338548 Log: Convert benchmarks to PORT_OPTIONS:MDOCS Modified: head/benchmarks/blogbench/Makefile head/benchmarks/httperf/Makefile head/benchmarks/imb/Makefile head/benchmarks/nbench/Makefile head/benchmarks/netpipe/Makefile head/benchmarks/pathchirp/Makefile head/benchmarks/pnetmark/Makefile head/benchmarks/pybench/Makefile head/benchmarks/thrulay/Makefile head/benchmarks/ttcp/Makefile head/benchmarks/webbench/Makefile Modified: head/benchmarks/blogbench/Makefile ============================================================================== --- head/benchmarks/blogbench/Makefile Fri Jan 3 15:26:06 2014 (r338547) +++ head/benchmarks/blogbench/Makefile Fri Jan 3 15:34:13 2014 (r338548) @@ -18,8 +18,11 @@ PLIST_FILES= bin/blogbench PORTDOCS= README NO_STAGE= yes + +.include + post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${DOCSDIR} .endif Modified: head/benchmarks/httperf/Makefile ============================================================================== --- head/benchmarks/httperf/Makefile Fri Jan 3 15:26:06 2014 (r338547) +++ head/benchmarks/httperf/Makefile Fri Jan 3 15:34:13 2014 (r338548) @@ -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 + post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} .for file in ${PORTDOCS} ${INSTALL_MAN} ${WRKSRC}/${file} ${DOCSDIR} Modified: head/benchmarks/imb/Makefile ============================================================================== --- head/benchmarks/imb/Makefile Fri Jan 3 15:26:06 2014 (r338547) +++ head/benchmarks/imb/Makefile Fri Jan 3 15:34:13 2014 (r338548) @@ -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} Modified: head/benchmarks/nbench/Makefile ============================================================================== --- head/benchmarks/nbench/Makefile Fri Jan 3 15:26:06 2014 (r338547) +++ head/benchmarks/nbench/Makefile Fri Jan 3 15:34:13 2014 (r338548) @@ -13,16 +13,13 @@ COMMENT= BYTE Magazine's native benchmar 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 Modified: head/benchmarks/netpipe/Makefile ============================================================================== --- head/benchmarks/netpipe/Makefile Fri Jan 3 15:26:06 2014 (r338547) +++ head/benchmarks/netpipe/Makefile Fri Jan 3 15:34:13 2014 (r338548) @@ -19,6 +19,9 @@ PLIST_FILES= bin/NPtcp bin/NPtcp6 DOCSDIR= ${PREFIX}/share/doc/${PORTNAME:L} NO_STAGE= yes + +.include + 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} Modified: head/benchmarks/pathchirp/Makefile ============================================================================== --- head/benchmarks/pathchirp/Makefile Fri Jan 3 15:26:06 2014 (r338547) +++ head/benchmarks/pathchirp/Makefile Fri Jan 3 15:34:13 2014 (r338548) @@ -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 Modified: head/benchmarks/pnetmark/Makefile ============================================================================== --- head/benchmarks/pnetmark/Makefile Fri Jan 3 15:26:06 2014 (r338547) +++ head/benchmarks/pnetmark/Makefile Fri Jan 3 15:34:13 2014 (r338548) @@ -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} Modified: head/benchmarks/pybench/Makefile ============================================================================== --- head/benchmarks/pybench/Makefile Fri Jan 3 15:26:06 2014 (r338547) +++ head/benchmarks/pybench/Makefile Fri Jan 3 15:34:13 2014 (r338548) @@ -17,6 +17,9 @@ USE_PYTHON= yes PORTDOCS= README NO_STAGE= yes + +.include + 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} Modified: head/benchmarks/thrulay/Makefile ============================================================================== --- head/benchmarks/thrulay/Makefile Fri Jan 3 15:26:06 2014 (r338547) +++ head/benchmarks/thrulay/Makefile Fri Jan 3 15:34:13 2014 (r338548) @@ -23,6 +23,9 @@ MAKE_JOBS_UNSAFE= yes PORTDOCS= ChangeLog README thrulay-protocol.txt thrulay-index.html NO_STAGE= yes + +.include + 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} Modified: head/benchmarks/ttcp/Makefile ============================================================================== --- head/benchmarks/ttcp/Makefile Fri Jan 3 15:26:06 2014 (r338547) +++ head/benchmarks/ttcp/Makefile Fri Jan 3 15:34:13 2014 (r338548) @@ -23,10 +23,13 @@ DIST_SUBDIR= ${PORTNAME} MAN1= ttcp.1 NO_STAGE= yes + +.include + 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 Modified: head/benchmarks/webbench/Makefile ============================================================================== --- head/benchmarks/webbench/Makefile Fri Jan 3 15:26:06 2014 (r338547) +++ head/benchmarks/webbench/Makefile Fri Jan 3 15:34:13 2014 (r338548) @@ -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 + 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}