1 files changed, 13 insertions, 12 deletions
diff --git a/games/blobwars/blobwars.SlackBuild b/games/blobwars/blobwars.SlackBuild
index 1a4c0d3164..3e262642e1 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.14}
+VERSION=${VERSION:-1.16}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -26,7 +26,6 @@ elif [ "$ARCH" = "x86_64" ]; then
 fi
 
 set -e # Exit on most errors
-
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -44,13 +43,11 @@ 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
+# Compile the application and install it into the $PKG directory
+make
+make install 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
@@ -58,15 +55,19 @@ make install \
     xargs strip --strip-unneeded 2> /dev/null
 )
 
-# Add build script to package docs
+# 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
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-# Fixup permissions in the package; no need for games group on anything
-chown -R root:root $PKG
-
+# Copy the slack-desc and doinst.sh into ./install
 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.${PKGTYPE:-tgz}