games/defcon: Updated for version 1.42

4 files changed, 22 insertions, 25 deletions

diff --git a/games/defcon/README b/games/defcon/README
index d73a089338..be891348eb 100644
--- a/games/defcon/README
+++ b/games/defcon/README
@@ -1,7 +1,12 @@
-DEFCON is a multiplayer simulation of global thermonuclear war developed by 
-Introversion. By default, the game functions as a demo, which can be unlocked
-by buying a license key from Introversion.
+DEFCON is a multiplayer simulation of global thermonuclear war,
+developed by Introversion. By default the game functions as a demo,
+which can be unlocked by buying a license key from Introversion.
 
-In addition to the Linux archive that is listed in the defcon.info file, 
-you will need the sounds.dat file for the game to build this package. 
-This file is available from http://www.everybody-dies.com/downloads/sounds.dat
+In addition to the Linux archive, that is listed in the defcon.info
+file, you will need the sounds.dat file for the game to build this
+package. This file is available from:
+
+http://www.everybody-dies.com/downloads/sounds.dat
+
+The DEFCON website can be found at: 
+http://www.everybody-dies.com/
diff --git a/games/defcon/defcon.SlackBuild b/games/defcon/defcon.SlackBuild
index 3e5a2d1ede..20c6e4eb5b 100644
--- a/games/defcon/defcon.SlackBuild
+++ b/games/defcon/defcon.SlackBuild
@@ -22,41 +22,33 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# Exit on most errors
+set -e
+
 PRGNAM=defcon
 VERSION=1.42
+ARCHIVEVER=v1.42
 ARCH=i686
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-ARCHIVEVER="v${VERSION}"
-
-# Go ahead and bail out now if the user didn't follow directions in the README
-if [ ! -e $CWD/sounds.dat ]; then
-  echo ; echo "Did you read $CWD/README?"
-  echo "You need this: http://www.everybody-dies.com/downloads/sounds.dat" 
-  echo ; exit 1
-fi
-
-set -e # Exit on most errors
-
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$ARCHIVEVER.tar.gz
+tar xzvf $CWD/$PRGNAM-$ARCHIVEVER.tar.gz
 cd $PRGNAM-$ARCHIVEVER
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
 mkdir -p $PKG/usr/lib/$PRGNAM $PKG/usr/bin
 cp -a lib/* $PKG/usr/lib/$PRGNAM
-install -m 0644 $CWD/sounds.dat $PKG/usr/lib/$PRGNAM
-install -m 0755 $CWD/defcon.sh $PKG/usr/bin/defcon
+install -m0644 -g root -o root $CWD/sounds.dat $PKG/usr/lib/$PRGNAM
+install -m0755 -g root -o root $CWD/defcon.sh $PKG/usr/bin/defcon
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a doc/README-SDL.txt doc/linux.txt $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/games/defcon/defcon.info b/games/defcon/defcon.info
index e30fec8c9f..c1ae81eb46 100644
--- a/games/defcon/defcon.info
+++ b/games/defcon/defcon.info
@@ -5,4 +5,4 @@ DOWNLOAD="http://download.introversion.co.uk/defcon/linux/defcon-v1.42.tar.gz"
 MD5SUM="df7ee425ebfa88615efc26508564feca"
 MAINTAINER="Daniel de Kok"
 EMAIL="danieldk@pobox.com"
-APPROVED="rworkman"
+APPROVED="dsomero"
diff --git a/games/defcon/slack-desc b/games/defcon/slack-desc
index 6a333442d6..a2f5386bae 100644
--- a/games/defcon/slack-desc
+++ b/games/defcon/slack-desc
@@ -6,10 +6,10 @@
 # leave one space after the ':'.
 
       |-----handy-ruler------------------------------------------------------|
-defcon: defcon (Everybody Dies!)
+defcon: defcon (everybody dies)
 defcon: 
-defcon: DEFCON is a multiplayer simulation of global thermonuclear war
-defcon: developed by Introversion. By default, the game functions as a demo,
+defcon: DEFCON is a multiplayer simulation of global thermonuclear war,
+defcon: developed by Introversion. By default the game functions as a demo,
 defcon: which can be unlocked by buying a license key from Introversion.
 defcon: 
 defcon: The DEFCON website can be found at: