Update to terminus-font to v4.38 as requested in PR 47092.

Handle fontconfig configuration file.

4 files changed, 37 insertions, 12 deletions

diff --git a/fonts/terminus-font/DESCR b/fonts/terminus-font/DESCR
index e6e13554223..231558b7a51 100644
--- a/fonts/terminus-font/DESCR
+++ b/fonts/terminus-font/DESCR
@@ -1,9 +1,10 @@
 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,
+more hours per day) work with computers. Version 4.38 contains 879 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, 10x18, 10x20, 11x22, 12x24, 14x28
-and 16x32. The styles are normal and bold (except for 6x12), plus EGA/VGA-bold
-for 8x14 and 8x16.
+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 cae821502e6..9e8ba812d28 100644
--- a/fonts/terminus-font/Makefile
+++ b/fonts/terminus-font/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2012/10/03 21:56:03 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2012/10/21 12:52:14 cheusov Exp $
 #
 
-DISTNAME=		terminus-font-4.36
-PKGREVISION=		1
+DISTNAME=		terminus-font-4.38
 CATEGORIES=		fonts
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=terminus-font/}
 
@@ -12,7 +11,6 @@ COMMENT=		Clean, fixed-width font
 LICENSE=		open-font-license
 
 USE_TOOLS+=		bdftopcf gmake gzip perl
-
 HAS_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--x11dir=${PREFIX}/lib/X11/fonts/misc
 
@@ -22,4 +20,24 @@ INSTALL_TARGET=		install-pcf
 FONTS_DIRS.x11=		${PREFIX}/lib/X11/fonts/misc
 REQD_DIRS+=		${PREFIX}/lib/X11/fonts/misc
 
+USE_LANGUAGES=		# none
+
+EGDIR=		${PREFIX}/share/examples/terminus-font
+
+DOCDIR=		${PREFIX}/share/doc/terminus-font
+DOCFILES=	AUTHORS CHANGES OFL.TXT README README-BG
+
+FCCONFDIR=	${PKG_SYSCONFDIR}/fontconfig/conf.d
+MAKE_DIRS+=	${FCCONFDIR}
+
+CONF_FILES=	${EGDIR}/75-yes-terminus.conf \
+		${FCCONFDIR}/75-yes-terminus.conf
+
+AUTO_MKDIRS=	yes
+
+post-install:
+	set -e; cd ${WRKSRC}; \
+	${INSTALL_DATA} ${DOCFILES} ${DESTDIR}${DOCDIR}; \
+	${INSTALL_DATA} 75-yes-terminus.conf ${DESTDIR}${EGDIR}
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/terminus-font/PLIST b/fonts/terminus-font/PLIST
index 3de10e31c7b..81136df16da 100644
--- a/fonts/terminus-font/PLIST
+++ b/fonts/terminus-font/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2012/02/02 21:17:40 asau Exp $
+@comment $NetBSD: PLIST,v 1.4 2012/10/21 12:52:14 cheusov 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
@@ -233,3 +233,9 @@ lib/X11/fonts/misc/ter-x28b.pcf.gz
 lib/X11/fonts/misc/ter-x28n.pcf.gz
 lib/X11/fonts/misc/ter-x32b.pcf.gz
 lib/X11/fonts/misc/ter-x32n.pcf.gz
+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
diff --git a/fonts/terminus-font/distinfo b/fonts/terminus-font/distinfo
index 6631c9aaa3d..ea3d1a4b931 100644
--- a/fonts/terminus-font/distinfo
+++ b/fonts/terminus-font/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2012/02/02 21:17:40 asau Exp $
+$NetBSD: distinfo,v 1.6 2012/10/21 12:52:14 cheusov Exp $
 
-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
+SHA1 (terminus-font-4.38.tar.gz) = 7f5d251e4b7c8c8f1b1ad9dec38f32079a79d115
+RMD160 (terminus-font-4.38.tar.gz) = 460a9fe77faf62fc6c16e7389be4c397d5adea3f
+Size (terminus-font-4.38.tar.gz) = 316507 bytes