[src/trunk]: src revert my own commit from a while back. Do allow matching bi...

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

details:   https://anonhg.NetBSD.org/src/rev/031ab95f9cc8
branches:  trunk
changeset: 364970:031ab95f9cc8
user:      maya <maya%NetBSD.org@localhost>
date:      Thu Aug 30 05:39:21 2018 +0000

description:
revert my own commit from a while back. Do allow matching bitmap fonts.
Not all bitmap fonts are bad, apparently.

diffstat:

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

diffs (35 lines):

diff -r b89156c0a22f -r 031ab95f9cc8 distrib/sets/lists/xetc/mi
--- a/distrib/sets/lists/xetc/mi        Thu Aug 30 01:19:49 2018 +0000
+++ b/distrib/sets/lists/xetc/mi        Thu Aug 30 05:39:21 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.30 2018/03/29 04:43:55 snj Exp $
+# $NetBSD: mi,v 1.31 2018/08/30 05:39:21 maya Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -74,7 +74,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/70-no-bitmaps.conf                  -unknown-       obsolete
 ./etc/fonts/conf.d/80-delicious.conf                   -unknown-       xorg
 ./etc/fonts/conf.d/90-synthetic.conf                   -unknown-       xorg
 ./etc/fonts/fonts.conf                                 -unknown-       xorg
diff -r b89156c0a22f -r 031ab95f9cc8 external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile
--- a/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile      Thu Aug 30 01:19:49 2018 +0000
+++ b/external/mit/xorg/lib/fontconfig/etc/conf.d/Makefile      Thu Aug 30 05:39:21 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.5 2017/08/29 15:50:57 maya Exp $
+#      $NetBSD: Makefile,v 1.6 2018/08/30 05:39:21 maya Exp $
 
 .include <bsd.own.mk>
 
@@ -18,7 +18,6 @@
        65-fonts-persian.conf \
        65-nonlatin.conf \
        69-unifont.conf \
-       70-no-bitmaps.conf \
        80-delicious.conf \
        90-synthetic.conf