summaryrefslogtreecommitdiffstats
path: root/system/univga-font
diff options
context:
space:
mode:
Diffstat (limited to 'system/univga-font')
-rw-r--r--system/univga-font/README3
-rw-r--r--system/univga-font/douninst.sh23
-rw-r--r--system/univga-font/slack-desc2
-rw-r--r--system/univga-font/univga-font.SlackBuild16
-rw-r--r--system/univga-font/univga-font.info6
5 files changed, 41 insertions, 9 deletions
diff --git a/system/univga-font/README b/system/univga-font/README
index 10e0670927..a5e814d8e5 100644
--- a/system/univga-font/README
+++ b/system/univga-font/README
@@ -28,3 +28,6 @@ some reason need it, you can also install the PCF (portable compiled
X font) version, with PCF=yes in the environment. You can also set
BDF=no, PSF=no, and/or OTB=no, if you want to omit one or more of
these font types. Setting all 4 variables to "no" is an error, though.
+
+This package also includes bdf2psf.pl, which converts X bitmap fonts
+to console fonts.
diff --git a/system/univga-font/douninst.sh b/system/univga-font/douninst.sh
new file mode 100644
index 0000000000..6d7d53ac0a
--- /dev/null
+++ b/system/univga-font/douninst.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+# Update fonts.{dir,scale,alias}
+if [ -x /usr/bin/mkfontdir -a -x /usr/bin/mkfontscale ]; then
+ ( cd usr/share/fonts/misc
+ /usr/bin/mkfontscale .
+ /usr/bin/mkfontdir .
+ if [ -e fonts.alias ]; then
+ grep -v '^univga\>' fonts.alias > fonts.alias.new
+ mv fonts.alias.new fonts.alias
+ fi
+ )
+fi
+
+# 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/system/univga-font/slack-desc b/system/univga-font/slack-desc
index 6ec95c65cf..67c4cf124f 100644
--- a/system/univga-font/slack-desc
+++ b/system/univga-font/slack-desc
@@ -10,8 +10,8 @@ univga-font: univga-font (unicode terminal font)
univga-font:
univga-font: UNI-VGA is a Unicode VGA font for X11 and console. It is primarily
univga-font: intended to be the single source of fonts for console and for MS-DOS
-univga-font:
univga-font: emulators.
+univga-font:
univga-font: Font types included in this package:
univga-font:
univga-font: PSF=@PSF@, BDF=@BDF@, OTB=@OTB@, PCF=@PCF@
diff --git a/system/univga-font/univga-font.SlackBuild b/system/univga-font/univga-font.SlackBuild
index d0e9ceb6ac..dffa83b51b 100644
--- a/system/univga-font/univga-font.SlackBuild
+++ b/system/univga-font/univga-font.SlackBuild
@@ -2,12 +2,17 @@
# Slackware build script for univga-font
-# 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.
# VERSION taken from the datestamp of the tarball.
+# 20230306 bkw: BUILD=4
+# - add douninst.sh.
+# - fix slack-desc formatting.
+# - mention bdf2psf.pl in README.
+
# 20201206 bkw: BUILD=3, added OTB font since -current's pango wants it.
# Also add PCF (disabled by default). Based on a patch from
# Tomasz Bywalec. Update README. Have slack-desc list the
@@ -19,15 +24,12 @@ cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=univga-font
VERSION=${VERSION:-20021031}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
ARCH=noarch
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -114,6 +116,9 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a *.lsm $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+# 20230306 bkw: douninst.sh makes package removal cleaner. it rebuilds
+# fonts.{dir|scale} after our fonts get removed, removes the "univga"
+# alias, and rebuilds the font cache.
mkdir -p $PKG/install
sed -e "s,@PCF@,$PCF," \
-e "s,@BDF@,$BDF," \
@@ -121,6 +126,7 @@ sed -e "s,@PCF@,$PCF," \
-e "s,@OTB@,$OTB," \
$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
diff --git a/system/univga-font/univga-font.info b/system/univga-font/univga-font.info
index b5dc60a78d..a9bfbcc3b6 100644
--- a/system/univga-font/univga-font.info
+++ b/system/univga-font/univga-font.info
@@ -1,10 +1,10 @@
PRGNAM="univga-font"
VERSION="20021031"
-HOMEPAGE="http://www.inp.nsk.su/~bolkhov/files/fonts/univga/index.html"
-DOWNLOAD="http://www.inp.nsk.su/~bolkhov/files/fonts/univga/uni-vga.tgz"
+HOMEPAGE="https://www.inp.nsk.su/~bolkhov/files/fonts/univga/index.html"
+DOWNLOAD="https://www.inp.nsk.su/~bolkhov/files/fonts/univga/uni-vga.tgz"
MD5SUM="60fbba53cb0efec1363fcc5fb8c244d9"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"