1 files changed, 12 insertions, 15 deletions
diff --git a/system/dar/dar.SlackBuild b/system/dar/dar.SlackBuild
index b89c3624d6..c3ab50827c 100644
--- a/system/dar/dar.SlackBuild
+++ b/system/dar/dar.SlackBuild
@@ -29,11 +29,15 @@
 # consistency with other scripts in our repository
 # No additional license terms added  :-)
 
+# 20220409 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - remove useless INSTALL from doc dir.
+# - fix permissions in doc dir, add missing SlackBuild.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM="dar"
 VERSION=${VERSION:-2.6.3}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -45,9 +49,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
@@ -81,9 +82,9 @@ 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 {} \+
 
 LDFLAGS="-L/usr/lib${LIBDIRSUFFIX} -L/lib${LIBDIRSUFFIX}" \
 CFLAGS="$SLKCFLAGS" \
@@ -102,21 +103,17 @@ CXXFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux
 
 make
-make install 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
+make install-strip DESTDIR=$PKG
+gzip -9 $PKG/usr/man/man*/*
 
 mv $PKG/etc/darrc $PKG/etc/darrc.new
 
 mkdir -p $PKG/usr/doc
 mv $PKG/usr/share/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS ChangeLog COPYING INSTALL NEWS README TODO THANKS \
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cp -a AUTHORS ChangeLog COPYING NEWS README TODO THANKS \
   $PKG/usr/doc/$PRGNAM-$VERSION
-( cd $PKG/usr/doc ; ln -s $PRGNAM-$VERSION $PRGNAM )
+chmod 644 $PKG/usr/doc/$PRGNAM-$VERSION/samples/*
 chown -R root:root $PKG/usr/doc
 
 mkdir -p $PKG/install