11 files changed, 44 insertions, 30 deletions
diff --git a/source/a/tar/tar.SlackBuild b/source/a/tar/tar.SlackBuild
index fb68717b4..26c076e1b 100755
--- a/source/a/tar/tar.SlackBuild
+++ b/source/a/tar/tar.SlackBuild
@@ -25,7 +25,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=tar
-VERSION=1.32
+VERSION=1.33
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
diff --git a/source/d/llvm/llvm.SlackBuild b/source/d/llvm/llvm.SlackBuild
index 3858e4d7d..826a47927 100755
--- a/source/d/llvm/llvm.SlackBuild
+++ b/source/d/llvm/llvm.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=llvm
 VERSION=${VERSION:-$(echo llvm-*.tar.xz | rev | cut -f 4- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/source/d/llvm/llvm.url b/source/d/llvm/llvm.url
index 6a30c7ec8..62c0ad415 100644
--- a/source/d/llvm/llvm.url
+++ b/source/d/llvm/llvm.url
@@ -1,23 +1,23 @@
-https://github.com/llvm/llvm-project/releases/download/llvmorg-11.0.0/llvm-11.0.0.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-11.0.0/clang-11.0.0.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-11.0.0/clang-tools-extra-11.0.0.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-11.0.0/compiler-rt-11.0.0.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-11.0.0/flang-11.0.0.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-11.0.0/lldb-11.0.0.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-11.0.0/openmp-11.0.0.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-11.0.0/polly-11.0.0.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-11.0.0/libcxx-11.0.0.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-11.0.0/libcxxabi-11.0.0.src.tar.xz
-https://github.com/llvm/llvm-project/releases/download/llvmorg-11.0.0/lld-11.0.0.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-11.0.1/llvm-11.0.1.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-11.0.1/clang-11.0.1.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-11.0.1/clang-tools-extra-11.0.1.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-11.0.1/compiler-rt-11.0.1.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-11.0.1/flang-11.0.1.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-11.0.1/lldb-11.0.1.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-11.0.1/openmp-11.0.1.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-11.0.1/polly-11.0.1.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-11.0.1/libcxx-11.0.1.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-11.0.1/libcxxabi-11.0.1.src.tar.xz
+https://github.com/llvm/llvm-project/releases/download/llvmorg-11.0.1/lld-11.0.1.src.tar.xz
 
-#http://llvm.org/releases/11.0.0/llvm-11.0.0.src.tar.xz
-#http://llvm.org/releases/11.0.0/clang-11.0.0.src.tar.xz
-#http://llvm.org/releases/11.0.0/clang-tools-extra-11.0.0.src.tar.xz
-#http://llvm.org/releases/11.0.0/compiler-rt-11.0.0.src.tar.xz
-#http://llvm.org/releases/11.0.0/flang-11.0.0.src.tar.xz
-#http://llvm.org/releases/11.0.0/lldb-11.0.0.src.tar.xz
-#http://llvm.org/releases/11.0.0/openmp-11.0.0.src.tar.xz
-#http://llvm.org/releases/11.0.0/polly-11.0.0.src.tar.xz
-#http://llvm.org/releases/11.0.0/libcxx-11.0.0.src.tar.xz
-#http://llvm.org/releases/11.0.0/libcxxabi-11.0.0.src.tar.xz
-#http://llvm.org/releases/11.0.0/lld-11.0.0.src.tar.xz
+#http://llvm.org/releases/11.0.1/llvm-11.0.1.src.tar.xz
+#http://llvm.org/releases/11.0.1/clang-11.0.1.src.tar.xz
+#http://llvm.org/releases/11.0.1/clang-tools-extra-11.0.1.src.tar.xz
+#http://llvm.org/releases/11.0.1/compiler-rt-11.0.1.src.tar.xz
+#http://llvm.org/releases/11.0.1/flang-11.0.1.src.tar.xz
+#http://llvm.org/releases/11.0.1/lldb-11.0.1.src.tar.xz
+#http://llvm.org/releases/11.0.1/openmp-11.0.1.src.tar.xz
+#http://llvm.org/releases/11.0.1/polly-11.0.1.src.tar.xz
+#http://llvm.org/releases/11.0.1/libcxx-11.0.1.src.tar.xz
+#http://llvm.org/releases/11.0.1/libcxxabi-11.0.1.src.tar.xz
+#http://llvm.org/releases/11.0.1/lld-11.0.1.src.tar.xz
diff --git a/source/kde/kde/build/cantor b/source/kde/kde/build/cantor
index 0cfbf0888..d00491fd7 100644
--- a/source/kde/kde/build/cantor
+++ b/source/kde/kde/build/cantor
@@ -1 +1 @@
-2
+1
diff --git a/source/kde/kde/build/kig b/source/kde/kde/build/kig
index 0cfbf0888..d00491fd7 100644
--- a/source/kde/kde/build/kig
+++ b/source/kde/kde/build/kig
@@ -1 +1 @@
-2
+1
diff --git a/source/kde/kde/build/kitinerary b/source/kde/kde/build/kitinerary
index 0cfbf0888..d00491fd7 100644
--- a/source/kde/kde/build/kitinerary
+++ b/source/kde/kde/build/kitinerary
@@ -1 +1 @@
-2
+1
diff --git a/source/kde/kde/build/okular b/source/kde/kde/build/okular
index 0cfbf0888..d00491fd7 100644
--- a/source/kde/kde/build/okular
+++ b/source/kde/kde/build/okular
@@ -1 +1 @@
-2
+1
diff --git a/source/kde/kde/kde.SlackBuild b/source/kde/kde/kde.SlackBuild
index 5c7dec06c..459165b06 100755
--- a/source/kde/kde/kde.SlackBuild
+++ b/source/kde/kde/kde.SlackBuild
@@ -40,6 +40,7 @@ PRECHECK=${PRECHECK:-"no"} # don't let the script check the available sources.
 CHECKOUT=${CHECKOUT:-"no"} # don't let the script checkout missing sources.
 GRACETME=${GRACETME:-"10"} # grace time to change your mind before build starts.
 SKIPBUILT=${SKIPBUILT:-"no"} # skip building already built packages.
+EXITFAIL=${EXITFAIL:-"yes"} # exit if a package fails to build.
 
 KDEGITURI="git://anongit.kde.org"
 
@@ -559,7 +560,9 @@ do
     if [ -z "$PRINT_PACKAGE_NAME" ]; then
       echo "${module} failed to build."
     fi
-    exit 1
+    if [ "$EXITFAIL" = "yes" ]; then
+      exit 1
+    fi
   fi
   cd - > /dev/null
 done
diff --git a/source/make_world.sh b/source/make_world.sh
index a269e96f0..876a9f11a 100755
--- a/source/make_world.sh
+++ b/source/make_world.sh
@@ -74,6 +74,16 @@ fi
 # of this script as you think will help to speed things along.
 WIPE_AFTER_BUILD=${WIPE_AFTER_BUILD:-no}
 
+# This variable is used to tell x11.SlackBuild not to use upgradepkg on the
+# built package since this script already does that:
+UPGRADE_PACKAGES=${UPGRADE_PACKAGES:-"no"}
+export UPGRADE_PACKAGES
+
+# This variable is used to tell kde.SlackBuild not to use upgradepkg on the
+# built package since this script already does that:
+UPGRADE=${UPGRADE:-"no"}
+export UPGRADE
+
 # Be kind, don't hit control-c! If you do, you might leave broken packages,
 # logfiles, and locks in $TMP that will cause problems for you later. If you're
 # not in a huge hurry to quit, create this file (replace with $TMP if needed):
diff --git a/source/xfce/xfce4-screensaver/xfce4-screensaver.SlackBuild b/source/xfce/xfce4-screensaver/xfce4-screensaver.SlackBuild
index 888970856..c7083ec7f 100755
--- a/source/xfce/xfce4-screensaver/xfce4-screensaver.SlackBuild
+++ b/source/xfce/xfce4-screensaver/xfce4-screensaver.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=xfce4-screensaver
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/xfce/xfce4-screensaver/xfce4-screensaver.url b/source/xfce/xfce4-screensaver/xfce4-screensaver.url
new file mode 100644
index 000000000..37cc6f2ea
--- /dev/null
+++ b/source/xfce/xfce4-screensaver/xfce4-screensaver.url
@@ -0,0 +1 @@
+http://archive.xfce.org/src/apps/xfce4-screensaver