1 files changed, 30 insertions, 41 deletions
diff --git a/desktop/wmtime/wmtime.SlackBuild b/desktop/wmtime/wmtime.SlackBuild
index d2cb2df416..bdc2beae1d 100644
--- a/desktop/wmtime/wmtime.SlackBuild
+++ b/desktop/wmtime/wmtime.SlackBuild
@@ -1,13 +1,17 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for wmtime
 
 # Originally written by Pablo Santamaria (email removed)
 
-# Now maintained by B. Watson <yalhcru@gmail.com>. Original version
+# Now maintained by B. Watson <urchlay@slackware.uk>. Original version
 # had no license, modified version released under the WTFPL. See
 # http://www.wtfpl.net/txt/copying/ for details.
 
+# 20210219 bkw: update for v1.4. This adds libdockapp as a dep, and
+# greatly simplifies the locale support. Also upstream added a man page,
+# so get rid of mine.
+
 # 20170211 bkw:
 # - Add man page, BUILD=3
 
@@ -17,10 +21,13 @@
 # - Make the language stuff work, support LANGUAGE variable
 # - Add Spanish, French, German language support.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=wmtime
-VERSION=${VERSION:-1.0b2}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-1.4}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -30,7 +37,11 @@ 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}
@@ -54,49 +65,27 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM.app
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM.app
+rm -rf $PRGNAM-$VERSION
+
+# The top-level dir is named dockapps-<githash>, force it to decompress to
+# a sanely-named directory:
+mkdir -p $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -C $PRGNAM-$VERSION --strip-components=1
+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 \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-# make the language stuff actually work
-sed -i \
-  "s,fopen(\"language\",fopen(\"/usr/share/$PRGNAM/language\"," \
-  $PRGNAM/$PRGNAM.c
-
-# much as I like the Beatles, we can't have 8 weekday names here:
-sed -i '8d' languages/slovene.lang
-
-sed -i "s/cc -c/cc -c -fgnu89-inline $SLKCFLAGS/" $PRGNAM/Makefile
-make -C $PRGNAM
-mkdir -p $PKG/usr/bin $PKG/usr/share/$PRGNAM/languages
-install -m0755 -s $PRGNAM/$PRGNAM $PKG/usr/bin
-install -m0644 languages/* $CWD/*.lang $PKG/usr/share/$PRGNAM/languages
-
-LANGUAGE="${LANGUAGE:-us}"
-if [ -e $PKG/usr/share/$PRGNAM/languages/$LANGUAGE.lang ]; then
-  ln -s languages/$LANGUAGE.lang $PKG/usr/share/$PRGNAM/language
-else
-  echo "Invalid LANGUAGE '$LANGUAGE'. Supported values are:" 2>&1
-  ls $PKG/usr/share/$PRGNAM/languages/*.lang | sed 's,.*/\([^/]*\)\.lang,\1,g'
-  exit 1
-fi
+chmod 644 *
 
-# man page written for this slackbuild
-mkdir -p $PKG/usr/man/man1
-gzip -9c < $CWD/$PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
+make CFLAGS="$SLKCFLAGS" LDFLAGS="-Wl,-s" PREFIX=/usr
+make install DESTDIR=$PKG PREFIX=/usr MANDIR=/usr/man/man1
+gzip -9 $PKG/usr/man/man1/$PRGNAM.1
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a BUGS CHANGES COPYING HINTS README TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGES COPYING HINTS README TODO $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $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