desktop/matchbox-desktop: Updated for version 0.9.1

5 files changed, 34 insertions, 30 deletions

diff --git a/desktop/matchbox-desktop/README b/desktop/matchbox-desktop/README
index c54bc3440c4f..b941c3118c8d 100644
--- a/desktop/matchbox-desktop/README
+++ b/desktop/matchbox-desktop/README
@@ -2,11 +2,4 @@ Matchbox is a lightweight environment for the X Window System, that
 is specifically designed for embedded platforms such as handhelds
 and set-top boxes.
 
-This is a SlackBuild for the Matchbox desktop manager. libmatchbox,
-matchbox-window-manager, and matchbox-common are required to build
-and run this package. These dependencies are available through
-the Matchbox website, or as SlackBuilds.
-
-The Matchbox homepage can be found at: 
-http://projects.o-hand.com/matchbox/ 
-
+This requires libmatchbox, matchbox-window-manager, and matchbox-common.
diff --git a/desktop/matchbox-desktop/doinst.sh b/desktop/matchbox-desktop/doinst.sh
index 0c93f2cf1790..69ce69da822e 100644
--- a/desktop/matchbox-desktop/doinst.sh
+++ b/desktop/matchbox-desktop/doinst.sh
@@ -1,19 +1,19 @@
-#!/bin/sh
-
-if [ -x usr/bin/update-desktop-database ]; then
-    ./usr/bin/update-desktop-database ./usr/share/applications > /dev/null 2>&1
-fi
-
-# Handle the incoming configuration files:
 config() {
   NEW="$1"
   OLD="$(dirname $NEW)/$(basename $NEW .new)"
   # If there's no config file by that name, mv it over:
   if [ ! -r $OLD ]; then
     mv $NEW $OLD
-  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then # toss the redundant copy
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
     rm $NEW
   fi
   # Otherwise, we leave the .new copy for the admin to consider...
 }
-config etc/mbdesktop_modules.new
+
+config etc/matchbox/mbdesktop_modules.new
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/desktop/matchbox-desktop/matchbox-desktop.SlackBuild b/desktop/matchbox-desktop/matchbox-desktop.SlackBuild
index 83cb4e9cff16..c5d63d34efc1 100644
--- a/desktop/matchbox-desktop/matchbox-desktop.SlackBuild
+++ b/desktop/matchbox-desktop/matchbox-desktop.SlackBuild
@@ -22,14 +22,12 @@
 # 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-desktop
 VERSION=0.9.1
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd) 		
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -37,15 +35,22 @@ 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
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
@@ -54,23 +59,27 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --enable-startup-notification \
-  --enable-dnotify
+  --enable-dnotify \
+  --build=$ARCH-slackware-linux
 
 make
 make install-strip DESTDIR=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README \
-  $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
 mv $PKG/etc/matchbox/mbdesktop_modules $PKG/etc/matchbox/mbdesktop_modules.new
-sed -i 's#Icon=mbdesktop.png#Icon=/usr/share/pixmaps/mbdesktop.png#' $PKG/usr/share/applications/mb-show-desktop.desktop
+sed -i 's#Icon=mbdesktop.png#Icon=mbdesktop#' $PKG/usr/share/applications/mb-show-desktop.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}
diff --git a/desktop/matchbox-desktop/matchbox-desktop.info b/desktop/matchbox-desktop/matchbox-desktop.info
index 196ec9ad0e14..8225cfd6a6a9 100644
--- a/desktop/matchbox-desktop/matchbox-desktop.info
+++ b/desktop/matchbox-desktop/matchbox-desktop.info
@@ -3,6 +3,8 @@ VERSION="0.9.1"
 HOMEPAGE="http://projects.o-hand.com/matchbox/"
 DOWNLOAD="http://projects.o-hand.com/matchbox/sources/matchbox-desktop/0.9/matchbox-desktop-0.9.1.tar.bz2"
 MD5SUM="3335a30b1a1aacfb39f23b505254765c"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Daniel de Kok"
 EMAIL="danieldk@pobox.com"
 APPROVED="BP{K}"
diff --git a/desktop/matchbox-desktop/slack-desc b/desktop/matchbox-desktop/slack-desc
index b9779b1e5709..5419cf961dcd 100644
--- a/desktop/matchbox-desktop/slack-desc
+++ b/desktop/matchbox-desktop/slack-desc
@@ -13,7 +13,7 @@ matchbox-desktop: is specifically designed for embedded platforms such as handhe
 matchbox-desktop: and set-top boxes.
 matchbox-desktop: 
 matchbox-desktop: This package contains the Matchbox desktop manager. 
-matchbox-desktop: 
-matchbox-desktop: The Matchbox homepage can be found at: 
-matchbox-desktop: http://projects.o-hand.com/matchbox/ 
-matchbox-desktop: 
+matchbox-desktop:
+matchbox-desktop: Homepage: http://projects.o-hand.com/matchbox/ 
+matchbox-desktop:
+matchbox-desktop: