2 files changed, 20 insertions, 13 deletions
diff --git a/graphics/mftrace/mftrace.SlackBuild b/graphics/mftrace/mftrace.SlackBuild
index f4f67caf4a971..54d83fd296b91 100644
--- a/graphics/mftrace/mftrace.SlackBuild
+++ b/graphics/mftrace/mftrace.SlackBuild
@@ -6,26 +6,32 @@
 set -e
 
 PRGNAM=mftrace
-VERSION=1.2.14
+VERSION=1.2.15
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+    SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+    LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+    SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+    LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+    SLKCFLAGS="-O2 -fPIC"
+    LIBDIRSUFFIX=""
 fi
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar -xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
@@ -35,6 +41,7 @@ sed -i "s/^CFLAGS =/CFLAGS +=/" GNUmakefile.in
 
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib$LIBDIRSUFFIX \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
@@ -44,10 +51,8 @@ sed -i "s/^CFLAGS =/CFLAGS +=/" GNUmakefile.in
 CFLAGS="$SLKCFLAGS" make
 make 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 $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 {} \;
@@ -62,4 +67,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 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/graphics/mftrace/mftrace.info b/graphics/mftrace/mftrace.info
index ed1d760739a29..f51ca12cf9c2e 100644
--- a/graphics/mftrace/mftrace.info
+++ b/graphics/mftrace/mftrace.info
@@ -1,8 +1,10 @@
 PRGNAM="mftrace"
-VERSION="1.2.14"
+VERSION="1.2.15"
 HOMEPAGE="http://www.lilypond.org/mftrace/"
-DOWNLOAD="http://www.lilypond.org/download/sources/mftrace/mftrace-1.2.14.tar.gz"
-MD5SUM="4e8837594c9e451666b65bfae3165e4f"
+DOWNLOAD="http://lilypond.org/download/sources/mftrace/mftrace-1.2.15.tar.gz"
+DOWNLOAD_x86_64=""
+MD5SUM="88c121f7046b3950518edd74ff9fbb35"
+MD5SUM_x86_64=""
 MAINTAINER="Kyle Guinn"
 EMAIL="elyk03@gmail.com"
-APPROVED="rworkman"
+APPROVED="rworkman,pprkut"