1 files changed, 23 insertions, 14 deletions
diff --git a/desktop/matchbox-panel/matchbox-panel.SlackBuild b/desktop/matchbox-panel/matchbox-panel.SlackBuild
index 4b30d92c6f..2252664f58 100644
--- a/desktop/matchbox-panel/matchbox-panel.SlackBuild
+++ b/desktop/matchbox-panel/matchbox-panel.SlackBuild
@@ -22,9 +22,6 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Exit on most errors
-set -e
-
 PRGNAM=matchbox-panel
 VERSION=0.9.3
 ARCH=${ARCH:-i486}
@@ -38,48 +35,60 @@ 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
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xjvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
-patch -p1 < $CWD/matchbox-panel-0.9.3-gcc4-no-nested-functions.patch
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
+patch -p1 < $CWD/matchbox-panel-0.9.3-gcc4-no-nested-functions.patch
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --enable-startup-notification \
   --enable-dnotify \
-  --enable-acpi-linux
+  --enable-acpi-linux \
+  --build=$ARCH-slackware-linux
 
 make
 make install-strip DESTDIR=$PKG
 
+# Fixup some desktop files to be more spec-compliant
+( cd $PKG/usr/share/applications
+  sed -i s'#Icon=minitime.png#Icon=minitime#' mb-applet-clock.desktop
+  sed -i s'#Icon=mbmenu.png#Icon=mbmenu#' mb-applet-menu-launcher.desktop
+  sed -i s'#Icon=minisys.png#Icon=minisys#' mb-applet-system-monitor.desktop
+  sed -i s'#Icon=signal-81-100.png#Icon=signal-81-100#' mb-applet-wireless.desktop
+  sed -i s'#Icon=mbterm.png#Icon=mbterm#' mb-launcher-term.desktop
+)
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-( cd $PKG/usr/share/applications
-  sed -i s'#Icon=minitime.png#Icon=/usr/share/pixmaps/minitime.png#' mb-applet-clock.desktop
-  sed -i s'#Icon=mbmenu.png#con=/usr/share/pixmaps/mbmenu.png#' mb-applet-menu-launcher.desktop
-  sed -i s'#Icon=minisys.png#Icon=/usr/share/pixmaps/minisys.png#' mb-applet-system-monitor.desktop
-  sed -i s'#Icon=signal-81-100.png#Icon=/usr/share/pixmaps/signal-81-100.png#' mb-applet-wireless.desktop
-  sed -i s'#Icon=mbterm.png#Icon=/usr/share/pixmaps/mbterm.png#' mb-launcher-term.desktop
-)
 
 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}