4 files changed, 36 insertions, 74 deletions
diff --git a/desktop/murrine/README b/desktop/murrine/README
index ca7b9121a5297..85b5221e5b498 100644
--- a/desktop/murrine/README
+++ b/desktop/murrine/README
@@ -1,13 +1,3 @@
-GTK2 engine that will make your desktop look like a 'murrina'.
-
-Murrine is an Italian word meaning the glass artworks done by 
-Venicians glass blowers. Murrine Engine is a Gtk2 engine that 
-will make your desktop look like a beautiful Murrina 
-(which is the italian singular of Murrine).
-
-This script is written to install the "default" Murrine themepack for
-the murrine engine, and it will print an error (but allow you to continue) 
-if you don't have the theme tarball in the build directory. You can obtain 
-the Murrine themepack here:
-
-http://cimi.netsons.org/media/download_gallery/MurrineThemePack.tar.bz2
+Murrine is an Italian word meaning colored glass patterns made by Venetian 
+glass makers.  Murrine is a gtk2 engine that will make your desktop look 
+like a beautiful Murrina (which is the italian singular of Murrine).
diff --git a/desktop/murrine/murrine.SlackBuild b/desktop/murrine/murrine.SlackBuild
index 2458acab7709c..6e3f1e38a8ee0 100644
--- a/desktop/murrine/murrine.SlackBuild
+++ b/desktop/murrine/murrine.SlackBuild
@@ -1,21 +1,18 @@
 #!/bin/sh
 
 # Slackware build script for murrine
-# Written by Grigorios Bouzakis (grbzks@gmail.com)
 
-# Modified by the SlackBuilds.org project
+# Written by crocket (crockabiscuit@yahoo.com)
 
 PRGNAM=murrine
-VERSION=0.90.3
+VERSION=${VERSION:-0.98.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -25,14 +22,6 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-# The default themepack for murrine is 
-# http://cimi.netsons.org/media/download_gallery/MurrineThemePack.tar.bz2
-# Others may work fine here, but the script has not been tested with them.
-# If you want to use another theme or themepack, ammend the line below.
-THEME=MurrineThemePack
-
-set -e
-
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -47,11 +36,13 @@ else
   LIBDIRSUFFIX=""
 fi
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
@@ -60,39 +51,19 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Install a default set of themes in the right directory.
-if [ -r $CWD/$THEME.tar.bz2 ]; then
-    mkdir -p $PKG/usr/share/themes
-    ( cd $PKG/usr/share/themes
-      echo "Installing $THEME"
-      tar -xvjf $CWD/$THEME.tar.bz2
-      chown -R root:root .
-    )
-else
-    # Warn users that the package may not work as expected
-    echo 
-    echo "A usable theme tarball does not appear to exist in "
-    echo "$CWD"
-    echo "See the README for more information on where to download"
-    echo "this. (or you didn't edit the script to reflect it or "
-    echo "something else is broken)."
-    echo 
-    echo "The script will continue to build a package, but some manual"
-    echo "setup may be required ager installation."
-    echo
-    echo "Type 'exit' to quit or any other key to continue the script."
-    read _continue
-    if [ "$_continue" = "exit" ]; then
-        exit 1
-    fi
-fi
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --enable-animation
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --mandir=/usr/man \
+  --infodir=/usr/info \
+  --enable-static=no \
+  --enable-animation \
+  --build=$ARCH-slackware-linux
 
 make
 make install DESTDIR=$PKG
@@ -101,7 +72,9 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 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 TODO \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -109,3 +82,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+
diff --git a/desktop/murrine/murrine.info b/desktop/murrine/murrine.info
index 7fb1024827a74..7dbcf60fa7be2 100644
--- a/desktop/murrine/murrine.info
+++ b/desktop/murrine/murrine.info
@@ -1,12 +1,10 @@
 PRGNAM="murrine"
-VERSION="0.90.3"
+VERSION="0.98.0"
 HOMEPAGE="http://www.cimitan.com/murrine/"
-DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/murrine/0.90/murrine-0.90.3.tar.gz \
-          http://cimi.netsons.org/media/download_gallery/MurrineThemePack.tar.bz2"
-MD5SUM="948ae8df6ac7553e1d28e441a9dd6075 \
-        414013c22d1fb3954a5c3d09499c80b2"
+DOWNLOAD="http://ftp.acc.umu.se/pub/GNOME/sources/murrine/0.98/murrine-0.98.0.tar.bz2"
+MD5SUM="d72b0988c6280346663d5c8bf72b9ecc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-MAINTAINER="Grigorios Bouzakis"
-EMAIL="grbzks@gmail.com"
-APPROVED="dsomero"
+MAINTAINER="crocket"
+EMAIL="crockabiscuit@yahoo.com"
+APPROVED="rworkman"
diff --git a/desktop/murrine/slack-desc b/desktop/murrine/slack-desc
index 1f03e287eb771..9823d2c9979f3 100644
--- a/desktop/murrine/slack-desc
+++ b/desktop/murrine/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
        |-----handy-ruler------------------------------------------------------|
-murrine: murrine (a Gtk2 engine)
+murrine: murrine (Gtk2 Cairo Engine)
+murrine:
+murrine: Murrine is an Italian word meaning colored glass patterns made by
+murrine: Venetian glass makers.  Murrine is a gtk2 engine that will make
+murrine: your desktop look like a beautiful Murrina(which is the italian
+murrine: singular of Murrine).
+murrine:
+murrine: Homepage: http://www.cimitan.com/murrine
+murrine:
+murrine:
 murrine:
-murrine: Murrine is a Gtk2 engine that will make your desktop look like a
-murrine: Murrina.  Written in C language, it uses cairo vectorial drawing
-murrine: library to draw widgets. It features  a modern glassy look, and it is
-murrine: elegant and clean on the eyes.
-murrine: It is also extremely customizable.
-murrine: 
-murrine: http://www.cimitan.com/murrine/
-murrine: 
-murrine: