5 files changed, 42 insertions, 35 deletions
diff --git a/academic/mathomatic/README b/academic/mathomatic/README
index 5cdc8c5baf..5468c4ffd4 100644
--- a/academic/mathomatic/README
+++ b/academic/mathomatic/README
@@ -4,14 +4,11 @@ subtraction, multiplication, division, modulo division, and all forms
 of exponentiation. All arithmetic is double precision floating point
 with up to 14 decimal digits accuracy.
 
-Mathomatic can symbolically:
-*combine and solve equations containing many variables
-*completely simplify and compare expressions and equations
-*do simple calculus transformations and series
-*perform standard, complex number, and polynomial arithmetic
-*generate optimized C, Java, and Python language code from simplified equations
-*carry out quick calculations, etc.
-
-Not implemented in Mathomatic are a GUI with plotting, named mathematical
-functions (such as f(x) and log(x)), arbitrary-precision arithmetic, and
-matricies.
+Mathomatic can symbolically combine and solve equations containing many 
+variables, completely simplify and compare expressions and equations, do 
+simple calculus transformations and series, perform standard, complex 
+number, and polynomial arithmetic, generate optimized C, Java, and Python 
+language code from simplified equations, carry out quick calculations, and 
+much more.  Plotting with gnuplot is also supported.  Not implemented in 
+Mathomatic are named mathematical functions, arbitrary-precision arithmetic, 
+and matrices.
diff --git a/academic/mathomatic/doinst.sh b/academic/mathomatic/doinst.sh
deleted file mode 100644
index 4e8ba7071d..0000000000
--- a/academic/mathomatic/doinst.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-if [ -x /usr/bin/update-desktop-database ]; then
-  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
-fi
-
diff --git a/academic/mathomatic/mathomatic.SlackBuild b/academic/mathomatic/mathomatic.SlackBuild
index 8995cd8c4d..979c391ab3 100644
--- a/academic/mathomatic/mathomatic.SlackBuild
+++ b/academic/mathomatic/mathomatic.SlackBuild
@@ -6,7 +6,7 @@
 # This work is released into the public domain.
 
 PRGNAM=mathomatic
-VERSION=${VERSION:-14.2.8}
+VERSION=${VERSION:-15.0.0}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -18,13 +18,16 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
-set -e # Exit on most errors
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -39,16 +42,26 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-CFLAGS="$SLKCFLAGS" make READLINE=1
-make test
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+make \
+  prefix=/usr \
+  mandir=/usr/man \
+  docdir=/usr/doc/$PRGNAM-$VERSION \
+  READLINE=1
+
+make test	# This is math. Testing is a very good idea.
+
 make install \
   prefix=$PKG/usr \
   mandir=$PKG/usr/man \
-  mathdocdir=$PKG/usr/doc/$PRGNAM-$VERSION
+  docdir=$PKG/usr/doc/$PRGNAM-$VERSION
 
 ( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null || true
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null || true
 )
 
 ( cd $PKG/usr/man
@@ -60,7 +73,6 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/academic/mathomatic/mathomatic.info b/academic/mathomatic/mathomatic.info
index c8ffec25c1..221a6dfbf6 100644
--- a/academic/mathomatic/mathomatic.info
+++ b/academic/mathomatic/mathomatic.info
@@ -1,8 +1,10 @@
 PRGNAM="mathomatic"
-VERSION="14.2.8"
+VERSION="15.0.0"
 HOMEPAGE="http://mathomatic.org/math/"
-DOWNLOAD="http://www.panix.com/~gesslein/mathomatic-14.2.8.tar.bz2"
-MD5SUM="99decea11fb050167fff2e89d63d7503"
+DOWNLOAD="http://www.panix.com/~gesslein/mathomatic-15.0.0.tar.bz2"
+MD5SUM="147694e40acc58e83bb285904fdc834a"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Dylan Armitage"
 EMAIL="d.armitage89@gmail.com"
 APPROVED="rworkman"
diff --git a/academic/mathomatic/slack-desc b/academic/mathomatic/slack-desc
index 98e023c841..2f3ebd41e7 100644
--- a/academic/mathomatic/slack-desc
+++ b/academic/mathomatic/slack-desc
@@ -5,15 +5,15 @@
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
-          |-----handy-ruler---------------------------------------------------|
+          |-----handy-ruler------------------------------------------------------|
 mathomatic: Mathomatic (a small, portable Computer Algebra System)
 mathomatic:
 mathomatic: This is a console mode application that does symbolic math and
 mathomatic: quick calculations in a standard and generalized way.
-mathomatic: Mathomatic is designed to be general and easy to use.
-mathomatic: It implements most of the rules of algebra for addition, 
-mathomatic: subtraction, multiplication, division, modulo division, and all 
-mathomatic: forms of exponentiation.
-mathomatic: 
-mathomatic: Homepage: http://mathomatic.org
-mathomatic: 
+mathomatic: Mathomatic is designed to be as general an easy to use as general.
+mathomatic: It implements most of the rules of algebra for addition, subtraction,
+mathomatic: multiplication, division, modulo division, and all forms of
+mathomatic: exponentiation. All arithmetic is double precision floating point
+mathomatic: with up to 14 decimal digits accuracy.  It is hoped that Mathomatic
+mathomatic: will show you the true perfect beauty that is mathematics, and be
+mathomatic: a useful calculating tool, too.