From owner-svn-ports-all@freebsd.org Tue Jul 28 19:31:28 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CCA639AD840; Tue, 28 Jul 2015 19:31:28 +0000 (UTC) (envelope-from thierry@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A49D715DB; Tue, 28 Jul 2015 19:31:28 +0000 (UTC) (envelope-from thierry@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6SJVSrl090144; Tue, 28 Jul 2015 19:31:28 GMT (envelope-from thierry@FreeBSD.org) Received: (from thierry@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6SJVSVE090143; Tue, 28 Jul 2015 19:31:28 GMT (envelope-from thierry@FreeBSD.org) Message-Id: <201507281931.t6SJVSVE090143@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: thierry set sender to thierry@FreeBSD.org using -f From: Thierry Thomas Date: Tue, 28 Jul 2015 19:31:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r393094 - head/science/meep 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.20 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: Tue, 28 Jul 2015 19:31:28 -0000 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 - -.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 + +.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 +.include