misc/hxtools: Updated for version 20221120.

Signed-off-by: B. Watson <urchlay@slackware.uk>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 49 insertions, 13 deletions

diff --git a/misc/hxtools/README b/misc/hxtools/README
index 532f84299c..183f596133 100644
--- a/misc/hxtools/README
+++ b/misc/hxtools/README
@@ -4,6 +4,9 @@ A collection of tools and scripts by Jan Engelhardt that have
 accumulated over the years, each of which seems to be too small to
 warrant its own project.
 
+The package also includes consoleet-utils (which was recently split off
+from hxtools).
+
 The following tools are included:
 
 * aumeta - move seek index and adjust metadata of audio files
diff --git a/misc/hxtools/hxtools.SlackBuild b/misc/hxtools/hxtools.SlackBuild
index 51eec52cc2..3291e18476 100644
--- a/misc/hxtools/hxtools.SlackBuild
+++ b/misc/hxtools/hxtools.SlackBuild
@@ -11,10 +11,13 @@
 # depends on libHX and wants to package it up for SBo, whatever it is
 # can just list hxtools as a dependency.
 
+# 20230109 bkw: update for v20221120, include new consoleet-utils.
+# TODO: package up the consoleet fonts, too (in a separate build).
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=hxtools
-VERSION=${VERSION:-20211204}
+VERSION=${VERSION:-20221120}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -53,7 +56,14 @@ fi
 set -e
 
 LIBNAM=libHX
-LIBVER=${LIBVER:-4.2}
+LIBVER=${LIBVER:-4.8}
+LEETNAM=consoleet-utils
+LEETVER=${LEETVER:-1.1}
+
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+LIBDOC=$PKGDOC/$LIBNAM-$LIBVER
+LEETDOC=$PKGDOC/$LEETNAM-$LEETVER
+
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -62,8 +72,9 @@ rm -rf $PRGNAM
 mkdir -p $PRGNAM
 cd $PRGNAM
 TOPDIR="$( pwd )"
-tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.zst
 tar xvf $CWD/$LIBNAM-$LIBVER.tar.xz
+tar xvf $CWD/$LEETNAM-$LEETVER.tar.zst
 chown -R root:root .
 find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
         \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
@@ -87,9 +98,6 @@ make # V=1
 make install-strip DESTDIR=$PKG
 rm -f $PKG/usr/lib*/*.la
 
-PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
-LIBDOC=$PKGDOC/$LIBNAM-$VERSION
-
 # LICENSE.GPL3 and LICENSE.WTFPL are also in hxtools, don't install here.
 mkdir -p $LIBDOC
 cp -a COPYING LICENSE.LGPL* *.rst doc $LIBDOC
@@ -149,12 +157,35 @@ rm -f $PKG/usr/bin/{rot13,man2html} \
 # redundant copy (the other one's in etc/):
 rm -f $PKG/usr/share/hxtools/hxloginpref.conf
 
+cp -a LICENSE* doc/*.rst examples $PKGDOC
+
+### consoleet-utils (used to be included in hxtools).
+cd $TOPDIR/$LEETNAM-$LEETVER
+libHX_CFLAGS="-I$PKG/usr/include" \
+libHX_LIBS="-L$PKG/usr/lib$LIBDIRSUFFIX -lHX" \
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --disable-static \
+  --build=$ARCH-slackware-linux
+
+make # V=1
+make install-strip DESTDIR=$PKG
+mkdir -p $LEETDOC
+cp -a doc/changelog.rst $LEETDOC
+
 gzip -9 $PKG/usr/man/man*/*
 
 # symlink redundant licenses
-cp -a LICENSE* doc/*.rst examples $PKGDOC
-ln -s ../LICENSE.WTFPL $LIBDOC/LICENSE.WTFPL
 ln -s ../LICENSE.GPL3 $LIBDOC/LICENSE.GPL3
+ln -s ../LICENSE.GPL3 $LEETDOC/LICENSE.GPL3
+ln -s ../LICENSE.MIT $LEETDOC/LICENSE.MIT
 cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/misc/hxtools/hxtools.info b/misc/hxtools/hxtools.info
index d850aac9e0..9186ae9694 100644
--- a/misc/hxtools/hxtools.info
+++ b/misc/hxtools/hxtools.info
@@ -1,10 +1,12 @@
 PRGNAM="hxtools"
-VERSION="20211204"
+VERSION="20221120"
 HOMEPAGE="https://inai.de/projects/hxtools/"
-DOWNLOAD="https://inai.de/files/hxtools/hxtools-20211204.tar.xz \
-          https://inai.de/files/libhx/libHX-4.2.tar.xz"
-MD5SUM="d1bcd68d5181c8c1ebf30eda7aa6820c \
-        3f2cc2752c0837990d7abf84f7b65b33"
+DOWNLOAD="https://inai.de/files/hxtools/hxtools-20221120.tar.zst \
+          https://inai.de/files/consoleet/consoleet-utils-1.1.tar.zst \
+          https://inai.de/files/libhx/libHX-4.8.tar.xz"
+MD5SUM="bcd0460a1aaf3340ec02ae1a6af479e6 \
+        85f603554e6f2abec78048d736e42d6e \
+        012454fde3c56be21b767e77cc3c5f93"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""