From d72c919da156143743fb28e2d36e7b6b1cb4ef94 Mon Sep 17 00:00:00 2001
From: B. Watson
Date: Sun, 1 Dec 2019 13:03:49 -0500
Subject: audio/eawpats: Update doinst.sh.

Signed-off-by: B. Watson <yalhcru@gmail.com>
---
 audio/eawpats/doinst.sh          |  4 ++++
 audio/eawpats/eawpats.SlackBuild | 12 ++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'audio/eawpats')

diff --git a/audio/eawpats/doinst.sh b/audio/eawpats/doinst.sh
index 110f77527d..0a9be04c39 100644
--- a/audio/eawpats/doinst.sh
+++ b/audio/eawpats/doinst.sh
@@ -13,3 +13,7 @@ config() {
 
 config etc/timidity/eawpats.cfg.new
 
+# if there's no existing timidity.cfg, eawpats takes over.
+if [ ! -r etc/timidity/timidity.cfg ]; then
+  ( cd etc/timidity ; ln -sf eawpats.cfg timidity.cfg )
+fi
diff --git a/audio/eawpats/eawpats.SlackBuild b/audio/eawpats/eawpats.SlackBuild
index d109f72ed9..b2529dfde6 100644
--- a/audio/eawpats/eawpats.SlackBuild
+++ b/audio/eawpats/eawpats.SlackBuild
@@ -11,6 +11,9 @@
 # This is the original author's site, but it's more polite to download
 # from the gentoo mirror (see .info file)
 
+# 20191201 bkw: symlink eawpats.cfg to timidity.cfg in doinst.sh,
+# if there's no timidity.cfg already. This makes things Just Work(tm).
+
 # 20140511 bkw: one patch was missing due to tar being silly.
 # When extracting (with tar, which is really tar-1.26 on slack 14.1):
 # tar: eawpats/charang.pat: implausibly old time stamp 1969-12-31 18:59:59
@@ -24,7 +27,7 @@ PRGNAM=eawpats
 VERSION=${VERSION:-12}
 SRCVER=${VERSION}_full
 ARCH=noarch
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
@@ -41,11 +44,8 @@ rm -rf $PRGNAM
 tar xvf $CWD/$PRGNAM$SRCVER.tar.gz
 cd $PRGNAM
 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 {} \+
 
 # see above
 touch charang.pat
-- 
cgit v1.2.3