###############################################################################

#

# Copyright 2009 Sun Microsystems, Inc. All rights reserved.

# Use is subject to license terms.

#

# Permission is hereby granted, free of charge, to any person obtaining a

# copy of this software and associated documentation files (the

# "Software"), to deal in the Software without restriction, including

# without limitation the rights to use, copy, modify, merge, publish,

# distribute, and/or sell copies of the Software, and to permit persons

# to whom the Software is furnished to do so, provided that the above

# copyright notice(s) and this permission notice appear in all copies of

# the Software and that both the above copyright notice(s) and this

# permission notice appear in supporting documentation.

#

# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

#

# Except as contained in this notice, the name of a copyright holder

# shall not be used in advertising or otherwise to promote the sale, use

# or other dealings in this Software without prior written authorization

# of the copyright holder.

#

diff -urp -x '*~' -x '*.orig' config.cpp config.cpp

--- config.cpp 2008-12-03 19:43:27.000000000 -0800

+++ config.cpp 2009-06-18 14:33:55.670348000 -0700

@@ -1,6 +1,13 @@

XCOMM X font server configuration file

XCOMM See xfs(__appmansuffix__) man page for more information.

+XCOMM DO NOT EDIT /usr/lib/X11/fs/config directly.

+XCOMM

+XCOMM /usr/lib/X11/fs/config is a factory-default file and will

+XCOMM be unconditionally overwritten upon subsequent installation.

+XCOMM Before making changes to the file, copy it to the system configuration

+XCOMM location, /etc/X11/fs/config and edit it there.

+

clone-self = on

use-syslog = off

catalogue = DEFAULTFONTPATH