Index: head/benchmarks/imb/Makefile
===================================================================
--- head/benchmarks/imb/Makefile	(revision 348682)
+++ head/benchmarks/imb/Makefile	(revision 348683)
@@ -1,63 +1,57 @@
 # Created by: trasz <trasz@pin.if.uz.zgora.pl>
 # $FreeBSD$
 
 PORTNAME=	imb
 PORTVERSION=	3.0
 PORTREVISION=	6
 CATEGORIES=	benchmarks parallel
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://cache-www.intel.com/cd/00/00/32/71/
 MASTER_SITE_SUBDIR=	itetcu
 DISTNAME=	327191_327191
 EXTRACT_SUFX=	.gz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Intel MPI Benchmark
 
 WRKSRC=		${WRKDIR}/IMB_3.0/src/
 USES=		dos2unix gmake
 MAKEFILE=	make_mpich
 ALL_TARGET=	all
 # Intel hardcodes -O3 in make_mpich.  Replacing it with system defaults
 # would make it impossible to compare benchmark results with other systems.
 # By putting it here we make it easier for somebody to change it, if they
 # _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
 .else
 BUILD_DEPENDS+=	${LOCALBASE}/bin/mpicc:${PORTSDIR}/net/mpich2
 RUN_DEPENDS+=	${LOCALBASE}/bin/mpirun:${PORTSDIR}/net/mpich2
 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>