From 63eb38fb2102054560fa313a4b58ca7ea955bd61 Mon Sep 17 00:00:00 2001
From: "B. Watson" <yalhcru@gmail.com>
Date: Mon, 4 Apr 2022 18:00:27 -0400
Subject: [PATCH] office/bibutils: Use SLKCFLAGS, strip binaries.

Signed-off-by: B. Watson <yalhcru@gmail.com>
---
 office/bibutils/bibutils.SlackBuild | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/office/bibutils/bibutils.SlackBuild b/office/bibutils/bibutils.SlackBuild
index 2f77ed589c..82de4eddb4 100644
--- a/office/bibutils/bibutils.SlackBuild
+++ b/office/bibutils/bibutils.SlackBuild
@@ -22,25 +22,27 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220404 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - i486 => i586.
+# - actually use SLKCFLAGS.
+# - strip binaries and library.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=bibutils
 VERSION=${VERSION:-5.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 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
 
-# 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
@@ -50,8 +52,8 @@ 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"
@@ -75,19 +77,20 @@ 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 {} \+
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --install-dir $PKG/usr/bin \
   --install-lib $PKG/usr/lib${LIBDIRSUFFIX} \
   --dynamic
 
+sed -i "s|-Wall|$SLKCFLAGS|" Makefile
 make
+
 make install
+strip $PKG/usr/bin/* $PKG/usr/lib*/lib*.so.?.?
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \