1 files changed, 40 insertions, 8 deletions
diff --git a/misc/hxtools/hxtools.SlackBuild b/misc/hxtools/hxtools.SlackBuild
index 51eec52cc2..287855600a 100644
--- a/misc/hxtools/hxtools.SlackBuild
+++ b/misc/hxtools/hxtools.SlackBuild
@@ -11,10 +11,14 @@
 # depends on libHX and wants to package it up for SBo, whatever it is
 # can just list hxtools as a dependency.
 
+# 20230901 bkw: update for v20230411 (and libhx-4.14, consoleet-utils-1.3).
+# 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:-20230411}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -53,7 +57,14 @@ fi
 set -e
 
 LIBNAM=libHX
-LIBVER=${LIBVER:-4.2}
+LIBVER=${LIBVER:-4.14}
+LEETNAM=consoleet-utils
+LEETVER=${LEETVER:-1.3}
+
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+LIBDOC=$PKGDOC/$LIBNAM-$LIBVER
+LEETDOC=$PKGDOC/$LEETNAM-$LEETVER
+
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -62,8 +73,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 +99,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 +158,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