Index: xc/ChangeLog
===================================================================
RCS file: /cvs/xorg/xc/ChangeLog,v
retrieving revision 1.229
diff -u -2 -0 -r1.229 ChangeLog
--- xc/ChangeLog	11 Aug 2004 08:05:31 -0000	1.229
+++ xc/ChangeLog	11 Aug 2004 13:48:15 -0000
@@ -1,20 +1,25 @@
+2004-08-11 Roland Mainz <roland.mainz@nrubsig.org>
+        * xc/programs/Xserver/Xprint/etc/init.d/xprint.cpp
+        Bugzilla #492: /etc/init.d/xprint did not source xorg.conf
+        for font paths additionally to xfree86 config files
+
 2004-08-11  Eric Anholt  <anholt@FreeBSD.org>
 
 	* programs/x11perf/Imakefile:
 	* programs/x11perf/do_traps.c: (InitFixedTraps):
 	- Fix the build with old libXrender headers installed by including
 	  TOP_INCLUDES first in the INCLUDES line.
 	- Drive-by fix of unused variables warnings in do_traps.c.
 
 2004-08-10  Adam Jackson <ajax@freedesktop.org>
 
 	* lib/X11/PolyReg.c:
 	Bug #372: Prevent a crash in XPolygonRegion when called with a bogus
 	point count.  Reported by Andreas Luik.
 
 2004-08-10  Adam Jackson <ajax@freedesktop.org>
 
 	* programs/Xserver/hw/xfree86/drivers/ati/atimodule.c:
 	Bug #978: Silence more unresolved symbol warnings from the ati driver.
 	Patch from Stefan Dirsch.
 
Index: xc/programs/Xserver/Xprint/etc/init.d/xprint.cpp
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/Xprint/etc/init.d/xprint.cpp,v
retrieving revision 1.1
diff -u -2 -0 -r1.1 xprint.cpp
--- xc/programs/Xserver/Xprint/etc/init.d/xprint.cpp	30 Jul 2004 12:03:56 -0000	1.1
+++ xc/programs/Xserver/Xprint/etc/init.d/xprint.cpp	11 Aug 2004 13:49:08 -0000
@@ -246,51 +246,66 @@
                 *)    [ "${key}" = "catalogue" -a "${tok}" != "" ] && echo "${tok}" ;;
               esac
               tok="${val#*=}"
           done
       done
     ) | tr "," "[\n]" | fontpath2fontlist
 }
 
 get_fontlist_from_all_xfs_configs()
 {
     get_fontlist_from_xfs_config "/etc/openwin/fs/fontserver.cfg"
     get_fontlist_from_xfs_config "/usr/openwin/lib/X11/fontserver.cfg"
     get_fontlist_from_xfs_config "/etc/X11/fs-xtt/config"
     get_fontlist_from_xfs_config "/etc/X11/fs/config"
     get_fontlist_from_xfs_config "/etc/X11/xfs/config"
     get_fontlist_from_xfs_config "${XPROJECTROOT}/lib/X11/fs/config"
 }
 
 get_fontlist_from_xf86config()
 {
-    srcxf86configfile=""
-    [ -f "/etc/X11/XF86Config-4" ] && srcxf86configfile="/etc/X11/XF86Config-4"
-    [ -f "/etc/X11/XF86Config" ]   && srcxf86configfile="/etc/X11/XF86Config"
+    srcxconf=""
 
+    XCOMM see xorg.conf(5x) manual page for the list of locations used here    
+    [ "${srcxconf}" = "" -a -f "/etc/X11/xorg.conf"  ]                      && srcxconf="/etc/X11/xorg.conf"
+    [ "${srcxconf}" = "" -a -f "/usr/X11R6/etc/X11/xorg.conf" ]             && srcxconf="/usr/X11R6/etc/X11/xorg.conf"
+    [ "${srcxconf}" = "" -a -f "/etc/X11/xorg.conf-4" ]                     && srcxconf="/etc/X11/xorg.conf-4"
+    [ "${srcxconf}" = "" -a -f "/etc/X11/xorg.conf" ]                       && srcxconf="/etc/X11/xorg.conf"
+    [ "${srcxconf}" = "" -a -f "/etc/xorg.conf" ]                           && srcxconf="/etc/xorg.conf"
+    [ "${srcxconf}" = "" -a -f "/usr/X11R6/etc/X11/xorg.conf.${hostname}" ] && srcxconf="/usr/X11R6/etc/X11/xorg.conf.${hostname}"
+    [ "${srcxconf}" = "" -a -f "/usr/X11R6/etc/X11/xorg.conf-4" ]           && srcxconf="/usr/X11R6/etc/X11/xorg.conf-4"
+    [ "${srcxconf}" = "" -a -f "/usr/X11R6/etc/X11/xorg.conf" ]             && srcxconf="/usr/X11R6/etc/X11/xorg.conf"
+    [ "${srcxconf}" = "" -a -f "/usr/X11R6/lib/X11/xorg.conf.${hostname}" ] && srcxconf="/usr/X11R6/lib/X11/xorg.conf.${hostname}"
+    [ "${srcxconf}" = "" -a -f "/usr/X11R6/lib/X11/xorg.conf-4" ]           && srcxconf="/usr/X11R6/lib/X11/xorg.conf-4"
+    [ "${srcxconf}" = "" -a -f "/usr/X11R6/lib/X11/xorg.conf" ]             && srcxconf="/usr/X11R6/lib/X11/xorg.conf"
+
+    XCOMM Xfree86 locations
+    [ "${srcxconf}" = "" -a -f "/etc/X11/XF86Config-4" ] && srcxconf="/etc/X11/XF86Config-4"
+    [ "${srcxconf}" = "" -a -f "/etc/X11/XF86Config" ]   && srcxconf="/etc/X11/XF86Config"
 
-    if [ "${srcxf86configfile}" = "" ] ; then
+
+    if [ "${srcxconf}" = "" ] ; then
         return 0
     fi
 
     currsection=""
-    cat "${srcxf86configfile}" |
+    cat "${srcxconf}" |
     while read i1 i2 i3 i4 ; do
         # Strip "\"" from I2
         i2="${i2#\"}" ; i2="${i2%\"}"
 
         case "${i1}" in
             \#*)
                 continue
                 ;;
             'Section')
                 currsection="${i2}"
                 ;;
             'EndSection')
                 currsection=""
                 ;;
             'FontPath')
                 [ "$currsection" = "Files" ] && echo "${i2%:unscaled}"
                 ;;
         esac  
     done | egrep -v -i "tcp/|tcp4/|tcp6/|unix/"