1 files changed, 24 insertions, 32 deletions
diff --git a/games/angband/angband.SlackBuild b/games/angband/angband.SlackBuild
index 1fc0041ca9..5b89130e95 100644
--- a/games/angband/angband.SlackBuild
+++ b/games/angband/angband.SlackBuild
@@ -3,18 +3,17 @@
 # Slackware build script for angband
 
 # Written by Marshall Scott (bacchist@gmail.com)
+# Heavily edited and currently maintained by David Melik (dchmelik@gmail.com)
 
 PRGNAM=angband
-VERSION=3.1.0beta
+VERSION=v3.3.2
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -38,64 +37,58 @@ else
   LIBDIRSUFFIX=""
 fi
 
+set -e # Exit on most errors
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 rm -rf $TMP/$PRGNAM-$VERSION
-cd $TMP || exit 1
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1
-cd $PRGNAM-$VERSION || exit 1
+cd $TMP
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
-# Fixup the DESTDIR support for --with-setgid
-patch -p1 < $CWD/Fix_DESTDIR_support.patch || exit 1
-
 # --enable-gtk and setgid are incompatible, so we'll not build the gtk part
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
   --with-libpath=/usr/share/games/angband \
+  --with-configpath=/etc/angband \
+  --with-varpath=/var/games/angband \
   --bindir=/usr/games \
   --with-setgid=games \
   --build=$ARCH-slackware-linux \
-  || exit 1
 
-make || exit
-make install DESTDIR=$PKG || exit
+make
+make install DESTDIR=$PKG
 
-# We'll deviate from what upstream does a little bit...
-mkdir -p $PKG/var/games/angband
-mv $PKG/usr/share/games/angband/{apex,bone,data,save} $PKG/var/games/angband
-( cd $PKG/usr/share/games/angband
-  for i in apex bone data save ; do
-    ln -s ../../../../var/games/angband/$i . 
-  done
-)
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
 # We'll kill the "delete.me" files in the package; probably these are left so
 # that lesser package management tools don't choke on empty directories
-find $PKG -name "delete.me" -exec rm -f {} \; || true
+find $PKG -name "delete.me" -exec rm -f {} \;
 
 # Now let's prevent upgrades from clobbering any existing datafiles
 # We'll handle these in doinst.sh
-mv $PKG/var/games/angband/apex/scores.raw \
-  $PKG/var/games/angband/apex/scores.raw.new
 for i in \
-  artifact ego_item flavor limits monster object p_class \
-  p_hist p_race prices shop_own spells terrain vault ; 
- do mv $PKG/var/games/angband/data/$i.raw \
-      $PKG/var/games/angband/data/$i.raw.new ;
+  artifact ego_item flavor hints limits monster monster_base names object \
+  object_base p_class p_hist p_race pain pit shop_own spell store terrain \
+  vault ; 
+ do mv $PKG/etc/angband/edit/$i.txt \
+      $PKG/etc/angband/edit/$i.txt.new ;
 done
 
+mkdir -p $PKG/usr/share/{applications,pixmaps}
+cp $CWD/angband.png $PKG/usr/share/pixmaps
+cp $CWD/angband.desktop $PKG/usr/share/applications
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
   changes.txt copying.txt faq.txt readme.txt thanks.txt lib/help/ \
     $PKG/usr/doc/$PRGNAM-$VERSION
 find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 644 {} \;
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$APP.SlackBuild
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 rm -f $PKG/usr/doc/$PRGNAM-$VERSION/help/.depend*
 
 mkdir -p $PKG/install
@@ -104,4 +97,3 @@ cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
-