Index: head/science/meep/Makefile
===================================================================
--- head/science/meep/Makefile	(revision 393476)
+++ head/science/meep/Makefile	(revision 393477)
@@ -1,60 +1,64 @@
 # Created by: Stas Timokhin <devel@stasyan.com>
 # $FreeBSD$
 
 PORTNAME=	meep
 PORTVERSION=	1.2.1
 PORTREVISION=	2
 CATEGORIES=	science
 MASTER_SITES=	http://ab-initio.mit.edu/meep/
 
 MAINTAINER=	devel@stasyan.com
 COMMENT=	FDTD simulation software to model electromagnetic systems
 
 BUILD_DEPENDS=	harminv:${PORTSDIR}/science/harminv \
 		gsed:${PORTSDIR}/textproc/gsed
 LIB_DEPENDS=	libguile-2.0.so:${PORTSDIR}/lang/guile2 \
 		libblas.so:${PORTSDIR}/math/blas \
 		libctl.so:${PORTSDIR}/science/libctl \
 		libhdf5.so:${PORTSDIR}/science/hdf5
 RUN_DEPENDS=	harminv:${PORTSDIR}/science/harminv
 
 GNU_CONFIGURE=	yes
 USE_GCC=	yes
 USES=		fortran gettext gmake iconv libtool pathfix pkgconfig
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 MAKE_ARGS+=	CC="${CC}" CXX="${CXX}"
 
 OPTIONS_RADIO=		MPI
 OPTIONS_RADIO_MPI=	OPENMPI MPICH2
 OPTIONS_DEFAULT=	${MPI_DEFAULT}
 OPENMPI_DESC=		MPI support (with OpenMPI)
 
-OPENMPI_BUILD_DEPENDS=	${LOCALBASE}/mpi/openmpi/bin/mpiCC:${PORTSDIR}/net/openmpi
-OPENMPI_RUN_DEPENDS=	${LOCALBASE}/mpi/openmpi/bin/mpirun:${PORTSDIR}/net/openmpi
-OPENMPI_CONFIGURE_ENV=	MPICXX=${LOCALBASE}/mpi/openmpi/bin/mpiCC
-OPENMPI_CFLAGS=		-I${LOCALBASE}/mpi/openmpi/include
-
-MPICH2_LIB_DEPENDS=	libmpich.so.8:${PORTSDIR}/net/mpich2
-MPICH2_CONFIGURE_ENV=	MPICXX=${LOCALBASE}/bin/mpicc
-MPICH2_CFLAGS=		-I${LOCALBASE}/include
-
 .include <bsd.port.pre.mk>
 
 .if ${OPSYS} == FreeBSD
 .  if ${OSVERSION} < 1000000
 MPI_DEFAULT=	OPENMPI
 .  else
 MPI_DEFAULT=	MPICH2
 .  endif
 .endif
 
 .if ${PORT_OPTIONS:MMPICH2} || ${PORT_OPTIONS:MOPENMPI}
 CONFIGURE_ARGS+=	--with-mpi
 PLIST_SUB+=		MPI="" NOMPI="@comment "
 .else
 CONFIGURE_ARGS+=	--without-mpi
 PLIST_SUB+=		MPI="@comment " NOMPI=""
+.endif
+
+.if ${PORT_OPTIONS:MMPICH2}
+LIB_DEPENDS+=	libmpich.so.8:${PORTSDIR}/net/mpich2
+CONFIGURE_ENV+=	MPICXX=${LOCALBASE}/bin/mpicc
+CFLAGS+=	-I${LOCALBASE}/include
+.endif
+
+.if ${PORT_OPTIONS:MOPENMPI}
+BUILD_DEPENDS+=	${LOCALBASE}/mpi/openmpi/bin/mpiCC:${PORTSDIR}/net/openmpi
+RUN_DEPENDS+=	${LOCALBASE}/mpi/openmpi/bin/mpirun:${PORTSDIR}/net/openmpi
+CONFIGURE_ENV+=	MPICXX=${LOCALBASE}/mpi/openmpi/bin/mpiCC
+CFLAGS+=	-I${LOCALBASE}/mpi/openmpi/include
 .endif
 
 .include <bsd.port.post.mk>