[src/trunk]: src/external/ofl/font-liberation-ttf Hook up font-liberation-ttf...

[maya <maya%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e22cf6425867
branches:  trunk
changeset: 945989:e22cf6425867
user:      maya <maya%NetBSD.org@localhost>
date:      Thu Nov 12 22:28:02 2020 +0000

description:
Hook up font-liberation-ttf to the build.

license ok'd by board.

diffstat:

 distrib/sets/lists/xfont/mi               |  14 +++++++++++++-
 external/Makefile                         |   4 ++--
 external/ofl/Makefile                     |   3 +++
 external/ofl/font-liberation-ttf/Makefile |  21 +++++++++++++++++++++
 4 files changed, 39 insertions(+), 3 deletions(-)

diffs (73 lines):

diff -r 1fe4ecec7c6d -r e22cf6425867 distrib/sets/lists/xfont/mi
--- a/distrib/sets/lists/xfont/mi       Thu Nov 12 22:27:55 2020 +0000
+++ b/distrib/sets/lists/xfont/mi       Thu Nov 12 22:28:02 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.44 2020/10/11 17:49:07 nia Exp $
+# $NetBSD: mi,v 1.45 2020/11/12 22:28:02 maya Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -3799,6 +3799,18 @@
 ./usr/X11R7/lib/X11/fonts/75dpi/timR24-ISO8859-4.pcf.gz        xfont   share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/75dpi/timR24-ISO8859-9.pcf.gz        xfont   share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/75dpi/timR24.bdf             xfont   share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/TTF/LiberationMono-Bold.ttf  xfont   share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/TTF/LiberationMono-BoldItalic.ttf    xfont   share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/TTF/LiberationMono-Italic.ttf        xfont   share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/TTF/LiberationMono-Regular.ttf       xfont   share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/TTF/LiberationSans-Bold.ttf  xfont   share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/TTF/LiberationSans-BoldItalic.ttf    xfont   share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/TTF/LiberationSans-Italic.ttf        xfont   share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/TTF/LiberationSans-Regular.ttf       xfont   share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/TTF/LiberationSerif-Bold.ttf xfont   share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/TTF/LiberationSerif-BoldItalic.ttf   xfont   share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/TTF/LiberationSerif-Italic.ttf       xfont   share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/TTF/LiberationSerif-Regular.ttf      xfont   share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/TTF/Vera.ttf                 xfont   share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/TTF/VeraBI.ttf               xfont   share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/TTF/VeraBd.ttf               xfont   share,xorg,x11fonts
diff -r 1fe4ecec7c6d -r e22cf6425867 external/Makefile
--- a/external/Makefile Thu Nov 12 22:27:55 2020 +0000
+++ b/external/Makefile Thu Nov 12 22:28:02 2020 +0000
@@ -1,7 +1,7 @@
-#      $NetBSD: Makefile,v 1.21 2018/04/07 22:39:31 christos Exp $
+#      $NetBSD: Makefile,v 1.22 2020/11/12 22:28:02 maya Exp $
 
 SUBDIR+= apache2 atheros broadcom bsd cddl gpl2 gpl3 historical intel-fw-eula
-SUBDIR+= intel-fw-public ibm-public mpl mit nvidia-firmware public-domain
+SUBDIR+= intel-fw-public ibm-public mpl mit nvidia-firmware ofl public-domain
 SUBDIR+= realtek
 
 .include <bsd.subdir.mk>
diff -r 1fe4ecec7c6d -r e22cf6425867 external/ofl/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/ofl/Makefile     Thu Nov 12 22:28:02 2020 +0000
@@ -0,0 +1,3 @@
+SUBDIR+=       font-liberation-ttf
+
+.include <bsd.subdir.mk>
diff -r 1fe4ecec7c6d -r e22cf6425867 external/ofl/font-liberation-ttf/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/ofl/font-liberation-ttf/Makefile Thu Nov 12 22:28:02 2020 +0000
@@ -0,0 +1,21 @@
+#      $NetBSD: Makefile,v 1.1 2020/11/12 22:28:02 maya Exp $
+
+.include <bsd.own.mk>
+
+FONTSUBDIR=    TTF
+FONTSRCPKG=    font-liberation-ttf
+FILESDIR=      ${X11FONTDIR}/TTF
+
+.PATH: ${X11SRCDIR}/external/ofl/${FONTSRCPKG}/src \
+       ${X11SRCDIR}/external/ofl/${FONTSRCPKG}/dist
+
+FILES=         LiberationMono-Bold.ttf LiberationMono-BoldItalic.ttf \
+               LiberationMono-Italic.ttf LiberationMono-Regular.ttf \
+               LiberationSans-Bold.ttf LiberationSans-BoldItalic.ttf \
+               LiberationSans-Italic.ttf LiberationSans-Regular.ttf \
+               LiberationSerif-Bold.ttf LiberationSerif-BoldItalic.ttf \
+               LiberationSerif-Italic.ttf LiberationSerif-Regular.ttf
+
+.include <bsd.x11.mk>
+.include <bsd.files.mk>
+.include <bsd.prog.mk>