4 files changed, 31 insertions, 7 deletions
diff --git a/audio/mhwaveedit/doinst.sh b/audio/mhwaveedit/doinst.sh
index 98d466d8b9..1f8ff67ded 100644
--- a/audio/mhwaveedit/doinst.sh
+++ b/audio/mhwaveedit/doinst.sh
@@ -1,3 +1,10 @@
-if [ -x usr/bin/update-desktop-database ]; then
-  ./usr/bin/update-desktop-database ./usr/share/applications >/dev/null 2>&1
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
+
diff --git a/audio/mhwaveedit/mhwaveedit.SlackBuild b/audio/mhwaveedit/mhwaveedit.SlackBuild
index f484225869..7a71076257 100644
--- a/audio/mhwaveedit/mhwaveedit.SlackBuild
+++ b/audio/mhwaveedit/mhwaveedit.SlackBuild
@@ -20,8 +20,13 @@ 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
 
 rm -rf $PKG
@@ -36,6 +41,7 @@ chmod -R a-s,u+w,go+r-w .
 CFLAGS="$SLKCFLAGS" \
   ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --docdir=/usr/doc/$PKGNAME-$VERSION \
@@ -48,8 +54,10 @@ make || exit 1
 make install DESTDIR=$PKG || exit 1
 
 ( 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
 )
 
 mkdir -p $PKG/usr/doc/$PKGNAME-$VERSION
@@ -68,4 +76,4 @@ 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/$PKGNAME-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PKGNAME-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/audio/mhwaveedit/mhwaveedit.info b/audio/mhwaveedit/mhwaveedit.info
index 35f30753d9..037b54d9ac 100644
--- a/audio/mhwaveedit/mhwaveedit.info
+++ b/audio/mhwaveedit/mhwaveedit.info
@@ -2,7 +2,9 @@ PRGNAM="mhwaveedit"
 VERSION="1.4.14"
 HOMEPAGE="https://gna.org/projects/mhwaveedit"
 DOWNLOAD="http://download.gna.org/mhwaveedit/mhwaveedit-1.4.14.tar.bz2"
+DOWNLOAD_x86_64=""
 MD5SUM="d49d160608c802098dbaf2b6c3eba27f"
+MD5SUM_x86_64=""
 MAINTAINER="Dušan Stefanović"
 EMAIL="stefanovic.dusan@gmail.com"
-APPROVED="David Somero,rworkman"
+APPROVED="dsomero,rworkman"
diff --git a/audio/mhwaveedit/slack-desc b/audio/mhwaveedit/slack-desc
index 7927815fcf..06ed0117d9 100644
--- a/audio/mhwaveedit/slack-desc
+++ b/audio/mhwaveedit/slack-desc
@@ -1,4 +1,11 @@
-          |-----handy-ruler--------------------------------------------------|
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# 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 ':'.
+
+          |-----handy-ruler-----------------------------------------------------|
 mhwaveedit: mhwaveedit (edit, play, and record sound files)
 mhwaveedit: 
 mhwaveedit: mhWaveEdit is a graphical program for editing, playing and