1 files changed, 13 insertions, 6 deletions
diff --git a/games/xroar/xroar.SlackBuild b/games/xroar/xroar.SlackBuild
index 49d407a920..457fde3316 100644
--- a/games/xroar/xroar.SlackBuild
+++ b/games/xroar/xroar.SlackBuild
@@ -6,6 +6,10 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20150912 bkw:
+# - update for 0.33.2
+# - use upstream's man page, get rid of mine
+
 # 20140824 bkw:
 # - update for 0.32
 # - somehow I lost the POD source to the man page, recreate from xroar.6
@@ -30,7 +34,7 @@
 # - mention gtkglext in README as an optional dep
 
 PRGNAM=xroar
-VERSION=${VERSION:-0.32}
+VERSION=${VERSION:-0.33.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -104,6 +108,13 @@ make
 make install DESTDIR=$PKG
 strip $PKG/usr/bin/$PRGNAM
 
+# man page needs to be in section 6, since this is in games/
+mkdir -p $PKG/usr/man/man6
+sed '1s,\<1\>,6,' \
+  < $PKG/usr/man/man1/$PRGNAM.1 \
+  | gzip -9c > $PKG/usr/man/man6/$PRGNAM.6.gz
+rm -rf $PKG/usr/man/man1
+
 mv $PKG/usr/share/info $PKG/usr/info
 rm -rf $PKG/usr/share
 rm -f $PKG/usr/info/dir
@@ -131,10 +142,6 @@ if [ ! -e $PKG/usr/share/$PRGNAM/roms/d32.rom ]; then
 	ln -s mini-dragon.rom $PKG/usr/share/$PRGNAM/roms/d32.rom
 fi
 
-# Man page written for this SlackBuild
-mkdir -p $PKG/usr/man/man6
-sed "s,_VERSION_,$VERSION,g" < $CWD/$PRGNAM.6 | gzip -9c > $PKG/usr/man/man6/$PRGNAM.6.gz
-
 # Icon taken from Fedora package here:
 # ftp://mirror.switch.ch/pool/3/mirror/rpmfusion/free/fedora/updates/8/i386/xroar-0.21-2.fc8.i386.rpm
 # Current versions of xroar include windows and mac icons that are larger,
@@ -151,7 +158,7 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a COPYING* ChangeLog $PKG/usr/doc/$PRGNAM-$VERSION
 
 # HTML version of the info page, for those who hate info pages...
-make doc/$PRGNAM.html
+( cd doc && make $PRGNAM.html )
 cp doc/$PRGNAM.html doc/*png $PKG/usr/doc/$PRGNAM-$VERSION
 
 # Don't keep duplicates of the doc images, use symlinks