aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--games/dwarffortress/README6
-rw-r--r--games/dwarffortress/dwarffortress3
-rw-r--r--games/dwarffortress/dwarffortress.SlackBuild45
-rw-r--r--games/dwarffortress/dwarffortress.info10
-rw-r--r--games/dwarffortress/slack-desc4
5 files changed, 46 insertions, 22 deletions
diff --git a/games/dwarffortress/README b/games/dwarffortress/README
index 32465d131d..225cf964fa 100644
--- a/games/dwarffortress/README
+++ b/games/dwarffortress/README
@@ -1,4 +1,4 @@
-Dwarf Fortress is a sandbox game created by Tarn Adams of Bay 12 Games.
+Dwarf Fortress is a sandbox game created by Bay 12 Games.
The graphics are ASCII with various tilesets available.
In Fortress Mode, the player helps their dwarves survive by declaring
@@ -11,6 +11,4 @@ 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 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.)
+(An original copy of the program is placed in /opt)
diff --git a/games/dwarffortress/dwarffortress b/games/dwarffortress/dwarffortress
index da0506a2c3..73c697a81a 100644
--- a/games/dwarffortress/dwarffortress
+++ b/games/dwarffortress/dwarffortress
@@ -7,9 +7,10 @@ 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/run_df
+ ~/.dwarffortress/df
}
if [ $UID == 0 ]; then
diff --git a/games/dwarffortress/dwarffortress.SlackBuild b/games/dwarffortress/dwarffortress.SlackBuild
index 69cc222af2..cde1b298e7 100644
--- a/games/dwarffortress/dwarffortress.SlackBuild
+++ b/games/dwarffortress/dwarffortress.SlackBuild
@@ -21,10 +21,12 @@
# 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.50.13}
-SRCNAM=df_50_13_linux
+VERSION=${VERSION:-0.47.05}
+SRCNAM=df_47_05_linux
SRCDIR=df_linux
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -43,6 +45,14 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
exit 0
fi
+if [ "$ARCH" = "i586" ]; then
+ BITFLAG="32"
+elif [ "$ARCH" = "x86_64" ]; then
+ BITFLAG=""
+else
+ BITFLAG=""
+fi
+
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
@@ -51,13 +61,28 @@ set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
-cd $PKG
-mkdir opt opt/$PRGNAM
-cd opt/$PRGNAM
+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 {} \;
-tar pxvf $CWD/$SRCNAM.tar.bz2
-chown -R root:root .
-chmod -R 755 .
+mkdir $PKG/opt
+cd ..
+mv $SRCDIR $PKG/opt/$PRGNAM
# Strip binaries and libraries -
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
@@ -69,9 +94,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
-cp -a command\ line.txt file\ changes.txt readme.txt \
+cd $PKG/opt/$PRGNAM
+cp -a README.linux 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 16bc9356e3..0aab99df86 100644
--- a/games/dwarffortress/dwarffortress.info
+++ b/games/dwarffortress/dwarffortress.info
@@ -1,10 +1,10 @@
PRGNAM="dwarffortress"
-VERSION="0.50.13"
+VERSION="0.47.05"
HOMEPAGE="https://bay12games.com/dwarves/"
-DOWNLOAD="https://bay12games.com/dwarves/df_50_13_linux.tar.bz2"
-MD5SUM="1f8f3eb59d41ed86dba8dc08cb38f4d1"
-DOWNLOAD_x86_64=""
-MD5SUM_x86_64=""
+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"
REQUIRES=""
MAINTAINER="David Ferrone"
EMAIL="zapwai@gmail.com"
diff --git a/games/dwarffortress/slack-desc b/games/dwarffortress/slack-desc
index e0dace8895..3964986c24 100644
--- a/games/dwarffortress/slack-desc
+++ b/games/dwarffortress/slack-desc
@@ -8,8 +8,8 @@
|-----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: Bay 12 Games. The graphics are ASCII with various tilesets available.
+dwarffortress: Dwarf Fortress is a complex sandbox game created by Bay 12 Games.
+dwarffortress: 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.
dwarffortress: In Adventure Mode, the player takes the role of an individual who can