4 files changed, 75 insertions, 3 deletions
diff --git a/games/chocolate-doom/BETA.txt b/games/chocolate-doom/BETA.txt
new file mode 100644
index 000000000000..79a73dfc157d
--- /dev/null
+++ b/games/chocolate-doom/BETA.txt
@@ -0,0 +1,43 @@
+
+It's now possible to build chocolate-doom-3.0.0-beta1 with this script,
+though the default is still to build 2.3.0 (the latest stable release).
+
+If there's ever a 3.0.0-beta2 or -beta3, you may be able to build those
+too. I don't have a time machine, so I can't test them since they don't
+exist yet :)
+
+Manual build
+------------
+
+The beta has switched to using SDL2, so you will need SDL2, SDL2_mixer, and
+SDL2_net installed.
+
+To build the beta version, download the source from:
+
+https://github.com/chocolate-doom/chocolate-doom/archive/chocolate-doom-3.0.0-beta1.tar.gz
+
+The md5sum is: da0439cb91db310c3342461ddd96ce16
+
+Set VERSION to 3.0.0_beta1 in the environment. Example:
+
+# VERSION=3.0.0_beta1 sh ./chocolate-doom.SlackBuild
+
+Notice the _ in the version number! Do not use a hyphen (-), Slackware
+can't handle version numbers with hyphen in them.
+
+
+Tool-assisted build
+-------------------
+
+If you use sbopkg or sbotools, you can replace chocolate-doom.info with
+chocolate-doom.info.beta, either by copy/pasting the contents or just
+copying the file.
+
+
+Config file
+-----------
+
+chocolate-doom's config file location has moved. In 2.3.0, user
+config files were kept in "~/.chocolate-doom/". 3.0.0-beta1 uses
+"~/.local/share/chocolate-doom/". You should be able to just copy your
+*.cfg files from the old location to the new one.
diff --git a/games/chocolate-doom/README b/games/chocolate-doom/README
index 4c14a9df9562..36ef4ae3e415 100644
--- a/games/chocolate-doom/README
+++ b/games/chocolate-doom/README
@@ -30,3 +30,7 @@ them both in /usr/share/games/doom, and run: chocolate-doom -iwad chex.wad
 
 The Strife demo (strife0.wad) doesn't work with Chocolate Doom.
 Chex Quest 2 and 3 are not supported.
+
+It's now possible to build chocolate-doom-3.0.0-beta1 with this script,
+though the default is still to build 2.3.0 (the latest stable release).
+See BETA.txt for details.
diff --git a/games/chocolate-doom/chocolate-doom.SlackBuild b/games/chocolate-doom/chocolate-doom.SlackBuild
index 4e71e7160e1a..bc77a3ab7298 100644
--- a/games/chocolate-doom/chocolate-doom.SlackBuild
+++ b/games/chocolate-doom/chocolate-doom.SlackBuild
@@ -6,6 +6,10 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20170228 bkw:
+# - Allow building 3.0.0-beta1 (but VERSION is still 2.3.0, and is
+#   still built the same, so BUILD is still 1). See BETA.txt.
+
 # 20170111 bkw:
 # - update for v2.3.0
 # - use upstream's .desktop files for heretic/hexen/strife, now that
@@ -49,12 +53,21 @@ fi
 
 set -e
 
+# Beta versions have a - in the filename, but Slackware needs version
+# numbers with no - in them. If the user wants to build 3.0.0-beta1,
+# he needs to set VERSION=3.0.0_beta1 and the script will figure out
+# the filename.
+case "$VERSION" in
+  *_*) REALVER=${VERSION//_/-} ;;
+  *)   REALVER=${VERSION}      ;;
+esac
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-$REALVER $PRGNAM-$PRGNAM-$REALVER
+tar xvf $CWD/$PRGNAM-$REALVER.tar.gz || tar xvf $CWD/$PRGNAM-$PRGNAM-$REALVER.tar.gz
+cd $PRGNAM-$REALVER || cd $PRGNAM-$PRGNAM-$REALVER
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -62,6 +75,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+[ -x configure ] || sh autogen.sh
+
 # NB: Upstream uses --docdir in a weird way: docs for chocolate-doom
 # go in $docdir, the others go in e.g. "$docdir/../chocolate-hexen/".
 CFLAGS="$SLKCFLAGS" \
diff --git a/games/chocolate-doom/chocolate-doom.info.beta b/games/chocolate-doom/chocolate-doom.info.beta
new file mode 100644
index 000000000000..f47a0eda9830
--- /dev/null
+++ b/games/chocolate-doom/chocolate-doom.info.beta
@@ -0,0 +1,10 @@
+PRGNAM="chocolate-doom"
+VERSION="3.0.0_beta1"
+HOMEPAGE="http://www.chocolate-doom.org/"
+DOWNLOAD="https://github.com/chocolate-doom/chocolate-doom/archive/chocolate-doom-3.0.0-beta1.tar.gz"
+MD5SUM="da0439cb91db310c3342461ddd96ce16"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES=""
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"