games/darkplaces: Updated for version 20110628.

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>

5 files changed, 35 insertions, 44 deletions

diff --git a/games/darkplaces/README b/games/darkplaces/README
index 6b019fecbd..6fa0df8963 100644
--- a/games/darkplaces/README
+++ b/games/darkplaces/README
@@ -1,18 +1,22 @@
 darkplaces (crossplatform Quake modification)
 
-DarkPlaces is a gameplay modification and a source port engine based on the 
-computer game Quake.  It adds enhanced network code, with asynchronous delta 
+DarkPlaces is a gameplay modification and a source port engine based on the
+computer game Quake.  It adds enhanced network code, with asynchronous delta
 compression, a built in server browser, real-time lighting, and bump mapping.
 It makes use of the OpenGL Shading Language and supports Ogg Vorbis.
 
-By default the binaries will not be built from source, we will instead use 
-the supplied binaries.  if you wish to build your own binaries from source 
-them pass SOURCE=yes to the build.  
+By default the binaries will not be built from source, we will instead use
+the supplied binaries.  if you wish to build your own binaries from source
+them pass SOURCE=YES to the build.
 
-Also the darkplaces game modifications are disabled by default to maintain 
-that "classic" look of the original quake.  To enable the modifications, 
+The application launcher will launch the OpenGL version of Quake, however
+if you would prefer it to launch the SDL version then pass SDL=YES to the
+build.
+
+Also the darkplaces game modifications are disabled by default to maintain
+that "classic" look of the original quake.  To enable the modifications,
 pass DPMOD=YES to the build.
 
-*NOTE* DarkPlaces is only a game engine modification; you still need the 
+*NOTE* DarkPlaces is only a game engine modification; you still need the
 original quake *.pak game files to play quake.  See README.SLACKWARE for
 more information on this.
diff --git a/games/darkplaces/darkplaces-sdl.desktop b/games/darkplaces/darkplaces-sdl.desktop
deleted file mode 100644
index 98f6ff7a7f..0000000000
--- a/games/darkplaces/darkplaces-sdl.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Quake (SDL)
-GenericName=Darkplaces Port of idsoftware's Quake (Software)
-Exec=darkplaces-sdl
-Terminal=false
-Type=Application
-Categories=Game;
-Icon=quake
-StartupNotify=false
diff --git a/games/darkplaces/darkplaces.SlackBuild b/games/darkplaces/darkplaces.SlackBuild
index df4960e9aa..cdf4fa3add 100644
--- a/games/darkplaces/darkplaces.SlackBuild
+++ b/games/darkplaces/darkplaces.SlackBuild
@@ -3,9 +3,11 @@
 # Slackware build script for darkplaces
 
 # Written by M.Dinslage (daedra1980@gmail.com)
+# Big thanks to Robby Workman for tweaks and
+# various script cleanups.
 
 PRGNAM=darkplaces
-VERSION=${VERSION:-20100408}
+VERSION=${VERSION:-20110628}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -22,8 +24,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-SRCDIR=${SRCDIR:-engine20100408}
-SRCVER=${SRCVER:-enginesource20100408}
+SRCDIR=${SRCDIR:-engine20110628}
+SRCVER=${SRCVER:-enginesource20110628}
 MODVER=${MODVER:-darkplacesmod20080808}
 
 # By default we won't add the darkplaces game mods
@@ -32,6 +34,9 @@ DPMOD=${DPMOD:-"NO"}
 # Pass SOURCE=YES if you want to build you binaries from source
 SOURCE=${SOURCE:-"NO"}
 
+# By default application launcher will use opengl version
+SDL=${SDL:-"NO"}
+
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -47,7 +52,7 @@ else
   # might not work at all, but we could try :)
   SLKCFLAGS="-O2"
   BINARCH=$ARCH
-  SOURCE="yes"
+  SOURCE="YES"
 fi
 
 set -e
@@ -58,14 +63,9 @@ cd $TMP
 rm -rf $PRGNAM
 mkdir -p $PRGNAM
 cd $PRGNAM
-rm -rf $PRGNAM$SRCDIR	
+rm -rf $PRGNAM$SRCDIR
 unzip $CWD/$PRGNAM$SRCDIR.zip
 unzip $PRGNAM$SRCVER.zip # this is in the first zip file
-
-#SRCDIR=${SRCDIR:-engine20100408}
-#SRCVER=${SRCVER:-enginesource20100408}
-#MODVER=${MODVER:-darkplacesmod20080808}
-
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -73,16 +73,8 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Let the Makefile set its own flags; 
+# Let the Makefile set its own flags;
 # this way the precompiled and from-source binaries use the same flags
-#CFLAGS="$SLKCFLAGS" \
-#CXXFLAGS="$SLKCFLAGS" \
-#LDFLAGS="$SLKLDFLAGS" \
-
-SRCDIR=${SRCDIR:-engine20100408}
-SRCVER=${SRCVER:-enginesource20100408}
-MODVER=${MODVER:-darkplacesmod20080808}
-
 if [ "$SOURCE" != "NO" ]; then
   cd $PRGNAM
   make release
@@ -111,10 +103,14 @@ done
 
 # Add application launcher
 mkdir -p $PKG/usr/share/{applications,pixmaps}
-cat $CWD/$PRGNAM-glx.desktop > $PKG/usr/share/applications/$PRGNAM-glx.desktop
-cat $CWD/$PRGNAM-sdl.desktop > $PKG/usr/share/applications/$PRGNAM-sdl.desktop
+cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
 cat $CWD/quake.png > $PKG/usr/share/pixmaps/quake.png
 
+# Make application launcher execute SDL version if requested.
+if [ "$SDL" != "NO" ]; then
+   sed -i 's,darkplaces-glx,darkplaces-sdl,g' $PKG/usr/share/applications/$PRGNAM.desktop
+fi
+
 if [ "$DPMOD" != "NO" ]; then
   unzip $CWD/$MODVER.zip
   chown -R root:root dpmod
diff --git a/games/darkplaces/darkplaces-glx.desktop b/games/darkplaces/darkplaces.desktop
index c806d818fd..796f1cfcd6 100644
--- a/games/darkplaces/darkplaces-glx.desktop
+++ b/games/darkplaces/darkplaces.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
-Name=Quake (GLX)
-GenericName=Darkplaces port of idsoftware's Quake (OpenGL)
+Name=Quake
+GenericName=Darkplaces port of idsoftware's Quake
 Exec=darkplaces-glx
 Terminal=false
 Type=Application
diff --git a/games/darkplaces/darkplaces.info b/games/darkplaces/darkplaces.info
index d52e814ffb..1031f0559e 100644
--- a/games/darkplaces/darkplaces.info
+++ b/games/darkplaces/darkplaces.info
@@ -1,12 +1,12 @@
 PRGNAM="darkplaces"
-VERSION="20100408"
+VERSION="20110628"
 HOMEPAGE="http://icculus.org/twilight/darkplaces/"
-DOWNLOAD="http://icculus.org/twilight/darkplaces/files/darkplacesengine20100408.zip \
+DOWNLOAD="http://icculus.org/twilight/darkplaces/files/darkplacesengine20110628.zip \
           http://icculus.org/twilight/darkplaces/files/darkplacesmod20080808.zip"
-MD5SUM="24e7e417b32cfb06ff915f6d8f251e80 \
+MD5SUM="c42103732cedfcf385ee959db9db6cb4 \
         94fd7b0f2aca505de37b48926786c863"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="M.Dinslage"
 EMAIL="daedra1980@gmail.com"
-APPROVED="rworkman"
+APPROVED="dsomero"