3 files changed, 50 insertions, 30 deletions
diff --git a/system/execline/README b/system/execline/README
index c3019a5055..d93c027cd2 100644
--- a/system/execline/README
+++ b/system/execline/README
@@ -1,23 +1,22 @@
 execline is a (non-interactive) scripting language, like sh; but its
-syntax is quite different from a traditional shell syntax. The
-execlineb program is meant to be used as an interpreter for a text
-file; the other commands are essentially useful inside an execlineb
-script.
+syntax is quite different from a traditional shell syntax. The execlineb
+program is meant to be used as an interpreter for a text file; the other
+commands are essentially useful inside an execlineb script.
 
 execline is as powerful as a shell: it features conditional loops,
 getopt-style option handling, filename globbing, and more. Meanwhile,
-its syntax is far more logic and predictable than the shell's syntax,
+its syntax is far more logical and predictable than the shell's syntax,
 and has no security issues.
 
 NOTE:
-Upstream recommends building skarnet.org softwares with static libraries
-as most of skarnet.org softwares are small enough that using shared
-libraries are generally not worth using. Therefore, by default, shared
-libraries are not built and binaries are linked against the static
-versions of the skarnet.org libraries.
+Upstream recommends building skarnet.org software with static libraries,
+as most of skarnet.org software are small enough that shared libraries
+are generally not worth using. Therefore, by default, shared libraries
+are not built and binaries are linked against the static versions of the
+skarnet.org libraries.
 
 If you want to also build the shared libraries, pass BUILD_SHARED=yes
-environment variable to the SlackBuild script like below:
+environment variable to this SlackBuild script like below:
 
     BUILD_SHARED=yes ./execline.SlackBuild
 
@@ -27,8 +26,10 @@ libraries and not the static ones, you can do something like:
 
     BUILD_SHARED=yes BUILD_STATIC=no ./execline.SlackBuild
 
-If you just want to build and use skarnet.org softwares, building only
+If you just want to build and use skarnet.org software, building only
 the static libraries should be sufficient.
 
 If you want the binaries to be linked against the shared versions of the
-skarnet.org libraries, pass LINK_SHARED=yes to the script.
+skarnet.org libraries, pass LINK_SHARED=yes to the script, i.e.,
+
+    LINK_SHARED=yes ./execline.SlackBuild
diff --git a/system/execline/execline.SlackBuild b/system/execline/execline.SlackBuild
index dac9e7f781..9f6c55eaa3 100644
--- a/system/execline/execline.SlackBuild
+++ b/system/execline/execline.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for execline
 
@@ -23,10 +23,17 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220301 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - fix doc dir permissions.
+# - remove useless INSTALL from doc dir.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=execline
-VERSION=${VERSION:-2.7.0.1}
+VERSION=${VERSION:-2.9.4.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +43,11 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -55,17 +66,19 @@ else
   LIBDIRSUFFIX=""
 fi
 
-# By default, only static libraries are built. If you need to build the shared libraries, just pass
-# BUILD_SHARED=yes to this script
+# By default, only static libraries are built. If you want to also build the
+# shared libraries, just pass BUILD_SHARED=yes to this script.
 BUILD_STATIC=${BUILD_STATIC:-yes}
 BUILD_SHARED=${BUILD_SHARED:-no}
 [ "$BUILD_STATIC" = "no" ] && LIBS_CONF="--disable-static"
 [ "$BUILD_SHARED" = "yes" ] && LIBS_CONF="--enable-shared $LIBS_CONF"
 
-# By default, all binaries are linked against the static versions of the skarnet.org libraries
-# Pass LINK_SHARED=yes to link the binaries against the shared versions of the skarnet.org libraries
-# Also, if you only built the shared versions of the skarnet.org libraries, the binaries will be
-# linked against shared libraries automatically, as though LINK_SHARED=yes is passed to this script
+# By default, all binaries are linked against the static versions of the
+# skarnet.org libraries. Pass LINK_SHARED=yes to link the binaries against the
+# shared versions of the skarnet.org libraries. If you only built the shared
+# versions of the skarnet.org libraries, the binaries will be linked against
+# shared libraries automatically, as though LINK_SHARED=yes is passed to this
+# script.
 LINK_SHARED=${LINK_SHARED:-no}
 [ "$LINK_SHARED" = "yes" ] && LIBS_CONF="--disable-allstatic $LIBS_CONF"
 
@@ -80,13 +93,13 @@ 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 \
+  -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 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-./configure \
+sh ./configure \
   --dynlibdir=/lib${LIBDIRSUFFIX} \
   --bindir=/bin \
   --libexecdir=/usr/libexec \
@@ -100,12 +113,18 @@ make
 make strip
 make install DESTDIR=$PKG
 
+# 20220410 bkw: these dirs get installed setgid, ugh.
+chmod g-s doc examples{,/etc{,/env-startup}}
+
+# 20220410 bkw: this is supposed to be an example, make it exemplary:
+echo '/var/mail/<username>' > examples/etc/env-startup/MAIL
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING INSTALL NEWS README doc examples $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING NEWS README doc examples $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/system/execline/execline.info b/system/execline/execline.info
index 9c13ab0f5e..079aaac2e0 100644
--- a/system/execline/execline.info
+++ b/system/execline/execline.info
@@ -1,8 +1,8 @@
 PRGNAM="execline"
-VERSION="2.7.0.1"
+VERSION="2.9.4.0"
 HOMEPAGE="https://skarnet.org/software/execline/"
-DOWNLOAD="https://skarnet.org/software/execline/execline-2.7.0.1.tar.gz"
-MD5SUM="8caf152cd354c7b0e805242828fbc409"
+DOWNLOAD="https://skarnet.org/software/execline/execline-2.9.4.0.tar.gz"
+MD5SUM="ab98d90c068f99c854277c6c8c696072"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="skalibs"