games/defcon: Updated for version 1.42

4 files changed, 32 insertions, 32 deletions

diff --git a/games/defcon/README b/games/defcon/README
index be891348eb..d73a089338 100644
--- a/games/defcon/README
+++ b/games/defcon/README
@@ -1,12 +1,7 @@
-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
-
-The DEFCON website can be found at: 
-http://www.everybody-dies.com/
+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
diff --git a/games/defcon/defcon.SlackBuild b/games/defcon/defcon.SlackBuild
index 0a3db027a7..3e5a2d1ede 100644
--- a/games/defcon/defcon.SlackBuild
+++ b/games/defcon/defcon.SlackBuild
@@ -22,39 +22,44 @@
 # 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.4beta2b
-ARCHIVEVER=v1.4-beta2b
+VERSION=1.42
 ARCH=i686
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-CWD=`pwd`
+
+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 xzvf $CWD/$PRGNAM-$ARCHIVEVER.tar.gz
+tar xvf $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
+mkdir -p $PKG/usr/lib/$PRGNAM $PKG/usr/bin
 cp -a lib/* $PKG/usr/lib/$PRGNAM
-cp $CWD/sounds.dat $PKG/usr/lib/$PRGNAM
-mkdir $PKG/usr/bin
-cp $CWD/defcon.sh $PKG/usr/bin/defcon
-chmod 0755 $PKG/usr/bin/defcon
+install -m 0644 $CWD/sounds.dat $PKG/usr/lib/$PRGNAM
+install -m 0755 $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
+cp -a doc/README-SDL.txt doc/linux.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/games/defcon/defcon.info b/games/defcon/defcon.info
index 09c9a00521..e30fec8c9f 100644
--- a/games/defcon/defcon.info
+++ b/games/defcon/defcon.info
@@ -1,8 +1,8 @@
 PRGNAM="defcon"
-VERSION="1.4beta2b"
+VERSION="1.42"
 HOMEPAGE="http://www.everybody-dies.com/"
-DOWNLOAD="http://www.everybody-dies.com/downloads/defcon-v1.4-beta2b.tar.gz"
-MD5SUM="8ce864ff256c287a06dbe50b4f640f25"
+DOWNLOAD="http://download.introversion.co.uk/defcon/linux/defcon-v1.42.tar.gz"
+MD5SUM="df7ee425ebfa88615efc26508564feca"
 MAINTAINER="Daniel de Kok"
 EMAIL="danieldk@pobox.com"
-APPROVED="elohim"
+APPROVED="rworkman"
diff --git a/games/defcon/slack-desc b/games/defcon/slack-desc
index a2f5386bae..6a333442d6 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: