system/afio: Fix 15.0 build.

Signed-off-by: B. Watson <yalhcru@gmail.com>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 20 insertions, 20 deletions

diff --git a/system/afio/README b/system/afio/README
index 6ff9ad41b536..18fda14eb6ab 100644
--- a/system/afio/README
+++ b/system/afio/README
@@ -1,3 +1,5 @@
+afio (archiver and backup program with internal compression support)
+
 Afio makes compressed archives that are safer than compressed tar or
 cpio archives, allowing better handling of input data corruption. Afio
 also supports multi-volume archives during interactive operation.
diff --git a/system/afio/afio.SlackBuild b/system/afio/afio.SlackBuild
index 13329cd9636a..04d164cea8d4 100644
--- a/system/afio/afio.SlackBuild
+++ b/system/afio/afio.SlackBuild
@@ -4,11 +4,17 @@
 
 # Written by ruario <sbo@ruari.com>
 
+# 20220212 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - i486 => i586
+# - use correct github download URL.
+# - don't install executable scripts in doc dir.
+# - don't install installation instructions in doc dir.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=afio
 VERSION=${VERSION:-2.5.2}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -20,9 +26,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# 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
@@ -32,12 +35,12 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-march=i686 -mtune=i686"
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-fPIC"
+  SLKCFLAGS="-O2 -fPIC"
 else
   SLKCFLAGS=""
 fi
@@ -48,27 +51,22 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/v$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+find . -type d -a -exec chmod 755 {} \+
+find . -type f -a -exec chmod 644 {} \+
 
-sed "s/\(^CFLAGS = \)/\1 $SLKCFLAGS /" -i.original Makefile
+sed -i "s,-O2,$SLKCFLAGS," Makefile
 make
 
-install -Dm755 afio $PKG/usr/bin/afio
+install -Dm755 -s afio $PKG/usr/bin/afio
 install -Dm644 afio.1 $PKG/usr/man/man1/afio.1
 
-strip --strip-unneeded $PKG/usr/bin/afio
 gzip $PKG/usr/man/man1/afio.1
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  ANNOUNCE* HISTORY INSTALLATION PORTING README* SCRIPTS script* afio_license_issues_*.txt \
+cp -a ANNOUNCE* HISTORY PORTING README* SCRIPTS script* *.txt \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/system/afio/afio.info b/system/afio/afio.info
index 93f2229d06dc..861e920a037b 100644
--- a/system/afio/afio.info
+++ b/system/afio/afio.info
@@ -1,7 +1,7 @@
 PRGNAM="afio"
 VERSION="2.5.2"
 HOMEPAGE="https://github.com/kholtman/afio"
-DOWNLOAD="https://github.com/kholtman/afio/archive/v2.5.2.tar.gz"
+DOWNLOAD="https://github.com/kholtman/afio/archive/v2.5.2/afio-2.5.2.tar.gz"
 MD5SUM="2ab7c66d2b6c100aef5fce596baf2247"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""