misc/owfs: Fix conflict w/libkqueue, rm .la files.

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

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

2 files changed, 22 insertions, 16 deletions

diff --git a/misc/owfs/README b/misc/owfs/README
index 2a0fc870b6b67..a637249cde50f 100644
--- a/misc/owfs/README
+++ b/misc/owfs/README
@@ -1,5 +1,5 @@
 OWFS is an easy way to use the powerful 1-wire system of Dallas/Maxim.
 
-OWFS is a simple and flexible program to monitor and control the physical
-environment. You can write scripts to read temperature, flash lights,
-write to an LCD, log and graph, ...
+OWFS is a simple and flexible program to monitor and control the
+physical environment. You can write scripts to read temperature, flash
+lights, write to an LCD, log and graph, ...
diff --git a/misc/owfs/owfs.SlackBuild b/misc/owfs/owfs.SlackBuild
index ca445ee56aa94..62aaac798f1cc 100644
--- a/misc/owfs/owfs.SlackBuild
+++ b/misc/owfs/owfs.SlackBuild
@@ -4,11 +4,17 @@
 
 # Written by MrJackson mrjackson@gmail.com
 
+# 20220222 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - fix build if libkqueue is installed.
+# - do not install empty TODO and useless INSTALL in doc dir.
+# - get rid of .la files.
+# - TODO: someone check the PHP extension, see if it works with PHP7?
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=owfs
 VERSION=${VERSION:-3.2p4}
-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
@@ -57,10 +60,15 @@ 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 {} \+
+
+# 20220301 bkw: if configure detects libkqueue's sys/event.h, it also
+# needs to link with -lkqueue, but doesn't.
+pkg-config --exists libkqueue && LIBS="$( pkg-config --libs libkqueue )"
 
+LIBS="$LIBS" \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -77,26 +85,24 @@ CXXFLAGS="$SLKCFLAGS" \
 
 make
 # Install paths needed else perl modules get installed in /usr/local. :/
-make install \
+make install-strip \
   INSTALLDIRS=vendor \
   INSTALLVENDORMAN3DIR=/usr/man/man3 \
   DESTDIR=$PKG
 
-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
+gzip -9 $PKG/usr/man/*/*
 
 find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true
 find $PKG -depth -type d -empty -delete || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  AUTHORS COPYING ChangeLog INSTALL NEWS README* TODO \
+  AUTHORS COPYING ChangeLog NEWS README* \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+rm -f $PKG/usr/lib*/*.la
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc