Module Name: src Committed By: maya Date: Thu Nov 12 22:28:02 UTC 2020
Modified Files: src/distrib/sets/lists/xfont: mi src/external: Makefile Added Files: src/external/ofl: Makefile src/external/ofl/font-liberation-ttf: Makefile Log Message: Hook up font-liberation-ttf to the build. license ok'd by board. To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 src/distrib/sets/lists/xfont/mi cvs rdiff -u -r1.21 -r1.22 src/external/Makefile cvs rdiff -u -r0 -r1.1 src/external/ofl/Makefile cvs rdiff -u -r0 -r1.1 src/external/ofl/font-liberation-ttf/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/distrib/sets/lists/xfont/mi diff -u src/distrib/sets/lists/xfont/mi:1.44 src/distrib/sets/lists/xfont/mi:1.45 --- src/distrib/sets/lists/xfont/mi:1.44 Sun Oct 11 17:49:07 2020 +++ src/distrib/sets/lists/xfont/mi Thu Nov 12 22:28:02 2020 @@ -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 Index: src/external/Makefile diff -u src/external/Makefile:1.21 src/external/Makefile:1.22 --- src/external/Makefile:1.21 Sat Apr 7 22:39:31 2018 +++ src/external/Makefile Thu Nov 12 22:28:02 2020 @@ -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> Added files: Index: src/external/ofl/Makefile diff -u /dev/null src/external/ofl/Makefile:1.1 --- /dev/null Thu Nov 12 22:28:02 2020 +++ src/external/ofl/Makefile Thu Nov 12 22:28:02 2020 @@ -0,0 +1,3 @@ +SUBDIR+= font-liberation-ttf + +.include <bsd.subdir.mk> Index: src/external/ofl/font-liberation-ttf/Makefile diff -u /dev/null src/external/ofl/font-liberation-ttf/Makefile:1.1 --- /dev/null Thu Nov 12 22:28:02 2020 +++ src/external/ofl/font-liberation-ttf/Makefile Thu Nov 12 22:28:02 2020 @@ -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>