2 files changed, 37 insertions, 16 deletions
diff --git a/desktop/afterstep/afterstep.SlackBuild b/desktop/afterstep/afterstep.SlackBuild
index e71df885f6..244bbb0a2e 100644
--- a/desktop/afterstep/afterstep.SlackBuild
+++ b/desktop/afterstep/afterstep.SlackBuild
@@ -1,11 +1,31 @@
 #!/bin/sh
 
 # Slackware build script for AfterStep WM
-# Written by NetrixTardis (netrixtardis@stealth3.com)
+# Written by Leo Midha (netrixtardis@stealth3.com)
+
+# Copyright 2010-2011 Leo Midha <netrixtardis@stealth3.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.
 
 PRGNAM=afterstep
-VERSION=${VERSION:-2.2.9}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-2.2.11}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -21,7 +41,7 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-SRCNAM=AfterStep	# leave this alone
+SRCNAM=AfterStep
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -46,7 +66,11 @@ cd $TMP
 tar xvf $CWD/$SRCNAM-$VERSION.tar.bz2
 cd $SRCNAM-$VERSION
 chown -R root:root .
-chmod -R a-s,u+w,go+r-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" \
@@ -65,10 +89,12 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-# Take care of default xinitrc
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
 install -D -m 0755 $CWD/xinitrc.afterstep $PKG/etc/X11/xinit/xinitrc.afterstep
 
 mkdir -p $PKG/usr/doc
@@ -77,11 +103,6 @@ cp -a COPYRIGHT ChangeLog INSTALL NEW README TEAM UPGRADE doc/menu.txt \
   doc/licences doc/languages doc/code  $PKG/usr/doc/$PRGNAM-$VERSION
 ( cd $PKG/usr/share/afterstep ; ln -s ../../doc/$PRGNAM-$VERSION doc )
 
-( 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/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/desktop/afterstep/afterstep.info b/desktop/afterstep/afterstep.info
index d4447019d5..4452dd3f75 100644
--- a/desktop/afterstep/afterstep.info
+++ b/desktop/afterstep/afterstep.info
@@ -1,10 +1,10 @@
 PRGNAM="afterstep"
-VERSION="2.2.9"
+VERSION="2.2.11"
 HOMEPAGE="http://www.afterstep.org"
-DOWNLOAD="ftp://ftp.afterstep.org/stable/AfterStep-2.2.9.tar.bz2"
-MD5SUM="59d739b2416ac18201027d7cc0888c20"
+DOWNLOAD="http://downloads.sourceforge.net/afterstep/AfterStep-2.2.11.tar.bz2"
+MD5SUM="dbedd3dd4cd6bad56edcab4ee6fb4de8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-MAINTAINER="NetrixTardis"
+MAINTAINER="Leo Midha"
 EMAIL="netrixtardis@stealth3.com"
 APPROVED="rworkman"