4 files changed, 52 insertions, 74 deletions
diff --git a/multimedia/gecko-mediaplayer/README b/multimedia/gecko-mediaplayer/README
index 4d14e4996266..ab9ad998920c 100644
--- a/multimedia/gecko-mediaplayer/README
+++ b/multimedia/gecko-mediaplayer/README
@@ -1,8 +1,8 @@
-Gecko Media Player is a browser plugin that uses GNOME MPlayer to
-play media in a browser. It should work with all browsers on Unix-ish
-systems (Linux, BSD, Solaris) and use the NS4 API (Mozilla, Firefox,
-Opera, etc.).
+Gecko Mediaplayer is the modern replacement for the mplayerplug-in 
+application.
 
-GNOME MPlayer (available at SBo) is required to run Gecko Media
-Player. GConf (also available at SBo) is an optional build time
-dependency.
+It is a browser plugin that uses GNOME MPlayer to play media in a browser. 
+It should work with all browsers on Unix-ish systems(Linux, BSD, Solaris) 
+and uses the NS4 API (Mozilla, Firefox, Opera, etc.).
+
+gnome-mplayer is required to use this software.
diff --git a/multimedia/gecko-mediaplayer/gecko-mediaplayer.SlackBuild b/multimedia/gecko-mediaplayer/gecko-mediaplayer.SlackBuild
index d490353d1c42..89db5255c554 100644
--- a/multimedia/gecko-mediaplayer/gecko-mediaplayer.SlackBuild
+++ b/multimedia/gecko-mediaplayer/gecko-mediaplayer.SlackBuild
@@ -1,31 +1,12 @@
 #!/bin/sh
 
-# Slackware build script for Gecko Media Player
-
-# Copyright 2008, 2009  Frank Caraballo <fecaraballo{at}gmail{dot}com>
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# 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.
-#
-# 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.
+# Slackware build script for gecko-mediaplayer
+# Written by Phillip Warner <pc_warner@yahoo.com>
 
 PRGNAM=gecko-mediaplayer
-VERSION=${VERSION:-0.9.5}
+VERSION=${VERSION:-0.9.8}
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
@@ -33,59 +14,54 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-GCONF=${GCONF:-no}
-
-if [ "$GCONF" = "no" ]; then
-  do_schemas="--disable-schemas-install"
-  do_gconf="--without-gconf"
-else
-  do_schemas=""
-  do_gconf=""
-fi
-
 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 || exit 1
+cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* || exit 1
-cd $PRGNAM-$VERSION || exit 1
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
- \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+  -exec chmod 755 {} \; -o \
+  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 \
+  -o -perm 400 \) -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --enable-static=no \
-  --build=$ARCH-slackware-linux \
-  $do_schemas \
-  $do_gconf \
-  || exit 1
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --disable-schemas-install
+
+make libdir=/usr/lib${LIBDIRSUFFIX} force_arch="$ARCH"
+make libdir=/usr/lib${LIBDIRSUFFIX} DESTDIR=$PKG install 
 
-make || exit 1
-make install-strip DESTDIR=$PKG || exit 1
+( cd $PKG
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null || true
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null || true
+)
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-mv $PKG/usr/share/doc/$PRGNAM/* $PKG/usr/doc/$PRGNAM-$VERSION
-rm -rf $PKG/usr/share/doc
 
 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/gecko-mediaplayer/gecko-mediaplayer.info b/multimedia/gecko-mediaplayer/gecko-mediaplayer.info
index 700cdafb0d69..b8cd35631e3c 100644
--- a/multimedia/gecko-mediaplayer/gecko-mediaplayer.info
+++ b/multimedia/gecko-mediaplayer/gecko-mediaplayer.info
@@ -1,8 +1,10 @@
 PRGNAM="gecko-mediaplayer"
-VERSION="0.9.5"
-HOMEPAGE="http://kdekorte.googlepages.com/"
-DOWNLOAD="http://gecko-mediaplayer.googlecode.com/files/gecko-mediaplayer-0.9.5.tar.gz"
-MD5SUM="95b83f30a41769e14a3c7bbb422b514e"
-MAINTAINER="Frank Caraballo"
-EMAIL="fecaraballo{at}gmail{dot}com"
+VERSION="0.9.8"
+HOMEPAGE="http://kdekorte.googlepages.com/gecko-mediaplayer"
+DOWNLOAD="http://gecko-mediaplayer.googlecode.com/files/gecko-mediaplayer-0.9.8.tar.gz"
+DOWNLOAD_x86_64=""
+MD5SUM="4df009d21b1a95c35c9adfdb6fbc96fe"
+MD5SUM_x86_64=""
+MAINTAINER="Phillip Warner"
+EMAIL="pc_warner@yahoo.com"
 APPROVED="dsomero"
diff --git a/multimedia/gecko-mediaplayer/slack-desc b/multimedia/gecko-mediaplayer/slack-desc
index bb90c9a8765b..5f85a68e2b57 100644
--- a/multimedia/gecko-mediaplayer/slack-desc
+++ b/multimedia/gecko-mediaplayer/slack-desc
@@ -1,19 +1,19 @@
 # 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
+# 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------------------------------------------------------|
-gecko-mediaplayer: Gecko Media Player (GNOME MPlayer Browser Plugin)
+                 |-----handy-ruler-----------------------------------------------------|
+gecko-mediaplayer: gecko-mediaplayer (Browser media plugin)
+gecko-mediaplayer: 
+gecko-mediaplayer: Gecko Mediaplayer is the modern replacement for mplayerplug-in.
+gecko-mediaplayer: It is a browser plugin that uses GNOME MPlayer to play media in a 
+gecko-mediaplayer: browser.
 gecko-mediaplayer:
-gecko-mediaplayer: Gecko Media Player is a browser plugin that uses GNOME MPlayer to
-gecko-mediaplayer: play media in a browser. It should work with all browsers on Unix-ish
-gecko-mediaplayer: systems (Linux, BSD, Solaris) and use the NS4 API (Mozilla, Firefox,
-gecko-mediaplayer: Opera, etc.).
+gecko-mediaplayer: Homepage: http://kdekorte.googlepages.com/gecko-mediaplayer
 gecko-mediaplayer:
-gecko-mediaplayer: Homepage: http://kdekorte.googlepages.com/
 gecko-mediaplayer:
 gecko-mediaplayer:
 gecko-mediaplayer: