4 files changed, 8 insertions, 100 deletions
diff --git a/source/a/etc/etc.SlackBuild b/source/a/etc/etc.SlackBuild
index 295cf8baf..1bbe1fe0e 100755
--- a/source/a/etc/etc.SlackBuild
+++ b/source/a/etc/etc.SlackBuild
@@ -23,8 +23,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=etc
-VERSION=15.0
-BUILD=${BUILD:-17}
+VERSION=15.1
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/a/tar/tar-1.13.bzip2.diff b/source/a/tar/tar-1.13.bzip2.diff
deleted file mode 100644
index 891301d14..000000000
--- a/source/a/tar/tar-1.13.bzip2.diff
+++ /dev/null
@@ -1,56 +0,0 @@
-diff -Nur tar-1.13.orig/src/tar.c tar-1.13/src/tar.c
---- tar-1.13.orig/src/tar.c	1999-07-07 00:49:50.000000000 -0500
-+++ tar-1.13/src/tar.c	2017-12-22 00:39:37.515271544 -0600
-@@ -16,6 +16,8 @@
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
- 
-+/* Patched to integrate bzip2 as compression filter (option -j)  */
-+
- #include "system.h"
- 
- #include <getopt.h>
-@@ -164,6 +166,8 @@
-   {"block-number", no_argument, NULL, 'R'},
-   {"block-size", required_argument, NULL, OBSOLETE_BLOCKING_FACTOR},
-   {"blocking-factor", required_argument, NULL, 'b'},
-+  {"bzip2", required_argument, NULL, 'j'},
-+  {"bunzip2", required_argument, NULL, 'j'},
-   {"catenate", no_argument, NULL, 'A'},
-   {"checkpoint", no_argument, &checkpoint_option, 1},
-   {"compare", no_argument, NULL, 'd'},
-@@ -340,6 +344,7 @@
-               PATTERN                at list/extract time, a globbing PATTERN\n\
-   -o, --old-archive, --portability   write a V7 format archive\n\
-       --posix                        write a POSIX conformant archive\n\
-+  -j, --bzip2, --bunzip2             filter the archive through bzip2\n\
-   -z, --gzip, --ungzip               filter the archive through gzip\n\
-   -Z, --compress, --uncompress       filter the archive through compress\n\
-       --use-compress-program=PROG    filter through PROG (must accept -d)\n"),
-@@ -410,13 +415,13 @@
- | Parse the options for tar.  |
- `----------------------------*/
- 
--/* Available option letters are DEHIJQY and aejnqy.  Some are reserved:
-+/* Available option letters are DEHIJQY and aenqy.  Some are reserved:
- 
-    y  per-file gzip compression
-    Y  per-block gzip compression */
- 
- #define OPTION_STRING \
--  "-01234567ABC:F:GK:L:MN:OPRST:UV:WX:Zb:cdf:g:hiklmoprstuvwxz"
-+  "-01234567ABC:F:GK:L:MN:OPRST:UV:WX:Zb:cdf:g:hijklmoprstuvwxz"
- 
- static void
- set_subcommand_option (enum subcommand subcommand)
-@@ -788,6 +793,10 @@
- 	  FATAL_ERROR ((0, errno, "%s", optarg));
- 	break;
- 
-+      case 'j':
-+        set_use_compress_program_option ("bzip2");
-+        break;
-+
-       case 'z':
- 	set_use_compress_program_option ("gzip");
- 	break;
diff --git a/source/a/tar/tar.SlackBuild b/source/a/tar/tar.SlackBuild
index 5e4afdaff..a22fe1eb2 100755
--- a/source/a/tar/tar.SlackBuild
+++ b/source/a/tar/tar.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2005-2018  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2005-2022  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,13 +20,11 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Slackware build script for tar
-
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=tar
-VERSION=1.34
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-2}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
@@ -66,40 +64,6 @@ else
   SLKCFLAGS="-O2"
 fi
 
-# This old version is the only one that won't clobber symlinks, e.g.:
-# someone moves /opt to /usr/opt and makes a symlink.  With newer
-# versions of tar, installing any new package will remove the /opt
-# symlink and plop down a new directory there.
-# Well, there's a lot of other bugs (the remote stuff particularly I'm
-# told is flaky) in tar-1.13, so it'll only be here now for use by the
-# Slackware package utils.  And, we'll even let people remove it and
-# the pkgutils will still try to work (but eventually they'll pay the
-# price :)
-#
-# NOTE:  The latest versions of tar can supposedly work for the pkgtools,
-# but some changes to add new options to the scripts might be required.
-#
-# Until tar-1.13 won't compile any more, it might be safer to keep using
-# it, though.
-cd $TMP
-rm -rf tar-1.13
-tar xvf $CWD/tar-1.13.tar.gz || exit 1
-cd tar-1.13 || exit 1
-zcat $CWD/tar-1.13.bzip2.diff.gz | patch -p1 --verbose || exit 1
-# The original config.{guess,sub} do not work on x86_64
-cp -p --verbose /usr/share/libtool/build-aux/config.{guess,sub} .
-chown -R root:root .
-CFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --disable-nls \
-  --build=$ARCH-slackware-linux || exit 1
-make $NUMJOBS || make || exit 1
-mkdir -p $PKG/bin
-cat src/tar > $PKG/bin/tar-1.13
-chmod 0755 $PKG/bin/tar-1.13
-# End building of tar-1.13
-
 cd $TMP
 rm -rf tar-$VERSION
 tar xvf $CWD/tar-$VERSION.tar.xz || exit 1
@@ -134,6 +98,7 @@ make install DESTDIR=$PKG || exit 1
     xargs strip --strip-unneeded 2> /dev/null
 )
 
+mkdir -p $PKG/bin
 mv $PKG/usr/bin/tar $PKG/bin
 ( cd $PKG/usr/bin ; ln -sf /bin/tar . )
 ( cd $PKG/bin ; ln -sf tar tar-$VERSION )
@@ -171,4 +136,3 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
 /sbin/makepkg -l y -c n $TMP/tar-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source/l/harfbuzz/harfbuzz.SlackBuild b/source/l/harfbuzz/harfbuzz.SlackBuild
index c8e417151..ff6c34647 100755
--- a/source/l/harfbuzz/harfbuzz.SlackBuild
+++ b/source/l/harfbuzz/harfbuzz.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2013, 2017, 2018, 2020, 2021  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2013, 2017, 2018, 2020, 2021, 2022  Patrick J. Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -110,7 +110,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 
 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
-  AUTHORS* COPYING* INSTALL* NEWS* README* THANKS* TODO* \
+  AUTHORS* CONFIG* COPYING* INSTALL* NEWS* README* THANKS* TODO* \
   $PKG/usr/doc/$PKGNAM-$VERSION
 
 # If there's a ChangeLog, installing at least part of the recent history