Index: head/science/meep/Makefile =================================================================== --- head/science/meep/Makefile (revision 326175) +++ head/science/meep/Makefile (revision 326176) @@ -1,54 +1,53 @@ # Created by: Stas Timokhin # $FreeBSD$ PORTNAME= meep -PORTVERSION= 1.1.1 -PORTREVISION= 4 +PORTVERSION= 1.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+= bash:${PORTSDIR}/shells/bash \ harminv:${PORTSDIR}/science/harminv \ gsed:${PORTSDIR}/textproc/gsed LIB_DEPENDS+= guile.21:${PORTSDIR}/lang/guile \ blas.2:${PORTSDIR}/math/blas \ - ctl.4:${PORTSDIR}/science/libctl \ - hdf5.0:${PORTSDIR}/science/hdf5 + ctl.5:${PORTSDIR}/science/libctl \ + hdf5.7:${PORTSDIR}/science/hdf5-18 RUN_DEPENDS+= harminv:${PORTSDIR}/science/harminv USE_GMAKE= yes GNU_CONFIGURE= yes USE_FORTRAN= yes USE_GCC= yes USES= gettext iconv pathfix USE_AUTOTOOLS+= libltdl CPPFLAGS+= -I${LOCALBASE}/include LD_LIBRARY_PATH= -L${LOCALBASE}/lib -L/usr/lib LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ENV+= LD_LIBRARY_PATH="${LD_LIBRARY_PATH}" 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 PLIST_SUB+= MPI="" NOMPI="@comment " .else CONFIGURE_ARGS+=--without-mpi PLIST_SUB+= MPI="@comment " NOMPI="" .endif post-patch: ${REINPLACE_CMD} -e 's+\#\! /bin/sh+\#\! ${PREFIX}/bin/bash+' \ -e s+\$$\(SHELL\)+${PREFIX}/bin/bash+ ${WRKSRC}/configure .include Index: head/science/meep/distinfo =================================================================== --- head/science/meep/distinfo (revision 326175) +++ head/science/meep/distinfo (revision 326176) @@ -1,2 +1,2 @@ -SHA256 (meep-1.1.1.tar.gz) = 7a97b5555da1f9ea2ec6eed5c45bd97bcd6ddbd54bdfc181f46c696dffc169f2 -SIZE (meep-1.1.1.tar.gz) = 751244 +SHA256 (meep-1.2.tar.gz) = 2734737b8053a45942bc1a50933d63b6fd18c7dc3cf33e92e0815ece93138942 +SIZE (meep-1.2.tar.gz) = 807522 Index: head/science/meep/files/patch-configure =================================================================== --- head/science/meep/files/patch-configure (revision 326175) +++ head/science/meep/files/patch-configure (revision 326176) @@ -1,27 +1,51 @@ ---- configure.orig 2009-08-21 16:35:00.000000000 +0000 -+++ configure 2011-06-19 22:08:46.000000000 +0000 -@@ -920,6 +920,7 @@ +--- configure.orig 2012-07-20 08:29:15.000000000 +0700 ++++ configure 2013-04-18 23:46:39.000000000 +0700 +@@ -1,4 +1,4 @@ +-#! /bin/sh ++#! /usr/local/bin/bash + # Guess values for system-dependent variables and create Makefiles. + # Generated by GNU Autoconf 2.69 for meep 1.2. + # +@@ -772,6 +772,7 @@ datadir datarootdir libexecdir +libdatadir sbindir bindir program_transform_name -@@ -1002,6 +1003,7 @@ +@@ -856,6 +857,7 @@ bindir='${exec_prefix}/bin' sbindir='${exec_prefix}/sbin' libexecdir='${exec_prefix}/libexec' +libdatadir='${exec_prefix}/libdata' datarootdir='${prefix}/share' datadir='${datarootdir}' sysconfdir='${prefix}/etc' -@@ -1398,7 +1400,7 @@ +@@ -1247,7 +1249,7 @@ fi # Check all directory arguments for consistency. -for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ +for ac_var in exec_prefix prefix bindir sbindir libexecdir libdatadir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ libdir localedir mandir +@@ -9622,7 +9624,7 @@ + LIBTOOL_DEPS="$ltmain" + + # Always use our own libtool. +-LIBTOOL='$(SHELL) $(top_builddir)/libtool' ++LIBTOOL='/usr/local/bin/bash $(top_builddir)/libtool' + + + +@@ -25552,7 +25554,7 @@ + ACTIVATE_READLINE="$ractivate" + else + ractivate="(use-modules (ice-9 readline)) (activate-readline)" +- if guile -c "$ractivate" >& /dev/null; then ++ if guile -c "$ractivate" > /dev/null 2>&1; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ice-9 readline" >&5 + $as_echo "ice-9 readline" >&6; } + ACTIVATE_READLINE="$ractivate"