4 files changed, 43 insertions, 27 deletions
diff --git a/academic/gtypist/doinst.sh b/academic/gtypist/doinst.sh
new file mode 100644
index 0000000000..5cc61a62e2
--- /dev/null
+++ b/academic/gtypist/doinst.sh
@@ -0,0 +1 @@
+chroot . /usr/bin/install-info /usr/info/gtypist.info.gz /usr/info/dir 2> /dev/null
diff --git a/academic/gtypist/gtypist.SlackBuild b/academic/gtypist/gtypist.SlackBuild
index 1442c16419..4e5c7da914 100644
--- a/academic/gtypist/gtypist.SlackBuild
+++ b/academic/gtypist/gtypist.SlackBuild
@@ -1,20 +1,33 @@
 #!/bin/sh
-
 # Slackware build script for gtypist
 
-# Written by Grigorios Bouzakis (grbzks@gmail.com)
+# Copyright 2007-2011 Grigorios Bouzakis <grbzks@xsmail.com>
+# All rights reserved.
+#
+# Permission to use, copy, modify, and distribute this software for any purpose
+# with or without fee is hereby granted, provided that the above copyright
+# notice and this permission notice appear in all copies.
+#
+# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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
+# AUTHORS AND COPYRIGHT HOLDERS AND THEIR CONTRIBUTORS 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=gtypist
-VERSION=${VERSION:-2.8.3}
+VERSION=${VERSION:-2.8.5}
 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
@@ -59,24 +72,25 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
+  --infodir=/usr/info \
   --mandir=/usr/man \
-  --infodir=/usr/info
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --build=$ARCH-slackware-linux
 
 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
 
-( 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
-)
+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
 
 rm -f $PKG/usr/info/dir
-gzip -9 $PKG/usr/info/*.info*
+find $PKG/usr/info -type f -exec gzip -9 {} \;
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
@@ -84,6 +98,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 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.${PKGTYPE:-tgz}
diff --git a/academic/gtypist/gtypist.info b/academic/gtypist/gtypist.info
index 01b9a06767..b40ee8cd2c 100644
--- a/academic/gtypist/gtypist.info
+++ b/academic/gtypist/gtypist.info
@@ -1,10 +1,10 @@
 PRGNAM="gtypist"
-VERSION="2.8.3"
+VERSION="2.8.5"
 HOMEPAGE="http://www.gnu.org/software/gtypist/"
-DOWNLOAD="ftp://ftp.gnu.org/gnu/gtypist/gtypist-2.8.3.tar.gz"
-MD5SUM="ea3c7faa01d7052c156d50fa0e0506b8"
+DOWNLOAD="ftp://ftp.gnu.org/gnu/gtypist/gtypist-2.8.5.tar.gz"
+MD5SUM="49ea1bb5ac51c74a9c75c0dd6d890463"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Grigorios Bouzakis"
-EMAIL="grbzks@gmail.com"
+EMAIL="grbzks@xsmail.com"
 APPROVED="dsomero"
diff --git a/academic/gtypist/slack-desc b/academic/gtypist/slack-desc
index 43a5823271..ed33716cd3 100644
--- a/academic/gtypist/slack-desc
+++ b/academic/gtypist/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
        |-----handy-ruler------------------------------------------------------|
-gtypist: GNU Typist (Universal Typing Tutor)
-gtypist: 
-gtypist: GNU Typist (or gtypist) is free software that assists you in
-gtypist: learning to type correctly.
-gtypist: 
-gtypist: It is intended to be used on a raw terminal without graphics.  It
-gtypist: has been compiled and used in Unix (GNU/Linux, Aix, Solaris, OpenBSD)
-gtypist: and also in DOS/Windows (DOS 6.22, Windows 98).
-gtypist: 
-gtypist: 
-gtypist: 
+gtypist: GNU Typist (universal typing tutor)
+gtypist:
+gtypist: GNU Typist is a universal typing tutor. You can learn correct typing
+gtypist: and improve your skills by practicing its exercises on a regular basis.
+gtypist:
+gtypist: Homepage: http://www.gnu.org/software/gtypist
+gtypist:
+gtypist:
+gtypist:
+gtypist:
+gtypist: