svn commit: r393094 - head/science/meep
Thierry Thomas
thierry at FreeBSD.org
Tue Jul 28 19:31:28 UTC 2015
Author: thierry
Date: Tue Jul 28 19:31:27 2015
New Revision: 393094
URL: https://svnweb.freebsd.org/changeset/ports/393094
Log:
Add an option for mpich2, and set de default according the OS version.
Submitted by: Stas Timokhin (maintainer)
Modified:
head/science/meep/Makefile
Modified: head/science/meep/Makefile
==============================================================================
--- head/science/meep/Makefile Tue Jul 28 19:30:53 2015 (r393093)
+++ head/science/meep/Makefile Tue Jul 28 19:31:27 2015 (r393094)
@@ -3,7 +3,7 @@
PORTNAME= meep
PORTVERSION= 1.2.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= science
MASTER_SITES= http://ab-initio.mit.edu/meep/
@@ -25,22 +25,36 @@ CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
MAKE_ARGS+= CC="${CC}" CXX="${CXX}"
-OPTIONS_DEFINE= OPENMPI
-OPTIONS_DEFAULT= OPENMPI
-OPENMPI_DESC= MPI support
-
-.include <bsd.port.options.mk>
-
-.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_ARGS+=--with-mpi
-CONFIGURE_ENV+= MPICXX=${LOCALBASE}/mpi/openmpi/bin/mpiCC
-CFLAGS+= -I${LOCALBASE}/mpi/openmpi/include
-PLIST_SUB+= MPI="" NOMPI="@comment "
+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=""
+CONFIGURE_ARGS+= --without-mpi
+PLIST_SUB+= MPI="@comment " NOMPI=""
.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
More information about the svn-ports-all
mailing list