1 files changed, 17 insertions, 14 deletions
diff --git a/games/blobwars/blobwars.SlackBuild b/games/blobwars/blobwars.SlackBuild
index 93da8a19b2..1a4c0d3164 100644
--- a/games/blobwars/blobwars.SlackBuild
+++ b/games/blobwars/blobwars.SlackBuild
@@ -4,7 +4,7 @@
 # Written by Tim Dickson tim@tree-of-life.co.uk
 
 PRGNAM=blobwars
-VERSION=${VERSION:-1.11}
+VERSION=${VERSION:-1.14}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -26,6 +26,7 @@ elif [ "$ARCH" = "x86_64" ]; then
 fi
 
 set -e # Exit on most errors
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -39,11 +40,17 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Compile the application and install it into the $PKG directory
-make
-make install DESTDIR=$PKG
+if [ "$ARCH" = "x86_64" ]; then
+  sed -i -e 's/-g games//' -e 's/-Werror//' makefile
+fi
+
+make \
+  CFLAGS="$SLKCFLAGS" \
+  DOCDIR=$PKG/usr/doc/$PRGNAM-$VERSION
+make install \
+  DOCDIR=$PKG/usr/doc/$PRGNAM-$VERSION \
+  DESTDIR=$PKG
 
-# Strip binaries and libraries
 ( cd $PKG
   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
     xargs strip --strip-unneeded 2> /dev/null || true
@@ -51,19 +58,15 @@ make install DESTDIR=$PKG
     xargs strip --strip-unneeded 2> /dev/null
 )
 
-# Copy program documentation into the package
-# Also, include the SlackBuild script in the documentation directory
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  $PKG/usr/share/doc \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+# Add build script to package docs
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-# Copy the slack-desc and doinst.sh into ./install
+# Fixup permissions in the package; no need for games group on anything
+chown -R root:root $PKG
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
-# Make the package; be sure to leave it in $OUTPUT
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}