Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 20 Mar 2014 13:15:50 +0000 (UTC)
From:      Pawel Pekala <pawel@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r348683 - head/benchmarks/imb
Message-ID:  <201403201315.s2KDFoqH032072@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pawel
Date: Thu Mar 20 13:15:50 2014
New Revision: 348683
URL: http://svnweb.freebsd.org/changeset/ports/348683
QAT: https://qat.redports.org/buildarchive/r348683/

Log:
  - Convert to new options framework
  - Support staging

Modified:
  head/benchmarks/imb/Makefile

Modified: head/benchmarks/imb/Makefile
==============================================================================
--- head/benchmarks/imb/Makefile	Thu Mar 20 13:10:36 2014	(r348682)
+++ head/benchmarks/imb/Makefile	Thu Mar 20 13:15:50 2014	(r348683)
@@ -24,22 +24,18 @@ ALL_TARGET=	all
 # _really_ want it.
 CFLAGS=		-O3
 
+MAKE_JOBS_UNSAFE=yes
+
+OPTIONS_DEFINE=	CHECK_RESULTS DOCS OPENMPI
+
 # Attention: -DCHECK results are not valid as real benchmark data! Don't
 # forget to deactivate DCHECK and recompile in order to get proper results.
-.if defined(CHECK_RESULTS)
-CFLAGS+=	-DCHECK
-.endif
+CHECK_RESULTS_DESC=	Check results (not valid as real benchmark data)
+CHECK_RESULTS_CFLAGS=	-DCHECK
 
-MAKE_JOBS_UNSAFE=yes
-
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
-.if exists(${LOCALBASE}/mpi/openmpi/bin/mpirun)
-WITH_OPENMPI=	yes
-.endif
-
-.if defined(WITH_OPENMPI)
+.if ${PORT_OPTIONS:MOPENMPI}
 BUILD_DEPENDS+=	${LOCALBASE}/mpi/openmpi/lib/libmpi.so:${PORTSDIR}/net/openmpi
 RUN_DEPENDS+=	${LOCALBASE}/mpi/openmpi/bin/mpirun:${PORTSDIR}/net/openmpi
 MAKE_ENV+=	MPI_HOME=${LOCALBASE}/mpi/openmpi
@@ -50,14 +46,12 @@ MAKE_ENV+=	MPI_HOME=${LOCALBASE}
 .endif
 
 do-install:
-.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}
-	${INSTALL_MAN} ${WRKDIR}/IMB_3.0/license/use-of-trademark-license.txt ${DOCSDIR}
-.endif
-	${INSTALL_PROGRAM} ${WRKSRC}/IMB-EXT ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/IMB-IO ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/IMB-MPI1 ${PREFIX}/bin
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_MAN} ${WRKDIR}/IMB_3.0/doc/IMB_ug-3.0.pdf ${STAGEDIR}${DOCSDIR}
+	${INSTALL_MAN} ${WRKDIR}/IMB_3.0/license/license.txt ${STAGEDIR}${DOCSDIR}
+	${INSTALL_MAN} ${WRKDIR}/IMB_3.0/license/use-of-trademark-license.txt \
+		${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} IMB-EXT IMB-IO IMB-MPI1 \
+		${STAGEDIR}${PREFIX}/bin)
 
 .include <bsd.port.post.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403201315.s2KDFoqH032072>