terminus-font: Update to 4.47

Version 4.47:

    Added 35 new characters (33 glyphs).
    Replaced ao2-variant "ae" with ao1 "ae", it was too similar to "oe".
    Some fixes and improvements (17 characters in various sizes/styles).
    Significantly improved the font build scripts. Python 3.5.0 or node 6.9.0 are now required to build the font.

Version 4.46:

    The X11 8-bit code pages are not installed by default.
    Added IBM-437 8-bit code page for X11.
    The CRT VGA weight for Linux console is not installed by default.
    Removed the Linux console mapping files.
    These should be provided by the console packages.
    Removed the BSD console installation.
    The recent BSD-s have a new console subsystem.
    Added 50 new characters. Mostly math, but also Buglarian yat and yus.
    Rewritten the font conversion tools in python/javascript.
    The full unicode range (17x64K) is now supported.
    The Windows installer can be built from sources.
    Small fixes and improvements (7 characters in various sizes).
    Renamed install-ref to install-psf-ref (uninstall too).

3 files changed, 14 insertions, 225 deletions

diff --git a/fonts/terminus-font/Makefile b/fonts/terminus-font/Makefile
index 917d6c894c6..52c6315c647 100644
--- a/fonts/terminus-font/Makefile
+++ b/fonts/terminus-font/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.20 2018/08/22 09:45:07 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2019/06/20 11:41:28 nia Exp $
 
-DISTNAME=		terminus-font-4.40
-PKGREVISION=		1
+DISTNAME=		terminus-font-4.47
 CATEGORIES=		fonts
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=terminus-font/}
 
@@ -20,8 +19,13 @@ INSTALL_TARGET=		install-pcf
 FONTS_DIRS.x11=		${PREFIX}/share/fonts/X11/misc
 REQD_DIRS+=		${PREFIX}/share/fonts/X11/misc
 
+PYTHON_FOR_BUILD_ONLY=		yes
+PYTHON_VERSIONS_INCOMPATIBLE=	27
+
 USE_LANGUAGES=		# none
 
+MAKE_FLAGS+=	INT=${PYTHONBIN}
+
 EGDIR=		${PREFIX}/share/examples/terminus-font
 
 DOCDIR=		${PREFIX}/share/doc/terminus-font
@@ -40,4 +44,5 @@ post-install:
 	${INSTALL_DATA} ${DOCFILES} ${DESTDIR}${DOCDIR}; \
 	${INSTALL_DATA} 75-yes-terminus.conf ${DESTDIR}${EGDIR}
 
+.include "../../lang/python/pyversion.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/terminus-font/PLIST b/fonts/terminus-font/PLIST
index ed50bb3fb62..78597276fac 100644
--- a/fonts/terminus-font/PLIST
+++ b/fonts/terminus-font/PLIST
@@ -1,226 +1,10 @@
-@comment $NetBSD: PLIST,v 1.6 2018/01/01 22:29:33 rillig Exp $
+@comment $NetBSD: PLIST,v 1.7 2019/06/20 11:41:28 nia Exp $
 share/doc/terminus-font/AUTHORS
 share/doc/terminus-font/CHANGES
 share/doc/terminus-font/OFL.TXT
 share/doc/terminus-font/README
 share/doc/terminus-font/README-BG
 share/examples/terminus-font/75-yes-terminus.conf
-share/fonts/X11/misc/ter-112b.pcf.gz
-share/fonts/X11/misc/ter-112n.pcf.gz
-share/fonts/X11/misc/ter-114b.pcf.gz
-share/fonts/X11/misc/ter-114n.pcf.gz
-share/fonts/X11/misc/ter-116b.pcf.gz
-share/fonts/X11/misc/ter-116n.pcf.gz
-share/fonts/X11/misc/ter-118b.pcf.gz
-share/fonts/X11/misc/ter-118n.pcf.gz
-share/fonts/X11/misc/ter-120b.pcf.gz
-share/fonts/X11/misc/ter-120n.pcf.gz
-share/fonts/X11/misc/ter-122b.pcf.gz
-share/fonts/X11/misc/ter-122n.pcf.gz
-share/fonts/X11/misc/ter-124b.pcf.gz
-share/fonts/X11/misc/ter-124n.pcf.gz
-share/fonts/X11/misc/ter-128b.pcf.gz
-share/fonts/X11/misc/ter-128n.pcf.gz
-share/fonts/X11/misc/ter-132b.pcf.gz
-share/fonts/X11/misc/ter-132n.pcf.gz
-share/fonts/X11/misc/ter-212b.pcf.gz
-share/fonts/X11/misc/ter-212n.pcf.gz
-share/fonts/X11/misc/ter-214b.pcf.gz
-share/fonts/X11/misc/ter-214n.pcf.gz
-share/fonts/X11/misc/ter-216b.pcf.gz
-share/fonts/X11/misc/ter-216n.pcf.gz
-share/fonts/X11/misc/ter-218b.pcf.gz
-share/fonts/X11/misc/ter-218n.pcf.gz
-share/fonts/X11/misc/ter-220b.pcf.gz
-share/fonts/X11/misc/ter-220n.pcf.gz
-share/fonts/X11/misc/ter-222b.pcf.gz
-share/fonts/X11/misc/ter-222n.pcf.gz
-share/fonts/X11/misc/ter-224b.pcf.gz
-share/fonts/X11/misc/ter-224n.pcf.gz
-share/fonts/X11/misc/ter-228b.pcf.gz
-share/fonts/X11/misc/ter-228n.pcf.gz
-share/fonts/X11/misc/ter-232b.pcf.gz
-share/fonts/X11/misc/ter-232n.pcf.gz
-share/fonts/X11/misc/ter-512b.pcf.gz
-share/fonts/X11/misc/ter-512n.pcf.gz
-share/fonts/X11/misc/ter-514b.pcf.gz
-share/fonts/X11/misc/ter-514n.pcf.gz
-share/fonts/X11/misc/ter-516b.pcf.gz
-share/fonts/X11/misc/ter-516n.pcf.gz
-share/fonts/X11/misc/ter-518b.pcf.gz
-share/fonts/X11/misc/ter-518n.pcf.gz
-share/fonts/X11/misc/ter-520b.pcf.gz
-share/fonts/X11/misc/ter-520n.pcf.gz
-share/fonts/X11/misc/ter-522b.pcf.gz
-share/fonts/X11/misc/ter-522n.pcf.gz
-share/fonts/X11/misc/ter-524b.pcf.gz
-share/fonts/X11/misc/ter-524n.pcf.gz
-share/fonts/X11/misc/ter-528b.pcf.gz
-share/fonts/X11/misc/ter-528n.pcf.gz
-share/fonts/X11/misc/ter-532b.pcf.gz
-share/fonts/X11/misc/ter-532n.pcf.gz
-share/fonts/X11/misc/ter-712b.pcf.gz
-share/fonts/X11/misc/ter-712n.pcf.gz
-share/fonts/X11/misc/ter-714b.pcf.gz
-share/fonts/X11/misc/ter-714n.pcf.gz
-share/fonts/X11/misc/ter-716b.pcf.gz
-share/fonts/X11/misc/ter-716n.pcf.gz
-share/fonts/X11/misc/ter-718b.pcf.gz
-share/fonts/X11/misc/ter-718n.pcf.gz
-share/fonts/X11/misc/ter-720b.pcf.gz
-share/fonts/X11/misc/ter-720n.pcf.gz
-share/fonts/X11/misc/ter-722b.pcf.gz
-share/fonts/X11/misc/ter-722n.pcf.gz
-share/fonts/X11/misc/ter-724b.pcf.gz
-share/fonts/X11/misc/ter-724n.pcf.gz
-share/fonts/X11/misc/ter-728b.pcf.gz
-share/fonts/X11/misc/ter-728n.pcf.gz
-share/fonts/X11/misc/ter-732b.pcf.gz
-share/fonts/X11/misc/ter-732n.pcf.gz
-share/fonts/X11/misc/ter-912b.pcf.gz
-share/fonts/X11/misc/ter-912n.pcf.gz
-share/fonts/X11/misc/ter-914b.pcf.gz
-share/fonts/X11/misc/ter-914n.pcf.gz
-share/fonts/X11/misc/ter-916b.pcf.gz
-share/fonts/X11/misc/ter-916n.pcf.gz
-share/fonts/X11/misc/ter-918b.pcf.gz
-share/fonts/X11/misc/ter-918n.pcf.gz
-share/fonts/X11/misc/ter-920b.pcf.gz
-share/fonts/X11/misc/ter-920n.pcf.gz
-share/fonts/X11/misc/ter-922b.pcf.gz
-share/fonts/X11/misc/ter-922n.pcf.gz
-share/fonts/X11/misc/ter-924b.pcf.gz
-share/fonts/X11/misc/ter-924n.pcf.gz
-share/fonts/X11/misc/ter-928b.pcf.gz
-share/fonts/X11/misc/ter-928n.pcf.gz
-share/fonts/X11/misc/ter-932b.pcf.gz
-share/fonts/X11/misc/ter-932n.pcf.gz
-share/fonts/X11/misc/ter-c12b.pcf.gz
-share/fonts/X11/misc/ter-c12n.pcf.gz
-share/fonts/X11/misc/ter-c14b.pcf.gz
-share/fonts/X11/misc/ter-c14n.pcf.gz
-share/fonts/X11/misc/ter-c16b.pcf.gz
-share/fonts/X11/misc/ter-c16n.pcf.gz
-share/fonts/X11/misc/ter-c18b.pcf.gz
-share/fonts/X11/misc/ter-c18n.pcf.gz
-share/fonts/X11/misc/ter-c20b.pcf.gz
-share/fonts/X11/misc/ter-c20n.pcf.gz
-share/fonts/X11/misc/ter-c22b.pcf.gz
-share/fonts/X11/misc/ter-c22n.pcf.gz
-share/fonts/X11/misc/ter-c24b.pcf.gz
-share/fonts/X11/misc/ter-c24n.pcf.gz
-share/fonts/X11/misc/ter-c28b.pcf.gz
-share/fonts/X11/misc/ter-c28n.pcf.gz
-share/fonts/X11/misc/ter-c32b.pcf.gz
-share/fonts/X11/misc/ter-c32n.pcf.gz
-share/fonts/X11/misc/ter-d12b.pcf.gz
-share/fonts/X11/misc/ter-d12n.pcf.gz
-share/fonts/X11/misc/ter-d14b.pcf.gz
-share/fonts/X11/misc/ter-d14n.pcf.gz
-share/fonts/X11/misc/ter-d16b.pcf.gz
-share/fonts/X11/misc/ter-d16n.pcf.gz
-share/fonts/X11/misc/ter-d18b.pcf.gz
-share/fonts/X11/misc/ter-d18n.pcf.gz
-share/fonts/X11/misc/ter-d20b.pcf.gz
-share/fonts/X11/misc/ter-d20n.pcf.gz
-share/fonts/X11/misc/ter-d22b.pcf.gz
-share/fonts/X11/misc/ter-d22n.pcf.gz
-share/fonts/X11/misc/ter-d24b.pcf.gz
-share/fonts/X11/misc/ter-d24n.pcf.gz
-share/fonts/X11/misc/ter-d28b.pcf.gz
-share/fonts/X11/misc/ter-d28n.pcf.gz
-share/fonts/X11/misc/ter-d32b.pcf.gz
-share/fonts/X11/misc/ter-d32n.pcf.gz
-share/fonts/X11/misc/ter-f12b.pcf.gz
-share/fonts/X11/misc/ter-f12n.pcf.gz
-share/fonts/X11/misc/ter-f14b.pcf.gz
-share/fonts/X11/misc/ter-f14n.pcf.gz
-share/fonts/X11/misc/ter-f16b.pcf.gz
-share/fonts/X11/misc/ter-f16n.pcf.gz
-share/fonts/X11/misc/ter-f18b.pcf.gz
-share/fonts/X11/misc/ter-f18n.pcf.gz
-share/fonts/X11/misc/ter-f20b.pcf.gz
-share/fonts/X11/misc/ter-f20n.pcf.gz
-share/fonts/X11/misc/ter-f22b.pcf.gz
-share/fonts/X11/misc/ter-f22n.pcf.gz
-share/fonts/X11/misc/ter-f24b.pcf.gz
-share/fonts/X11/misc/ter-f24n.pcf.gz
-share/fonts/X11/misc/ter-f28b.pcf.gz
-share/fonts/X11/misc/ter-f28n.pcf.gz
-share/fonts/X11/misc/ter-f32b.pcf.gz
-share/fonts/X11/misc/ter-f32n.pcf.gz
-share/fonts/X11/misc/ter-g12b.pcf.gz
-share/fonts/X11/misc/ter-g12n.pcf.gz
-share/fonts/X11/misc/ter-g14b.pcf.gz
-share/fonts/X11/misc/ter-g14n.pcf.gz
-share/fonts/X11/misc/ter-g16b.pcf.gz
-share/fonts/X11/misc/ter-g16n.pcf.gz
-share/fonts/X11/misc/ter-g18b.pcf.gz
-share/fonts/X11/misc/ter-g18n.pcf.gz
-share/fonts/X11/misc/ter-g20b.pcf.gz
-share/fonts/X11/misc/ter-g20n.pcf.gz
-share/fonts/X11/misc/ter-g22b.pcf.gz
-share/fonts/X11/misc/ter-g22n.pcf.gz
-share/fonts/X11/misc/ter-g24b.pcf.gz
-share/fonts/X11/misc/ter-g24n.pcf.gz
-share/fonts/X11/misc/ter-g28b.pcf.gz
-share/fonts/X11/misc/ter-g28n.pcf.gz
-share/fonts/X11/misc/ter-g32b.pcf.gz
-share/fonts/X11/misc/ter-g32n.pcf.gz
-share/fonts/X11/misc/ter-k12b.pcf.gz
-share/fonts/X11/misc/ter-k12n.pcf.gz
-share/fonts/X11/misc/ter-k14b.pcf.gz
-share/fonts/X11/misc/ter-k14n.pcf.gz
-share/fonts/X11/misc/ter-k16b.pcf.gz
-share/fonts/X11/misc/ter-k16n.pcf.gz
-share/fonts/X11/misc/ter-k18b.pcf.gz
-share/fonts/X11/misc/ter-k18n.pcf.gz
-share/fonts/X11/misc/ter-k20b.pcf.gz
-share/fonts/X11/misc/ter-k20n.pcf.gz
-share/fonts/X11/misc/ter-k22b.pcf.gz
-share/fonts/X11/misc/ter-k22n.pcf.gz
-share/fonts/X11/misc/ter-k24b.pcf.gz
-share/fonts/X11/misc/ter-k24n.pcf.gz
-share/fonts/X11/misc/ter-k28b.pcf.gz
-share/fonts/X11/misc/ter-k28n.pcf.gz
-share/fonts/X11/misc/ter-k32b.pcf.gz
-share/fonts/X11/misc/ter-k32n.pcf.gz
-share/fonts/X11/misc/ter-p12b.pcf.gz
-share/fonts/X11/misc/ter-p12n.pcf.gz
-share/fonts/X11/misc/ter-p14b.pcf.gz
-share/fonts/X11/misc/ter-p14n.pcf.gz
-share/fonts/X11/misc/ter-p16b.pcf.gz
-share/fonts/X11/misc/ter-p16n.pcf.gz
-share/fonts/X11/misc/ter-p18b.pcf.gz
-share/fonts/X11/misc/ter-p18n.pcf.gz
-share/fonts/X11/misc/ter-p20b.pcf.gz
-share/fonts/X11/misc/ter-p20n.pcf.gz
-share/fonts/X11/misc/ter-p22b.pcf.gz
-share/fonts/X11/misc/ter-p22n.pcf.gz
-share/fonts/X11/misc/ter-p24b.pcf.gz
-share/fonts/X11/misc/ter-p24n.pcf.gz
-share/fonts/X11/misc/ter-p28b.pcf.gz
-share/fonts/X11/misc/ter-p28n.pcf.gz
-share/fonts/X11/misc/ter-p32b.pcf.gz
-share/fonts/X11/misc/ter-p32n.pcf.gz
-share/fonts/X11/misc/ter-u12b.pcf.gz
-share/fonts/X11/misc/ter-u12n.pcf.gz
-share/fonts/X11/misc/ter-u14b.pcf.gz
-share/fonts/X11/misc/ter-u14n.pcf.gz
-share/fonts/X11/misc/ter-u16b.pcf.gz
-share/fonts/X11/misc/ter-u16n.pcf.gz
-share/fonts/X11/misc/ter-u18b.pcf.gz
-share/fonts/X11/misc/ter-u18n.pcf.gz
-share/fonts/X11/misc/ter-u20b.pcf.gz
-share/fonts/X11/misc/ter-u20n.pcf.gz
-share/fonts/X11/misc/ter-u22b.pcf.gz
-share/fonts/X11/misc/ter-u22n.pcf.gz
-share/fonts/X11/misc/ter-u24b.pcf.gz
-share/fonts/X11/misc/ter-u24n.pcf.gz
-share/fonts/X11/misc/ter-u28b.pcf.gz
-share/fonts/X11/misc/ter-u28n.pcf.gz
-share/fonts/X11/misc/ter-u32b.pcf.gz
-share/fonts/X11/misc/ter-u32n.pcf.gz
 share/fonts/X11/misc/ter-x12b.pcf.gz
 share/fonts/X11/misc/ter-x12n.pcf.gz
 share/fonts/X11/misc/ter-x14b.pcf.gz
diff --git a/fonts/terminus-font/distinfo b/fonts/terminus-font/distinfo
index 656ff4bba50..0c21f678762 100644
--- a/fonts/terminus-font/distinfo
+++ b/fonts/terminus-font/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.9 2016/11/30 13:10:13 mef Exp $
+$NetBSD: distinfo,v 1.10 2019/06/20 11:41:28 nia Exp $
 
-SHA1 (terminus-font-4.40.tar.gz) = f471933fc1ca28b05f75b5eb6c41bfdd8369ea69
-RMD160 (terminus-font-4.40.tar.gz) = e63701657d348de6caadbd825fb00b1e241a621f
-SHA512 (terminus-font-4.40.tar.gz) = 843da1f51e37d48ae88c88def965ed96c2236c183fb596705290a96eba41256a02197a298439b83913eb7679b32c2a8f44dd04de031be4db56285efd3d4c6900
-Size (terminus-font-4.40.tar.gz) = 558440 bytes
+SHA1 (terminus-font-4.47.tar.gz) = d6f481d4d2189b5237778483c5388cdb96a51ddd
+RMD160 (terminus-font-4.47.tar.gz) = 51dad30b36b9ef2fc20e6daa70df41507f082da2
+SHA512 (terminus-font-4.47.tar.gz) = 09455d107a09c422f4fedfcc70ae1483063c844fb01b0adfa3d2a0e28c9502e9ca922542b5ad735cbebb491d148c453d0213d61ebebf64c79f16cb582964fa47
+Size (terminus-font-4.47.tar.gz) = 620344 bytes