1 files changed, 24 insertions, 14 deletions
diff --git a/system/incron/incron.SlackBuild b/system/incron/incron.SlackBuild
index c1227dbf4e..efab451c5e 100644
--- a/system/incron/incron.SlackBuild
+++ b/system/incron/incron.SlackBuild
@@ -1,15 +1,19 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for incrond
 
 # Written by Asaf Ohaion asaf@lingnu.com
 # Modified by Willy Sudiarto Raharjo <willysr@slackware-id.org>
-# Modified 2017 by Marek Srejma <sam_web@yahoo.de>
+# Modified 2017 by Marek Šrejma <marek@modweb.de>, Germany
+# Modified 2022 by B. Watson <urchlay@slackware.uk>, to fix Slack 15.0 build.
+
+cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=incron
 VERSION=${VERSION:-0.6.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -19,7 +23,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}
@@ -49,26 +57,28 @@ 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 \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 sed -i 's|/share/|/|g' Makefile
 
-make PREFIX=/usr
-make install DESTDIR=$PKG PREFIX=/usr MANPATH=/usr/man
+make \
+  PREFIX=/usr \
+  MANPATH=/usr/man \
+  OPTIMIZE="$SLKCFLAGS -std=gnu++11" \
+  DEBUG="-Wl,-s" \
+  DESTDIR=$PKG \
+  all \
+  install
+
+gzip -9 $PKG/usr/man/man*/*
 
 # Install init script:
 mkdir -p $PKG/etc/rc.d
 cp $CWD/rc.incrond $PKG/etc/rc.d/rc.incrond.new
 chmod 644 $PKG/etc/rc.d/rc.incrond.new
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-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
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a CHANGELOG COPYING README LICENSE-* VERSION $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
@@ -78,4 +88,4 @@ cat $CWD/doinst.sh > $PKG/install/doinst.sh
 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