Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/nx/patches/nx-x11-2.1.0-xorg7-font-fix.patch

    Contents of /trunk/nx/patches/nx-x11-2.1.0-xorg7-font-fix.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 153 - (show annotations) (download)
    Tue May 8 20:52:56 2007 UTC (17 years ago) by niro
    File size: 19647 byte(s) 
    -import
    1 diff -purN nx-X11.orig/lib/fontconfig/fonts.conf.in nx-X11/lib/fontconfig/fonts.conf.in
    2 --- nx-X11.orig/lib/fontconfig/fonts.conf.in 2002-10-03 17:06:28.000000000 -0500
    3 +++ nx-X11/lib/fontconfig/fonts.conf.in 2006-03-21 08:15:22.000000000 -0600
    4 @@ -24,7 +24,7 @@
    5 Common X11R6 font directories
    6 -->
    7
    8 - <dir>/usr/X11R6/lib/X11/fonts</dir>
    9 + <dir>/usr/share/fonts</dir>
    10 <dir>/usr/share/fonts</dir>
    11 <dir>~/.fonts</dir>
    12
    13 diff -purN nx-X11.orig/lib/fontconfig/src/fontconfig.man nx-X11/lib/fontconfig/src/fontconfig.man
    14 --- nx-X11.orig/lib/fontconfig/src/fontconfig.man 2003-02-16 11:44:36.000000000 -0600
    15 +++ nx-X11/lib/fontconfig/src/fontconfig.man 2006-03-21 08:15:22.000000000 -0600
    16 @@ -1352,8 +1352,8 @@ This is an example of a system-wide conf
    17 <!--
    18 Find fonts in these directories
    19 -->
    20 -<dir>/usr/X11R6/lib/X11/fonts/truetype</dir>
    21 -<dir>/usr/X11R6/lib/X11/fonts/Type1</dir>
    22 +<dir>/usr/share/fonts/truetype</dir>
    23 +<dir>/usr/share/fonts/Type1</dir>
    24
    25 <!--
    26 Accept deprecated 'mono' alias, replacing it with 'monospace'
    27 --- nx-X11/programs/Xserver/hw/nxagent/Font.c.orig 2006-12-28 18:13:53.000000000 +0100
    28 +++ nx-X11/programs/Xserver/hw/nxagent/Font.c 2007-01-03 20:16:41.000000000 +0100
    29 @@ -61,15 +61,15 @@
    30 #undef TEST
    31 #undef DEBUG
    32
    33 -#define NXAGENT_DEFAULT_FONT_DIR "/usr/X11R6/lib/X11/fonts"
    34 +#define NXAGENT_DEFAULT_FONT_DIR "/usr/share/X11/fonts"
    35 #define NXAGENT_ALTERNATE_FONT_DIR "/usr/share/X11/fonts"
    36 #define NXAGENT_ALTERNATE_FONT_DIR_2 "/usr/share/fonts/X11"
    37 #define NXAGENT_ALTERNATE_FONT_DIR_3 "/usr/share/fonts"
    38
    39 #define NXAGENT_DEFAULT_FONT_PATH \
    40 -"/usr/X11R6/lib/X11/fonts/misc/,/usr/X11R6/lib/X11/fonts/Speedo/,\
    41 -/usr/X11R6/lib/X11/fonts/Type1/,/usr/X11R6/lib/X11/fonts/75dpi/,\
    42 -/usr/X11R6/lib/X11/fonts/100dpi/,/usr/X11R6/lib/X11/fonts/TTF/"
    43 +"/usr/share/X11/fonts/misc/,/usr/share/X11/fonts/Speedo/,\
    44 +/usr/share/X11/fonts/Type1/,/usr/share/X11/fonts/75dpi/,\
    45 +/usr/share/X11/fonts/100dpi/,/usr/share/X11/fonts/TTF/"
    46
    47 #define NXAGENT_ALTERNATE_FONT_PATH \
    48 "/usr/share/X11/fonts/misc/,/usr/share/X11/fonts/Speedo/,\
    49 @@ -1402,7 +1402,7 @@
    50 S_ISDIR(dirStat.st_mode) != 0)
    51 {
    52 /*
    53 - * Let's use the old "/usr/X11R6/lib/X11/fonts" style.
    54 + * Let's use the old "/usr/share/fonts" style.
    55 */
    56
    57 #ifdef TEST
    58 diff -purN nx-X11.orig/programs/Xserver/hw/xfree86/doc/Install nx-X11/programs/Xserver/hw/xfree86/doc/Install
    59 --- nx-X11.orig/programs/Xserver/hw/xfree86/doc/Install 2003-02-24 23:29:10.000000000 -0600
    60 +++ nx-X11/programs/Xserver/hw/xfree86/doc/Install 2006-03-21 08:14:26.000000000 -0600
    61 @@ -318,7 +318,7 @@ tion procedure for this case is as follo
    62 chmod ug-w /usr/X11R6/lib # Make sure the permissions are OK
    63 /sbin/ldconfig /usr/X11R6/lib # For Linux
    64 /sbin/ldconfig -m /usr/X11R6/lib # For FreeBSD, NetBSD, OpenBSD
    65 - /usr/X11R6/bin/mkfontdir /usr/X11R6/lib/X11/fonts/misc
    66 + /usr/X11R6/bin/mkfontdir /usr/share/fonts/misc
    67
    68 4.2 Installing over an old installation
    69
    70 @@ -378,7 +378,7 @@ Once that's done, the main part of the i
    71 chmod ug-w /usr/X11R6/lib # Make sure the permissions are OK
    72 /sbin/ldconfig /usr/X11R6/lib # For Linux
    73 /sbin/ldconfig -m /usr/X11R6/lib # For FreeBSD, NetBSD, OpenBSD
    74 - /usr/X11R6/bin/mkfontdir /usr/X11R6/lib/X11/fonts/misc
    75 + /usr/X11R6/bin/mkfontdir /usr/share/fonts/misc
    76
    77 Generated from XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/Install.sgml,v 1.17 2003/02/24 17:09:16 dawes Exp $
    78
    79 diff -purN nx-X11.orig/programs/Xserver/hw/xfree86/doc/Japanese/man/XF86Config.man nx-X11/programs/Xserver/hw/xfree86/doc/Japanese/man/XF86Config.man
    80 --- nx-X11.orig/programs/Xserver/hw/xfree86/doc/Japanese/man/XF86Config.man 1998-04-04 20:28:40.000000000 -0600
    81 +++ nx-X11/programs/Xserver/hw/xfree86/doc/Japanese/man/XF86Config.man 2006-03-21 08:14:26.000000000 -0600
    82 @@ -99,16 +99,16 @@ EndSection
    83 .\" X11R6 allows the X server to request fonts from a font server. A
    84 .\" font server is specified by placing a "<trans>/<hostname>:<port_number>"
    85 .\" entry into the fontpath. For example, the fontpath
    86 -.\" "/usr/X11R6/lib/X11/fonts/misc/,tcp/zok:7100" tells the X server
    87 +.\" "/usr/share/fonts/misc/,tcp/zok:7100" tells the X server
    88 .\" to first try to locate the font in the local directory
    89 -.\" /usr/X11R6/lib/X11/fonts/misc. If that fails, then request the
    90 +.\" /usr/share/fonts/misc. If that fails, then request the
    91 .\" font from the \fIfont server\fP running on machine zok listening
    92 .\" for connections on TCP port number 7100.
    93 X11R6 は X サーバがフォントサーバにフォントを要求することが可能
    94 になりました。フォントサーバは場所を "<trans>/<hostname>:<port_number>"
    95 とフォントパスに指定します。例えば、フォントパス
    96 -"/usr/X11R6/lib/X11/fonts/misc/,tcp/zok:7100" はまず最初にローカル
    97 -ディレクトリ /usr/X11R6/lib/X11/fonts/misc を X サーバに伝えます。
    98 +"/usr/share/fonts/misc/,tcp/zok:7100" はまず最初にローカル
    99 +ディレクトリ /usr/share/fonts/misc を X サーバに伝えます。
    100 これが失敗したときに、ポート番号 7100 から TCP で接続して聞いて
    101 (listening) いる zok というホストで動作している \fIフォントサーバ\fP
    102 にフォントを要求します。
    103 diff -purN nx-X11.orig/programs/Xserver/hw/xfree86/doc/Japanese/sgml/RELNOTE.sgml nx-X11/programs/Xserver/hw/xfree86/doc/Japanese/sgml/RELNOTE.sgml
    104 --- nx-X11.orig/programs/Xserver/hw/xfree86/doc/Japanese/sgml/RELNOTE.sgml 1997-01-25 22:34:24.000000000 -0600
    105 +++ nx-X11/programs/Xserver/hw/xfree86/doc/Japanese/sgml/RELNOTE.sgml 2006-03-21 08:14:26.000000000 -0600
    106 @@ -1372,7 +1372,7 @@ However, if you didn't install <tt>X312D
    107 3.1.2D (or are not sure if you installed it), you should run the following:
    108
    109 <tscreen><verb>
    110 - /usr/X11R6/bin/mkfontdir /usr/X11R6/lib/X11/fonts/misc
    111 + /usr/X11R6/bin/mkfontdir /usr/share/fonts/misc
    112 </verb></tscreen>
    113
    114 An up-to-date version of the xterm termcap and terminfo entries is
    115 diff -purN nx-X11.orig/programs/Xserver/hw/xfree86/doc/README.SVR4 nx-X11/programs/Xserver/hw/xfree86/doc/README.SVR4
    116 --- nx-X11.orig/programs/Xserver/hw/xfree86/doc/README.SVR4 2000-02-29 19:48:14.000000000 -0600
    117 +++ nx-X11/programs/Xserver/hw/xfree86/doc/README.SVR4 2006-03-21 08:14:27.000000000 -0600
    118 @@ -295,9 +295,9 @@ you need to do:
    119 for i in *pc???.bdf
    120 do
    121 /usr/X11R6/bin/bdftopcf $i > \
    122 - /usr/X11R6/lib/X11/fonts/misc/`basename $i .bdf`.pcf
    123 + /usr/share/fonts/misc/`basename $i .bdf`.pcf
    124 done
    125 - cd /usr/X11R6/lib/X11/fonts/misc
    126 + cd /usr/share/fonts/misc
    127 /usr/X11R6/bin/mkfontdir
    128 # Do this only if the server is already running.
    129 /usr/X11R6/bin/xset fp rehash
    130 diff -purN nx-X11.orig/programs/Xserver/hw/xfree86/doc/README.fonts nx-X11/programs/Xserver/hw/xfree86/doc/README.fonts
    131 --- nx-X11.orig/programs/Xserver/hw/xfree86/doc/README.fonts 2003-01-19 22:10:02.000000000 -0600
    132 +++ nx-X11/programs/Xserver/hw/xfree86/doc/README.fonts 2006-03-21 08:14:27.000000000 -0600
    133 @@ -253,7 +253,7 @@ CMap `UniKS-UCS2-H' is called
    134
    135 The CIDFont code in XFree86 requires a very rigid directory structure. The
    136 main directory must be called `CID' (its location defaults to
    137 -`/usr/X11R6/lib/X11/fonts/CID' but it may be located anywhere), and it should
    138 +`/usr/share/fonts/CID' but it may be located anywhere), and it should
    139 contain a subdirectory for every CID collection. Every subdirectory must
    140 contain subdirectories called CIDFont (containing the actual CIDFont files),
    141 CMap (containing all the needed CMaps), AFM (containing the font metric
    142 @@ -398,7 +398,7 @@ dard fonts in a number of regional encod
    143
    144 For example, the font file
    145
    146 - /usr/X11R6/lib/X11/fonts/misc/6x13.bdf
    147 + /usr/share/fonts/misc/6x13.bdf
    148
    149 with XLFD
    150
    151 @@ -442,7 +442,7 @@ The main ClearlyU font has the XLFD
    152
    153 and resides in the font file
    154
    155 - /usr/X11R6/lib/X11/fonts/misc/cu12.pcf.gz
    156 + /usr/share/fonts/misc/cu12.pcf.gz
    157
    158 Additional ClearlyU fonts include
    159
    160 @@ -480,7 +480,7 @@ Standard Encoding. These fonts have XLF
    161
    162 and reside in the font files
    163
    164 - /usr/X11R6/lib/X11/fonts/Type1/cour*.pfa
    165 + /usr/share/fonts/Type1/cour*.pfa
    166
    167 The Adobe Utopia set of fonts only cover ISO 8859-1 as well as Adobe Standard
    168 Encoding. These fonts have XLFD
    169 @@ -489,7 +489,7 @@ Encoding. These fonts have XLFD
    170
    171 and reside in the font files
    172
    173 - /usr/X11R6/lib/X11/fonts/Type1/UT*.pfa
    174 + /usr/share/fonts/Type1/UT*.pfa
    175
    176 Finally, XFree86 also comes with Type 1 versions of Bitstream Courier and
    177 Charter. These fonts have XLFD
    178 @@ -499,7 +499,7 @@ Charter. These fonts have XLFD
    179
    180 and reside in the font files
    181
    182 - /usr/X11R6/lib/X11/fonts/Type1/c*bt_.pfb
    183 + /usr/share/fonts/Type1/c*bt_.pfb
    184
    185 3.3.2 Standard Speedo fonts
    186
    187 @@ -515,7 +515,7 @@ XLFD name
    188
    189 and reside in the font files
    190
    191 - /usr/X11R6/lib/X11/fonts/Speedo/font*.spd
    192 + /usr/share/fonts/Speedo/font*.spd
    193
    194 3.4 The Bigelow & Holmes Luxi family
    195
    196 @@ -699,7 +699,7 @@ The Speedo backend limits all encodings
    197 In order to use a font in an encoding that the font backend does not know
    198 about, you need to have an `encodings.dir' file either in the same directory
    199 as the font file used or in a system-wide location
    200 -(`/usr/X11R6/lib/X11/fonts/encodings/' by default).
    201 +(`/usr/share/fonts/encodings/' by default).
    202
    203 The `encodings.dir' file has a similar format to `fonts.dir'. Its first line
    204 specifies the number of encodings, while every successive line has two
    205 @@ -709,9 +709,9 @@ should agree with the encoding name defi
    206 ple,
    207
    208 3
    209 - mulearabic-0 /usr/X11R6/lib/X11/fonts/encodings/mulearabic-0.enc
    210 - mulearabic-1 /usr/X11R6/lib/X11/fonts/encodings/mulearabic-1.enc
    211 - mulearabic-2 /usr/X11R6/lib/X11/fonts/encodings/mulearabic-2.enc
    212 + mulearabic-0 /usr/share/fonts/encodings/mulearabic-0.enc
    213 + mulearabic-1 /usr/share/fonts/encodings/mulearabic-1.enc
    214 + mulearabic-2 /usr/share/fonts/encodings/mulearabic-2.enc
    215
    216 The name of an encoding must be specified in the encoding file's `STARTENCOD-
    217 ING' or `ALIAS' line. It is not enough to create an `encodings.dir' entry.
    218 diff -purN nx-X11.orig/programs/Xserver/hw/xfree86/doc/sgml/Install.sgml nx-X11/programs/Xserver/hw/xfree86/doc/sgml/Install.sgml
    219 --- nx-X11.orig/programs/Xserver/hw/xfree86/doc/sgml/Install.sgml 2003-02-24 11:09:16.000000000 -0600
    220 +++ nx-X11/programs/Xserver/hw/xfree86/doc/sgml/Install.sgml 2006-03-21 08:14:26.000000000 -0600
    221 @@ -432,7 +432,7 @@ ln -s /etc/X11/xserver /usr/X11R6/lib/X1
    222 chmod ug-w /usr/X11R6/lib # Make sure the permissions are OK
    223 /sbin/ldconfig /usr/X11R6/lib # For Linux
    224 /sbin/ldconfig -m /usr/X11R6/lib # For FreeBSD, NetBSD, OpenBSD
    225 -/usr/X11R6/bin/mkfontdir /usr/X11R6/lib/X11/fonts/misc
    226 +/usr/X11R6/bin/mkfontdir /usr/share/fonts/misc
    227 </verb></tscreen>
    228
    229 <sect1>Installing over an old installation
    230 @@ -511,7 +511,7 @@ Once that's done, the main part of the i
    231 chmod ug-w /usr/X11R6/lib # Make sure the permissions are OK
    232 /sbin/ldconfig /usr/X11R6/lib # For Linux
    233 /sbin/ldconfig -m /usr/X11R6/lib # For FreeBSD, NetBSD, OpenBSD
    234 -/usr/X11R6/bin/mkfontdir /usr/X11R6/lib/X11/fonts/misc
    235 +/usr/X11R6/bin/mkfontdir /usr/share/fonts/misc
    236 </verb></tscreen>
    237
    238 ]]>
    239 diff -purN nx-X11.orig/programs/Xserver/hw/xfree86/doc/sgml/SVR4.sgml nx-X11/programs/Xserver/hw/xfree86/doc/sgml/SVR4.sgml
    240 --- nx-X11.orig/programs/Xserver/hw/xfree86/doc/sgml/SVR4.sgml 1999-08-23 01:38:52.000000000 -0500
    241 +++ nx-X11/programs/Xserver/hw/xfree86/doc/sgml/SVR4.sgml 2006-03-21 08:14:26.000000000 -0600
    242 @@ -328,9 +328,9 @@ things you need to do:
    243 for i in *pc???.bdf
    244 do
    245 /usr/X11R6/bin/bdftopcf $i > \
    246 - /usr/X11R6/lib/X11/fonts/misc/`basename $i .bdf`.pcf
    247 + /usr/share/fonts/misc/`basename $i .bdf`.pcf
    248 done
    249 - cd /usr/X11R6/lib/X11/fonts/misc
    250 + cd /usr/share/fonts/misc
    251 /usr/X11R6/bin/mkfontdir
    252 # Do this only if the server is already running.
    253 /usr/X11R6/bin/xset fp rehash
    254 diff -purN nx-X11.orig/programs/Xserver/hw/xfree86/doc/sgml/fonts.sgml nx-X11/programs/Xserver/hw/xfree86/doc/sgml/fonts.sgml
    255 --- nx-X11.orig/programs/Xserver/hw/xfree86/doc/sgml/fonts.sgml 2003-01-19 21:43:08.000000000 -0600
    256 +++ nx-X11/programs/Xserver/hw/xfree86/doc/sgml/fonts.sgml 2006-03-21 08:14:26.000000000 -0600
    257 @@ -296,7 +296,7 @@ Munhwa-Regular--UniKS-UCS2-H
    258
    259 The CIDFont code in XFree86 requires a very rigid directory
    260 structure. The main directory must be called `<tt/CID/' (its location
    261 -defaults to `<tt>/usr/X11R6/lib/X11/fonts/CID</tt>' but it may be
    262 +defaults to `<tt>/usr/share/fonts/CID</tt>' but it may be
    263 located anywhere), and it should contain a subdirectory for every CID
    264 collection. Every subdirectory <it/must/ contain subdirectories
    265 called <tt/CIDFont/ (containing the actual CIDFont files), <tt/CMap/
    266 @@ -457,7 +457,7 @@ with no duplication of work.
    267
    268 For example, the font file
    269 <tscreen><verb>
    270 -/usr/X11R6/lib/X11/fonts/misc/6x13.bdf
    271 +/usr/share/fonts/misc/6x13.bdf
    272 </verb></tscreen>
    273 with XLFD
    274 <tscreen><verb>
    275 @@ -502,7 +502,7 @@ The main ClearlyU font has the XLFD
    276 </verb></tscreen>
    277 and resides in the font file
    278 <tscreen><verb>
    279 -/usr/X11R6/lib/X11/fonts/misc/cu12.pcf.gz
    280 +/usr/share/fonts/misc/cu12.pcf.gz
    281 </verb></tscreen>
    282 Additional ClearlyU fonts include
    283 <tscreen><verb>
    284 @@ -542,7 +542,7 @@ XLFD
    285 </verb></tscreen>
    286 and reside in the font files
    287 <tscreen><verb>
    288 -/usr/X11R6/lib/X11/fonts/Type1/cour*.pfa
    289 +/usr/share/fonts/Type1/cour*.pfa
    290 </verb></tscreen>
    291
    292 The Adobe Utopia set of fonts only cover ISO&nbsp;8859-1 as well as
    293 @@ -552,7 +552,7 @@ Adobe Standard Encoding. These fonts ha
    294 </verb></tscreen>
    295 and reside in the font files
    296 <tscreen><verb>
    297 -/usr/X11R6/lib/X11/fonts/Type1/UT*.pfa
    298 +/usr/share/fonts/Type1/UT*.pfa
    299 </verb></tscreen>
    300
    301 Finally, XFree86 also comes with Type&nbsp;1 versions of Bitstream
    302 @@ -563,7 +563,7 @@ Courier and Charter. These fonts have X
    303 </verb></tscreen>
    304 and reside in the font files
    305 <tscreen><verb>
    306 -/usr/X11R6/lib/X11/fonts/Type1/c*bt_.pfb
    307 +/usr/share/fonts/Type1/c*bt_.pfb
    308 </verb></tscreen>
    309
    310 <sect2>Standard Speedo fonts
    311 @@ -581,7 +581,7 @@ ISO&nbsp;8859-2. They have XLFD name
    312 </verb></tscreen>
    313 and reside in the font files
    314 <tscreen><verb>
    315 -/usr/X11R6/lib/X11/fonts/Speedo/font*.spd
    316 +/usr/share/fonts/Speedo/font*.spd
    317 </verb></tscreen>
    318
    319 <sect1>The Bigelow &amp; Holmes Luxi family
    320 @@ -770,7 +770,7 @@ The Speedo backend limits all encodings
    321 <p>In order to use a font in an encoding that the font backend does
    322 not know about, you need to have an `<tt/encodings.dir/' file either
    323 in the same directory as the font file used or in a system-wide
    324 -location (`<tt>/usr/X11R6/lib/X11/fonts/encodings/</tt>' by default).
    325 +location (`<tt>/usr/share/fonts/encodings/</tt>' by default).
    326
    327 The `<tt/encodings.dir/' file has a similar format to
    328 `<tt/fonts.dir/'. Its first line specifies the number of encodings,
    329 @@ -781,9 +781,9 @@ encoding name defined in the encoding fi
    330
    331 <tscreen><verb>
    332 3
    333 -mulearabic-0 /usr/X11R6/lib/X11/fonts/encodings/mulearabic-0.enc
    334 -mulearabic-1 /usr/X11R6/lib/X11/fonts/encodings/mulearabic-1.enc
    335 -mulearabic-2 /usr/X11R6/lib/X11/fonts/encodings/mulearabic-2.enc
    336 +mulearabic-0 /usr/share/fonts/encodings/mulearabic-0.enc
    337 +mulearabic-1 /usr/share/fonts/encodings/mulearabic-1.enc
    338 +mulearabic-2 /usr/share/fonts/encodings/mulearabic-2.enc
    339 </verb></tscreen>
    340
    341 The name of an encoding <it/must/ be specified in the encoding file's
    342 diff -purN nx-X11.orig/programs/Xserver/hw/xfree86/drivers/newport/XF86Config.indy nx-X11/programs/Xserver/hw/xfree86/drivers/newport/XF86Config.indy
    343 --- nx-X11.orig/programs/Xserver/hw/xfree86/drivers/newport/XF86Config.indy 2003-02-19 22:05:16.000000000 -0600
    344 +++ nx-X11/programs/Xserver/hw/xfree86/drivers/newport/XF86Config.indy 2006-03-21 08:14:34.000000000 -0600
    345 @@ -52,15 +52,15 @@ Section "Files"
    346 # as well as specifying multiple comma-separated entries in one FontPath
    347 # command (or a combination of both methods)
    348
    349 - FontPath "/usr/X11R6/lib/X11/fonts/local/"
    350 - FontPath "/usr/X11R6/lib/X11/fonts/misc/"
    351 - FontPath "/usr/X11R6/lib/X11/fonts/75dpi/:unscaled"
    352 - FontPath "/usr/X11R6/lib/X11/fonts/100dpi/:unscaled"
    353 - FontPath "/usr/X11R6/lib/X11/fonts/Type1/"
    354 - FontPath "/usr/X11R6/lib/X11/fonts/CID/"
    355 - FontPath "/usr/X11R6/lib/X11/fonts/Speedo/"
    356 - FontPath "/usr/X11R6/lib/X11/fonts/75dpi/"
    357 - FontPath "/usr/X11R6/lib/X11/fonts/100dpi/"
    358 + FontPath "/usr/share/fonts/local/"
    359 + FontPath "/usr/share/fonts/misc/"
    360 + FontPath "/usr/share/fonts/75dpi/:unscaled"
    361 + FontPath "/usr/share/fonts/100dpi/:unscaled"
    362 + FontPath "/usr/share/fonts/Type1/"
    363 + FontPath "/usr/share/fonts/CID/"
    364 + FontPath "/usr/share/fonts/Speedo/"
    365 + FontPath "/usr/share/fonts/75dpi/"
    366 + FontPath "/usr/share/fonts/100dpi/"
    367
    368 # ModulePath can be used to set a search path for the X server modules.
    369 # The default path is shown here.
    370 diff -purN nx-X11.orig/programs/Xserver/hw/xfree86/etc/install.sv3 nx-X11/programs/Xserver/hw/xfree86/etc/install.sv3
    371 --- nx-X11.orig/programs/Xserver/hw/xfree86/etc/install.sv3 1999-03-28 09:32:52.000000000 -0600
    372 +++ nx-X11/programs/Xserver/hw/xfree86/etc/install.sv3 2006-03-21 08:14:25.000000000 -0600
    373 @@ -549,9 +549,9 @@ then
    374 read answer
    375 [ "$answer" = "y" -o "$answer" = "Y" ] && {
    376 sed -e 's/FONT 8x16/FONT vga/' </usr/lib/loadfont/vga437.bdf \
    377 - | bdftopcf -t >/usr/X11R6/lib/X11/fonts/misc/vga.pcf
    378 - chmod 644 /usr/X11R6/lib/X11/fonts/misc/fonts.dir
    379 - mkfontdir /usr/X11R6/lib/X11/fonts/misc
    380 + | bdftopcf -t >/usr/share/fonts/misc/vga.pcf
    381 + chmod 644 /usr/share/fonts/misc/fonts.dir
    382 + mkfontdir /usr/share/fonts/misc
    383 }
    384 fi
    385 }
    386 diff -purN nx-X11.orig/programs/mkcfm/mkcfm.c nx-X11/programs/mkcfm/mkcfm.c
    387 --- nx-X11.orig/programs/mkcfm/mkcfm.c 2002-12-09 11:30:12.000000000 -0600
    388 +++ nx-X11/programs/mkcfm/mkcfm.c 2006-03-21 08:14:10.000000000 -0600
    389 @@ -48,7 +48,7 @@
    390 static void CIDFillVals(FontScalablePtr);
    391 static Bool DoDirectory(char *dirName);
    392
    393 -#define DEFAULTCID "/usr/X11R6/lib/X11/fonts/CID"
    394 +#define DEFAULTCID "/usr/share/fonts/CID"
    395 #define DECIPOINTSPERINCH 722.7
    396 #define DEFAULTRES 75
    397 #define DEFAULTPOINTSIZE 120
    398 diff -purN nx-X11.orig/programs/mkcfm/mkcfm.man nx-X11/programs/mkcfm/mkcfm.man
    399 --- nx-X11.orig/programs/mkcfm/mkcfm.man 1999-05-15 07:10:38.000000000 -0500
    400 +++ nx-X11/programs/mkcfm/mkcfm.man 2006-03-21 08:14:10.000000000 -0600
    401 @@ -24,7 +24,7 @@ mkcfm - create summaries of font metric
    402 [\fICID-font-directory-name\fP]
    403 .SH DESCRIPTION
    404 There is usually only one CID font directory on the X font path. It is
    405 -usually called \fI/usr/X11R6/lib/X11/fonts/CID\fP. If you do not specify
    406 +usually called \fI/usr/share/fonts/CID\fP. If you do not specify
    407 an argument, \fImkcfm\fP will try to go through the subdirectories of
    408 that directory, and create one summary of font metric files for each
    409 CIDFont (character descriptions) file and each CMap (Character Maps) file
    410 diff -purN nx-X11.orig/programs/xfs/xfs.man nx-X11/programs/xfs/xfs.man
    411 --- nx-X11.orig/programs/xfs/xfs.man 2001-12-14 14:01:32.000000000 -0600
    412 +++ nx-X11/programs/xfs/xfs.man 2006-03-21 08:14:56.000000000 -0600
    413 @@ -186,9 +186,9 @@ XCOMM where to look for fonts
    414 XCOMM the first is a set of Speedo outlines, the second is a set of
    415 XCOMM misc bitmaps and the last is a set of 100dpi bitmaps
    416 XCOMM
    417 -catalogue = /usr/X11R6/lib/X11/fonts/speedo,
    418 - /usr/X11R6/lib/X11/fonts/misc,
    419 - /usr/X11R6/lib/X11/fonts/100dpi/
    420 +catalogue = /usr/share/fonts/speedo,
    421 + /usr/share/fonts/misc,
    422 + /usr/share/fonts/100dpi/
    423
    424 XCOMM in 12 points, decipoints
    425 default-point-size = 120