4 files changed, 20 insertions, 27 deletions
diff --git a/academic/mathomatic/README b/academic/mathomatic/README
index 5468c4ffd4..3c01da81e0 100644
--- a/academic/mathomatic/README
+++ b/academic/mathomatic/README
@@ -9,6 +9,6 @@ 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.
+much more. Plotting with gnuplot is also supported. Not implemented in 
+Mathomatic are named functions, arbitrary-precision arithmetic, and
+matrices.
diff --git a/academic/mathomatic/mathomatic.SlackBuild b/academic/mathomatic/mathomatic.SlackBuild
index 54e57bbead..5b7a0425b1 100644
--- a/academic/mathomatic/mathomatic.SlackBuild
+++ b/academic/mathomatic/mathomatic.SlackBuild
@@ -1,21 +1,19 @@
 #!/bin/sh
 
-# Slackware build script for Mathomatic
+# Slackware build script for mathomatic
 
 # Written by Dylan Armitage <d.armitage89@gmail.com>
 # This work is released into the public domain.
 
 PRGNAM=mathomatic
-VERSION=${VERSION:-15.0.8}
+VERSION=${VERSION:-15.3.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -55,27 +53,22 @@ find . \
  -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-make \
-  prefix=/usr \
-  mandir=/usr/man \
-  docdir=/usr/doc/$PRGNAM-$VERSION \
-  READLINE=1
+make READLINE=1
 
-make test	# This is math. Testing is a very good idea.
+# We do want to make sure it works. This is math, afterall.
+make test
 
 make install \
-  prefix=$PKG/usr \
-  mandir=$PKG/usr/man \
-  docdir=$PKG/usr/doc/$PRGNAM-$VERSION
+prefix=/usr \
+mandir=/usr/man \
+docdir=/usr/doc/$PRGNAM-$VERSION \
+DESTDIR=$PKG
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/academic/mathomatic/mathomatic.info b/academic/mathomatic/mathomatic.info
index fee16309d6..835ff2464d 100644
--- a/academic/mathomatic/mathomatic.info
+++ b/academic/mathomatic/mathomatic.info
@@ -1,10 +1,10 @@
 PRGNAM="mathomatic"
-VERSION="15.0.8"
-HOMEPAGE="http://mathomatic.org/math/"
-DOWNLOAD="http://www.panix.com/~gesslein/mathomatic-15.0.8.tar.bz2"
-MD5SUM="24f8c4f80318215f2190daefc1f0e106"
+VERSION="15.3.3"
+HOMEPAGE="http://www.mathomatic.org"
+DOWNLOAD="http://www.mathomatic.org/archive/mathomatic-15.3.3.tar.bz2"
+MD5SUM="74a9dcf0ad73f642fca01ee4e9e1b624"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Dylan Armitage"
 EMAIL="d.armitage89@gmail.com"
-APPROVED="rworkman"
+APPROVED=""
diff --git a/academic/mathomatic/slack-desc b/academic/mathomatic/slack-desc
index 2f3ebd41e7..5b204e45e3 100644
--- a/academic/mathomatic/slack-desc
+++ b/academic/mathomatic/slack-desc
@@ -3,7 +3,7 @@
 # up the first '|' above the ':' following the base package name, and the '|'
 # on the right side marks the last column you can put a character in.  You must
 # make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
+# customary to leave one space after the ':' except on otherwise blank lines.
 
           |-----handy-ruler------------------------------------------------------|
 mathomatic: Mathomatic (a small, portable Computer Algebra System)