1 files changed, 30 insertions, 25 deletions
diff --git a/desktop/wmclock/wmclock.SlackBuild b/desktop/wmclock/wmclock.SlackBuild
index 9e97a25180..879687c636 100644
--- a/desktop/wmclock/wmclock.SlackBuild
+++ b/desktop/wmclock/wmclock.SlackBuild
@@ -1,19 +1,25 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for wmclock
 
-# Written by B. Watson (yalhcru@gmail.com)
+# Written by B. Watson (urchlay@slackware.uk)
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20231118 bkw: update for v1.0.16. not really necessary, but I'm tired
+# of repology claiming this is outdated.
+
 # 20151110 bkw:
 # - finally got around to upgrading to 1.0.14.
 # - added default language in slack-desc.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=wmclock
-VERSION=${VERSION:-1.0.14}
+VERSION=${VERSION:-1.0.16}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -23,23 +29,23 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
 else
   SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
 fi
 
 set -e
@@ -48,29 +54,28 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+mkdir -p $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
+tar xvf $CWD/${PRGNAM}_$VERSION.orig.tar.gz --strip-components=1
 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 \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
-# Set the default language with LANGUAGE=<language> in the environment
+autoreconf -if
+
+# Set the default language with LANGUAGE=<language> in the environment.
 # Default is english. It's still possible to display in other
 # languages using the -monthxpm and -weekdayxpm options.
 
 LANGUAGE=${LANGUAGE:-english}
-./configure --lang $LANGUAGE
-
-make CDEBUGFLAGS="$SLKCFLAGS" PREFIX=/usr
-mkdir -p $PKG/usr/bin
-install -s -m0755 -o root -g root $PRGNAM $PKG/usr/bin
-make install.share DESTDIR=$PKG PREFIX=/usr
-
-mkdir -p $PKG/usr/man/man1
-gzip -9c $PRGNAM.man > $PKG/usr/man/man1/$PRGNAM.1.gz
+CFLAGS="$SLKCFLAGS" \
+./configure \
+  --with-lang=$LANGUAGE \
+  --prefix=/usr \
+  --mandir=/usr/man
+make
+make install-strip DESTDIR=$PKG
+gzip -9 $PKG/usr/man/man1/$PRGNAM.1
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp README COPYING ChangeLog $PKG/usr/doc/$PRGNAM-$VERSION
@@ -80,4 +85,4 @@ mkdir -p $PKG/install
 sed "s,@LANGUAGE@,$LANGUAGE," $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE