sun-paths.patch revision 1088
1088N/Adiff -Nurp -x '*~' -x '*.orig' hw/xfree86/common/xf86Config.c hw/xfree86/common/xf86Config.c
1088N/A--- hw/xfree86/common/xf86Config.c 2010-06-10 23:10:22.000000000 -0700
1088N/A+++ hw/xfree86/common/xf86Config.c 2011-02-15 15:53:04.379144701 -0800
1088N/A@@ -75,9 +75,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," \
1088N/A@@ -85,8 +85,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," \
1088N/Adiff -Nurp -x '*~' -x '*.orig' hw/xfree86/common/xf86Globals.c hw/xfree86/common/xf86Globals.c
1088N/A--- hw/xfree86/common/xf86Globals.c 2010-06-06 14:37:03.000000000 -0700
1088N/A+++ hw/xfree86/common/xf86Globals.c 2011-02-15 15:53:04.379410669 -0800
1088N/A@@ -140,7 +140,8 @@ xf86InfoRec xf86Info = {
851N/A };
851N/A const char *xf86ConfigFile = NULL;
1088N/A const char *xf86ConfigDir = 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;
1088N/Adiff -Nurp -x '*~' -x '*.orig' hw/xfree86/doc/man/xorg.conf.man.pre hw/xfree86/doc/man/xorg.conf.man.pre
1088N/A--- hw/xfree86/doc/man/xorg.conf.man.pre 2010-06-10 23:10:22.000000000 -0700
1088N/A+++ hw/xfree86/doc/man/xorg.conf.man.pre 2011-02-15 15:53:04.380098603 -0800
1088N/A@@ -36,9 +36,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__
1088N/A@@ -70,10 +70,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__
1088N/Adiff -Nurp -x '*~' -x '*.orig' include/xorg-server.h.in include/xorg-server.h.in
1088N/A--- include/xorg-server.h.in 2011-02-15 15:53:02.434190580 -0800
1088N/A+++ include/xorg-server.h.in 2011-02-15 15:53:04.380266311 -0800
1088N/A@@ -184,6 +184,7 @@
1088N/A /* X Access Control Extension */
1088N/A #undef XACE
1088N/A
1088N/A+#include <sys/isa_defs.h> /* Ensure _LP64 is defined when needed on Solaris */
1088N/A #ifdef _LP64
1088N/A #define _XSERVER64 1
1088N/A #endif