4 files changed, 41 insertions, 13 deletions
diff --git a/games/yamagi-quake2/README b/games/yamagi-quake2/README
index 7499c894f9..2edb6f96ca 100644
--- a/games/yamagi-quake2/README
+++ b/games/yamagi-quake2/README
@@ -4,4 +4,4 @@ on single-player. Features include rock-solid stability and AMD64 support.
 This only installs the Yamagi-Quake2 source port. Before playing it, you
 need to copy your Quake2 data files into the appropriate subdirectories of
 /usr/share/quake2.  Please refer to the README files in
-/usr/doc/yamagi-quake-3.00/ for details.
+/usr/doc/yamagi-quake2-4.00/ for details.
diff --git a/games/yamagi-quake2/ctf.sh b/games/yamagi-quake2/ctf.sh
new file mode 100644
index 0000000000..ad7d3477f8
--- /dev/null
+++ b/games/yamagi-quake2/ctf.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /usr/share/quake2/quake2 +set basedir /usr/share/quake2 +set game ctf $*
diff --git a/games/yamagi-quake2/yamagi-quake2.SlackBuild b/games/yamagi-quake2/yamagi-quake2.SlackBuild
index 70f180873d..e5549195c2 100644
--- a/games/yamagi-quake2/yamagi-quake2.SlackBuild
+++ b/games/yamagi-quake2/yamagi-quake2.SlackBuild
@@ -7,10 +7,11 @@
 # Includes components from the Arch Linux AUR builds.
 
 PRGNAM=yamagi-quake2
-VERSION=${VERSION:-3.00}
+VERSION=${VERSION:-4.00}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+CTFVER=${CTFVER:-1.00}
 XATRIXVER=${XATRIXVER:-1.06}
 ROGUEVER=${ROGUEVER:-1.04}
 
@@ -43,13 +44,13 @@ fi
 
 set -e 
 
-rm -rf $PKG $TMP/{quake2-$VERSION,quake2-xatrix-$XATRIXVER,quake2-rogue-$ROGUEVER}
+rm -rf $PKG $TMP/{quake2-$VERSION,ctf-$CTFVER,quake2-xatrix-$XATRIXVER,quake2-rogue-$ROGUEVER}
 mkdir -p $TMP $PKG $OUTPUT
 
 # Quake 2
 
 cd $TMP
-tar xvf $CWD/quake2-$VERSION.tar.bz2
+tar xvf $CWD/quake2-$VERSION.tar.xz
 cd quake2-$VERSION
 
 chown -R root:root .
@@ -63,10 +64,29 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
  make
 
-mkdir -p $PKG/usr/{bin,share/quake2/{xatrix,rogue}}
+mkdir -p $PKG/usr/{bin,share/quake2/{ctf,xatrix,rogue}}
 cp -r release/* $PKG/usr/share/quake2
 install -D -m 755 $CWD/quake2.sh $PKG/usr/bin/quake2
 
+# CTF Support
+
+cd $TMP
+tar xvf $CWD/quake2-ctf-$CTFVER.tar.xz
+cd ctf-$CTFVER
+
+chown -R root:root .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -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
+install -D -m 755 $CWD/ctf.sh $PKG/usr/bin/ctf
+
 # Mission Pack 1 support
 
 cd $TMP
@@ -110,20 +130,24 @@ find $PKG/usr/share/quake2 -print0 | xargs -0 file | grep -e "executable" -e "sh
 
 # Documentation
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/{quake2-xatrix-$XATRIXVER,quake2-rogue-$ROGUEVER}
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/{ctf-$CTFVER,quake2-xatrix-$XATRIXVER,quake2-rogue-$ROGUEVER}
 
 cd $TMP
 
 cp -a \
-  quake2-$VERSION/README \
+  quake2-$VERSION/{CHANGELOG,LICENSE,README} \
   $PKG/usr/doc/$PRGNAM-$VERSION
 
 cp -a \
-  quake2-xatrix-$XATRIXVER/README \
+  ctf-$CTFVER/{LICENSE,README} \
+  $PKG/usr/doc/$PRGNAM-$VERSION/ctf-$CTFVER
+
+cp -a \
+  quake2-xatrix-$XATRIXVER/{LICENSE,README} \
   $PKG/usr/doc/$PRGNAM-$VERSION/quake2-xatrix-$XATRIXVER
 
 cp -a \
-  quake2-rogue-$ROGUEVER/README \
+  quake2-rogue-$ROGUEVER/{LICENSE,README} \
   $PKG/usr/doc/$PRGNAM-$VERSION/quake2-rogue-$ROGUEVER
 
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/games/yamagi-quake2/yamagi-quake2.info b/games/yamagi-quake2/yamagi-quake2.info
index 5a06c88d59..3e180e8241 100644
--- a/games/yamagi-quake2/yamagi-quake2.info
+++ b/games/yamagi-quake2/yamagi-quake2.info
@@ -1,10 +1,12 @@
 PRGNAM="yamagi-quake2"
-VERSION="3.00"
+VERSION="4.00"
 HOMEPAGE="http://www.yamagi.org/quake2/"
-DOWNLOAD="http://deponie.yamagi.org/quake2/quake2-3.00.tar.bz2  \
-    http://deponie.yamagi.org/quake2/quake2-xatrix-1.06.tar.bz2 \
+DOWNLOAD="http://deponie.yamagi.org/quake2/quake2-4.00.tar.xz \
+    http://deponie.yamagi.org/quake2/quake2-ctf-1.00.tar.xz \
+	http://deponie.yamagi.org/quake2/quake2-xatrix-1.06.tar.bz2 \
     http://deponie.yamagi.org/quake2/quake2-rogue-1.04.tar.bz2"
-MD5SUM="bbad6517c36ce9743d9d07c7e1ab4185 \
+MD5SUM="98c4c39e70350d788b6174f032e630a9 \
+	d6d50b456f482dda92d6e4a615ef13bd \
     c69e60937e1550fc424e26b1dfb2c55f \
     be83f102dc3b2a10edd4153ac02dc8c7"
 DOWNLOAD_x86_64=""