academic/meep: Updated for version 1.14.

Signed-off-by: Dave Woodfall <dave@slackbuilds.org>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 62 insertions, 23 deletions

diff --git a/academic/meep/README b/academic/meep/README
index 9baddd56dd3a..7c2f438e1de1 100644
--- a/academic/meep/README
+++ b/academic/meep/README
@@ -1,14 +1,42 @@
 meep (electromagnetic FDTD solver)
 
-Meep is a free and open-source software package for
-electromagnetics simulation via the finite-difference
-time-domain (FDTD) method spanning a broad range of
-applications.
+Meep is a free and open-source software package for electromagnetics 
+simulation via the finite-difference time-domain (FDTD) method spanning 
+a broad range of applications. It saves results in hdf5 format.
 
-You may wish to preinstall: harminv, mpb
+This package requires: hdf5, libctl, lapack, mpb
+
+You probably will also want to preinstall: harminv
 
 You may wish to also install: h5utils
 
-If the build script can find the ATLAS libraries, it will
-adapt the configure options to use them rather than the
-default lapack.
+You very probably want to build a multi-processor version of this 
+code by adding the "--with-openmp" configure option. Here, mpb is 
+specified as a prerequisite since at the present time the python 
+interface will not build without it.
+
+
+
+Configuration:
+
+If the build script can find the ATLAS libraries, it will adapt the configure 
+options to use them, rather than the the default choice of lapack. 
+
+You can add additional options to the command line using the environment 
+variable SBOPTIONS_MEEP; e.g. to enable MPI (multi-processor calculation) 
+using openmp, use:
+
+SBOPTIONS_MEEP="--with-openmp" ./meep.Slackbuild
+
+Alternatively, if building non-interactively (e.g. if using slpkg), use/create  
+the file /etc/sbo_pkg_options.conf since this slackbuild script will search it 
+for options. Simply include a line starting "meep:" followed by options, e.g.:
+
+meep: --with-openmp
+
+Currently, building the python support for meep can be problematic unless 
+the mpb package is also installed; if you do so, and (e.g.) use openmp, it is 
+best to build mpb with the same option. You may also need to install mpi4py
+using pip.  If you do not want python support, specify "--without-python", 
+and in this case installing mpb is not necessary.
+
diff --git a/academic/meep/meep.SlackBuild b/academic/meep/meep.SlackBuild
index 347fb3f9aef2..bb3cb854d2b1 100644
--- a/academic/meep/meep.SlackBuild
+++ b/academic/meep/meep.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=meep
-VERSION=${VERSION:-1.12.0}
+VERSION=${VERSION:-1.14}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -74,13 +74,29 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-LOCALCONFIGS=" --without-python --with-mpi "
+# if there is no configure script, try to build one!
+if [ ! -f ./configure ] ; then 
+  ./autogen.sh
+fi
+
+
+LOCALCONFIGS=
+XDBFILE=/etc/sbo_pkg_options.conf
+if [ -f ${XDBFILE} ] ; then 
+  LOCALCONFIGS=${LOCALCONFIGS}" "$(grep "^${PRGNAM}:" ${XDBFILE} | grep -v '^#' | awk -F: '{print$2}') 
+  echo Build options selected by file: LOCALCONFIGS=${LOCALCONFIGS}
+fi
+if [  -n "${SBOPTIONS_MEEP}" ] ; then
+  LOCALCONFIGS=${LOCALCONFIGS}" "${SBOPTIONS_MEEP}
+  echo Build options selected by environment: LOCALCONFIGS=${LOCALCONFIGS}
+fi
 
-# check for the Atlas replacement for blas; if the libraries are found,
+  
+# check for the Atlas replacement for blas; if the libraries are found, 
 #  add the configure option accordingly
 
-if [ -f /usr/lib${LIBDIRSUFFIX}/libatlas.a ] ; then
-  if [ -f /usr/lib${LIBIRSUFFIX}/libatlas.so ] ; then
+if [ -f /usr/lib/libatlas.a ] ; then
+  if [ -f /usr/lib/libatlas.so ] ; then
     echo "NOTICE: libatlas was found, configure --with-blas=atlas"
     LOCALCONFIGS=${LOCALCONFIGS}" --with-blas=atlas"
   fi
@@ -94,7 +110,6 @@ CPPFLAGS="$SLKCFLAGS" \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --build=$ARCH-slackware-linux \
-  --disable-static \
   $LOCALCONFIGS
 
 make
@@ -115,11 +130,9 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
-###sbolint off
 if [ -f $CWD/doinst.sh ] ; then 
   cat $CWD/doinst.sh > $PKG/install/doinst.sh
 fi
-###sbolint on
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/academic/meep/meep.info b/academic/meep/meep.info
index 4c77d9c39283..bf739dd8b6ef 100644
--- a/academic/meep/meep.info
+++ b/academic/meep/meep.info
@@ -1,10 +1,10 @@
 PRGNAM="meep"
-VERSION="1.12.0"
+VERSION="1.14"
 HOMEPAGE="https://github.com/NanoComp/meep"
-DOWNLOAD="https://github.com/NanoComp/meep/releases/download/v1.12.0/meep-1.12.0.tar.gz"
-MD5SUM="ce2064167a540036f315b5b7b4b8253e"
+DOWNLOAD="https://github.com/NanoComp/meep/releases/download/v1.14.0/meep-1.14.tar.gz"
+MD5SUM="46875840eb7fc7267d9defe041eeb91e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="lapack openmpi hdf5 libctl"
+REQUIRES="lapack hdf5 libctl mpb"
 MAINTAINER="PaulKinsler"
 EMAIL="dr.paul@kinsler.org"
diff --git a/academic/meep/slack-desc b/academic/meep/slack-desc
index aa2462124ca2..3a624bb611ec 100644
--- a/academic/meep/slack-desc
+++ b/academic/meep/slack-desc
@@ -8,12 +8,10 @@
     |-----handy-ruler------------------------------------------------------|
 meep: meep (electromagnetics simulation using FDTD)
 meep:
-meep: Meep is a free and open-source software package for
+meep: Meep is a free and open-source software package for 
 meep: electromagnetics simulation via the finite-difference
 meep: time-domain (FDTD) method spanning a broad range of
 meep: applications.
 meep:
 meep: Homepage: https://github.com/NanoComp/meep
 meep:
-meep:
-meep: