8 files changed, 53 insertions, 35 deletions
diff --git a/source/a/pam/pam.SlackBuild b/source/a/pam/pam.SlackBuild
index bfa4e9249..64b098060 100755
--- a/source/a/pam/pam.SlackBuild
+++ b/source/a/pam/pam.SlackBuild
@@ -27,7 +27,7 @@ SRCNAM=Linux-PAM
 PKGNAM=pam
 PAMRHVER=${PAMRHVER:-$(echo pam-redhat-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -173,6 +173,12 @@ chmod 6755 $PKG/sbin/unix_chkpwd
 # This package can own the /etc/pam.d/ directory
 mkdir -p $PKG/etc/pam.d
 
+# Relocate pkgconfig files:
+if [ -d $PKG/lib${LIBDIRSUFFIX}/pkgconfig -a ! -d $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig ]; then
+  mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}
+  mv $PKG/lib${LIBDIRSUFFIX}/pkgconfig $PKG/usr/lib${LIBDIRSUFFIX}
+fi
+
 # Strip binaries:
 ( cd $PKG
   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
diff --git a/source/a/userspace-rcu/userspace-rcu.SlackBuild b/source/a/userspace-rcu/userspace-rcu.SlackBuild
index 52989a9b3..b255163a4 100755
--- a/source/a/userspace-rcu/userspace-rcu.SlackBuild
+++ b/source/a/userspace-rcu/userspace-rcu.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=userspace-rcu
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -97,7 +97,7 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
-  --libdir=/lib${LIBDIRSUFFIX} \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --docdir=/usr/doc/$PKGNAM-$VERSION \
@@ -111,6 +111,16 @@ make install DESTDIR=$PKG || exit 1
 # Don't ship .la files:
 rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
 
+# Move libraries out of /usr:
+mkdir -p $PKG/lib${LIBDIRSUFFIX}
+( cd $PKG/usr/lib${LIBDIRSUFFIX}
+  # Move libraries and symlinks:
+  for file in lib*.so.* ; do
+    mv $file ../../lib${LIBDIRSUFFIX}
+    ln -sf ../../lib${LIBDIRSUFFIX}/$file .
+  done
+)
+
 # Strip binaries:
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 
diff --git a/source/d/llvm/llvm.url b/source/d/llvm/llvm.url
index 0a46dad36..2dc65c608 100644
--- a/source/d/llvm/llvm.url
+++ b/source/d/llvm/llvm.url
@@ -1,29 +1,29 @@
-https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.4/llvm-17.0.4.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.4/clang-17.0.4.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.4/clang-tools-extra-17.0.4.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.4/compiler-rt-17.0.4.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.4/flang-17.0.4.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.4/lldb-17.0.4.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.4/openmp-17.0.4.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.4/polly-17.0.4.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.4/libcxx-17.0.4.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.4/libcxxabi-17.0.4.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.4/lld-17.0.4.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.4/libunwind-17.0.4.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.4/cmake-17.0.4.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.4/third-party-17.0.4.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.5/llvm-17.0.5.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.5/clang-17.0.5.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.5/clang-tools-extra-17.0.5.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.5/compiler-rt-17.0.5.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.5/flang-17.0.5.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.5/lldb-17.0.5.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.5/openmp-17.0.5.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.5/polly-17.0.5.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.5/libcxx-17.0.5.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.5/libcxxabi-17.0.5.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.5/lld-17.0.5.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.5/libunwind-17.0.5.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.5/cmake-17.0.5.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-17.0.5/third-party-17.0.5.src.tar.xz
 
-#http://llvm.org/releases/17.0.4/llvm-17.0.4.src.tar.xz
-#http://llvm.org/releases/17.0.4/clang-17.0.4.src.tar.xz
-#http://llvm.org/releases/17.0.4/clang-tools-extra-17.0.4.src.tar.xz
-#http://llvm.org/releases/17.0.4/compiler-rt-17.0.4.src.tar.xz
-#http://llvm.org/releases/17.0.4/flang-17.0.4.src.tar.xz
-#http://llvm.org/releases/17.0.4/lldb-17.0.4.src.tar.xz
-#http://llvm.org/releases/17.0.4/openmp-17.0.4.src.tar.xz
-#http://llvm.org/releases/17.0.4/polly-17.0.4.src.tar.xz
-#http://llvm.org/releases/17.0.4/libcxx-17.0.4.src.tar.xz
-#http://llvm.org/releases/17.0.4/libcxxabi-17.0.4.src.tar.xz
-#http://llvm.org/releases/17.0.4/lld-17.0.4.src.tar.xz
-#http://llvm.org/releases/17.0.4/libunwind-17.0.4.src.tar.xz
-#http://llvm.org/releases/17.0.4/cmake-17.0.4.src.tar.xz
-#http://llvm.org/releases/17.0.4/third-party-17.0.4.src.tar.xz
+#http://llvm.org/releases/17.0.5/llvm-17.0.5.src.tar.xz
+#http://llvm.org/releases/17.0.5/clang-17.0.5.src.tar.xz
+#http://llvm.org/releases/17.0.5/clang-tools-extra-17.0.5.src.tar.xz
+#http://llvm.org/releases/17.0.5/compiler-rt-17.0.5.src.tar.xz
+#http://llvm.org/releases/17.0.5/flang-17.0.5.src.tar.xz
+#http://llvm.org/releases/17.0.5/lldb-17.0.5.src.tar.xz
+#http://llvm.org/releases/17.0.5/openmp-17.0.5.src.tar.xz
+#http://llvm.org/releases/17.0.5/polly-17.0.5.src.tar.xz
+#http://llvm.org/releases/17.0.5/libcxx-17.0.5.src.tar.xz
+#http://llvm.org/releases/17.0.5/libcxxabi-17.0.5.src.tar.xz
+#http://llvm.org/releases/17.0.5/lld-17.0.5.src.tar.xz
+#http://llvm.org/releases/17.0.5/libunwind-17.0.5.src.tar.xz
+#http://llvm.org/releases/17.0.5/cmake-17.0.5.src.tar.xz
+#http://llvm.org/releases/17.0.5/third-party-17.0.5.src.tar.xz
diff --git a/source/kde/kde/build/plasma-wayland-protocols b/source/kde/kde/build/plasma-wayland-protocols
index 0cfbf0888..d00491fd7 100644
--- a/source/kde/kde/build/plasma-wayland-protocols
+++ b/source/kde/kde/build/plasma-wayland-protocols
@@ -1 +1 @@
-2
+1
diff --git a/source/kde/zxing-cpp/slack-desc b/source/l/zxing-cpp/slack-desc
index e989cb626..e989cb626 100644
--- a/source/kde/zxing-cpp/slack-desc
+++ b/source/l/zxing-cpp/slack-desc
diff --git a/source/kde/zxing-cpp/zxing-cpp.SlackBuild b/source/l/zxing-cpp/zxing-cpp.SlackBuild
index b07430649..b07430649 100755
--- a/source/kde/zxing-cpp/zxing-cpp.SlackBuild
+++ b/source/l/zxing-cpp/zxing-cpp.SlackBuild
diff --git a/source/kde/zxing-cpp/zxing-cpp.url b/source/l/zxing-cpp/zxing-cpp.url
index 261e4b754..261e4b754 100644
--- a/source/kde/zxing-cpp/zxing-cpp.url
+++ b/source/l/zxing-cpp/zxing-cpp.url
diff --git a/source/n/nfs-utils/nfs-utils.SlackBuild b/source/n/nfs-utils/nfs-utils.SlackBuild
index e7d6f333a..c69e95779 100755
--- a/source/n/nfs-utils/nfs-utils.SlackBuild
+++ b/source/n/nfs-utils/nfs-utils.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2008, 2009, 2010, 2011, 2013, 2016, 2018, 2020  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2013, 2016, 2018, 2020, 2023  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=nfs-utils
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -126,7 +126,9 @@ make install DESTDIR=$PKG || exit 1
 rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
 
 # Move udev rule:
-mv $PKG/usr/lib $PKG
+mkdir -p $PKG/lib
+mv $PKG/usr/lib/udev $PKG/lib
+rmdir $PKG/usr/lib 2> /dev/null
 
 # Add nfsmount.conf and man page:
 cat ./utils/mount/nfsmount.conf > $PKG/etc/nfsmount.conf.new