5 files changed, 9 insertions, 64 deletions
diff --git a/games/chocolate-doom/BETA.txt b/games/chocolate-doom/BETA.txt
deleted file mode 100644
index 79a73dfc15..0000000000
--- a/games/chocolate-doom/BETA.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-
-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 36ef4ae3e4..8a56cb458a 100644
--- a/games/chocolate-doom/README
+++ b/games/chocolate-doom/README
@@ -1,8 +1,7 @@
 Chocolate Doom is a Doom source port that accurately reproduces the
 experience of Doom and Doom II as they were played in the 1990s.
 
-Starting with version 2.3.0, Chocolate Doom also supports Heretic, Hexen,
-Strife, and Chex Quest.
+Chocolate Doom also supports Heretic, Hexen, Strife, and Chex Quest.
 
 To play chocolate-doom, you need at least one of:
   doom2.wad from Doom II
@@ -30,7 +29,3 @@ 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 bc77a3ab72..1b2317bbd6 100644
--- a/games/chocolate-doom/chocolate-doom.SlackBuild
+++ b/games/chocolate-doom/chocolate-doom.SlackBuild
@@ -6,6 +6,9 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20180101 bkw:
+# - Update for v3.0.0. Building 2.3.0 still works, if someone needs it.
+
 # 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.
@@ -20,7 +23,7 @@
 # - update README and slack-desc
 
 PRGNAM=chocolate-doom
-VERSION=${VERSION:-2.3.0}
+VERSION=${VERSION:-3.0.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/games/chocolate-doom/chocolate-doom.info b/games/chocolate-doom/chocolate-doom.info
index c01943c5cb..96cebcd492 100644
--- a/games/chocolate-doom/chocolate-doom.info
+++ b/games/chocolate-doom/chocolate-doom.info
@@ -1,10 +1,10 @@
 PRGNAM="chocolate-doom"
-VERSION="2.3.0"
+VERSION="3.0.0"
 HOMEPAGE="http://www.chocolate-doom.org/"
-DOWNLOAD="https://www.chocolate-doom.org/downloads/2.3.0/chocolate-doom-2.3.0.tar.gz"
-MD5SUM="5759b36c9a342e8d62ecdcc5fc9f428c"
+DOWNLOAD="https://www.chocolate-doom.org/downloads/3.0.0/chocolate-doom-3.0.0.tar.gz"
+MD5SUM="8bece4533e144ca01f13daa1b5912e95"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="SDL2_mixer SDL2_net"
 MAINTAINER="B. Watson"
 EMAIL="yalhcru@gmail.com"
diff --git a/games/chocolate-doom/chocolate-doom.info.beta b/games/chocolate-doom/chocolate-doom.info.beta
deleted file mode 100644
index f47a0eda98..0000000000
--- a/games/chocolate-doom/chocolate-doom.info.beta
+++ /dev/null
@@ -1,10 +0,0 @@
-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"