games/trigger-rally: Updated for version 0.6.4.

Signed-off-by: Larry Hajali <larryhaja[at]gmail[dot]com>

1 files changed, 28 insertions, 38 deletions

diff --git a/games/trigger-rally/trigger-rally.SlackBuild b/games/trigger-rally/trigger-rally.SlackBuild
index 56cafb1ff4..688574dada 100644
--- a/games/trigger-rally/trigger-rally.SlackBuild
+++ b/games/trigger-rally/trigger-rally.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for trigger-rally
 
-# Copyright 2015 Larry Hajali <larryhaja[at]gmail[dot]com>
+# Copyright 2015-2016 Larry Hajali <larryhaja[at]gmail[dot]com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=trigger-rally
-VERSION=${VERSION:-0.6.2}
+VERSION=${VERSION:-0.6.4}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -60,12 +60,9 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION-src.tar.bz2
-cd $PRGNAM-$VERSION-src
-tar xvf $CWD/$PRGNAM-$VERSION-data.tar.bz2
-# Fix permissions.
-find . -type f -exec chmod -x '{}' \;
-chmod +x configure
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
+for i in $CWD/*.zip;do cp $i data/plugins;done
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -73,28 +70,24 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --bindir=/usr/games \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --datadir=/usr/share/$PRGNAM \
-  --build=$ARCH-slackware-linux
-
-jam -dx -qa
-
-# Manually install the binary and data files.
-mkdir -p $PKG/usr/games $PKG/usr/share/$PRGNAM
-install -m 0755 trigger $PKG/usr/games/$PRGNAM
-cd $PRGNAM-$VERSION-data
-find . -maxdepth 1 -type d -exec cp -ar '{}' $PKG/usr/share/$PRGNAM \;
-cp trigger.config.defs $PKG/usr/share/$PRGNAM
-cd -
+# Fix end-of-line encoding
+for j in doc/*; do
+  sed -e 's/\r//' $i > ${i}.new
+  touch -r $i ${i}.new
+  mv ${i}.new $i
+done
+
+# Fix for gcc >= 5.x
+# https://sourceforge.net/p/trigger-rally/discussion/527953/thread/e1cde947/
+patch -p0 < $CWD/hiscore1.h.patch
+
+OPTIMS="$SLKCFLAGS" \
+make -C src
+
+make -C src install \
+  DESTDIR=$PKG \
+  prefix=/usr \
+  docdir=/usr/doc/$PRGNAM-$VERSION
 
 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 || true
@@ -102,19 +95,16 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 mkdir $PKG/usr/share/applications
 install -m 0644 $CWD/$PRGNAM.desktop $PKG/usr/share/applications
 for i in 16 22 24 32 36 48 64 72 96 128 192 256; do
-  install -D -m 0644 $PRGNAM-$VERSION-data/icon/trigger-${i}.png \
+  mkdir -p $PKG/usr/share/icons/hicolor/${i}x${i}/apps
+  ln -s /usr/share/games/$PRGNAM/icon/trigger-${i}.png \
     $PKG/usr/share/icons/hicolor/${i}x${i}/apps/$PRGNAM.png
 done
-install -D -m 0644 $PRGNAM-$VERSION-data/icon/$PRGNAM-icons.svg \
-  $PKG/usr/share/icons/hicolor/scalable/apps/$PRGNAM.png
+mkdir -p $PKG/usr/share/icons/hicolor/scalable/apps
+ln -s /usr/share/games/$PRGNAM/icons/trigger-${i}-icons.svg \
+  $PKG/usr/share/icons/hicolor/scalable/apps/$PRGNAM.svg
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a doc/* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-# Fix permissions.
-find $PKG -type d -exec chmod 0755 '{}' \;
-
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh