3 files changed, 33 insertions, 23 deletions
diff --git a/system/cfengine/README b/system/cfengine/README
index 0032937102..ceea160639 100644
--- a/system/cfengine/README
+++ b/system/cfengine/README
@@ -2,3 +2,6 @@ cfengine (Automate and manage your IT infrastructure)
 
 CFEngine is a configuration management and automation framework that
 lets you securely manage your mission critical IT infrastructure.
+
+Optional dependency: if avahi is installed, cfengine will be built
+with support for it.
diff --git a/system/cfengine/cfengine.SlackBuild b/system/cfengine/cfengine.SlackBuild
index 829602948e..18010359ff 100644
--- a/system/cfengine/cfengine.SlackBuild
+++ b/system/cfengine/cfengine.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for cfengine
 
@@ -22,10 +22,19 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220405 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - fix build when avahi is installed, and document avahi as optional.
+
+# 20220211 bkw: Modified by SlackBuilds.org: update for v3.15.2 since
+# the previous version wouldn't build on Slackware 15.0.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=cfengine
-VERSION=${VERSION:-3.10.1}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-3.15.2}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,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}
@@ -65,9 +78,11 @@ 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 {} \+
+
+SLKCFLAGS+=" -fcommon"
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -79,28 +94,20 @@ CXXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --with-workdir=/var/lib/cfengine \
-  --with-pam=no \
-  --without-pam \
   --enable-static=no \
   --enable-shared=yes \
   --build=$ARCH-slackware-linux
 
-make
-make install DESTDIR=$PKG
-
-if [ "$ARCH" = "x86_64" ]; then
-  mv $PKG/usr/lib $PKG/usr/lib${LIBDIRSUFFIX}
-fi
-
-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
+make V=1
+make install-strip DESTDIR=$PKG
+rm -f $PKG/usr/lib*/*.la
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a INSTALL README.md examples/ $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.md examples/ $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
diff --git a/system/cfengine/cfengine.info b/system/cfengine/cfengine.info
index a28a964000..ffd557cbf5 100644
--- a/system/cfengine/cfengine.info
+++ b/system/cfengine/cfengine.info
@@ -1,10 +1,10 @@
 PRGNAM="cfengine"
-VERSION="3.10.1"
+VERSION="3.15.2"
 HOMEPAGE="https://cfengine.com/"
-DOWNLOAD="https://cfengine-package-repos.s3.amazonaws.com/tarballs/cfengine-3.10.1.tar.gz"
-MD5SUM="ae7e2dc8b20faa89089002c9b9fd4e0a"
+DOWNLOAD="https://cfengine-package-repos.s3.amazonaws.com/tarballs/cfengine-3.15.2.tar.gz"
+MD5SUM="be04030c007dacd69ad705059a906495"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="lmdb"
+REQUIRES=""
 MAINTAINER="Jeremy HOCDE"
 EMAIL="jeremyhocde@gmail.com"