4 files changed, 24 insertions, 18 deletions
diff --git a/misc/matchbox-common/README b/misc/matchbox-common/README
index 65ce7e52e8f0b..cf73720882f12 100644
--- a/misc/matchbox-common/README
+++ b/misc/matchbox-common/README
@@ -6,8 +6,4 @@ This is a build for the common files that are shared between Matchbox
 applications. It does not require other packages, but isn't particularly
 useful without matchbox-desktop or matchbox-panel. 
 
-You will need to have the Matchbox library (libmatchbox) installed, which
-can also be found on this site.
-
-The Matchbox homepage can be found at: 
-http://projects.o-hand.com/matchbox/ 
+This requires libmatchbox.
diff --git a/misc/matchbox-common/matchbox-common.SlackBuild b/misc/matchbox-common/matchbox-common.SlackBuild
index c0e5c74cf3fc3..39d5070512dd4 100644
--- a/misc/matchbox-common/matchbox-common.SlackBuild
+++ b/misc/matchbox-common/matchbox-common.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-common
 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,22 +59,25 @@ 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
 
 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
 
 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/misc/matchbox-common/matchbox-common.info b/misc/matchbox-common/matchbox-common.info
index efd05e2c46bd8..504536c031913 100644
--- a/misc/matchbox-common/matchbox-common.info
+++ b/misc/matchbox-common/matchbox-common.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-common/0.9/matchbox-common-0.9.1.tar.bz2"
 MD5SUM="8e8ba0ee170a9ac78fdc583b00ccf76b"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Daniel de Kok"
 EMAIL="danieldk@pobox.com"
 APPROVED="BP{k}"
diff --git a/misc/matchbox-common/slack-desc b/misc/matchbox-common/slack-desc
index 7c9c253099e18..2962312ce483e 100644
--- a/misc/matchbox-common/slack-desc
+++ b/misc/matchbox-common/slack-desc
@@ -5,7 +5,7 @@
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
-      |-----handy-ruler------------------------------------------------------|
+               |-----handy-ruler------------------------------------------------------|
 matchbox-common: matchbox-common (Shared Matchbox files) 
 matchbox-common: 
 matchbox-common: Matchbox is a lightweight environment for the X Window System,
@@ -13,7 +13,7 @@ matchbox-common: that is specifically designed for embedded platforms such as
 matchbox-common: handhelds and set-top boxes.
 matchbox-common: This package contains common files that are shared between 
 matchbox-common: Matchbox applications.
-matchbox-common: 
-matchbox-common: The Matchbox homepage can be found at: 
-matchbox-common: http://projects.o-hand.com/matchbox/ 
-matchbox-common: 
+matchbox-common:
+matchbox-common: Homepage: http://projects.o-hand.com/matchbox/ 
+matchbox-common:
+matchbox-common: