4 files changed, 16 insertions, 14 deletions
diff --git a/academic/tuxtype2/README b/academic/tuxtype2/README
index 17a44b12528d8..fcf884d7e0d4b 100644
--- a/academic/tuxtype2/README
+++ b/academic/tuxtype2/README
@@ -1,3 +1,5 @@
 "Tux Typing" is an educational typing tutor for children. It
 features several different types of gameplay, at a variety of
 difficulty levels.
+
+This requires SDL_Pango.
diff --git a/academic/tuxtype2/tuxtype2.SlackBuild b/academic/tuxtype2/tuxtype2.SlackBuild
index 0d5bae182560c..85746bda29040 100644
--- a/academic/tuxtype2/tuxtype2.SlackBuild
+++ b/academic/tuxtype2/tuxtype2.SlackBuild
@@ -23,16 +23,15 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=tuxtype2
-VERSION=${VERSION:-1.5.3}
+VERSION=${VERSION:-1.8.0}
+SRCPATH=tuxtype_w_fonts
 BUILD=${BUILD:-2}
 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,9 +58,9 @@ fi
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP || exit 1
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* || exit 1
-cd $PRGNAM-$VERSION || exit 1
+rm -rf $SRCPATH-$VERSION
+tar xvf $CWD/$SRCPATH-$VERSION.tar.?z* || exit 1
+cd $SRCPATH-$VERSION || exit 1
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -88,7 +87,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 mkdir -p $PKG/usr/share/{applications,pixmaps}
 cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
 ( cd $PKG/usr/share/pixmaps
-  ln -s ../tuxtype2/tuxtype2.ico tuxtype2.png
+  ln -s ../tuxtype/images/icons/icon.png tuxtype2.png
 )
 
 mkdir -p $PKG/install
diff --git a/academic/tuxtype2/tuxtype2.desktop b/academic/tuxtype2/tuxtype2.desktop
index 4f65a3a253f09..6664bbe0c7f38 100644
--- a/academic/tuxtype2/tuxtype2.desktop
+++ b/academic/tuxtype2/tuxtype2.desktop
@@ -1,8 +1,9 @@
+
 [Desktop Entry]
 Encoding=UTF-8
 Name=Tux Typing 2
 GenericName=Educational Typing Tutor
-Exec=tuxtype2
+Exec=tuxtype
 Terminal=false
 Type=Application
 Categories=Application;Education
diff --git a/academic/tuxtype2/tuxtype2.info b/academic/tuxtype2/tuxtype2.info
index c88d7d16aff6b..4780d7c2a6892 100644
--- a/academic/tuxtype2/tuxtype2.info
+++ b/academic/tuxtype2/tuxtype2.info
@@ -1,10 +1,10 @@
 PRGNAM="tuxtype2"
-VERSION="1.5.3"
+VERSION="1.8.0"
 HOMEPAGE="http://tuxtype.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/tuxtype/tuxtype2-1.5.3.tar.bz2"
-MD5SUM="ca04e65d3b19ddeeedb8a49147ed642b"
+DOWNLOAD="http://downloads.sourceforge.net/tuxtype/tuxtype_w_fonts-1.8.0.tar.gz"
+MD5SUM="7294fc19db32a3134bd4112e9cb604c4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-MAINTAINER="Frank Caraballo"
-EMAIL="fecaraballo{at}gmail{dot}com"
-APPROVED="dsomero"
+MAINTAINER="Jon Hulka"
+EMAIL="jon.hulka{at}gmail{dot}com"
+APPROVED="Niels Horn"