14 files changed, 71 insertions, 28 deletions
diff --git a/source/a/aaa_libraries/aaa_libraries.SlackBuild b/source/a/aaa_libraries/aaa_libraries.SlackBuild
index 81461a42c..37ae5f181 100755
--- a/source/a/aaa_libraries/aaa_libraries.SlackBuild
+++ b/source/a/aaa_libraries/aaa_libraries.SlackBuild
@@ -23,7 +23,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=aaa_libraries
 VERSION=${VERSION:-15.0}
-BUILD=${BUILD:-5}
+BUILD=${BUILD:-6}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -89,7 +89,7 @@ cat $CWD/tracked-files \
   )
 done
 
-cat $CWD/symlinks-to-tracked-libs-tmp \
+cat $CWD/symlinks-to-tracked-libs-tmp.d/* \
   | grep -v "^#" | grep -v "^$" \
   | sed -e "s#^/lib/#/lib${LIBDIRSUFFIX}/#" \
         -e "s#^/usr/lib/#/usr/lib${LIBDIRSUFFIX}/#" \
@@ -105,7 +105,7 @@ cat $CWD/symlinks-to-tracked-libs-tmp \
   )
 done
 
-cat $CWD/tracked-files-tmp \
+cat $CWD/tracked-files-tmp.d/* \
   | grep -v "^#" | grep -v "^$" \
   | sed -e "s#^/lib/#/lib${LIBDIRSUFFIX}/#" \
         -e "s#^/usr/lib/#/usr/lib${LIBDIRSUFFIX}/#" \
diff --git a/source/a/aaa_libraries/symlinks-to-tracked-libs-tmp.d/README b/source/a/aaa_libraries/symlinks-to-tracked-libs-tmp.d/README
new file mode 100644
index 000000000..2e0d30830
--- /dev/null
+++ b/source/a/aaa_libraries/symlinks-to-tracked-libs-tmp.d/README
@@ -0,0 +1,4 @@
+# This file lists shared library symlinks for libraries we would
+# like to keep copies of temporarily until we can recompile
+# everything that's still using them.  Once that happens, they'll
+# be dropped from this package.
diff --git a/source/a/aaa_libraries/symlinks-to-tracked-libs-tmp b/source/a/aaa_libraries/symlinks-to-tracked-libs-tmp.d/glib-dependencies
index bf2e2e0ef..163f3f679 100644
--- a/source/a/aaa_libraries/symlinks-to-tracked-libs-tmp
+++ b/source/a/aaa_libraries/symlinks-to-tracked-libs-tmp.d/glib-dependencies
@@ -1,8 +1,3 @@
-# This file lists shared library symlinks for libraries we would
-# like to keep copies of temporarily until we can recompile
-# everything that's still using them.  Once that happens, they'll
-# be dropped from this package.
-#
 # We need these libraries here or we won't be able to recompile gcc
 # after any of them get a shared library .so-version bump:
 /usr/lib/libisl.so.23
diff --git a/source/a/aaa_libraries/symlinks-to-tracked-libs-tmp.d/icu4c-68.2 b/source/a/aaa_libraries/symlinks-to-tracked-libs-tmp.d/icu4c-68.2
new file mode 100644
index 000000000..5f831a8ee
--- /dev/null
+++ b/source/a/aaa_libraries/symlinks-to-tracked-libs-tmp.d/icu4c-68.2
@@ -0,0 +1,6 @@
+/usr/lib/libicudata.so.68
+/usr/lib/libicui18n.so.68
+/usr/lib/libicuio.so.68
+/usr/lib/libicutest.so.68
+/usr/lib/libicutu.so.68
+/usr/lib/libicuuc.so.68
diff --git a/source/a/aaa_libraries/tracked-files-tmp b/source/a/aaa_libraries/tracked-files-tmp.d/README
index 58b6c36d1..671782ec3 100644
--- a/source/a/aaa_libraries/tracked-files-tmp
+++ b/source/a/aaa_libraries/tracked-files-tmp.d/README
@@ -2,4 +2,3 @@
 # copies of temporarily until we can recompile everything that's
 # still using them.  Once that happens, they'll be dropped from
 # this package.
-
diff --git a/source/a/aaa_libraries/tracked-files-tmp.d/boost-1.75.0 b/source/a/aaa_libraries/tracked-files-tmp.d/boost-1.75.0
new file mode 100644
index 000000000..5ec36054c
--- /dev/null
+++ b/source/a/aaa_libraries/tracked-files-tmp.d/boost-1.75.0
@@ -0,0 +1,39 @@
+/usr/lib/libboost_atomic.so.1.75.0
+/usr/lib/libboost_chrono.so.1.75.0
+/usr/lib/libboost_container.so.1.75.0
+/usr/lib/libboost_context.so.1.75.0
+/usr/lib/libboost_contract.so.1.75.0
+/usr/lib/libboost_coroutine.so.1.75.0
+/usr/lib/libboost_date_time.so.1.75.0
+/usr/lib/libboost_fiber.so.1.75.0
+/usr/lib/libboost_filesystem.so.1.75.0
+/usr/lib/libboost_graph.so.1.75.0
+/usr/lib/libboost_iostreams.so.1.75.0
+/usr/lib/libboost_json.so.1.75.0
+/usr/lib/libboost_locale.so.1.75.0
+/usr/lib/libboost_log.so.1.75.0
+/usr/lib/libboost_log_setup.so.1.75.0
+/usr/lib/libboost_math_c99.so.1.75.0
+/usr/lib/libboost_math_c99f.so.1.75.0
+/usr/lib/libboost_math_c99l.so.1.75.0
+/usr/lib/libboost_math_tr1.so.1.75.0
+/usr/lib/libboost_math_tr1f.so.1.75.0
+/usr/lib/libboost_math_tr1l.so.1.75.0
+/usr/lib/libboost_nowide.so.1.75.0
+/usr/lib/libboost_prg_exec_monitor.so.1.75.0
+/usr/lib/libboost_program_options.so.1.75.0
+/usr/lib/libboost_python27.so.1.75.0
+/usr/lib/libboost_python39.so.1.75.0
+/usr/lib/libboost_random.so.1.75.0
+/usr/lib/libboost_regex.so.1.75.0
+/usr/lib/libboost_serialization.so.1.75.0
+/usr/lib/libboost_stacktrace_addr2line.so.1.75.0
+/usr/lib/libboost_stacktrace_basic.so.1.75.0
+/usr/lib/libboost_stacktrace_noop.so.1.75.0
+/usr/lib/libboost_system.so.1.75.0
+/usr/lib/libboost_thread.so.1.75.0
+/usr/lib/libboost_timer.so.1.75.0
+/usr/lib/libboost_type_erasure.so.1.75.0
+/usr/lib/libboost_unit_test_framework.so.1.75.0
+/usr/lib/libboost_wave.so.1.75.0
+/usr/lib/libboost_wserialization.so.1.75.0
diff --git a/source/a/glibc-zoneinfo/doinst.sh b/source/a/glibc-zoneinfo/doinst.sh
index eb776e2ff..debfd490a 100644
--- a/source/a/glibc-zoneinfo/doinst.sh
+++ b/source/a/glibc-zoneinfo/doinst.sh
@@ -6,7 +6,7 @@
 # bugs these days. We're going to make /etc/localtime a symlink just
 # like everyone else does so that programs that expect it to be a link
 # can fetch the timezone without requiring any special patches.
-# If you insist on making /usr a seperate partition, you might want to
+# If you insist on making /usr a separate partition, you might want to
 # put the pointed-to directories and timezone file in your empty /usr
 # directory so that it is available before the real /usr is mounted.
 # Still not recommended though.
diff --git a/source/a/less/less.SlackBuild b/source/a/less/less.SlackBuild
index 56d8703ef..6db39b350 100755
--- a/source/a/less/less.SlackBuild
+++ b/source/a/less/less.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=less
 VERSION=${VERSION:-$(echo less-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/a/pkgtools/manpages/pkgtool.8 b/source/a/pkgtools/manpages/pkgtool.8
index 56e392176..0faf56013 100644
--- a/source/a/pkgtools/manpages/pkgtool.8
+++ b/source/a/pkgtools/manpages/pkgtool.8
@@ -52,7 +52,7 @@ is run during the initial system installation.
 Feel free to try them, but be careful.
 .TP
 .B \--sets #A#B#C#
-Install the disk sets A, B, C. Seperate the disk set names by '#' symbols.
+Install the disk sets A, B, C. Separate the disk set names by '#' symbols.
 .TP
 .B \--source_mounted
 When this flag is present, 
diff --git a/source/a/pkgtools/pkgtools.SlackBuild b/source/a/pkgtools/pkgtools.SlackBuild
index cca59234c..aac185ee3 100755
--- a/source/a/pkgtools/pkgtools.SlackBuild
+++ b/source/a/pkgtools/pkgtools.SlackBuild
@@ -30,7 +30,7 @@ PKGNAM=pkgtools
 # *** UPDATE THESE WITH EACH BUILD:
 VERSION=15.0
 ARCH=${ARCH:-noarch}
-BUILD=${BUILD:-37}
+BUILD=${BUILD:-38}
 
 # 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
diff --git a/source/a/pkgtools/scripts/upgradepkg b/source/a/pkgtools/scripts/upgradepkg
index d71ca4b03..62d05440f 100644
--- a/source/a/pkgtools/scripts/upgradepkg
+++ b/source/a/pkgtools/scripts/upgradepkg
@@ -262,11 +262,11 @@ for ARG; do
         echo "$NEW would be installed (new package)."
       else
         if [ $PLAINTERSE ]; then
-          /sbin/installpkg --terse --terselength $TERSELENGTH $INCOMINGDIR/$NNAME
+          $ROOT/sbin/installpkg --terse --terselength $TERSELENGTH $INCOMINGDIR/$NNAME
         elif [ $INFOBOX ]; then
-          /sbin/installpkg --infobox $INCOMINGDIR/$NNAME
+          $ROOT/sbin/installpkg --infobox $INCOMINGDIR/$NNAME
         elif [ $TERSE ]; then
-          OUTPUTLINE="$(/sbin/installpkg --terse --terselength $(expr $TERSELENGTH - 12) $INCOMINGDIR/$NNAME)"
+          OUTPUTLINE="$($ROOT/sbin/installpkg --terse --terselength $(expr $TERSELENGTH - 12) $INCOMINGDIR/$NNAME)"
           ( flock 9 || exit 11
             echo "Installing: ${OUTPUTLINE}"
           ) 9> $INSTLOCKDIR/outputline.lock
@@ -278,7 +278,7 @@ for ARG; do
 +==============================================================================
 
 EOF
-          /sbin/installpkg $INCOMINGDIR/$NNAME
+          $ROOT/sbin/installpkg $INCOMINGDIR/$NNAME
         fi
       fi
     fi
@@ -356,26 +356,26 @@ EOF
   # Next, the new package is pre-installed:
   if [ "$VERBOSE" = "verbose" ]; then
     if ! [ $TERSE ]; then
-      /sbin/installpkg $INCOMINGDIR/$NNAME
+      $ROOT/sbin/installpkg $INCOMINGDIR/$NNAME
       RETCODE=$?
     else
-      /sbin/installpkg $INCOMINGDIR/$NNAME 1> /dev/null
+      $ROOT/sbin/installpkg $INCOMINGDIR/$NNAME 1> /dev/null
       RETCODE=$?
     fi
   else
     if [ $PLAINTERSE ]; then
-      /sbin/installpkg --terse --terselength $TERSELENGTH $INCOMINGDIR/$NNAME
+      $ROOT/sbin/installpkg --terse --terselength $TERSELENGTH $INCOMINGDIR/$NNAME
     elif [ $INFOBOX ]; then
-      /sbin/installpkg --infobox $INCOMINGDIR/$NNAME
+      $ROOT/sbin/installpkg --infobox $INCOMINGDIR/$NNAME
     elif [ $TERSE ]; then
-      OUTPUTLINE="$(/sbin/installpkg --terse --terselength $(expr $TERSELENGTH - 12) $INCOMINGDIR/$NNAME)"
+      OUTPUTLINE="$($ROOT/sbin/installpkg --terse --terselength $(expr $TERSELENGTH - 12) $INCOMINGDIR/$NNAME)"
       RETCODE=$?
       ( flock 9 || exit 11
         echo "Upgrading:  ${OUTPUTLINE}"
       ) 9> $INSTLOCKDIR/outputline.lock
     else
       echo "Pre-installing package $NEW..."
-      /sbin/installpkg $INCOMINGDIR/$NNAME 1> /dev/null
+      $ROOT/sbin/installpkg $INCOMINGDIR/$NNAME 1> /dev/null
       RETCODE=$?
     fi
   fi
@@ -406,9 +406,9 @@ EOF
   # shift location, so we should always reinstall as the final step:
   if [ ! "$NOT_PARANOID" = "true" ]; then
     if ! [ $TERSE ]; then
-      /sbin/installpkg --no-overwrite $INCOMINGDIR/$NNAME
+      $ROOT/sbin/installpkg --no-overwrite $INCOMINGDIR/$NNAME
     else
-      /sbin/installpkg --no-overwrite $INCOMINGDIR/$NNAME 1> /dev/null
+      $ROOT/sbin/installpkg --no-overwrite $INCOMINGDIR/$NNAME 1> /dev/null
     fi
   fi
   ! [ $TERSE ] && echo "Package $OLD upgraded with new package $INCOMINGDIR/$NNAME."
diff --git a/source/a/sdparm/sdparm.SlackBuild b/source/a/sdparm/sdparm.SlackBuild
index 6bd5e3c2e..6503818af 100755
--- a/source/a/sdparm/sdparm.SlackBuild
+++ b/source/a/sdparm/sdparm.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=sdparm
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/source/a/udisks/udisks.SlackBuild b/source/a/udisks/udisks.SlackBuild
index c91939525..66420a2b1 100755
--- a/source/a/udisks/udisks.SlackBuild
+++ b/source/a/udisks/udisks.SlackBuild
@@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=udisks
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-8}
+BUILD=${BUILD:-9}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/source/a/xfsprogs/xfsprogs.SlackBuild b/source/a/xfsprogs/xfsprogs.SlackBuild
index fe5d5e8f9..1fbf978d3 100755
--- a/source/a/xfsprogs/xfsprogs.SlackBuild
+++ b/source/a/xfsprogs/xfsprogs.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=xfsprogs
 VERSION=${VERSION:-$(echo xfsprogs-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}