From f55341b03cc8bfe8e83f3757c95f20900976777d Mon Sep 17 00:00:00 2001
From: B. Watson
Date: Wed, 28 Sep 2016 15:05:15 -0400
Subject: games/gzdoom: Updated for version 2.2.0.

---
 games/gzdoom/README_versions.txt | 4 ++--
 games/gzdoom/gzdoom.SlackBuild   | 9 ++++++---
 games/gzdoom/gzdoom.info         | 6 +++---
 3 files changed, 11 insertions(+), 8 deletions(-)

(limited to 'games/gzdoom')

diff --git a/games/gzdoom/README_versions.txt b/games/gzdoom/README_versions.txt
index 03aa98c54f..d9a7fa9424 100644
--- a/games/gzdoom/README_versions.txt
+++ b/games/gzdoom/README_versions.txt
@@ -4,9 +4,9 @@ of gzdoom. Supported versions:
 
 1.8.09 - last version to use SDL1 (good for older/slower systems).
 1.9.1 - last version to not require OpenGL 3.0 (good for nouveau).
-2.2.1 - latest version of gzdoom (best choice for fast modern systems).
+2.2.0 - latest version of gzdoom (best choice for fast modern systems).
 
-By default, 2.2.1 is built (as per the .info file). If you'd like to
+By default, 2.2.0 is built (as per the .info file). If you'd like to
 try one of the others, download the source, save it in the SlackBuild
 directory, and run gzdoom.SlackBuild with VERSION=1.8.09 or VERSION=1.9.1
 set in the environment. If you use sbopkg, you can create a custom .info
diff --git a/games/gzdoom/gzdoom.SlackBuild b/games/gzdoom/gzdoom.SlackBuild
index 79d9e04465..a9a5738295 100644
--- a/games/gzdoom/gzdoom.SlackBuild
+++ b/games/gzdoom/gzdoom.SlackBuild
@@ -6,6 +6,9 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20160928 bkw:
+# - Updated for 2.2.0. 1.9.1 and 1.8.09 still work, too.
+
 # 20160803 bkw:
 # - Updated for 2.1.1. Also for 1.9.1 and 1.8.09 (see README_versions.txt)
 # - Update .info for new HOMEPAGE
@@ -33,7 +36,7 @@
 # - Add WTFPL
 
 PRGNAM=gzdoom
-VERSION=${VERSION:-2.1.1}
+VERSION=${VERSION:-2.2.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -135,8 +138,8 @@ cp -a docs/* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 cat $CWD/README_SBo.txt > $PKG/usr/doc/$PRGNAM-$VERSION/README_SBo.txt
 
-# Fix DOS CRLF line endings
-sed -i 's/\r//' $PKG/usr/doc/$PRGNAM-$VERSION/*
+# Fix DOS CRLF line endings. The stuff in licenses/ is already OK, for 2.2.0.
+sed -i 's/\r//' $PKG/usr/doc/$PRGNAM-$VERSION/*.*
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/games/gzdoom/gzdoom.info b/games/gzdoom/gzdoom.info
index 16c19e00c6..d572d55061 100644
--- a/games/gzdoom/gzdoom.info
+++ b/games/gzdoom/gzdoom.info
@@ -1,8 +1,8 @@
 PRGNAM="gzdoom"
-VERSION="2.1.1"
+VERSION="2.2.0"
 HOMEPAGE="http://gzdoom.drdteam.org/"
-DOWNLOAD="https://github.com/coelckers/gzdoom/archive/g2.1.1.tar.gz"
-MD5SUM="f01edcdf598a94c66a9bc14e52d76fff"
+DOWNLOAD="https://github.com/coelckers/gzdoom/archive/g2.2.0.tar.gz"
+MD5SUM="4415ed80f30ba53ad525cbe6b39804e4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="SDL2 fmodapi"
-- 
cgit v1.2.3