audio/caps: Updated for version 0.9.26.

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

4 files changed, 71 insertions, 39 deletions

diff --git a/audio/caps/README b/audio/caps/README
index c02ce92679..f75e0f44c4 100644
--- a/audio/caps/README
+++ b/audio/caps/README
@@ -18,4 +18,5 @@ the package, set DOCS=no in the script's environment. Note that the HTML
 doc is also available online (it's the caps homepage)... but only the
 most recent version, which might be newer than this build.
 
-If you're upgrading from an older version of caps, read UPGRADE.txt.
+If you're upgrading from an older version of caps, or need to install
+an older version of caps for e.g. an old Ardour session, read UPGRADE.txt.
diff --git a/audio/caps/UPGRADE.txt b/audio/caps/UPGRADE.txt
index b7d3b27e5c..206028d4db 100644
--- a/audio/caps/UPGRADE.txt
+++ b/audio/caps/UPGRADE.txt
@@ -1,32 +1,56 @@
+Upgrade notes:
 
-0.9.24 upgrade notes:
+It's a terrible idea to upgrade plugins while running programs are
+still using them. Make sure you exit any application(s) that use the
+caps plugins before upgrading.
 
-Some of the plugin names and/or their parameters have changed since the
-old (0.9.7 or 0.9.20) SlackBuild.
-
-If you're upgrading from 0.9.7, be aware that any of your scripts
+Plugin names and parameters can and do change, between caps releases. If
+you're upgrading from an older version, be aware that any of your scripts
 or projects that use caps (e.g. Ardour sessions, or jack-rack presets)
-will need updating. For Ardour 2.x, if the changes prevent your session
-from loading, try:
+might need updating, especially if you're upgrading from a really old
+version.
+
+For Ardour, if the changes prevent your session from loading, try:
 
 - Make a backup of your session directory (done with cp or tar, whatever).
-- Start ardour2 with the -d (or --disable-plugins) option, load the session.
+- Start ardour3 with the -d (or --disable-plugins) option.
+- Load the session.
 - Remove the offending plugins from their tracks or busses.
-- Save and exit
-- Start ardour2 normally, load the session.
-- Add the plugins back.
+- Save the session.
+- Exit Ardour.
+- Start ardour3 normally.
+- Load the session again.
+- Add the plugins back. Manually.
 
-If all else fails and you want to downgrade back to 0.9.7, you can
-still build it with this SlackBuild. Upstream removed the 0.9.7
-source from their site, but there's a copy here:
+If all else fails and you want to downgrade back to an older version,
+you can still build many of them with this SlackBuild. Upstream removes
+the old sources from their site, but there are several versions archived
+here:
 
 http://urchlay.naptime.net/~urchlay/src/caps_0.9.7.tar.bz2
-
-Build with: VERSION=0.9.7 DOCS=no ./caps.SlackBuild
-
-You can still build 0.9.20 as well:
+[no documentation available for 0.9.7; package won't contain docs]
 
 http://urchlay.naptime.net/~urchlay/src/caps_0.9.20.tar.bz2
 http://urchlay.naptime.net/~urchlay/src/caps-doc-unofficial_0.9.20.tar.bz2
 
-Build with: VERSION=0.9.20 ./caps.SlackBuild
+http://urchlay.naptime.net/~urchlay/src/caps_0.9.24.tar.bz2
+http://urchlay.naptime.net/~urchlay/src/caps-doc-unofficial_0.9.24.tar.bz2
+
+Build with a command like:
+
+  root@box:caps# VERSION=0.9.7 ./caps.SlackBuild
+
+md5sums of the above files:
+
+7eea7c1f30363cca78f600544de271f4  caps-doc-unofficial_0.9.20.tar.bz2
+58eec76a6db744e13539101dd1f7c647  caps-doc-unofficial_0.9.24.tar.bz2
+0bb3935f6747a7087ca32a67bd0d8793  caps_0.9.20.tar.bz2
+c1d634038dcb54702306c0e30cb1c626  caps_0.9.24.tar.bz2
+d74582d3ae7a4244d3a77501693bbdf3  caps_0.9.7.tar.bz2
+
+Other old versions not listed here may work, but haven't been tested.
+
+At some point, I may be forced to change the SlackBuild in a way that
+will break compatibility with old versions. If that happens, and you
+still need an old version, please let me know (at the email address in
+the .info file).
diff --git a/audio/caps/caps.SlackBuild b/audio/caps/caps.SlackBuild
index f197d318d1..8b852bbeb6 100644
--- a/audio/caps/caps.SlackBuild
+++ b/audio/caps/caps.SlackBuild
@@ -6,10 +6,16 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20181218 bkw:
+# - update for v0.9.26.
+# - expand UPGRADE.txt.
+# - test script with versions 0.9.7, 0.9.20, 0.9.24 (it still works).
+# - minor script cleanups/simplifications.
+
 # 20170622 bkw: fix build on -current
 
 PRGNAM=caps
-VERSION=${VERSION:-0.9.24}
+VERSION=${VERSION:-0.9.26}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -51,13 +57,12 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/${PRGNAM}_$VERSION.tar.bz2
 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 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 {} \+
 
-patch -p1 < $CWD/gcc7fix.diff
+# 0.9.26 doesn't need this (and it won't apply), leaving it here
+# in case someone really needs 0.9.24 for existing projects.
+[ "$VERSION" = "0.9.24" ] && patch -p1 < $CWD/gcc7fix.diff
 
 if [ "$FORCE_SLACK_CFLAGS" = "yes" ]; then
   make OPTS="$SLKCFLAGS" ARCH=""
@@ -66,22 +71,24 @@ else
   make
 fi
 
-make install \
-  DEST=$PKG/usr/lib$LIBDIRSUFFIX/ladspa \
-  RDFDEST=$PKG/usr/share/ladspa/rdf \
+LADSPALIB=$PKG/usr/lib$LIBDIRSUFFIX/ladspa
+make install DEST=$LADSPALIB RDFDEST=$PKG/usr/share/ladspa/rdf
 
 # LADSPA standard seems to be mode 0755
-chmod 0755 $PKG/usr/lib$LIBDIRSUFFIX/ladspa/*.so
+chmod 0755 $LADSPALIB
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a CHANGES COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 # docs are in a separate tarball now, just a wget -r of upstream's site
-if [ "${DOCS:-yes}" = "yes" ]; then
+DOCVER="${DOCVER:-$VERSION}"
+DOCFILE="$CWD/$PRGNAM-doc-unofficial_$DOCVER.tar.bz2"
+
+if [ "${DOCS:-yes}" = "yes" ] && [ -e "$DOCFILE" ]; then
   ( cd $PKG/usr/doc/$PRGNAM-$VERSION
-    tar xvf $CWD/$PRGNAM-doc-unofficial_$VERSION.tar.bz2 --no-same-owner
-	mv $PRGNAM-doc-unofficial_$VERSION html
+    tar xvf "$DOCFILE" --no-same-owner
+    mv $PRGNAM-doc-unofficial_$DOCVER html
     chown root.root html/*
     chmod 644 html/*
   )
diff --git a/audio/caps/caps.info b/audio/caps/caps.info
index 3a89cf7286..a66240fdcd 100644
--- a/audio/caps/caps.info
+++ b/audio/caps/caps.info
@@ -1,10 +1,10 @@
 PRGNAM="caps"
-VERSION="0.9.24"
+VERSION="0.9.26"
 HOMEPAGE="http://quitte.de/dsp/caps.html"
-DOWNLOAD="http://quitte.de/dsp/caps_0.9.24.tar.bz2 \
-          http://urchlay.naptime.net/~urchlay/src/caps-doc-unofficial_0.9.24.tar.bz2"
-MD5SUM="c1d634038dcb54702306c0e30cb1c626 \
-        58eec76a6db744e13539101dd1f7c647"
+DOWNLOAD="http://quitte.de/dsp/caps_0.9.26.tar.bz2 \
+          http://urchlay.naptime.net/~urchlay/src/caps-doc-unofficial_0.9.26.tar.bz2"
+MD5SUM="36b30c7c7db2d2bc5f4f54077e97b5ee \
+        3c3eb99856f0d21b5a7212622ff0b55f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="ladspa_sdk"