4 files changed, 48 insertions, 38 deletions
diff --git a/desktop/scrotwm/README b/desktop/scrotwm/README
index 4c2513d85094..c1e552dfbae4 100644
--- a/desktop/scrotwm/README
+++ b/desktop/scrotwm/README
@@ -1,9 +1,12 @@
-Scrotwm is a small dynamic tiling window manager for X11. It tries
-to stay out of the way so that valuable screen real estate can be
-used for much more important stuff. It has sane defaults and does
-not require one to learn a language to do any configuration. It
-was written by hackers for hackers and it strives to be small,
-compact and fast.
+Scrotwm is a small dynamic tiling window manager for X11. It tries to stay out
+of the way so that valuable screen real estate can be used for much more
+important stuff. It has sane defaults and does not require one to learn a
+language to do any configuration. It was written by hackers for hackers and it
+strives to be small, compact and fast.
 
-This package contains an example scrotwm.conf and shell scripts
-for it.
+It was largely inspired by xmonad and dwm. Both are fine products but suffer
+from things like: crazy-unportable-language-syndrome, silly defaults,
+asymmetrical window layout, "how hard can it be?" and good old NIH. Nevertheless
+dwm was a phenomenal resource and many good ideas and code was borrowed from it.
+On the other hand xmonad has great defaults, key bindings and xinerama support,
+but is crippled by not being written in C.
diff --git a/desktop/scrotwm/scrotwm.SlackBuild b/desktop/scrotwm/scrotwm.SlackBuild
index f3263fdb8957..396bdfd66bb1 100755..100644
--- a/desktop/scrotwm/scrotwm.SlackBuild
+++ b/desktop/scrotwm/scrotwm.SlackBuild
@@ -1,6 +1,5 @@
 #!/bin/sh -e
  
-# Build script for scrotwm
 # Copyright (c) 2010 Daniel LEVAI
 # All rights reserved.
 # 
@@ -25,11 +24,11 @@
 # 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.
-#
-# Modified by the SlackBuilds.org project.
+
+# Build script for scrotwm
 
 PRGNAM=scrotwm
-VERSION=0.9.22
+VERSION=0.9.23
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -52,10 +51,10 @@ fi
 
 set -e
 
-rm -rf $PKG
+rm -Rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
+rm -Rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tgz
 cd $PRGNAM-$VERSION
 chown -R root:root .
@@ -66,26 +65,34 @@ find . \
  -exec chmod 644 {} \;
 
 cd linux
-  CFLAGS="$SLKCFLAGS"  make  \
-  LIBDIR=/usr/lib$LIBDIRSUFFIX \
-  MANDIR=/usr/man PREFIX=/usr 
-
-  make install DESTDIR=$PKG \
-  LIBDIR=/usr/lib$LIBDIRSUFFIX \
-  MANDIR=/usr/man PREFIX=/usr 
+  CFLAGS="$SLKCFLAGS" make \
+    PREFIX=/usr \
+    LIBDIR=/usr/lib${LIBDIRSUFFIX} \
+    MANDIR=/usr/man
+  make install \
+    PREFIX=/usr \
+    LIBDIR=/usr/lib${LIBDIRSUFFIX} \
+    MANDIR=/usr/man \
+    DESTDIR=$PKG
 cd ..
 
 strip --strip-unneeded $PKG/usr/bin/scrotwm
 
+# Fixup the manpages
 ( 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 {es,it,ru}/man1
+  for i in es it ru ; do 
+    mkdir -p $i/man1
+    mv man1/scrotwm_$i.1 $i/man1/scrotwm.1
+  done
 )
+find $PKG/usr/man -type f -exec gzip -9 {} \;
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/examples/
 cp -a scrotwm.conf initscreen.sh baraction.sh screenshot.sh \
     $PKG/usr/doc/$PRGNAM-$VERSION/examples/
-cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+find $PKG/usr/doc -type f -exec chmod 0644 {} \;
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/desktop/scrotwm/scrotwm.info b/desktop/scrotwm/scrotwm.info
index fca73beca691..aa2ba871a5c3 100644
--- a/desktop/scrotwm/scrotwm.info
+++ b/desktop/scrotwm/scrotwm.info
@@ -1,10 +1,10 @@
 PRGNAM="scrotwm"
-VERSION="0.9.22"
+VERSION="0.9.23"
 HOMEPAGE="http://scrotwm.org"
-DOWNLOAD="http://scrotwm.org/snapshot/scrotwm-0.9.22.tgz"
-MD5SUM="bc66c66d300b3176c119bfdae43b6a42"
+DOWNLOAD="http://scrotwm.org/snapshot/scrotwm-0.9.23.tgz"
+MD5SUM="7d24853051c63f8a03ff0adc92a0df35"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Daniel LEVAI"
 EMAIL="leva@ecentrum.hu"
-APPROVED="dsomero"
+APPROVED=""
diff --git a/desktop/scrotwm/slack-desc b/desktop/scrotwm/slack-desc
index 848e2196e8d7..b3016b3670e5 100644
--- a/desktop/scrotwm/slack-desc
+++ b/desktop/scrotwm/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
        |-----handy-ruler------------------------------------------------------|
-scrotwm: scrotwm (small dynamic tiling window manager)
-scrotwm: 
-scrotwm: Scrotwm is a small dynamic tiling window manager for X11. It tries
-scrotwm: to stay out of the way so that valuable screen real estate can be
-scrotwm: used for much more important stuff. It has sane defaults and does
-scrotwm: not require one to learn a language to do any configuration. It
-scrotwm: was written by hackers for hackers and it strives to be small,
+scrotwm: Scrotwm (small tiling window manager)
+scrotwm:
+scrotwm: Scrotwm is a small dynamic tiling window manager for X11.
+scrotwm: It tries to stay out of the way so that valuable screen real estate
+scrotwm: can be used for much more important stuff. It has sane defaults and
+scrotwm: does not require one to learn a language to do any configuration.
+scrotwm: It was written by hackers for hackers and it strives to be small,
 scrotwm: compact and fast.
-scrotwm: 
-scrotwm: This package contains an example scrotwm.conf and shell scripts.
-scrotwm: Homepage: http://www.scrotwm.org/
+scrotwm:
+scrotwm: Homepage (with screenshots): http://www.scrotwm.org/
+scrotwm: