games/blobwars: Updated for version 2.00.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

5 files changed, 34 insertions, 35 deletions

diff --git a/games/blobwars/README b/games/blobwars/README
index c49747f8fc..72f9460e38 100644
--- a/games/blobwars/README
+++ b/games/blobwars/README
@@ -1,11 +1,13 @@
 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
+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.
 
-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.
+The program and data is GPL2 and the music is various licences. See the
+game doc readme for details.  The game depends on SDL2, SDL2_image,
+SDL2_mixer and SDL2_TTF.  All dependancies are available from
+slackbuilds.org.
 
-This game is produced by parallelrealities.co.uk
+This game was originally created by parallelrealities.co.uk
+and now is produced by Perpendicular Dimensions
diff --git a/games/blobwars/blobwars.SlackBuild b/games/blobwars/blobwars.SlackBuild
index fa1f4a8875..3ab35020a6 100644
--- a/games/blobwars/blobwars.SlackBuild
+++ b/games/blobwars/blobwars.SlackBuild
@@ -1,16 +1,22 @@
 #!/bin/sh
 # Slackware build script for blobwars
 
-# Written by Tim Dickson tim@tree-of-life.co.uk
+# Written by Tim Dickson dickson.tim@googlemail.com
+# (C) 2016
+# changelog
+#
+# 17/10/2016. version 2.00. change to sdl2, project now includes
+# desktop icons etc. and mskefile includes DESTDIR support.
+# doc dir still gets fixed for slackware defaults.
 
 PRGNAM=blobwars
-VERSION=${VERSION:-1.19}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-2.00}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -21,8 +27,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -36,7 +42,6 @@ else
 fi
 
 set -e
-
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -50,24 +55,21 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-if [ "$ARCH" = "x86_64" ]; then
-  sed -i -e 's/-g games//' -e 's/-Werror//' makefile
-fi
-
 #make new game default more child friendly
 sed -i 's/gore = 1/gore = 0/' src/CGame.cpp
-# Fix doc installation path
-sed -i 's/share\/doc/doc/' makefile
+
+#fix hard-coded manual location
+sed -i "s_blobwars/man_blobwars-$VERSION/man_" data/titleWidgets
 
 # Compile the application and install it into the $PKG directory
-RELEASE=1 make
-make install DESTDIR=$PKG
+#doc dir fixed for slackware and help display bug.
+#note. the trailing / on the first make command is intentional.
+make USEPAK=1 CFLAGS="$SLKCFLAGS" DOCDIR="/usr/doc/$PRGNAM-$VERSION/"
+make install USEPAK=1 DESTDIR=$PKG DOCDIR="/usr/doc/$PRGNAM-$VERSION"
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-# Also, include the SlackBuild script in the documentation directory
-mv $PKG/usr/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/games/blobwars/blobwars.info b/games/blobwars/blobwars.info
index f5b7eaa11f..5cd38a5479 100644
--- a/games/blobwars/blobwars.info
+++ b/games/blobwars/blobwars.info
@@ -1,10 +1,10 @@
 PRGNAM="blobwars"
-VERSION="1.19"
-HOMEPAGE="http://www.parallelrealities.co.uk/p/blob-wars-metal-blob-solid.html"
-DOWNLOAD="http://downloads.sourceforge.net/blobwars/blobwars-1.19.tar.gz"
-MD5SUM="87e8aaa114b6e4742ea6ee28e7a7f984"
+VERSION="2.00"
+HOMEPAGE="http://sourceforge.net/projects/blobwars/"
+DOWNLOAD="http://downloads.sourceforge.net/project/blobwars/blobwars-2.00.tar.gz"
+MD5SUM="73baa49a41151140818cf14cb77d57b4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
-MAINTAINER="Tim Dickson"
+MAINTAINER="Tim Dickson (timsoft)"
+REQUIRES="SDL2_image SDL2_mixer SDL2_ttf SDL2_net"
 EMAIL="dickson.tim@googlemail.com"
diff --git a/games/blobwars/doinst.sh b/games/blobwars/doinst.sh
index 3e5691a052..4e8ba7071d 100644
--- a/games/blobwars/doinst.sh
+++ b/games/blobwars/doinst.sh
@@ -2,8 +2,3 @@ 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 650c7d7d03..90bdbf5f70 100644
--- a/games/blobwars/slack-desc
+++ b/games/blobwars/slack-desc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
         |-----handy-ruler------------------------------------------------------|
-blobwars: Blobwars Episode 1 Metal Blob Solid (An SDL based platform game)
+blobwars: blobwars (An SDL2 based platform game)
 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
@@ -16,4 +16,4 @@ blobwars: Blob agent, Bob. Bob's mission is to infiltrate the various enemy
 blobwars: bases around the Blobs' homeworld and rescue as many MIAs as
 blobwars: possible. But standing in his way are many vicious aliens, other
 blobwars: Blobs who have been assimilated and the evil alien leader, Galdov.
-blobwars: software by www.parallelrealities.co.uk
+blobwars: software originally by www.parallelrealities.co.uk