sun-paths.patch revision 1018
1018N/Adiff -urp -x '*~' -x '*.orig' hw/xfree86/common/xf86Config.c hw/xfree86/common/xf86Config.c
1018N/A--- hw/xfree86/common/xf86Config.c 2010-05-03 17:47:58.000000000 -0700
1018N/A+++ hw/xfree86/common/xf86Config.c 2010-10-20 20:27:00.062592706 -0700
1018N/A@@ -77,9 +77,9 @@ extern DeviceAssocRec mouse_assoc;
1018N/A */
1018N/A #ifndef ROOT_CONFIGPATH
1018N/A #define ROOT_CONFIGPATH "%A," "%R," \
1018N/A- "/etc/X11/%R," "%P/etc/X11/%R," \
1018N/A+ "/etc/X11/%R," "%P/lib/X11/%R," \
1018N/A "%E," "%F," \
1018N/A- "/etc/X11/%F," "%P/etc/X11/%F," \
1018N/A+ "/etc/X11/%F," "%P/lib/X11/%F," \
1018N/A "/etc/X11/%X-%M," "/etc/X11/%X," "/etc/%X," \
1018N/A "%P/etc/X11/%X.%H," "%P/etc/X11/%X-%M," \
1018N/A "%P/etc/X11/%X," \
1018N/A@@ -87,8 +87,8 @@ extern DeviceAssocRec mouse_assoc;
1018N/A "%P/lib/X11/%X"
1018N/A #endif
1018N/A #ifndef USER_CONFIGPATH
1018N/A-#define USER_CONFIGPATH "/etc/X11/%S," "%P/etc/X11/%S," \
1018N/A- "/etc/X11/%G," "%P/etc/X11/%G," \
1018N/A+#define USER_CONFIGPATH "/etc/X11/%S," "%P/lib/X11/%S," \
1018N/A+ "/etc/X11/%G," "%P/lib/X11/%G," \
1018N/A "/etc/X11/%X-%M," "/etc/X11/%X," "/etc/%X," \
1018N/A "%P/etc/X11/%X.%H," "%P/etc/X11/%X-%M," \
1018N/A "%P/etc/X11/%X," \
851N/Adiff -urp -x '*~' -x '*.orig' hw/xfree86/common/xf86Globals.c hw/xfree86/common/xf86Globals.c
851N/A--- hw/xfree86/common/xf86Globals.c 2009-11-22 16:35:01.000000000 -0800
851N/A+++ hw/xfree86/common/xf86Globals.c 2009-12-02 18:57:45.196668578 -0800
851N/A@@ -143,7 +143,8 @@ xf86InfoRec xf86Info = {
851N/A #endif
851N/A };
851N/A const char *xf86ConfigFile = NULL;
851N/A-const char *xf86ModulePath = DEFAULT_MODULE_PATH;
851N/A+/* Sun: add old module path for compatibility with out-of-tree driver packages */
851N/A+const char *xf86ModulePath = DEFAULT_MODULE_PATH ",/usr/X11/lib/modules/";
851N/A MessageType xf86ModPathFrom = X_DEFAULT;
851N/A const char *xf86LogFile = DEFAULT_LOGPREFIX;
851N/A MessageType xf86LogFileFrom = X_DEFAULT;
1018N/Adiff -urp -x '*~' -x '*.orig' hw/xfree86/doc/man/xorg.conf.man.pre hw/xfree86/doc/man/xorg.conf.man.pre
1018N/A--- hw/xfree86/doc/man/xorg.conf.man.pre 2010-05-03 17:47:59.000000000 -0700
1018N/A+++ hw/xfree86/doc/man/xorg.conf.man.pre 2010-10-20 20:27:00.063252935 -0700
1018N/A@@ -28,9 +28,9 @@ server is started as a normal user:
1018N/A .RS 4
1018N/A .nf
1018N/A .IR /etc/X11/ <cmdline>
1018N/A-.IR __projectroot__/etc/X11/ <cmdline>
1018N/A+.IR __projectroot__/lib/X11/ <cmdline>
1018N/A .IB /etc/X11/ $XORGCONFIG
1018N/A-.IB __projectroot__/etc/X11/ $XORGCONFIG
1018N/A+.IB __projectroot__/lib/X11/ $XORGCONFIG
1018N/A .I /etc/X11/__xconfigfile__\-4
1018N/A .I /etc/X11/__xconfigfile__
1018N/A .I /etc/__xconfigfile__
1018N/A@@ -62,10 +62,10 @@ search locations are as follows:
1018N/A .nf
1018N/A <cmdline>
1018N/A .IR /etc/X11/ <cmdline>
1018N/A-.IR __projectroot__/etc/X11/ <cmdline>
1018N/A+.IR __projectroot__/lib/X11/ <cmdline>
1018N/A .B $XORGCONFIG
1018N/A .IB /etc/X11/ $XORGCONFIG
1018N/A-.IB __projectroot__/etc/X11/ $XORGCONFIG
1018N/A+.IB __projectroot__/lib/X11/ $XORGCONFIG
1018N/A .I /etc/X11/__xconfigfile__\-4
1018N/A .I /etc/X11/__xconfigfile__
1018N/A .I /etc/__xconfigfile__