xsrc/40476: Standard X11 "sony" PCF fonts are missing in native-xorg

[nakayama%netbsd.org@localhost]

>Number:         40476
>Category:       xsrc
>Synopsis:       Standard X11 "sony" PCF fonts are missing in native-xorg
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    xsrc-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sun Jan 25 16:20:00 +0000 2009
>Originator:     Takeshi Nakayama
>Release:        NetBSD 5.0_BETA
>Organization:
Private
>Environment:
System: NetBSD lethe 5.0_BETA NetBSD 5.0_BETA (LETHE) #5: Sun Jan 25 18:05:55 
JST 2009 takeshi@lethe:/sys/arch/i386/compile/LETHE i386
Architecture: i386
Machine: i386

>Description:
The standard X11 "sony" PCF fonts are missing in native-xorg.  This is
a regression from XFree86.

>How-To-Repeat:
% ls /usr/X11R6/lib/X11/fonts/misc/{12x24,8x16}*
/usr/X11R6/lib/X11/fonts/misc/12x24.pcf.gz
/usr/X11R6/lib/X11/fonts/misc/12x24rk.pcf.gz
/usr/X11R6/lib/X11/fonts/misc/8x16.pcf.gz
/usr/X11R6/lib/X11/fonts/misc/8x16rk.pcf.gz

% ls /usr/X11R7/lib/X11/fonts/misc/{12x24,8x16}*
ls: /usr/X11R7/lib/X11/fonts/misc/12x24*: No such file or directory
ls: /usr/X11R7/lib/X11/fonts/misc/8x16*: No such file or directory

>Fix:
Import font-sony-misc-1.0.0.tar.bz2 from xorg to
xsrc/external/mit/font-sony-misc/dist, then apply the following
patch.

Index: src/distrib/sets/lists/xfont/mi
===================================================================
RCS file: /cvsroot/src/distrib/sets/lists/xfont/mi,v
retrieving revision 1.33
diff -u -d -r1.33 mi
--- src/distrib/sets/lists/xfont/mi     30 Dec 2008 20:33:27 -0000      1.33
+++ src/distrib/sets/lists/xfont/mi     25 Jan 2009 09:33:08 -0000
@@ -8429,6 +8429,8 @@
 ./usr/X11R7/lib/X11/fonts/misc/10x20-ISO8859-9.pcf.gz  xfont   share,xorg
 ./usr/X11R7/lib/X11/fonts/misc/10x20-KOI8-R.pcf.gz     xfont   share,xorg
 ./usr/X11R7/lib/X11/fonts/misc/12x13ja.pcf.gz          xfont   share,xorg
+./usr/X11R7/lib/X11/fonts/misc/12x24.pcf.gz            xfont   share,xorg
+./usr/X11R7/lib/X11/fonts/misc/12x24rk.pcf.gz          xfont   share,xorg
 ./usr/X11R7/lib/X11/fonts/misc/18x18ja.pcf.gz          xfont   share,xorg
 ./usr/X11R7/lib/X11/fonts/misc/18x18ko.pcf.gz          xfont   share,xorg
 ./usr/X11R7/lib/X11/fonts/misc/4x6-ISO8859-1.pcf.gz    xfont   share,xorg
@@ -8704,6 +8706,8 @@
 ./usr/X11R7/lib/X11/fonts/misc/8x13O-ISO8859-9.pcf.gz  xfont   share,xorg
 ./usr/X11R7/lib/X11/fonts/misc/8x13O-KOI8-R.pcf.gz     xfont-obsolete  
share,xorg,obsolete
 ./usr/X11R7/lib/X11/fonts/misc/8x13O.pcf.gz            xfont   share,xorg
+./usr/X11R7/lib/X11/fonts/misc/8x16.pcf.gz             xfont   share,xorg
+./usr/X11R7/lib/X11/fonts/misc/8x16rk.pcf.gz           xfont   share,xorg
 ./usr/X11R7/lib/X11/fonts/misc/9x15-ISO8859-1.pcf.gz   xfont   share,xorg
 ./usr/X11R7/lib/X11/fonts/misc/9x15-ISO8859-10.pcf.gz  xfont   share,xorg
 ./usr/X11R7/lib/X11/fonts/misc/9x15-ISO8859-11.pcf.gz  xfont   share,xorg
Index: src/external/mit/xorg/share/fonts/misc/Makefile
===================================================================
RCS file: /cvsroot/src/external/mit/xorg/share/fonts/misc/Makefile,v
retrieving revision 1.1.1.1
diff -u -d -r1.1.1.1 Makefile
--- src/external/mit/xorg/share/fonts/misc/Makefile     29 Jul 2008 05:01:23 
-0000      1.1.1.1
+++ src/external/mit/xorg/share/fonts/misc/Makefile     25 Jan 2009 09:33:08 
-0000
@@ -1,7 +1,7 @@
 #      $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:23 mrg Exp $
 
 SUBDIR=        font-cursor-misc font-daewoo-misc font-dec-misc font-isas-misc \
-       font-jis-misc font-misc-misc font-mutt-misc
+       font-jis-misc font-misc-misc font-mutt-misc font-sony-misc
 
 FONTSUBDIR=    misc
 
Index: src/external/mit/xorg/share/fonts/misc/font-sony-misc/Makefile
===================================================================
RCS file: src/external/mit/xorg/share/fonts/misc/font-sony-misc/Makefile
diff -N src/external/mit/xorg/share/fonts/misc/font-sony-misc/Makefile
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ src/external/mit/xorg/share/fonts/misc/font-sony-misc/Makefile      25 Jan 
2009 09:33:08 -0000
@@ -0,0 +1,14 @@
+#      $NetBSD$
+
+.include <bsd.own.mk>
+
+FONTSUBDIR=    misc
+FONTSRCPKG=    font-sony-misc
+
+.PATH:         ${X11SRCDIR.${FONTSRCPKG}}
+BDFFILES+=     12x24.bdf 12x24rk.bdf 8x16.bdf 8x16rk.bdf
+
+.include "../../Makefile.bdf"
+
+.include <bsd.x11.mk>
+.include <bsd.prog.mk>
Index: src/share/mk/bsd.own.mk
===================================================================
RCS file: /cvsroot/src/share/mk/bsd.own.mk,v
retrieving revision 1.553
diff -u -d -r1.553 bsd.own.mk
--- src/share/mk/bsd.own.mk     30 Dec 2008 21:31:10 -0000      1.553
+++ src/share/mk/bsd.own.mk     25 Jan 2009 13:34:02 -0000
@@ -856,7 +856,7 @@
        font-bitstream-100dpi font-bitstream-75dpi font-bitstream-type1 \
        font-cursor-misc font-daewoo-misc font-dec-misc font-ibm-type1 \
        font-isas-misc font-jis-misc font-misc-misc font-mutt-misc \
-       font-util ttf-bitstream-vera encodings
+       font-sony-misc font-util ttf-bitstream-vera encodings
 X11SRCDIR.${_dir}?=            ${X11SRCDIRMIT}/${_dir}/dist
 .endfor