2 files changed, 33 insertions, 21 deletions

diff --git a/academic/maxima/maxima.SlackBuild b/academic/maxima/maxima.SlackBuild
index 75c03afc35..78fa0adce9 100644
--- a/academic/maxima/maxima.SlackBuild
+++ b/academic/maxima/maxima.SlackBuild
@@ -24,12 +24,14 @@
 
 # Modified by Joćo Medeiros as needed to build maxima instead of octave
 # Modified by the SlackBuilds.org project
+# Modified by Ken Milmore 2009
 
 PRGNAM=maxima
-VERSION=5.10.0
+VERSION=5.18.1
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -37,45 +39,55 @@ 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
+
 rm -rf $PKG 
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP || exit 1
+cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -zxvf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1
-cd $PRGNAM-$VERSION || exit 1
+tar -zxvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
-chmod -R a-s,u+w,go+r-w .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
-  --localstatedir=/var \
-  || exit 1
+  --localstatedir=/var
 
-make || exit 1
-make install DESTDIR=$PKG || exit 1
+make -j1
+make -j1 install DESTDIR=$PKG
 
 ( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-  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
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
 )
 
-if [ -d $PKG/usr/man ]; then
 ( 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
 )
-fi
-if [ -d $PKG/usr/info ]; then
-  gzip -9 $PKG/usr/info/*.info*
-  rm -rf $PKG/usr/info/dir
-fi
+
+# NOTE: Do not compress the info pages; they are needed by Maxima's help facility.
+rm -rf $PKG/usr/info/dir
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS COPYING ChangeLog* INSTALL* NEWS README* \
diff --git a/academic/maxima/maxima.info b/academic/maxima/maxima.info
index 05afd252bb..fdb1bc45ee 100644
--- a/academic/maxima/maxima.info
+++ b/academic/maxima/maxima.info
@@ -1,8 +1,8 @@
 PRGNAM="maxima"
-VERSION="5.10.0"
+VERSION="5.18.1"
 HOMEPAGE="http://maxima.sourceforge.net/"
-DOWNLOAD="http://dl.sourceforge.net/maxima/maxima-5.10.0.tar.gz"
-MD5SUM="1e7f5ecabf990f350c5f662f106d83b7"
+DOWNLOAD="http://downloads.sourceforge.net/maxima/maxima-5.18.1.tar.gz"
+MD5SUM="8be7388ad31b975335623b390bc2516e"
 MAINTAINER="Joćo Medeiros"
 EMAIL="ignotus21@gmail.com"
-APPROVED="rworkman"
+APPROVED="dsomero"