4 files changed, 25 insertions, 9 deletions
diff --git a/games/ds-models/README b/games/ds-models/README
index 58b159f3f2..ce09d97619 100644
--- a/games/ds-models/README
+++ b/games/ds-models/README
@@ -13,12 +13,15 @@ package with be approximately 30% smaller. There's also a GZDOOM=no
 option, but it won't make the package smaller (skulltag still requires
 the gzdoom models, so they'll still be included).
 
-This includes scripts "dm-gzdoom" and "dm-skulltag" for starting gzdoom
+As of r15, ds-models supports Zandronum, but there's no SlackBuild for
+Zandronum yet, so no support for it here (yet).
+
+This includes scripts "ds-gzdoom" and "ds-skulltag" for starting gzdoom
 or skulltag with the models preloaded.
 
-To make gzdoom or skulltag always use the models, edit ~/.gzdoom/zdoom.ini
-and/or ~/.skulltag/skulltag.ini and add the following lines under the
-[Global.Autoload] marker:
+To make gzdoom or skulltag always use the models, edit
+~/.config/gzdoom/zdoom.ini and/or ~/.skulltag/skulltag.ini and add the
+following lines under the [Global.Autoload] marker:
 
 # for both gzdoom and skulltag:
 Path=/usr/share/games/doom/GZ-Models.pk3
diff --git a/games/ds-models/ds-models.SlackBuild b/games/ds-models/ds-models.SlackBuild
index e0fea7b775..95ae03b0b1 100644
--- a/games/ds-models/ds-models.SlackBuild
+++ b/games/ds-models/ds-models.SlackBuild
@@ -6,8 +6,13 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20140324 bkw:
+# Updated for version r15
+# fixed typos in README
+# fixed .def files for recent gzdoom
+
 PRGNAM=ds-models
-VERSION=${VERSION:-r14}
+VERSION=${VERSION:-r15}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -19,6 +24,8 @@ OUTPUT=${OUTPUT:-/tmp}
 ARCH=noarch
 
 # Which game(s) to support?
+# As of r15, Zandronum is also supported, but as there's no SBo build for
+# it, I won't bother.
 SKULLTAG=${SKULLTAG:-yes}
 GZDOOM=${GZDOOM:-yes}
 
@@ -56,6 +63,10 @@ do
   cp ${DEF_FILE} work
 done
 
+# get rid of upstream's CRLF endings and stray NBSP characters, which
+# confuse recent gzdooms.
+perl -i -pe 's,[\xa0\r],,g' work/*.def
+
 for MODEL_DIR in \
   $(find $(pwd)/GZ-Models/Build -maxdepth 2 -mindepth 2 -type d)
 do
@@ -82,6 +93,8 @@ if [ "$SKULLTAG" = "yes" ]; then
       cp ${DEF_FILE} work
   done
 
+  perl -i -pe 's,[\xa0\r],,g' work/*.def
+
   for MODEL_DIR in \
       $(find ST-Models/Build -maxdepth 2 -mindepth 2 -type d)
   do
diff --git a/games/ds-models/ds-models.info b/games/ds-models/ds-models.info
index 4f9c678cdb..6877e3179a 100644
--- a/games/ds-models/ds-models.info
+++ b/games/ds-models/ds-models.info
@@ -1,9 +1,9 @@
 PRGNAM="ds-models"
-VERSION="r14"
+VERSION="r15"
 HOMEPAGE="http://code.google.com/p/ds-models/source/browse/"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/ds-models-r14.tar.gz"
+DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/ds-models-r15.tar.gz"
 DOWNLOAD_x86_64=""
-MD5SUM="e1f661b810abc10400ae96cb8cc82404"
+MD5SUM="9092e6862566680ad782673dea5a0980"
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
diff --git a/games/ds-models/svn2targz.sh b/games/ds-models/svn2targz.sh
index 4530ebc274..7a86681fde 100644
--- a/games/ds-models/svn2targz.sh
+++ b/games/ds-models/svn2targz.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 PRGNAM=ds-models
-VERSION=14
+VERSION=15
 REPO=http://ds-models.googlecode.com/svn/trunk/
 
 rm -rf $PRGNAM-r$VERSION