4 files changed, 50 insertions, 19 deletions
diff --git a/system/dina-font/README b/system/dina-font/README
index 2457aa760f680..db843e934a3fd 100644
--- a/system/dina-font/README
+++ b/system/dina-font/README
@@ -15,5 +15,6 @@ 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.
 
-Both the X11 and console fonts use the Windows-1252 character set
-(compatible with Latin-1).
+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.
diff --git a/system/dina-font/dina-font.SlackBuild b/system/dina-font/dina-font.SlackBuild
index ab336b3551b48..f3aa6aef87b14 100644
--- a/system/dina-font/dina-font.SlackBuild
+++ b/system/dina-font/dina-font.SlackBuild
@@ -6,7 +6,7 @@
 # Formerly maintained by Ryan P.C. McQuen <email removed>.
 # Now maintained by B. Watson <yalhcru@gmail.com>.
 
-# Copyright 2010  Binh Nguyen <binhvng@gmail.com>
+# Copyright 2010  Binh Nguyen <email removed>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,6 +26,13 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20180117 bkw:
+# - update for v2.93, BUILD=1
+# - original site has gone away, use gentoo distfiles for download and
+#   wayback machine for homepage.
+# - add new codepage 437 and 850 fonts in OEM/, as psf fonts.
+# - remove homepage from slack-desc, as it's defunct.
+
 # 20170326 bkw:
 # - take over maintenance.
 # - get rid of spurious 'mkdir -p $CWD/Dina-PCF'.
@@ -42,8 +49,8 @@
 # - BUILD=2
 
 PRGNAM=dina-font
-VERSION=${VERSION:-2.92}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-2.93}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 ARCH=noarch
@@ -53,17 +60,17 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-SRCNAM=Dina
-
 set -e
 
+SRCNAM=dina
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 mkdir -p $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
-unzip $CWD/$SRCNAM.zip
+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 \
@@ -87,14 +94,37 @@ done
 if which fnt2psf 2>/dev/null; then
   echo "=== psftools found, creating console fonts"
   ANDCONSOLE="and console "
-  mkdir -p $PKG/usr/share/kbd/consolefonts
-  fon2fnts DinaR.fon
+  PSFDIR=$PKG/usr/share/kbd/consolefonts
+  mkdir -p $PSFDIR
+
+  fon2fnts DinaR.fon           # e.g. Dina_10.fnt
+  fon2fnts OEM/DinaT437.fon    # e.g. DinaTerm_10.fnt
+  fon2fnts OEM/DinaT850.fon    # e.g. DinaTerm_10_1.fnt
+
   for i in 6 8 9 10; do
-    fnt2psf --codepage=1252 \
-            Dina_$i.fnt \
-            $PKG/usr/share/kbd/consolefonts/Dina_$i.psf
+    [ -e Dina_$i.fnt ] && \
+       fnt2psf --codepage=1252 \
+         Dina_$i.fnt \
+         $PSFDIR/Dina_$i-1252.psf
+
+    [ -e DinaTerm_$i.fnt ] && \
+       fnt2psf --codepage=437 \
+         DinaTerm_$i.fnt \
+         $PSFDIR/Dina_$i-437.psf
+
+    [ -e DinaTerm_${i}_1.fnt ] && \
+       fnt2psf --codepage=850 \
+         DinaTerm_${i}_1.fnt \
+         $PSFDIR/Dina_$i-850.psf
   done
-  gzip -9 $PKG/usr/share/kbd/consolefonts/*.psf
+  gzip -9 $PSFDIR/*.psf
+
+  # symlinks for compatibility with old rc.font, after upgrading.
+  ( cd $PSFDIR
+    for i in Dina_*-1252.psf.gz; do
+      ln -s $i "$( echo $i | sed 's,-1252,,' )"
+    done
+    cd - )
 else
   echo "=== psftools missing, NOT creating console fonts"
   ONLY=" only"
diff --git a/system/dina-font/dina-font.info b/system/dina-font/dina-font.info
index 983a13c747246..7eb5a04848850 100644
--- a/system/dina-font/dina-font.info
+++ b/system/dina-font/dina-font.info
@@ -1,8 +1,8 @@
 PRGNAM="dina-font"
-VERSION="2.92"
-HOMEPAGE="http://www.donationcoder.com/Software/Jibz/Dina/index.html"
-DOWNLOAD="https://www.donationcoder.com/Software/Jibz/Dina/downloads/Dina.zip"
-MD5SUM="028424baac750e9fd0f54df03202e5d0"
+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"
+MD5SUM="04cf107a6bbc54011c03b34ef296bbae"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/system/dina-font/slack-desc b/system/dina-font/slack-desc
index ed902815b04ce..59ba01fd39ab1 100644
--- a/system/dina-font/slack-desc
+++ b/system/dina-font/slack-desc
@@ -15,5 +15,5 @@ dina-font:
 dina-font: This package includes X11 @ANDCONSOLE@fonts@ONLY@.
 dina-font:
 dina-font:
-dina-font: Homepage: http://www.donationcoder.com/Software/Jibz/Dina/index.html
+dina-font:
 dina-font: