diff options
Diffstat (limited to 'source/d')
-rwxr-xr-x | source/d/autoconf-archive/autoconf-archive.SlackBuild | 4 | ||||
-rwxr-xr-x | source/d/autoconf/autoconf.SlackBuild | 2 | ||||
-rw-r--r-- | source/d/autoconf/doinst.sh | 2 | ||||
-rwxr-xr-x | source/d/automake/automake.SlackBuild | 2 | ||||
-rw-r--r-- | source/d/automake/doinst.sh | 2 | ||||
-rwxr-xr-x | source/d/check/check.SlackBuild | 2 | ||||
-rwxr-xr-x | source/d/gcc/gcc.SlackBuild | 2 | ||||
-rwxr-xr-x | source/d/gnucobol/gnucobol.SlackBuild | 2 | ||||
-rwxr-xr-x | source/d/gyp/gyp.SlackBuild | 2 | ||||
-rwxr-xr-x | source/d/help2man/help2man.SlackBuild | 2 | ||||
-rw-r--r-- | source/d/libtool/doinst.sh | 2 | ||||
-rwxr-xr-x | source/d/libtool/libtool.SlackBuild | 2 | ||||
-rwxr-xr-x | source/d/ninja/ninja.SlackBuild | 2 | ||||
-rwxr-xr-x | source/d/parallel/parallel.SlackBuild | 2 | ||||
-rwxr-xr-x | source/d/patchelf/patchelf.SlackBuild | 2 | ||||
-rwxr-xr-x | source/d/poke/poke.SlackBuild | 2 | ||||
-rwxr-xr-x | source/d/rcs/rcs.SlackBuild | 2 | ||||
-rwxr-xr-x | source/d/re2c/re2c.SlackBuild | 2 | ||||
-rwxr-xr-x | source/d/rinutils/rinutils.SlackBuild | 2 | ||||
-rwxr-xr-x | source/d/sassc/sassc.SlackBuild | 2 | ||||
-rwxr-xr-x | source/d/vala/vala.SlackBuild | 2 | ||||
-rwxr-xr-x | source/d/yasm/yasm.SlackBuild | 2 |
22 files changed, 23 insertions, 23 deletions
diff --git a/source/d/autoconf-archive/autoconf-archive.SlackBuild b/source/d/autoconf-archive/autoconf-archive.SlackBuild index 3a42c57d3..6a55aa480 100755 --- a/source/d/autoconf-archive/autoconf-archive.SlackBuild +++ b/source/d/autoconf-archive/autoconf-archive.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2020 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2020, 2022 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -30,7 +30,7 @@ BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$(uname -m)" in i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; esac diff --git a/source/d/autoconf/autoconf.SlackBuild b/source/d/autoconf/autoconf.SlackBuild index 59093015d..b006e5907 100755 --- a/source/d/autoconf/autoconf.SlackBuild +++ b/source/d/autoconf/autoconf.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=autoconf VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/d/autoconf/doinst.sh b/source/d/autoconf/doinst.sh index 4877094ed..c8e04ff4c 100644 --- a/source/d/autoconf/doinst.sh +++ b/source/d/autoconf/doinst.sh @@ -2,7 +2,7 @@ # "autoconf" item in info root structure, if we type "info". if [ -x /usr/bin/install-info ] ; then install-info --info-dir=/usr/info /usr/info/autoconf.info.gz 2>/dev/null -elif fgrep "Autoconf" usr/info/dir 1> /dev/null 2> /dev/null ; then +elif grep -F "Autoconf" usr/info/dir 1> /dev/null 2> /dev/null ; then GOOD=yes # It seems to be entered in the /usr/info/dir already else # add the info to the dir file directly: cat << EOF >> usr/info/dir diff --git a/source/d/automake/automake.SlackBuild b/source/d/automake/automake.SlackBuild index 21915f799..c67b2449c 100755 --- a/source/d/automake/automake.SlackBuild +++ b/source/d/automake/automake.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=automake VERSION=${VERSION:-$(echo automake-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Note: the package is _built_ as 'noarch' # Automatically determine architecture for build & packaging: diff --git a/source/d/automake/doinst.sh b/source/d/automake/doinst.sh index e50590c1c..f21e4bdf9 100644 --- a/source/d/automake/doinst.sh +++ b/source/d/automake/doinst.sh @@ -2,7 +2,7 @@ # "automake" item in info root structure, if we type "info". if [ -x /usr/bin/install-info ] ; then install-info --info-dir=/usr/info /usr/info/automake.info.gz 2>/dev/null -elif fgrep "automake" usr/info/dir 1> /dev/null 2> /dev/null ; then +elif grep -F "automake" usr/info/dir 1> /dev/null 2> /dev/null ; then GOOD=yes # It seems to be entered in the /usr/info/dir already else # add the info to the dir file directly: cat << EOF >> usr/info/dir diff --git a/source/d/check/check.SlackBuild b/source/d/check/check.SlackBuild index b8bd21e95..799996f2e 100755 --- a/source/d/check/check.SlackBuild +++ b/source/d/check/check.SlackBuild @@ -30,7 +30,7 @@ BUILD=${BUILD:-3} if [ -z "$ARCH" ]; then case "$(uname -m)" in i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; esac diff --git a/source/d/gcc/gcc.SlackBuild b/source/d/gcc/gcc.SlackBuild index f69d92d00..56ae24107 100755 --- a/source/d/gcc/gcc.SlackBuild +++ b/source/d/gcc/gcc.SlackBuild @@ -66,7 +66,7 @@ NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ -z "$ARCH" ]; then case "$(uname -m)" in i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; esac diff --git a/source/d/gnucobol/gnucobol.SlackBuild b/source/d/gnucobol/gnucobol.SlackBuild index 8c7316e83..ea814d9b5 100755 --- a/source/d/gnucobol/gnucobol.SlackBuild +++ b/source/d/gnucobol/gnucobol.SlackBuild @@ -30,7 +30,7 @@ BUILD=${BUILD:-3} if [ -z "$ARCH" ]; then case "$(uname -m)" in i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; esac diff --git a/source/d/gyp/gyp.SlackBuild b/source/d/gyp/gyp.SlackBuild index 2eec22c5d..50bcca11a 100755 --- a/source/d/gyp/gyp.SlackBuild +++ b/source/d/gyp/gyp.SlackBuild @@ -30,7 +30,7 @@ BUILD=${BUILD:-2} if [ -z "$ARCH" ]; then case "$(uname -m)" in i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; esac diff --git a/source/d/help2man/help2man.SlackBuild b/source/d/help2man/help2man.SlackBuild index d58e2217d..1a5419b05 100755 --- a/source/d/help2man/help2man.SlackBuild +++ b/source/d/help2man/help2man.SlackBuild @@ -30,7 +30,7 @@ BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$(uname -m)" in i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; esac diff --git a/source/d/libtool/doinst.sh b/source/d/libtool/doinst.sh index 38b074dd6..0c08bb49a 100644 --- a/source/d/libtool/doinst.sh +++ b/source/d/libtool/doinst.sh @@ -2,7 +2,7 @@ # "libtool" item in info root structure, if we type "info". if [ -x /usr/bin/install-info ] ; then install-info --info-dir=/usr/info /usr/info/libtool.info.gz 2>/dev/null -elif fgrep "libtoolize" usr/info/dir 1> /dev/null 2> /dev/null ; then +elif grep -F "libtoolize" usr/info/dir 1> /dev/null 2> /dev/null ; then GOOD=yes # It seems to be entered in the /usr/info/dir already else # add the info to the dir file directly: cat << EOF >> usr/info/dir diff --git a/source/d/libtool/libtool.SlackBuild b/source/d/libtool/libtool.SlackBuild index 7c9ebec7f..4bf94114b 100755 --- a/source/d/libtool/libtool.SlackBuild +++ b/source/d/libtool/libtool.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libtool VERSION=${VERSION:-$(echo libtool-*.tar.xz | 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/d/ninja/ninja.SlackBuild b/source/d/ninja/ninja.SlackBuild index f0b6c6af1..5a863f5e1 100755 --- a/source/d/ninja/ninja.SlackBuild +++ b/source/d/ninja/ninja.SlackBuild @@ -33,7 +33,7 @@ NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} if [ -z "$ARCH" ]; then case "$(uname -m)" in i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; esac diff --git a/source/d/parallel/parallel.SlackBuild b/source/d/parallel/parallel.SlackBuild index 7bb6863eb..d95113840 100755 --- a/source/d/parallel/parallel.SlackBuild +++ b/source/d/parallel/parallel.SlackBuild @@ -30,7 +30,7 @@ BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$(uname -m)" in i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; esac diff --git a/source/d/patchelf/patchelf.SlackBuild b/source/d/patchelf/patchelf.SlackBuild index f5fcc5704..72c9540af 100755 --- a/source/d/patchelf/patchelf.SlackBuild +++ b/source/d/patchelf/patchelf.SlackBuild @@ -30,7 +30,7 @@ BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$(uname -m)" in i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; esac diff --git a/source/d/poke/poke.SlackBuild b/source/d/poke/poke.SlackBuild index 200157a60..f6be2bd07 100755 --- a/source/d/poke/poke.SlackBuild +++ b/source/d/poke/poke.SlackBuild @@ -30,7 +30,7 @@ BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$(uname -m)" in i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; esac diff --git a/source/d/rcs/rcs.SlackBuild b/source/d/rcs/rcs.SlackBuild index e9b5a8126..3004bebc5 100755 --- a/source/d/rcs/rcs.SlackBuild +++ b/source/d/rcs/rcs.SlackBuild @@ -30,7 +30,7 @@ BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$(uname -m)" in i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; esac diff --git a/source/d/re2c/re2c.SlackBuild b/source/d/re2c/re2c.SlackBuild index 56cf490c8..13eee5528 100755 --- a/source/d/re2c/re2c.SlackBuild +++ b/source/d/re2c/re2c.SlackBuild @@ -31,7 +31,7 @@ BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$(uname -m)" in i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; esac diff --git a/source/d/rinutils/rinutils.SlackBuild b/source/d/rinutils/rinutils.SlackBuild index 23e3c3058..3c699414e 100755 --- a/source/d/rinutils/rinutils.SlackBuild +++ b/source/d/rinutils/rinutils.SlackBuild @@ -30,7 +30,7 @@ BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$(uname -m)" in i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; esac diff --git a/source/d/sassc/sassc.SlackBuild b/source/d/sassc/sassc.SlackBuild index f32a0c18b..66d0425af 100755 --- a/source/d/sassc/sassc.SlackBuild +++ b/source/d/sassc/sassc.SlackBuild @@ -31,7 +31,7 @@ BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$(uname -m)" in i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; esac diff --git a/source/d/vala/vala.SlackBuild b/source/d/vala/vala.SlackBuild index 9d95a2155..45cac8ddf 100755 --- a/source/d/vala/vala.SlackBuild +++ b/source/d/vala/vala.SlackBuild @@ -30,7 +30,7 @@ BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$(uname -m)" in i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; esac diff --git a/source/d/yasm/yasm.SlackBuild b/source/d/yasm/yasm.SlackBuild index 1b870291e..a6ddf8232 100755 --- a/source/d/yasm/yasm.SlackBuild +++ b/source/d/yasm/yasm.SlackBuild @@ -39,7 +39,7 @@ fi if [ -z "$ARCH" ]; then case "$(uname -m)" in i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; esac |