[src/netbsd-8]: src Pull up following revision(s) (requested by maya in ticke...

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

details:   https://anonhg.NetBSD.org/src/rev/116d7c7599d9
branches:  netbsd-8
changeset: 434614:116d7c7599d9
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Feb 06 09:28:03 2018 +0000

description:
Pull up following revision(s) (requested by maya in ticket #534):
        external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile: revision 1.5
        distrib/sets/lists/xetc/mi: revision 1.29
Don't fc-match bitmap fonts by default.
Now things using Helvetica won't look terrible, and will use the fallback
font instead.
Idea by jakllsch, thanks!

diffstat:

 distrib/sets/lists/xetc/mi                           |  3 ++-
 external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile |  3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diffs (34 lines):

diff -r 48528e9903e2 -r 116d7c7599d9 distrib/sets/lists/xetc/mi
--- a/distrib/sets/lists/xetc/mi        Tue Feb 06 09:06:35 2018 +0000
+++ b/distrib/sets/lists/xetc/mi        Tue Feb 06 09:28:03 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.27 2016/12/15 12:56:52 kre Exp $
+# $NetBSD: mi,v 1.27.6.1 2018/02/06 09:28:03 martin Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -101,6 +101,7 @@
 ./etc/fonts/conf.d/65-fonts-persian.conf               -unknown-       xorg
 ./etc/fonts/conf.d/65-nonlatin.conf                    -unknown-       xorg
 ./etc/fonts/conf.d/69-unifont.conf                     -unknown-       xorg
+./etc/fonts/conf.d/70-no-bitmaps.conf                  -unknown-       xorg
 ./etc/fonts/conf.d/80-delicious.conf                   -unknown-       xorg
 ./etc/fonts/conf.d/90-synthetic.conf                   -unknown-       xorg
 ./etc/fonts/fonts.conf                                 -unknown-       x11
diff -r 48528e9903e2 -r 116d7c7599d9 external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile
--- a/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile      Tue Feb 06 09:06:35 2018 +0000
+++ b/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile      Tue Feb 06 09:28:03 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2013/06/03 20:23:39 mrg Exp $
+#      $NetBSD: Makefile,v 1.3.20.1 2018/02/06 09:28:03 martin Exp $
 
 .include <bsd.own.mk>
 
@@ -17,6 +17,7 @@
        65-fonts-persian.conf \
        65-nonlatin.conf \
        69-unifont.conf \
+       70-no-bitmaps.conf \
        80-delicious.conf \
        90-synthetic.conf