aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorB. Watson <yalhcru@gmail.com>2017-03-09 15:17:57 -0500
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2017-03-18 06:58:55 +0700
commit7f99c64498734fc5ed0d527538ca03b3b66f38dc (patch)
treeb438654818e0ec111c2ee0f019bc474444850a02
parent33f56ee91571e219da063fdbaa2b209c31e0ee55 (diff)
games/gottet: New maintainer, FHS fix.
Signed-off-by: B. Watson <yalhcru@gmail.com>
-rw-r--r--games/gottet/gottet.SlackBuild37
-rw-r--r--games/gottet/gottet.info4
2 files changed, 33 insertions, 8 deletions
diff --git a/games/gottet/gottet.SlackBuild b/games/gottet/gottet.SlackBuild
index dcd25ac962ae..3b150abd572c 100644
--- a/games/gottet/gottet.SlackBuild
+++ b/games/gottet/gottet.SlackBuild
@@ -2,8 +2,11 @@
# Slackware build script for gottet
+# Originally written by:
# Ryan P.C. McQuen | Everett, WA | ryanpcmcquen@member.fsf.org
+# Now maintained by B. Watson (yalhcru@gmail.com)
+
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
@@ -22,14 +25,23 @@
# with this program (most likely, a file named COPYING). If not, see
# <http://www.gnu.org/licenses/>.
+# 20170309 bkw:
+# - take over maintenance
+# - thought about a version bump, but 1.0.6 is the last version that
+# supports qt4. don't want qt5 as a dep.
+# - binary in /usr/games
+# - i486 => i586
+# - support SLKCFLAGS
+# - BUILD=2
+
PRGNAM=gottet
VERSION=${VERSION:-1.0.6}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -40,6 +52,20 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+ SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+ SLKCFLAGS="-O2 -fPIC"
+ LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
+fi
+
set -eu
rm -rf $PKG
@@ -56,12 +82,11 @@ 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 {} \;
-qmake PREFIX=/usr
+qmake PREFIX=/usr BINDIR=games
+sed -i "s,-O2,$SLKCFLAGS," Makefile
make
make install INSTALL_ROOT=$PKG
-
-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
+strip $PKG/usr/games/$PRGNAM
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a COPYING ChangeLog CREDITS $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/games/gottet/gottet.info b/games/gottet/gottet.info
index 93478e56de3a..5b2b957f016b 100644
--- a/games/gottet/gottet.info
+++ b/games/gottet/gottet.info
@@ -6,5 +6,5 @@ MD5SUM="cacc0861304ee161451bb4ea3c8246d9"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
-MAINTAINER="Ryan P.C. McQuen"
-EMAIL="ryanpcmcquen@member.fsf.org"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"