3 files changed, 38 insertions, 35 deletions
diff --git a/multimedia/kaffeine-mozilla/kaffeine-mozilla.SlackBuild b/multimedia/kaffeine-mozilla/kaffeine-mozilla.SlackBuild
index 46d4646f4368..9c18ab0ca9a2 100644
--- a/multimedia/kaffeine-mozilla/kaffeine-mozilla.SlackBuild
+++ b/multimedia/kaffeine-mozilla/kaffeine-mozilla.SlackBuild
@@ -1,46 +1,48 @@
 #!/bin/sh
 
 # Slackware build script for kaffeine-mozilla
-# Written by Michiel van Wessem (michiel@slackbuilds.org)
-
-# Copyright  2007 Michiel van Wessem (http://michielvwessem.wordpress.com)
+# Copyright 2007-2009  Michiel van Wessem, Manchester, United Kingdom
 # All rights reserved.
 #
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
 #
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
 #
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-set -e
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=kaffeine-mozilla
-VERSION=0.2
+VERSION=${VERSION:-0.2}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-DOCFILES="AUTHORS COPYING ChangeLog INSTALL README"
-
 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="64"
 fi
 
 rm -rf $PKG
@@ -50,25 +52,26 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
-chmod -R u+w,go+r-w,a-s .
 
-CFLAGS="$SLKCFLAGS" \
+FLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
-  --prefix=/usr/lib/mozilla \
+  --prefix=/usr/lib${LIBDIRSUFFIX}/mozilla \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
-  --with-x 
+  --mandir=/usr/man \
+  --build=$ARCH-slackware-linux
 
 make
 make install-strip DESTDIR=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCFILES $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING ChangeLog INSTALL 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/multimedia/kaffeine-mozilla/kaffeine-mozilla.info b/multimedia/kaffeine-mozilla/kaffeine-mozilla.info
index d99de3d4027e..0d8b7951ca9d 100644
--- a/multimedia/kaffeine-mozilla/kaffeine-mozilla.info
+++ b/multimedia/kaffeine-mozilla/kaffeine-mozilla.info
@@ -2,7 +2,9 @@ PRGNAM="kaffeine-mozilla"
 VERSION="0.2"
 HOMEPAGE="http://kaffeine.sourceforge.net"
 DOWNLOAD="http://downloads.sourceforge.net/kaffeine/kaffeine-mozilla-0.2.tar.bz2"
-MD5SUM="c7bb24cbd20fdfeffbb0da452533cac4  "
+MD5SUM="c7bb24cbd20fdfeffbb0da452533cac4"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Michiel van Wessem"
 EMAIL="michiel@slackbuilds.org"
 APPROVED="rworkman"
diff --git a/multimedia/kaffeine-mozilla/slack-desc b/multimedia/kaffeine-mozilla/slack-desc
index dfd31c343d45..5eef5f00bc5e 100644
--- a/multimedia/kaffeine-mozilla/slack-desc
+++ b/multimedia/kaffeine-mozilla/slack-desc
@@ -1,4 +1,4 @@
-kaffeine-mozilla: kaffeine-mozilla (kaffeine plugin for mozilla browsers)
+kaffeine-mozilla: kaffeine-mozilla plugin
 kaffeine-mozilla: 
 kaffeine-mozilla: The kaffeine-mozilla plugin is a browser plugin that lanches
 kaffeine-mozilla: kaffeine for supported media types.
@@ -6,6 +6,4 @@ kaffeine-mozilla:
 kaffeine-mozilla: This mozilla plugin launches kaffeine, the xine-based media
 kaffeine-mozilla: player for KDE, when a page containing a supported media
 kaffeine-mozilla: format is loaded.
-kaffeine-mozilla:
-kaffeine-mozilla:
-kaffeine-mozilla:
+kaffeine-mozilla: