games/freedoom: Updated for version 0.9.

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

3 files changed, 27 insertions, 26 deletions

diff --git a/games/freedoom/README b/games/freedoom/README
index 691695a892..0ea5b5d867 100644
--- a/games/freedoom/README
+++ b/games/freedoom/README
@@ -11,13 +11,13 @@ files, since it is a replacement for them.
 
 This package installs 3 wad files in /usr/share/games/doom:
 
-freedoom.wad  - Replacement IWAD for Doom II.
-freedoomu.wad - Same data as freedoom.wad, but in Doom I compatible form.
-freedm.wad    - Standalone deathmatch-only level pack.
+freedoom1.wad  - Replacement IWAD for Doom I and Ultimate Doom.
+freedoom2.wad  - Replacement IWAD for Doom II and Final Doom.
+freedm.wad     - Standalone deathmatch-only level pack.
 
 To use these data files with zdoom, simply build and install this package.
-You will be prompted for which IWAD file to use (which game to play) when
-starting zdoom. Other Doom source ports may do the same, or may require
-a command-line option to set the IWAD file. Some engines may require
-symlinking "freedoom.wad" to "doom2.wad" and "freedoomu.wad" to "doom.wad".
-
+You will be prompted for which IWAD file to use (which game to play)
+when starting zdoom. Other Doom source ports may do the same, or may
+require a command-line option to set the IWAD file. Some engines may
+require symlinking "freedoom2.wad" to "doom2.wad" and "freedoom1.wad"
+to "doom.wad".
diff --git a/games/freedoom/freedoom.SlackBuild b/games/freedoom/freedoom.SlackBuild
index 6d2b5711a4..b94afae240 100644
--- a/games/freedoom/freedoom.SlackBuild
+++ b/games/freedoom/freedoom.SlackBuild
@@ -7,7 +7,7 @@
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
 PRGNAM=freedoom
-VERSION=${VERSION:-0.8}
+VERSION=${VERSION:-0.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -29,27 +29,30 @@ cd $TMP/$PRGNAM-$VERSION
 
 mkdir -p $PKG/usr/share/games/doom $PKG/usr/doc/$PRGNAM-$VERSION
 
-for zipfile in $PRGNAM-iwad $PRGNAM-ultimate freedm; do
-  unzip $CWD/$zipfile-v$VERSION.zip
-  cd $zipfile-v$VERSION
+for zipfile in $PRGNAM freedm; do
+  unzip $CWD/$zipfile-$VERSION.zip
+  cd $zipfile-$VERSION
   chown -R root:root .
   chmod 644 *
   cp *.wad $PKG/usr/share/games/doom
   cd -
 done
 
-# The docs are identical in all 3 zipfiles, only keep one set.
-cd $PRGNAM-iwad-v$VERSION
-cp COPYING CREDITS *.html $PKG/usr/doc/$PRGNAM-$VERSION
+# The docs are identical in both zipfiles, only keep one set.
+cd $PRGNAM-$VERSION
+cp -a COPYING CREDITS *.html $PKG/usr/doc/$PRGNAM-$VERSION
 cd -
 
-# Rename to avoid conflicts with id software's doom.wad and doom2.wad.
+# Upstream recently renamed their wad files. The new names are less
+# confusing (freedoom1.wad is Doom I, freedoom2.wad is Doom II). For now,
+# we'll make symlinks to the old names, for compatibility with engines that
+# don't yet know about the new names.
 # zdoom will correctly find the files with these names, according to
 # http://remilia.zdoom.org/wiki/IWAD
 
 cd $PKG/usr/share/games/doom
-mv doom.wad freedoomu.wad
-mv doom2.wad freedoom.wad
+ln -s freedoom1.wad freedoomu.wad
+ln -s freedoom2.wad freedoom.wad
 
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README
diff --git a/games/freedoom/freedoom.info b/games/freedoom/freedoom.info
index 7e9b4dd142..62f7acebf6 100644
--- a/games/freedoom/freedoom.info
+++ b/games/freedoom/freedoom.info
@@ -1,12 +1,10 @@
 PRGNAM="freedoom"
-VERSION="0.8"
-HOMEPAGE="http://www.nongnu.org/freedoom/"
-DOWNLOAD="https://github.com/freedoom/freedoom/releases/download/v0.8/freedoom-iwad-v0.8.zip \
-          https://github.com/freedoom/freedoom/releases/download/v0.8/freedoom-ultimate-v0.8.zip \
-          https://github.com/freedoom/freedoom/releases/download/v0.8/freedm-v0.8.zip"
-MD5SUM="04cdd4618111fc201abd0a432313c24a \
-        7ccb8a04c12a0773b1f239502f497f17 \
-        f3c39b41305a46f333945a14859d77c2"
+VERSION="0.9"
+HOMEPAGE="http://freedoom.github.io/index.html"
+DOWNLOAD="https://github.com/freedoom/freedoom/releases/download/v0.9/freedoom-0.9.zip \
+          https://github.com/freedoom/freedoom/releases/download/v0.9/freedm-0.9.zip"
+MD5SUM="30b2c2a0ffce39ae56f6ecc03c0dc2eb \
+        c6a643862eecdff90e43fd575f763561"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""