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

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

details:   https://anonhg.NetBSD.org/src/rev/93c3296175dd
branches:  netbsd-6
changeset: 774480:93c3296175dd
user:      riz <riz%NetBSD.org@localhost>
date:      Mon Aug 20 19:36:57 2012 +0000

description:
Pull up following revision(s) (requested by tron in ticket #519):
        distrib/sets/lists/xfont/mi: revision 1.40
        external/mit/xorg/share/fonts/misc/font-misc-misc/Makefile: revision 1.2
Build and install iso10646-1 encoded 10x20 font. This matches the behaviour
of the upstream software and modular X.org in pkgsrc.
Patch supplied by Piotr Meyer in PR xsrc/46755.

diffstat:

 distrib/sets/lists/xfont/mi                                |  3 ++-
 external/mit/xorg/share/fonts/misc/font-misc-misc/Makefile |  4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diffs (35 lines):

diff -r cbfa768d8724 -r 93c3296175dd distrib/sets/lists/xfont/mi
--- a/distrib/sets/lists/xfont/mi       Mon Aug 20 19:34:20 2012 +0000
+++ b/distrib/sets/lists/xfont/mi       Mon Aug 20 19:36:57 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.39 2010/04/11 02:41:38 jakllsch Exp $
+# $NetBSD: mi,v 1.39.8.1 2012/08/20 19:36:57 riz Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -8440,6 +8440,7 @@
 ./usr/X11R7/lib/X11/fonts/misc/10x20-ISO8859-8.pcf.gz  xfont   share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/10x20-ISO8859-9.pcf.gz  xfont   share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/10x20-KOI8-R.pcf.gz     xfont   share,xorg,x11fonts
+./usr/X11R7/lib/X11/fonts/misc/10x20.pcf.gz            xfont   share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/12x13ja.pcf.gz          xfont   share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/12x24.pcf.gz            xfont   share,xorg,x11fonts
 ./usr/X11R7/lib/X11/fonts/misc/12x24rk.pcf.gz          xfont   share,xorg,x11fonts
diff -r cbfa768d8724 -r 93c3296175dd external/mit/xorg/share/fonts/misc/font-misc-misc/Makefile
--- a/external/mit/xorg/share/fonts/misc/font-misc-misc/Makefile        Mon Aug 20 19:34:20 2012 +0000
+++ b/external/mit/xorg/share/fonts/misc/font-misc-misc/Makefile        Mon Aug 20 19:36:57 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:23 mrg Exp $
+#      $NetBSD: Makefile,v 1.1.1.1.24.1 2012/08/20 19:36:58 riz Exp $
 
 .include <bsd.own.mk>
 
@@ -15,7 +15,7 @@
 BDFFILES+=     4x6.bdf 5x7.bdf 5x8.bdf 6x10.bdf 6x12.bdf 6x13.bdf \
                6x13B.bdf 6x13O.bdf 6x9.bdf 7x13.bdf 7x13B.bdf 7x13O.bdf \
                7x14.bdf 7x14B.bdf 8x13.bdf 8x13B.bdf 8x13O.bdf 9x15.bdf \
-               9x15B.bdf 9x18.bdf 9x18B.bdf
+               9x15B.bdf 9x18.bdf 9x18B.bdf 10x20.bdf
 
 # Most fonts have 22 output types, but ISO8859-8 and ISO8859-11 are
 # missing a few.