From a22d1843900f65ede3f87d55207ca0b8f2a38b98 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Tue, 18 Sep 2018 19:22:30 +0000
Subject: Tue Sep 18 19:22:30 UTC 2018

ap/dmidecode-3.2-x86_64-1.txz:  Upgraded.
ap/nano-3.1-x86_64-1.txz:  Upgraded.
ap/slackpkg-2.83.0-noarch-4.txz:  Rebuilt.
  Merged two patches from git:
  Clarify that a press of "Enter" is needed to confirm kernel change
  Mention possible stale mirror if CHECKSUMS.md5 gpg verify fails
  Thanks to Mario Preksavec and Robby Workman.
ap/sqlite-3.25.0-x86_64-1.txz:  Upgraded.
ap/xorriso-1.5.0-x86_64-1.txz:  Upgraded.
l/lmdb-0.9.22-x86_64-2.txz:  Rebuilt.
  Fixed the build script to clear out the build area properly - previously
  it was possible for binaries of the wrong $ARCH to end up in the package.
  Thanks to reddog83.
n/gnutls-3.6.3-x86_64-2.txz:  Rebuilt.
  Merged backported SSL/TLS fixes. Thanks to orbea.
n/samba-4.9.0-x86_64-2.txz:  Rebuilt.
  Recompiled in case the lmdb package was broken.
---
 source/d/bison/bison.SlackBuild | 20 +-------------------
 source/d/clisp/clisp.SlackBuild |  3 +++
 source/d/gdb/gdb.SlackBuild     | 20 +-------------------
 source/d/guile/guile.SlackBuild |  3 +++
 source/d/m4/m4.SlackBuild       |  3 +++
 source/d/rcs/rcs.SlackBuild     |  3 +++
 6 files changed, 14 insertions(+), 38 deletions(-)

(limited to 'source/d')

diff --git a/source/d/bison/bison.SlackBuild b/source/d/bison/bison.SlackBuild
index 713fda61..03b8b41b 100755
--- a/source/d/bison/bison.SlackBuild
+++ b/source/d/bison/bison.SlackBuild
@@ -78,25 +78,7 @@ find . \
   -exec chmod 644 {} \;
 
 # Don't use icecream:
-for path_element in $(echo $PATH | tr ':' '\n') ; do
-  if [ "$path_element" = "/usr/libexec/icecc/bin" ]; then
-    continue
-  fi
-  if [ -z "$REVERSE_PATH" ]; then
-    REVERSE_PATH="$path_element"
-  else
-    REVERSE_PATH="${REVERSE_PATH}:$path_element"
-  fi
-done
-for path_element in $(echo $REVERSE_PATH | tr ':' '\n') ; do
-  if [ -z "$FORWARD_PATH" ]; then
-    FORWARD_PATH="$path_element"
-  else
-    FORWARD_PATH="${FORWARD_PATH}:$path_element"
-  fi
-done
-PATH=$FORWARD_PATH
-unset FORWARD_PATH REVERSE_PATH
+PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g")
 
 CFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/source/d/clisp/clisp.SlackBuild b/source/d/clisp/clisp.SlackBuild
index 4205aa13..3b210fda 100755
--- a/source/d/clisp/clisp.SlackBuild
+++ b/source/d/clisp/clisp.SlackBuild
@@ -61,6 +61,9 @@ else
   LIBDIRSUFFIX=""
 fi
 
+# Don't use icecream:
+PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g")
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
 TMP=${TMP:-/tmp}
diff --git a/source/d/gdb/gdb.SlackBuild b/source/d/gdb/gdb.SlackBuild
index 41b0fd5d..e697bf4a 100755
--- a/source/d/gdb/gdb.SlackBuild
+++ b/source/d/gdb/gdb.SlackBuild
@@ -56,25 +56,7 @@ TMP=${TMP:-/tmp}
 PKG=$TMP/package-gdb
 
 # Don't use icecream:
-for path_element in $(echo $PATH | tr ':' '\n') ; do
-  if [ "$path_element" = "/usr/libexec/icecc/bin" ]; then
-    continue
-  fi
-  if [ -z "$REVERSE_PATH" ]; then
-    REVERSE_PATH="$path_element"
-  else
-    REVERSE_PATH="${REVERSE_PATH}:$path_element"
-  fi
-done
-for path_element in $(echo $REVERSE_PATH | tr ':' '\n') ; do
-  if [ -z "$FORWARD_PATH" ]; then
-    FORWARD_PATH="$path_element"
-  else
-    FORWARD_PATH="${FORWARD_PATH}:$path_element"
-  fi
-done
-PATH=$FORWARD_PATH
-unset FORWARD_PATH REVERSE_PATH
+PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g")
 
 rm -rf $PKG
 mkdir -p $TMP $PKG
diff --git a/source/d/guile/guile.SlackBuild b/source/d/guile/guile.SlackBuild
index f90537a1..ff00e419 100755
--- a/source/d/guile/guile.SlackBuild
+++ b/source/d/guile/guile.SlackBuild
@@ -65,6 +65,9 @@ else
   LIBDIRSUFFIX=""
 fi
 
+# Don't use icecream:
+PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g")
+
 cd $TMP
 rm -rf guile-$VERSION
 tar xvf $CWD/guile-$VERSION.tar.?z || exit 1
diff --git a/source/d/m4/m4.SlackBuild b/source/d/m4/m4.SlackBuild
index 0bc3f10f..e297a183 100755
--- a/source/d/m4/m4.SlackBuild
+++ b/source/d/m4/m4.SlackBuild
@@ -63,6 +63,9 @@ else
   LIBDIRSUFFIX=""
 fi
 
+# Don't use icecream:
+PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g")
+
 rm -rf $PKG
 mkdir -p $TMP $PKG
 
diff --git a/source/d/rcs/rcs.SlackBuild b/source/d/rcs/rcs.SlackBuild
index f2348714..d0bc509e 100755
--- a/source/d/rcs/rcs.SlackBuild
+++ b/source/d/rcs/rcs.SlackBuild
@@ -73,6 +73,9 @@ else
   LIBDIRSUFFIX=""
 fi
 
+# Don't use icecream:
+PATH=$(echo $PATH | sed "s|/usr/libexec/icecc/bin||g" | tr -s : | sed "s/^://g" | sed "s/:$//g")
+
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-$PKGNAM
 
-- 
cgit v1.2.3