games/chocolate-doom: Updated for version 2.3.0.

1 files changed, 27 insertions, 17 deletions

diff --git a/games/chocolate-doom/chocolate-doom.SlackBuild b/games/chocolate-doom/chocolate-doom.SlackBuild
index ff3354cdb0..4e71e7160e 100644
--- a/games/chocolate-doom/chocolate-doom.SlackBuild
+++ b/games/chocolate-doom/chocolate-doom.SlackBuild
@@ -6,8 +6,17 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20170111 bkw:
+# - update for v2.3.0
+# - use upstream's .desktop files for heretic/hexen/strife, now that
+#   they're provided
+# - use symlinks for the *-setup binaries, since they're identical
+# - include a few missing docs (AUTHORS, COPYING, etc)
+# - get rid of no-longer-needed disable_windres.diff
+# - update README and slack-desc
+
 PRGNAM=chocolate-doom
-VERSION=${VERSION:-2.2.1}
+VERSION=${VERSION:-2.3.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -53,16 +62,12 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Grr. Newer binutils includes a windres command, which doesn't seem to work
-# like the actual windows one (configure lacks switches to disable windres)
-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 \
+  --bindir=/usr/games \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
@@ -77,26 +82,31 @@ make install DESTDIR=$PKG
 # install-strip fails to strip the *-setup binaries.
 strip $PKG/usr/games/*
 
+# No symlinks in /usr/man (we'll create some later though)
 gzip -9 $PKG/usr/man/man?/*
 
 # Move icons to standard Slackware pixmap icon dir:
 mv $PKG/usr/share/icons $PKG/usr/share/pixmaps
 
-# Upstream doesn't include .desktop files or icons for the other games,
-# we'll generate them.
-cd $PKG/usr/share/applications
-  for GAME in Heretic Hexen Strife; do
-    game="$( echo $GAME | tr A-Z a-z )"
-    sed -e "s,Doom,$GAME,g" -e "s,doom,$game,g" \
-      $PRGNAM.desktop \
-      > chocolate-$game.desktop
-    ln -s $PRGNAM.png $PKG/usr/share/pixmaps/chocolate-$game.png
-  done
-cd -
+# 2.3.0 has a single chocolate-setup binary, which it installs 4 copies
+# of with different names, and it uses the names to decide which game
+# to configure. Better done with symlinks. Plus make links for the man
+# pages. Note that running chocolate-setup lets you pick which game
+# you want to configure, so strictly speaking these extra symlinks are
+# unneeded. Also, upstream only ships one .desktop file for the setup,
+# I'm leaving that as-is.
+cp $PKG/usr/games/$PRGNAM-setup $PKG/usr/games/chocolate-setup
+for exe in $PKG/usr/games/chocolate-*-setup; do
+  man=$PKG/usr/man/man6/$( basename $exe ).6.gz
+  rm -f $exe $man
+  ln -s chocolate-setup $exe
+  ln -s chocolate-setup.6.gz $man
+done
 
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
+cp -a HACKING.md TODO.md AUTHORS COPYING $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh