desktop/alltray: Updated for version 0.70

4 files changed, 53 insertions, 23 deletions

diff --git a/desktop/alltray/README b/desktop/alltray/README
index 413a9c4ce3f0c..085b587eea313 100644
--- a/desktop/alltray/README
+++ b/desktop/alltray/README
@@ -3,5 +3,5 @@ Evolution, Thunderbird, Terminals) into the system tray. A highlight feature
 is that a click on the "close" button will minimize back to system tray.  
 It works well with Gnome, KDE, Xfce 4.*, Fluxbox, and WindowMaker.
 
-NOTE: If you have installed one of the GNOME Distribution for Slackware, then
-      you can safely remove the "--disable-gconf" line in the build script.
+NOTE: If you have installed one of the GNOME distributions for Slackware,
+then you can safely remove the "--disable-gconf \" line in the SlackBuild.
diff --git a/desktop/alltray/alltray.SlackBuild b/desktop/alltray/alltray.SlackBuild
index e66e6912639b5..9fa4d2e84005d 100644
--- a/desktop/alltray/alltray.SlackBuild
+++ b/desktop/alltray/alltray.SlackBuild
@@ -1,17 +1,32 @@
 #!/bin/sh
 
 # Slackware build script for alltray
-# Written by eroc <eroc@linuxmail.org>
 
-# Modified by the SlackBuilds.org project
-
-set -e
+# Copyright (c) 2008, Antonio Hernandez Blas <hba.nihilismus@gmail.com>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+# 1.- 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.
 
 PRGNAM=alltray
-VERSION=0.69
+VERSION=0.70
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -21,36 +36,52 @@ if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
 fi
 
-rm -rf $PKG 
+set -e
+
+rm -rf $PKG
 mkdir -p $TMP $PKG/usr $OUTPUT
-cd $TMP 
+cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-chmod -R a-s,u+rw,go-w .
+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 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
-  --disable-gconf 
+  --mandir=/usr/man \
+  --disable-gconf \
+  --enable-static=no \
+  --enable-shared=yes \
+  --build=$ARCH-slackware-linux
 
 make
 make install-strip DESTDIR=$PKG
 
+( cd $PKG/usr/man
+  find . -type f -exec gzip -9 {} \;
+  for i in $(find . -type l) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+)
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README  \
+cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-gzip -9 $PKG/usr/man/man1/*.1
-
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+
diff --git a/desktop/alltray/alltray.info b/desktop/alltray/alltray.info
index da44bf0fa94f8..f0df23deb1b7c 100644
--- a/desktop/alltray/alltray.info
+++ b/desktop/alltray/alltray.info
@@ -1,8 +1,8 @@
 PRGNAM="alltray"
-VERSION="0.69"
+VERSION="0.70"
 HOMEPAGE="http://alltray.sourceforge.net"
-DOWNLOAD="http://dl.sourceforge.net/alltray/alltray-0.69.tar.gz"
-MD5SUM="ebc1c8eea945aff703d758e296b76cc9"
-MAINTAINER="eroc"
-EMAIL="eroc@linuxmail.org"
+DOWNLOAD="http://downloads.sourceforge.net/alltray/alltray-0.70.tar.gz"
+MD5SUM="675a0a60f22fae04da787095ef0bd7d9"
+MAINTAINER="Antonio Hernandez Blas"
+EMAIL="hba.nihilismus@gmail.com"
 APPROVED="rworkman"
diff --git a/desktop/alltray/doinst.sh b/desktop/alltray/doinst.sh
index 3412314ed0094..392c12adb9bd3 100644
--- a/desktop/alltray/doinst.sh
+++ b/desktop/alltray/doinst.sh
@@ -1,5 +1,4 @@
-
-if [ -x usr/bin/update-desktop-database ]; then
-  ./usr/bin/update-desktop-database ./usr/share/applications >/dev/null 2>&1
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications
 fi