3 files changed, 18 insertions, 17 deletions
diff --git a/games/assaultcube/README b/games/assaultcube/README
index 6bcac0b64454..4eec924c3022 100644
--- a/games/assaultcube/README
+++ b/games/assaultcube/README
@@ -1,6 +1,6 @@
-formerly ActionCube, is a free first-person-shooter
+Formerly ActionCube, is a free first-person-shooter
 based on the game Cube. Set in a realistic looking
-environment, as far as that´s possible with this
+environment, as far as that's possible with this
 engine, while gameplay stays fast and arcade.
 
 Note: If upgrading from version 1.1 or earlier then the new
diff --git a/games/assaultcube/assaultcube.SlackBuild b/games/assaultcube/assaultcube.SlackBuild
index bdf31088d339..0f5f023de632 100644
--- a/games/assaultcube/assaultcube.SlackBuild
+++ b/games/assaultcube/assaultcube.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for assaultcube
 
-# Copyright 2011-2013 Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2011-2014 Larry Hajali <larryhaja[at]gmail[dot]com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
 
 SRCNAM=AssaultCube
 PRGNAM=assaultcube
-VERSION=${VERSION:-1.2.0.1}
+VERSION=${VERSION:-1.2.0.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -62,18 +62,21 @@ cd ${SRCNAM}_v${VERSION}
 chown -R root:root .
 find . -type f ! -name configure -exec chmod 644 '{}' \;
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -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 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Use custom SLKCFLAGS and remove precompiled binaries.
+# Use custom SLKCFLAGS, remove end-of-line encoding and remove precompiled binaries.
 patch -p1 < $CWD/Makefile.patch
 sed -i 's/\r//g' changelog.txt
 sed -i "s|-O2|$SLKCFLAGS|" source/enet/configure
 rm -f bin_unix/*
+# Remove unneeded comments.
+sed -i -r '/^#(CUBE|SYSTEM|MACHINE)/d' assaultcube.sh server.sh
 # Fix an illegal string literal.
-sed -i "s|Couldn.t|Couldn't|" source/src/bot/bot_waypoint.cpp
+cat -v source/src/bot/bot_waypoint.cpp | sed "s|M-4|'|" > bot_waypoint.cpp
+mv bot_waypoint.cpp source/src/bot/bot_waypoint.cpp
 
 EXTRA_CXXFLAGS="$SLKCFLAGS" \
 make -C source/src
@@ -85,8 +88,7 @@ sed -i "/^CUBE_DIR/s|=.*|=\"/usr/share/${PRGNAM}\"|" $PRGNAM.sh server.sh
 install -m 0755 $PRGNAM.sh $PKG/usr/games/$PRGNAM
 install -m 0755 server.sh $PKG/usr/games/$PRGNAM-server
 chmod 0755 bin_unix/*
-cp -ar \
-  bin_unix bot config demos mods packages screenshots scripts \
+cp -ar bin_unix bot config demos mods packages screenshots scripts \
   $PKG/usr/share/$PRGNAM
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
@@ -101,8 +103,7 @@ for i in 16 24 32 48 64 96 128 256; do
 done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  changelog.txt source/*.txt source/src/*.txt docs/*.txt README.html \
+cp -a changelog.txt source/*.txt source/src/*.txt docs/*.txt README.html \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/games/assaultcube/assaultcube.info b/games/assaultcube/assaultcube.info
index 66e6539341ae..466322155a87 100644
--- a/games/assaultcube/assaultcube.info
+++ b/games/assaultcube/assaultcube.info
@@ -1,8 +1,8 @@
 PRGNAM="assaultcube"
-VERSION="1.2.0.1"
+VERSION="1.2.0.2"
 HOMEPAGE="http://assault.cubers.net/"
-DOWNLOAD="http://downloads.sourceforge.net/actiongame/AssaultCube_v1.2.0.1.tar.bz2"
-MD5SUM="d159e60bc7cc09e7675c0db941906f56"
+DOWNLOAD="http://downloads.sourceforge.net/actiongame/AssaultCube_v1.2.0.2.tar.bz2"
+MD5SUM="a052fc79dca4ecae0f15d9a953f1e2ad"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="OpenAL"