games/yamagi-quake2: Updated for version 5.34.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>

3 files changed, 63 insertions, 42 deletions

diff --git a/games/yamagi-quake2/README b/games/yamagi-quake2/README
index 5830a34c3a2b..2474ca700e9d 100644
--- a/games/yamagi-quake2/README
+++ b/games/yamagi-quake2/README
@@ -1,14 +1,11 @@
 This is an enhanced client for Id Software's legendary Quake II.  It focuses on
 single-player. Features include rock-solid stability and AMD64 support.
 
-OpenAL is a recommended optional dependency. Install it first, then
-do:
-
-	WITH_OPENAL=yes ./yamagi-quake2.SlackBuild
+OpenAL and SDL2 are recommended optional dependencies.
 
 Before playing, copy your Quake2 data files into the appropriate subdirectories
 of /usr/share/quake2.  Please refer to the README files in
-/usr/doc/yamagi-quake2-5.31/ for details.
+/usr/doc/yamagi-quake2-5.34/ for details.
 
 To get a reasonable default configuration, copy
-/usr/doc/yamagi-quake2-5.31/yq2.cfg to your baseq2 directory.
+/usr/doc/yamagi-quake2-5.34/yq2.cfg to your baseq2 directory.
diff --git a/games/yamagi-quake2/yamagi-quake2.SlackBuild b/games/yamagi-quake2/yamagi-quake2.SlackBuild
index 62dd32cb3178..c9fb85b7418e 100644
--- a/games/yamagi-quake2/yamagi-quake2.SlackBuild
+++ b/games/yamagi-quake2/yamagi-quake2.SlackBuild
@@ -25,19 +25,17 @@
 # Includes components from the Arch Linux AUR builds.
 
 PRGNAM=yamagi-quake2
-VERSION=${VERSION:-5.32}
+VERSION=${VERSION:-5.34}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-CTFVER=${CTFVER:-1.03}
-XATRIXVER=${XATRIXVER:-2.03}
-ROGUEVER=${ROGUEVER:-2.02}
-
-WITH_OPENAL=${WITH_OPENAL:-no}
+CTFVER=${CTFVER:-1.04}
+XATRIXVER=${XATRIXVER:-2.04}
+ROGUEVER=${ROGUEVER:-2.03}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -48,8 +46,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -80,12 +78,18 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-make WITH_OPENAL=$WITH_OPENAL
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+cd ..
 
 mkdir -p $PKG/usr/{bin,share/quake2/{ctf,xatrix,rogue}}
-cp -r release/* $PKG/usr/share/quake2
+cp -r build/release/* $PKG/usr/share/quake2
 mkdir -p $PKG/usr/share/quake2/baseq2
 cp stuff/yq2.cfg $PKG/usr/share/quake2/baseq2
 mkdir -p $PKG/usr/share/pixmaps
@@ -107,10 +111,16 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
- make
-cp -r release/* $PKG/usr/share/quake2/ctf
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  cp -r Release/* $PKG/usr/share/quake2/ctf
+cd ..
 install -D -m 755 $CWD/ctf.sh $PKG/usr/bin/ctf
 
 # Mission Pack 1 support
@@ -126,10 +136,17 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
- make
-cp -r release/* $PKG/usr/share/quake2/xatrix
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  cp -r Release/* $PKG/usr/share/quake2/xatrix
+cd ..
+
 install -D -m 755 $CWD/xatrix.sh $PKG/usr/bin/xatrix
 
 # Mission Pack 2 support
@@ -145,10 +162,17 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
- make
-cp -r release/* $PKG/usr/share/quake2/rogue
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  cp -r Release/* $PKG/usr/share/quake2/rogue
+cd ..
+
 install -D -m 755 $CWD/rogue.sh $PKG/usr/bin/rogue
 
 find $PKG/usr/share/quake2 -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
@@ -161,7 +185,7 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/{ctf-$CTFVER,quake2-xatrix-$XATRIXVER,qua
 cd $TMP
 
 cp -a \
-  quake2-$VERSION/{CHANGELOG,CONTRIBUTE,LICENSE,README,stuff/yq2.cfg} \
+  quake2-$VERSION/{CHANGELOG,CONTRIBUTE,LICENSE,README.md,stuff/yq2.cfg} \
   $PKG/usr/doc/$PRGNAM-$VERSION
 
 cp -a \
diff --git a/games/yamagi-quake2/yamagi-quake2.info b/games/yamagi-quake2/yamagi-quake2.info
index 17b0bbdbab8b..73467151fba6 100644
--- a/games/yamagi-quake2/yamagi-quake2.info
+++ b/games/yamagi-quake2/yamagi-quake2.info
@@ -1,16 +1,16 @@
 PRGNAM="yamagi-quake2"
-VERSION="5.32"
+VERSION="5.34"
 HOMEPAGE="http://www.yamagi.org/quake2/"
-DOWNLOAD="http://deponie.yamagi.org/quake2/quake2-5.32.tar.xz \
-          http://deponie.yamagi.org/quake2/quake2-ctf-1.03.tar.xz \
-          http://deponie.yamagi.org/quake2/quake2-xatrix-2.03.tar.xz  \
-          http://deponie.yamagi.org/quake2/quake2-rogue-2.02.tar.xz"
-MD5SUM="bd16a8e0053777ab082b9354cd0212fc \
-        aa79d20551a662c9e34b2da7a0e9e796 \
-        403daa902c3d5894fa5b89231bc3da8b \
-        f8167234a9fbcbb92d225b8a6d17bb05"
+DOWNLOAD="http://deponie.yamagi.org/quake2/quake2-5.34.tar.xz \
+          http://deponie.yamagi.org/quake2/quake2-ctf-1.04.tar.xz \
+          http://deponie.yamagi.org/quake2/quake2-xatrix-2.04.tar.xz  \
+          http://deponie.yamagi.org/quake2/quake2-rogue-2.03.tar.xz"
+MD5SUM="115a336512e2609486ce4fcd511ef808 \
+        b7d27b126174eeb49bff97bb20218b64 \
+        a2290b32c608566d06c6e616a92fc8ef \
+        172ae099dedb509e06dde1510835c07d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="SDL2"
+REQUIRES=""
 MAINTAINER="Dugan Chen"
 EMAIL="thedoogster [at] gmail [dot] com"