academic/mrbayes: Updated for version 3.2.7a.

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

2 files changed, 28 insertions, 23 deletions

diff --git a/academic/mrbayes/mrbayes.SlackBuild b/academic/mrbayes/mrbayes.SlackBuild
index 5154bdee24..2bf1289cb4 100644
--- a/academic/mrbayes/mrbayes.SlackBuild
+++ b/academic/mrbayes/mrbayes.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for mrbayes
 
-# Copyright 2013-2016 Petar Petrov slackalaxy@gmail.com
+# Copyright 2013-2019 Petar Petrov slackalaxy@gmail.com
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,13 +23,14 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=mrbayes
-VERSION=${VERSION:-3.2.6}
+SRCNAM=MrBayes
+VERSION=${VERSION:-3.2.7a}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -40,8 +41,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -59,9 +60,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf ${PRGNAM}-${VERSION}
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd ${PRGNAM}-${VERSION}
+rm -rf ${SRCNAM}-${VERSION}
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd ${SRCNAM}-${VERSION}
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -69,11 +70,6 @@ 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 {} \;
 
-cd src
-autoconf
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -84,17 +80,26 @@ CXXFLAGS="$SLKCFLAGS" \
   --with-beagle=no \
   --build=$ARCH-slackware-linux
 
-make
-install -D -m755 mb $PKG/usr/bin/$PRGNAM
+# Fix the examples path
+sed -i "s:/share:/share/$PRGNAM:" examples/Makefile
+sed -i 's:examples/${PACKAGE}:examples:g' examples/Makefile
+
+# Use our CFLAGS
+sed -i "/^CFLAGS/s/=/+=/" Makefile
+
+make CFLAGS="$SLKCFLAGS"
+make install DESTDIR=$PKG
+
+# Rename the executable
+cd $PKG/usr/bin
+mv mb $PRGNAM
+cd -
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-mkdir -p $PKG/usr/share/$PRGNAM
-cp -a ../examples $PKG/usr/share/$PRGNAM
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a gpl.txt ../documentation/* $PKG/usr/doc/$PRGNAM-$VERSION
+# Add these too to the doc folder
+cp -a INSTALL TODO $PKG/usr/doc/$PRGNAM-$VERSION
 
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 cat $CWD/References > $PKG/usr/doc/$PRGNAM-$VERSION/References
diff --git a/academic/mrbayes/mrbayes.info b/academic/mrbayes/mrbayes.info
index 547aa09398..f00c0fc95f 100644
--- a/academic/mrbayes/mrbayes.info
+++ b/academic/mrbayes/mrbayes.info
@@ -1,8 +1,8 @@
 PRGNAM="mrbayes"
-VERSION="3.2.6"
+VERSION="3.2.7a"
 HOMEPAGE="http://mrbayes.sourceforge.net/"
-DOWNLOAD="http://ponce.cc/slackware/sources/repo/mrbayes-3.2.6.tar.gz"
-MD5SUM="95f9822f24be47b976bf87540b55d1fe"
+DOWNLOAD="https://github.com/NBISweden/MrBayes/archive/v3.2.7a/MrBayes-3.2.7a.tar.gz"
+MD5SUM="504236626ce9a2de1066a8520672f0cc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""