academic/mpb: Updated for version 1.10.0.

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

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

3 files changed, 25 insertions, 16 deletions

diff --git a/academic/mpb/README b/academic/mpb/README
index 5d6b26c927..5f0440095a 100644
--- a/academic/mpb/README
+++ b/academic/mpb/README
@@ -1,37 +1,44 @@
 mpb (computes electromagnetic band structures and modes)
 
-MPB is a free and open-source software package for computing electromagnetic
+MPB is a free and open-source software package for computing electromagnetic 
 band structures and modes. It saves results in hdf5 format.
 
+This package requires: hdf5, libctl, lapack
+
 You may wish to also install: h5utils
 
 You very probably want to build a multi-processor version of this
 code by adding the "--with-openmp" configure option.
 
 
+
 Configuration:
+
 If the build script can find the ATLAS libraries, it will adapt the configure 
 options to use them rather than the default lapack.
 
-You can add additional options to the command line using the environment
-variable SBOPTIONS_MPB; e.g. to enable MPI (multi-processor calculation)
+You can add additional options to the command line using the environment 
+variable SBOPTIONS_MPB; e.g. to enable MPI (multi-processor calculation) 
 using openmp, use:
 
 SBOPTIONS_MPB="--with-openmp" ./mpb.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
+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 "mpb:" followed by options, e.g.:
 
 mpb: --with-openmp
 
-If you want to use mpich instead of openmp, you will have to recompile the
+If you want to use mpich instead of openmp, you will have to recompile the 
 installed slackware fftw library with two additional configure options, i.e.
 not only "--with-mpi" but also "--enable-type-prefix".
 
+
+
 Note:
 
 This mpb build script does *two* passes. This is so that when MPI
 support is enabled, the first compiles the mpb-data utility, then the second
 builds the full MPI version. The resulting package includes both, with any
 MPI version of the files replacing the non- MPI version.
+
diff --git a/academic/mpb/mpb.SlackBuild b/academic/mpb/mpb.SlackBuild
index 11cecb63cb..2be79e9208 100644
--- a/academic/mpb/mpb.SlackBuild
+++ b/academic/mpb/mpb.SlackBuild
@@ -75,13 +75,14 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # if there is no configure script, try to build one!
-if [ ! -f ./configure ] ; then
+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}
@@ -92,11 +93,11 @@ if [  -n "${SBOPTIONS_MPB}" ] ; then
 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{$LIBDIRSUFFIX}/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
@@ -131,7 +132,7 @@ CPPFLAGS="$SLKCFLAGS" \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --build=$ARCH-slackware-linux \
-  $LOCALCONFIGS
+  $LOCALCONFIGS 
 
 make
 make install DESTDIR=$PKG
@@ -150,5 +151,10 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
+
+if [ -f $CWD/doinst.sh ] ; then 
+  cat $CWD/doinst.sh > $PKG/install/doinst.sh
+fi
+
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/academic/mpb/slack-desc b/academic/mpb/slack-desc
index 90b4bc501d..47ada15959 100644
--- a/academic/mpb/slack-desc
+++ b/academic/mpb/slack-desc
@@ -11,9 +11,5 @@ mpb:
 mpb: MPB is a free and open-source software package for 
 mpb: computing electromagnetic band structures and modes.
 mpb:
-mpb:
-mpb:
 mpb: Homepage: https://github.com/NanoComp/mpb
 mpb:
-mpb:
-mpb: