Re: s/vera/dejavu/ font

[coypu%sdf.org@localhost]

On Fri, Nov 06, 2020 at 01:42:19PM +0000, coypu%sdf.org@localhost wrote:
> hi all,
> 
> any objections for swapping the vera fonts to the dejavu fonts, which
> use them as a basis and add support for several languages?
> 
> as far as I can tell, nothing in base uses xlfd to search for vera,
> and fontconfig considers them equivalent.

a diff for this looks something like this:
(+ a cvs import to xsrc)

Index: distrib/sets/lists/xfont/mi
===================================================================
RCS file: /cvsroot/src/distrib/sets/lists/xfont/mi,v
retrieving revision 1.44
diff -u -r1.44 mi
--- distrib/sets/lists/xfont/mi	11 Oct 2020 17:49:07 -0000	1.44
+++ distrib/sets/lists/xfont/mi	6 Nov 2020 15:18:26 -0000
@@ -3799,16 +3799,38 @@
 ./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/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
-./usr/X11R7/lib/X11/fonts/TTF/VeraIt.ttf		xfont	share,xorg,x11fonts
-./usr/X11R7/lib/X11/fonts/TTF/VeraMoBI.ttf		xfont	share,xorg,x11fonts
-./usr/X11R7/lib/X11/fonts/TTF/VeraMoBd.ttf		xfont	share,xorg,x11fonts
-./usr/X11R7/lib/X11/fonts/TTF/VeraMoIt.ttf		xfont	share,xorg,x11fonts
-./usr/X11R7/lib/X11/fonts/TTF/VeraMono.ttf		xfont	share,xorg,x11fonts
-./usr/X11R7/lib/X11/fonts/TTF/VeraSe.ttf		xfont	share,xorg,x11fonts
-./usr/X11R7/lib/X11/fonts/TTF/VeraSeBd.ttf		xfont	share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/TTF/DejaVuMathTeXGyre.ttf	xfont	share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/TTF/DejaVuSans-Bold.ttf	xfont	share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/TTF/DejaVuSans-BoldOblique.ttf	xfont	share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/TTF/DejaVuSans-ExtraLight.ttf	xfont	share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/TTF/DejaVuSans-Oblique.ttf	xfont	share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/TTF/DejaVuSans.ttf	xfont	share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/TTF/DejaVuSansCondensed-Bold.ttf	xfont	share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/TTF/DejaVuSansCondensed-BoldOblique.ttf	xfont	share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/TTF/DejaVuSansCondensed-Oblique.ttf	xfont	share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/TTF/DejaVuSansCondensed.ttf	xfont	share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/TTF/DejaVuSansMono-Bold.ttf	xfont	share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/TTF/DejaVuSansMono-BoldOblique.ttf	xfont	share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/TTF/DejaVuSansMono-Oblique.ttf	xfont	share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/TTF/DejaVuSansMono.ttf	xfont	share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/TTF/DejaVuSerif-Bold.ttf	xfont	share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/TTF/DejaVuSerif-BoldItalic.ttf	xfont	share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/TTF/DejaVuSerif-Italic.ttf	xfont	share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/TTF/DejaVuSerif.ttf	xfont	share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/TTF/DejaVuSerifCondensed-Bold.ttf	xfont	share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/TTF/DejaVuSerifCondensed-BoldItalic.ttf	xfont	share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/TTF/DejaVuSerifCondensed-Italic.ttf	xfont	share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/TTF/DejaVuSerifCondensed.ttf	xfont	share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/TTF/Vera.ttf			xfont-obsolete	obsolete
+./usr/X11R7/lib/X11/fonts/TTF/VeraBI.ttf		xfont-obsolete	obsolete
+./usr/X11R7/lib/X11/fonts/TTF/VeraBd.ttf		xfont-obsolete	obsolete
+./usr/X11R7/lib/X11/fonts/TTF/VeraIt.ttf		xfont-obsolete	obsolete
+./usr/X11R7/lib/X11/fonts/TTF/VeraMoBI.ttf		xfont-obsolete	obsolete
+./usr/X11R7/lib/X11/fonts/TTF/VeraMoBd.ttf		xfont-obsolete	obsolete
+./usr/X11R7/lib/X11/fonts/TTF/VeraMoIt.ttf		xfont-obsolete	obsolete
+./usr/X11R7/lib/X11/fonts/TTF/VeraMono.ttf		xfont-obsolete	obsolete
+./usr/X11R7/lib/X11/fonts/TTF/VeraSe.ttf		xfont-obsolete	obsolete
+./usr/X11R7/lib/X11/fonts/TTF/VeraSeBd.ttf		xfont-obsolete	obsolete
 ./usr/X11R7/lib/X11/fonts/TTF/encodings.dir		xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/TTF/fonts.dir			xfont	share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/TTF/fonts.scale		xfont	share,xorg,x11fonts
Index: external/mit/xorg/share/fonts/TTF/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/share/fonts/TTF/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- external/mit/xorg/share/fonts/TTF/Makefile	29 Jul 2008 05:01:23 -0000	1.1.1.1
+++ external/mit/xorg/share/fonts/TTF/Makefile	6 Nov 2020 15:18:50 -0000
@@ -1,6 +1,6 @@
 #	$NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:23 mrg Exp $
 
-SUBDIR=	font-bh-ttf ttf-bitstream-vera
+SUBDIR=	font-bh-ttf font-dejavu-ttf
 
 FONTSUBDIR=	TTF
 
Index: external/mit/xorg/share/fonts/TTF/font-dejavu-ttf/Makefile
===================================================================
RCS file: external/mit/xorg/share/fonts/TTF/font-dejavu-ttf/Makefile
diff -N external/mit/xorg/share/fonts/TTF/font-dejavu-ttf/Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ external/mit/xorg/share/fonts/TTF/font-dejavu-ttf/Makefile	6 Nov 2020 15:18:50 -0000
@@ -0,0 +1,21 @@
+#	$NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:23 mrg Exp $
+
+.include <bsd.own.mk>
+
+FONTSUBDIR=	TTF
+FONTSRCPKG=	font-dejavu-ttf
+
+FILES=		DejaVuMathTeXGyre.ttf DejaVuSans-Bold.ttf DejaVuSans-BoldOblique.ttf \
+		DejaVuSans-ExtraLight.ttf DejaVuSans-Oblique.ttf DejaVuSans.ttf \
+		DejaVuSansCondensed-Bold.ttf DejaVuSansCondensed-BoldOblique.ttf \
+		DejaVuSansCondensed-Oblique.ttf DejaVuSansCondensed.ttf \
+		DejaVuSansMono-Bold.ttf DejaVuSansMono-BoldOblique.ttf \
+		DejaVuSansMono-Oblique.ttf DejaVuSansMono.ttf DejaVuSerif-Bold.ttf \
+		DejaVuSerif-BoldItalic.ttf DejaVuSerif-Italic.ttf DejaVuSerif.ttf \
+		DejaVuSerifCondensed-Bold.ttf DejaVuSerifCondensed-BoldItalic.ttf \
+		DejaVuSerifCondensed-Italic.ttf DejaVuSerifCondensed.ttf
+
+.include "../../Makefile.font"
+
+.include <bsd.x11.mk>
+.include <bsd.prog.mk>
Index: share/mk/bsd.own.mk
===================================================================
RCS file: /cvsroot/src/share/mk/bsd.own.mk,v
retrieving revision 1.1230
diff -u -r1.1230 bsd.own.mk
--- share/mk/bsd.own.mk	5 Nov 2020 13:03:31 -0000	1.1230
+++ share/mk/bsd.own.mk	6 Nov 2020 15:18:54 -0000
@@ -1611,6 +1611,8 @@
 X11SRCDIR.${_dir}?=		${X11SRCDIRMIT}/${_dir}/dist
 .endfor
 
+X11SRCDIR.font-dejavu-ttf?=	${X11SRCDIRMIT}/font-dejavu-ttf/dist/ttf
+
 # X11SRCDIR.Mesa points to the currently used Mesa sources
 X11SRCDIR.Mesa?=		${X11SRCDIRMIT}/${EXTERNAL_MESALIB_DIR}/dist