sun-paths.patch revision 1124
1124N/Adiff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
1124N/Aindex 5312ca6..9622eab 100644
1124N/A--- a/hw/xfree86/common/xf86Config.c
1124N/A+++ b/hw/xfree86/common/xf86Config.c
1124N/A@@ -74,9 +74,9 @@
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," \
1124N/A "/etc/X11/%X," "/etc/%X," \
1124N/A "%P/etc/X11/%X.%H," \
1018N/A "%P/etc/X11/%X," \
1124N/A@@ -84,8 +84,8 @@
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," \
1124N/A "/etc/X11/%X," "/etc/%X," \
1124N/A "%P/etc/X11/%X.%H," \
1018N/A "%P/etc/X11/%X," \
1124N/Adiff --git a/hw/xfree86/common/xf86Globals.c b/hw/xfree86/common/xf86Globals.c
1124N/Aindex 16d5557..f87c1eb 100644
1124N/A--- a/hw/xfree86/common/xf86Globals.c
1124N/A+++ b/hw/xfree86/common/xf86Globals.c
1124N/A@@ -138,7 +138,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;
1124N/Adiff --git a/hw/xfree86/doc/man/xorg.conf.man b/hw/xfree86/doc/man/xorg.conf.man
1124N/Aindex e3fd0ea..dac9a10 100644
1124N/A--- a/hw/xfree86/doc/man/xorg.conf.man
1124N/A+++ b/hw/xfree86/doc/man/xorg.conf.man
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__
1018N/A .I /etc/__xconfigfile__
1124N/A .IR __projectroot__/etc/X11/__xconfigfile__. <hostname>
1124N/A@@ -67,10 +67,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__
1018N/A .I /etc/__xconfigfile__
1124N/A .IR __projectroot__/etc/X11/__xconfigfile__. <hostname>
1124N/Adiff --git a/include/xorg-server.h.in b/include/xorg-server.h.in
1124N/Aindex b10b994..feaedfc 100644
1124N/A--- a/include/xorg-server.h.in
1124N/A+++ b/include/xorg-server.h.in
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