Update Terminus font to version 4.36

From Bug Hunting in PR pkg/45761


Changes since version 4.28:

Version 4.36:

    * Removed the rarely used cm2 variant.
    * Added new ll2 variant with more distinctive l.
    * Added quotereversed (201B), quotedblreversed (201F), I/i/U/u dotbelow
      (1ECA, 1ECB, 1EE4, 1EE5).
    * Moved all quotes and alike in size 32 one line down.
    * Small fixes and improvements (t commaaccent, quotes alignment etc. in
      some sizes).
    * Windows installation: creates the relevant registry key.

Version 4.35:

    * Added hi2 variant for size 18.
    * Fixes in size 18: normal V, normal W, bold X, H stroke, some
      pseudographic characters and the *NIX installation.

Version 4.34:

    * Added size 10x18.
    * Small fixes and improvements in section, multiply, Eng/eng, Dje,
      dje, house, male, zeta and various characters in the different sizes.
    * The default cyrillic ghe is now ge1, with ge2 available as an option.

Version 4.32:

    * Slightly more distintive normal M and W.
    * Rounded 28-bold, 32-normal, 32-bold.
      Also removed the 32-normal kx2 style.
    * Small changes: Che/che stroke, phi, Zhe/zhe etc.
    * Linux console: the default bold is now framebuffer.
    * Smaller Makefile, GNU make required.
    * Changed the font license to SIL OFL 1.1.
      It's FSF approved, no need to worry.
    * And, as you can see, Terminus Font is now on sourceforge.

Version 4.30:

    * Added size 22 (not very good).
    * Added another 25 characters.
    * Various small fixes and improvements.
    * Changed the default prefix and x11dir.

4 files changed, 71 insertions, 18 deletions

diff --git a/fonts/terminus-font/DESCR b/fonts/terminus-font/DESCR
index 9e05833969e..e6e13554223 100644
--- a/fonts/terminus-font/DESCR
+++ b/fonts/terminus-font/DESCR
@@ -1,9 +1,9 @@
-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.
+Terminus Font is a clean, fixed width bitmap font, designed for long (8 and
+more hours per day) work with computers. Version 4.36 contains 856 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, 10x18, 10x20, 11x22, 12x24, 14x28
+and 16x32. The styles are normal and bold (except for 6x12), plus EGA/VGA-bold
+for 8x14 and 8x16.
diff --git a/fonts/terminus-font/Makefile b/fonts/terminus-font/Makefile
index 1e98611dee6..caa7d547346 100644
--- a/fonts/terminus-font/Makefile
+++ b/fonts/terminus-font/Makefile
@@ -1,17 +1,18 @@
-# $NetBSD: Makefile,v 1.7 2008/11/09 22:48:59 bjs Exp $
+# $NetBSD: Makefile,v 1.8 2012/02/02 21:17:40 asau Exp $
 #
 
-DISTNAME=		terminus-font-4.28
+DISTNAME=		terminus-font-4.36
 CATEGORIES=		fonts
-MASTER_SITES=		http://www.is-vn.bg/hamster/
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=terminus-font/}
 
 MAINTAINER=		j+pkgsrc@salmi.ch
-HOMEPAGE=		http://www.is-vn.bg/hamster/jimmy-en.html
+HOMEPAGE=		http://terminus-font.sourceforge.net/
 COMMENT=		Clean, fixed-width font
+LICENSE=		open-font-license
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-USE_TOOLS+=		perl bdftopcf gzip
+USE_TOOLS+=		bdftopcf gmake gzip perl
 
 HAS_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--x11dir=${PREFIX}/lib/X11/fonts/misc
diff --git a/fonts/terminus-font/PLIST b/fonts/terminus-font/PLIST
index e9513a7a30b..3de10e31c7b 100644
--- a/fonts/terminus-font/PLIST
+++ b/fonts/terminus-font/PLIST
@@ -1,12 +1,16 @@
-@comment $NetBSD: PLIST,v 1.2 2008/08/19 09:52:01 bjs Exp $
+@comment $NetBSD: PLIST,v 1.3 2012/02/02 21:17:40 asau Exp $
 lib/X11/fonts/misc/ter-112b.pcf.gz
 lib/X11/fonts/misc/ter-112n.pcf.gz
 lib/X11/fonts/misc/ter-114b.pcf.gz
 lib/X11/fonts/misc/ter-114n.pcf.gz
 lib/X11/fonts/misc/ter-116b.pcf.gz
 lib/X11/fonts/misc/ter-116n.pcf.gz
+lib/X11/fonts/misc/ter-118b.pcf.gz
+lib/X11/fonts/misc/ter-118n.pcf.gz
 lib/X11/fonts/misc/ter-120b.pcf.gz
 lib/X11/fonts/misc/ter-120n.pcf.gz
+lib/X11/fonts/misc/ter-122b.pcf.gz
+lib/X11/fonts/misc/ter-122n.pcf.gz
 lib/X11/fonts/misc/ter-124b.pcf.gz
 lib/X11/fonts/misc/ter-124n.pcf.gz
 lib/X11/fonts/misc/ter-128b.pcf.gz
@@ -19,8 +23,12 @@ lib/X11/fonts/misc/ter-214b.pcf.gz
 lib/X11/fonts/misc/ter-214n.pcf.gz
 lib/X11/fonts/misc/ter-216b.pcf.gz
 lib/X11/fonts/misc/ter-216n.pcf.gz
+lib/X11/fonts/misc/ter-218b.pcf.gz
+lib/X11/fonts/misc/ter-218n.pcf.gz
 lib/X11/fonts/misc/ter-220b.pcf.gz
 lib/X11/fonts/misc/ter-220n.pcf.gz
+lib/X11/fonts/misc/ter-222b.pcf.gz
+lib/X11/fonts/misc/ter-222n.pcf.gz
 lib/X11/fonts/misc/ter-224b.pcf.gz
 lib/X11/fonts/misc/ter-224n.pcf.gz
 lib/X11/fonts/misc/ter-228b.pcf.gz
@@ -33,8 +41,12 @@ lib/X11/fonts/misc/ter-514b.pcf.gz
 lib/X11/fonts/misc/ter-514n.pcf.gz
 lib/X11/fonts/misc/ter-516b.pcf.gz
 lib/X11/fonts/misc/ter-516n.pcf.gz
+lib/X11/fonts/misc/ter-518b.pcf.gz
+lib/X11/fonts/misc/ter-518n.pcf.gz
 lib/X11/fonts/misc/ter-520b.pcf.gz
 lib/X11/fonts/misc/ter-520n.pcf.gz
+lib/X11/fonts/misc/ter-522b.pcf.gz
+lib/X11/fonts/misc/ter-522n.pcf.gz
 lib/X11/fonts/misc/ter-524b.pcf.gz
 lib/X11/fonts/misc/ter-524n.pcf.gz
 lib/X11/fonts/misc/ter-528b.pcf.gz
@@ -47,8 +59,12 @@ lib/X11/fonts/misc/ter-714b.pcf.gz
 lib/X11/fonts/misc/ter-714n.pcf.gz
 lib/X11/fonts/misc/ter-716b.pcf.gz
 lib/X11/fonts/misc/ter-716n.pcf.gz
+lib/X11/fonts/misc/ter-718b.pcf.gz
+lib/X11/fonts/misc/ter-718n.pcf.gz
 lib/X11/fonts/misc/ter-720b.pcf.gz
 lib/X11/fonts/misc/ter-720n.pcf.gz
+lib/X11/fonts/misc/ter-722b.pcf.gz
+lib/X11/fonts/misc/ter-722n.pcf.gz
 lib/X11/fonts/misc/ter-724b.pcf.gz
 lib/X11/fonts/misc/ter-724n.pcf.gz
 lib/X11/fonts/misc/ter-728b.pcf.gz
@@ -61,8 +77,12 @@ lib/X11/fonts/misc/ter-914b.pcf.gz
 lib/X11/fonts/misc/ter-914n.pcf.gz
 lib/X11/fonts/misc/ter-916b.pcf.gz
 lib/X11/fonts/misc/ter-916n.pcf.gz
+lib/X11/fonts/misc/ter-918b.pcf.gz
+lib/X11/fonts/misc/ter-918n.pcf.gz
 lib/X11/fonts/misc/ter-920b.pcf.gz
 lib/X11/fonts/misc/ter-920n.pcf.gz
+lib/X11/fonts/misc/ter-922b.pcf.gz
+lib/X11/fonts/misc/ter-922n.pcf.gz
 lib/X11/fonts/misc/ter-924b.pcf.gz
 lib/X11/fonts/misc/ter-924n.pcf.gz
 lib/X11/fonts/misc/ter-928b.pcf.gz
@@ -75,8 +95,12 @@ lib/X11/fonts/misc/ter-c14b.pcf.gz
 lib/X11/fonts/misc/ter-c14n.pcf.gz
 lib/X11/fonts/misc/ter-c16b.pcf.gz
 lib/X11/fonts/misc/ter-c16n.pcf.gz
+lib/X11/fonts/misc/ter-c18b.pcf.gz
+lib/X11/fonts/misc/ter-c18n.pcf.gz
 lib/X11/fonts/misc/ter-c20b.pcf.gz
 lib/X11/fonts/misc/ter-c20n.pcf.gz
+lib/X11/fonts/misc/ter-c22b.pcf.gz
+lib/X11/fonts/misc/ter-c22n.pcf.gz
 lib/X11/fonts/misc/ter-c24b.pcf.gz
 lib/X11/fonts/misc/ter-c24n.pcf.gz
 lib/X11/fonts/misc/ter-c28b.pcf.gz
@@ -89,8 +113,12 @@ lib/X11/fonts/misc/ter-d14b.pcf.gz
 lib/X11/fonts/misc/ter-d14n.pcf.gz
 lib/X11/fonts/misc/ter-d16b.pcf.gz
 lib/X11/fonts/misc/ter-d16n.pcf.gz
+lib/X11/fonts/misc/ter-d18b.pcf.gz
+lib/X11/fonts/misc/ter-d18n.pcf.gz
 lib/X11/fonts/misc/ter-d20b.pcf.gz
 lib/X11/fonts/misc/ter-d20n.pcf.gz
+lib/X11/fonts/misc/ter-d22b.pcf.gz
+lib/X11/fonts/misc/ter-d22n.pcf.gz
 lib/X11/fonts/misc/ter-d24b.pcf.gz
 lib/X11/fonts/misc/ter-d24n.pcf.gz
 lib/X11/fonts/misc/ter-d28b.pcf.gz
@@ -103,8 +131,12 @@ lib/X11/fonts/misc/ter-f14b.pcf.gz
 lib/X11/fonts/misc/ter-f14n.pcf.gz
 lib/X11/fonts/misc/ter-f16b.pcf.gz
 lib/X11/fonts/misc/ter-f16n.pcf.gz
+lib/X11/fonts/misc/ter-f18b.pcf.gz
+lib/X11/fonts/misc/ter-f18n.pcf.gz
 lib/X11/fonts/misc/ter-f20b.pcf.gz
 lib/X11/fonts/misc/ter-f20n.pcf.gz
+lib/X11/fonts/misc/ter-f22b.pcf.gz
+lib/X11/fonts/misc/ter-f22n.pcf.gz
 lib/X11/fonts/misc/ter-f24b.pcf.gz
 lib/X11/fonts/misc/ter-f24n.pcf.gz
 lib/X11/fonts/misc/ter-f28b.pcf.gz
@@ -117,8 +149,12 @@ lib/X11/fonts/misc/ter-g14b.pcf.gz
 lib/X11/fonts/misc/ter-g14n.pcf.gz
 lib/X11/fonts/misc/ter-g16b.pcf.gz
 lib/X11/fonts/misc/ter-g16n.pcf.gz
+lib/X11/fonts/misc/ter-g18b.pcf.gz
+lib/X11/fonts/misc/ter-g18n.pcf.gz
 lib/X11/fonts/misc/ter-g20b.pcf.gz
 lib/X11/fonts/misc/ter-g20n.pcf.gz
+lib/X11/fonts/misc/ter-g22b.pcf.gz
+lib/X11/fonts/misc/ter-g22n.pcf.gz
 lib/X11/fonts/misc/ter-g24b.pcf.gz
 lib/X11/fonts/misc/ter-g24n.pcf.gz
 lib/X11/fonts/misc/ter-g28b.pcf.gz
@@ -131,8 +167,12 @@ lib/X11/fonts/misc/ter-k14b.pcf.gz
 lib/X11/fonts/misc/ter-k14n.pcf.gz
 lib/X11/fonts/misc/ter-k16b.pcf.gz
 lib/X11/fonts/misc/ter-k16n.pcf.gz
+lib/X11/fonts/misc/ter-k18b.pcf.gz
+lib/X11/fonts/misc/ter-k18n.pcf.gz
 lib/X11/fonts/misc/ter-k20b.pcf.gz
 lib/X11/fonts/misc/ter-k20n.pcf.gz
+lib/X11/fonts/misc/ter-k22b.pcf.gz
+lib/X11/fonts/misc/ter-k22n.pcf.gz
 lib/X11/fonts/misc/ter-k24b.pcf.gz
 lib/X11/fonts/misc/ter-k24n.pcf.gz
 lib/X11/fonts/misc/ter-k28b.pcf.gz
@@ -145,8 +185,12 @@ lib/X11/fonts/misc/ter-p14b.pcf.gz
 lib/X11/fonts/misc/ter-p14n.pcf.gz
 lib/X11/fonts/misc/ter-p16b.pcf.gz
 lib/X11/fonts/misc/ter-p16n.pcf.gz
+lib/X11/fonts/misc/ter-p18b.pcf.gz
+lib/X11/fonts/misc/ter-p18n.pcf.gz
 lib/X11/fonts/misc/ter-p20b.pcf.gz
 lib/X11/fonts/misc/ter-p20n.pcf.gz
+lib/X11/fonts/misc/ter-p22b.pcf.gz
+lib/X11/fonts/misc/ter-p22n.pcf.gz
 lib/X11/fonts/misc/ter-p24b.pcf.gz
 lib/X11/fonts/misc/ter-p24n.pcf.gz
 lib/X11/fonts/misc/ter-p28b.pcf.gz
@@ -159,8 +203,12 @@ lib/X11/fonts/misc/ter-u14b.pcf.gz
 lib/X11/fonts/misc/ter-u14n.pcf.gz
 lib/X11/fonts/misc/ter-u16b.pcf.gz
 lib/X11/fonts/misc/ter-u16n.pcf.gz
+lib/X11/fonts/misc/ter-u18b.pcf.gz
+lib/X11/fonts/misc/ter-u18n.pcf.gz
 lib/X11/fonts/misc/ter-u20b.pcf.gz
 lib/X11/fonts/misc/ter-u20n.pcf.gz
+lib/X11/fonts/misc/ter-u22b.pcf.gz
+lib/X11/fonts/misc/ter-u22n.pcf.gz
 lib/X11/fonts/misc/ter-u24b.pcf.gz
 lib/X11/fonts/misc/ter-u24n.pcf.gz
 lib/X11/fonts/misc/ter-u28b.pcf.gz
@@ -173,8 +221,12 @@ lib/X11/fonts/misc/ter-x14b.pcf.gz
 lib/X11/fonts/misc/ter-x14n.pcf.gz
 lib/X11/fonts/misc/ter-x16b.pcf.gz
 lib/X11/fonts/misc/ter-x16n.pcf.gz
+lib/X11/fonts/misc/ter-x18b.pcf.gz
+lib/X11/fonts/misc/ter-x18n.pcf.gz
 lib/X11/fonts/misc/ter-x20b.pcf.gz
 lib/X11/fonts/misc/ter-x20n.pcf.gz
+lib/X11/fonts/misc/ter-x22b.pcf.gz
+lib/X11/fonts/misc/ter-x22n.pcf.gz
 lib/X11/fonts/misc/ter-x24b.pcf.gz
 lib/X11/fonts/misc/ter-x24n.pcf.gz
 lib/X11/fonts/misc/ter-x28b.pcf.gz
diff --git a/fonts/terminus-font/distinfo b/fonts/terminus-font/distinfo
index 66abe436b45..6631c9aaa3d 100644
--- a/fonts/terminus-font/distinfo
+++ b/fonts/terminus-font/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2008/11/09 22:48:59 bjs Exp $
+$NetBSD: distinfo,v 1.5 2012/02/02 21:17:40 asau Exp $
 
-SHA1 (terminus-font-4.28.tar.gz) = 5134a39dd6f50f07e77d20e0718fe8cd00cc16b4
-RMD160 (terminus-font-4.28.tar.gz) = 79bc8e60c660cf166825974dd76e5a3772131ac4
-Size (terminus-font-4.28.tar.gz) = 229336 bytes
+SHA1 (terminus-font-4.36.tar.gz) = bbd839f8d21f4bcbf2c6d98aa1b5842bddc675c0
+RMD160 (terminus-font-4.36.tar.gz) = a10138462e6aa7cf2b6a3f7960b72b1703fa5f7d
+Size (terminus-font-4.36.tar.gz) = 309387 bytes