games/oblige: Updated for version 7.50.

4 files changed, 32 insertions, 10 deletions

diff --git a/games/oblige/README b/games/oblige/README
index 2013f916cf52b..4897aee55c200 100644
--- a/games/oblige/README
+++ b/games/oblige/README
@@ -1,10 +1,10 @@
-OBLIGE v6 is a random level generator for Doom, Doom II, and their
-expansion packs. The goal is to produce high quality levels which are
-fun to play.
+OBLIGE is a random level generator for Doom, Doom II, and their expansion
+packs. The goal is to produce high quality levels which are fun to play.
 
 A Doom engine is required if you actually want to play the levels you
 generate. Currently there are builds on SBo for zdoom, gzdoom, prboom,
-chocolate-doom, odamex, skulltag, and maybe a few more.
+odamex, skulltag, and maybe a few more. Note that chocolate-doom won't
+work with oblige's levels, a limit-removing engine is needed.
 
 Also required: the data file(s) for whichever game(s) you're playing
 (registered versions, not shareware):
@@ -19,3 +19,10 @@ Plutonia         plutonia.wad
 
 Older versions of oblige had support for Heretic and Quake. If you need
 these, install oblige-legacy4 (which can co-exist with this version).
+
+Oblige 6 and 7 take completely different approaches to level generation.
+Some people might prefer version 6, so this script supports both. By
+default, the version in the .info file (currently 7.50) is built. To build
+version 6 instead, get oblige-620-source.tar.gz from the author's site,
+place it in the SlackBuild directory, and run the script with VERSION=6.20
+in the environment.
diff --git a/games/oblige/oblige.SlackBuild b/games/oblige/oblige.SlackBuild
index 5782b5e209d58..ba9f34209ff28 100644
--- a/games/oblige/oblige.SlackBuild
+++ b/games/oblige/oblige.SlackBuild
@@ -6,6 +6,12 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20161016 bkw:
+# - update for 7.50
+# - get rid of CRLF endings in docs
+# - allow script to build both 6.20 and 7.50, see README for why
+# - reword short description in slack-desc (was too vague)
+
 # 20150510 bkw:
 # - version bump to 6.20
 # - use upstream's .desktop and icon
@@ -25,7 +31,7 @@
 # in /usr/share.
 
 PRGNAM=oblige
-VERSION=${VERSION:-6.20}
+VERSION=${VERSION:-7.50}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -65,7 +71,15 @@ rm -rf $PKG
 mkdir -p $TMP $PKG/usr/bin $PKG/usr/share/$PRGNAM $OUTPUT
 cd $TMP
 rm -rf ${SRCNAM}-${VERSION}-source
-tar xvf $CWD/$PRGNAM-$SRCVER-source.tar.gz
+
+# script supports 6.x and 7.x. author switched from .tar.gz to .zip
+# for 7.x, so check for both.
+if [ -e $CWD/$PRGNAM-$SRCVER-source.zip ]; then
+  unzip $CWD/$PRGNAM-$SRCVER-source.zip
+else
+  tar xvf $CWD/$PRGNAM-$SRCVER-source.tar.gz
+fi
+
 cd ${SRCNAM}-${VERSION}-source
 chown -R root:root .
 find -L . \
@@ -90,6 +104,7 @@ cat misc/icon_128x128.png > $PKG/usr/share/pixmaps/$PRGNAM.png
 cat misc/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+sed -i 's,\r,,' *.txt doc/*.txt
 cp *.txt doc/*.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/games/oblige/oblige.info b/games/oblige/oblige.info
index ea1858c471120..043db90cda318 100644
--- a/games/oblige/oblige.info
+++ b/games/oblige/oblige.info
@@ -1,8 +1,8 @@
 PRGNAM="oblige"
-VERSION="6.20"
+VERSION="7.50"
 HOMEPAGE="http://oblige.sourceforge.net/"
-DOWNLOAD="http://sourceforge.net/projects/oblige/files/Oblige/6.20/oblige-620-source.tar.gz"
-MD5SUM="cae46a6381b4a36b1b0169999f8ff428"
+DOWNLOAD="http://sourceforge.net/projects/oblige/files/Oblige/7.50/oblige-750-source.zip"
+MD5SUM="02bb5cb719844035eba57ce03e2fa29a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="fltk"
diff --git a/games/oblige/slack-desc b/games/oblige/slack-desc
index 8113f86c37ab3..eceb6f9a133d7 100644
--- a/games/oblige/slack-desc
+++ b/games/oblige/slack-desc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
       |-----handy-ruler------------------------------------------------------|
-oblige: oblige (random level generator for various classic games)
+oblige: oblige (random level generator for Doom engine games)
 oblige:
 oblige: OBLIGE is a random level generator for various classic games,
 oblige: including DOOM, DOOM II, Heretic, and Quake. The goal is to produce