--- a/open-src/xserver/Makefile.inc	Wed Oct 21 10:31:36 2009 -0700
+++ b/open-src/xserver/Makefile.inc	Thu Oct 22 15:54:44 2009 -0700
@@ -28,7 +28,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# ident	"@(#)Makefile.inc	1.17	09/10/12 SMI"
+# ident	"@(#)Makefile.inc	1.18	09/10/22 SMI"
 #
 
 PWD:sh=pwd
@@ -65,6 +65,7 @@
 	--with-module-dir=$(SERVER_MODULES_DIR) \
 	--with-dri-driver-path=$(DRI_MODULES_DIR) \
 	--with-xkb-path='$${libdir}/X11/xkb' \
+	--with-xkb-bindir='$${exec_prefix}/bin' \
 	--with-serverconfig-path='$${libdir}/X11/xserver' \
 	--with-default-font-path="catalogue:/etc/X11/fontpath.d" \
 	--with-default-xkb-rules=xorg \

--- a/open-src/xserver/xorg/sun-paths.patch	Wed Oct 21 10:31:36 2009 -0700
+++ b/open-src/xserver/xorg/sun-paths.patch	Thu Oct 22 15:54:44 2009 -0700
@@ -1,6 +1,28 @@
+diff -urp -x '*~' -x '*.orig' configure.ac configure.ac
+--- configure.ac	2009-10-22 13:54:32.540502728 -0700
++++ configure.ac	2009-10-22 13:54:33.966045650 -0700
+@@ -476,6 +476,9 @@ AC_ARG_WITH(default-font-path, AS_HELP_S
+ AC_ARG_WITH(xkb-path,         AS_HELP_STRING([--with-xkb-path=PATH], [Path to XKB base dir (default: ${datadir}/X11/xkb)]),
+ 				[ XKBPATH="$withval" ],
+ 				[ XKBPATH="${datadir}/X11/xkb" ])
++AC_ARG_WITH(xkb-bindir,       AS_HELP_STRING([--with-xkb-bindir=PATH], [Path to XKB program dir (default: ${bindir})]),
++				[ XKBBINDIR="$withval" ],
++				[ XKBBINDIR="${bindir}" ])
+ AC_ARG_WITH(xkb-output,       AS_HELP_STRING([--with-xkb-output=PATH], [Path to XKB output dir (default: ${datadir}/X11/xkb/compiled)]),
+ 				[ XKBOUTPUT="$withval" ],
+ 				[ XKBOUTPUT="compiled" ])
+@@ -1017,7 +1020,7 @@ AC_DEFINE(XKB, 1, [Build XKB])
+ AC_DEFINE(XKB_IN_SERVER, 1, [Build XKB server])
+ AC_DEFINE(XKB_DFLT_DISABLED, 0, [Disable XKB per default])
+ AC_DEFINE_DIR(XKB_BASE_DIRECTORY, XKBPATH, [Path to XKB data])
+-AC_DEFINE_DIR(XKB_BIN_DIRECTORY, bindir, [Path to XKB bin dir])
++AC_DEFINE_DIR(XKB_BIN_DIRECTORY, XKBBINDIR, [Path to XKB bin dir])
+ 
+ dnl Make sure XKM_OUTPUT_DIR is an absolute path
+ XKBOUTPUT_FIRSTCHAR=`echo $XKBOUTPUT | cut -b 1`
 diff -urp -x '*~' -x '*.orig' hw/xfree86/common/xf86Configure.c hw/xfree86/common/xf86Configure.c
---- hw/xfree86/common/xf86Configure.c	2009-01-09 09:47:03.000000000 -0800
-+++ hw/xfree86/common/xf86Configure.c	2009-01-22 20:33:12.636229000 -0800
+--- hw/xfree86/common/xf86Configure.c	2009-10-11 19:52:40.000000000 -0700
++++ hw/xfree86/common/xf86Configure.c	2009-10-22 13:54:33.966485848 -0700
 @@ -518,7 +518,8 @@ configureModuleSection (void)
              /* 'strstr(dFP,"/dir")' is meant as 'dFP =~ m(/dir\W)' */
      	    if (defaultFontPath && (
@@ -11,15 +33,3 @@
      	        (strcmp(*el, "type1")  == 0 &&
  		 strstr(defaultFontPath, "/Type1")))) 
  	    	ptr->mod_load_lst = (XF86LoadPtr)xf86addListItem(
-diff -urp -x '*~' -x '*.orig' xkb/xkbInit.c xkb/xkbInit.c
---- xkb/xkbInit.c	2009-01-22 20:33:05.826163000 -0800
-+++ xkb/xkbInit.c	2009-01-22 20:33:12.637635000 -0800
-@@ -94,7 +94,7 @@ typedef struct	_SrvXkmInfo {
- #endif
- 
- char	*		XkbBaseDirectory=	XKB_BASE_DIRECTORY;
--char	*		XkbBinDirectory=	XKB_BIN_DIRECTORY;
-+char	*		XkbBinDirectory=	XKB_BASE_DIRECTORY;
- static int	 	XkbWantAccessX=		0;	
- 
- static Bool		rulesDefined=		False;

--- a/packages/SUNWxorg-server/prototype_com	Wed Oct 21 10:31:36 2009 -0700
+++ b/packages/SUNWxorg-server/prototype_com	Thu Oct 22 15:54:44 2009 -0700
@@ -30,7 +30,7 @@
 #
 ###########################################################################
 #
-# ident "@(#)prototype_com 1.34     09/06/24 SMI"
+# ident	"@(#)prototype_com	1.35	09/10/22 SMI"
 #
 # X.Org Foundation X server for Solaris & OpenSolaris
 
@@ -103,10 +103,6 @@
 d none X11/lib 0755 root bin
 d none X11/lib/X11 0755 root bin
 s none X11/lib/X11/doc=../../share/doc
-d none X11/lib/X11/xkb 0755 root bin
-s none X11/lib/X11/xkb/xkbcomp=../../../bin/xkbcomp
-s none X11/lib/X11/xkb/README.config=../../../share/doc/README.XKB-Config
-s none X11/lib/X11/xkb/README.enhancing=../../../share/doc/README.XKB-Enhancing
 
 d none X11/share/man 0755 root bin
 s none X11/man=share/man