1 files changed, 22 insertions, 25 deletions
diff --git a/system/ioping/ioping.SlackBuild b/system/ioping/ioping.SlackBuild
index 6990e5664b..f63d60d8bd 100644
--- a/system/ioping/ioping.SlackBuild
+++ b/system/ioping/ioping.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for ioping
 
@@ -24,26 +24,36 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220211 bkw: Modified by SlackBuilds.org, updated for v1.2 as the
+# previous version wouldn't build on Slackware 15.0.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=ioping
-VERSION=${VERSION:-0.9}
+VERSION=${VERSION:-1.2}
 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 [ ! -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"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -65,36 +75,23 @@ rm -rf $PRGNAM-$VERSION
 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 {} \;
+chmod 644 *
 
-# We don't have a git repo so we manually set the version in the Makefile
-patch < $CWD/ioping-0.9-Makefile.diff
+sed -i "s|-g -O2|$SLKCFLAGS -Wl,-s|" Makefile
 
 make install \
-  OPTS="$SLKCFLAGS" \
   PREFIX=/usr \
+  MAN1DIR=/usr/man/man1 \
   DESTDIR=$PKG
 
-strip --strip-unneeded $PKG/usr/bin/ioping
-mkdir -p $PKG/usr/man/man1
-mv $PKG/usr/share/man/man1/ioping.1 $PKG/usr/man/man1
-gzip -9 $PKG/usr/man/man1/ioping.1
-rmdir $PKG/usr/share/man/man1
-rmdir $PKG/usr/share/man
-rmdir $PKG/usr/share
+gzip -9 $PKG/usr/man/man1/$PRGNAM.1
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cat $TMP/$PRGNAM-$VERSION/changelog > $PKG/usr/doc/$PRGNAM-$VERSION/changelog
-cat $TMP/$PRGNAM-$VERSION/README > $PKG/usr/doc/$PRGNAM-$VERSION/README
-cat $TMP/$PRGNAM-$VERSION/LICENSE > $PKG/usr/doc/$PRGNAM-$VERSION/LICENSE
+cp -a LICENSE changelog README.md $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
 
 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