5 files changed, 65 insertions, 24 deletions
diff --git a/misc/font-unscii/README b/misc/font-unscii/README
index aeb8de42fa..35665dd930 100644
--- a/misc/font-unscii/README
+++ b/misc/font-unscii/README
@@ -4,7 +4,8 @@ Unscii is a set of bitmapped Unicode fonts based on classic system
 fonts. Unscii attempts to support character cell art well while also
 being suitable for terminal and programming use.
 
-The package include PCF, TTF, and OTF fonts for use with X. No console
-(PSF) fonts are included: These fonts have over 2500 glyphs each, but the
-console only supports 512 glyphs per font. Most of the special character
-art glyphs would have to be omitted from a console conversion.
+The package include PCF, TTF, and OTF fonts for use with X. No
+console (PSF) fonts are included: These fonts have over 2500 glyphs
+each, but the console only supports 512 glyphs per font. Most of the
+special character art glyphs would have to be omitted from a console
+conversion.
diff --git a/misc/font-unscii/doinst.sh b/misc/font-unscii/doinst.sh
index 15acd6001a..89ef3509cb 100644
--- a/misc/font-unscii/doinst.sh
+++ b/misc/font-unscii/doinst.sh
@@ -1,9 +1,17 @@
 # Update fonts.{dir,scale,alias}
 if [ -x /usr/bin/mkfontdir -a -x /usr/bin/mkfontscale ]; then
   for i in misc TTF OTF; do
-    ( cd usr/share/fonts/misc
-      if ! grep -q ^unscii- fonts.alias; then
-        cat <<EOF >> fonts.alias
+    ( cd usr/share/fonts/$i
+      /usr/bin/mkfontscale .
+      /usr/bin/mkfontdir .
+    )
+  done
+fi
+
+# Only include aliases for the bitmap fonts (e.g. xterm -fn unscii-16)
+( cd usr/share/fonts/misc
+  if ! grep -q ^unscii- fonts.alias; then
+    cat <<EOF >> fonts.alias
 unscii-16-full -unscii-unscii-medium-r-normal-full-16-160-75-75-c-80-iso10646-1
 unscii-16 -unscii-unscii-medium-r-normal-16-16-160-75-75-c-80-iso10646-1
 unscii-8-alt -unscii-unscii-medium-r-normal-alt-8-80-75-75-c-80-iso10646-1
@@ -13,12 +21,8 @@ unscii-8-tall -unscii-unscii-medium-r-normal-tall-16-160-75-75-c-80-iso10646-1
 unscii-8-thin -unscii-unscii-medium-r-normal-thin-8-80-75-75-c-80-iso10646-1
 unscii-8 -unscii-unscii-medium-r-normal-8-8-80-75-75-c-80-iso10646-1
 EOF
-      fi
-      /usr/bin/mkfontscale .
-      /usr/bin/mkfontdir .
-    )
-  done
-fi
+  fi
+)
 
 # If X is running...
 if [ "$DISPLAY" != "" ] && [ -x /usr/bin/xset ]; then
diff --git a/misc/font-unscii/douninst.sh b/misc/font-unscii/douninst.sh
new file mode 100644
index 0000000000..9e10abf2e6
--- /dev/null
+++ b/misc/font-unscii/douninst.sh
@@ -0,0 +1,25 @@
+# Update fonts.{dir,scale,alias}
+if [ -x /usr/bin/mkfontdir -a -x /usr/bin/mkfontscale ]; then
+  for i in misc TTF OTF; do
+    ( cd usr/share/fonts/$i
+      /usr/bin/mkfontscale .
+      /usr/bin/mkfontdir .
+    )
+  done
+fi
+
+# Remove aliases.
+( cd usr/share/fonts/misc
+  grep -v ^unscii- fonts.alias > fonts.alias.new
+  mv fonts.alias.new fonts.alias
+)
+
+# If X is running...
+if [ "$DISPLAY" != "" ] && [ -x /usr/bin/xset ]; then
+  /usr/bin/xset fp rehash >/dev/null 2>&1
+fi
+
+# Update the X font indexes:
+if [ -x /usr/bin/fc-cache ]; then
+  /usr/bin/fc-cache -f
+fi
diff --git a/misc/font-unscii/font-unscii.SlackBuild b/misc/font-unscii/font-unscii.SlackBuild
index bec06c651c..739fc3a5c3 100644
--- a/misc/font-unscii/font-unscii.SlackBuild
+++ b/misc/font-unscii/font-unscii.SlackBuild
@@ -1,18 +1,28 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for font-unscii
 
-# 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.
 
+# 20230307 bkw: BUILD=2, fix doinst.sh, add douninst.sh for cleanup.
+# 20210326 bkw: updated for v2.1, reflow README, new homepage/download
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=font-unscii
-VERSION=${VERSION:-2.0}
-BUILD=${BUILD:-1}
+VERSION=${VERSION:-2.1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 ARCH=noarch
 
-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}
@@ -49,6 +59,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
+cat $CWD/douninst.sh > $PKG/install/douninst.sh
 
 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
diff --git a/misc/font-unscii/font-unscii.info b/misc/font-unscii/font-unscii.info
index e3f4085332..4e1c840edc 100644
--- a/misc/font-unscii/font-unscii.info
+++ b/misc/font-unscii/font-unscii.info
@@ -1,10 +1,10 @@
 PRGNAM="font-unscii"
-VERSION="2.0"
-HOMEPAGE="http://pelulamu.net/unscii/"
-DOWNLOAD="http://pelulamu.net/unscii/unscii-2.0-src.tar.gz"
-MD5SUM="3902d8f56e48782778ae9676803ec864"
+VERSION="2.1"
+HOMEPAGE="http://viznut.fi/unscii/"
+DOWNLOAD="http://viznut.fi/unscii/unscii-2.1-src.tar.gz"
+MD5SUM="b171f5552b7503588d985edbba27a1b2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="fontforge perl-Text-CharWidth"
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"