2 files changed, 7 insertions, 10 deletions
diff --git a/games/chocolate-doom/chocolate-doom.SlackBuild b/games/chocolate-doom/chocolate-doom.SlackBuild
index 4703624a9a34..0d4562cdb7fc 100644
--- a/games/chocolate-doom/chocolate-doom.SlackBuild
+++ b/games/chocolate-doom/chocolate-doom.SlackBuild
@@ -7,7 +7,7 @@
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
 PRGNAM=chocolate-doom
-VERSION=${VERSION:-2.0.0}
+VERSION=${VERSION:-2.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -58,6 +58,8 @@ find -L . \
 patch -p1 < $CWD/disable_windres.diff
 autoreconf -if
 
+# 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" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -66,7 +68,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --docdir=/usr/doc/$PRGNAM-$VERSION/$PRGNAM \
   --build=$ARCH-slackware-linux
 
 make
@@ -75,11 +77,6 @@ make install DESTDIR=$PKG
 # install-strip fails to strip the *-setup binaries.
 strip $PKG/usr/games/*
 
-# Grrr. --docdir is being ignored.
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-mv $PKG/usr/share/doc/$PRGNAM/* $PKG/usr/doc/$PRGNAM-$VERSION
-rm -rf $PKG/usr/share/doc
-
 gzip -9 $PKG/usr/man/man?/*
 
 # Move icons to standard Slackware pixmap icon dir:
diff --git a/games/chocolate-doom/chocolate-doom.info b/games/chocolate-doom/chocolate-doom.info
index 5470a2710749..f639731dc273 100644
--- a/games/chocolate-doom/chocolate-doom.info
+++ b/games/chocolate-doom/chocolate-doom.info
@@ -1,8 +1,8 @@
 PRGNAM="chocolate-doom"
-VERSION="2.0.0"
+VERSION="2.1.0"
 HOMEPAGE="http://www.chocolate-doom.org/"
-DOWNLOAD="http://www.chocolate-doom.org/downloads/2.0.0/chocolate-doom-2.0.0.tar.gz"
-MD5SUM="5551fe8e319ff4a49848234faaa6df4f"
+DOWNLOAD="http://www.chocolate-doom.org/downloads/2.1.0/chocolate-doom-2.1.0.tar.gz"
+MD5SUM="b4c4e9063e94f269292a4fa946ebf33c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""