terminus-font: => 4.28 + clean up

7 files changed, 33 insertions, 32 deletions

diff --git a/fonts/terminus-font/BUILD b/fonts/terminus-font/BUILD
index 55bed37ab2..aa0b28e5d4 100755
--- a/fonts/terminus-font/BUILD
+++ b/fonts/terminus-font/BUILD
@@ -1,6 +1,7 @@
-./configure --prefix=/usr \
-            --psfdir=${INSTALL_ROOT}/usr/share/consolefonts \
-            --acmdir=${INSTALL_ROOT}/usr/share/consoletrans \
-            --unidir=${INSTALL_ROOT}/usr/share/consoletrans \
-            --x11dir=${INSTALL_ROOT}/usr/share/fonts/misc  &&
+./configure --prefix="$INSTALL_ROOT/usr" \
+            --psfdir="$INSTALL_ROOT/usr/share/consolefonts" \
+            --acmdir="$INSTALL_ROOT/usr/share/consoletrans" \
+            --unidir="$INSTALL_ROOT/usr/share/consoletrans" \
+            --x11dir="$INSTALL_ROOT/usr/share/fonts/misc" &&
+
 make psf txt pcf
diff --git a/fonts/terminus-font/DEPENDS b/fonts/terminus-font/DEPENDS
index 51e917e048..06ae8bd3e3 100755
--- a/fonts/terminus-font/DEPENDS
+++ b/fonts/terminus-font/DEPENDS
@@ -1,11 +1,5 @@
 depends gawk &&
 depends perl &&
-
-. $GRIMOIRE/FUNCTIONS &&
-
-if check_if_xorg_modular_libs
-then
-  depends bdftopcf
-fi &&
+depends bdftopcf &&
 
 . $SECTION_DIRECTORY/X11_DEPENDS
diff --git a/fonts/terminus-font/DETAILS b/fonts/terminus-font/DETAILS
index d766092910..a1934949f6 100755
--- a/fonts/terminus-font/DETAILS
+++ b/fonts/terminus-font/DETAILS
@@ -1,26 +1,25 @@
            SPELL=terminus-font
-         VERSION=4.26
+         VERSION=4.28
           SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=http://www.is-vn.bg/hamster/$SOURCE
-     SOURCE_HASH=sha512:1f78d56cabfeca5436d49e66eb46fd17cc6a10485785604b4ee572bb1d8d96159d1ec41c3088e5d8f80e57970ffcfd68dc14876c78a79da8152b61fe08ae5fd7
-        WEB_SITE=http://www.is-vn.bg/hamster/jimmy-en.html
+     SOURCE_HASH=sha512:7c0940a98daaacd1cbd657db1fa14f18fa0c21882ad1ca238c8f0ea00bc2766181107aec1c3a424ff9138259e5f68f954da3e69e10f58dbb3455b471a0f3e1a6
+        WEB_SITE=http://www.is-vn.bg/hamster/
          ENTERED=20050720
       LICENSE[0]=GPL
         KEYWORDS="fonts x11 libs"
-           SHORT="a clean fixed width font"
+           SHORT="clean fixed width font"
 cat << EOF
-Terminus Font is designed for long (8 and more hours per day) work
-with computers. Version 4.14 contains 603 characters, covering code
-pages ISO8859-1/2/5/9/13/15/16, Windows-1250/1251/1252/1254/1257,
-IBM-437/852/855/866, KOI8-R/U/E/F, Bulgarian-MIK, Paratype-PT154/PT254,
-Macintosh-Ukrainian and Esperanto, and also the vt100 and xterm 
-pseudographic characters.
+Terminus Font is designed for long (8 and more hours per day) work with
+computers. Version 4.28 contains 825 characters, covers about 120 language sets
+and supports ISO8859-1/2/5/7/9/13/15/16, Paratype-PT154/PT254, KOI8-R/U/E/F,
+Esperanto, many IBM, Windows and Macintosh code pages, as well as the IBM VGA,
+vt100 and xterm pseudographic characters.
 
-The sizes present are 6x12, 8x14, 8x16, 10x20, 12x24, 14x28 and 16x32.
-The styles are normal and bold (except for 6x12), plus EGA/VGA-bold for
-8x14 and 8x16.
+The sizes present are 6x12, 8x14, 8x16, 10x20, 12x24, 14x28 and 16x32. The
+styles are normal and bold (except for 6x12), plus EGA/VGA-bold for 8x14 and
+8x16.
 
-Compilation and installation on Linux console, BSD console (not tested)
-and X11 Window System are supported.
+Compilation and installation on Linux console, BSD console (not tested) and
+X11 Window System are supported.
 EOF
diff --git a/fonts/terminus-font/FINAL b/fonts/terminus-font/FINAL
index 4ff489d6e6..d307d24516 100755
--- a/fonts/terminus-font/FINAL
+++ b/fonts/terminus-font/FINAL
@@ -1 +1 @@
-source  $SECTION_DIRECTORY/X11_FINAL
+. $SECTION_DIRECTORY/X11_FINAL
diff --git a/fonts/terminus-font/HISTORY b/fonts/terminus-font/HISTORY
index 169b4347f8..9fd80d5c52 100644
--- a/fonts/terminus-font/HISTORY
+++ b/fonts/terminus-font/HISTORY
@@ -1,3 +1,8 @@
+2008-09-24 Vlad Glagolev <stealth@sourcemage.org>
+	* DETAILS: updated spell to 4.28; fixed WEB_SITE; quoting paths
+	* DEPENDS: fixed dep -- bdftopcf (required anyway); cleaned up
+	* BUILD: quoting paths; cleaned up
+
 2008-05-18 Vlad Glagolev <stealth@sourcemage.org>
 	* DETAILS: updated spell to 4.26
 	* BUILD, DEPENDS: fixed identation, added FUNCTION's sourcing
diff --git a/fonts/terminus-font/INSTALL b/fonts/terminus-font/INSTALL
index c2d02475f6..573a25e5c0 100755
--- a/fonts/terminus-font/INSTALL
+++ b/fonts/terminus-font/INSTALL
@@ -1,2 +1,4 @@
-make DESTDIR=${INSTALL_ROOT} \
-	     install-psf install-acm install-ref install-pcf
+make DESTDIR="$INSTALL_ROOT" install-psf \
+                             install-acm \
+                             install-ref \
+                             install-pcf
diff --git a/fonts/terminus-font/POST_REMOVE b/fonts/terminus-font/POST_REMOVE
index 368b620825..2284fce37d 100755
--- a/fonts/terminus-font/POST_REMOVE
+++ b/fonts/terminus-font/POST_REMOVE
@@ -1 +1 @@
-source  $SECTION_DIRECTORY/X11_POST_REMOVE
+. $SECTION_DIRECTORY/X11_POST_REMOVE