1 files changed, 18 insertions, 6 deletions
diff --git a/system/foremost/foremost.SlackBuild b/system/foremost/foremost.SlackBuild
index 7f34e6338c..a22dec9eab 100644
--- a/system/foremost/foremost.SlackBuild
+++ b/system/foremost/foremost.SlackBuild
@@ -1,28 +1,38 @@
-#!/bin/sh
+#!/bin/bash
 # Slackware build script for foremost
 # Written by Larry Hajali <larryhaja[at]gmail[dot]com>
 # Edited by Barry J. Grundy <bgrundy[at]linuxleo[dot]com November 2011
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=foremost
 VERSION=${VERSION:-1.5.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 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"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
 elif [ "$ARCH" = "x86_64" ]; then
@@ -46,6 +56,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+patch -p1 < $CWD/gcc10.patch
+
 # Set the $ARCH variable for the Makefile.
 sed -i "s|-O2|$SLKCFLAGS|" Makefile
 # Set location of configuration file.
@@ -80,4 +92,4 @@ 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}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE