Magellan Linux

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

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