desktop/gtk-engines: Updated for version 2.18.2

4 files changed, 41 insertions, 29 deletions

diff --git a/desktop/gtk-engines/README b/desktop/gtk-engines/README
index 4423810150..374218c762 100644
--- a/desktop/gtk-engines/README
+++ b/desktop/gtk-engines/README
@@ -1,4 +1,4 @@
-gtk-engines are theme engines for GTK+ 2
+gtk-engines are theme engines for GTK+2
 
-Package contains Clearlooks, Crux, Glide, HC, Industrial, LUA, Mist,
-Redmond & ThinIce
+This package contains the Clearlooks, Crux, Glide, HC, 
+Industrial, LUA, Mist, Redmond, and ThinIce themes.
diff --git a/desktop/gtk-engines/gtk-engines.SlackBuild b/desktop/gtk-engines/gtk-engines.SlackBuild
index b7a417f7f7..0cc5f97d78 100644
--- a/desktop/gtk-engines/gtk-engines.SlackBuild
+++ b/desktop/gtk-engines/gtk-engines.SlackBuild
@@ -1,11 +1,10 @@
 #!/bin/sh
 
 # Slackware build script for gtk-engines
-
-# Written by Grigorios Bouzakis (grbzks@gmail.com)
+# Written by Grigorios Bouzakis (grbzks@xsmail.com)
 
 PRGNAM=gtk-engines
-VERSION=2.18.0
+VERSION=${VERSION:-2.18.2}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -17,19 +16,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
 
-DOCS="AUTHORS ChangeLog COPYING INSTALL NEWS README"
-
 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.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
@@ -41,25 +43,33 @@ find . \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
---prefix=/usr \
---enable-animation
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --enable-animation \
+  --build=$ARCH-slackware-linux
 
 make
 make install DESTDIR=$PKG
 
 ( cd $PKG
   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
-    xargs strip --strip-unneeded 2> /dev/null
+    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
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS ChangeLog COPYING 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/desktop/gtk-engines/gtk-engines.info b/desktop/gtk-engines/gtk-engines.info
index 0a40929d48..2987f6eefe 100644
--- a/desktop/gtk-engines/gtk-engines.info
+++ b/desktop/gtk-engines/gtk-engines.info
@@ -1,8 +1,10 @@
 PRGNAM="gtk-engines"
-VERSION="2.18.0"
+VERSION="2.18.2"
 HOMEPAGE="http://ftp.gnome.org/pub/gnome/sources/gtk-engines/"
-DOWNLOAD="http://ftp.gnome.org/pub/gnome/sources/gtk-engines/2.18/gtk-engines-2.18.0.tar.gz"
-MD5SUM="a45589212a2548285809600635a8f32f"
+DOWNLOAD="http://ftp.gnome.org/pub/gnome/sources/gtk-engines/2.18/gtk-engines-2.18.2.tar.gz"
+MD5SUM="d2bb3b7f3937b8d6bbb2d858a5be8d36"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Grigorios Bouzakis"
-EMAIL="grbzks@gmail.com"
-APPROVED="dsomero"
+EMAIL="grbzks@xsmail.com"
+APPROVED="rworkman"
diff --git a/desktop/gtk-engines/slack-desc b/desktop/gtk-engines/slack-desc
index 32d09cce89..0ab6f62988 100644
--- a/desktop/gtk-engines/slack-desc
+++ b/desktop/gtk-engines/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
            |-----handy-ruler------------------------------------------------------|
-gtk-engines: gtk-engines (Theme engines for GTK+ 2)
-gtk-engines: 
-gtk-engines: gtk-egines is a collection of basic theme engines for GTK+ 2.
-gtk-engines: This package contains Clearlooks, Crux, Glide, HC, Industrial, LUA,
-gtk-engines: Mist, Redmond & ThinIce
-gtk-engines: 
+gtk-engines: gtk-engines (Theme engines for GTK+2)
+gtk-engines:
+gtk-engines: gtk-engines is a collection of basic theme engines for GTK+2.
+gtk-engines:
+gtk-engines: This package contains Clearlooks, Crux, Glide, HC, Industrial,
+gtk-engines: LUA, Mist, Redmond, and ThinIce themes.
+gtk-engines:
 gtk-engines: Homepage: http://ftp.gnome.org/pub/GNOME/sources/gtk-engines/
-gtk-engines: 
-gtk-engines: 
-gtk-engines: 
-gtk-engines: 
+gtk-engines:
+gtk-engines:
+gtk-engines: