audio/calf-ladspa: Clean up README and slack-desc.

Signed-off-by: B. Watson <yalhcru@gmail.com>

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

4 files changed, 25 insertions, 30 deletions

diff --git a/audio/calf-ladspa/README b/audio/calf-ladspa/README
index 3fbe03c4b1..dd16f5b763 100644
--- a/audio/calf-ladspa/README
+++ b/audio/calf-ladspa/README
@@ -1,17 +1,18 @@
-Calf "legacy" audio plugin pack for LADSPA and JACK. Contains effects
-(flanger, reverb, tape-like delay, phaser, rotary speaker, multi-mode
-filter, multi-tap chorus and compressor) and instruments (organ
-simulator and a monophonic synthesizer). This is the last release of
-Calf that supports LADSPA.
+calf-ladspa (legacy audio plugin pack for LADSPA)
+
+Calf "legacy" audio plugin pack for LADSPA. Contains effects (flanger,
+reverb, tape-like delay, phaser, rotary speaker, multi-mode filter,
+multi-tap chorus and compressor). This is the last release of Calf
+that supported LADSPA.
 
 This build only contains LADSPA plugins. It can be installed on the
 same system as the main "calf" build without conflict. If you're
 looking for LV2 plugins and/or the standalone calfjackhost, see the
-main "calf" build.  The main purpose for calf-ladspa is to allow old
+main "calf" build. The main purpose for calf-ladspa is to allow old
 Ardour/etc sessions to keep working after upgrading calf to the new
-non-LADSPA version. New projects should use the LV2 plugins in the calf
-build, since that's what upstream supports.
+non-LADSPA version. New projects should use the LV2 plugins in the
+calf build, since that's what upstream supports.
 
-If you're looking for DSSI, please contact the script
-maintainer. Adding DSSI to this build is possible, but more work than I
-want to do unless someone actually *needs* it for opening old sessions.
+If you're looking for DSSI, please contact the script maintainer.
+Adding DSSI to this build is possible, but more work than I want to do
+unless someone actually *needs* it for opening old sessions.
diff --git a/audio/calf-ladspa/calf-ladspa.SlackBuild b/audio/calf-ladspa/calf-ladspa.SlackBuild
index 53e77de7bb..46a68d7957 100644
--- a/audio/calf-ladspa/calf-ladspa.SlackBuild
+++ b/audio/calf-ladspa/calf-ladspa.SlackBuild
@@ -4,6 +4,9 @@
 
 # Written by B. Watson (yalhcru@gmail.com)
 
+# 20211127 bkw: BUILD=2
+# - rework README and slack-desc, remove mentions of JACK and DSSI.
+
 # 20170706 bkw:
 # - Patch source so it doesn't check for jack-audio-connection-kit or
 #   fluidsynth. Previously they were required for the build to complete,
@@ -46,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
@@ -93,11 +93,8 @@ rm -rf $SRCNAM-$VERSION
 tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
 cd $SRCNAM-$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 {} \+
 
 # There are no --without or --disable options for jack and fluidsynth,
 # so patch the autoconf to skip them (they're not needed for the LADSPA
@@ -105,9 +102,7 @@ find -L . \
 patch -p1 < $CWD/disable-jack-and-fluidsynth.diff
 
 # gcc 7 is very picky about the argument types of std::min() and std::max().
-# This patch replaces them with C-style MIN and MAX macros. Not actually
-# needed on Slack 14.2, so it's commented out, but I'm checking the actual
-# patch into git so I won't lose track of it.
+# This patch replaces them with C-style MIN and MAX macros.
 patch -p1 < $CWD/minmax.diff
 
 autoreconf -if
@@ -142,8 +137,7 @@ make
 make install DESTDIR=$PKG docdir=/usr/doc/$PRGNAM-$VERSION
 
 # install-strip is supported, but doesn't work:
-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
+strip $PKG/usr/lib*/ladspa/*.so
 
 # This build is only for the ladspa plugins, so none of this
 # other stuff should be in the package:
diff --git a/audio/calf-ladspa/calf-ladspa.info b/audio/calf-ladspa/calf-ladspa.info
index 9ab966e10a..704aa20394 100644
--- a/audio/calf-ladspa/calf-ladspa.info
+++ b/audio/calf-ladspa/calf-ladspa.info
@@ -1,6 +1,6 @@
 PRGNAM="calf-ladspa"
 VERSION="0.0.19kx"
-HOMEPAGE="http://kxstudio.sourceforge.net/Plugins"
+HOMEPAGE="https://calf-studio-gear.org/"
 DOWNLOAD="https://slackware.uk/~urchlay/src/calf-0.0.19kx.tar.gz"
 MD5SUM="ba2147ddc53022ddf1ffdf28c3340a57"
 DOWNLOAD_x86_64=""
diff --git a/audio/calf-ladspa/slack-desc b/audio/calf-ladspa/slack-desc
index 495567f433..593ea8fa0e 100644
--- a/audio/calf-ladspa/slack-desc
+++ b/audio/calf-ladspa/slack-desc
@@ -6,12 +6,12 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
            |-----handy-ruler------------------------------------------------------|
-calf-ladspa: calf-ladspa (legacy audio plugin pack for LADSPA, DSSI, and JACK)
+calf-ladspa: calf-ladspa (legacy audio plugin pack for LADSPA)
+calf-ladspa:
+calf-ladspa: Calf audio plugin pack for LADSPA. Contains effects (flanger, reverb,
+calf-ladspa: tape-like delay, phaser, rotary speaker, multi-mode filter, multi-tap
+calf-ladspa: chorus and compressor).
 calf-ladspa:
-calf-ladspa: Calf audio plugin pack for LADSPA, DSSI, and JACK. Contains
-calf-ladspa: effects (flanger, reverb, tape-like delay, phaser, rotary speaker,
-calf-ladspa: multi-mode filter, multi-tap chorus and compressor) and instruments
-calf-ladspa: (organ simulator and a monophonic synthesizer).
 calf-ladspa:
 calf-ladspa:
 calf-ladspa: