upstream/oracle/x-cons/x-s12-clone: changeset 1112:4778e9ecf66e

--- a/open-src/doc/xorg-sgml-doctools/Makefile	Sun Apr 10 11:12:44 2011 -0700
+++ b/open-src/doc/xorg-sgml-doctools/Makefile	Mon Apr 11 11:04:15 2011 -0700
@@ -1,6 +1,6 @@
 ###############################################################################
 #
-# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -31,11 +31,11 @@
 MODULE_PKGTAIL_SET=yes
 
 # Version number (used in path names)
-MODULE_VERSION=1.6
+MODULE_VERSION=1.7
 
 # Checksums for upstream tarball
-TARBALL_MD5  = fe333413fd4139de07ebfa36039b8a59
-TARBALL_SHA1 = adb6da74caadde7a568cfd6e8933e8e2f3179a54
+TARBALL_MD5  = 2588efb3f49f7fc6ecf41ce42e0b2e5e
+TARBALL_SHA1 = 5301166d1e36df9cd796adf944d003f32b7b4945
 
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES=

--- a/open-src/lib/libX11/Makefile	Sun Apr 10 11:12:44 2011 -0700
+++ b/open-src/lib/libX11/Makefile	Mon Apr 11 11:04:15 2011 -0700
@@ -27,14 +27,16 @@
 MODULE_NAME=libX11
 
 # Version number (used in path names)
-MODULE_VERSION = 1.4.1
+MODULE_VERSION = 1.4.3
 
 # Checksums for upstream tarball
-TARBALL_MD5  = 4603bdbce1bd73cbc140de402fe6ed24
-TARBALL_SHA1 = 83590cdac5071b7154b223d73655edcfc82095c1
+TARBALL_MD5  = 85e942627aaa020813e0eb8433353563
+TARBALL_SHA1 = 174270a0e51614b5077026fc6c20701d4e09aef8
 
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES = \
+	xml-install.patch,-p1 \
+	xml-install-paths.patch,-p1 \
 	1234757.patch \
 	4010755.patch \
 	4614834.patch \

--- a/open-src/lib/libX11/SolarisIA.patch	Sun Apr 10 11:12:44 2011 -0700
+++ b/open-src/lib/libX11/SolarisIA.patch	Mon Apr 11 11:04:15 2011 -0700
@@ -20,10 +20,10 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
 #
-diff -urp -x '*~' -x '*.orig' src/Makefile.am src/Makefile.am
---- src/Makefile.am	2011-01-11 22:59:47.437339035 -0800
-+++ src/Makefile.am	2011-01-11 22:59:48.281136834 -0800
-@@ -353,6 +353,9 @@ libX11_xcb_la_SOURCES = x11_xcb.c Xxcbin
+diff -Nurp -x '*~' -x '*.orig' src/Makefile.am src/Makefile.am
+--- src/Makefile.am	2011-04-06 13:52:16.515334675 -0700
++++ src/Makefile.am	2011-04-06 13:52:17.726885350 -0700
+@@ -352,6 +352,9 @@ libX11_xcb_la_SOURCES = x11_xcb.c Xxcbin
  libX11_xcb_la_LDFLAGS = -version-number 1:0:0 -no-undefined
  libX11_xcb_la_LIBADD = libX11.la
  
@@ -33,9 +33,9 @@
  #
  # Figure out which sub-libraries to link into Xlib
  #
-diff -urp -x '*~' -x '*.orig' src/OpenDis.c src/OpenDis.c
---- src/OpenDis.c	2011-01-11 22:59:47.426484930 -0800
-+++ src/OpenDis.c	2011-01-11 22:59:48.281461847 -0800
+diff -Nurp -x '*~' -x '*.orig' src/OpenDis.c src/OpenDis.c
+--- src/OpenDis.c	2011-04-06 13:52:16.502368856 -0700
++++ src/OpenDis.c	2011-04-06 13:52:17.727406866 -0700
 @@ -38,6 +38,12 @@ in this Software without prior written a
  #include "XKBlib.h"
  #endif /* XKB */
@@ -47,9 +47,9 @@
 +/* end SUNSOFT_INTERACTIVE */
 +
  #if defined(XTHREADS) && defined(SUNSOFT)
- DisplayPtrLink *HeadDisplay=NULL;
- DisplayPtrLink *LastDisplay=NULL;
-@@ -595,6 +601,21 @@ fallback_success:
+ struct _DisplayPtrLink {
+     Display *dpy;
+@@ -605,6 +611,21 @@ fallback_success:
  #ifdef XKB
  	XkbUseExtension(dpy,NULL,NULL);
  #endif

--- a/open-src/lib/libX11/im-ximcp.patch	Sun Apr 10 11:12:44 2011 -0700
+++ b/open-src/lib/libX11/im-ximcp.patch	Mon Apr 11 11:04:15 2011 -0700
@@ -21,9 +21,9 @@
 # DEALINGS IN THE SOFTWARE.
 #
 
-diff -urp -x '*~' -x '*.orig' modules/im/ximcp/imImSw.c modules/im/ximcp/imImSw.c
+diff -Nurp -x '*~' -x '*.orig' modules/im/ximcp/imImSw.c modules/im/ximcp/imImSw.c
 --- modules/im/ximcp/imImSw.c	2010-09-03 22:52:38.000000000 -0700
-+++ modules/im/ximcp/imImSw.c	2010-11-21 18:47:59.406356831 -0800
++++ modules/im/ximcp/imImSw.c	2011-04-06 13:52:23.090417547 -0700
 @@ -48,7 +48,9 @@ _XimCheckIfDefault(
  }
  
@@ -34,9 +34,9 @@
      { _XimCheckIfThaiProcessing,	_XimThaiOpenIM,	 _XimThaiIMFree },
      { _XimCheckIfDefault,         _XimProtoOpenIM, _XimProtoIMFree },
      { NULL,                       NULL,		 NULL },
-diff -urp -x '*~' -x '*.orig' modules/im/ximcp/imThaiFlt.c modules/im/ximcp/imThaiFlt.c
---- modules/im/ximcp/imThaiFlt.c	2010-09-03 22:52:38.000000000 -0700
-+++ modules/im/ximcp/imThaiFlt.c	2010-11-21 18:47:59.407125117 -0800
+diff -Nurp -x '*~' -x '*.orig' modules/im/ximcp/imThaiFlt.c modules/im/ximcp/imThaiFlt.c
+--- modules/im/ximcp/imThaiFlt.c	2011-03-24 22:34:22.000000000 -0700
++++ modules/im/ximcp/imThaiFlt.c	2011-04-06 13:52:23.091092465 -0700
 @@ -76,6 +76,12 @@ SOFTWARE.
  #include "XimThai.h"
  #include "XlcPubI.h"
@@ -206,7 +206,7 @@
      if ((new_char <= 0x1f) || (new_char == 0x7f))
          b->tree[ic->private.local.composed].keysym = symbol;
      else
-@@ -1367,7 +1483,15 @@ _XimThaiFilter(Display *d, Window w, XEv
+@@ -1374,7 +1490,15 @@ _XimThaiFilter(Display *d, Window w, XEv
       */
      isc_mode = IC_IscMode(ic);
      if (!(previous_char = IC_GetPreviousChar(ic))) previous_char = ' ';

--- a/open-src/lib/libX11/lc-gb18030.patch	Sun Apr 10 11:12:44 2011 -0700
+++ b/open-src/lib/libX11/lc-gb18030.patch	Mon Apr 11 11:04:15 2011 -0700
@@ -21,26 +21,26 @@
 # DEALINGS IN THE SOFTWARE.
 #
 
-diff -urp -x '*~' -x '*.orig' configure.ac configure.ac
---- configure.ac	2010-11-21 18:48:03.658185379 -0800
-+++ configure.ac	2010-11-21 18:48:04.458891398 -0800
-@@ -455,6 +455,7 @@ AC_OUTPUT([Makefile
- 	   modules/im/ximcp/Makefile
- 	   modules/lc/Makefile
- 	   modules/lc/def/Makefile
-+	   modules/lc/gb18030/Makefile
- 	   modules/lc/gen/Makefile
- 	   modules/lc/Utf8/Makefile
- 	   modules/lc/xlocale/Makefile
-diff -urp -x '*~' -x '*.orig' modules/lc/Makefile.am modules/lc/Makefile.am
+diff -Nurp -x '*~' -x '*.orig' configure.ac configure.ac
+--- configure.ac	2011-04-06 13:52:26.413533808 -0700
++++ configure.ac	2011-04-06 13:52:27.461991654 -0700
+@@ -450,6 +450,7 @@ AC_CONFIG_FILES([Makefile
+ 		modules/im/ximcp/Makefile
+ 		modules/lc/Makefile
+ 		modules/lc/def/Makefile
++		modules/lc/gb18030/Makefile
+ 		modules/lc/gen/Makefile
+ 		modules/lc/Utf8/Makefile
+ 		modules/lc/xlocale/Makefile
+diff -Nurp -x '*~' -x '*.orig' modules/lc/Makefile.am modules/lc/Makefile.am
 --- modules/lc/Makefile.am	2010-09-03 22:52:38.000000000 -0700
-+++ modules/lc/Makefile.am	2010-11-21 18:48:04.459061907 -0800
++++ modules/lc/Makefile.am	2011-04-06 13:52:27.462144697 -0700
 @@ -1 +1 @@
 -SUBDIRS=Utf8 def gen xlocale
 +SUBDIRS=Utf8 def gen xlocale gb18030
-diff -urp -x '*~' -x '*.orig' src/xlibi18n/Makefile.am src/xlibi18n/Makefile.am
---- src/xlibi18n/Makefile.am	2010-09-21 18:25:24.000000000 -0700
-+++ src/xlibi18n/Makefile.am	2010-11-21 18:48:04.459305791 -0800
+diff -Nurp -x '*~' -x '*.orig' src/xlibi18n/Makefile.am src/xlibi18n/Makefile.am
+--- src/xlibi18n/Makefile.am	2011-01-29 10:09:13.000000000 -0800
++++ src/xlibi18n/Makefile.am	2011-04-06 13:52:27.462304357 -0700
 @@ -36,6 +36,7 @@ LC_LIBS = \
  	${top_builddir}/modules/lc/def/libxlcDef.la \
  	${top_builddir}/modules/lc/gen/libxlibi18n.la \
@@ -49,9 +49,9 @@
  	${top_builddir}/modules/lc/xlocale/libxlocale.la
  
  OM_LIBS = \
-diff -urp -x '*~' -x '*.orig' src/xlibi18n/Xlcint.h src/xlibi18n/Xlcint.h
+diff -Nurp -x '*~' -x '*.orig' src/xlibi18n/Xlcint.h src/xlibi18n/Xlcint.h
 --- src/xlibi18n/Xlcint.h	2010-09-03 22:52:39.000000000 -0700
-+++ src/xlibi18n/Xlcint.h	2010-11-21 18:48:04.459698934 -0800
++++ src/xlibi18n/Xlcint.h	2011-04-06 13:52:27.462605995 -0700
 @@ -932,6 +932,12 @@ extern XLCd _XlcUtf8Loader(
      const char*		name
  );
@@ -65,9 +65,9 @@
  /* The old EUC locale loader. */
  extern XLCd _XlcEucLoader(
      const char*		name
-diff -urp -x '*~' -x '*.orig' src/xlibi18n/lcCT.c src/xlibi18n/lcCT.c
---- src/xlibi18n/lcCT.c	2010-11-21 18:48:03.683823575 -0800
-+++ src/xlibi18n/lcCT.c	2010-11-21 18:48:04.460141231 -0800
+diff -Nurp -x '*~' -x '*.orig' src/xlibi18n/lcCT.c src/xlibi18n/lcCT.c
+--- src/xlibi18n/lcCT.c	2011-04-06 13:52:26.445490222 -0700
++++ src/xlibi18n/lcCT.c	2011-04-06 13:52:27.462981375 -0700
 @@ -126,6 +126,8 @@ static const CTDataRec default_ct_data[]
      { "BIG5-0:GLGR", "\033%/2"},
      { "BIG5HKSCS-0:GLGR", "\033%/2"},
@@ -77,9 +77,9 @@
      /* used by Emacs, but not backed by ISO-IR */
      { "BIG5-E0:GL", "\033$(0" },
      { "BIG5-E0:GR", "\033$)0" },
-diff -urp -x '*~' -x '*.orig' src/xlibi18n/lcInit.c src/xlibi18n/lcInit.c
---- src/xlibi18n/lcInit.c	2010-09-21 18:25:24.000000000 -0700
-+++ src/xlibi18n/lcInit.c	2010-11-21 18:48:04.460499579 -0800
+diff -Nurp -x '*~' -x '*.orig' src/xlibi18n/lcInit.c src/xlibi18n/lcInit.c
+--- src/xlibi18n/lcInit.c	2011-01-29 10:09:13.000000000 -0800
++++ src/xlibi18n/lcInit.c	2011-04-06 13:52:27.463186940 -0700
 @@ -106,6 +106,7 @@ Sun Microsystems, Inc. or its licensors 
  #define USE_GENERIC_LOADER
  #define USE_DEFAULT_LOADER
@@ -110,9 +110,9 @@
  #ifdef USE_DYNAMIC_LOADER
      _XlcRemoveLoader(_XlcDynamicLoader);
  #endif
-diff -urp -x '*~' -x '*.orig' src/xlibi18n/lcUTF8.c src/xlibi18n/lcUTF8.c
---- src/xlibi18n/lcUTF8.c	2010-11-21 18:48:03.684843035 -0800
-+++ src/xlibi18n/lcUTF8.c	2010-11-21 18:48:04.461129908 -0800
+diff -Nurp -x '*~' -x '*.orig' src/xlibi18n/lcUTF8.c src/xlibi18n/lcUTF8.c
+--- src/xlibi18n/lcUTF8.c	2011-04-06 13:52:26.446628892 -0700
++++ src/xlibi18n/lcUTF8.c	2011-04-06 13:52:27.463715259 -0700
 @@ -213,6 +213,7 @@ typedef struct {
  #include "lcUniConv/big5_emacs.h"
  #include "lcUniConv/big5hkscs.h"
@@ -140,9 +140,9 @@
  
      /* The ISO10646-1/UTF-8 entry occurs twice, once at the beginning
         (for lookup speed), once at the end (as a fallback).  */
-diff -urp -x '*~' -x '*.orig' src/xlibi18n/lcUniConv/gbk.h src/xlibi18n/lcUniConv/gbk.h
+diff -Nurp -x '*~' -x '*.orig' src/xlibi18n/lcUniConv/gbk.h src/xlibi18n/lcUniConv/gbk.h
 --- src/xlibi18n/lcUniConv/gbk.h	2010-09-03 22:52:39.000000000 -0700
-+++ src/xlibi18n/lcUniConv/gbk.h	2010-11-21 18:48:04.463729400 -0800
++++ src/xlibi18n/lcUniConv/gbk.h	2011-04-06 13:52:27.466387657 -0700
 @@ -1,9 +1,41 @@
 +/*
 + * Copyright  The Open Group

--- a/open-src/lib/libX11/locale.paths.patch	Sun Apr 10 11:12:44 2011 -0700
+++ b/open-src/lib/libX11/locale.paths.patch	Mon Apr 11 11:04:15 2011 -0700
@@ -1,9 +1,9 @@
 Allow passing multi-directory paths to configure search for locale files
 
-diff -urp -x '*~' -x '*.orig' configure.ac configure.ac
---- configure.ac	2010-11-21 18:48:30.520846608 -0800
-+++ configure.ac	2010-11-21 18:48:31.439723048 -0800
-@@ -427,11 +427,16 @@ AC_ARG_WITH(locale-lib-dir,	AS_HELP_STRI
+diff -Nurp -x '*~' -x '*.orig' configure.ac configure.ac
+--- configure.ac	2011-04-06 13:52:52.161843884 -0700
++++ configure.ac	2011-04-06 13:52:53.339680452 -0700
+@@ -422,11 +422,16 @@ AC_ARG_WITH(locale-lib-dir,	AS_HELP_STRI
   [Directory where locale libraries files are installed (default: $libdir/X11/locale)]),
  				[ X11_LOCALELIBDIR="$withval" ],
  				[ X11_LOCALELIBDIR="${X11_LIBDIR}/locale" ])

--- a/open-src/lib/libX11/solaris-abi.patch	Sun Apr 10 11:12:44 2011 -0700
+++ b/open-src/lib/libX11/solaris-abi.patch	Mon Apr 11 11:04:15 2011 -0700
@@ -20,10 +20,10 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
 #
-diff -urp -x '*~' -x '*.orig' configure.ac configure.ac
---- configure.ac	2010-11-21 14:02:48.000000000 -0800
-+++ configure.ac	2010-11-21 18:47:54.799563366 -0800
-@@ -206,7 +206,7 @@ if test x$XLIB_LOADABLE_I18N = xyes; the
+diff -Nurp -x '*~' -x '*.orig' configure.ac configure.ac
+--- configure.ac	2011-04-05 13:28:42.000000000 -0700
++++ configure.ac	2011-04-06 13:52:15.327642630 -0700
+@@ -204,7 +204,7 @@ if test x$XLIB_LOADABLE_I18N = xyes; the
  	fi
  	AC_DEFINE(USE_DYNAMIC_LC,1,
  		  [Split some i18n functions into loadable modules])
@@ -32,10 +32,10 @@
  fi
  AC_MSG_RESULT($XLIB_LOADABLE_I18N)
  
-diff -urp -x '*~' -x '*.orig' src/Makefile.am src/Makefile.am
---- src/Makefile.am	2010-09-21 18:25:24.000000000 -0700
-+++ src/Makefile.am	2010-11-21 18:47:54.799940548 -0800
-@@ -369,9 +369,14 @@ if XKB
+diff -Nurp -x '*~' -x '*.orig' src/Makefile.am src/Makefile.am
+--- src/Makefile.am	2011-02-17 20:54:46.000000000 -0800
++++ src/Makefile.am	2011-04-06 13:52:15.327994531 -0700
+@@ -368,9 +368,14 @@ if XKB
  USE_XKB_LIBS = $(XKB_LIBS)
  endif

--- a/open-src/lib/libX11/solaris-kbd.patch	Sun Apr 10 11:12:44 2011 -0700
+++ b/open-src/lib/libX11/solaris-kbd.patch	Mon Apr 11 11:04:15 2011 -0700
@@ -22,18 +22,18 @@
 #
 
 
-diff -urp -x '*~' -x '*.orig' src/KeyBind.c src/KeyBind.c
---- src/KeyBind.c	2010-09-21 18:25:24.000000000 -0700
-+++ src/KeyBind.c	2010-11-21 18:47:55.561803959 -0800
-@@ -44,6 +44,7 @@ in this Software without prior written a
- #define XK_CAUCASUS
+diff -Nurp -x '*~' -x '*.orig' src/KeyBind.c src/KeyBind.c
+--- src/KeyBind.c	2011-03-24 22:34:22.000000000 -0700
++++ src/KeyBind.c	2011-04-06 13:52:16.519172102 -0700
+@@ -45,6 +45,7 @@ in this Software without prior written a
  #define XK_VIETNAMESE
  #define XK_XKB_KEYS
+ #define XK_SINHALA
 +#define XK_CURRENCY
  #include <X11/keysymdef.h>
  #include <stdio.h>
  
-@@ -55,6 +56,20 @@ in this Software without prior written a
+@@ -56,6 +57,20 @@ in this Software without prior written a
  #include "Xresource.h"
  #include "Key.h"
  
@@ -54,7 +54,7 @@
  #ifdef XKB
  #include "XKBlib.h"
  #include "XKBlibint.h"
-@@ -76,6 +91,11 @@ ComputeMaskFromKeytrans(
+@@ -77,6 +92,11 @@ ComputeMaskFromKeytrans(
      Display *dpy,
      register struct _XKeytrans *p);
  
@@ -66,7 +66,7 @@
  struct _XKeytrans {
  	struct _XKeytrans *next;/* next on list */
  	char *string;		/* string to return when the time comes */
-@@ -97,6 +117,10 @@ KeyCodetoKeySym(register Display *dpy, K
+@@ -98,6 +118,10 @@ KeyCodetoKeySym(register Display *dpy, K
  	((int)keycode < dpy->min_keycode) || ((int)keycode > dpy->max_keycode))
        return NoSymbol;
  
@@ -77,7 +77,7 @@
      syms = &dpy->keysyms[(keycode - dpy->min_keycode) * per];
      if (col < 4) {
  	if (col > 1) {
-@@ -765,6 +789,9 @@ _XTranslateKey(	register Display *dpy,
+@@ -766,6 +790,9 @@ _XTranslateKey(	register Display *dpy,
      int per;
      register KeySym *syms;
      KeySym sym, lsym, usym;
@@ -87,7 +87,7 @@
  
      if ((! dpy->keysyms) && (! _XKeyInitialize(dpy)))
  	return 0;
-@@ -779,17 +806,54 @@ _XTranslateKey(	register Display *dpy,
+@@ -780,17 +807,54 @@ _XTranslateKey(	register Display *dpy,
      syms = &dpy->keysyms[(keycode - dpy->min_keycode) * per];
      while ((per > 2) && (syms[per - 1] == NoSymbol))
  	per--;
@@ -142,7 +142,7 @@
      } else if (!(modifiers & ShiftMask) &&
  	(!(modifiers & LockMask) || (dpy->lock_meaning == NoSymbol))) {
  	if ((per == 1) || (syms[1] == NoSymbol))
-@@ -817,19 +881,41 @@ _XTranslateKey(	register Display *dpy,
+@@ -818,19 +882,41 @@ _XTranslateKey(	register Display *dpy,
  
  int
  _XTranslateKeySym(
@@ -190,7 +190,7 @@
      /* see if symbol rebound, if so, return that string. */
      for (p = dpy->key_bindings; p; p = p->next) {
  	if (((modifiers & AllMods) == p->state) && (symbol == p->key)) {
-@@ -843,8 +929,29 @@ _XTranslateKeySym(
+@@ -844,8 +930,29 @@ _XTranslateKeySym(
      hiBytes = symbol >> 8;
      if (!(nbytes &&
  	  ((hiBytes == 0) ||
@@ -220,7 +220,7 @@
  	     (symbol == XK_Return) ||
  	     (symbol == XK_Escape) ||
  	     (symbol == XK_KP_Space) ||
-@@ -855,15 +962,35 @@ _XTranslateKeySym(
+@@ -856,15 +963,35 @@ _XTranslateKeySym(
  	     (symbol == XK_Delete))))))
  	return 0;
  
@@ -256,7 +256,7 @@
  	if ((c >= '@' && c < '\177') || c == ' ') c &= 0x1F;
  	else if (c == '2') c = '\000';
  	else if (c >= '3' && c <= '7') c -= ('3' - '\033');
-@@ -957,11 +1084,22 @@ XLookupString (
+@@ -958,11 +1085,22 @@ XLookupString (
      }
  #endif
  
@@ -279,7 +279,7 @@
  }
  
  static void
-@@ -1075,3 +1213,287 @@ ComputeMaskFromKeytrans(
+@@ -1076,3 +1214,287 @@ ComputeMaskFromKeytrans(
      }
      p->state &= AllMods;
  }
@@ -567,9 +567,9 @@
 +    }
 +}
 +#endif /* SUNSOFT_KBD */
-diff -urp -x '*~' -x '*.orig' src/xkb/XKBBind.c src/xkb/XKBBind.c
---- src/xkb/XKBBind.c	2010-09-21 18:25:24.000000000 -0700
-+++ src/xkb/XKBBind.c	2010-11-21 18:47:55.562288437 -0800
+diff -Nurp -x '*~' -x '*.orig' src/xkb/XKBBind.c src/xkb/XKBBind.c
+--- src/xkb/XKBBind.c	2011-01-29 10:09:13.000000000 -0800
++++ src/xkb/XKBBind.c	2011-04-06 13:52:16.519538005 -0700
 @@ -577,6 +577,20 @@ XkbTranslateKeySym(	register Display *	d
  			int 			nbytes,
  			int *			extra_rtrn)
@@ -652,9 +652,9 @@
  }
  
  
-diff -urp -x '*~' -x '*.orig' src/xkb/XKBlibint.h src/xkb/XKBlibint.h
+diff -Nurp -x '*~' -x '*.orig' src/xkb/XKBlibint.h src/xkb/XKBlibint.h
 --- src/xkb/XKBlibint.h	2010-09-03 22:52:39.000000000 -0700
-+++ src/xkb/XKBlibint.h	2010-11-21 18:47:55.562584726 -0800
++++ src/xkb/XKBlibint.h	2011-04-06 13:52:16.519753992 -0700
 @@ -175,10 +175,19 @@ extern int _XTranslateKey(
  
  extern int	_XTranslateKeySym(
@@ -693,9 +693,9 @@
  _XFUNCPROTOEND
  
  #endif /* _XKBLIBINT_H_ */
-diff -urp -x '*~' -x '*.orig' src/xlibi18n/ICWrap.c src/xlibi18n/ICWrap.c
---- src/xlibi18n/ICWrap.c	2010-09-21 18:25:24.000000000 -0700
-+++ src/xlibi18n/ICWrap.c	2010-11-21 18:47:55.562971854 -0800
+diff -Nurp -x '*~' -x '*.orig' src/xlibi18n/ICWrap.c src/xlibi18n/ICWrap.c
+--- src/xlibi18n/ICWrap.c	2011-01-29 10:09:13.000000000 -0800
++++ src/xlibi18n/ICWrap.c	2011-04-06 13:52:16.520026528 -0700
 @@ -67,6 +67,12 @@ from The Open Group.
  #include "Xlibint.h"
  #include "Xlcint.h"

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/lib/libX11/xml-install-paths.patch	Mon Apr 11 11:04:15 2011 -0700
@@ -0,0 +1,68 @@
+From 78a05d38e4736d75a175a1b99270940f83a24b56 Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <[email protected]>
+Date: Fri, 8 Apr 2011 21:36:11 -0700
+Subject: [PATCH:libX11] Make doc install directories match pre-docbook.am paths
+
+Signed-off-by: Alan Coopersmith <[email protected]>
+---
+ specs/i18n/framework/Makefile.am |    2 +-
+ specs/i18n/localedb/Makefile.am  |    2 +-
+ specs/i18n/trans/Makefile.am     |    2 +-
+ specs/libX11/Makefile.am         |    2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/specs/i18n/framework/Makefile.am b/specs/i18n/framework/Makefile.am
+index 350b7df..af7ae1d 100644
+--- a/specs/i18n/framework/Makefile.am
++++ b/specs/i18n/framework/Makefile.am
+@@ -8,7 +8,7 @@ docbook = framework.xml
+ chapters = framework.svg
+ 
+ # The location where the DocBook/XML files and their generated formats are installed
+-shelfdir = $(docdir)/framework
++shelfdir = $(docdir)/i18n/framework
+ 
+ # Generate DocBook/XML output formats with or without stylesheets
+ include $(top_srcdir)/docbook.am
+diff --git a/specs/i18n/localedb/Makefile.am b/specs/i18n/localedb/Makefile.am
+index 0c52a13..68a917c 100644
+--- a/specs/i18n/localedb/Makefile.am
++++ b/specs/i18n/localedb/Makefile.am
+@@ -5,7 +5,7 @@ if ENABLE_SPECS
+ docbook = localedb.xml
+ 
+ # The location where the DocBook/XML files and their generated formats are installed
+-shelfdir = $(docdir)/localedb
++shelfdir = $(docdir)/i18n/localedb
+ 
+ # Generate DocBook/XML output formats with or without stylesheets
+ include $(top_srcdir)/docbook.am
+diff --git a/specs/i18n/trans/Makefile.am b/specs/i18n/trans/Makefile.am
+index 6e4baf1..40a135a 100644
+--- a/specs/i18n/trans/Makefile.am
++++ b/specs/i18n/trans/Makefile.am
+@@ -5,7 +5,7 @@ if ENABLE_SPECS
+ docbook = trans.xml
+ 
+ # The location where the DocBook/XML files and their generated formats are installed
+-shelfdir = $(docdir)/trans
++shelfdir = $(docdir)/i18n/trans
+ 
+ # Generate DocBook/XML output formats with or without stylesheets
+ include $(top_srcdir)/docbook.am
+diff --git a/specs/libX11/Makefile.am b/specs/libX11/Makefile.am
+index c4de67e..b87e568 100644
+--- a/specs/libX11/Makefile.am
++++ b/specs/libX11/Makefile.am
+@@ -30,7 +30,7 @@ chapters =		\
+ 	glossary.xml
+ 
+ # The location where the DocBook/XML files and their generated formats are installed
+-shelfdir = $(docdir)
++shelfdir = $(docdir)/libX11
+ 
+ # Generate DocBook/XML output formats with or without stylesheets
+ include $(top_srcdir)/docbook.am
+-- 
+1.7.3.2
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/lib/libX11/xml-install.patch	Mon Apr 11 11:04:15 2011 -0700
@@ -0,0 +1,143 @@
+From b95c288c7d897ed3ed9268572b7c097ed2652907 Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <[email protected]>
+Date: Fri, 8 Apr 2011 13:24:28 -0700
+Subject: [PATCH:libX11] Install xml versions of specs even if HAVE_XMLTO is false
+
+Moves HAVE_XMLTO check into docbook.am, more closely matches behaviour
+from before docbook.am changes (commit e8c76407d2f6e3)
+
+Signed-off-by: Alan Coopersmith <[email protected]>
+---
+ docbook.am                       |    2 ++
+ specs/XIM/Makefile.am            |    2 --
+ specs/XKB/Makefile.am            |    2 --
+ specs/i18n/framework/Makefile.am |    2 --
+ specs/i18n/localedb/Makefile.am  |    2 --
+ specs/i18n/trans/Makefile.am     |    2 --
+ specs/libX11/Makefile.am         |    2 --
+ 7 files changed, 2 insertions(+), 12 deletions(-)
+
+diff --git a/docbook.am b/docbook.am
+index 3cf21e8..6937083 100644
+--- a/docbook.am
++++ b/docbook.am
+@@ -20,6 +20,7 @@ shelf_DATA =
+ # DocBook/XML file with chapters, appendix and images it includes
+ dist_shelf_DATA = $(docbook) $(chapters)
+ 
++if HAVE_XMLTO
+ #
+ # Generate DocBook/XML output formats with or without stylesheets
+ #
+@@ -91,5 +92,6 @@ XSLTPROC_FLAGS =					\
+ 
+ endif HAVE_XSLTPROC
+ endif HAVE_STYLESHEETS
++endif HAVE_XMLTO
+ 
+ CLEANFILES = $(shelf_DATA) $(sgmldbs_DATA)
+diff --git a/specs/XIM/Makefile.am b/specs/XIM/Makefile.am
+index a1fa72d..68b0b3f 100644
+--- a/specs/XIM/Makefile.am
++++ b/specs/XIM/Makefile.am
+@@ -1,6 +1,5 @@
+ 
+ if ENABLE_SPECS
+-if HAVE_XMLTO
+ 
+ # Main DocBook/XML files (DOCTYPE book)
+ docbook = xim.xml
+@@ -21,5 +20,4 @@ shelfdir = $(docdir)/XIM
+ # Generate DocBook/XML output formats with or without stylesheets
+ include $(top_srcdir)/docbook.am
+ 
+-endif HAVE_XMLTO
+ endif ENABLE_SPECS
+diff --git a/specs/XKB/Makefile.am b/specs/XKB/Makefile.am
+index 3939db6..90771cc 100644
+--- a/specs/XKB/Makefile.am
++++ b/specs/XKB/Makefile.am
+@@ -1,6 +1,5 @@
+ 
+ if ENABLE_SPECS
+-if HAVE_XMLTO
+ 
+ # Main DocBook/XML files (DOCTYPE book)
+ docbook = xkblib.xml
+@@ -59,5 +58,4 @@ shelfdir = $(docdir)/XKB
+ # Generate DocBook/XML output formats with or without stylesheets
+ include $(top_srcdir)/docbook.am
+ 
+-endif HAVE_XMLTO
+ endif ENABLE_SPECS
+diff --git a/specs/i18n/framework/Makefile.am b/specs/i18n/framework/Makefile.am
+index 6e8b010..350b7df 100644
+--- a/specs/i18n/framework/Makefile.am
++++ b/specs/i18n/framework/Makefile.am
+@@ -1,6 +1,5 @@
+ 
+ if ENABLE_SPECS
+-if HAVE_XMLTO
+ 
+ # Main DocBook/XML files (DOCTYPE book)
+ docbook = framework.xml
+@@ -14,5 +13,4 @@ shelfdir = $(docdir)/framework
+ # Generate DocBook/XML output formats with or without stylesheets
+ include $(top_srcdir)/docbook.am
+ 
+-endif HAVE_XMLTO
+ endif ENABLE_SPECS
+diff --git a/specs/i18n/localedb/Makefile.am b/specs/i18n/localedb/Makefile.am
+index 8db6a7b..0c52a13 100644
+--- a/specs/i18n/localedb/Makefile.am
++++ b/specs/i18n/localedb/Makefile.am
+@@ -1,6 +1,5 @@
+ 
+ if ENABLE_SPECS
+-if HAVE_XMLTO
+ 
+ # Main DocBook/XML files (DOCTYPE book)
+ docbook = localedb.xml
+@@ -11,5 +10,4 @@ shelfdir = $(docdir)/localedb
+ # Generate DocBook/XML output formats with or without stylesheets
+ include $(top_srcdir)/docbook.am
+ 
+-endif HAVE_XMLTO
+ endif ENABLE_SPECS
+diff --git a/specs/i18n/trans/Makefile.am b/specs/i18n/trans/Makefile.am
+index cdec750..6e4baf1 100644
+--- a/specs/i18n/trans/Makefile.am
++++ b/specs/i18n/trans/Makefile.am
+@@ -1,6 +1,5 @@
+ 
+ if ENABLE_SPECS
+-if HAVE_XMLTO
+ 
+ # Main DocBook/XML files (DOCTYPE book)
+ docbook = trans.xml
+@@ -11,5 +10,4 @@ shelfdir = $(docdir)/trans
+ # Generate DocBook/XML output formats with or without stylesheets
+ include $(top_srcdir)/docbook.am
+ 
+-endif HAVE_XMLTO
+ endif ENABLE_SPECS
+diff --git a/specs/libX11/Makefile.am b/specs/libX11/Makefile.am
+index 0e59ad8..c4de67e 100644
+--- a/specs/libX11/Makefile.am
++++ b/specs/libX11/Makefile.am
+@@ -1,6 +1,5 @@
+ 
+ if ENABLE_SPECS
+-if HAVE_XMLTO
+ 
+ # Main DocBook/XML files (DOCTYPE book)
+ docbook = libX11.xml
+@@ -36,5 +35,4 @@ shelfdir = $(docdir)
+ # Generate DocBook/XML output formats with or without stylesheets
+ include $(top_srcdir)/docbook.am
+ 
+-endif HAVE_XMLTO
+ endif ENABLE_SPECS
+-- 
+1.7.3.2
+

--- a/open-src/proto/x11proto/Makefile	Sun Apr 10 11:12:44 2011 -0700
+++ b/open-src/proto/x11proto/Makefile	Mon Apr 11 11:04:15 2011 -0700
@@ -27,15 +27,14 @@
 MODULE_NAME=xproto
 
 # Version number (used in path names)
-MODULE_VERSION=7.0.20
+MODULE_VERSION=7.0.21
 
 # Checksums for upstream tarball
-TARBALL_MD5  = 65633168e5315c19defb4652cd3d83c1
-TARBALL_SHA1 = a55d051c8ad9c50e90429c9319d6d3af821f0696
+TARBALL_MD5  = c5a93a69b701cf81925fab02b35b0d0e
+TARBALL_SHA1 = 608290fa354b1aff4a075c905f1057d979c62ac9
 
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES=	\
-	xfuncproto.patch,-p1 \
 	X.h-patch
 
 # ARC cases that covered this module

--- a/open-src/proto/x11proto/xfuncproto.patch	Sun Apr 10 11:12:44 2011 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
-From e5604f04482350eb922a31ad4342aab91ab3b412 Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <[email protected]>
-Date: Thu, 9 Dec 2010 16:04:52 -0800
-Subject: [PATCH:x11proto 1/2] Enable gcc attribute(__format__) on gcc versions older than 4.0
-
-Enabled on 2.3 and up, since that's where it's available according to
-http://www.ohse.de/uwe/articles/gcc-attributes.html#func-format
-
-Tested with gcc 3.4.3 on Solaris.
-
-Signed-off-by: Alan Coopersmith <[email protected]>
-Reviewed-by: Jeremy Huddleston <[email protected]>
----
- Xfuncproto.h.in |    8 ++++++--
- 1 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/Xfuncproto.h.in b/Xfuncproto.h.in
-index 0177119..b624956 100644
---- a/Xfuncproto.h.in
-+++ b/Xfuncproto.h.in
-@@ -77,10 +77,8 @@ in this Software without prior written authorization from The Open Group.
- 
- #if defined(__GNUC__) && (__GNUC__ >= 4)
- # define _X_SENTINEL(x) __attribute__ ((__sentinel__(x)))
--# define _X_ATTRIBUTE_PRINTF(x,y) __attribute__((__format__(__printf__,x,y)))
- #else
- # define _X_SENTINEL(x)
--# define _X_ATTRIBUTE_PRINTF(x,y)
- #endif /* GNUC >= 4 */
- 
- #if defined(__GNUC__) && (__GNUC__ >= 4) && !defined(__CYGWIN__)
-@@ -124,4 +122,10 @@ in this Software without prior written authorization from The Open Group.
- # define _X_NORETURN
- #endif /* GNUC  */
- 
-+#if defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 203)
-+# define _X_ATTRIBUTE_PRINTF(x,y) __attribute__((__format__(__printf__,x,y)))
-+#else /* not gcc >= 2.3 */
-+# define _X_ATTRIBUTE_PRINTF(x,y)
-+#endif
-+
- #endif /* _XFUNCPROTO_H_ */
--- 
-1.7.3.2
-
-From 1870ec9ce40e8852e1cdce473afa90d21d780e52 Mon Sep 17 00:00:00 2001
-From: Alan Coopersmith <[email protected]>
-Date: Mon, 13 Dec 2010 16:25:31 -0800
-Subject: [PATCH:x11proto 2/2] Xfuncproto.h: Add _X_RESTRICT_KEYWORD for C99 & gcc in non-strict-C89 mode
-
-Signed-off-by: Alan Coopersmith <[email protected]>
----
- Xfuncproto.h.in |   12 ++++++++++++
- 1 files changed, 12 insertions(+), 0 deletions(-)
-
-diff --git a/Xfuncproto.h.in b/Xfuncproto.h.in
-index b624956..fd9f29b 100644
---- a/Xfuncproto.h.in
-+++ b/Xfuncproto.h.in
-@@ -128,4 +128,16 @@ in this Software without prior written authorization from The Open Group.
- # define _X_ATTRIBUTE_PRINTF(x,y)
- #endif
- 
-+/* C99 keyword "restrict" or equivalent extensions in pre-C99 compilers */
-+#ifndef _X_RESTRICT_KYWD
-+# if defined(restrict) /* assume autoconf set it correctly */ || \
-+   (defined(__STDC__) && (__STDC_VERSION__ - 0 >= 199901L)) /* C99 */
-+#  define _X_RESTRICT_KYWD  restrict
-+# elif defined(__GNUC__) && !defined(__STRICT_ANSI__) /* gcc w/C89+extensions */
-+#  define _X_RESTRICT_KYWD __restrict__
-+# else
-+#  define _X_RESTRICT_KYWD
-+# endif
-+#endif
-+
- #endif /* _XFUNCPROTO_H_ */
--- 
-1.7.3.2
-

--- a/open-src/util/util-macros/Makefile	Sun Apr 10 11:12:44 2011 -0700
+++ b/open-src/util/util-macros/Makefile	Mon Apr 11 11:04:15 2011 -0700
@@ -31,11 +31,11 @@
 MODULE_PKGNAME_SET=yes
 
 # Version number (used in path names)
-MODULE_VERSION=1.11.0
+MODULE_VERSION=1.13.0
 
 # Checksums for upstream tarball
-TARBALL_MD5  = 22d5cdff672450cb6902e0d68c200dcb
-TARBALL_SHA1 = 646188eeca4fa319d95aba7a271149bcbf9ee49e
+TARBALL_MD5  = ed6dbe0cd80c29fd7d6653385b1db540
+TARBALL_SHA1 = 5d86ac2a4c0aa3428d72aff35dacc07baf883121
 
 # Patches to apply to source after unpacking, in order
 SOURCE_PATCHES=

--- a/pkg/manifests/x11-documentation-xorg-docs.p5m	Sun Apr 10 11:12:44 2011 -0700
+++ b/pkg/manifests/x11-documentation-xorg-docs.p5m	Mon Apr 11 11:04:15 2011 -0700
@@ -42,6 +42,7 @@
 dir path=usr/share/pkgconfig
 dir path=usr/share/sgml
 dir path=usr/share/sgml/X11
+dir path=usr/share/sgml/X11/dbs
 file path=usr/share/doc/X11/License.html
 file path=usr/share/doc/X11/License.txt
 file path=usr/share/doc/X11/License.xml
@@ -82,6 +83,12 @@
 file path=usr/share/man/man5/Xprint.5
 file path=usr/share/man/man5/Xsecurity.5
 file path=usr/share/pkgconfig/xorg-sgml-doctools.pc
+file path=usr/share/sgml/X11/dbs/masterdb.html.xml
+file path=usr/share/sgml/X11/dbs/masterdb.pdf.xml
+file path=usr/share/sgml/X11/dbs/masterdb.ps.xml
+file path=usr/share/sgml/X11/dbs/masterdb.txt.xml
 file path=usr/share/sgml/X11/defs.ent
+file path=usr/share/sgml/X11/xorg-fo.xsl
+file path=usr/share/sgml/X11/xorg-xhtml.xsl
 file path=usr/share/sgml/X11/xorg.css
 file path=usr/share/sgml/X11/xorg.xsl

--- a/pkg/manifests/x11-library-libx11.p5m	Sun Apr 10 11:12:44 2011 -0700
+++ b/pkg/manifests/x11-library-libx11.p5m	Mon Apr 11 11:04:15 2011 -0700
@@ -105,14 +105,13 @@
 dir path=usr/share/doc
 dir path=usr/share/doc/libX11
 dir path=usr/share/doc/libX11/Compose
-dir path=usr/share/doc/libX11/specs
-dir path=usr/share/doc/libX11/specs/XIM
-dir path=usr/share/doc/libX11/specs/XKB
-dir path=usr/share/doc/libX11/specs/i18n
-dir path=usr/share/doc/libX11/specs/i18n/framework
-dir path=usr/share/doc/libX11/specs/i18n/localedb
-dir path=usr/share/doc/libX11/specs/i18n/trans
-dir path=usr/share/doc/libX11/specs/libX11
+dir path=usr/share/doc/libX11/XIM
+dir path=usr/share/doc/libX11/XKB
+dir path=usr/share/doc/libX11/i18n
+dir path=usr/share/doc/libX11/i18n/framework
+dir path=usr/share/doc/libX11/i18n/localedb
+dir path=usr/share/doc/libX11/i18n/trans
+dir path=usr/share/doc/libX11/libX11
 dir path=usr/share/man
 dir path=usr/share/man/man3x11
 dir path=usr/share/man/man4
@@ -343,87 +342,87 @@
 file path=usr/share/X11/locale/zh_TW/Compose
 file path=usr/share/X11/locale/zh_TW/XI18N_OBJS
 file path=usr/share/X11/locale/zh_TW/XLC_LOCALE
-file path=usr/share/doc/libX11/specs/XIM/dynamicflow.svg
-file path=usr/share/doc/libX11/specs/XIM/dynamicflowsampleseq.svg
-file path=usr/share/doc/libX11/specs/XIM/eventflow.svg
-file path=usr/share/doc/libX11/specs/XIM/sampleprotocolflow1.svg
-file path=usr/share/doc/libX11/specs/XIM/sampleprotocolflow2.svg
-file path=usr/share/doc/libX11/specs/XIM/staticflow.svg
-file path=usr/share/doc/libX11/specs/XIM/staticflowsampleseq.svg
-file path=usr/share/doc/libX11/specs/XIM/xim.xml
-file path=usr/share/doc/libX11/specs/XKB/XKBlib-1.svg
-file path=usr/share/doc/libX11/specs/XKB/XKBlib-10.svg
-file path=usr/share/doc/libX11/specs/XKB/XKBlib-11.svg
-file path=usr/share/doc/libX11/specs/XKB/XKBlib-12.svg
-file path=usr/share/doc/libX11/specs/XKB/XKBlib-13.svg
-file path=usr/share/doc/libX11/specs/XKB/XKBlib-14.svg
-file path=usr/share/doc/libX11/specs/XKB/XKBlib-15.svg
-file path=usr/share/doc/libX11/specs/XKB/XKBlib-16.svg
-file path=usr/share/doc/libX11/specs/XKB/XKBlib-17.svg
-file path=usr/share/doc/libX11/specs/XKB/XKBlib-18.svg
-file path=usr/share/doc/libX11/specs/XKB/XKBlib-19.svg
-file path=usr/share/doc/libX11/specs/XKB/XKBlib-2.svg
-file path=usr/share/doc/libX11/specs/XKB/XKBlib-20.svg
-file path=usr/share/doc/libX11/specs/XKB/XKBlib-21.svg
-file path=usr/share/doc/libX11/specs/XKB/XKBlib-3.svg
-file path=usr/share/doc/libX11/specs/XKB/XKBlib-4.svg
-file path=usr/share/doc/libX11/specs/XKB/XKBlib-5.svg
-file path=usr/share/doc/libX11/specs/XKB/XKBlib-6.svg
-file path=usr/share/doc/libX11/specs/XKB/XKBlib-7.svg
-file path=usr/share/doc/libX11/specs/XKB/XKBlib-8.svg
-file path=usr/share/doc/libX11/specs/XKB/XKBlib-9.svg
-file path=usr/share/doc/libX11/specs/XKB/acknowledgement.xml
-file path=usr/share/doc/libX11/specs/XKB/ch01.xml
-file path=usr/share/doc/libX11/specs/XKB/ch02.xml
-file path=usr/share/doc/libX11/specs/XKB/ch03.xml
-file path=usr/share/doc/libX11/specs/XKB/ch04.xml
-file path=usr/share/doc/libX11/specs/XKB/ch05.xml
-file path=usr/share/doc/libX11/specs/XKB/ch06.xml
-file path=usr/share/doc/libX11/specs/XKB/ch07.xml
-file path=usr/share/doc/libX11/specs/XKB/ch08.xml
-file path=usr/share/doc/libX11/specs/XKB/ch09.xml
-file path=usr/share/doc/libX11/specs/XKB/ch10.xml
-file path=usr/share/doc/libX11/specs/XKB/ch11.xml
-file path=usr/share/doc/libX11/specs/XKB/ch12.xml
-file path=usr/share/doc/libX11/specs/XKB/ch13.xml
-file path=usr/share/doc/libX11/specs/XKB/ch14.xml
-file path=usr/share/doc/libX11/specs/XKB/ch15.xml
-file path=usr/share/doc/libX11/specs/XKB/ch16.xml
-file path=usr/share/doc/libX11/specs/XKB/ch17.xml
-file path=usr/share/doc/libX11/specs/XKB/ch18.xml
-file path=usr/share/doc/libX11/specs/XKB/ch19.xml
-file path=usr/share/doc/libX11/specs/XKB/ch20.xml
-file path=usr/share/doc/libX11/specs/XKB/ch21.xml
-file path=usr/share/doc/libX11/specs/XKB/ch22.xml
-file path=usr/share/doc/libX11/specs/XKB/glossary.xml
-file path=usr/share/doc/libX11/specs/XKB/xkblib.xml
-file path=usr/share/doc/libX11/specs/i18n/framework/framework.svg
-file path=usr/share/doc/libX11/specs/i18n/framework/framework.xml
-file path=usr/share/doc/libX11/specs/i18n/localedb/localedb.xml
-file path=usr/share/doc/libX11/specs/i18n/trans/trans.xml
-file path=usr/share/doc/libX11/specs/libX11/AppA.xml
-file path=usr/share/doc/libX11/specs/libX11/AppB.xml
-file path=usr/share/doc/libX11/specs/libX11/AppC.xml
-file path=usr/share/doc/libX11/specs/libX11/AppD.xml
-file path=usr/share/doc/libX11/specs/libX11/CH01.xml
-file path=usr/share/doc/libX11/specs/libX11/CH02.xml
-file path=usr/share/doc/libX11/specs/libX11/CH03.xml
-file path=usr/share/doc/libX11/specs/libX11/CH04.xml
-file path=usr/share/doc/libX11/specs/libX11/CH05.xml
-file path=usr/share/doc/libX11/specs/libX11/CH06.xml
-file path=usr/share/doc/libX11/specs/libX11/CH07.xml
-file path=usr/share/doc/libX11/specs/libX11/CH08.xml
-file path=usr/share/doc/libX11/specs/libX11/CH09.xml
-file path=usr/share/doc/libX11/specs/libX11/CH10.xml
-file path=usr/share/doc/libX11/specs/libX11/CH11.xml
-file path=usr/share/doc/libX11/specs/libX11/CH12.xml
-file path=usr/share/doc/libX11/specs/libX11/CH13.xml
-file path=usr/share/doc/libX11/specs/libX11/CH14.xml
-file path=usr/share/doc/libX11/specs/libX11/CH15.xml
-file path=usr/share/doc/libX11/specs/libX11/CH16.xml
-file path=usr/share/doc/libX11/specs/libX11/credits.xml
-file path=usr/share/doc/libX11/specs/libX11/glossary.xml
-file path=usr/share/doc/libX11/specs/libX11/libX11.xml
+file path=usr/share/doc/libX11/XIM/dynamicflow.svg
+file path=usr/share/doc/libX11/XIM/dynamicflowsampleseq.svg
+file path=usr/share/doc/libX11/XIM/eventflow.svg
+file path=usr/share/doc/libX11/XIM/sampleprotocolflow1.svg
+file path=usr/share/doc/libX11/XIM/sampleprotocolflow2.svg
+file path=usr/share/doc/libX11/XIM/staticflow.svg
+file path=usr/share/doc/libX11/XIM/staticflowsampleseq.svg
+file path=usr/share/doc/libX11/XIM/xim.xml
+file path=usr/share/doc/libX11/XKB/XKBlib-1.svg
+file path=usr/share/doc/libX11/XKB/XKBlib-10.svg
+file path=usr/share/doc/libX11/XKB/XKBlib-11.svg
+file path=usr/share/doc/libX11/XKB/XKBlib-12.svg
+file path=usr/share/doc/libX11/XKB/XKBlib-13.svg
+file path=usr/share/doc/libX11/XKB/XKBlib-14.svg
+file path=usr/share/doc/libX11/XKB/XKBlib-15.svg
+file path=usr/share/doc/libX11/XKB/XKBlib-16.svg
+file path=usr/share/doc/libX11/XKB/XKBlib-17.svg
+file path=usr/share/doc/libX11/XKB/XKBlib-18.svg
+file path=usr/share/doc/libX11/XKB/XKBlib-19.svg
+file path=usr/share/doc/libX11/XKB/XKBlib-2.svg
+file path=usr/share/doc/libX11/XKB/XKBlib-20.svg
+file path=usr/share/doc/libX11/XKB/XKBlib-21.svg
+file path=usr/share/doc/libX11/XKB/XKBlib-3.svg
+file path=usr/share/doc/libX11/XKB/XKBlib-4.svg
+file path=usr/share/doc/libX11/XKB/XKBlib-5.svg
+file path=usr/share/doc/libX11/XKB/XKBlib-6.svg
+file path=usr/share/doc/libX11/XKB/XKBlib-7.svg
+file path=usr/share/doc/libX11/XKB/XKBlib-8.svg
+file path=usr/share/doc/libX11/XKB/XKBlib-9.svg
+file path=usr/share/doc/libX11/XKB/acknowledgement.xml
+file path=usr/share/doc/libX11/XKB/ch01.xml
+file path=usr/share/doc/libX11/XKB/ch02.xml
+file path=usr/share/doc/libX11/XKB/ch03.xml
+file path=usr/share/doc/libX11/XKB/ch04.xml
+file path=usr/share/doc/libX11/XKB/ch05.xml
+file path=usr/share/doc/libX11/XKB/ch06.xml
+file path=usr/share/doc/libX11/XKB/ch07.xml
+file path=usr/share/doc/libX11/XKB/ch08.xml
+file path=usr/share/doc/libX11/XKB/ch09.xml
+file path=usr/share/doc/libX11/XKB/ch10.xml
+file path=usr/share/doc/libX11/XKB/ch11.xml
+file path=usr/share/doc/libX11/XKB/ch12.xml
+file path=usr/share/doc/libX11/XKB/ch13.xml
+file path=usr/share/doc/libX11/XKB/ch14.xml
+file path=usr/share/doc/libX11/XKB/ch15.xml
+file path=usr/share/doc/libX11/XKB/ch16.xml
+file path=usr/share/doc/libX11/XKB/ch17.xml
+file path=usr/share/doc/libX11/XKB/ch18.xml
+file path=usr/share/doc/libX11/XKB/ch19.xml
+file path=usr/share/doc/libX11/XKB/ch20.xml
+file path=usr/share/doc/libX11/XKB/ch21.xml
+file path=usr/share/doc/libX11/XKB/ch22.xml
+file path=usr/share/doc/libX11/XKB/glossary.xml
+file path=usr/share/doc/libX11/XKB/xkblib.xml
+file path=usr/share/doc/libX11/i18n/framework/framework.svg
+file path=usr/share/doc/libX11/i18n/framework/framework.xml
+file path=usr/share/doc/libX11/i18n/localedb/localedb.xml
+file path=usr/share/doc/libX11/i18n/trans/trans.xml
+file path=usr/share/doc/libX11/libX11/AppA.xml
+file path=usr/share/doc/libX11/libX11/AppB.xml
+file path=usr/share/doc/libX11/libX11/AppC.xml
+file path=usr/share/doc/libX11/libX11/AppD.xml
+file path=usr/share/doc/libX11/libX11/CH01.xml
+file path=usr/share/doc/libX11/libX11/CH02.xml
+file path=usr/share/doc/libX11/libX11/CH03.xml
+file path=usr/share/doc/libX11/libX11/CH04.xml
+file path=usr/share/doc/libX11/libX11/CH05.xml
+file path=usr/share/doc/libX11/libX11/CH06.xml
+file path=usr/share/doc/libX11/libX11/CH07.xml
+file path=usr/share/doc/libX11/libX11/CH08.xml
+file path=usr/share/doc/libX11/libX11/CH09.xml
+file path=usr/share/doc/libX11/libX11/CH10.xml
+file path=usr/share/doc/libX11/libX11/CH11.xml
+file path=usr/share/doc/libX11/libX11/CH12.xml
+file path=usr/share/doc/libX11/libX11/CH13.xml
+file path=usr/share/doc/libX11/libX11/CH14.xml
+file path=usr/share/doc/libX11/libX11/CH15.xml
+file path=usr/share/doc/libX11/libX11/CH16.xml
+file path=usr/share/doc/libX11/libX11/credits.xml
+file path=usr/share/doc/libX11/libX11/glossary.xml
+file path=usr/share/doc/libX11/libX11/libX11.xml
 file path=usr/share/man/man3x11/AllPlanes.3x11
 file path=usr/share/man/man3x11/BitmapBitOrder.3x11
 file path=usr/share/man/man3x11/BitmapPad.3x11

author	Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
	Mon, 11 Apr 2011 11:04:15 -0700
changeset 1112	4778e9ecf66e
parent 1111	582653852b4c
child 1113	7c899e96b5f0

open-src/doc/xorg-sgml-doctools/Makefile		file \| annotate \| diff \| comparison \| revisions
open-src/lib/libX11/Makefile		file \| annotate \| diff \| comparison \| revisions
open-src/lib/libX11/SolarisIA.patch		file \| annotate \| diff \| comparison \| revisions
open-src/lib/libX11/im-ximcp.patch		file \| annotate \| diff \| comparison \| revisions
open-src/lib/libX11/lc-gb18030.patch		file \| annotate \| diff \| comparison \| revisions
open-src/lib/libX11/locale.paths.patch		file \| annotate \| diff \| comparison \| revisions
open-src/lib/libX11/solaris-abi.patch		file \| annotate \| diff \| comparison \| revisions
open-src/lib/libX11/solaris-kbd.patch		file \| annotate \| diff \| comparison \| revisions
open-src/lib/libX11/xml-install-paths.patch		file \| annotate \| diff \| comparison \| revisions
open-src/lib/libX11/xml-install.patch		file \| annotate \| diff \| comparison \| revisions
open-src/proto/x11proto/Makefile		file \| annotate \| diff \| comparison \| revisions
open-src/proto/x11proto/xfuncproto.patch		file \| annotate \| diff \| comparison \| revisions
open-src/util/util-macros/Makefile		file \| annotate \| diff \| comparison \| revisions
pkg/manifests/x11-documentation-xorg-docs.p5m		file \| annotate \| diff \| comparison \| revisions
pkg/manifests/x11-library-libx11.p5m		file \| annotate \| diff \| comparison \| revisions