1 files changed, 35 insertions, 24 deletions
diff --git a/libraries/confuse/confuse.SlackBuild b/libraries/confuse/confuse.SlackBuild
index 730f9699a7..3da9cd5fb5 100644
--- a/libraries/confuse/confuse.SlackBuild
+++ b/libraries/confuse/confuse.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Slackware build script for libConfuse
 #
-# Copyright 2009-2017  Erik W. Hanson, Minneapolis, MN, USA
+# Copyright 2009-2022  Erik W. Hanson, Minneapolis, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,26 +22,38 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220414 bkw: Modified by SlackBuilds.org, BUILD=3:
+# - get rid of /usr/share/doc, put docs in right place.
+# - i486 => i586.
+# - use "set -e" in script, instead of littering "|| exit 1" everywhere.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=confuse
-VERSION=${VERSION:-3.2}
+VERSION=${VERSION:-3.3}
 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"
@@ -54,18 +66,20 @@ else
   LIBDIRSUFFIX=""
 fi
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP || exit 1
+cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1
-cd $PRGNAM-$VERSION || exit 1
+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 \
+ -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 {} \+
 
 # The "-Wno-unused" is needed on 13.0, but won't hurt anything for 12.2
 CFLAGS="-Wno-unused $SLKCFLAGS" \
@@ -76,29 +90,26 @@ CFLAGS="-Wno-unused $SLKCFLAGS" \
   --localstatedir=/var \
   --enable-shared=yes \
   --enable-static=no \
-  --build=$ARCH-slackware-linux \
-  || exit 1
-
-make || exit 1
-make install-strip DESTDIR=$PKG || exit 1
+  --build=$ARCH-slackware-linux
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+make
+make install-strip DESTDIR=$PKG
 
 mkdir -p $PKG/usr/man/man3
 cp -a doc/man/man3/* $PKG/usr/man/man3/
 gzip -9 $PKG/usr/man/man3/*
 
-rmdir $PKG/usr/bin
+rm -rf $PKG/usr/bin
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  ABOUT-NLS AUTHORS COPYING INSTALL NEWS README \
-    $PKG/usr/doc/$PRGNAM-$VERSION
+mv $PKG/usr/share/doc/$PRGNAM/* $PKG/usr/doc/$PRGNAM-$VERSION
+rm -rf $PKG/usr/share/doc
 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
 
 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