games/oblige: Updated for version 7.70.

Signed-off-by: B. Watson <yalhcru@gmail.com>

4 files changed, 34 insertions, 18 deletions

diff --git a/games/oblige/oblige.6 b/games/oblige/oblige.6
index 0c70b2891a..2748279bc1 100644
--- a/games/oblige/oblige.6
+++ b/games/oblige/oblige.6
@@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH OBLIGE 6 "2015-05-10" "6.20" "SlackBuilds.org"
+.TH OBLIGE 6 "2017-12-21" "7.70" "SlackBuilds.org"
 .SH NAME
 oblige \- random level generator for Doom and Doom II
 .
@@ -38,7 +38,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .
 .SH SYNOPSIS
 .sp
-oblige [\fI\-options\fP]
+oblige [\fI\-options\fP] [\fIkey=value\fP \fI\&...\fP]
 .SH DESCRIPTION
 .sp
 \fBoblige\fP creates a patch WAD file for use with Doom or Doom II,
@@ -51,7 +51,7 @@ noninteractively (see the \fB\-b\fP option below).
 .INDENT 0.0
 .TP
 .BI \-\-home \ <dir>
-Home directory, where B<oblige> looks for its config file, and creates
+Home directory, where \fBoblige\fP looks for its config file, and creates
 temporary files. Default is \fI~/.oblige\fP\&.
 .TP
 .BI \-\-install \ <dir>
@@ -59,7 +59,7 @@ Installation directory, where \fBoblige\fP looks for lua scripts and other
 data. Default is \fI/usr/share/oblige\fP\&.
 .TP
 .BI \-\-config \ <file>
-Config file to use. Default is \fI~/.oblige/CONFIG.txt\fP\&. Not used in
+Config file to use. Default is \fI~/.oblige/CONFIG.txt\fP in GUI mode, none in
 \fB\-\-batch\fP mode.
 .UNINDENT
 .INDENT 0.0
@@ -86,12 +86,17 @@ config file is ignored, and a new seed is generated.
 Enable verbose debugging messages in log.
 .TP
 .B \-\-terminal\fP,\fB  \-t
-Print log messages to stdout (rather than \fI~/.oblige/LIGS.txt\fP). Disabled
+Print log messages to stdout (rather than \fI~/.oblige/LOGS.txt\fP). Disabled
 by default, unless in \fB\-\-batch\fP mode.
 .TP
 .B \-\-help\fP,\fB  \-h
 Show built\-in help message.
 .UNINDENT
+.INDENT 0.0
+.TP
+.B \fBkey=value\fP
+Override setting from CONFIG.txt. May be given multiple times.
+.UNINDENT
 .\" other sections we might want, uncomment as needed.
 .
 .\" FILES
@@ -116,10 +121,10 @@ Show built\-in help message.
 .
 .SH COPYRIGHT
 .sp
-See the file /usr/doc/oblige\-6.20/GPL.txt for license information.
+See the file /usr/doc/oblige\-7.70/GPL.txt for license information.
 .SH AUTHORS
 .sp
-\fBoblige\fP is (c) 2006\-2015 by Andrew Apted.
+\fBoblige\fP is (c) 2006\-2017 by Andrew Apted.
 .sp
 This man page written for the SlackBuilds.org project
 by B. Watson, and is licensed under the WTFPL.
diff --git a/games/oblige/oblige.SlackBuild b/games/oblige/oblige.SlackBuild
index 0006462ed1..160b214651 100644
--- a/games/oblige/oblige.SlackBuild
+++ b/games/oblige/oblige.SlackBuild
@@ -6,6 +6,9 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20171220 bkw:
+# - update for 7.70. Upstream calls this the final release :(
+
 # 20170817 bkw:
 # - update for 7.666. Sadly this might be the last update, upstream is
 #   tired of working on oblige :(
@@ -35,7 +38,7 @@
 # in /usr/share.
 
 PRGNAM=oblige
-VERSION=${VERSION:-7.666}
+VERSION=${VERSION:-7.70}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -95,6 +98,12 @@ find -L . \
 # 'make install' would install the .desktop and icon to /usr, not PREFIX.
 sed -i '/xdg-/d' Makefile
 
+# if there's no prefabs/ dir, don't try to install it. doing it this
+# way allows this script to still build oblige 7.666, if needed.
+if [ ! -d prefabs ]; then
+  sed -i '/\/prefabs/d' Makefile
+fi
+
 make PREFIX=/usr OPTIMISE="$SLKCFLAGS"
 make install PREFIX=$PKG/usr
 
diff --git a/games/oblige/oblige.info b/games/oblige/oblige.info
index fc19e0c2fc..bdfa88a959 100644
--- a/games/oblige/oblige.info
+++ b/games/oblige/oblige.info
@@ -1,8 +1,8 @@
 PRGNAM="oblige"
-VERSION="7.666"
+VERSION="7.70"
 HOMEPAGE="http://oblige.sourceforge.net/"
-DOWNLOAD="http://sourceforge.net/projects/oblige/files/Oblige/7.666/oblige-7666-source.zip"
-MD5SUM="5cc744def8f87f817cffd15da1adbccb"
+DOWNLOAD="http://sourceforge.net/projects/oblige/files/Oblige/7.70/oblige-770-source.zip"
+MD5SUM="10d8f0d9789b58118883752e5c0800de"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="fltk"
diff --git a/games/oblige/oblige.rst b/games/oblige/oblige.rst
index 1ba0a68f37..34640bcea0 100644
--- a/games/oblige/oblige.rst
+++ b/games/oblige/oblige.rst
@@ -2,7 +2,7 @@
 ..   rst2man.py oblige.rst > oblige.6
 .. rst2man.py comes from the SBo development/docutils package.
 
-.. |version| replace:: 6.20
+.. |version| replace:: 7.70
 .. |date| date::
 
 ======
@@ -21,7 +21,7 @@ random level generator for Doom and Doom II
 SYNOPSIS
 ========
 
-oblige [*-options*]
+oblige [*-options*] [*key=value* *...*]
 
 DESCRIPTION
 ===========
@@ -37,7 +37,7 @@ OPTIONS
 =======
 
 --home <dir>
-  Home directory, where B<oblige> looks for its config file, and creates
+  Home directory, where **oblige** looks for its config file, and creates
   temporary files. Default is *~/.oblige*.
 
 --install <dir>
@@ -45,8 +45,7 @@ OPTIONS
   data. Default is */usr/share/oblige*.
 
 --config <file>
-
-  Config file to use. Default is *~/.oblige/CONFIG.txt*. Not used in
+  Config file to use. Default is *~/.oblige/CONFIG.txt* in GUI mode, none in
   **--batch** mode.
 
 --batch, **-b** *<output>*
@@ -69,12 +68,15 @@ OPTIONS
   Enable verbose debugging messages in log.
 
 --terminal, -t
-  Print log messages to stdout (rather than *~/.oblige/LIGS.txt*). Disabled
+  Print log messages to stdout (rather than *~/.oblige/LOGS.txt*). Disabled
   by default, unless in **--batch** mode.
 
 --help, -h
   Show built-in help message.
 
+**key=value**
+  Override setting from CONFIG.txt. May be given multiple times.
+
 .. other sections we might want, uncomment as needed.
 
 .. FILES
@@ -100,7 +102,7 @@ See the file /usr/doc/oblige-|version|/GPL.txt for license information.
 AUTHORS
 =======
 
-**oblige** is (c) 2006-2015 by Andrew Apted.
+**oblige** is (c) 2006-2017 by Andrew Apted.
 
 This man page written for the SlackBuilds.org project
 by B. Watson, and is licensed under the WTFPL.