4 files changed, 32 insertions, 38 deletions
diff --git a/network/axel/README b/network/axel/README
index a1f6e0a8e7..3368633451 100644
--- a/network/axel/README
+++ b/network/axel/README
@@ -1,7 +1,7 @@
 Axel accelerates the HTTP/FTP downloading process by using multiple
-connections for one file. It can use multiple mirrors for a download. Axel
-has no dependencies and is lightweight, so it might be useful as a wget
-clone on byte-critical systems. Axel is the perfect utility for those
-connections to wherever you are downloading from that may have a limit
-on ftp stream speeds, http sessions that burst and slow down, or servers
-with a slow connection.
+connections for one file. It can use multiple mirrors for a download.
+Axel has no dependencies and is lightweight, so it might be useful as a
+wget clone on byte-critical systems. Axel is the perfect utility for
+those connections to wherever you are downloading from that may have a
+limit on ftp stream speeds, http sessions that burst and slow down, or
+servers with a slow connection.
diff --git a/network/axel/axel.SlackBuild b/network/axel/axel.SlackBuild
index 1fd45e4c8c..48564656ae 100644
--- a/network/axel/axel.SlackBuild
+++ b/network/axel/axel.SlackBuild
@@ -1,10 +1,10 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for axel
 
 # Copyright 2008  Antonio Hernández Blas <hba.nihilismus@gmail.com>
 # Copyright 2011  Matthew "mfillpot" Fillpot
-# Copyright 2018-2020  Jostein Berntsen <jbernts@broadpark.no>
+# Copyright 2018-2022  Jostein Berntsen <jvbernts@online.no>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,10 +24,17 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220403 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - strip the binary.
+# - remove useless INSTALL from package doc dir.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=axel
-VERSION=${VERSION:-2.17.8}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-2.17.11}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -37,7 +44,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+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}
@@ -67,9 +78,9 @@ 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 \
+ -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ -exec chmod 644 {} \+
 
 ./configure \
   --prefix=/usr \
@@ -78,18 +89,15 @@ find -L . \
 
 CFLAGS="$SLKCFLAGS" \
   make
-make install DESTDIR=$PKG
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+make install-strip DESTDIR=$PKG
+gzip -9 $PKG/usr/man/man*/*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS CONTRIBUTING.md COPYING CREDITS INSTALL NEWS README.md VERSION $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CONTRIBUTING.md COPYING NEWS README.md VERSION $PKG/usr/doc/$PRGNAM-$VERSION
 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}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/axel/axel.info b/network/axel/axel.info
index f20e9d19a9..411b0eeb0a 100644
--- a/network/axel/axel.info
+++ b/network/axel/axel.info
@@ -1,10 +1,10 @@
 PRGNAM="axel"
-VERSION="2.17.8"
+VERSION="2.17.11"
 HOMEPAGE="https://github.com/axel-download-accelerator/axel"
-DOWNLOAD="https://github.com/axel-download-accelerator/axel/releases/download/v2.17.8/axel-2.17.8.tar.gz"
-MD5SUM="15c0d085d33b3908ebd8debc41b25afa"
+DOWNLOAD="https://github.com/axel-download-accelerator/axel/releases/download/v2.17.11/axel-2.17.11.tar.gz"
+MD5SUM="a03b18bc96fda568c6273e7affecbcc8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Jostein Berntsen"
-EMAIL="jbernts@broadpark.no"
+EMAIL="jvbernts@online.no"
diff --git a/network/axel/doinst.sh b/network/axel/doinst.sh
deleted file mode 100644
index fa6f314c12..0000000000
--- a/network/axel/doinst.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-config() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  # If there's no config file by that name, mv it over:
-  if [ ! -r $OLD ]; then
-    mv $NEW $OLD
-  elif [ "$(cat $OLD|md5sum)" = "$(cat $NEW|md5sum)" ]; then
-    # toss the redundant copy
-    rm $NEW
-  fi
-  # Otherwise, we leave the .new copy for the admin to consider...
-}
-
-config etc/axelrc.new