games/gargoyle: various build improvements

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>

6 files changed, 24 insertions, 21 deletions

diff --git a/games/gargoyle/README b/games/gargoyle/README
index a6d83240ea..e173fc2b7b 100644
--- a/games/gargoyle/README
+++ b/games/gargoyle/README
@@ -1,7 +1,6 @@
-The Gargoyle interactive fiction interpreter.
+Gargoyle is an interactive fiction interpreter.
 
-Supports most formats.
+The default setup uses the Linux Libertine font, which you 
+can download at http://www.linuxlibertine.org
 
-Once you have it installed, configure it by editing /etc/garglk.ini
-
-Requires jam, SDL_sound, smpeg.
+This requires jam, SDL_sound, and smpeg.
diff --git a/games/gargoyle/doinst.sh b/games/gargoyle/doinst.sh
index 94e2207419..595fdd454b 100644
--- a/games/gargoyle/doinst.sh
+++ b/games/gargoyle/doinst.sh
@@ -12,3 +12,7 @@ config() {
 }
 
 config etc/garglk.ini.new
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
diff --git a/games/gargoyle/gargoyle.SlackBuild b/games/gargoyle/gargoyle.SlackBuild
index a3b76a3d2a..64720bf2c5 100644
--- a/games/gargoyle/gargoyle.SlackBuild
+++ b/games/gargoyle/gargoyle.SlackBuild
@@ -2,11 +2,11 @@
 
 # Slackware build script for gargoyle
 
-# Written by Dugan Chen (dugan [underscore] c [at] fastmail [dot] fm)
+# Written by Dugan Chen (thedoogster@gmail.com)
 
 PRGNAM=gargoyle	
 VERSION=${VERSION:-2011.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -64,23 +64,21 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/bin
-cd $PKG/usr/bin
+install -m755 $CWD/gargoyle.sh $PKG/usr/bin/gargoyle
 
-( ln -sf ../libexec/gargoyle/gargoyle . )
-
-cd $PKG/usr/lib$LIBDIRSUFFIX
-
-( ln -sf ./gargoyle/libgarglk.so . )
-
-cd $TMP/$PRGNAM-$VERSION
+ln -s gargoyle/libgarglk.so $PKG/usr/lib${LIBDIRSUFFIX}/libgarglk.so
 
 mkdir -p $PKG/etc
 cp garglk/garglk.ini $PKG/etc/garglk.ini.new
 
+mkdir -p $PKG/usr/share/pixmaps
+cp garglk/gargoyle-house.png $PKG/usr/share/pixmaps
+
+mkdir -p $PKG/usr/share/applications
+cp garglk/gargoyle.desktop $PKG/usr/share/applications
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  INSTALL \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a INSTALL $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/games/gargoyle/gargoyle.info b/games/gargoyle/gargoyle.info
index 93c6079ebb..accf19cebb 100644
--- a/games/gargoyle/gargoyle.info
+++ b/games/gargoyle/gargoyle.info
@@ -6,5 +6,5 @@ MD5SUM="41b91504ff237f132b761fa3c66d416a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Dugan Chen"
-EMAIL="dugan [underscore] c [at] fastmail [dot] fm"
-APPROVED="Niels Horn"
+EMAIL="thedoogster@gmail.com"
+APPROVED="rworkman"
diff --git a/games/gargoyle/gargoyle.sh b/games/gargoyle/gargoyle.sh
new file mode 100644
index 0000000000..3e1527d3c8
--- /dev/null
+++ b/games/gargoyle/gargoyle.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+LD_LIBRARY_PATH=/usr/libexec/gargoyle:$LD_LIBRARY_PATH /usr/libexec/gargoyle/gargoyle $*
diff --git a/games/gargoyle/slack-desc b/games/gargoyle/slack-desc
index 3f2be98d69..cc8498470f 100644
--- a/games/gargoyle/slack-desc
+++ b/games/gargoyle/slack-desc
@@ -14,6 +14,6 @@ gargoyle:
 gargoyle: Agility, Alan 2 and 3, Frotz (glk port), Glulxe, Hugo, Level 9,
 gargoyle: Magnetic, Scare, Tads 2 and 3.
 gargoyle:
-gargoyle:
 gargoyle: http://ccxvii.net/gargoyle/ 
 gargoyle:
+gargoyle: