1 files changed, 33 insertions, 13 deletions
diff --git a/libraries/libslack/libslack.SlackBuild b/libraries/libslack/libslack.SlackBuild
index 62943ee552..91721dbf48 100644
--- a/libraries/libslack/libslack.SlackBuild
+++ b/libraries/libslack/libslack.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for libslack
 
-# Copyright 2012-2017 Christoph Willing, Australia
+# Copyright 2012-2023 Christoph Willing, Australia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,26 +22,36 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20230703 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - install static library without +x permission (this is the standard).
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=libslack
-VERSION=${VERSION:-0.6}
+VERSION=${VERSION:-0.7.5}
 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"
@@ -61,7 +71,15 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-tar xvf $CWD/$PRGNAM-$VERSION.html.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION-html.tar.gz
+cd $PRGNAM-$VERSION-html
+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 \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
+cd ..
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -71,7 +89,7 @@ find -L . \
  -exec chmod 644 {} \;
 
 # Strip update, download and uninstall capabilities from libslack-config
-patch -p1 < $CWD/notwanted.patch
+patch -p0 < $CWD/notwanted-0.7.3.diff
 
 # Set our CFLAGS
 sed -i "s|-O3|$SLKCFLAGS|" conf/linux Makefile
@@ -82,7 +100,7 @@ make
 # "make install" is badly broken (thanks XGizzmo), so manual install
 mkdir -p $PKG/usr/bin $PKG/usr/lib$LIBDIRSUFFIX $PKG/usr/include/slack
 
-install -m 0755 $PRGNAM.a $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM-$VERSION.a
+install -m 0644 $PRGNAM.a $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM-$VERSION.a
 ( cd $PKG/usr/lib$LIBDIRSUFFIX ; ln -s $PRGNAM-$VERSION.a $PRGNAM.a )
 
 install -m 0644 *.h $PKG/usr/include/slack/
@@ -100,14 +118,16 @@ chmod 0755 $PKG/usr/bin/$PRGNAM-config
 # Man pages overwrite stuff (thanks XGizzmo), so we ignore them
 # and install only the html documentation
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/html
-cp -a README LICENSE \
+cp -a COPYING LICENSE README.md REFERENCES \
   $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a *.html \
+cp -a $TMP/$PRGNAM-$VERSION-html/* \
   $PKG/usr/doc/$PRGNAM-$VERSION/html/
 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