system/dar: Updated for version 2.7.15, new maintainer.

Signed-off-by: B. Watson <urchlay@slackware.uk>

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

4 files changed, 51 insertions, 22 deletions

diff --git a/system/dar/README b/system/dar/README
index efb15c05b5..6823ed98ff 100644
--- a/system/dar/README
+++ b/system/dar/README
@@ -1,4 +1,10 @@
+dar (Disk ARchive)
+
 Disk ARchive (DAR) is a backup tool for files and directories.
-It is primarily aimed for floppies, zip disks and/or hard drives.
+It is primarily aimed at floppies, zip disks and/or hard drives.
 It has numerous features that make it a substitute for a tar-based
 backup system.
+
+Optional dependencies (autodetected):
+- librsync, for rsync compression support.
+- pybind11, for Python 3 bindings.
diff --git a/system/dar/dar.SlackBuild b/system/dar/dar.SlackBuild
index 878dddc9f0..361617da9a 100644
--- a/system/dar/dar.SlackBuild
+++ b/system/dar/dar.SlackBuild
@@ -4,7 +4,7 @@
 # Home Page http://dar.linux.free.fr/
 
 # Copyright (c) 2007-2019, Nishant Limbachia, Hoffman Estates, IL, USA
-# <nishant _AT_ mnspace _DOT_ net>
+# Copyright (c) 2024 B. Watson
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -29,6 +29,13 @@
 # consistency with other scripts in our repository
 # No additional license terms added  :-)
 
+# 20240826 bkw:
+# - new maintainer.
+# - update for v2.7.15.
+# - tweak README and slack-desc.
+# - document optional librsync and pybind11 deps.
+# - fix samples/ path, for default config file.
+
 # 20220409 bkw: Modified by SlackBuilds.org, BUILD=2:
 # - remove useless INSTALL from doc dir.
 # - fix permissions in doc dir, add missing SlackBuild.
@@ -36,8 +43,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM="dar"
-VERSION=${VERSION:-2.6.3}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-2.7.15}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -80,12 +87,12 @@ cd $TMP
 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 \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
 
+# 20240826 bkw: --disable-upx doesn't affect compile options, it
+# prevents the dar executables from being compressed with upx
+# when installed.
 LDFLAGS="-L/usr/lib${LIBDIRSUFFIX} -L/lib${LIBDIRSUFFIX}" \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -99,6 +106,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-shared \
   --disable-static \
   --disable-upx \
+  --disable-dar-static \
   --disable-build-html \
   --build=$ARCH-slackware-linux
 
@@ -106,14 +114,29 @@ make
 make install-strip DESTDIR=$PKG
 gzip -9 $PKG/usr/man/man*/*
 
+# 20240826 bkw: sbopkglint hates it if we don't do this:
+if [ -d $PKG/usr/lib$LIBDIRSUFFIX/python3 ]; then
+  strip $PKG/usr/lib*/python3/*/*.so
+  chmod 755 $PKG/usr/lib*/python3/*/*.so
+fi
+
 mv $PKG/etc/darrc $PKG/etc/darrc.new
 
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
 mkdir -p $PKG/usr/doc
-mv $PKG/usr/share/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION
-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
-chmod 644 $PKG/usr/doc/$PRGNAM-$VERSION/samples/*
+mv $PKG/usr/share/$PRGNAM $PKGDOC
+
+# 20240827 bkw: the config file wants to source stuff from
+# samples/, which it expects to find in /usr/share/dar.
+# Also the permissions are awful.
+mkdir -p $PKG/usr/share/$PRGNAM
+mv $PKGDOC/samples $PKG/usr/share/$PRGNAM
+ln -s ../../share/$PRGNAM/samples $PKGDOC/samples
+chmod 644 $PKGDOC/samples/*
+
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
+cp -a AUTHORS ChangeLog COPYING NEWS README TODO THANKS $PKGDOC
+chmod 644 $PKGDOC/samples/*
 chown -R root:root $PKG/usr/doc
 
 mkdir -p $PKG/install
diff --git a/system/dar/dar.info b/system/dar/dar.info
index 2aa5ebddea..981a41f23e 100644
--- a/system/dar/dar.info
+++ b/system/dar/dar.info
@@ -1,10 +1,10 @@
 PRGNAM="dar"
-VERSION="2.6.3"
+VERSION="2.7.15"
 HOMEPAGE="http://dar.linux.free.fr/"
-DOWNLOAD="http://downloads.sourceforge.net/dar/dar-2.6.3.tar.gz"
-MD5SUM="c02666e2e04fb37d61745e0de220f983"
+DOWNLOAD="https://dar.edrusb.org/dar.linux.free.fr/Releases/Source_code/dar-2.7.15.tar.gz"
+MD5SUM="06b555d485ace47a02144f32a32af285"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Nishant Limbachia"
-EMAIL="nishant@mnspace.net"
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/dar/slack-desc b/system/dar/slack-desc
index abfd358b24..3275ab5286 100644
--- a/system/dar/slack-desc
+++ b/system/dar/slack-desc
@@ -10,9 +10,9 @@ dar: dar (Disk ARchive)
 dar:
 dar: dar is a shell command that backs up directory trees and files.
 dar: It has been tested under Linux, Windows, Solaris, FreeBSD, NetBSD,
-dar: MacOS X and several other systems.  It is released under the
-dar: GNU General Public License (GPL).  dar also includes a programming
-dar: API called libdar which makes it easy to program a gui interface.
+dar: MacOS X and several other systems. It is released under the
+dar: GNU General Public License (GPL). dar also includes a programming
+dar: API called libdar which makes it easy to program a GUI interface.
 dar:
 dar: Homepage: http://dar.linux.free.fr/
 dar: