development/mawk: Updated for version 1.3.4_20230808.

Signed-off-by: B. Watson <urchlay@slackware.uk>

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

3 files changed, 34 insertions, 40 deletions

diff --git a/development/mawk/README b/development/mawk/README
index fbf82b010da1..7cbdd2107cfe 100644
--- a/development/mawk/README
+++ b/development/mawk/README
@@ -19,28 +19,9 @@ This build does not conflict with Slackware's own awk (from the gawk
 package).
 
 By default, mawk is built using its own built-in regular expression
-engine. There are some slight differences between this and the glibc
-regular expression engine:
-
-- Embedded NUL characters are supported by the built-in engine. For
-  instance, you can use the hex escape \x00 to match a NUL character.
-  glibc regexes don't support this.
-
-- POSIX brace syntax is NOT supported by the built-in engine. For
-  instance, /a{3}/ to match "aaa" but not "a" or "aa". glibc regexes do
-  support this.
-
-If you require the glibc engine, export BUILTIN_REGEX=no in the script's
-environment.
-
-The default version in the .info file is 1.3.4, which is a stable
-release from 2009. If you'd like to (or need to) build one of the newer
-'snapshot' releases, get the source from:
-
-ftp://ftp.invisible-island.net/mawk/
-
-...and export VERSION in the environment. Notice the filenames look
-like e.g. "mawk-1.3.4-20171017.tgz". Slackware version numbers can't
-contain the hyphen, so use an underscore instead. Example:
-
-# export "VERSION=1.3.4_20171017"
+engine. In recent mawk versions, the only user-visible difference
+between the built-in and glibc regex engines is that the glibc engine
+doesn't support embedded NUL characters (can't use \x00 to match a
+NUL, for instance). If there are other difference in usage, they are
+undocumented. If you require the glibc engine, export BUILTIN_REGEX=no
+in the script's environment.
diff --git a/development/mawk/mawk.SlackBuild b/development/mawk/mawk.SlackBuild
index 2c63da8cd47e..878e9da7d1d0 100644
--- a/development/mawk/mawk.SlackBuild
+++ b/development/mawk/mawk.SlackBuild
@@ -6,6 +6,14 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20230822 bkw: Update for v1.3.4_20230808.
+# Sorry this went so long without updates.
+# - get MANIFEST out of the package doc dir (don't need).
+# - install examples/ to the doc dir (but without +x perms).
+# - run 'make check' by default, undocumented MAKECHECK=no to disable.
+# - if 'make check' is run, save the results to the doc dir.
+# - POSIX intervals (brace expressions) are now supported in the
+#   built-in regex engine, so update README accordingly.
 # 20200302 bkw: Update for v1.3.4_20200120.
 # 20200111 bkw: Update for v1.3.4_20200106.
 # 20191129 bkw: Update for v1.3.4_20190203.
@@ -14,7 +22,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=mawk
-VERSION=${VERSION:-1.3.4_20200120}
+VERSION=${VERSION:-1.3.4_20230808}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -52,9 +60,11 @@ fi
 
 set -e
 
-# This does nothing for 1.3.4, but allows e.g. VERSION=1.3.4_20171017 in
-# the environment.
-SRCVER="$( echo $VERSION | sed 's,_,-,' )"
+# This does nothing for 1.3.4, but allows e.g. VERSION=1.3.4_20171017 to
+# work correctly.
+# 20230822 bkw: trying to teach myself to remember bash's string substutions,
+# so get rid of the sed here.
+SRCVER="${VERSION/_/-}"
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -63,8 +73,8 @@ rm -rf $PRGNAM-$SRCVER
 tar xvf $CWD/$PRGNAM-$SRCVER.tgz
 cd $PRGNAM-$SRCVER
 chown -R root:root .
-find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
-        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
 
 if [ "${BUILTIN_REGEX:-yes}" = "yes" ]; then
   REGEX_OPT="--with-builtin-regex"
@@ -86,15 +96,18 @@ CXXFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux
 
 make
+[ "${MAKECHECK:-yes}" = "yes" ] && make check 2>&1 | tee make_check.out
 make install DESTDIR=$PKG
 
 strip $PKG/usr/bin/$PRGNAM
-gzip -9 $PKG/usr/man/man1/$PRGNAM.1
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ACKNOWLEDGMENT CHANGES COPYING MANIFEST README \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+gzip -9 $PKG/usr/man/man*/*
+
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+chmod 644 examples/*
+cp -a ACKNOWLEDGMENT CHANGES COPYING README examples $PKGDOC
+[ -e make_check.out ] && cp -a make_check.out $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 sed "s,@REGEX_DESC@,$REGEX_DESC," $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/development/mawk/mawk.info b/development/mawk/mawk.info
index ac03e8d58679..c9b2f025875e 100644
--- a/development/mawk/mawk.info
+++ b/development/mawk/mawk.info
@@ -1,8 +1,8 @@
 PRGNAM="mawk"
-VERSION="1.3.4_20200120"
+VERSION="1.3.4_20230808"
 HOMEPAGE="http://invisible-island.net/mawk/mawk.html"
-DOWNLOAD="https://invisible-mirror.net/archives/mawk/mawk-1.3.4-20200120.tgz"
-MD5SUM="d48752f402d7371d9eb5f68de3da05d4"
+DOWNLOAD="https://invisible-mirror.net/archives/mawk/mawk-1.3.4-20230808.tgz"
+MD5SUM="d0c17c6b8dc2dcde838cf1c9bdd86e25"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""