5 files changed, 24 insertions, 50 deletions
diff --git a/games/dwarffortress/README b/games/dwarffortress/README
index bc04339ffb..32465d131d 100644
--- a/games/dwarffortress/README
+++ b/games/dwarffortress/README
@@ -11,4 +11,6 @@ https://dffd.bay12games.com
 
 Note: A local copy of the game will be placed in ~/.dwarffortress when
 run, where tilesets/graphics and config files can be changed.
-(An original copy of the program is placed in /opt)
+An original copy of the program is kept in /opt.
+After an update, delete your local .dwarffortress folder before running.
+(Regions kept in data/save can be reused for minor version updates.)
diff --git a/games/dwarffortress/dwarffortress b/games/dwarffortress/dwarffortress
index 6f71dec339..da0506a2c3 100644
--- a/games/dwarffortress/dwarffortress
+++ b/games/dwarffortress/dwarffortress
@@ -7,10 +7,9 @@ runme(){
     if [ ! -d ~/.dwarffortress ]; then
 	cp -a /opt/dwarffortress ~/.dwarffortress
 	cd ~/.dwarffortress
-	find {data,raw,sdl} -type d -exec chmod 700 {} \;	
     fi
     cd ~/.dwarffortress
-    ~/.dwarffortress/df
+    ~/.dwarffortress/run_df
 }
 
 if [ $UID == 0 ]; then
diff --git a/games/dwarffortress/dwarffortress.SlackBuild b/games/dwarffortress/dwarffortress.SlackBuild
index 1a30512966..69cc222af2 100644
--- a/games/dwarffortress/dwarffortress.SlackBuild
+++ b/games/dwarffortress/dwarffortress.SlackBuild
@@ -21,23 +21,15 @@
 #  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
+cd $(dirname $0) ; CWD=$(pwd)
 PRGNAM=dwarffortress
-VERSION=${VERSION:-0.47.05}
-SRCNAM=df_47_05_linux
+VERSION=${VERSION:-0.50.13}
+SRCNAM=df_50_13_linux
 SRCDIR=df_linux
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
-  exit 0
-fi
-
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i586 ;;
@@ -46,15 +38,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-if [ "$ARCH" = "i586" ]; then
-  BITFLAG="32"
-elif [ "$ARCH" = "x86_64" ]; then
-  BITFLAG=""
-else
-  BITFLAG=""
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
 fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -63,28 +51,13 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 
-cd $TMP
-rm -rf $SRCDIR
-tar xvf $CWD/$SRCNAM$BITFLAG.tar.bz2
-cd $SRCDIR && chown -R root:root .
-
-## Unnecessary in this case. Leave it in case the Toady One ever uses symlinks.
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-## Remove two library files that prevent operation, use local libraries instead.
-rm libs/libgcc_s.so.1
-rm libs/libstdc++.so.6
-
-## These directories will be writeable by the user. Normally mode 700.
-find {data,raw,sdl} -type d -exec chmod 755 {} \;
+cd $PKG
+mkdir opt opt/$PRGNAM
+cd opt/$PRGNAM
 
-mkdir $PKG/opt
-cd ..
-mv $SRCDIR $PKG/opt/$PRGNAM
+tar pxvf $CWD/$SRCNAM.tar.bz2
+chown -R root:root .
+chmod -R 755 .
 
 # Strip binaries and libraries -
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
@@ -96,9 +69,9 @@ cat $CWD/dwarffortress.desktop > $PKG/usr/share/applications/dwarffortress.deskt
 cat $CWD/dwarffortress.png > $PKG/usr/share/pixmaps/dwarffortress.png
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cd $PKG/opt/$PRGNAM
-cp -a README.linux  command\ line.txt  file\ changes.txt readme.txt  \
+cp -a command\ line.txt  file\ changes.txt readme.txt  \
    release\ notes.txt $PKG/usr/doc/$PRGNAM-$VERSION
+chmod 644 $PKG/usr/doc/$PRGNAM-$VERSION/*
 
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/games/dwarffortress/dwarffortress.info b/games/dwarffortress/dwarffortress.info
index 0aab99df86..16bc9356e3 100644
--- a/games/dwarffortress/dwarffortress.info
+++ b/games/dwarffortress/dwarffortress.info
@@ -1,10 +1,10 @@
 PRGNAM="dwarffortress"
-VERSION="0.47.05"
+VERSION="0.50.13"
 HOMEPAGE="https://bay12games.com/dwarves/"
-DOWNLOAD="https://bay12games.com/dwarves/df_47_05_linux32.tar.bz2"
-MD5SUM="c7b12be86285893db8c611d407b67c0b"
-DOWNLOAD_x86_64="https://bay12games.com/dwarves/df_47_05_linux.tar.bz2"
-MD5SUM_x86_64="be1e9b5954a50ffe90b2df8e7920c5a4"
+DOWNLOAD="https://bay12games.com/dwarves/df_50_13_linux.tar.bz2"
+MD5SUM="1f8f3eb59d41ed86dba8dc08cb38f4d1"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="David Ferrone"
 EMAIL="zapwai@gmail.com"
diff --git a/games/dwarffortress/slack-desc b/games/dwarffortress/slack-desc
index 8f8e6d21fb..e0dace8895 100644
--- a/games/dwarffortress/slack-desc
+++ b/games/dwarffortress/slack-desc
@@ -8,7 +8,7 @@
              |-----handy-ruler------------------------------------------------------|
 dwarffortress: dwarffortress (A single-player fantasy simulator adventure game)
 dwarffortress:
-dwarffortress: Dwarf Fortress is a complex sandbox game created by Tarn Adams of
+dwarffortress: Dwarf Fortress is a complex sandbox game created by Tarn Adams of 
 dwarffortress: Bay 12 Games. The graphics are ASCII with various tilesets available.
 dwarffortress: In Fortress Mode, the player helps their dwarves survive by declaring
 dwarffortress: areas to collect food, create workshops, create defenses, etc.