5 files changed, 48 insertions, 23 deletions
diff --git a/system/dina-font/README b/system/dina-font/README
index db843e934a..3335053618 100644
--- a/system/dina-font/README
+++ b/system/dina-font/README
@@ -4,17 +4,18 @@ Dina is a monospace bitmap font, primarily aimed at programmers. It is
 relatively compact to allow a lot of code on screen while clear enough
 to remain readable even at high resolutions.
 
-After the package is installed, X applications using fontconfig will be
-able to use the Dina fonts right away. To make them visible to old-style X
-apps (such as xterm), run "xset fp rehash" in your X session. After that,
-try e.g. "xterm -fn Dina_10" (Dina_6, Dina_8, Dina_9 are also available).
+After the package is installed, X applications using fontconfig will
+be able to use the Dina fonts right away. To make them visible to
+old-style X apps (such as xterm), run "xset fp rehash" in your X
+session. After that, try e.g. "xterm -fn Dina_10" (Dina_6, Dina_8,
+Dina_9 are also available).
 
 Optionally, console fonts can be included in the package. To do this,
-install psftools before running this SlackBuild. To view the fonts, use
-e.g. "setfont Dina_10" (or Dina_6, Dina_8, Dina_9). To use as the system
-default, edit /etc/rc.d/rc.font and change the setfont line there. Don't
-forget that rc.font needs to be executable.
+install psftools before running this SlackBuild. To view the fonts,
+use e.g. "setfont Dina_10" (or Dina_6, Dina_8, Dina_9). To use as the
+system default, edit /etc/rc.d/rc.font and change the setfont line
+there. Don't forget that rc.font needs to be executable.
 
 The X11 fonts use the Windows-1252 character set (compatible with
-Latin-1). The console fonts are available in Windows-1252, codepage 437,
-and codepage 850.
+Latin-1). The console fonts are available in Windows-1252, codepage
+437, and codepage 850.
diff --git a/system/dina-font/dina-font.SlackBuild b/system/dina-font/dina-font.SlackBuild
index f3aa6aef87..41a01e03b7 100644
--- a/system/dina-font/dina-font.SlackBuild
+++ b/system/dina-font/dina-font.SlackBuild
@@ -1,10 +1,10 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for dina-font
 
 # Originally written by Binh Nguyen <email removed>.
 # Formerly maintained by Ryan P.C. McQuen <email removed>.
-# Now maintained by B. Watson <yalhcru@gmail.com>.
+# Now maintained by B. Watson <urchlay@slackware.uk>.
 
 # Copyright 2010  Binh Nguyen <email removed>
 # All rights reserved.
@@ -26,6 +26,8 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20230307 bkw: BUILD=2, add douninst.sh.
+
 # 20180117 bkw:
 # - update for v2.93, BUILD=1
 # - original site has gone away, use gentoo distfiles for download and
@@ -48,14 +50,21 @@
 # - install the docs in /usr/doc/$PRGNAM-$VERSION.
 # - BUILD=2
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=dina-font
 VERSION=${VERSION:-2.93}
-BUILD=${BUILD:-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}
@@ -72,11 +81,8 @@ mkdir -p $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
 unzip $CWD/$SRCNAM-$VERSION.zip
 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 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
 mkdir -p $PKG/usr/share/fonts/misc
 
@@ -139,6 +145,7 @@ sed -e "s,@ANDCONSOLE@,$ANDCONSOLE," \
     -e "s,@ONLY@,$ONLY," \
     $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/system/dina-font/dina-font.info b/system/dina-font/dina-font.info
index 7eb5a04848..c3417c5c53 100644
--- a/system/dina-font/dina-font.info
+++ b/system/dina-font/dina-font.info
@@ -1,10 +1,10 @@
 PRGNAM="dina-font"
 VERSION="2.93"
 HOMEPAGE="http://web.archive.org/web/20170706192353/http://www.donationcoder.com/Software/Jibz/Dina/index.html"
-DOWNLOAD="http://ftp.osuosl.org/pub/gentoo/distfiles/dina-2.93.zip"
+DOWNLOAD="http://ftp.osuosl.org/pub/gentoo/distfiles/fe/dina-2.93.zip"
 MD5SUM="04cf107a6bbc54011c03b34ef296bbae"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="B. Watson"
-EMAIL="yalhcru@gmail.com"
+EMAIL="urchlay@slackware.uk"
diff --git a/system/dina-font/doinst.sh b/system/dina-font/doinst.sh
index 96b0162ebe..8bf0ea71d1 100644
--- a/system/dina-font/doinst.sh
+++ b/system/dina-font/doinst.sh
@@ -1,6 +1,6 @@
 if [ -x /usr/bin/mkfontdir ]; then
   ( cd usr/share/fonts/misc
-    if ! grep -q ^Dina_ fonts.alias 2>/dev/null; then
+    if ! grep -q '^Dina_\([689]\|10\) ' fonts.alias 2>/dev/null; then
       echo 'Dina_6 -windows-dina-medium-r-normal--8-60-96-96-c-60-microsoft-cp1252' >> fonts.alias
       echo 'Dina_8 -windows-dina-medium-r-normal--10-80-96-96-c-70-microsoft-cp1252' >> fonts.alias
       echo 'Dina_9 -windows-dina-medium-r-normal--12-90-96-96-c-70-microsoft-cp1252' >> fonts.alias
@@ -10,6 +10,9 @@ if [ -x /usr/bin/mkfontdir ]; then
     mkfontdir .
   )
 fi
+
+[ "$DISPLAY" != "" ] && xset fp rehash 2>/dev/null
+
 if [ -x usr/bin/fc-cache ]; then
   usr/bin/fc-cache -f
 fi
diff --git a/system/dina-font/douninst.sh b/system/dina-font/douninst.sh
new file mode 100644
index 0000000000..f1bc56ae86
--- /dev/null
+++ b/system/dina-font/douninst.sh
@@ -0,0 +1,14 @@
+if [ -x /usr/bin/mkfontdir ]; then
+  ( cd usr/share/fonts/misc
+    grep -v '^Dina_\([689]\|10\) ' fonts.alias > fonts.alias.new
+    mv fonts.alias.new fonts.alias
+    mkfontscale .
+    mkfontdir .
+  )
+fi
+
+[ "$DISPLAY" != "" ] && xset fp rehash 2>/dev/null
+
+if [ -x usr/bin/fc-cache ]; then
+  usr/bin/fc-cache -f
+fi