From e93134819a7e1bf6af77e82d6f7d9c412c9b2398 Mon Sep 17 00:00:00 2001
From: "B. Watson" <yalhcru@gmail.com>
Date: Fri, 10 Sep 2021 20:09:08 -0400
Subject: [PATCH] multimedia/l-smash: Add README to docdir.

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

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 multimedia/l-smash/README             | 12 +++++++++---
 multimedia/l-smash/l-smash.SlackBuild | 19 +++++++++----------
 multimedia/l-smash/slack-desc         | 18 +++++++++---------
 3 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/multimedia/l-smash/README b/multimedia/l-smash/README
index 9c0a641d7a..82d053c024 100644
--- a/multimedia/l-smash/README
+++ b/multimedia/l-smash/README
@@ -1,3 +1,9 @@
-l-smash is an OpenSource simple tool for the mp4 container. It rivals
-Mp4Box from GPAC in muxing, demuxing and tagging mp4, mov, 3gp, 3g2, 
-m4a and m4v files.
+l-smash (open source mp4 handler)
+
+l-smash is a set of simple open source tools for the mp4 container. It
+rivals Mp4Box from GPAC in muxing, demuxing and tagging mp4, mov, 3gp,
+3g2, m4a and m4v files.
+
+Included in the package are four executables: boxdumper, muxer,
+remuxer, and timelineeditor. There are no man pages for these, but
+each one can be run with --help to see usage information.
diff --git a/multimedia/l-smash/l-smash.SlackBuild b/multimedia/l-smash/l-smash.SlackBuild
index 0e895b9f59..07c3386d59 100644
--- a/multimedia/l-smash/l-smash.SlackBuild
+++ b/multimedia/l-smash/l-smash.SlackBuild
@@ -24,8 +24,8 @@
 
 # Now maintained by B. Watson <yalhcru@gmail.com>
 
+# 20210910 bkw: include our own README since there are no docs
 # 20180215 bkw: update for 2.14.5
-
 # 20170302 bkw: use long-format github URL
 
 # 20160817 bkw:
@@ -38,7 +38,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=l-smash
 VERSION=${VERSION:-2.14.5}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -50,9 +50,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
@@ -85,11 +82,8 @@ rm -rf $PRGNAM-$VERSION
 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 {} \+
 
 # -Wl,-s = strip binaries at link time.
 ./configure \
@@ -107,7 +101,12 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+# 20210910 bkw: upstream didn't bother with any docs other than --help
+# messages. Include our own README, which at least tells the user the
+# names of the binaries (hint: none of them are called -lsmash!), and
+# tells him to use the --help option.
 mkdir -p $PKG/install
+cat $CWD/README > $PKG/install/README
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
diff --git a/multimedia/l-smash/slack-desc b/multimedia/l-smash/slack-desc
index 96deed283e..6fbfbd1431 100644
--- a/multimedia/l-smash/slack-desc
+++ b/multimedia/l-smash/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
        |-----handy-ruler------------------------------------------------------|
-l-smash: l-smash (Yet another OpenSource mp4 handler)
-l-smash: l-smash is an OpenSource simple tool for the mp4 container. It rivals
-l-smash: Mp4Box from GPAC in muxing, demuxing and tagging mp4, mov, 3gp, 3g2,
-l-smash: m4a and m4v files.
-l-smash:
-l-smash:
-l-smash: https://github.com/l-smash/l-smash
-l-smash:
-l-smash:
+l-smash: l-smash (open source mp4 handler)
+l-smash:
+l-smash: l-smash is a set of simple open source tools for the mp4 container. It
+l-smash: rivals Mp4Box from GPAC in muxing, demuxing and tagging mp4, mov, 3gp,
+l-smash: 3g2, m4a and m4v files.
+l-smash:
+l-smash: Included in the package are four executables: boxdumper, muxer,
+l-smash: remuxer, and timelineeditor. There are no man pages for these, but
+l-smash: each one can be run with --help to see usage information.
 l-smash:
 l-smash: