aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorB. Watson <yalhcru@gmail.com>2017-03-20 23:44:19 -0400
committerDavid Spencer <idlemoor@slackbuilds.org>2017-03-25 13:28:00 +0000
commit9168a9e76cee3b8fbb003a588b8fe9400bb3859c (patch)
tree9a7b18154dc82b7e8f596908d23603c0b230d353
parent1f449519831106ebfc3625b331962b022c523df3 (diff)
graphics/fbpic: VERSION override, i486=>i586, install doinst.sh.
Signed-off-by: B. Watson <yalhcru@gmail.com> Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
-rw-r--r--graphics/fbpic/doinst.sh1
-rw-r--r--graphics/fbpic/fbpic.SlackBuild9
2 files changed, 5 insertions, 5 deletions
diff --git a/graphics/fbpic/doinst.sh b/graphics/fbpic/doinst.sh
index 4a25de5e6fbd1..65c7e2eeb9aa5 100644
--- a/graphics/fbpic/doinst.sh
+++ b/graphics/fbpic/doinst.sh
@@ -7,4 +7,3 @@ if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
/usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
fi
fi
-
diff --git a/graphics/fbpic/fbpic.SlackBuild b/graphics/fbpic/fbpic.SlackBuild
index 6aee1ccf5fe22..1bc2e5358f64d 100644
--- a/graphics/fbpic/fbpic.SlackBuild
+++ b/graphics/fbpic/fbpic.SlackBuild
@@ -5,13 +5,13 @@
# Written by K.D.Hedger kdhedger@yahoo.co.uk
PRGNAM=fbpic
-VERSION=0.0.2
+VERSION=${VERSION:-0.0.2}
BUILD=${BUILD:-1}
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
@@ -22,8 +22,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"
@@ -61,6 +61,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
cd $PKG
/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}