games/blobwars: Updated for version 1.14

6 files changed, 37 insertions, 34 deletions

diff --git a/games/blobwars/README b/games/blobwars/README
index 5c1189a59190..aed63632e04a 100644
--- a/games/blobwars/README
+++ b/games/blobwars/README
@@ -1,14 +1,8 @@
 blobwars Metal Blob Solid episode 1 is a platform game in which you
-have to collect MIA's missing in action) blobs scattered arround many
-areas. There are other things to collect, keys to open doors, bosses
-at the end of different levels etc. You can also re-visit levels to
-collect things you missed earlier.
+have to collect MIA (missing in action) blobs scattered around many
+areas.  There are other things to collect, keys to open doors, bosses
+at the end of different levels, etcetera.  You can also re-visit levels
+to collect things you missed earlier.
 
-The program is GPL and the data (graphics etc) is free for use with this
-program but not free for any other use.  The game depends on SDL, SDL_image,
-SDL_mixer, SDL_TTF, and FreeType.  All dependancies are included in slackware
-12.2 in the SDL and freetype packages.
-
-This game is produced by parallelrealities.co.uk
-
-NOTE:  Currently, blobwars does not compile on Slackware64-current.
+The program is GPL and the data (graphics etc) are free for use with 
+this program, but not free for any other use.
diff --git a/games/blobwars/blobwars.SlackBuild b/games/blobwars/blobwars.SlackBuild
index 93da8a19b2f9..1a4c0d3164cb 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}
diff --git a/games/blobwars/blobwars.desktop b/games/blobwars/blobwars.desktop
index dc2497effa10..f95c60e18a34 100644
--- a/games/blobwars/blobwars.desktop
+++ b/games/blobwars/blobwars.desktop
@@ -1,7 +1,5 @@
 [Desktop Entry]
-Encoding=UTF-8
-Categories=Application;Game;
-X-Desktop-File-Install-Version=1.0
+Categories=Game;
 Name=Metal Blob Solid
 Icon=blobwars
 Exec=blobwars
diff --git a/games/blobwars/blobwars.info b/games/blobwars/blobwars.info
index 2490dc0d346c..fd53991bfdaa 100644
--- a/games/blobwars/blobwars.info
+++ b/games/blobwars/blobwars.info
@@ -1,8 +1,10 @@
 PRGNAM="blobwars"
-VERSION="1.11"
+VERSION="1.14"
 HOMEPAGE="http://parallelrealities.co.uk/projects/blobWars.php"
-DOWNLOAD="http://parallelrealities.co.uk/download/blobwars/blobwars-1.11-1.tar.gz"
-MD5SUM="4da5ec26e0a865a58e3acfeb2e48d3e2"
+DOWNLOAD="http://parallelrealities.co.uk/download/blobwars/blobwars-1.14-1.tar.gz"
+MD5SUM="c4133a08d49d63b518e70d67b88fb8be"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Tim Dickson (timsoft)"
 EMAIL="tim@tree-of-life.co.uk"
-APPROVED="chess"
+APPROVED="rworkman"
diff --git a/games/blobwars/doinst.sh b/games/blobwars/doinst.sh
index 4e8ba7071dea..1f8ff67dedb2 100644
--- a/games/blobwars/doinst.sh
+++ b/games/blobwars/doinst.sh
@@ -2,3 +2,9 @@ if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
 
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
+
diff --git a/games/blobwars/slack-desc b/games/blobwars/slack-desc
index b82c8aa2b608..536619c0f647 100644
--- a/games/blobwars/slack-desc
+++ b/games/blobwars/slack-desc
@@ -6,7 +6,7 @@
 # leave one space after the ':'.
 
         |-----handy-ruler------------------------------------------------------|
-blobwars: Blobwars:Episode 1  Metal Blob Solid. An SDL based platform game
+blobwars: Blobwars:Episode 1 Metal Blob Solid
 blobwars:
 blobwars: Since their world was invaded by an alien race, the Blobs have faced
 blobwars: a lifetime of war. But now they have a chance to win the war once