games/crossfire-client: Updated for version 1.9.1

4 files changed, 18 insertions, 21 deletions

diff --git a/games/crossfire-client/README b/games/crossfire-client/README
index fd74a9ca8f..3443b65066 100644
--- a/games/crossfire-client/README
+++ b/games/crossfire-client/README
@@ -12,4 +12,3 @@ it isn't as well tested and isn't as stable as the GTK+1 (gcfclient) or CF
 launch gcfclient instead of gcfclient2.  This can be changed with a simple 
 modification to the /usr/share/applications/crossfire-client.desktop file
 after installing the package - change the "Exec" line.
-
diff --git a/games/crossfire-client/crossfire-client.SlackBuild b/games/crossfire-client/crossfire-client.SlackBuild
index 898c157f71..806faa6dbd 100644
--- a/games/crossfire-client/crossfire-client.SlackBuild
+++ b/games/crossfire-client/crossfire-client.SlackBuild
@@ -9,11 +9,6 @@
 
 # Modified by the SlackBuilds.org project
 
-if [ "$(id -u)" != "0" ]; then
-    echo "This script must be run as root!"
-    exit
-fi
-
 set -e
 
 NAME=crossfire-client
@@ -21,7 +16,7 @@ VERSION=1.9.1
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-CWD=`pwd`
+CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=${PKG:-$TMP/package-$NAME}
 OUTPUT=${OUTPUT:-/tmp}
@@ -32,7 +27,6 @@ cd $TMP
 rm -rf $NAME-$VERSION
 tar zxvf $CWD/$NAME-$VERSION.tar.gz
 cd $NAME-$VERSION
-
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
@@ -45,30 +39,26 @@ fi
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
-    --prefix=/usr \
-    --exec-prefix=/usr \
-    --bindir=/usr/games \
-    --disable-debug \
-    --enable-gtk \
-    --enable-sdl
+  --prefix=/usr \
+  --exec-prefix=/usr \
+  --bindir=/usr/games \
+  --disable-debug \
+  --enable-gtk \
+  --enable-sdl
 
 make
 make install-strip DESTDIR=$PKG
 
 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
+for i in $(find $PKG/usr/man -type l) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/share/{pixmaps,applications}
 install -m 0644 pixmaps/48x48.png $PKG/usr/share/pixmaps/crossfire-client.png
 install -m 0644 gtk/crossfire-client.desktop $PKG/usr/share/applications/
 
-# Fix the icon path in the desktop file
-sed -i 's%Icon=crossfire-client%Icon=/usr/share/pixmaps/crossfire-client.png%' \
-  $PKG/usr/share/applications/crossfire-client.desktop
-
 mkdir -p $PKG/usr/doc/$NAME-$VERSION
 cp -a AUTHORS COPYING ChangeLog INSTALL License NEWS NOTES README TODO \
-    $PKG/usr/doc/$NAME-$VERSION
+  $PKG/usr/doc/$NAME-$VERSION
 cat $CWD/$NAME.SlackBuild > $PKG/usr/doc/$NAME-$VERSION/$NAME.SlackBuild
 
 mkdir -pv $PKG/install
diff --git a/games/crossfire-client/crossfire-client.info b/games/crossfire-client/crossfire-client.info
index 83100d5563..8995605fd2 100644
--- a/games/crossfire-client/crossfire-client.info
+++ b/games/crossfire-client/crossfire-client.info
@@ -5,4 +5,4 @@ DOWNLOAD="http://dl.sourceforge.net/crossfire/crossfire-client-1.9.1.tar.gz"
 MD5SUM="e7084c22c1f2074c95fe34331ac2ceae"
 MAINTAINER="hollywoodb"
 EMAIL="hollywoodb@fastmail.fm"
-APPROVED="robw810"
+APPROVED="rworkman"
diff --git a/games/crossfire-client/slack-desc b/games/crossfire-client/slack-desc
index 78b25bc893..349066563d 100644
--- a/games/crossfire-client/slack-desc
+++ b/games/crossfire-client/slack-desc
@@ -1,3 +1,11 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+      |-----handy-ruler------------------------------------------------------|
 crossfire-client: crossfire-client (client for Crossfire multiplayer RPG)
 crossfire-client:
 crossfire-client: Crossfire is an open source, cooperative multiplayer