summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author B. Watson <yalhcru@gmail.com>2022-02-12 03:37:15 -0500
committer Willy Sudiarto Raharjo <willysr@slackbuilds.org>2022-02-13 09:17:48 +0700
commitb6777ee1eb7faa492145d8928b41e93799a64c26 (patch)
tree1bd80317a1b3f62f107fb7b7f8bbf7a69986c41a
parent80327853e21c09eac7ed809ef0e6be1e8d30f0cb (diff)
downloadslackbuilds-b6777ee1eb7faa492145d8928b41e93799a64c26.tar.gz
slackbuilds-b6777ee1eb7faa492145d8928b41e93799a64c26.tar.xz
system/whowatch: Fix 15.0 build, download URL.
Signed-off-by: B. Watson <yalhcru@gmail.com> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--system/whowatch/whowatch.SlackBuild22
-rw-r--r--system/whowatch/whowatch.info2
2 files changed, 10 insertions, 14 deletions
diff --git a/system/whowatch/whowatch.SlackBuild b/system/whowatch/whowatch.SlackBuild
index dbe3183ef3..57bafc4f23 100644
--- a/system/whowatch/whowatch.SlackBuild
+++ b/system/whowatch/whowatch.SlackBuild
@@ -23,6 +23,8 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# 20220212 bkw: Modified by SlackBuilds.org: fix build on 15.0.
+
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=whowatch
@@ -33,15 +35,12 @@ PKGTYPE=${PKGTYPE:-tgz}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
fi
-# 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
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -51,8 +50,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -76,11 +75,11 @@ cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
+ -o -perm 511 \) -exec chmod 755 {} \+ -o \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -fcommon" \
./configure \
--prefix=/usr \
--libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -90,10 +89,7 @@ CFLAGS="$SLKCFLAGS" \
--build=$ARCH-slackware-linux
make
-make install DESTDIR=$PKG
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+make install-strip DESTDIR=$PKG
gzip -9 $PKG/usr/man/man?/*.?
diff --git a/system/whowatch/whowatch.info b/system/whowatch/whowatch.info
index e2f22892a9..6c02d42394 100644
--- a/system/whowatch/whowatch.info
+++ b/system/whowatch/whowatch.info
@@ -1,7 +1,7 @@
PRGNAM="whowatch"
VERSION="1.6.1"
HOMEPAGE="http://whowatch.sourceforge.net/"
-DOWNLOAD="http://download.sourceforge.net/whowatch/whowatch-1.6.1.tar.gz"
+DOWNLOAD="https://slackware.uk/~urchlay/src/whowatch-1.6.1.tar.gz"
MD5SUM="6ed1e17df50746845c694a41c11e1765"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""