From 33f56ee91571e219da063fdbaa2b209c31e0ee55 Mon Sep 17 00:00:00 2001 From: "B. Watson" Date: Thu, 9 Mar 2017 15:00:25 -0500 Subject: games/enigma: New maintainer, FHS fix. Signed-off-by: B. Watson --- games/enigma/enigma.SlackBuild | 26 ++++++++++++++++++-------- games/enigma/enigma.info | 4 ++-- 2 files changed, 20 insertions(+), 10 deletions(-) (limited to 'games') diff --git a/games/enigma/enigma.SlackBuild b/games/enigma/enigma.SlackBuild index 75aad15f48..22fc6e659a 100644 --- a/games/enigma/enigma.SlackBuild +++ b/games/enigma/enigma.SlackBuild @@ -2,8 +2,11 @@ # Slackware build script for enigma +# Formerly maintained by: # Ryan P.C. McQuen | Everett, WA | ryanpcmcquen@member.fsf.org +# Now maintained by B. Watson (yalhcru@gmail.com) + # Copyright 2010 Binh Nguyen # All rights reserved. # @@ -24,6 +27,11 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 20170309 bkw: +# - take over maintenance +# - i486 => i586 +# - binary in /usr/games + PRGNAM=enigma VERSION=${VERSION:-1.04} BUILD=${BUILD:-1} @@ -31,7 +39,7 @@ 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 @@ -42,8 +50,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -75,6 +83,7 @@ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ + --bindir=/usr/games \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ --localstatedir=/var/games \ @@ -82,12 +91,13 @@ CXXFLAGS="$SLKCFLAGS" \ --infodir=/usr/info \ --build=$ARCH-slackware-linux -mkdir -p $PKG/usr/bin +mkdir -p $PKG/usr/games make -make install prefix=$PKG/usr localstatedir=$PKG/var/games - -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 +make install \ + prefix=$PKG/usr \ + localstatedir=$PKG/var/games \ + bindir=$PKG/usr/games +strip $PKG/usr/games/$PRGNAM mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a CHANGELOG LICENCE README $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/games/enigma/enigma.info b/games/enigma/enigma.info index cefd86af1c..c94cd03366 100644 --- a/games/enigma/enigma.info +++ b/games/enigma/enigma.info @@ -6,5 +6,5 @@ MD5SUM="a54ee9ae40dae781560a3c2b1ce8f45d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" -MAINTAINER="Ryan P.C. McQuen" -EMAIL="ryanpcmcquen@member.fsf.org" +MAINTAINER="B. Watson" +EMAIL="yalhcru@gmail.com" -- cgit v1.2.3-65-gdbad