--- a/open-src/common/Makefile.inc	Wed Feb 27 19:55:52 2008 -0800
+++ b/open-src/common/Makefile.inc	Thu Feb 28 17:02:09 2008 -0800
@@ -28,7 +28,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile.inc	1.83	08/01/23
+# @(#)Makefile.inc	1.85	08/02/28
 #
 
 # Borrowed from Solaris OS/Net makefile.master:
@@ -284,7 +284,7 @@
 ### Remove libtool from build process when needed
 
 delibtoolize:
-	$(TOP)/common/delibtoolize.pl $(SOURCE_DIR)
+	$(TOP)/common/delibtoolize.pl $(DELIBTOOLIZE_FLAGS) $(SOURCE_DIR)
 
 ### Source tarballs & downloading if necessary
 

--- a/open-src/common/delibtoolize.pl	Wed Feb 27 19:55:52 2008 -0800
+++ b/open-src/common/delibtoolize.pl	Thu Feb 28 17:02:09 2008 -0800
@@ -27,7 +27,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# ident	"@(#)delibtoolize.pl	1.8	07/11/02 SMI"
+# ident	"@(#)delibtoolize.pl	1.9	08/02/27 SMI"
 #
 
 #
@@ -76,7 +76,7 @@
       }
 
       # TODO: handle line continuation
-      if ($l =~ m/^(\S*)_la_LDFLAGS\s=.*-version-number (\d+)[:\d]+/ms) {
+      if ($l =~ m/^(\S*)_la_LDFLAGS\s=.*-version-number (\d+)[:\d]*/ms) {
 	$so_versions{$1} = $2;
       }
       if ($l =~ m/^(\S*)_la_LDFLAGS\s=.*\s*-avoid-version\b/ms) {
@@ -132,7 +132,7 @@
 	$l =~ s{(\s*$sharedobjflags)+\b}{}msg;
 	$l =~ s{(_la_LDFLAGS\s*=\s*)}{$1 $sharedobjflags }ms;
 	$l =~ s{\s+-module\b}{}ms;
-	$l =~ s{\s+-version-number\s+\d+[:\d]+}{}ms;
+	$l =~ s{\s+-version-number\s+\d+[:\d]*}{}ms;
 	$l =~ s{\s+-no-undefined\b}{ -z defs}ms;
       }
 

--- a/open-src/common/pc-files/build_32/x11.pc	Wed Feb 27 19:55:52 2008 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-prefix=/usr/openwin
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-xthreadlib=
-
-Name: X11
-Description: X Library
-Version: 0.0
-Requires: xproto kbproto inputproto
-Requires.private: xau xdmcp
-Cflags: -I${includedir} -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DXTHREADS -DXUSE_MTSAFE_API
-Libs: -L${libdir} -R${libdir} -lX11
-Libs.private: 

--- a/open-src/common/pc-files/build_64/x11.pc	Wed Feb 27 19:55:52 2008 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-prefix=/usr/openwin
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib/64
-includedir=${prefix}/include
-
-xthreadlib=
-
-Name: X11
-Description: X Library
-Version: 0.0
-Requires: xproto kbproto inputproto
-Requires.private: xau xdmcp
-Cflags: -I${includedir} -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DXTHREADS -DXUSE_MTSAFE_API
-Libs: -L${libdir} -R${libdir} -lX11
-Libs.private: 

--- a/open-src/lib/Makefile	Wed Feb 27 19:55:52 2008 -0800
+++ b/open-src/lib/Makefile	Thu Feb 28 17:02:09 2008 -0800
@@ -28,7 +28,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile	1.13	08/02/21
+# @(#)Makefile	1.14	08/02/27
 #
 ###############################################################################
 
@@ -38,6 +38,7 @@
 	libxtrans \
 	libXau \
 	libXdmcp \
+	libX11 \
 	libICE \
 	libSM \
 	libfontenc \

--- a/open-src/lib/Makefile.inc	Wed Feb 27 19:55:52 2008 -0800
+++ b/open-src/lib/Makefile.inc	Thu Feb 28 17:02:09 2008 -0800
@@ -28,7 +28,7 @@
 # or other dealings in this Software without prior written authorization
 # of the copyright holder.
 #
-# @(#)Makefile.inc	1.9	08/01/23
+# @(#)Makefile.inc	1.10	08/02/27
 #
 
 PWD:sh=pwd
@@ -77,6 +77,11 @@
 
 # Run configure script
 $(SOURCE_DIR)/Makefile: $(UNPACK_TARGET) $(XPROTO_DEP)
+	@case '$(MFLAGS)' in *[ik]*) set +e;; esac; \
+	if [ "x$(AUTORECONF)" = "xtrue" ] ; then \
+	    (cd $(SOURCE_DIR) && \
+	     ACLOCAL="$(ACLOCAL_PATH)" autoreconf -v --install --force ) ; \
+	fi
 	(cd $(SOURCE_DIR) ; chmod a+x configure ; \
 	 $(CONFIG_ENV) ./configure $(CONFIG_OPTS) )
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/lib/libX11/1234757.patch	Thu Feb 28 17:02:09 2008 -0800
@@ -0,0 +1,239 @@
+###############################################################################
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use subject to license terms.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, and/or sell copies of the Software, and to permit persons
+# to whom the Software is furnished to do so, provided that the above
+# copyright notice(s) and this permission notice appear in all copies of
+# the Software and that both the above copyright notice(s) and this
+# permission notice appear in supporting documentation.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+# 
+# Except as contained in this notice, the name of a copyright holder
+# shall not be used in advertising or otherwise to promote the sale, use
+# or other dealings in this Software without prior written authorization
+# of the copyright holder.
+#
+
+1234757: XInitThreads needs to be made less restrictive
+
+This is a RFE to enhance XInitThreads so that it may be called:
+
+    * By libraries used by the client, (without the client's intervention)
+    * At a later time, after other Xlib calls have already been made. 
+      Currently, XInitThreads *Must* be the first Xlib call that the client 
+      makes.
+
+For Example, in order for XIL 1.3 to be MT HOT, it must be able to
+make the call to XInitThreads, even if the client has already made
+other Xlib calls.
+
+--- include/X11/Xlibint.h	2007-05-16 08:34:44.000000000 -0700
++++ include/X11/Xlibint.h	2008-02-13 16:25:37.412776000 -0800
+@@ -187,6 +187,29 @@
+ 	struct _X11XCBPrivate *xcb; /* XCB glue private data */
+ };
+ 
++#if defined(XTHREADS) && defined(SUNSOFT)
++struct _DisplayPtrLink {
++    Display *dpy;
++    struct _DisplayPtrLink *next;
++};
++ 
++typedef struct _DisplayPtrLink DisplayPtrLink;
++ 
++int InitDisplayArrayLock();
++
++void RemoveFromDisplayLink(
++#if NeedFunctionPrototypes
++    Display *   /*dpy */
++#endif /* NeedFunctionPrototypes */
++);
++
++int AddToDisplayLink(
++#if NeedFunctionPrototypes
++    Display *   /*dpy */
++#endif /* NeedFunctionPrototypes */
++);
++#endif /* XTHREADS && SUNSOFT */
++
+ #define XAllocIDs(dpy,ids,n) (*(dpy)->idlist_alloc)(dpy,ids,n)
+ 
+ /*
+
+diff -urp -x '*~' -x '*.orig' src/OpenDis.c src/OpenDis.c
+--- src/OpenDis.c	2007-05-17 06:53:58.000000000 -0700
++++ src/OpenDis.c	2008-02-12 21:00:38.937312000 -0800
+@@ -62,6 +62,11 @@ typedef struct {
+ } _XBigReqState;
+ #endif /* !USE_XCB */
+ 
++#if defined(XTHREADS) && defined(SUNSOFT)
++DisplayPtrLink *HeadDisplay=NULL;
++DisplayPtrLink *LastDisplay=NULL;
++#endif /* XTHREADS && SUNSOFT */
++
+ #ifdef XTHREADS
+ #include "locking.h"
+ int  (*_XInitDisplayLock_fn)(Display *dpy) = NULL;
+@@ -267,6 +272,13 @@ XOpenDisplay (
+ 	}
+ #endif
+ 
++#ifdef XTHREADS
++        if (AddToDisplayLink(dpy) == 0) {
++                OutOfMemory (dpy, setup);
++                return(NULL);
++        }
++#endif XTHREADS
++
+ 	if (!_XPollfdCacheInit(dpy)) {
+ 	        OutOfMemory (dpy, setup);
+ 		return(NULL);
+@@ -793,6 +805,10 @@ _XBigReqHandler(
+ void _XFreeDisplayStructure(dpy)
+ 	register Display *dpy;
+ {
++#ifdef XTHREADS
++        RemoveFromDisplayLink(dpy);
++#endif XTHREADS
++
+ 	while (dpy->ext_procs) {
+ 	    _XExtension *ext = dpy->ext_procs;
+ 	    dpy->ext_procs = ext->next;
+@@ -917,6 +933,107 @@ void _XFreeDisplayStructure(dpy)
+ 	Xfree ((char *)dpy);
+ }
+ 
++#if defined(XTHREADS) && defined(SUNSOFT)
++int
++AddToDisplayLink(dpy)
++Display *dpy;
++{
++    if ( dpy->lock )
++        return 1;
++ 
++/*
++ * Attempt to allocate a display array. Return NULL if allocation fails.
++ */
++    if ( !HeadDisplay ) {
++        if ((HeadDisplay = (DisplayPtrLink *) Xcalloc
++                   (1, sizeof(struct _DisplayPtrLink))) == NULL ) {
++            return 0;
++        }
++ 
++        HeadDisplay->dpy = dpy;
++        HeadDisplay->next = NULL;
++        LastDisplay = HeadDisplay;
++        return 1;
++    }
++ 
++    if ((LastDisplay->next = (DisplayPtrLink *) Xcalloc
++                       (1, sizeof(struct _DisplayPtrLink))) == NULL ) {
++        return 0;
++    }
++ 
++    LastDisplay = LastDisplay->next;
++    LastDisplay->dpy = dpy;
++    LastDisplay->next = NULL;
++    return 1;
++}
++
++void
++RemoveFromDisplayLink(dpy)
++Display *dpy;
++{
++    DisplayPtrLink *tmp_display  = HeadDisplay;
++    DisplayPtrLink *prev_display = HeadDisplay;
++ 
++    if ( dpy->lock )
++        return;
++ 
++    while ( tmp_display ) {
++        if ((tmp_display->dpy == dpy) && (tmp_display->dpy->fd == dpy->fd)){
++            break;
++        }
++ 
++        prev_display = tmp_display;
++        tmp_display = tmp_display->next;
++    }
++
++    /* Node not found */
++    if ( !tmp_display )
++        return;
++
++    /* If tmp_display is the first node */
++    if ( tmp_display == HeadDisplay ) {
++        if ( HeadDisplay->next )
++            HeadDisplay = HeadDisplay->next;
++        else {
++            HeadDisplay = NULL;
++            LastDisplay = NULL;
++        }
++    } 
++    /* If tmp_display is the last node */
++    else if ( tmp_display == LastDisplay )  {
++        LastDisplay = prev_display;
++        LastDisplay->next = NULL;
++    }
++    /* tmp_display is in the middle of list*/
++    else
++        prev_display->next = tmp_display->next;
++
++    Xfree(tmp_display);
++    return;
++}
++
++int
++InitDisplayArrayLock()
++{
++    DisplayPtrLink *tmp_display  = HeadDisplay;
++    DisplayPtrLink *prev_display = HeadDisplay;
++ 
++    while ( tmp_display ) {
++        if ((tmp_display->dpy) && (!tmp_display->dpy->lock)) {
++            /* Initialize the display lock */
++            if (_XInitDisplayLock_fn(tmp_display->dpy) != 0) {
++                OutOfMemory (tmp_display->dpy, NULL);
++                return 0;
++            }
++        }
++        tmp_display = tmp_display->next;
++    }
++ 
++    return 1;
++}
++
++#endif /* XTHREADS && SUNSOFT */
++
+ /* OutOfMemory is called if malloc fails.  XOpenDisplay returns NULL
+    after this returns. */
+ 
+diff -urp -x '*~' -x '*.orig' src/locking.c src/locking.c
+--- src/locking.c	2007-05-16 08:34:44.000000000 -0700
++++ src/locking.c	2008-02-12 21:00:38.939222000 -0800
+@@ -642,6 +642,11 @@ Status XInitThreads()
+ #endif
+ #endif
+ 
++#ifdef SUNSOFT
++    if (InitDisplayArrayLock() == 0)
++        return 0;
++#endif
++
+     return 1;
+ }
+ 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/lib/libX11/1261271.patch	Thu Feb 28 17:02:09 2008 -0800
@@ -0,0 +1,66 @@
+###############################################################################
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use subject to license terms.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, and/or sell copies of the Software, and to permit persons
+# to whom the Software is furnished to do so, provided that the above
+# copyright notice(s) and this permission notice appear in all copies of
+# the Software and that both the above copyright notice(s) and this
+# permission notice appear in supporting documentation.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+# 
+# Except as contained in this notice, the name of a copyright holder
+# shall not be used in advertising or otherwise to promote the sale, use
+# or other dealings in this Software without prior written authorization
+# of the copyright holder.
+#
+
+1261271 /usr/dist/exe/gnuemacs doesn't work on s297.
+
+diff -urp -x '*~' -x '*.orig' src/XlibInt.c src/XlibInt.c
+--- src/XlibInt.c	2008-02-27 21:08:53.377329000 -0800
++++ src/XlibInt.c	2008-02-27 21:08:58.411340000 -0800
+@@ -59,6 +59,12 @@ from The Open Group.
+ #include <X11/extensions/sme.h>
+ #endif /* SME */
+ 
++/* Xtransint.h is needed for access to an xtrans internal structure.
++ * See the comments in _XFlush for information.  This is required for
++ * compatibility between X11R6-xtrans and gnuemacs v18.58.
++ */
++#include <X11/Xtrans/Xtransint.h>
++
+ #ifdef XTHREADS
+ #include "locking.h"
+ 
+@@ -800,6 +806,17 @@ static void _XFlushInt(
+ 	register char *bufindex;
+ 	_XExtension *ext;
+ 
++	/* Begin gnuemacs v18.58 compatability fix.
++	 * In x11trans.c, line 2207, in gnuemacs source, the dpy->fd is
++	 * modified.  This was of no consequence in X11R5, but in X11R6,
++	 * the xtrans layer has a copy which must be updated here.
++	 * The reason to perform the update here is because this code
++	 * is executed right after gnuemacs changes the fd variable.
++	 */
++	if (dpy->fd != dpy->trans_conn->fd) {
++		dpy->trans_conn->fd = dpy->fd;
++	}
++	/* End gnuemacs v18.58 compatability fix. */
+ #ifdef SUNSOFT
+         if (dpy->smeBuffer) {
+                 smeRegion *smeBp = (smeRegion *) dpy->smeBuffer;

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/lib/libX11/4010755.patch	Thu Feb 28 17:02:09 2008 -0800
@@ -0,0 +1,229 @@
+###############################################################################
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use subject to license terms.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, and/or sell copies of the Software, and to permit persons
+# to whom the Software is furnished to do so, provided that the above
+# copyright notice(s) and this permission notice appear in all copies of
+# the Software and that both the above copyright notice(s) and this
+# permission notice appear in supporting documentation.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+# 
+# Except as contained in this notice, the name of a copyright holder
+# shall not be used in advertising or otherwise to promote the sale, use
+# or other dealings in this Software without prior written authorization
+# of the copyright holder.
+#
+
+4010755: SEGV in XFindContext if XInitThreads has been enabled
+
+XFindContext in Xlib was calling _XLockMutex with an uninitialized
+mutex lock structure. The new version of XInitThreads activates the
+locking functions at any time, even after displays have been created.
+
+In this new case, the context structure was created prior to
+XInitThreads being invoked. As a result, the display contained an
+opaque pointer to this context structure, which still contained an
+uninitialized lock structure.
+
+The solution was to explicitly set the lock structure pointer to NULL
+(as a flag) when creating the context, then check for NULL before
+locking. If NULL is found and threads are now enabled, then the
+structure gets reinitialized to the correct mutex lock structure
+before the lock call.
+
+Another area besides the functions in Context.c are the functions in
+Xrm.c. A similar fix was added to them as well.
+
+
+diff -urp -x '*~' -x '*.orig' src/Context.c src/Context.c
+--- src/Context.c	2007-05-16 08:34:44.000000000 -0700
++++ src/Context.c	2008-02-12 21:00:44.588363000 -0800
+@@ -192,6 +192,7 @@ int XSaveContext(
+ 	    return XCNOMEM;
+ 	}
+ 	db->numentries = 0;
++	db->linfo.lock = (xmutex_t) NULL;
+ 	_XCreateMutex(&db->linfo);
+ #ifdef MOTIFBC
+ 	if (!display) *pdb = db; else
+@@ -203,6 +204,8 @@ int XSaveContext(
+ 	    UnlockDisplay(display);
+ 	}
+     }
++    if (!db->linfo.lock)
++	_XCreateMutex(&db->linfo);
+     _XLockMutex(&db->linfo);
+     head = &Hash(db, rid, context);
+     _XUnlockMutex(&db->linfo);
+@@ -254,6 +257,8 @@ int XFindContext(display, rid, context, 
+     }
+     if (!db)
+ 	return XCNOENT;
++    if (!db->linfo.lock)
++        _XCreateMutex(&db->linfo);
+     _XLockMutex(&db->linfo);
+     for (entry = Hash(db, rid, context); entry; entry = entry->next)
+     {
+@@ -292,6 +297,8 @@ int XDeleteContext(display, rid, context
+     }
+     if (!db)
+ 	return XCNOENT;
++    if (!db->linfo.lock)
++        _XCreateMutex(&db->linfo);
+     _XLockMutex(&db->linfo);
+     for (prev = &Hash(db, rid, context);
+ 	 (entry = *prev);
+diff -urp -x '*~' -x '*.orig' src/Xrm.c src/Xrm.c
+--- src/Xrm.c	2007-05-16 08:34:44.000000000 -0700
++++ src/Xrm.c	2008-02-12 21:00:44.594920000 -0800
+@@ -500,6 +500,7 @@ static XrmDatabase NewDatabase(void)
+ 
+     db = (XrmDatabase) Xmalloc(sizeof(XrmHashBucketRec));
+     if (db) {
++        db->linfo.lock = (xmutex_t) NULL;
+ 	_XCreateMutex(&db->linfo);
+ 	db->table = (NTable)NULL;
+ 	db->mbstate = (XPointer)NULL;
+@@ -775,7 +776,11 @@ void XrmCombineDatabase(
+     if (!*into) {
+ 	*into = from;
+     } else if (from) {
++	if (!(&from->linfo.lock))
++	    _XCreateMutex(&from->linfo);
+ 	_XLockMutex(&from->linfo);
++	if (!(&(*into)->linfo.lock))
++	    _XCreateMutex(&(*into)->linfo);
+ 	_XLockMutex(&(*into)->linfo);
+ 	if ((ftable = from->table)) {
+ 	    prev = &(*into)->table;
+@@ -1022,6 +1027,8 @@ void XrmQPutResource(
+     XrmValuePtr		value)
+ {
+     if (!*pdb) *pdb = NewDatabase();
++    if (!(*pdb)->linfo.lock)
++        _XCreateMutex(&(*pdb)->linfo);
+     _XLockMutex(&(*pdb)->linfo);
+     PutEntry(*pdb, bindings, quarks, type, value);
+     _XUnlockMutex(&(*pdb)->linfo);
+@@ -1038,6 +1045,8 @@ XrmPutResource(
+     XrmQuark	    quarks[MAXDBDEPTH+1];
+ 
+     if (!*pdb) *pdb = NewDatabase();
++    if (!(*pdb)->linfo.lock)
++        _XCreateMutex(&(*pdb)->linfo);
+     _XLockMutex(&(*pdb)->linfo);
+     XrmStringToBindingQuarkList(specifier, bindings, quarks);
+     PutEntry(*pdb, bindings, quarks, XrmStringToQuark(type), value);
+@@ -1056,6 +1065,8 @@ XrmQPutStringResource(
+     if (!*pdb) *pdb = NewDatabase();
+     value.addr = (XPointer) str;
+     value.size = strlen(str)+1;
++    if (!(*pdb)->linfo.lock)
++        _XCreateMutex(&(*pdb)->linfo);
+     _XLockMutex(&(*pdb)->linfo);
+     PutEntry(*pdb, bindings, quarks, XrmQString, &value);
+     _XUnlockMutex(&(*pdb)->linfo);
+@@ -1538,6 +1549,8 @@ XrmPutStringResource(
+     XrmStringToBindingQuarkList(specifier, bindings, quarks);
+     value.addr = (XPointer) str;
+     value.size = strlen(str)+1;
++    if (!(*pdb)->linfo.lock)
++        _XCreateMutex(&(*pdb)->linfo);
+     _XLockMutex(&(*pdb)->linfo);
+     PutEntry(*pdb, bindings, quarks, XrmQString, &value);
+     _XUnlockMutex(&(*pdb)->linfo);
+@@ -1550,6 +1563,8 @@ XrmPutLineResource(
+     _Xconst char*line)
+ {
+     if (!*pdb) *pdb = NewDatabase();
++    if (!(*pdb)->linfo.lock)
++        _XCreateMutex(&(*pdb)->linfo);
+     _XLockMutex(&(*pdb)->linfo);
+     GetDatabase(*pdb, line, (char *)NULL, False);
+     _XUnlockMutex(&(*pdb)->linfo);
+@@ -1562,6 +1577,8 @@ XrmGetStringDatabase(
+     XrmDatabase     db;
+ 
+     db = NewDatabase();
++    if (!db->linfo.lock)
++        _XCreateMutex(&db->linfo);
+     _XLockMutex(&db->linfo);
+     GetDatabase(db, data, (char *)NULL, True);
+     _XUnlockMutex(&db->linfo);
+@@ -1670,6 +1687,8 @@ XrmGetFileDatabase(
+ 	return (XrmDatabase)NULL;
+ 
+     db = NewDatabase();
++    if (!db->linfo.lock)
++        _XCreateMutex(&db->linfo);
+     _XLockMutex(&db->linfo);
+     GetDatabase(db, str, filename, True);
+     _XUnlockMutex(&db->linfo);
+@@ -1694,6 +1713,8 @@ XrmCombineFileDatabase(
+ 	    *target = db = NewDatabase();
+     } else
+ 	db = NewDatabase();
++    if (!db->linfo.lock)
++        _XCreateMutex(&db->linfo);
+     _XLockMutex(&db->linfo);
+     GetDatabase(db, str, filename, True);
+     _XUnlockMutex(&db->linfo);
+@@ -1966,6 +1987,8 @@ Bool XrmEnumerateDatabase(
+ 
+     if (!db)
+ 	return False;
++    if (!db->linfo.lock)
++        _XCreateMutex(&db->linfo);
+     _XLockMutex(&db->linfo);
+     eclosure.db = db;
+     eclosure.proc = proc;
+@@ -2262,6 +2285,8 @@ Bool XrmQGetSearchList(
+     closure.idx = -1;
+     closure.limit = listLength - 2;
+     if (db) {
++	if (!db->linfo.lock)
++	    _XCreateMutex(&db->linfo);
+ 	_XLockMutex(&db->linfo);
+ 	table = db->table;
+ 	if (*names) {
+@@ -2540,6 +2565,8 @@ Bool XrmQGetResource(
+     VClosureRec closure;
+ 
+     if (db && *names) {
++	if (!db->linfo.lock)
++	    _XCreateMutex(&db->linfo);
+ 	_XLockMutex(&db->linfo);
+ 	closure.type = pType;
+ 	closure.value = pValue;
+@@ -2636,6 +2663,8 @@ XrmLocaleOfDatabase(
+     XrmDatabase db)
+ {
+     const char* retval;
++    if (!db->linfo.lock)
++        _XCreateMutex(&db->linfo);
+     _XLockMutex(&db->linfo);
+     retval = (*db->methods->lcname)(db->mbstate);
+     _XUnlockMutex(&db->linfo);
+@@ -2648,6 +2677,8 @@ void XrmDestroyDatabase(
+     register NTable table, next;
+ 
+     if (db) {
++	if (!db->linfo.lock)
++	    _XCreateMutex(&db->linfo);
+ 	_XLockMutex(&db->linfo);
+ 	for (next = db->table; (table = next); ) {
+ 	    next = table->next;

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/lib/libX11/4076297.patch	Thu Feb 28 17:02:09 2008 -0800
@@ -0,0 +1,55 @@
+###############################################################################
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use subject to license terms.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, and/or sell copies of the Software, and to permit persons
+# to whom the Software is furnished to do so, provided that the above
+# copyright notice(s) and this permission notice appear in all copies of
+# the Software and that both the above copyright notice(s) and this
+# permission notice appear in supporting documentation.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+# 
+# Except as contained in this notice, the name of a copyright holder
+# shall not be used in advertising or otherwise to promote the sale, use
+# or other dealings in this Software without prior written authorization
+# of the copyright holder.
+#
+
+4076297 glXChooseVisual hangs if XInitThreads is called
+
+diff -urp -x '*~' -x '*.orig' src/XlibInt.c src/XlibInt.c
+--- src/XlibInt.c	2008-02-27 21:08:48.204605000 -0800
++++ src/XlibInt.c	2008-02-27 21:08:53.377329000 -0800
+@@ -1339,7 +1339,8 @@ int _XRead(
+        if (dpy->lock && dpy->lock->reply_bytes_left > 0)
+        {
+            dpy->lock->reply_bytes_left -= original_size;
+-           if (dpy->lock->reply_bytes_left == 0) {
++           if (dpy->lock->reply_bytes_left <= 0) {
++	       dpy->lock->reply_bytes_left = 0;
+ 	       dpy->flags &= ~XlibDisplayReply;
+                UnlockNextReplyReader(dpy);
+ 	   }
+@@ -1564,7 +1565,8 @@ void _XReadPad(
+        if (dpy->lock && dpy->lock->reply_bytes_left > 0)
+        {
+            dpy->lock->reply_bytes_left -= original_size;
+-           if (dpy->lock->reply_bytes_left == 0) {
++           if (dpy->lock->reply_bytes_left <= 0) {
++	       dpy->lock->reply_bytes_left = 0;
+ 	       dpy->flags &= ~XlibDisplayReply;
+                UnlockNextReplyReader(dpy);
+ 	   }

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/lib/libX11/4614834.patch	Thu Feb 28 17:02:09 2008 -0800
@@ -0,0 +1,96 @@
+###############################################################################
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use subject to license terms.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, and/or sell copies of the Software, and to permit persons
+# to whom the Software is furnished to do so, provided that the above
+# copyright notice(s) and this permission notice appear in all copies of
+# the Software and that both the above copyright notice(s) and this
+# permission notice appear in supporting documentation.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+# 
+# Except as contained in this notice, the name of a copyright holder
+# shall not be used in advertising or otherwise to promote the sale, use
+# or other dealings in this Software without prior written authorization
+# of the copyright holder.
+#
+
+4614834: Xlib color functions are not MT-safe
+
+In a multithreaded Xlib client:
+
+    * concurrent access to XAllocNamedColor() make the client crash
+    * concurrent access to XLookupColor() make the client crash
+
+The cause of the problem is that in multithread environment some data
+in XLookupColor() and XAllocNamedColor() can be accessed/modified at
+same time by multi threads. Adding some lock and unlock code to make
+sure only one thread can access the data at one time fixed the
+problem.
+
+diff -urp -x '*~' -x '*.orig' src/GetColor.c src/GetColor.c
+--- src/GetColor.c	2007-05-16 08:34:44.000000000 -0700
++++ src/GetColor.c	2008-02-12 21:00:49.846700000 -0800
+@@ -57,12 +57,14 @@ XColor *exact_def) /* RETURN */
+     if ((ccc = XcmsCCCOfColormap(dpy, cmap)) != (XcmsCCC)NULL) {
+ 	const char *tmpName = colorname;
+ 
++	LockDisplay(dpy);
+ 	switch (_XcmsResolveColorString(ccc, &tmpName, &cmsColor_exact,
+ 					XcmsRGBFormat)) {
+ 	case XcmsSuccess:
+ 	case XcmsSuccessWithCompression:
+ 	    _XcmsRGB_to_XColor(&cmsColor_exact, exact_def, 1);
+ 	    memcpy((char *)hard_def, (char *)exact_def, sizeof(XColor));
++	    UnlockDisplay(dpy);
+ 	    ret = XAllocColor(dpy, cmap, hard_def);
+ 	    exact_def->pixel = hard_def->pixel;
+ 	    return(ret);
+@@ -75,6 +77,7 @@ XColor *exact_def) /* RETURN */
+ 	     */
+ 	    break;
+ 	}
++	UnlockDisplay(dpy);
+     }
+ 
+     /*
+diff -urp -x '*~' -x '*.orig' src/LookupCol.c src/LookupCol.c
+--- src/LookupCol.c	2007-05-16 08:34:44.000000000 -0700
++++ src/LookupCol.c	2008-02-12 21:00:49.847158000 -0800
+@@ -55,6 +55,7 @@ XLookupColor (
+ 	if ((ccc = XcmsCCCOfColormap(dpy, cmap)) != (XcmsCCC)NULL) {
+ 	    const char *tmpName = spec;
+ 
++	    LockDisplay(dpy);
+ 	    switch (_XcmsResolveColorString(ccc, &tmpName, &cmsColor_exact,
+ 					    XcmsRGBFormat)) {
+ 	    case XcmsSuccess:
+@@ -62,6 +63,7 @@ XLookupColor (
+ 		_XcmsRGB_to_XColor(&cmsColor_exact, def, 1);
+ 		memcpy((char *)scr, (char *)def, sizeof(XColor));
+ 		_XUnresolveColor(ccc, scr);
++		UnlockDisplay(dpy);
+ 		return(1);
+ 	    case XcmsFailure:
+ 	    case _XCMS_NEWNAME:
+@@ -72,6 +74,7 @@ XLookupColor (
+ 		 */
+ 		break;
+ 	    }
++	    UnlockDisplay(dpy);
+ 	}
+ 
+ 	/*

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/lib/libX11/5039226.patch	Thu Feb 28 17:02:09 2008 -0800
@@ -0,0 +1,55 @@
+###############################################################################
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use subject to license terms.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, and/or sell copies of the Software, and to permit persons
+# to whom the Software is furnished to do so, provided that the above
+# copyright notice(s) and this permission notice appear in all copies of
+# the Software and that both the above copyright notice(s) and this
+# permission notice appear in supporting documentation.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+# 
+# Except as contained in this notice, the name of a copyright holder
+# shall not be used in advertising or otherwise to promote the sale, use
+# or other dealings in this Software without prior written authorization
+# of the copyright holder.
+#
+
+5039226 Whitebox animation causes Solaris desktop hang
+
+This problem is caused by a dead lock between java_vm and Xserver:
+Xserver is grabbed by java_vm and waiting for XUngrabServer, java_vm
+thought XUngrabServer was already sent and sends another dga lock
+request to Xserver and blocked on that request. Here is what happened:
+java_vm threads calls XGrabServer and XUngrabServer and then
+Solaris_DGA_GetLock, it seems no problem, but the current
+XUngrabServer requires a XSync call after XUngrabServer in MT
+environment to make sure Xserver is ungrabbed *before* new lock
+requests come in. Without this XSync, a dead lock may formed just like
+this case.
+
+--- src/UngrabSvr.c	2007-05-17 06:53:58.000000000 -0700
++++ src/UngrabSvr.c	2008-02-27 18:14:24.227304000 -0800
+@@ -41,6 +41,9 @@
+         GetEmptyReq(UngrabServer, req);
+         UnlockDisplay(dpy);
+ 	SyncHandle();
++	/* fix for bug 5039226: desktop hangs */
++	if (!dpy->synchandler)  
++	    XSync(dpy, 0);
+ 	return 1;
+ }
+ 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/lib/libX11/6409332.patch	Thu Feb 28 17:02:09 2008 -0800
@@ -0,0 +1,45 @@
+###############################################################################
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use subject to license terms.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, and/or sell copies of the Software, and to permit persons
+# to whom the Software is furnished to do so, provided that the above
+# copyright notice(s) and this permission notice appear in all copies of
+# the Software and that both the above copyright notice(s) and this
+# permission notice appear in supporting documentation.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+# 
+# Except as contained in this notice, the name of a copyright holder
+# shall not be used in advertising or otherwise to promote the sale, use
+# or other dealings in this Software without prior written authorization
+# of the copyright holder.
+#
+Part of the fix for:
+6409332 infinite loop in XFlushInt() in Nevada on x86/32-bit
+
+The rest is already in libX11 upstream.
+
+--- include/X11/Xlibint.h	2008-02-19 14:30:30.193100000 -0800
++++ include/X11/Xlibint.h	2007-06-07 09:35:46.649363000 -0700
+@@ -108,7 +108,7 @@
+ 	int nscreens;		/* number of screens on this server*/
+ 	Screen *screens;	/* pointer to list of screens */
+ 	unsigned long motion_buffer;	/* size of motion buffer */
+-	unsigned long flags;	   /* internal connection flags */
++	volatile unsigned long flags;	   /* internal connection flags */
+ 	int min_keycode;	/* minimum defined keycode */
+ 	int max_keycode;	/* maximum defined keycode */
+ 	KeySym *keysyms;	/* This server's keysyms */

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/lib/libX11/Makefile	Thu Feb 28 17:02:09 2008 -0800
@@ -0,0 +1,128 @@
+###############################################################################
+#
+# X11 1.x Makefile
+#
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use subject to license terms.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, and/or sell copies of the Software, and to permit persons
+# to whom the Software is furnished to do so, provided that the above
+# copyright notice(s) and this permission notice appear in all copies of
+# the Software and that both the above copyright notice(s) and this
+# permission notice appear in supporting documentation.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+# 
+# Except as contained in this notice, the name of a copyright holder
+# shall not be used in advertising or otherwise to promote the sale, use
+# or other dealings in this Software without prior written authorization
+# of the copyright holder.
+#
+# @(#)Makefile	1.3	08/02/28
+#
+
+# Package name used in tarballs
+LIB_MODULE=libX11
+
+# Version number (used in path names)
+LIB_VERS=1.1.3
+
+# Patches to apply to source after unpacking, in order
+SOURCE_PATCHES = \
+	lintlib.patch,-p1 \
+	manpages.patch,-p1 \
+	XErrorDB.patch,-p1 \
+	1234757.patch \
+	4010755.patch \
+	4614834.patch \
+	5039226.patch \
+	6409332.patch \
+	solaris-abi.patch \
+	solaris-i18n.patch \
+	solaris-kbd.patch \
+	SolarisIA.patch \
+	sme.patch \
+	4076297.patch \
+	1261271.patch
+
+# Library name (used for specfiles/mapfiles)
+LIBNAME=X11
+
+# Man pages to apply Sun footer to & attributes to list
+SUNTOUCHED_MANPAGES=man/*.man man/xkb/*.man
+SUN_PACKAGE=SUNWxwplt
+LIB_STABILITY=Committed
+LIB_MAN_SUFFIX=3X11
+
+# Command line options to GNU autoconf configure script
+LIB_ADD_CONFIG_OPTS = --enable-xthreads --enable-loadable-i18n \
+	--with-xcb=no --enable-loadable-xcursor --enable-xcms \
+	--enable-xlocaledir --enable-xkb --enable-man-pages=$(LIB_MAN_SUFFIX) \
+	--with-lint --enable-lint-library \
+	--with-locale-lib-dir='$${exec_prefix}/lib/X11/locale$(LIBSUBDIR)'
+
+# -xF is needed for mapfile reordering to work
+LIB_ADD_CFLAGS = -xF -g
+
+# -DSUNSOFT enables SUN_SME (Shared Memory transport extension)
+# -DMOTIFBC enables compatibility with bugs in Motif & other apps
+# -DSUNSOFT_KBD enables Solaris traditional keyboard handling
+LIB_ADD_CPPFLAGS = -DSUNSOFT -DMOTIFBC -DSUNSOFT_KBD
+
+# Work around libtool's interference
+LIB_ADD_BUILD_DEPS = delibtoolize
+
+# Use -KPIC instead of -Kpic because we have too many symbols on SPARC
+DELIBTOOLIZE_FLAGS_sparc = -P
+DELIBTOOLIZE_FLAGS_i386 = 
+DELIBTOOLIZE_FLAGS = $(DELIBTOOLIZE_FLAGS_$(MACH))
+
+# Need additional mapfile for additional symbols in 64-bit versions
+BUILD_64_FLAGS = ADD_libX11_LDFLAGS="-M $(PWD)/mapfile-vers-64"
+
+# Library built in tree
+LIB_BUILT=$(SOURCE_DIR)/src/.libs/libX11.so.4
+
+# pkg-config files that need to have -R added
+FIX_PC_FILES=x11.pc.in
+
+# Regenerate Makefile.in's from Makefile.am's after patching them
+AUTORECONF=true
+
+include ../Makefile.inc
+
+# Merge in additional sources from sun-src directory
+source_gen:: $(LNDIR)
+	mkdir -p $(SOURCE_DIR)
+	(cd $(SOURCE_DIR) && $(LNDIR) ../../sun-src)
+
+install_gen::
+	mkdir -p $(PROTODIR)/usr/X11/lib$(ARCHLIBSUBDIR)
+	-rm -f $(PROTODIR)/usr/X11/lib$(ARCHLIBSUBDIR)/libX11.so
+	ln -s libX11.so.4 $(PROTODIR)/usr/X11/lib$(ARCHLIBSUBDIR)/libX11.so
+
+# Install additional headers we need in other parts of the build or ship in
+# packages, but which X.Org doesn't
+install_32::
+	mkdir -p $(PROTODIR)/usr/X11/include/X11/extensions
+	cp -pf sun-src/include/X11/Xvarargs.h $(PROTODIR)/usr/X11/include/X11/
+	cp -pf sun-src/include/X11/extensions/XInteractive.h \
+		$(PROTODIR)/usr/X11/include/X11/extensions/
+	cp -pf sun-src/include/X11/extensions/XInteractive.h \
+		$(PROTODIR)/usr/X11/include/X11/extensions/
+	cp -pf $(BUILD_DIR_32)$(SOURCE_DIR)/src/ks_tables.h \
+		$(PROTODIR)/usr/X11/include/
+	cp -pf $(BUILD_DIR_32)$(SOURCE_DIR)/src/xlibi18n/Xlc*.h \
+		$(PROTODIR)/usr/X11/include/X11/

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/lib/libX11/SolarisIA.patch	Thu Feb 28 17:02:09 2008 -0800
@@ -0,0 +1,79 @@
+###############################################################################
+# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+# Use subject to license terms.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, and/or sell copies of the Software, and to permit persons
+# to whom the Software is furnished to do so, provided that the above
+# copyright notice(s) and this permission notice appear in all copies of
+# the Software and that both the above copyright notice(s) and this
+# permission notice appear in supporting documentation.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+# 
+# Except as contained in this notice, the name of a copyright holder
+# shall not be used in advertising or otherwise to promote the sale, use
+# or other dealings in this Software without prior written authorization
+# of the copyright holder.
+#
+diff -urp -x '*~' -x '*.orig' src/Makefile.am src/Makefile.am
+--- src/Makefile.am	2008-02-27 21:08:37.807066000 -0800
++++ src/Makefile.am	2008-02-27 21:08:42.581207000 -0800
+@@ -357,6 +357,9 @@ libX11_la_SOURCES += \
+                   x11_trans.c
+ endif
+ 
++# SolarisIA extension
++libX11_la_SOURCES += XInteractive.c
++
+ #
+ # Figure out which sub-libraries to link into Xlib
+ #
+diff -urp -x '*~' -x '*.orig' src/OpenDis.c src/OpenDis.c
+--- src/OpenDis.c	2008-02-27 21:08:37.717142000 -0800
++++ src/OpenDis.c	2008-02-27 21:08:42.585211000 -0800
+@@ -47,6 +47,11 @@ in this Software without prior written a
+ #include "XKBlib.h"
+ #endif /* XKB */
+ 
++/* begin SUNSOFT_INTERACTIVE */
++#include <X11/extensions/interactive.h>
++#include <X11/extensions/XInteractive.h>
++/* end SUNSOFT_INTERACTIVE */
++
+ #if !USE_XCB
+ #ifdef X_NOT_POSIX
+ #define Size_t unsigned int
+@@ -758,6 +763,21 @@ XOpenDisplay (
+ #ifdef XKB
+ 	XkbUseExtension(dpy,NULL,NULL);
+ #endif
++/* begin SUNSOFT_INTERACTIVE */
++	{
++
++	   long  pid    = (long) getpid();
++	   int majorop, first_event, first_error;
++	   int majorv, minorv;
++ 
++	   if ( (XQueryExtension(dpy, "SolarisIA",
++		&majorop, &first_event, &first_error)==True)) {
++		  XSolarisIASetProcessInfo(dpy, (unsigned char *)&pid,
++					   INTERACTIVE_INFO, 1); 
++	   }
++	} 
++/* end SUNSOFT_INTERACTIVE */
++
+ /*
+  * and return successfully
+  */

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/lib/libX11/XErrorDB.patch	Thu Feb 28 17:02:09 2008 -0800
@@ -0,0 +1,95 @@
+XErrorDB fixes applied to X.Org git after libX11-1.1.3 was released.
+These should all be included in libX11-1.1.4 so this patch can be
+removed when upgrading to that release.
+
+From 31540f1438ec63faf37044f2fd654b335ddf80f0 Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?Kristian_H=C3=B8gsberg?= <[email protected]>
+Date: Wed, 29 Aug 2007 19:50:57 -0400
+Subject: [PATCH] Add GLX 1.4 requests and errors.
+---
+ src/XErrorDB |   16 ++++++++++++++++
+ 1 files changed, 16 insertions(+), 0 deletions(-)
+
+diff --git a/src/XErrorDB b/src/XErrorDB
+index 2e34b1d..a0b9684 100644
+--- a/src/XErrorDB
++++ b/src/XErrorDB
+@@ -498,6 +498,18 @@ XRequest.GLX.17: X_GLXVendorPrivateWithR
+ XRequest.GLX.18: X_GLXQueryExtensionsString
+ XRequest.GLX.19: X_GLXQueryServerString
+ XRequest.GLX.20: X_GLXClientInfo
++XRequest.GLX.21: X_GLXGetFBConfigs
++XRequest.GLX.22: X_GLXCreatePixmap
++XRequest.GLX.23: X_GLXDestroyPixmap
++XRequest.GLX.24: X_GLXCreateNewContext
++XRequest.GLX.25: X_GLXQueryContext
++XRequest.GLX.26: X_GLXMakeContextCurrent
++XRequest.GLX.27: X_GLXCreatePbuffer
++XRequest.GLX.28: X_GLXDestroyPbuffer
++XRequest.GLX.29: X_GLXGetDrawableAttributes
++XRequest.GLX.30: X_GLXChangeDrawableAttributes
++XRequest.GLX.31: X_GLXCreateWindow
++XRequest.GLX.32: X_GLXDestroyWindow
+ ! GL Non-rendering Commands
+ XRequest.GLX.103: X_GLXDeleteLists
+ XRequest.GLX.102: X_GLXEndList
+@@ -555,6 +567,10 @@ XProtoError.GLX.5: GLXBadCurrentWindow
+ XProtoError.GLX.6: GLXBadRenderRequest
+ XProtoError.GLX.7: GLXBadLargeRequest
+ XProtoError.GLX.8: GLXUnsupportedPrivateRequest
++XProtoError.GLX.9: GLXBadFBConfig
++XProtoError.GLX.10: GLXBadPbuffer
++XProtoError.GLX.11: GLXBadCurrentDrawable
++XProtoError.GLX.12: GLXBadWindow
+ ! XC-MISC extension, an X Consortium standard
+ XRequest.XC-MISC.0: XCMiscGetVersion
+ XRequest.XC-MISC.1: XCMiscGetXIDRange
+-- 
+1.4.1
+
+From 416a812200f24d19149dcc497e5c51a0608120f6 Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <[email protected]>
+Date: Fri, 8 Feb 2008 15:31:31 -0800
+Subject: [PATCH] XErrorDB updates for Render 0.9 & XFixes 4.0
+---
+ src/XErrorDB |   10 +++++++++-
+ 1 files changed, 9 insertions(+), 1 deletions(-)
+
+diff --git a/src/XErrorDB b/src/XErrorDB
+index a0b9684..70715a5 100644
+--- a/src/XErrorDB
++++ b/src/XErrorDB
+@@ -634,7 +634,7 @@ XProtoError.XFree86-Misc.5: XF86MiscModI
+ XProtoError.XFree86-Misc.6: XF86MiscModInDevClientNotLocal
+ XProtoError.XFree86-Misc.7: XF86MiscNoModule
+ ! XFree86-DGA  -- not an X Consortium standard
+-XRequest.XFree86-DGA.0: XDGAQueryVersion
++XRequest.XFree86-DGA.0: XF86DGAQueryVersion
+ XRequest.XFree86-DGA.1: XF86DGAGetVideoLL
+ XRequest.XFree86-DGA.2: XF86DGADirectVideo
+ XRequest.XFree86-DGA.3: XF86DGAGetViewPortSize
+@@ -891,6 +891,12 @@ XRequest.RENDER.27: RenderCreateCursor
+ XRequest.RENDER.28: RenderSetPictureTransform
+ XRequest.RENDER.29: RenderQueryFilters
+ XRequest.RENDER.30: RenderSetPictureFilter
++XRequest.RENDER.31: RenderCreateAnimCursor
++XRequest.RENDER.32: RenderAddTraps
++XRequest.RENDER.33: RenderCreateSolidFill
++XRequest.RENDER.34: RenderCreateLinearGradient
++XRequest.RENDER.35: RenderCreateRadialGradient
++XRequest.RENDER.36: RenderCreateConicalGradient
+ XProtoError.RENDER.0: RenderBadFormat (invalid PictFormat parameter)
+ XlibMessage.RENDER.0: PictFormat id in failed request: 0x%lx
+ XProtoError.RENDER.1: RenderBadPicture (invalid Picture parameter)
+@@ -931,6 +937,8 @@ XRequest.XFIXES.25: XFixesGetCursorImage
+ XRequest.XFIXES.26: XFixesChangeCursor
+ XRequest.XFIXES.27: XFixesChangeCursorByName
+ XRequest.XFIXES.28: XFixesExpandRegion
++XRequest.XFIXES.29: XFixesHideCursor
++XRequest.XFIXES.30: XFixesShowCursor
+ XProtoError.XFIXES.0: BadRegion (invalid Region parameter)
+ XlibMessage.XFIXES.0: Region id in failed request:  0x%lx
+ ! DAMAGE extension
+-- 
+1.4.1
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/lib/libX11/lintlib.patch	Thu Feb 28 17:02:09 2008 -0800
@@ -0,0 +1,59 @@
+From e5892467ae3308c8651be76e06db322dcbc08522 Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <[email protected]>
+Date: Fri, 15 Feb 2008 17:27:53 -0800
+Subject: [PATCH] Add support for building lint library with --enable-lint-library
+---
+ configure.ac    |    5 +++++
+ src/Makefile.am |   13 +++++++++++++
+ 2 files changed, 18 insertions(+), 0 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 604d1bb..7ab9b7f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -14,6 +14,10 @@ AM_MAINTAINER_MODE
+ AM_CONFIG_HEADER([src/config.h])
+ AC_CONFIG_HEADER([include/X11/XlibConf.h])
+ 
++# Require xorg-macros version 1.1.0 or newer for XORG_WITH_LINT macro
++m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later before running autoconf/autogen])])
++XORG_MACROS_VERSION(1.1)
++
+ # Checks for programs.
+ AC_PROG_LIBTOOL
+ AC_PROG_CC
+@@ -331,6 +335,7 @@ fi
+ 
+ dnl Allow checking code with lint, sparse, etc.
+ XORG_WITH_LINT
++XORG_LINT_LIBRARY([X11])
+ LINT_FLAGS="${LINT_FLAGS} ${X11_CFLAGS} ${XPROTO_CFLAGS}"
+ 
+ if test "x$GCC" = "xyes"; then
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 7c44f5b..564e03f 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -402,6 +402,19 @@ lint:	$(BUILT_SOURCES)
+ 	done
+ endif LINT
+ 
++if MAKE_LINT_LIB
++lintlibdir = $(libdir)
++
++lintlib_DATA = $(LINTLIB)
++
++lintlib_src = $(libX11_la_SOURCES) xcms/*.c xkb/*.c
++
++CLEANFILES += $(lintlib_DATA)
++
++$(LINTLIB): $(libX11_la_SOURCES)
++	$(LINT) -y -oX11 -x $(ALL_LINT_FLAGS) $(lintlib_src)
++endif MAKE_LINT_LIB
++
+ #
+ # Building ks_tables.h requires the makekeys utility
+ #
+-- 
+1.4.1
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/lib/libX11/manpages.patch	Thu Feb 28 17:02:09 2008 -0800
@@ -0,0 +1,2404 @@
+Manpage fixes applied to X.Org git after libX11-1.1.3 was released.
+These should all be included in libX11-1.1.4 so this patch can be
+removed when upgrading to that release.
+
+From e3430616f26b68e1439143cbe10732f3fc329d20 Mon Sep 17 00:00:00 2001
+From: Eric S. Raymond <[email protected]>
+Date: Tue, 2 Jan 2007 08:40:00 -0800
+Subject: [PATCH] Bug #9516: Markup error in XAllocWMHints.3x
+
+X.Org Bugzilla #9516 <https://bugs.freedesktop.org/show_bug.cgi?id=9516>
+---
+ man/XAllocWMHints.man |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+diff --git a/man/XAllocWMHints.man b/man/XAllocWMHints.man
+index 4c3fe1d..089dc52 100644
+--- a/man/XAllocWMHints.man
++++ b/man/XAllocWMHints.man
+@@ -46,8 +46,7 @@
+ .\"
+ .ds xT X Toolkit Intrinsics \- C Language Interface
+ .ds xW Athena X Widgets \- C Language X Toolkit Interface
+-.ds xL Xlib \- C Language X Interface, \fRO'Reilly and Associates, Sebastopol,
+-1991. 
++.ds xL Xlib \- C Language X Interface, \fRO'Reilly and Associates, Sebastopol, 1991. 
+ .ds xC Inter-Client Communication Conventions Manual
+ .na
+ .de Ds
+-- 
+1.4.1
+
+From ca5d9a625ea0965853fa9e74a448b8c29c78ec95 Mon Sep 17 00:00:00 2001
+From: Eric S. Raymond <[email protected]>
+Date: Tue, 2 Jan 2007 10:18:00 -0800
+Subject: [PATCH] Bug 9523: Markup problems in XQueryExtension.3x
+
+X.Org Bugzilla #9523 <https://bugs.freedesktop.org/show_bug.cgi?id=9523>
+---
+ man/XQueryExtension.man |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+diff --git a/man/XQueryExtension.man b/man/XQueryExtension.man
+index a81ec0c..bfc0964 100644
+--- a/man/XQueryExtension.man
++++ b/man/XQueryExtension.man
+@@ -14,7 +14,7 @@
+ .\" of the information in this document.  It is provided \`\`as-is'' without
+ .\" express or implied warranty.
+ .\"
+-.dS xL Programming with Xlib
++.ds xL Programming with Xlib
+ .TH XQueryExtension __libmansuffix__ __xorgversion__ "X FUNCTIONS"
+ .SH NAME
+ XQueryExtension, XListExtensions, XFreeExtensionList \- list available extensions
+@@ -25,7 +25,6 @@ Bool XQueryExtension(\^\fIdisplay, \fIna
+ char **XListExtensions(\^\fIdisplay\fP, \fInextensions_return\fP\^)
+ .HP
+ XFreeExtensionList(\^\fIlist\fP\^)
+-.FN
+ .SH ARGUMENTS
+ .IP \fIdisplay\fP 1i
+ Specifies the connection to the X server.
+-- 
+1.4.1
+
+From c316aaf0aab06951db9dc5c9c1148bfea835d885 Mon Sep 17 00:00:00 2001
+From: Eric S. Raymond <[email protected]>
+Date: Sun, 14 Jan 2007 10:38:00 -0800
+Subject: [PATCH] Bug #9650: Bad markup in XLoadFont.3x manual page
+
+X.Org Bugzilla #9650 <https://bugs.freedesktop.org/show_bug.cgi?id=9650>
+---
+ man/XLoadFont.man |   47 +++++++++++++++++++++++------------------------
+ 1 files changed, 23 insertions(+), 24 deletions(-)
+
+diff --git a/man/XLoadFont.man b/man/XLoadFont.man
+index ab7e890..906f20e 100644
+--- a/man/XLoadFont.man
++++ b/man/XLoadFont.man
+@@ -141,6 +141,16 @@
+ .el .sp 10p
+ ..
+ .ny0
++.de EX
++.sp
++.nf
++.ft CW
++..
++.de EE
++.ft R
++.fi
++.sp
++..
+ .TH XLoadFont __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+ .SH NAME
+ XLoadFont, XQueryFont, XLoadQueryFont, XFreeFont, XGetFontProperty, XUnloadFont, XCharStruct, XFontProp, XChar2b, XFontStruct \- load or unload fonts and font metric structures
+@@ -309,9 +319,7 @@ and
+ structures contain:
+ .LP
+ .IN "XCharStruct" "" "@DEF@"
+-.Ds 0
+-.TA .5i 3i
+-.ta .5i 3i
++.EX
+ typedef struct {
+ 	short lbearing;	/\(** origin to left edge of raster */
+ 	short rbearing;	/\(** origin to right edge of raster */
+@@ -320,32 +328,26 @@ typedef struct {
+ 	short descent;	/\(** baseline to bottom edge of raster */
+ 	unsigned short attributes;	/\(** per char flags (not predefined) */
+ } XCharStruct;
+-.De
++.EE
+ .LP
+ .IN "XFontProp" "" "@DEF@"
+-.Ds 0
+-.TA .5i 1i 3i
+-.ta .5i 1i 3i
++.EX
+ typedef struct {
+ 	Atom	name;
+ 	unsigned long card32;
+ } XFontProp;
+-.De
++.EE
+ .LP
+ .IN "XChar2b" "" "@DEF@"
+-.Ds 0
+-.TA .5i 3i
+-.ta .5i 3i
++.EX
+ typedef struct {	/\(** normal 16 bit characters are two bytes */
+     unsigned char byte1;
+     unsigned char byte2;
+ } XChar2b;
+-.De
++.EE
+ .LP
+ .IN "XFontStruct" "" "@DEF@"
+-.Ds 0
+-.TA .5i 3i
+-.ta .5i 3i
++.EX
+ typedef struct {
+ 	XExtData *ext_data;	/\(** hook for extension to hang data */
+ 	Font fid;	/\(** Font id for this font */
+@@ -364,7 +366,7 @@ typedef struct {
+ 	int ascent;	/\(** logical extent above baseline for spacing */
+ 	int descent;	/\(** logical decent below baseline for spacing */
+ } XFontStruct;
+-.De
++.EE
+ .LP
+ X supports single byte/character, two bytes/character matrix,
+ and 16-bit character text operations.
+@@ -416,19 +418,16 @@ min_char_or_byte2 and max_char_or_byte2 
+ and the 2-byte character index values corresponding to the
+ per_char array element N (counting from 0) are:
+ .IP
+-.nf
++.EX
+ 	byte1 = N/D + min_byte1
+-.br
+ 	byte2 = N\\D + min_char_or_byte2
+-.IP
+-.fi
++.EE
+ where:
+-.IP
+-.nf
++.EX
+         D = max_char_or_byte2 \- min_char_or_byte2 + 1
+         / = integer division
+-        \\ = integer modulus
+-.fi
++        \e\e = integer modulus
++.EE
+ .IP \(bu 5
+ If the per_char pointer is NULL, 
+ all glyphs between the first and last character indexes
+-- 
+1.4.1
+
+From 2e7e0748d353d7f53bbd65ec6bf0df8758528ddc Mon Sep 17 00:00:00 2001
+From: Eric S. Raymond <[email protected]>
+Date: Sun, 14 Jan 2007 10:39:00 -0800
+Subject: [PATCH] Bug #9651: Bad markup in XcmsColor.3x
+
+X.Org Bugzilla #9651 <https://bugs.freedesktop.org/show_bug.cgi?id=9651>
+---
+ man/XcmsColor.man |   72 +++++++++++++++++++++++------------------------------
+ 1 files changed, 31 insertions(+), 41 deletions(-)
+
+diff --git a/man/XcmsColor.man b/man/XcmsColor.man
+index 43635ce..8c7d0e9 100644
+--- a/man/XcmsColor.man
++++ b/man/XcmsColor.man
+@@ -140,6 +140,16 @@
+ .el .sp 10p
+ ..
+ .ny0
++.de EX
++.sp
++.nf
++.ft CW
++..
++.de EE
++.ft R
++.fi
++.sp
++..
+ .TH XcmsColor __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+ .SH NAME
+ XcmsColor, XcmsRGB, XcmsRGBi, XcmsCIEXYZ, XcmsCIEuvY, XcmsCIExyY, XcmsCIELab, XcmsCIELuv, XcmsTekHVC, XcmsPad \- Xcms color struture
+@@ -148,9 +158,7 @@ The structure for
+ .ZN XcmsColor
+ contains:
+ .LP
+-.Ds 0
+-.TA .5i 1i 2.5i
+-.ta .5i 1i 2.5i
++.EX
+ typedef unsigned long XcmsColorFormat;			/\(** Color Specification Format */
+ 
+ typedef struct {
+@@ -168,11 +176,9 @@ typedef struct {
+ 	unsigned long pixel;
+ 	XcmsColorFormat format;
+ } XcmsColor;			/\(** Xcms Color Structure */
+-.De
++.EE
+ .LP
+-.Ds 0
+-.TA .5i 2.5i
+-.ta .5i 2.5i
++.EX
+ typedef double XcmsFloat;
+ 
+ typedef struct {
+@@ -180,88 +186,72 @@ typedef struct {
+ 	unsigned short green;	/\(** 0x0000 to 0xffff */
+ 	unsigned short blue;	/\(** 0x0000 to 0xffff */
+ } XcmsRGB;		/\(** RGB Device */
+-.De
++.EE
+ .LP
+-.Ds 0
+-.TA .5i 2.5i
+-.ta .5i 2.5i
++.EX
+ typedef struct {
+ 	XcmsFloat red;	/\(** 0.0 to 1.0 */
+ 	XcmsFloat green;	/\(** 0.0 to 1.0 */
+ 	XcmsFloat blue;	/\(** 0.0 to 1.0 */
+ } XcmsRGBi;		/\(** RGB Intensity */
+-.De
++.EE
+ .LP
+-.Ds 0
+-.TA .5i 2.5i
+-.ta .5i 2.5i
++.EX
+ typedef struct {
+ 	XcmsFloat X;
+ 	XcmsFloat Y;	/\(** 0.0 to 1.0 */
+ 	XcmsFloat Z;
+ } XcmsCIEXYZ;		/\(** CIE XYZ */
+-.De
++.EE
+ .LP
+-.Ds 0
+-.TA .5i 2.5i
+-.ta .5i 2.5i
++.EX
+ typedef struct {
+ 	XcmsFloat u_prime;	/\(** 0.0 to ~0.6 */
+ 	XcmsFloat v_prime;	/\(** 0.0 to ~0.6 */
+ 	XcmsFloat Y; 	/\(** 0.0 to 1.0 */
+ } XcmsCIEuvY;		/\(** CIE u'v'Y */
+-.De
++.EE
+ .LP
+-.Ds 0
+-.TA .5i 2.5i
+-.ta .5i 2.5i
++.EX
+ typedef struct {
+ 	XcmsFloat x; 	/\(** 0.0 to ~.75 */
+ 	XcmsFloat y; 	/\(** 0.0 to ~.85 */
+ 	XcmsFloat Y; 	/\(** 0.0 to 1.0 */
+ } XcmsCIExyY;		/\(** CIE xyY */
+-.De
++.EE
+ .LP
+-.Ds 0
+-.TA .5i 2.5i
+-.ta .5i 2.5i
++.EX
+ typedef struct {
+ 	XcmsFloat L_star; 	/\(** 0.0 to 100.0 */
+ 	XcmsFloat a_star;
+ 	XcmsFloat b_star;
+ } XcmsCIELab;		/\(** CIE L*a*b* */
+-.De
++.EE
+ .LP
+-.Ds 0
+-.TA .5i 2.5i
+-.ta .5i 2.5i
++.EX
+ typedef struct {
+ 	XcmsFloat L_star; 	/\(** 0.0 to 100.0 */
+ 	XcmsFloat u_star;
+ 	XcmsFloat v_star;
+ } XcmsCIELuv;		/\(** CIE L*u*v* */
+-.De
++.EE
+ .LP
+-.Ds 0
+-.TA .5i 2.5i
+-.ta .5i 2.5i
++.EX
+ typedef struct {
+ 	XcmsFloat H; 	/\(** 0.0 to 360.0 */
+ 	XcmsFloat V; 	/\(** 0.0 to 100.0 */
+ 	XcmsFloat C; 	/\(** 0.0 to 100.0 */
+ } XcmsTekHVC;		/\(** TekHVC */
+-.De
++.EE
+ .LP
+-.Ds 0
+-.TA .5i 2.5i
+-.ta .5i 2.5i
++.EX
+ typedef struct {
+ 	XcmsFloat pad0;
+ 	XcmsFloat pad1;
+ 	XcmsFloat pad2;
+ 	XcmsFloat pad3;
+ } XcmsPad;		/\(** four doubles */
+-.De
++.EE
+ .SH DESCRIPTION
+ The
+ .ZN XcmsColor
+@@ -271,5 +261,5 @@ each supporting color specification enco
+ XcmsAllocColor(3X11),
+ XcmsStoreColor(3X11),
+ XcmsConvertColors(3X11),
+-.br
++.LP
+ \fI\*(xL\fP
+-- 
+1.4.1
+
+From 9d3ceea4b902e0471824c1e07ad64342b9a1114e Mon Sep 17 00:00:00 2001
+From: Eric S. Raymond <[email protected]>
+Date: Sun, 14 Jan 2007 10:40:00 -0800
+Subject: [PATCH] Bug #9652: Bad markup in XDrawArc.3x
+
+X.Org Bugzilla #9652 <https://bugs.freedesktop.org/show_bug.cgi?id=9652>
+---
+ man/XDrawArc.man |   23 +++++++++++++++--------
+ 1 files changed, 15 insertions(+), 8 deletions(-)
+
+diff --git a/man/XDrawArc.man b/man/XDrawArc.man
+index c878c45..00a79cf 100644
+--- a/man/XDrawArc.man
++++ b/man/XDrawArc.man
+@@ -142,6 +142,16 @@
+ .el .sp 10p
+ ..
+ .ny0
++.de EX
++.sp
++.nf
++.ft CW
++..
++.de EE
++.ft R
++.fi
++.sp
++..
+ '\" e
+ .TH XDrawArc __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+ .SH NAME
+@@ -240,13 +250,12 @@ than in degrees scaled by 64) in the ran
+ returns a value in the range % [ - pi over 2 , ~pi over 2  ] %
+ and adjust is:
+ .LP
+-.Ds
+-.TA 1i 2i
+-.ta 1i 2i
++.TS
++l l.
+ %0%	for normal-angle in the range % [ 0 , ~pi over 2  ]%
+ %pi%	for normal-angle in the range % [ pi over 2 , ~{3 pi} over 2  ]%
+ %2 pi%	for normal-angle in the range % [ {3 pi} over 2 , ~2 pi  ]%
+-.De
++.TE
+ .LP
+ For any given arc, 
+ .ZN XDrawArc
+@@ -295,15 +304,13 @@ The
+ .ZN XArc
+ structure contains:
+ .LP
+-.Ds 0
+-.TA .5i 3i
+-.ta .5i 3i
++.EX
+ typedef struct {
+ 	short x, y;
+ 	unsigned short width, height;
+ 	short angle1, angle2;             /\(** Degrees * 64 */
+ } XArc;
+-.De
++.EE
+ .LP
+ All x and y members are signed integers.
+ The width and height members are 16-bit unsigned integers.
+-- 
+1.4.1
+
+From 2db713252090cae08f0200fecad4fc25fb64c8b1 Mon Sep 17 00:00:00 2001
+From: Eric S. Raymond <[email protected]>
+Date: Sun, 14 Jan 2007 10:40:00 -0800
+Subject: [PATCH] Bug #9653: Bad markup in XQueryColor.3x
+
+X.Org Bugzilla #9653 <https://bugs.freedesktop.org/show_bug.cgi?id=9653>
+---
+ man/XQueryColor.man |   10 ++++------
+ 1 files changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/man/XQueryColor.man b/man/XQueryColor.man
+index eff8a6c..e2e884b 100644
+--- a/man/XQueryColor.man
++++ b/man/XQueryColor.man
+@@ -1,3 +1,4 @@
++'\" t
+ .\" Copyright \(co 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1994, 1996 X Consortium
+ .\"
+ .\" Permission is hereby granted, free of charge, to any person obtaining
+@@ -276,16 +277,13 @@ supported, but its continued use is not 
+ The syntax is an initial sharp sign character followed by
+ a numeric specification, in one of the following formats:
+ .LP
+-.\" Start marker code here
+-.Ds 0
+-.TA 2i
+-.ta 2i
++.TS
++l l.
+ \&#RGB	(4 bits each)
+ \&#RRGGBB	(8 bits each)
+ \&#RRRGGGBBB	(12 bits each)
+ \&#RRRRGGGGBBBB	(16 bits each)
+-.De
+-.\" End marker code here
++.TE
+ .LP
+ The R, G, and B represent single hexadecimal digits.
+ When fewer than 16 bits each are specified, 
+-- 
+1.4.1
+
+From 4341d1a34b2a2e460b58131b6fd81935f3355bbc Mon Sep 17 00:00:00 2001
+From: Eric S. Raymond <[email protected]>
+Date: Sun, 14 Jan 2007 10:43:00 -0800
+Subject: [PATCH] Bug #9654: Bad markup in XrmGetFileDatabase.3x
+
+X.Org Bugzilla #9654 <https://bugs.freedesktop.org/show_bug.cgi?id=9654>
+---
+ man/XrmGetFileDatabase.man |   17 ++++++++++++-----
+ 1 files changed, 12 insertions(+), 5 deletions(-)
+
+diff --git a/man/XrmGetFileDatabase.man b/man/XrmGetFileDatabase.man
+index 959603a..c46994a 100644
+--- a/man/XrmGetFileDatabase.man
++++ b/man/XrmGetFileDatabase.man
+@@ -140,6 +140,16 @@
+ .el .sp 10p
+ ..
+ .ny0
++.de EX
++.sp
++.nf
++.ft CW
++..
++.de EE
++.ft R
++.fi
++.sp
++..
+ .TH XrmGetFileDatabase __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+ .SH NAME
+ XrmGetFileDatabase, XrmPutFileDatabase, XrmGetStringDatabase, XrmLocaleOfDatabase, XrmGetDatabase, XrmSetDatabase, XrmDestroyDatabase \- retrieve and store resource databases
+@@ -247,9 +257,7 @@ terminated by newline characters or the 
+ The syntax of an individual resource line is:
+ .LP
+ .\" Start marker code here
+-.Ds 0
+-.TA 1.5i 1.75i
+-.ta 1.5i 1.75i
++.EX
+ ResourceLine	=	Comment | IncludeFile | ResourceSpec | <empty line>
+ Comment	=	"!" {<any character except null or newline>}
+ IncludeFile	=	"#" WhiteSpace "include" WhiteSpace FileName WhiteSpace
+@@ -262,8 +270,7 @@ Component	=	"?" | ComponentName
+ ComponentName	=	NameChar {NameChar}
+ NameChar	=	"a"\-"z" | "A"\-"Z" | "0"\-"9" | "_" | "-"
+ Value	=	{<any character except null or unescaped newline>}
+-.De
+-.\" End marker code here
++.EE
+ .LP
+ Elements separated by vertical bar (|) are alternatives.
+ Curly braces ({\&.\&.\&.}) indicate zero or more repetitions
+-- 
+1.4.1
+
+From 74cba78daa738ef4d92096107d95c1a585933666 Mon Sep 17 00:00:00 2001
+From: Eric S. Raymond <[email protected]>
+Date: Sun, 14 Jan 2007 10:43:00 -0800
+Subject: [PATCH] Bug #9655: Bad markup in XrmUniqueQuark.3x
+
+X.Org Bugzilla #9655 <https://bugs.freedesktop.org/show_bug.cgi?id=9655>
+---
+ man/XrmUniqueQuark.man |   16 +++++++---------
+ 1 files changed, 7 insertions(+), 9 deletions(-)
+
+diff --git a/man/XrmUniqueQuark.man b/man/XrmUniqueQuark.man
+index 26332be..baaeac9 100644
+--- a/man/XrmUniqueQuark.man
++++ b/man/XrmUniqueQuark.man
+@@ -143,7 +143,7 @@
+ .TH XrmUniqueQuark __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
+ .SH NAME
+ XrmUniqueQuark, XrmStringToQuark, XrmPermStringToQuark, XrmQuarkToString, XrmStringToQuarkList, XrmStringToBindingQuarkList \- manipulate resource quarks
+-.SH SYNTAX
++.SH SYNOPSIS
+ .HP
+ XrmQuark XrmUniqueQuark\^(void); 
+ .LP
+@@ -267,9 +267,9 @@ A binding list is a list of type
+ and indicates if components of name or class lists are bound tightly or loosely
+ (that is, if wildcarding of intermediate components is specified).
+ .LP
+-.Ds 0
++.EX
+ typedef enum {XrmBindTightly, XrmBindLoosely} XrmBinding, *XrmBindingList;
+-.De
++.EE
+ .LP
+ .ZN XrmBindTightly
+ indicates that a period separates the components, and
+@@ -290,17 +290,15 @@ If the string does not start with period
+ a period is assumed.
+ For example, ``*a.b*c'' becomes:
+ .LP
+-.Ds 0
+-.TA .75i 1.5i 2.25i
+-.ta .75i 1.5i 2.25i
++.TS
++l l l.
+ quarks	a	b	c
+-.br
+ bindings	loose	tight	loose
+-.De
++.TE
+ .SH "SEE ALSO"
+ XrmGetResource(3X11),
+ XrmInitialize(3X11),
+ XrmMergeDatabases(3X11),
+ XrmPutResource(3X11)
+-.br
++.LP
+ \fI\*(xL\fP
+-- 
+1.4.1
+
+From fa4effe82759f864a22a2dc6c920fa72ddb175a8 Mon Sep 17 00:00:00 2001
+From: Eric S. Raymond <[email protected]>
+Date: Sun, 14 Jan 2007 10:48:00 -0800
+Subject: [PATCH] Bug #9658: Bad markup on XIfEvent.3x
+
+X.Org Bugzilla #9658 <https://bugs.freedesktop.org/show_bug.cgi?id=9658>
+---
+ man/XIfEvent.man |    2 --
+ 1 files changed, 0 insertions(+), 2 deletions(-)
+
+diff --git a/man/XIfEvent.man b/man/XIfEvent.man
+index 61d28e5..17c483b 100644
+--- a/man/XIfEvent.man
++++ b/man/XIfEvent.man
+@@ -221,7 +221,6 @@ has first called
+ .ZN XLockDisplay .
+ .LP
+ The predicate procedure and its associated arguments are:
+-.sM
+ .HP
+ Bool (\^*\fIpredicate\fP\^)\^(\^Display *\fIdisplay\fP, XEvent *\fIevent\fP, XPointer \fIarg\fP\^)
+ .IP \fIdisplay\fP 1i
+@@ -238,7 +237,6 @@ or
+ .ZN XPeekIfEvent 
+ function.
+ .LP
+-.eM
+ The predicate procedure is called once for each
+ event in the queue until it finds a match. 
+ After finding a match, the predicate procedure must return 
+-- 
+1.4.1
+
+From 11ea09745efa8de7dc82fe30ebd2393f08390957 Mon Sep 17 00:00:00 2001
+From: Eric Anholt <[email protected]>
+Date: Fri, 31 Aug 2007 17:30:33 -0700
+Subject: [PATCH] Bug #2081: Note the range limitation of XSetScreenSaver arguments.
+---
+ man/XSetScreenSaver.man |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/man/XSetScreenSaver.man b/man/XSetScreenSaver.man
+index c0c1e36..4a42bcf 100644
+--- a/man/XSetScreenSaver.man
++++ b/man/XSetScreenSaver.man
+@@ -213,6 +213,8 @@ If the timeout value is nonzero, 
+ .ZN XSetScreenSaver
+ enables the screen saver.
+ An interval of 0 disables the random-pattern motion.
++Both values are limited to a 16-bit signed integer range by the wire protocol,
++despite the C prototype.
+ If no input from devices (keyboard, mouse, and so on) is generated 
+ for the specified number of timeout seconds once the screen saver is enabled,
+ the screen saver is activated.
+-- 
+1.4.1
+
+From 6e5485e0a5e3ab738becad12193e760c5fee83a4 Mon Sep 17 00:00:00 2001
+From: Samuel Thibault <[email protected]>
+Date: Sun, 28 Oct 2007 04:44:00 -0800
+Subject: [PATCH] X.Org Bug #12983: Typos in ./man/XChangeKeyboardControl.man
+
+<http://bugs.freedesktop.org/show_bug.cgi?id=12983>
+---
+ man/XChangeKeyboardControl.man |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/man/XChangeKeyboardControl.man b/man/XChangeKeyboardControl.man
+index 58a5c9b..6b05848 100644
+--- a/man/XChangeKeyboardControl.man
++++ b/man/XChangeKeyboardControl.man
+@@ -149,9 +149,9 @@ XChangeKeyboardControl, XGetKeyboardCont
+ .SH SYNTAX
+ .HP
+ int XChangeKeyboardControl\^(\^Display *\fIdisplay\fP, unsigned long
+-\fIvalue_mask\fP\^, XKeyBoardControl *\fIvalues\fP\^); 
++\fIvalue_mask\fP\^, XKeyboardControl *\fIvalues\fP\^); 
+ .HP
+-int XGetKeyboardControl\^(\^Display *\fIdisplay\fP, XKeyBoardState
++int XGetKeyboardControl\^(\^Display *\fIdisplay\fP, XKeyboardState
+ *\fIvalues_return\fP\^); 
+ .HP
+ int XAutoRepeatOn\^(\^Display *\fIdisplay\fP\^); 
+-- 
+1.4.1
+
+From 4b91ed099554626f1ec17d5bdf7bd77ce1a70037 Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <[email protected]>
+Date: Wed, 21 Nov 2007 16:50:04 -0800
+Subject: [PATCH] X.Org Bug #4312: incorrect comment asterisk in XAnyEvent.3x man page
+
+X.Org Bugzilla #4312 <http://bugs.freedesktop.org/show_bug.cgi?id=4312>
+
+Protect /* sequences from cpp pre-processor removal without transforming
+to Unicode mathematical asterisk character
+---
+ man/XAddHost.man                  |   14 +++----
+ man/XAllocSizeHints.man           |   32 ++++++++-------
+ man/XAllocStandardColormap.man    |    4 +-
+ man/XAllocWMHints.man             |   26 ++++++------
+ man/XAnyEvent.man                 |    8 ++--
+ man/XButtonEvent.man              |   78 +++++++++++++++++++------------------
+ man/XChangeKeyboardControl.man    |    8 ++--
+ man/XChangeKeyboardMapping.man    |    4 +-
+ man/XCirculateEvent.man           |   10 ++---
+ man/XCirculateRequestEvent.man    |   10 ++---
+ man/XClientMessageEvent.man       |    8 ++--
+ man/XColormapEvent.man            |   12 +++---
+ man/XConfigureEvent.man           |    8 ++--
+ man/XConfigureRequestEvent.man    |   10 ++---
+ man/XConfigureWindow.man          |    4 +-
+ man/XCreateColormap.man           |    6 +--
+ man/XCreateGC.man                 |   44 ++++++++++-----------
+ man/XCreateWindow.man             |   34 ++++++++--------
+ man/XCreateWindowEvent.man        |   20 +++++----
+ man/XCrossingEvent.man            |   30 +++++++-------
+ man/XDestroyWindowEvent.man       |    8 ++--
+ man/XDrawArc.man                  |    2 -
+ man/XDrawText.man                 |   16 ++++----
+ man/XErrorEvent.man               |   12 +++---
+ man/XExposeEvent.man              |   10 ++---
+ man/XFocusChangeEvent.man         |   14 +++----
+ man/XFontSetExtents.man           |    4 +-
+ man/XGetVisualInfo.man            |    4 +-
+ man/XGetWindowAttributes.man      |   42 ++++++++++----------
+ man/XGraphicsExposeEvent.man      |   26 ++++++------
+ man/XGravityEvent.man             |    8 ++--
+ man/XKeymapEvent.man              |   10 ++---
+ man/XLoadFont.man                 |   46 +++++++++++-----------
+ man/XMapEvent.man                 |   26 ++++++------
+ man/XMapRequestEvent.man          |    8 ++--
+ man/XPropertyEvent.man            |   10 ++---
+ man/XReparentEvent.man            |    8 ++--
+ man/XResizeRequestEvent.man       |    8 ++--
+ man/XSelectionClearEvent.man      |    8 ++--
+ man/XSelectionEvent.man           |   10 ++---
+ man/XSelectionRequestEvent.man    |    8 ++--
+ man/XStringListToTextProperty.man |    8 ++--
+ man/XUnmapEvent.man               |    8 ++--
+ man/XVisibilityEvent.man          |    8 ++--
+ man/XcmsColor.man                 |   58 ++++++++++++++--------------
+ man/XmbDrawText.man               |   16 ++++----
+ man/XmbTextListToTextProperty.man |   18 ++++-----
+ man/XrmInitialize.man             |   24 ++++++-----
+ 48 files changed, 399 insertions(+), 399 deletions(-)
+
+diff --git a/man/XAddHost.man b/man/XAddHost.man
+index b9f0aa7..fe95c7d 100644
+--- a/man/XAddHost.man
++++ b/man/XAddHost.man
+@@ -305,9 +305,9 @@ structure contains:
+ .TA .5i 3i
+ .ta .5i 3i
+ typedef struct {
+-	int family;	/\(** for example FamilyInternet */
+-	int length;	/\(** length of address, in bytes */
+-	char *address;	/\(** pointer to where to find the address */
++	int family;	/\&* for example FamilyInternet */
++	int length;	/\&* length of address, in bytes */
++	char *address;	/\&* pointer to where to find the address */
+ } XHostAddress;
+ .De
+ .LP
+@@ -331,10 +331,10 @@ structure which contains:
+ .TA .5i 3i
+ .ta .5i 3i
+ typedef struct {
+-	int typelength;		/\(** length of type string, in bytes */
+-	int valuelength;	/\(** length of value string, in bytes */
+-	char *type;		/\(** pointer to where to find the type string */
+-	char *value;		/\(** pointer to where to find the address */
++	int typelength;		/\&* length of type string, in bytes */
++	int valuelength;	/\&* length of value string, in bytes */
++	char *type;		/\&* pointer to where to find the type string */
++	char *value;		/\&* pointer to where to find the address */
+ } XServerInterpretedAddress;
+ .De
+ .LP
+diff --git a/man/XAllocSizeHints.man b/man/XAllocSizeHints.man
+index e957214..226b9d5 100644
+--- a/man/XAllocSizeHints.man
++++ b/man/XAllocSizeHints.man
+@@ -324,7 +324,7 @@ The
+ .ZN XSizeHints
+ structure contains:
+ .LP
+-/\(** Size hints mask bits */
++/\&* Size hints mask bits */
+ .TS
+ lw(.5i) lw(1.1i) lw(1.5i) lw(3.1i).
+ T{
+@@ -334,7 +334,7 @@ T}	T{
+ T}	T{
+ (1L << 0)
+ T}	T{
+-/\(** user specified x, y */
++/\&* user specified x, y */
+ T}
+ T{
+ \&#define
+@@ -343,7 +343,7 @@ T}	T{
+ T}	T{
+ (1L << 1)
+ T}	T{
+-/\(** user specified width, height */
++/\&* user specified width, height */
+ T}
+ T{
+ \&#define
+@@ -352,7 +352,7 @@ T}	T{
+ T}	T{
+ (1L << 2)
+ T}	T{
+-/\(** program specified position */
++/\&* program specified position */
+ T}
+ T{
+ \&#define
+@@ -361,7 +361,7 @@ T}	T{
+ T}	T{
+ (1L << 3)
+ T}	T{
+-/\(** program specified size */
++/\&* program specified size */
+ T}
+ T{
+ \&#define
+@@ -370,7 +370,7 @@ T}	T{
+ T}	T{
+ (1L << 4)
+ T}	T{
+-/\(** program specified minimum size */
++/\&* program specified minimum size */
+ T}
+ T{
+ \&#define
+@@ -379,7 +379,7 @@ T}	T{
+ T}	T{
+ (1L << 5)
+ T}	T{
+-/\(** program specified maximum size */
++/\&* program specified maximum size */
+ T}
+ T{
+ \&#define
+@@ -388,7 +388,7 @@ T}	T{
+ T}	T{
+ (1L << 6)
+ T}	T{
+-/\(** program specified resize increments */
++/\&* program specified resize increments */
+ T}
+ T{
+ \&#define
+@@ -397,7 +397,7 @@ T}	T{
+ T}	T{
+ (1L << 7)
+ T}	T{
+-/\(** program specified min and max aspect ratios */
++/\&* program specified min and max aspect ratios */
+ T}
+ T{
+ \&#define
+@@ -430,22 +430,22 @@ T}
+ .Ds 0
+ .TA .5i 2.5i
+ .ta .5i 2.5i
+-/\(** Values */
++/\&* Values */
+ 
+ typedef struct {
+-	long flags;	/\(** marks which fields in this structure are defined */
+-	int x, y;	/\(** Obsolete */
+-	int width, height;	/\(** Obsolete */
++	long flags;	/\&* marks which fields in this structure are defined */
++	int x, y;	/\&* Obsolete */
++	int width, height;	/\&* Obsolete */
+ 	int min_width, min_height;
+ 	int max_width, max_height;
+ 	int width_inc, height_inc;
+ 	struct {
+-	       int x;	/\(** numerator */
+-	       int y;	/\(** denominator */
++	       int x;	/\&* numerator */
++	       int y;	/\&* denominator */
+ 	} min_aspect, max_aspect;
+ 	int base_width, base_height;
+ 	int win_gravity;
+-	/\(** this structure may be extended in the future */
++	/\&* this structure may be extended in the future */
+ } XSizeHints;
+ .De
+ .LP
+diff --git a/man/XAllocStandardColormap.man b/man/XAllocStandardColormap.man
+index 29039e5..0baf05c 100644
+--- a/man/XAllocStandardColormap.man
++++ b/man/XAllocStandardColormap.man
+@@ -284,7 +284,7 @@ The
+ .ZN XStandardColormap
+ structure contains:
+ .LP
+-/\(** Hints */
++/\&* Hints */
+ .TS
+ lw(.5i) lw(2i) lw(1i).
+ T{
+@@ -295,7 +295,7 @@ T}	T{
+ ( (XID) 1L)
+ T}
+ .TE
+-/\(** Values */
++/\&* Values */
+ .IN "XStandardColormap" "" "@DEF@"
+ .Ds 0
+ .TA .5i 2.5i
+diff --git a/man/XAllocWMHints.man b/man/XAllocWMHints.man
+index 089dc52..9afaa7d 100644
+--- a/man/XAllocWMHints.man
++++ b/man/XAllocWMHints.man
+@@ -217,7 +217,7 @@ The
+ .ZN XWMHints
+ structure contains:
+ .LP
+-/\(** Window manager hints mask bits */
++/\&* Window manager hints mask bits */
+ .TS
+ lw(.5i) lw(2.5i) lw(2.5i).
+ T{
+@@ -292,19 +292,19 @@ T}
+ .Ds 0
+ .TA .5i 2.5i
+ .ta .5i 2.5i
+-/\(** Values */
++/\&* Values */
+ 
+ typedef struct {
+-	long flags;	/\(** marks which fields in this structure are defined */
+-	Bool input;	/\(** does this application rely on the window manager to
++	long flags;	/\&* marks which fields in this structure are defined */
++	Bool input;	/\&* does this application rely on the window manager to
+ 			get keyboard input? */
+-	int initial_state;	/\(** see below */
+-	Pixmap icon_pixmap;	/\(** pixmap to be used as icon */
+-	Window icon_window;	/\(** window to be used as icon */
+-	int icon_x, icon_y;	/\(** initial position of icon */
+-	Pixmap icon_mask;	/\(** pixmap to be used as mask for icon_pixmap */
+-	XID window_group;	/\(** id of related window group */
+-	/\(** this structure may be extended in the future */
++	int initial_state;	/\&* see below */
++	Pixmap icon_pixmap;	/\&* pixmap to be used as icon */
++	Window icon_window;	/\&* window to be used as icon */
++	int icon_x, icon_y;	/\&* initial position of icon */
++	Pixmap icon_mask;	/\&* pixmap to be used as mask for icon_pixmap */
++	XID window_group;	/\&* id of related window group */
++	/\&* this structure may be extended in the future */
+ } XWMHints;
+ .De
+ .LP
+@@ -358,7 +358,7 @@ T}	T{
+ T}	T{
+ 1
+ T}	T{
+-/\(** most applications start this way */
++/\&* most applications start this way */
+ T}
+ T{
+ \&#define
+@@ -367,7 +367,7 @@ T}	T{
+ T}	T{
+ 3
+ T}	T{
+-/\(** application wants to start as an icon */
++/\&* application wants to start as an icon */
+ T}
+ .TE
+ The icon_mask specifies which pixels of the icon_pixmap should be used as the
+diff --git a/man/XAnyEvent.man b/man/XAnyEvent.man
+index f095958..40be01e 100644
+--- a/man/XAnyEvent.man
++++ b/man/XAnyEvent.man
+@@ -153,9 +153,9 @@ have the following common members:
+ .ta .5i 3i
+ typedef struct {
+ 	int type;
+-	unsigned long serial;	/\(** # of last request processed by server */
+-	Bool send_event;	/\(** true if this came from a SendEvent request */
+-	Display *display;	/\(** Display the event was read from */
++	unsigned long serial;	/\&* # of last request processed by server */
++	Bool send_event;	/\&* true if this came from a SendEvent request */
++	Display *display;	/\&* Display the event was read from */
+ 	Window window;
+ } XAnyEvent;
+ .De
+@@ -186,7 +186,7 @@ structure is a union of the individual s
+ .TA .5i 3i
+ .ta .5i 3i
+ typedef union _XEvent {
+-	int type;	/\(** must not be changed */
++	int type;	/\&* must not be changed */
+ 	XAnyEvent xany;
+ 	XKeyEvent xkey;
+ 	XButtonEvent xbutton;
+diff --git a/man/XButtonEvent.man b/man/XButtonEvent.man
+index 4a28ea8..7cc3e54 100644
+--- a/man/XButtonEvent.man
++++ b/man/XButtonEvent.man
+@@ -158,19 +158,19 @@ events contain:
+ .TA .5i 3i
+ .ta .5i 3i
+ typedef struct {
+-	int type;	/\(** ButtonPress or ButtonRelease */
+-	unsigned long serial;	/\(** # of last request processed by server */
+-	Bool send_event;	/\(** true if this came from a SendEvent request */
+-	Display *display;	/\(** Display the event was read from */
+-	Window window;	/\(** ``event'' window it is reported relative to */
+-	Window root;	/\(** root window that the event occurred on */
+-	Window subwindow;	/\(** child window */
+-	Time time;	/\(** milliseconds */
+-	int x, y;	/\(** pointer x, y coordinates in event window */
+-	int x_root, y_root;	/\(** coordinates relative to root */
+-	unsigned int state;	/\(** key or button mask */
+-	unsigned int button;	/\(** detail */
+-	Bool same_screen;	/\(** same screen flag */
++	int type;	/\&* ButtonPress or ButtonRelease */
++	unsigned long serial;	/\&* # of last request processed by server */
++	Bool send_event;	/\&* true if this came from a SendEvent request */
++	Display *display;	/\&* Display the event was read from */
++	Window window;	/\&* ``event'' window it is reported relative to */
++	Window root;	/\&* root window that the event occurred on */
++	Window subwindow;	/\&* child window */
++	Time time;	/\&* milliseconds */
++	int x, y;	/\&* pointer x, y coordinates in event window */
++	int x_root, y_root;	/\&* coordinates relative to root */
++	unsigned int state;	/\&* key or button mask */
++	unsigned int button;	/\&* detail */
++	Bool same_screen;	/\&* same screen flag */
+ } XButtonEvent;
+ typedef XButtonEvent XButtonPressedEvent;
+ typedef XButtonEvent XButtonReleasedEvent;
+@@ -180,19 +180,19 @@ typedef XButtonEvent XButtonReleasedEven
+ .TA .5i 3i
+ .ta .5i 3i
+ typedef struct {
+-	int type;	/\(** KeyPress or KeyRelease */
+-	unsigned long serial;	/\(** # of last request processed by server */
+-	Bool send_event;	/\(** true if this came from a SendEvent request */
+-	Display *display;	/\(** Display the event was read from */
+-	Window window;	/\(** ``event'' window it is reported relative to */
+-	Window root;	/\(** root window that the event occurred on */
+-	Window subwindow;	/\(** child window */
+-	Time time;	/\(** milliseconds */
+-	int x, y;	/\(** pointer x, y coordinates in event window */
+-	int x_root, y_root;	/\(** coordinates relative to root */
+-	unsigned int state;	/\(** key or button mask */
+-	unsigned int keycode;	/\(** detail */
+-	Bool same_screen;	/\(** same screen flag */
++	int type;	/\&* KeyPress or KeyRelease */
++	unsigned long serial;	/\&* # of last request processed by server */
++	Bool send_event;	/\&* true if this came from a SendEvent request */
++	Display *display;	/\&* Display the event was read from */
++	Window window;	/\&* ``event'' window it is reported relative to */
++	Window root;	/\&* root window that the event occurred on */
++	Window subwindow;	/\&* child window */
++	Time time;	/\&* milliseconds */
++	int x, y;	/\&* pointer x, y coordinates in event window */
++	int x_root, y_root;	/\&* coordinates relative to root */
++	unsigned int state;	/\&* key or button mask */
++	unsigned int keycode;	/\&* detail */
++	Bool same_screen;	/\&* same screen flag */
+ } XKeyEvent;
+ typedef XKeyEvent XKeyPressedEvent;
+ typedef XKeyEvent XKeyReleasedEvent;
+@@ -202,19 +202,19 @@ typedef XKeyEvent XKeyReleasedEvent;
+ .TA .5i 3i
+ .ta .5i 3i
+ typedef struct {
+-	int type;	/\(** MotionNotify */
+-	unsigned long serial;	/\(** # of last request processed by server */
+-	Bool send_event;	/\(** true if this came from a SendEvent request */
+-	Display *display;	/\(** Display the event was read from */
+-	Window window;	/\(** ``event'' window reported relative to */
+-	Window root;	/\(** root window that the event occurred on */
+-	Window subwindow;	/\(** child window */
+-	Time time;	/\(** milliseconds */
+-	int x, y;	/\(** pointer x, y coordinates in event window */
+-	int x_root, y_root;	/\(** coordinates relative to root */
+-	unsigned int state;	/\(** key or button mask */
+-	char is_hint;	/\(** detail */
+-	Bool same_screen;	/\(** same screen flag */
++	int type;	/\&* MotionNotify */
++	unsigned long serial;	/\&* # of last request processed by server */
++	Bool send_event;	/\&* true if this came from a SendEvent request */
++	Display *display;	/\&* Display the event was read from */
++	Window window;	/\&* ``event'' window reported relative to */
++	Window root;	/\&* root window that the event occurred on */
++	Window subwindow;	/\&* child window */
++	Time time;	/\&* milliseconds */
++	int x, y;	/\&* pointer x, y coordinates in event window */
++	int x_root, y_root;	/\&* coordinates relative to root */
++	unsigned int state;	/\&* key or button mask */
++	char is_hint;	/\&* detail */
++	Bool same_screen;	/\&* same screen flag */
+ } XMotionEvent;
+ typedef XMotionEvent XPointerMovedEvent;
+ .De
+diff --git a/man/XChangeKeyboardControl.man b/man/XChangeKeyboardControl.man
+index 6b05848..dd3225d 100644
+--- a/man/XChangeKeyboardControl.man
++++ b/man/XChangeKeyboardControl.man
+@@ -251,7 +251,7 @@ The
+ structure contains:
+ .LP
+ .LP
+-/\(** Mask bits for ChangeKeyboardControl */
++/\&* Mask bits for ChangeKeyboardControl */
+ .TS
+ lw(.5i) lw(2.5i) lw(.8i).
+ T{
+@@ -315,7 +315,7 @@ T}
+ .Ds 0
+ .TA .5i 2.5i
+ .ta .5i 2.5i
+-/\(** Values */
++/\&* Values */
+ 
+ typedef struct {
+ 	int key_click_percent;
+@@ -323,9 +323,9 @@ typedef struct {
+ 	int bell_pitch;
+ 	int bell_duration;
+ 	int led;
+-	int led_mode;	/\(** LedModeOn, LedModeOff */
++	int led_mode;	/\&* LedModeOn, LedModeOff */
+ 	int key;
+-	int auto_repeat_mode;	/\(** AutoRepeatModeOff, AutoRepeatModeOn, 
++	int auto_repeat_mode;	/\&* AutoRepeatModeOff, AutoRepeatModeOn, 
+                             	AutoRepeatModeDefault */
+ } XKeyboardControl;
+ .De
+diff --git a/man/XChangeKeyboardMapping.man b/man/XChangeKeyboardMapping.man
+index 67b030a..e157ec9 100644
+--- a/man/XChangeKeyboardMapping.man
++++ b/man/XChangeKeyboardMapping.man
+@@ -428,8 +428,8 @@ structure contains:
+ .TA .5i 2.5i
+ .ta .5i 2.5i
+ typedef struct {
+-	int max_keypermod;	/\(** This server's max number of keys per modifier */
+-	KeyCode *modifiermap;	/\(** An 8 by max_keypermod array of the modifiers */
++	int max_keypermod;	/\&* This server's max number of keys per modifier */
++	KeyCode *modifiermap;	/\&* An 8 by max_keypermod array of the modifiers */
+ } XModifierKeymap;
+ .De
+ .SH DIAGNOSTICS
+diff --git a/man/XCirculateEvent.man b/man/XCirculateEvent.man
+index b3e4d8d..1ac71f8 100644
+--- a/man/XCirculateEvent.man
++++ b/man/XCirculateEvent.man
+@@ -153,13 +153,13 @@ events contains:
+ .TA .5i 3i
+ .ta .5i 3i
+ typedef struct {
+-	int type;	/\(** CirculateNotify */
+-	unsigned long serial;	/\(** # of last request processed by server */
+-	Bool send_event;	/\(** true if this came from a SendEvent request */
+-	Display *display;	/\(** Display the event was read from */
++	int type;	/\&* CirculateNotify */
++	unsigned long serial;	/\&* # of last request processed by server */
++	Bool send_event;	/\&* true if this came from a SendEvent request */
++	Display *display;	/\&* Display the event was read from */
+ 	Window event;
+ 	Window window;
+-	int place;	/\(** PlaceOnTop, PlaceOnBottom */
++	int place;	/\&* PlaceOnTop, PlaceOnBottom */
+ } XCirculateEvent;
+ .De
+ .LP
+diff --git a/man/XCirculateRequestEvent.man b/man/XCirculateRequestEvent.man
+index ce97c26..6c9ac80 100644
+--- a/man/XCirculateRequestEvent.man
++++ b/man/XCirculateRequestEvent.man
+@@ -153,13 +153,13 @@ events contains:
+ .TA .5i 3i
+ .ta .5i 3i
+ typedef struct {
+-	int type;	/\(** CirculateRequest */
+-	unsigned long serial;	/\(** # of last request processed by server */
+-	Bool send_event;	/\(** true if this came from a SendEvent request */
+-	Display *display;	/\(** Display the event was read from */
++	int type;	/\&* CirculateRequest */
++	unsigned long serial;	/\&* # of last request processed by server */
++	Bool send_event;	/\&* true if this came from a SendEvent request */
++	Display *display;	/\&* Display the event was read from */
+ 	Window parent;
+ 	Window window;
+-	int place;	/\(** PlaceOnTop, PlaceOnBottom */
++	int place;	/\&* PlaceOnTop, PlaceOnBottom */
+ } XCirculateRequestEvent;
+ .De
+ .LP
+diff --git a/man/XClientMessageEvent.man b/man/XClientMessageEvent.man
+index 915cc55..da786af 100644
+--- a/man/XClientMessageEvent.man
++++ b/man/XClientMessageEvent.man
+@@ -153,10 +153,10 @@ events contains:
+ .TA .5i 1i 3i
+ .ta .5i 1i 3i
+ typedef struct {
+-	int type;	/\(** ClientMessage */
+-	unsigned long serial;		/\(** # of last request processed by server */
+-	Bool send_event;		/\(** true if this came from a SendEvent request */
+-	Display *display;		/\(** Display the event was read from */
++	int type;	/\&* ClientMessage */
++	unsigned long serial;		/\&* # of last request processed by server */
++	Bool send_event;		/\&* true if this came from a SendEvent request */
++	Display *display;		/\&* Display the event was read from */
+ 	Window window;
+ 	Atom message_type;
+ 	int format;
+diff --git a/man/XColormapEvent.man b/man/XColormapEvent.man
+index 95de9c9..8920c7f 100644
+--- a/man/XColormapEvent.man
++++ b/man/XColormapEvent.man
+@@ -153,14 +153,14 @@ events contains:
+ .TA .5i 3i
+ .ta .5i 3i
+ typedef struct {
+-	int type;	/\(** ColormapNotify */
+-	unsigned long serial;	/\(** # of last request processed by server */
+-	Bool send_event;	/\(** true if this came from a SendEvent request */
+-	Display *display;	/\(** Display the event was read from */
++	int type;	/\&* ColormapNotify */
++	unsigned long serial;	/\&* # of last request processed by server */
++	Bool send_event;	/\&* true if this came from a SendEvent request */
++	Display *display;	/\&* Display the event was read from */
+ 	Window window;
+-	Colormap colormap;	/\(** colormap or None */
++	Colormap colormap;	/\&* colormap or None */
+ 	Bool new;
+-	int state;	/\(** ColormapInstalled, ColormapUninstalled */
++	int state;	/\&* ColormapInstalled, ColormapUninstalled */
+ } XColormapEvent;
+ .De
+ .LP
+diff --git a/man/XConfigureEvent.man b/man/XConfigureEvent.man
+index 5cc65cf..47c8ea4 100644
+--- a/man/XConfigureEvent.man
++++ b/man/XConfigureEvent.man
+@@ -153,10 +153,10 @@ events contains:
+ .TA .5i 3i
+ .ta .5i 3i
+ typedef struct {
+-	int type;	/\(** ConfigureNotify */
+-	unsigned long serial;	/\(** # of last request processed by server */
+-	Bool send_event;	/\(** true if this came from a SendEvent request */
+-	Display *display;	/\(** Display the event was read from */
++	int type;	/\&* ConfigureNotify */
++	unsigned long serial;	/\&* # of last request processed by server */
++	Bool send_event;	/\&* true if this came from a SendEvent request */
++	Display *display;	/\&* Display the event was read from */
+ 	Window event;
+ 	Window window;
+ 	int x, y;
+diff --git a/man/XConfigureRequestEvent.man b/man/XConfigureRequestEvent.man
+index dbf6c99..07c6709 100644
+--- a/man/XConfigureRequestEvent.man
++++ b/man/XConfigureRequestEvent.man
+@@ -153,17 +153,17 @@ events contains:
+ .TA .5i 3i
+ .ta .5i 3i
+ typedef struct {
+-	int type;	/\(** ConfigureRequest */
+-	unsigned long serial;	/\(** # of last request processed by server */
+-	Bool send_event;	/\(** true if this came from a SendEvent request */
+-	Display *display;	/\(** Display the event was read from */
++	int type;	/\&* ConfigureRequest */
++	unsigned long serial;	/\&* # of last request processed by server */
++	Bool send_event;	/\&* true if this came from a SendEvent request */
++	Display *display;	/\&* Display the event was read from */
+ 	Window parent;
+ 	Window window;
+ 	int x, y;
+ 	int width, height;
+ 	int border_width;
+ 	Window above;
+-	int detail;	/\(** Above, Below, TopIf, BottomIf, Opposite */
++	int detail;	/\&* Above, Below, TopIf, BottomIf, Opposite */
+ 	unsigned long value_mask;
+ } XConfigureRequestEvent;
+ .De
+diff --git a/man/XConfigureWindow.man b/man/XConfigureWindow.man
+index 54059c8..2541942 100644
+--- a/man/XConfigureWindow.man
++++ b/man/XConfigureWindow.man
+@@ -334,7 +334,7 @@ The
+ structure contains:
+ .LP
+ .LP
+-/\(** Configure window value mask bits */
++/\&* Configure window value mask bits */
+ .TS
+ lw(.5i) lw(2.5i) lw(.8i).
+ T{
+@@ -391,7 +391,7 @@ T}
+ .Ds 0
+ .TA .5i 3i
+ .ta .5i 3i
+-/\(** Values */
++/\&* Values */
+ 
+ typedef struct {
+ 	int x, y;
+diff --git a/man/XCreateColormap.man b/man/XCreateColormap.man
+index 17c6dbf..0901775 100644
+--- a/man/XCreateColormap.man
++++ b/man/XCreateColormap.man
+@@ -313,9 +313,9 @@ structure contains:
+ .TA .5i 2.5i
+ .ta .5i 2.5i
+ typedef struct {
+-	unsigned long pixel;	/\(** pixel value */
+-	unsigned short red, green, blue;	/\(** rgb values */
+-	char flags;	/\(** DoRed, DoGreen, DoBlue */	
++	unsigned long pixel;	/\&* pixel value */
++	unsigned short red, green, blue;	/\&* rgb values */
++	char flags;	/\&* DoRed, DoGreen, DoBlue */	
+ 	char pad;
+ } XColor;
+ .De
+diff --git a/man/XCreateGC.man b/man/XCreateGC.man
+index 91897a0..9b698e6 100644
+--- a/man/XCreateGC.man
++++ b/man/XCreateGC.man
+@@ -311,7 +311,7 @@ The
+ structure contains:
+ .LP
+ .LP
+-/\(** GC attribute value mask bits */
++/\&* GC attribute value mask bits */
+ .TS
+ lw(.5i) lw(2.5i) lw(.75i).
+ T{
+@@ -480,31 +480,31 @@ T}
+ .Ds 0
+ .TA .5i 3i
+ .ta .5i 3i
+-/\(** Values */
++/\&* Values */
+ 
+ typedef struct {
+-	int function;	/\(** logical operation */
+-	unsigned long plane_mask;	/\(** plane mask */
+-	unsigned long foreground;	/\(** foreground pixel */
+-	unsigned long background;	/\(** background pixel */
+-	int line_width;	/\(** line width (in pixels) */
+-	int line_style;	/\(** LineSolid, LineOnOffDash, LineDoubleDash */
+-	int cap_style;	/\(** CapNotLast, CapButt, CapRound, CapProjecting */
+-	int join_style;	/\(** JoinMiter, JoinRound, JoinBevel */
+-	int fill_style;	/\(** FillSolid, FillTiled, FillStippled FillOpaqueStippled*/
+-	int fill_rule;	/\(** EvenOddRule, WindingRule */
+-	int arc_mode;	/\(** ArcChord, ArcPieSlice */
+-	Pixmap tile;	/\(** tile pixmap for tiling operations */
+-	Pixmap stipple;	/\(** stipple 1 plane pixmap for stippling */
+-	int ts_x_origin;	/\(** offset for tile or stipple operations */
++	int function;	/\&* logical operation */
++	unsigned long plane_mask;	/\&* plane mask */
++	unsigned long foreground;	/\&* foreground pixel */
++	unsigned long background;	/\&* background pixel */
++	int line_width;	/\&* line width (in pixels) */
++	int line_style;	/\&* LineSolid, LineOnOffDash, LineDoubleDash */
++	int cap_style;	/\&* CapNotLast, CapButt, CapRound, CapProjecting */
++	int join_style;	/\&* JoinMiter, JoinRound, JoinBevel */
++	int fill_style;	/\&* FillSolid, FillTiled, FillStippled FillOpaqueStippled*/
++	int fill_rule;	/\&* EvenOddRule, WindingRule */
++	int arc_mode;	/\&* ArcChord, ArcPieSlice */
++	Pixmap tile;	/\&* tile pixmap for tiling operations */
++	Pixmap stipple;	/\&* stipple 1 plane pixmap for stippling */
++	int ts_x_origin;	/\&* offset for tile or stipple operations */
+ 	int ts_y_origin;
+-	Font font;	/\(** default text font for text operations */
+-	int subwindow_mode;	/\(** ClipByChildren, IncludeInferiors */
+-	Bool graphics_exposures;	/\(** boolean, should exposures be generated */
+-	int clip_x_origin;	/\(** origin for clipping */
++	Font font;	/\&* default text font for text operations */
++	int subwindow_mode;	/\&* ClipByChildren, IncludeInferiors */
++	Bool graphics_exposures;	/\&* boolean, should exposures be generated */
++	int clip_x_origin;	/\&* origin for clipping */
+ 	int clip_y_origin;
+-	Pixmap clip_mask;	/\(** bitmap clipping; other calls for rects */
+-	int dash_offset;	/\(** patterned/dashed line information */
++	Pixmap clip_mask;	/\&* bitmap clipping; other calls for rects */
++	int dash_offset;	/\&* patterned/dashed line information */
+ 	char dashes;
+ } XGCValues;
+ .De
+diff --git a/man/XCreateWindow.man b/man/XCreateWindow.man
+index 18c66df..c8e03ea 100644
+--- a/man/XCreateWindow.man
++++ b/man/XCreateWindow.man
+@@ -319,7 +319,7 @@ The
+ structure contains:
+ .LP
+ .LP
+-/\(** Window attribute value mask bits */
++/\&* Window attribute value mask bits */
+ .TS
+ lw(.5i) lw(2.5i) lw(.8i).
+ T{
+@@ -432,24 +432,24 @@ T}
+ .Ds 0
+ .TA .5i 3i
+ .ta .5i 3i
+-/\(** Values */
++/\&* Values */
+ 
+ typedef struct {
+-	Pixmap background_pixmap;	/\(** background, None, or ParentRelative */
+-	unsigned long background_pixel;	/\(** background pixel */
+-	Pixmap border_pixmap;		/\(** border of the window or CopyFromParent */
+-	unsigned long border_pixel;	/\(** border pixel value */
+-	int bit_gravity;	/\(** one of bit gravity values */
+-	int win_gravity;	/\(** one of the window gravity values */
+-	int backing_store;	/\(** NotUseful, WhenMapped, Always */
+-	unsigned long backing_planes;	/\(** planes to be preserved if possible */
+-	unsigned long backing_pixel;	/\(** value to use in restoring planes */
+-	Bool save_under;	/\(** should bits under be saved? (popups) */
+-	long event_mask;	/\(** set of events that should be saved */
+-	long do_not_propagate_mask;	/\(** set of events that should not propagate */
+-	Bool override_redirect;	/\(** boolean value for override_redirect */
+-	Colormap colormap;	/\(** color map to be associated with window */
+-	Cursor cursor;		/\(** cursor to be displayed (or None) */
++	Pixmap background_pixmap;	/\&* background, None, or ParentRelative */
++	unsigned long background_pixel;	/\&* background pixel */
++	Pixmap border_pixmap;		/\&* border of the window or CopyFromParent */
++	unsigned long border_pixel;	/\&* border pixel value */
++	int bit_gravity;	/\&* one of bit gravity values */
++	int win_gravity;	/\&* one of the window gravity values */
++	int backing_store;	/\&* NotUseful, WhenMapped, Always */
++	unsigned long backing_planes;	/\&* planes to be preserved if possible */
++	unsigned long backing_pixel;	/\&* value to use in restoring planes */
++	Bool save_under;	/\&* should bits under be saved? (popups) */
++	long event_mask;	/\&* set of events that should be saved */
++	long do_not_propagate_mask;	/\&* set of events that should not propagate */
++	Bool override_redirect;	/\&* boolean value for override_redirect */
++	Colormap colormap;	/\&* color map to be associated with window */
++	Cursor cursor;		/\&* cursor to be displayed (or None) */
+ } XSetWindowAttributes;
+ .De
+ .LP
+diff --git a/man/XCreateWindowEvent.man b/man/XCreateWindowEvent.man
+index 9fb2ce2..8574f4e 100644
+--- a/man/XCreateWindowEvent.man
++++ b/man/XCreateWindowEvent.man
+@@ -153,16 +153,16 @@ events contains:
+ .TA .5i 3i
+ .ta .5i 3i
+ typedef struct {
+-	int type;	/\(** CreateNotify */
+-	unsigned long serial;	/\(** # of last request processed by server */
+-	Bool send_event;	/\(** true if this came from a SendEvent request */
+-	Display *display;	/\(** Display the event was read from */
+-	Window parent;	/\(** parent of the window */
+-	Window window;	/\(** window id of window created */
+-	int x, y;	/\(** window location */
+-	int width, height;	/\(** size of window */
+-	int border_width;	/\(** border width */
+-	Bool override_redirect;	/\(** creation should be overridden */
++	int type;	/\&* CreateNotify */
++	unsigned long serial;	/\&* # of last request processed by server */
++	Bool send_event;	/\&* true if this came from a SendEvent request */
++	Display *display;	/\&* Display the event was read from */
++	Window parent;	/\&* parent of the window */
++	Window window;	/\&* window id of window created */
++	int x, y;	/\&* window location */
++	int width, height;	/\&* size of window */
++	int border_width;	/\&* border width */
++	Bool override_redirect;	/\&* creation should be overridden */
+ } XCreateWindowEvent;
+ .De
+ .LP
+diff --git a/man/XCrossingEvent.man b/man/XCrossingEvent.man
+index 9721a2c..1556b48 100644
+--- a/man/XCrossingEvent.man
++++ b/man/XCrossingEvent.man
+@@ -155,25 +155,25 @@ events contains:
+ .TA .5i 3i
+ .ta .5i 3i
+ typedef struct {
+-	int type;	/\(** EnterNotify or LeaveNotify */
+-	unsigned long serial;	/\(** # of last request processed by server */
+-	Bool send_event;	/\(** true if this came from a SendEvent request */
+-	Display *display;	/\(** Display the event was read from */
+-	Window window;	/\(** ``event'' window reported relative to */
+-	Window root;	/\(** root window that the event occurred on */
+-	Window subwindow;	/\(** child window */
+-	Time time;	/\(** milliseconds */
+-	int x, y;	/\(** pointer x, y coordinates in event window */
+-	int x_root, y_root;	/\(** coordinates relative to root */
+-	int mode;	/\(** NotifyNormal, NotifyGrab, NotifyUngrab */
++	int type;	/\&* EnterNotify or LeaveNotify */
++	unsigned long serial;	/\&* # of last request processed by server */
++	Bool send_event;	/\&* true if this came from a SendEvent request */
++	Display *display;	/\&* Display the event was read from */
++	Window window;	/\&* ``event'' window reported relative to */
++	Window root;	/\&* root window that the event occurred on */
++	Window subwindow;	/\&* child window */
++	Time time;	/\&* milliseconds */
++	int x, y;	/\&* pointer x, y coordinates in event window */
++	int x_root, y_root;	/\&* coordinates relative to root */
++	int mode;	/\&* NotifyNormal, NotifyGrab, NotifyUngrab */
+ 	int detail;
+-		/\(**
++		/\&*
+ 	 	* NotifyAncestor, NotifyVirtual, NotifyInferior, 
+ 	 	* NotifyNonlinear,NotifyNonlinearVirtual
+ 	 	*/
+-	Bool same_screen;	/\(** same screen flag */
+-	Bool focus;	/\(** boolean focus */
+-	unsigned int state;	/\(** key or button mask */
++	Bool same_screen;	/\&* same screen flag */
++	Bool focus;	/\&* boolean focus */
++	unsigned int state;	/\&* key or button mask */
+ } XCrossingEvent;
+ typedef XCrossingEvent XEnterWindowEvent;
+ typedef XCrossingEvent XLeaveWindowEvent;
+diff --git a/man/XDestroyWindowEvent.man b/man/XDestroyWindowEvent.man
+index 9c5a261..91c024b 100644
+--- a/man/XDestroyWindowEvent.man
++++ b/man/XDestroyWindowEvent.man
+@@ -153,10 +153,10 @@ events contains:
+ .TA .5i 3i
+ .ta .5i 3i
+ typedef struct {
+-	int type;	/\(** DestroyNotify */
+-	unsigned long serial;	/\(** # of last request processed by server */
+-	Bool send_event;	/\(** true if this came from a SendEvent request */
+-	Display *display;	/\(** Display the event was read from */
++	int type;	/\&* DestroyNotify */
++	unsigned long serial;	/\&* # of last request processed by server */
++	Bool send_event;	/\&* true if this came from a SendEvent request */
++	Display *display;	/\&* Display the event was read from */
+ 	Window event;
+ 	Window window;
+ } XDestroyWindowEvent;
+diff --git a/man/XDrawArc.man b/man/XDrawArc.man
+index 00a79cf..af25276 100644
+--- a/man/XDrawArc.man
++++ b/man/XDrawArc.man
+@@ -308,7 +308,7 @@ structure contains:
+ typedef struct {
+ 	short x, y;
+ 	unsigned short width, height;
+-	short angle1, angle2;             /\(** Degrees * 64 */
++	short angle1, angle2;             /\&* Degrees * 64 */
+ } XArc;
+ .EE
+ .LP
+diff --git a/man/XDrawText.man b/man/XDrawText.man
+index 706d69e..ae2e44e 100644
+--- a/man/XDrawText.man
++++ b/man/XDrawText.man
+@@ -228,10 +228,10 @@ structures contain:
+ .TA .5i 3i
+ .ta .5i 3i
+ typedef struct {
+-	char *chars;	/\(** pointer to string */
+-	int nchars;	/\(** number of characters */
+-	int delta;	/\(** delta between strings */
+-	Font font;	/\(** Font to print it in, None don't change */
++	char *chars;	/\&* pointer to string */
++	int nchars;	/\&* number of characters */
++	int delta;	/\&* delta between strings */
++	Font font;	/\&* Font to print it in, None don't change */
+ } XTextItem;
+ .De
+ .LP
+@@ -239,10 +239,10 @@ typedef struct {
+ .TA .5i 3i
+ .ta .5i 3i
+ typedef struct {
+-	XChar2b *chars;	/\(** pointer to two-byte characters */
+-	int nchars;	/\(** number of characters */
+-	int delta;	/\(** delta between strings */
+-	Font font;	/\(** font to print it in, None don't change */
++	XChar2b *chars;	/\&* pointer to two-byte characters */
++	int nchars;	/\&* number of characters */
++	int delta;	/\&* delta between strings */
++	Font font;	/\&* font to print it in, None don't change */
+ } XTextItem16;
+ .De
+ .LP
+diff --git a/man/XErrorEvent.man b/man/XErrorEvent.man
+index e1f4eae..c74b46b 100644
+--- a/man/XErrorEvent.man
++++ b/man/XErrorEvent.man
+@@ -154,12 +154,12 @@ structure contains:
+ .ta .5i 2.5i
+ typedef struct {
+ 	int type;
+-	Display *display;	/\(** Display the event was read from */
+-	unsigned long serial;		/\(** serial number of failed request */
+-	unsigned char error_code;	/\(** error code of failed request */
+-	unsigned char request_code;	/\(** Major op-code of failed request */
+-	unsigned char minor_code;	/\(** Minor op-code of failed request */
+-	XID resourceid;		/\(** resource id */
++	Display *display;	/\&* Display the event was read from */
++	unsigned long serial;		/\&* serial number of failed request */
++	unsigned char error_code;	/\&* error code of failed request */
++	unsigned char request_code;	/\&* Major op-code of failed request */
++	unsigned char minor_code;	/\&* Minor op-code of failed request */
++	XID resourceid;		/\&* resource id */
+ } XErrorEvent;
+ .De
+ .LP
+diff --git a/man/XExposeEvent.man b/man/XExposeEvent.man
+index 82efac2..84cf712 100644
+--- a/man/XExposeEvent.man
++++ b/man/XExposeEvent.man
+@@ -153,14 +153,14 @@ events contains:
+ .TA .5i 3i
+ .ta .5i 3i
+ typedef struct {
+-	int type;	/\(** Expose */
+-	unsigned long serial;	/\(** # of last request processed by server */
+-	Bool send_event;	/\(** true if this came from a SendEvent request */
+-	Display *display;	/\(** Display the event was read from */
++	int type;	/\&* Expose */
++	unsigned long serial;	/\&* # of last request processed by server */
++	Bool send_event;	/\&* true if this came from a SendEvent request */
++	Display *display;	/\&* Display the event was read from */
+ 	Window window;
+ 	int x, y;
+ 	int width, height;
+-	int count;	/\(** if nonzero, at least this many more */
++	int count;	/\&* if nonzero, at least this many more */
+ } XExposeEvent;
+ .De
+ .LP
+diff --git a/man/XFocusChangeEvent.man b/man/XFocusChangeEvent.man
+index c96d3cc..61f38a7 100644
+--- a/man/XFocusChangeEvent.man
++++ b/man/XFocusChangeEvent.man
+@@ -155,14 +155,14 @@ events contains:
+ .TA .5i 3i
+ .ta .5i 3i
+ typedef struct {
+-	int type;	/\(** FocusIn or FocusOut */
+-	unsigned long serial;	/\(** # of last request processed by server */
+-	Bool send_event;	/\(** true if this came from a SendEvent request */
+-	Display *display;	/\(** Display the event was read from */
+-	Window window;	/\(** window of event */
+-	int mode;	/\(** NotifyNormal, NotifyGrab, NotifyUngrab */
++	int type;	/\&* FocusIn or FocusOut */
++	unsigned long serial;	/\&* # of last request processed by server */
++	Bool send_event;	/\&* true if this came from a SendEvent request */
++	Display *display;	/\&* Display the event was read from */
++	Window window;	/\&* window of event */
++	int mode;	/\&* NotifyNormal, NotifyGrab, NotifyUngrab */
+ 	int detail;
+-		/\(**
++		/\&*
+ 	 	* NotifyAncestor, NotifyVirtual, NotifyInferior, 
+ 	 	* NotifyNonlinear,NotifyNonlinearVirtual, NotifyPointer,
+ 	 	* NotifyPointerRoot, NotifyDetailNone 
+diff --git a/man/XFontSetExtents.man b/man/XFontSetExtents.man
+index 6d415ba..d70428f 100644
+--- a/man/XFontSetExtents.man
++++ b/man/XFontSetExtents.man
+@@ -153,8 +153,8 @@ structure contains:
+ .TA .5i 3i
+ .ta .5i 3i
+ typedef struct {
+-	XRectangle max_ink_extent;	/\(** over all drawable characters */
+-	XRectangle max_logical_extent;	/\(** over all drawable characters */
++	XRectangle max_ink_extent;	/\&* over all drawable characters */
++	XRectangle max_logical_extent;	/\&* over all drawable characters */
+ } XFontSetExtents;
+ .De
+ .LP
+diff --git a/man/XGetVisualInfo.man b/man/XGetVisualInfo.man
+index 155c9f1..e4f7937 100644
+--- a/man/XGetVisualInfo.man
++++ b/man/XGetVisualInfo.man
+@@ -209,7 +209,7 @@ The
+ structure contains:
+ .LP
+ .LP
+-/\(** Visual information mask bits */
++/\&* Visual information mask bits */
+ .TS
+ lw(.5i) lw(2.5i) lw(.8i).
+ T{
+@@ -294,7 +294,7 @@ T}
+ .Ds 0
+ .TA .5i 3i
+ .ta .5i 3i
+-/\(** Values */
++/\&* Values */
+ 
+ typedef struct {
+ 	Visual *visual;
+diff --git a/man/XGetWindowAttributes.man b/man/XGetWindowAttributes.man
+index b7665b7..2aa86e4 100644
+--- a/man/XGetWindowAttributes.man
++++ b/man/XGetWindowAttributes.man
+@@ -222,27 +222,27 @@ structure contains:
+ .TA .5i 3i
+ .ta .5i 3i
+ typedef struct {
+-	int x, y;	/\(** location of window */
+-	int width, height;	/\(** width and height of window */
+-	int border_width;	/\(** border width of window */
+-	int depth;	/\(** depth of window */
+-	Visual *visual;	/\(** the associated visual structure */
+-	Window root;	/\(** root of screen containing window */
+-	int class;	/\(** InputOutput, InputOnly*/
+-	int bit_gravity;	/\(** one of the bit gravity values */
+-	int win_gravity;	/\(** one of the window gravity values */
+-	int backing_store;	/\(** NotUseful, WhenMapped, Always */
+-	unsigned long backing_planes;	/\(** planes to be preserved if possible */
+-	unsigned long backing_pixel;	/\(** value to be used when restoring planes */
+-	Bool save_under;	/\(** boolean, should bits under be saved? */
+-	Colormap colormap;	/\(** color map to be associated with window */
+-	Bool map_installed;	/\(** boolean, is color map currently installed*/
+-	int map_state;	/\(** IsUnmapped, IsUnviewable, IsViewable */
+-	long all_event_masks;	/\(** set of events all people have interest in*/
+-	long your_event_mask;	/\(** my event mask */
+-	long do_not_propagate_mask;	/\(** set of events that should not propagate */
+-	Bool override_redirect;	/\(** boolean value for override-redirect */
+-	Screen *screen;	/\(** back pointer to correct screen */
++	int x, y;	/\&* location of window */
++	int width, height;	/\&* width and height of window */
++	int border_width;	/\&* border width of window */
++	int depth;	/\&* depth of window */
++	Visual *visual;	/\&* the associated visual structure */
++	Window root;	/\&* root of screen containing window */
++	int class;	/\&* InputOutput, InputOnly*/
++	int bit_gravity;	/\&* one of the bit gravity values */
++	int win_gravity;	/\&* one of the window gravity values */
++	int backing_store;	/\&* NotUseful, WhenMapped, Always */
++	unsigned long backing_planes;	/\&* planes to be preserved if possible */
++	unsigned long backing_pixel;	/\&* value to be used when restoring planes */
++	Bool save_under;	/\&* boolean, should bits under be saved? */
++	Colormap colormap;	/\&* color map to be associated with window */
++	Bool map_installed;	/\&* boolean, is color map currently installed*/
++	int map_state;	/\&* IsUnmapped, IsUnviewable, IsViewable */
++	long all_event_masks;	/\&* set of events all people have interest in*/
++	long your_event_mask;	/\&* my event mask */
++	long do_not_propagate_mask;	/\&* set of events that should not propagate */
++	Bool override_redirect;	/\&* boolean value for override-redirect */
++	Screen *screen;	/\&* back pointer to correct screen */
+ } XWindowAttributes;
+ .De
+ .LP
+diff --git a/man/XGraphicsExposeEvent.man b/man/XGraphicsExposeEvent.man
+index 6e20083..a5637c8 100644
+--- a/man/XGraphicsExposeEvent.man
++++ b/man/XGraphicsExposeEvent.man
+@@ -155,16 +155,16 @@ events contain:
+ .TA .5i 3i
+ .ta .5i 3i
+ typedef struct {
+-	int type;	/\(** GraphicsExpose */
+-	unsigned long serial;	/\(** # of last request processed by server */
+-	Bool send_event;	/\(** true if this came from a SendEvent request */
+-	Display *display;	/\(** Display the event was read from */
++	int type;	/\&* GraphicsExpose */
++	unsigned long serial;	/\&* # of last request processed by server */
++	Bool send_event;	/\&* true if this came from a SendEvent request */
++	Display *display;	/\&* Display the event was read from */
+ 	Drawable drawable;
+ 	int x, y;
+ 	int width, height;
+-	int count;	/\(** if nonzero, at least this many more */
+-	int major_code;	/\(** core is CopyArea or CopyPlane */
+-	int minor_code;	/\(** not defined in the core */
++	int count;	/\&* if nonzero, at least this many more */
++	int major_code;	/\&* core is CopyArea or CopyPlane */
++	int minor_code;	/\&* not defined in the core */
+ } XGraphicsExposeEvent;
+ .De
+ .LP
+@@ -172,13 +172,13 @@ typedef struct {
+ .TA .5i 3i
+ .ta .5i 3i
+ typedef struct {
+-	int type;	/\(** NoExpose */
+-	unsigned long serial;	/\(** # of last request processed by server */
+-	Bool send_event;	/\(** true if this came from a SendEvent request */
+-	Display *display;	/\(** Display the event was read from */
++	int type;	/\&* NoExpose */
++	unsigned long serial;	/\&* # of last request processed by server */
++	Bool send_event;	/\&* true if this came from a SendEvent request */
++	Display *display;	/\&* Display the event was read from */
+ 	Drawable drawable;
+-	int major_code;	/\(** core is CopyArea or CopyPlane */
+-	int minor_code;	/\(** not defined in the core */
++	int major_code;	/\&* core is CopyArea or CopyPlane */
++	int minor_code;	/\&* not defined in the core */
+ } XNoExposeEvent;
+ .De
+ .LP
+diff --git a/man/XGravityEvent.man b/man/XGravityEvent.man
+index 9d07e6f..c49719e 100644
+--- a/man/XGravityEvent.man
++++ b/man/XGravityEvent.man
+@@ -153,10 +153,10 @@ events contains:
+ .TA .5i 3i
+ .ta .5i 3i
+ typedef struct {
+-	int type;	/\(** GravityNotify */
+-	unsigned long serial;	/\(** # of last request processed by server */
+-	Bool send_event;	/\(** true if this came from a SendEvent request */
+-	Display *display;	/\(** Display the event was read from */
++	int type;	/\&* GravityNotify */
++	unsigned long serial;	/\&* # of last request processed by server */
++	Bool send_event;	/\&* true if this came from a SendEvent request */
++	Display *display;	/\&* Display the event was read from */
+ 	Window event;
+ 	Window window;
+ 	int x, y;
+diff --git a/man/XKeymapEvent.man b/man/XKeymapEvent.man
+index c687c96..356865d 100644
+--- a/man/XKeymapEvent.man
++++ b/man/XKeymapEvent.man
+@@ -152,12 +152,12 @@ events contains:
+ .Ds 0
+ .TA .5i 3i
+ .ta .5i 3i
+-/\(** generated on EnterWindow and FocusIn when KeymapState selected */
++/\&* generated on EnterWindow and FocusIn when KeymapState selected */
+ typedef struct {
+-	int type;	/\(** KeymapNotify */
+-	unsigned long serial;	/\(** # of last request processed by server */
+-	Bool send_event;	/\(** true if this came from a SendEvent request */
+-	Display *display;	/\(** Display the event was read from */
++	int type;	/\&* KeymapNotify */
++	unsigned long serial;	/\&* # of last request processed by server */
++	Bool send_event;	/\&* true if this came from a SendEvent request */
++	Display *display;	/\&* Display the event was read from */
+ 	Window window;
+ 	char key_vector[32];
+ } XKeymapEvent;	
+diff --git a/man/XLoadFont.man b/man/XLoadFont.man
+index 906f20e..a13ed84 100644
+--- a/man/XLoadFont.man
++++ b/man/XLoadFont.man
+@@ -321,12 +321,12 @@ structures contain:
+ .IN "XCharStruct" "" "@DEF@"
+ .EX
+ typedef struct {
+-	short lbearing;	/\(** origin to left edge of raster */
+-	short rbearing;	/\(** origin to right edge of raster */
+-	short width;	/\(** advance to next char's origin */
+-	short ascent;	/\(** baseline to top edge of raster */
+-	short descent;	/\(** baseline to bottom edge of raster */
+-	unsigned short attributes;	/\(** per char flags (not predefined) */
++	short lbearing;	/\&* origin to left edge of raster */
++	short rbearing;	/\&* origin to right edge of raster */
++	short width;	/\&* advance to next char's origin */
++	short ascent;	/\&* baseline to top edge of raster */
++	short descent;	/\&* baseline to bottom edge of raster */
++	unsigned short attributes;	/\&* per char flags (not predefined) */
+ } XCharStruct;
+ .EE
+ .LP
+@@ -340,7 +340,7 @@ typedef struct {
+ .LP
+ .IN "XChar2b" "" "@DEF@"
+ .EX
+-typedef struct {	/\(** normal 16 bit characters are two bytes */
++typedef struct {	/\&* normal 16 bit characters are two bytes */
+     unsigned char byte1;
+     unsigned char byte2;
+ } XChar2b;
+@@ -349,22 +349,22 @@ typedef struct {	/\(** normal 16 bit cha
+ .IN "XFontStruct" "" "@DEF@"
+ .EX
+ typedef struct {
+-	XExtData *ext_data;	/\(** hook for extension to hang data */
+-	Font fid;	/\(** Font id for this font */
+-	unsigned direction;	/\(** hint about the direction font is painted */
+-	unsigned min_char_or_byte2;	/\(** first character */
+-	unsigned max_char_or_byte2;	/\(** last character */
+-	unsigned min_byte1;	/\(** first row that exists */
+-	unsigned max_byte1;	/\(** last row that exists */
+-	Bool all_chars_exist;	/\(** flag if all characters have nonzero size */
+-	unsigned default_char;	/\(** char to print for undefined character */
+-	int n_properties;	/\(** how many properties there are */
+-	XFontProp *properties;	/\(** pointer to array of additional properties */
+-	XCharStruct min_bounds;	/\(** minimum bounds over all existing char */
+-	XCharStruct max_bounds;	/\(** maximum bounds over all existing char */
+-	XCharStruct *per_char;	/\(** first_char to last_char information */
+-	int ascent;	/\(** logical extent above baseline for spacing */
+-	int descent;	/\(** logical decent below baseline for spacing */
++	XExtData *ext_data;	/\&* hook for extension to hang data */
++	Font fid;	/\&* Font id for this font */
++	unsigned direction;	/\&* hint about the direction font is painted */
++	unsigned min_char_or_byte2;	/\&* first character */
++	unsigned max_char_or_byte2;	/\&* last character */
++	unsigned min_byte1;	/\&* first row that exists */
++	unsigned max_byte1;	/\&* last row that exists */
++	Bool all_chars_exist;	/\&* flag if all characters have nonzero size */
++	unsigned default_char;	/\&* char to print for undefined character */
++	int n_properties;	/\&* how many properties there are */
++	XFontProp *properties;	/\&* pointer to array of additional properties */
++	XCharStruct min_bounds;	/\&* minimum bounds over all existing char */
++	XCharStruct max_bounds;	/\&* maximum bounds over all existing char */
++	XCharStruct *per_char;	/\&* first_char to last_char information */
++	int ascent;	/\&* logical extent above baseline for spacing */
++	int descent;	/\&* logical decent below baseline for spacing */
+ } XFontStruct;
+ .EE
+ .LP
+diff --git a/man/XMapEvent.man b/man/XMapEvent.man
+index 5bc8f85..7f2747c 100644
+--- a/man/XMapEvent.man
++++ b/man/XMapEvent.man
+@@ -153,13 +153,13 @@ events contains:
+ .TA .5i 3i
+ .ta .5i 3i
+ typedef struct {
+-	int type;	/\(** MapNotify */
+-	unsigned long serial;	/\(** # of last request processed by server */
+-	Bool send_event;	/\(** true if this came from a SendEvent request */
+-	Display *display;	/\(** Display the event was read from */
++	int type;	/\&* MapNotify */
++	unsigned long serial;	/\&* # of last request processed by server */
++	Bool send_event;	/\&* true if this came from a SendEvent request */
++	Display *display;	/\&* Display the event was read from */
+ 	Window event;
+ 	Window window;
+-	Bool override_redirect;	/\(** boolean, is override set... */
++	Bool override_redirect;	/\&* boolean, is override set... */
+ } XMapEvent;
+ .De
+ .LP
+@@ -208,15 +208,15 @@ events is:
+ .TA .5i 3i
+ .ta .5i 3i
+ typedef struct {
+-	int type;	/\(** MappingNotify */
+-	unsigned long serial;	/\(** # of last request processed by server */
+-	Bool send_event;	/\(** true if this came from a SendEvent request */
+-	Display *display;	/\(** Display the event was read from */
+-	Window window;	/\(** unused */
+-	int request;	/\(** one of MappingModifier, MappingKeyboard,
++	int type;	/\&* MappingNotify */
++	unsigned long serial;	/\&* # of last request processed by server */
++	Bool send_event;	/\&* true if this came from a SendEvent request */
++	Display *display;	/\&* Display the event was read from */
++	Window window;	/\&* unused */
++	int request;	/\&* one of MappingModifier, MappingKeyboard,
+ 		   MappingPointer */
+-	int first_keycode;	/\(** first keycode */
+-	int count;	/\(** defines range of change w. first_keycode*/
++	int first_keycode;	/\&* first keycode */
++	int count;	/\&* defines range of change w. first_keycode*/
+ } XMappingEvent;
+ .De
+ .LP
+diff --git a/man/XMapRequestEvent.man b/man/XMapRequestEvent.man
+index f76551d..a8ece72 100644
+--- a/man/XMapRequestEvent.man
++++ b/man/XMapRequestEvent.man
+@@ -153,10 +153,10 @@ events contains:
+ .TA .5i 3i
+ .ta .5i 3i
+ typedef struct {
+-	int type;	/\(** MapRequest */
+-	unsigned long serial;	/\(** # of last request processed by server */
+-	Bool send_event;	/\(** true if this came from a SendEvent request */
+-	Display *display;	/\(** Display the event was read from */
++	int type;	/\&* MapRequest */
++	unsigned long serial;	/\&* # of last request processed by server */
++	Bool send_event;	/\&* true if this came from a SendEvent request */
++	Display *display;	/\&* Display the event was read from */
+ 	Window parent;
+ 	Window window;
+ } XMapRequestEvent;
+diff --git a/man/XPropertyEvent.man b/man/XPropertyEvent.man
+index ef34642..30ac75a 100644
+--- a/man/XPropertyEvent.man
++++ b/man/XPropertyEvent.man
+@@ -153,14 +153,14 @@ events contains:
+ .TA .5i 3i
+ .ta .5i 3i
+ typedef struct {
+-	int type;	/\(** PropertyNotify */
+-	unsigned long serial;	/\(** # of last request processed by server */
+-	Bool send_event;	/\(** true if this came from a SendEvent request */
+-	Display *display;	/\(** Display the event was read from */
++	int type;	/\&* PropertyNotify */
++	unsigned long serial;	/\&* # of last request processed by server */
++	Bool send_event;	/\&* true if this came from a SendEvent request */
++	Display *display;	/\&* Display the event was read from */
+ 	Window window;
+ 	Atom atom;
+ 	Time time;
+-	int state;	/\(** PropertyNewValue or PropertyDelete */
++	int state;	/\&* PropertyNewValue or PropertyDelete */
+ } XPropertyEvent;
+ .De
+ .LP
+diff --git a/man/XReparentEvent.man b/man/XReparentEvent.man
+index ff42e28..228661c 100644
+--- a/man/XReparentEvent.man
++++ b/man/XReparentEvent.man
+@@ -153,10 +153,10 @@ events contains:
+ .TA .5i 3i
+ .ta .5i 3i
+ typedef struct {
+-	int type;	/\(** ReparentNotify */
+-	unsigned long serial;	/\(** # of last request processed by server */
+-	Bool send_event;	/\(** true if this came from a SendEvent request */
+-	Display *display;	/\(** Display the event was read from */
++	int type;	/\&* ReparentNotify */
++	unsigned long serial;	/\&* # of last request processed by server */
++	Bool send_event;	/\&* true if this came from a SendEvent request */
++	Display *display;	/\&* Display the event was read from */
+ 	Window event;
+ 	Window window;
+ 	Window parent;
+diff --git a/man/XResizeRequestEvent.man b/man/XResizeRequestEvent.man
+index 71243b9..eb522f3 100644
+--- a/man/XResizeRequestEvent.man
++++ b/man/XResizeRequestEvent.man
+@@ -153,10 +153,10 @@ events contains:
+ .TA .5i 3i
+ .ta .5i 3i
+ typedef struct {
+-	int type;	/\(** ResizeRequest */
+-	unsigned long serial;	/\(** # of last request processed by server */
+-	Bool send_event;	/\(** true if this came from a SendEvent request */
+-	Display *display;	/\(** Display the event was read from */
++	int type;	/\&* ResizeRequest */
++	unsigned long serial;	/\&* # of last request processed by server */
++	Bool send_event;	/\&* true if this came from a SendEvent request */
++	Display *display;	/\&* Display the event was read from */
+ 	Window window;
+ 	int width, height;
+ } XResizeRequestEvent;
+diff --git a/man/XSelectionClearEvent.man b/man/XSelectionClearEvent.man
+index 3fd7b1f..d186034 100644
+--- a/man/XSelectionClearEvent.man
++++ b/man/XSelectionClearEvent.man
+@@ -153,10 +153,10 @@ events contains:
+ .TA .5i 3i
+ .ta .5i 3i
+ typedef struct {
+-	int type;	/\(** SelectionClear */
+-	unsigned long serial;	/\(** # of last request processed by server */
+-	Bool send_event;	/\(** true if this came from a SendEvent request */
+-	Display *display;	/\(** Display the event was read from */
++	int type;	/\&* SelectionClear */
++	unsigned long serial;	/\&* # of last request processed by server */
++	Bool send_event;	/\&* true if this came from a SendEvent request */
++	Display *display;	/\&* Display the event was read from */
+ 	Window window;
+ 	Atom selection;
+ 	Time time;
+diff --git a/man/XSelectionEvent.man b/man/XSelectionEvent.man
+index 45481f5..e68eef7 100644
+--- a/man/XSelectionEvent.man
++++ b/man/XSelectionEvent.man
+@@ -153,14 +153,14 @@ events contains:
+ .TA .5i 3i
+ .ta .5i 3i
+ typedef struct {
+-	int type;	/\(** SelectionNotify */
+-	unsigned long serial;	/\(** # of last request processed by server */
+-	Bool send_event;	/\(** true if this came from a SendEvent request */
+-	Display *display;	/\(** Display the event was read from */
++	int type;	/\&* SelectionNotify */
++	unsigned long serial;	/\&* # of last request processed by server */
++	Bool send_event;	/\&* true if this came from a SendEvent request */
++	Display *display;	/\&* Display the event was read from */
+ 	Window requestor;
+ 	Atom selection;
+ 	Atom target;
+-	Atom property;	/\(** atom or None */
++	Atom property;	/\&* atom or None */
+ 	Time time;
+ } XSelectionEvent;
+ .De
+diff --git a/man/XSelectionRequestEvent.man b/man/XSelectionRequestEvent.man
+index 9d2febe..ae15700 100644
+--- a/man/XSelectionRequestEvent.man
++++ b/man/XSelectionRequestEvent.man
+@@ -153,10 +153,10 @@ events contains:
+ .TA .5i 3i
+ .ta .5i 3i
+ typedef struct {
+-	int type;	/\(** SelectionRequest */
+-	unsigned long serial;	/\(** # of last request processed by server */
+-	Bool send_event;	/\(** true if this came from a SendEvent request */
+-	Display *display;	/\(** Display the event was read from */
++	int type;	/\&* SelectionRequest */
++	unsigned long serial;	/\&* # of last request processed by server */
++	Bool send_event;	/\&* true if this came from a SendEvent request */
++	Display *display;	/\&* Display the event was read from */
+ 	Window owner;
+ 	Window requestor;
+ 	Atom selection;
+diff --git a/man/XStringListToTextProperty.man b/man/XStringListToTextProperty.man
+index a921048..abba419 100644
+--- a/man/XStringListToTextProperty.man
++++ b/man/XStringListToTextProperty.man
+@@ -230,10 +230,10 @@ structure contains:
+ .TA .5i 2.5i
+ .ta .5i 2.5i
+ typedef struct {
+-	unsigned char *value;	/\(** property data */
+-	Atom encoding;	/\(** type of property */
+-	int format;	/\(** 8, 16, or 32 */
+-	unsigned long nitems;	/\(** number of items in value */
++	unsigned char *value;	/\&* property data */
++	Atom encoding;	/\&* type of property */
++	int format;	/\&* 8, 16, or 32 */
++	unsigned long nitems;	/\&* number of items in value */
+ } XTextProperty;
+ .De
+ .SH "SEE ALSO"
+diff --git a/man/XUnmapEvent.man b/man/XUnmapEvent.man
+index c560a2a..a0623f7 100644
+--- a/man/XUnmapEvent.man
++++ b/man/XUnmapEvent.man
+@@ -153,10 +153,10 @@ events contains:
+ .TA .5i 3i
+ .ta .5i 3i
+ typedef struct {
+-	int type;	/\(** UnmapNotify */
+-	unsigned long serial;	/\(** # of last request processed by server */
+-	Bool send_event;	/\(** true if this came from a SendEvent request */
+-	Display *display;	/\(** Display the event was read from */
++	int type;	/\&* UnmapNotify */
++	unsigned long serial;	/\&* # of last request processed by server */
++	Bool send_event;	/\&* true if this came from a SendEvent request */
++	Display *display;	/\&* Display the event was read from */
+ 	Window event;
+ 	Window window;
+ 	Bool from_configure;
+diff --git a/man/XVisibilityEvent.man b/man/XVisibilityEvent.man
+index 0313aab..7b878cf 100644
+--- a/man/XVisibilityEvent.man
++++ b/man/XVisibilityEvent.man
+@@ -153,10 +153,10 @@ events contains:
+ .TA .5i 3i
+ .ta .5i 3i
+ typedef struct {
+-	int type;	/\(** VisibilityNotify */
+-	unsigned long serial;	/\(** # of last request processed by server */
+-	Bool send_event;	/\(** true if this came from a SendEvent request */
+-	Display *display;	/\(** Display the event was read from */
++	int type;	/\&* VisibilityNotify */
++	unsigned long serial;	/\&* # of last request processed by server */
++	Bool send_event;	/\&* true if this came from a SendEvent request */
++	Display *display;	/\&* Display the event was read from */
+ 	Window window;
+ 	int state;
+ } XVisibilityEvent;
+diff --git a/man/XcmsColor.man b/man/XcmsColor.man
+index 8c7d0e9..fa845dd 100644
+--- a/man/XcmsColor.man
++++ b/man/XcmsColor.man
+@@ -159,7 +159,7 @@ The structure for
+ contains:
+ .LP
+ .EX
+-typedef unsigned long XcmsColorFormat;			/\(** Color Specification Format */
++typedef unsigned long XcmsColorFormat;			/\&* Color Specification Format */
+ 
+ typedef struct {
+ 	union {
+@@ -175,73 +175,73 @@ typedef struct {
+ 	} spec;
+ 	unsigned long pixel;
+ 	XcmsColorFormat format;
+-} XcmsColor;			/\(** Xcms Color Structure */
++} XcmsColor;			/\&* Xcms Color Structure */
+ .EE
+ .LP
+ .EX
+ typedef double XcmsFloat;
+ 
+ typedef struct {
+-	unsigned short red;	/\(** 0x0000 to 0xffff */
+-	unsigned short green;	/\(** 0x0000 to 0xffff */
+-	unsigned short blue;	/\(** 0x0000 to 0xffff */
+-} XcmsRGB;		/\(** RGB Device */
++	unsigned short red;	/\&* 0x0000 to 0xffff */
++	unsigned short green;	/\&* 0x0000 to 0xffff */
++	unsigned short blue;	/\&* 0x0000 to 0xffff */
++} XcmsRGB;		/\&* RGB Device */
+ .EE
+ .LP
+ .EX
+ typedef struct {
+-	XcmsFloat red;	/\(** 0.0 to 1.0 */
+-	XcmsFloat green;	/\(** 0.0 to 1.0 */
+-	XcmsFloat blue;	/\(** 0.0 to 1.0 */
+-} XcmsRGBi;		/\(** RGB Intensity */
++	XcmsFloat red;	/\&* 0.0 to 1.0 */
++	XcmsFloat green;	/\&* 0.0 to 1.0 */
++	XcmsFloat blue;	/\&* 0.0 to 1.0 */
++} XcmsRGBi;		/\&* RGB Intensity */
+ .EE
+ .LP
+ .EX
+ typedef struct {
+ 	XcmsFloat X;
+-	XcmsFloat Y;	/\(** 0.0 to 1.0 */
++	XcmsFloat Y;	/\&* 0.0 to 1.0 */
+ 	XcmsFloat Z;
+-} XcmsCIEXYZ;		/\(** CIE XYZ */
++} XcmsCIEXYZ;		/\&* CIE XYZ */
+ .EE
+ .LP
+ .EX
+ typedef struct {
+-	XcmsFloat u_prime;	/\(** 0.0 to ~0.6 */
+-	XcmsFloat v_prime;	/\(** 0.0 to ~0.6 */
+-	XcmsFloat Y; 	/\(** 0.0 to 1.0 */
+-} XcmsCIEuvY;		/\(** CIE u'v'Y */
++	XcmsFloat u_prime;	/\&* 0.0 to ~0.6 */
++	XcmsFloat v_prime;	/\&* 0.0 to ~0.6 */
++	XcmsFloat Y; 	/\&* 0.0 to 1.0 */
++} XcmsCIEuvY;		/\&* CIE u'v'Y */
+ .EE
+ .LP
+ .EX
+ typedef struct {
+-	XcmsFloat x; 	/\(** 0.0 to ~.75 */
+-	XcmsFloat y; 	/\(** 0.0 to ~.85 */
+-	XcmsFloat Y; 	/\(** 0.0 to 1.0 */
+-} XcmsCIExyY;		/\(** CIE xyY */
++	XcmsFloat x; 	/\&* 0.0 to ~.75 */
++	XcmsFloat y; 	/\&* 0.0 to ~.85 */
++	XcmsFloat Y; 	/\&* 0.0 to 1.0 */
++} XcmsCIExyY;		/\&* CIE xyY */
+ .EE
+ .LP
+ .EX
+ typedef struct {
+-	XcmsFloat L_star; 	/\(** 0.0 to 100.0 */
++	XcmsFloat L_star; 	/\&* 0.0 to 100.0 */
+ 	XcmsFloat a_star;
+ 	XcmsFloat b_star;
+-} XcmsCIELab;		/\(** CIE L*a*b* */
++} XcmsCIELab;		/\&* CIE L*a*b* */
+ .EE
+ .LP
+ .EX
+ typedef struct {
+-	XcmsFloat L_star; 	/\(** 0.0 to 100.0 */
++	XcmsFloat L_star; 	/\&* 0.0 to 100.0 */
+ 	XcmsFloat u_star;
+ 	XcmsFloat v_star;
+-} XcmsCIELuv;		/\(** CIE L*u*v* */
++} XcmsCIELuv;		/\&* CIE L*u*v* */
+ .EE
+ .LP
+ .EX
+ typedef struct {
+-	XcmsFloat H; 	/\(** 0.0 to 360.0 */
+-	XcmsFloat V; 	/\(** 0.0 to 100.0 */
+-	XcmsFloat C; 	/\(** 0.0 to 100.0 */
+-} XcmsTekHVC;		/\(** TekHVC */
++	XcmsFloat H; 	/\&* 0.0 to 360.0 */
++	XcmsFloat V; 	/\&* 0.0 to 100.0 */
++	XcmsFloat C; 	/\&* 0.0 to 100.0 */
++} XcmsTekHVC;		/\&* TekHVC */
+ .EE
+ .LP
+ .EX
+@@ -250,7 +250,7 @@ typedef struct {
+ 	XcmsFloat pad1;
+ 	XcmsFloat pad2;
+ 	XcmsFloat pad3;
+-} XcmsPad;		/\(** four doubles */
++} XcmsPad;		/\&* four doubles */
+ .EE
+ .SH DESCRIPTION
+ The
+diff --git a/man/XmbDrawText.man b/man/XmbDrawText.man
+index 30fe5ea..b857f5a 100644
+--- a/man/XmbDrawText.man
++++ b/man/XmbDrawText.man
+@@ -228,10 +228,10 @@ structure contains:
+ .TA .5i 2.5i
+ .ta .5i 2.5i
+ typedef struct {
+-	char *chars;	/\(** pointer to string */
+-	int nchars;	/\(** number of bytes */
+-	int delta;	/\(** pixel delta between strings */
+-	XFontSet font_set; 	/\(** fonts, None means don't change */
++	char *chars;	/\&* pointer to string */
++	int nchars;	/\&* number of bytes */
++	int delta;	/\&* pixel delta between strings */
++	XFontSet font_set; 	/\&* fonts, None means don't change */
+ } XmbTextItem;
+ .De
+ The
+@@ -241,10 +241,10 @@ structure contains:
+ .TA .5i 2.5i
+ .ta .5i 2.5i
+ typedef struct {
+-	wchar_t *chars;	/\(** pointer to wide char string */
+-	int nchars;	/\(** number of wide characters */
+-	int delta;	/\(** pixel delta between strings */
+-	XFontSet font_set;	/\(** fonts, None means don't change */
++	wchar_t *chars;	/\&* pointer to wide char string */
++	int nchars;	/\&* number of wide characters */
++	int delta;	/\&* pixel delta between strings */
++	XFontSet font_set;	/\&* fonts, None means don't change */
+ } XwcTextItem;
+ .De
+ .SH "SEE ALSO"
+diff --git a/man/XmbTextListToTextProperty.man b/man/XmbTextListToTextProperty.man
+index cad0cf3..23501e9 100644
+--- a/man/XmbTextListToTextProperty.man
++++ b/man/XmbTextListToTextProperty.man
+@@ -408,10 +408,10 @@ structure contains:
+ .TA .5i 2.5i
+ .ta .5i 2.5i
+ typedef struct {
+-	unsigned char *value;	/\(** property data */
+-	Atom encoding;	/\(** type of property */
+-	int format;	/\(** 8, 16, or 32 */
+-	unsigned long nitems;	/\(** number of items in value */
++	unsigned char *value;	/\&* property data */
++	Atom encoding;	/\&* type of property */
++	int format;	/\&* 8, 16, or 32 */
++	unsigned long nitems;	/\&* number of items in value */
+ } XTextProperty;
+ .De
+ .LP
+@@ -447,11 +447,11 @@ T}
+ .TA .5i 2.5i
+ .ta .5i 2.5i
+ typedef enum {
+-	XStringStyle,		/\(** STRING */
+-	XCompoundTextStyle,	/\(** COMPOUND_TEXT */
+-	XTextStyle,		/\(** text in owner's encoding (current locale) */
+-	XStdICCTextStyle,	/\(** STRING, else COMPOUND_TEXT */
+-	XUTF8StringStyle	/\(** UTF8_STRING */
++	XStringStyle,		/\&* STRING */
++	XCompoundTextStyle,	/\&* COMPOUND_TEXT */
++	XTextStyle,		/\&* text in owner's encoding (current locale) */
++	XStdICCTextStyle,	/\&* STRING, else COMPOUND_TEXT */
++	XUTF8StringStyle	/\&* UTF8_STRING */
+ } XICCEncodingStyle;
+ .De
+ .SH "SEE ALSO"
+diff --git a/man/XrmInitialize.man b/man/XrmInitialize.man
+index c282e61..c481bef 100644
+--- a/man/XrmInitialize.man
++++ b/man/XrmInitialize.man
+@@ -233,14 +233,14 @@ typedef struct {
+ .TA .5i 2.5i
+ .ta .5i 2.5i
+ typedef enum {
+-	XrmoptionNoArg,	/\(** Value is specified in XrmOptionDescRec.value */
+-	XrmoptionIsArg,	/\(** Value is the option string itself */
+-	XrmoptionStickyArg,	/\(** Value is characters immediately following option */
+-	XrmoptionSepArg,	/\(** Value is next argument in argv */
+-	XrmoptionResArg,	/\(** Resource and value in next argument in argv */
+-	XrmoptionSkipArg,	/\(** Ignore this option and the next argument in argv */
+-	XrmoptionSkipLine,	/\(** Ignore this option and the rest of argv */
+-	XrmoptionSkipNArgs	/\(** Ignore this option and the next
++	XrmoptionNoArg,	/\&* Value is specified in XrmOptionDescRec.value */
++	XrmoptionIsArg,	/\&* Value is the option string itself */
++	XrmoptionStickyArg,	/\&* Value is characters immediately following option */
++	XrmoptionSepArg,	/\&* Value is next argument in argv */
++	XrmoptionResArg,	/\&* Resource and value in next argument in argv */
++	XrmoptionSkipArg,	/\&* Ignore this option and the next argument in argv */
++	XrmoptionSkipLine,	/\&* Ignore this option and the rest of argv */
++	XrmoptionSkipNArgs	/\&* Ignore this option and the next
+ 		\ \ \ XrmOptionDescRec.value arguments in argv */
+ } XrmOptionKind;
+ .De
+@@ -249,10 +249,10 @@ typedef enum {
+ .TA .5i 2.5i
+ .ta .5i 2.5i
+ typedef struct {
+-	char *option;	/\(** Option specification string in argv		    */
+-	char *specifier;	/\(** Binding and resource name (sans application name)    */
+-	XrmOptionKind argKind;	/\(** Which style of option it is	    */
+-	XPointer value;	/\(** Value to provide if XrmoptionNoArg or 
++	char *option;	/\&* Option specification string in argv		    */
++	char *specifier;	/\&* Binding and resource name (sans application name)    */
++	XrmOptionKind argKind;	/\&* Which style of option it is	    */
++	XPointer value;	/\&* Value to provide if XrmoptionNoArg or 
+ 		\ \ \ XrmoptionSkipNArgs   */
+ } XrmOptionDescRec, *XrmOptionDescList;
+ .De
+-- 
+1.4.1
+
+From e3eb83ec6a9bffa63cdffd94f077c12f85ad7240 Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <[email protected]>
+Date: Mon, 11 Feb 2008 20:11:43 -0800
+Subject: [PATCH] Spell out number in XkbGetKeyVirtualModMap man page to avoid cpp errors from #
+---
+ man/xkb/XkbGetKeyVirtualModMap.man |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/man/xkb/XkbGetKeyVirtualModMap.man b/man/xkb/XkbGetKeyVirtualModMap.man
+index dcb7533..6b35a77 100644
+--- a/man/xkb/XkbGetKeyVirtualModMap.man
++++ b/man/xkb/XkbGetKeyVirtualModMap.man
+@@ -57,7 +57,7 @@ connection to server
+ keycode of first key to fetch
+ .TP
+ .I \- num
+-# keys for which virtual mod maps are desired
++number of keys for which virtual mod maps are desired
+ .TP
+ .I \- xkb
+ Xkb description where results will be placed
+-- 
+1.4.1
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/lib/libX11/mapfile-order	Thu Feb 28 17:02:09 2008 -0800
@@ -0,0 +1,599 @@
+text	=	LOAD	?RXO;
+text	:	.text%XrmInitialize	:	Xrm.o;
+text	:	.text%XrmPermStringToQuark	:	Quarks.o;
+text	:	.text%_XrmInternalStringToQuark	:	Quarks.o;
+text	:	.text%ExpandQuarkTable	:	Quarks.o;
+text	:	.text%_Xpermalloc	:	Quarks.o;
+text	:	.text%permalloc	:	Quarks.o;
+text	:	.text%XrmGetStringDatabase	:	Xrm.o;
+text	:	.text%NewDatabase	:	Xrm.o;
+text	:	.text%_XrmInitParseInfo	:	lcWrap.o;
+text	:	.text%_XOpenLC	:	lcWrap.o;
+text	:	.text%_XlcMapOSLocaleName	:	SetLocale.o;
+text	:	.text%_XlcInitLoader	:	lcInit.o;
+text	:	.text%_XlcAddLoader	:	lcWrap.o;
+text	:	.text%_XlcRemoveLoader	:	lcWrap.o;
+text	:	.text%_XlcDefaultLoader	:	lcDefConv.o;
+text	:	.text%_XlcCreateLC	:	lcPubWrap.o;
+text	:	.text%create	:	lcPublic.o;
+text	:	.text%initialize	:	lcPublic.o;
+text	:	.text%_XlcInitCTInfo	:	lcCT.o;
+text	:	.text%resolve_ct_list	:	lcCT.o;
+text	:	.text%_XlcLocaleDirName	:	lcFile.o;
+text	:	.text%_XlcResolveLocaleName	:	lcFile.o;
+text	:	.text%xlocaledir	:	lcFile.o;
+text	:	.text%parse_path	:	lcFile.o;
+text	:	.text%parse_line	:	lcFile.o;
+text	:	.text%_XlcResolveName	:	lcFile.o;
+text	:	.text%_XlcAddCT	:	lcCT.o;
+text	:	.text%_XlcParseCT	:	lcCT.o;
+text	:	.text%_XlcGetCTInfoFromEncoding	:	lcCT.o;
+text	:	.text%_XlcCreateDefaultCharSet	:	lcCharSet.o;
+text	:	.text%_XlcParseCharSet	:	lcCT.o;
+text	:	.text%XrmStringToQuark	:	Quarks.o;
+text	:	.text%XrmQuarkToString	:	Quarks.o;
+text	:	.text%_XlcAddCharSet	:	lcCharSet.o;
+text	:	.text%_XlcGetCharSet	:	lcCharSet.o;
+text	:	.text%init_converter	:	lcCT.o;
+text	:	.text%_XlcSetConverter	:	lcConv.o;
+text	:	.text%initialize_core	:	lcPublic.o;
+text	:	.text%_XInitPublicOM	:	XsunSL.o;
+text	:	.text%_XInitPublicIM	:	XsunSL.o;
+text	:	.text%load_public	:	lcPublic.o;
+text	:	.text%_XlcCreateLocaleDataBase	:	lcDB.o;
+text	:	.text%_XlcFileName	:	lcFile.o;
+text	:	.text%lowercase	:	lcFile.o;
+text	:	.text%_XlcGetResource	:	lcDB.o;
+text	:	.text%_XrmDefaultInitParseInfo	:	lcRM.o;
+text	:	.text%_XlcOpenConverter	:	lcConv.o;
+text	:	.text%get_converter	:	lcConv.o;
+text	:	.text%open_strtostr	:	lcDefConv.o;
+text	:	.text%create_conv	:	lcDefConv.o;
+text	:	.text%GetDatabase	:	Xrm.o;
+text	:	.text%mbinit	:	lcRM.o;
+text	:	.text%_XlcResetConverter	:	lcConv.o;
+text	:	.text%mbfinish	:	lcRM.o;
+text	:	.text%XrmParseCommand	:	ParseCmd.o;
+text	:	.text%XrmGetResource	:	Xrm.o;
+text	:	.text%XrmStringToQuarkList	:	Xrm.o;
+text	:	.text%XrmQGetResource	:	Xrm.o;
+text	:	.text%XrmGetFileDatabase	:	Xrm.o;
+text	:	.text%ReadInFile	:	Xrm.o;
+text	:	.text%PutEntry	:	Xrm.o;
+text	:	.text%GrowTable	:	Xrm.o;
+text	:	.text%MoveValues	:	Xrm.o;
+text	:	.text%XrmDestroyDatabase	:	Xrm.o;
+text	:	.text%destroy	:	lcRM.o;
+text	:	.text%_XlcCloseConverter	:	lcConv.o;
+text	:	.text%close_converter	:	lcConv.o;
+text	:	.text%close_converter	:	lcDefConv.o;
+text	:	.text%_XCloseLC	:	lcWrap.o;
+text	:	.text%GetNEntry	:	Xrm.o;
+text	:	.text%GetVEntry	:	Xrm.o;
+text	:	.text%GetLooseVEntry	:	Xrm.o;
+text	:	.text%XSetAuthorization	:	ConnDis.o;
+text	:	.text%XOpenDisplay	:	OpenDis.o;
+text	:	.text%XSetErrorHandler	:	ErrHndlr.o;
+text	:	.text%XSetIOErrorHandler	:	ErrHndlr.o;
+text	:	.text%_X11TransConnectDisplay	:	ConnDis.o;
+text	:	.text%copystring	:	ConnDis.o;
+text	:	.text%_X11TransOpenCOTSClient	:	x11trans.o;
+text	:	.text%_X11TransOpen	:	x11trans.o;
+text	:	.text%_X11TransParseAddress	:	x11trans.o;
+text	:	.text%_X11TransGetHostname	:	x11trans.o;
+text	:	.text%_X11TransSelectTransport	:	x11trans.o;
+text	:	.text%_X11TransSocketOpenCOTSClient	:	x11trans.o;
+text	:	.text%_X11TransSocketSelectFamily	:	x11trans.o;
+text	:	.text%_X11TransSocketOpen	:	x11trans.o;
+text	:	.text%_X11TransConnect	:	x11trans.o;
+text	:	.text%_X11TransSocketPIPEConnect	:	x11trans.o;
+text	:	.text%_X11TransGetPeerAddr	:	x11trans.o;
+text	:	.text%_X11TransConvertAddress	:	x11trans.o;
+text	:	.text%_X11TransSetOption	:	x11trans.o;
+text	:	.text%GetAuthorization	:	ConnDis.o;
+text	:	.text%_X11TransGetConnectionNumber	:	x11trans.o;
+text	:	.text%AddToDisplayLink	:	OpenDis.o;
+text	:	.text%_XPollfdCacheInit	:	XlibInt.o;
+text	:	.text%_XSendClientPrefix	:	ConnDis.o;
+text	:	.text%_X11TransWritev	:	x11trans.o;
+text	:	.text%_X11TransSocketWritev	:	x11trans.o;
+text	:	.text%_XRead	:	XlibInt.o;
+text	:	.text%_X11TransRead	:	x11trans.o;
+text	:	.text%_X11TransSocketRead	:	x11trans.o;
+text	:	.text%_XWaitForReadable	:	XlibInt.o;
+text	:	.text%_XVIDtoVisual	:	XlibInt.o;
+text	:	.text%XCreateGC	:	CrGC.o;
+text	:	.text%_XUpdateGCCache	:	CrGC.o;
+text	:	.text%_XAllocID	:	XlibInt.o;
+text	:	.text%_XGenerateGCList	:	CrGC.o;
+text	:	.text%XSynchronize	:	Synchro.o;
+text	:	.text%_XReply	:	XlibInt.o;
+text	:	.text%_XFlushInt	:	XlibInt.o;
+text	:	.text%_X11TransWrite	:	x11trans.o;
+text	:	.text%_X11TransSocketWrite	:	x11trans.o;
+text	:	.text%_XAsyncReply	:	XlibInt.o;
+text	:	.text%_XSetLastRequestRead	:	XlibInt.o;
+text	:	.text%_XBigReqHandler	:	OpenDis.o;
+text	:	.text%_XGetAsyncReply	:	XlibAsync.o;
+text	:	.text%XkbUseExtension	:	XKBUse.o;
+text	:	.text%XInitExtension	:	InitExt.o;
+text	:	.text%XQueryExtension	:	QuExt.o;
+text	:	.text%_XSend	:	XlibInt.o;
+text	:	.text%XESetCloseDisplay	:	InitExt.o;
+text	:	.text%XLookupExtension	:	InitExt.o;
+text	:	.text%XESetErrorString	:	InitExt.o;
+text	:	.text%XSetWindowBackground	:	Backgnd.o;
+text	:	.text%XClearWindow	:	Clear.o;
+text	:	.text%XFlush	:	Flush.o;
+text	:	.text%_XFlush	:	XlibInt.o;
+text	:	.text%XUndefineCursor	:	UndefCurs.o;
+text	:	.text%XQueryBestCursor	:	QuCurShp.o;
+text	:	.text%XCreateBitmapFromData	:	CrBFData.o;
+text	:	.text%XCreatePixmap	:	CrPixmap.o;
+text	:	.text%XPutImage	:	PutImage.o;
+text	:	.text%PutSubImage	:	PutImage.o;
+text	:	.text%PutImageRequest	:	PutImage.o;
+text	:	.text%SendXYImage	:	PutImage.o;
+text	:	.text%SwapBits	:	PutImage.o;
+text	:	.text%XFreeGC	:	FreeGC.o;
+text	:	.text%_XFreeExtData	:	FreeEData.o;
+text	:	.text%XQueryColors	:	QuColors.o;
+text	:	.text%XCreatePixmapCursor	:	CrCursor.o;
+text	:	.text%XFreePixmap	:	FreePix.o;
+text	:	.text%XDefineCursor	:	DefCursor.o;
+text	:	.text%XFreeCursor	:	FreeCurs.o;
+text	:	.text%MoveTables	:	Xrm.o;
+text	:	.text%XrmPutStringResource	:	Xrm.o;
+text	:	.text%XrmStringToBindingQuarkList	:	Xrm.o;
+text	:	.text%XrmPutFileDatabase	:	Xrm.o;
+text	:	.text%XrmEnumerateDatabase	:	Xrm.o;
+text	:	.text%EnumNTable	:	Xrm.o;
+text	:	.text%EnumAllNTable	:	Xrm.o;
+text	:	.text%EnumLTable	:	Xrm.o;
+text	:	.text%DumpEntry	:	Xrm.o;
+text	:	.text%PrintBindingQuarkList	:	Xrm.o;
+text	:	.text%XrmMergeDatabases	:	Xrm.o;
+text	:	.text%XrmCombineDatabase	:	Xrm.o;
+text	:	.text%MergeTables	:	Xrm.o;
+text	:	.text%MergeValues	:	Xrm.o;
+text	:	.text%XDisplayString	:	Macros.o;
+text	:	.text%XDisplayName	:	DisName.o;
+text	:	.text%XListExtensions	:	ListExt.o;
+text	:	.text%_XReadPad	:	XlibInt.o;
+text	:	.text%_X11TransReadv	:	x11trans.o;
+text	:	.text%_X11TransSocketReadv	:	x11trans.o;
+text	:	.text%XGetVisualInfo	:	VisUtil.o;
+text	:	.text%XFree	:	XlibInt.o;
+text	:	.text%XResourceManagerString	:	Misc.o;
+text	:	.text%XMaxRequestSize	:	Misc.o;
+text	:	.text%XChangeProperty	:	ChProp.o;
+text	:	.text%XCloseDisplay	:	ClDisplay.o;
+text	:	.text%XSync	:	Sync.o;
+text	:	.text%_XDisconnectDisplay	:	ConnDis.o;
+text	:	.text%_X11TransDisconnect	:	x11trans.o;
+text	:	.text%_X11TransSocketPIPEDisconnect	:	x11trans.o;
+text	:	.text%_X11TransClose	:	x11trans.o;
+text	:	.text%_X11TransSocketPIPEClose	:	x11trans.o;
+text	:	.text%_X11TransFreeConnInfo	:	x11trans.o;
+text	:	.text%_XFreeDisplayStructure	:	OpenDis.o;
+text	:	.text%RemoveFromDisplayLink	:	OpenDis.o;
+text	:	.text%XSetFontPath	:	SetFPath.o;
+text	:	.text%XDisplayKeycodes	:	Misc.o;
+text	:	.text%XGetModifierMapping	:	ModMap.o;
+text	:	.text%XKeycodeToKeysym	:	XKBBind.o;
+text	:	.text%_XKeycodeToKeysym	:	KeyBind.o;
+text	:	.text%_XKeyInitialize	:	KeyBind.o;
+text	:	.text%XGetKeyboardMapping	:	GetPntMap.o;
+text	:	.text%InitModMap	:	KeyBind.o;
+text	:	.text%ResetModMap	:	KeyBind.o;
+text	:	.text%KeyCodetoKeySym	:	KeyBind.o;
+text	:	.text%XConvertCase	:	KeyBind.o;
+text	:	.text%XKeysymToString	:	KeysymStr.o;
+text	:	.text%XFreeModifiermap	:	ModMap.o;
+text	:	.text%XStringToKeysym	:	StrKeysym.o;
+text	:	.text%XInsertModifiermapEntry	:	ModMap.o;
+text	:	.text%XSetModifierMapping	:	ModMap.o;
+text	:	.text%XPending	:	Pending.o;
+text	:	.text%_XEventsQueued	:	XlibInt.o;
+text	:	.text%_X11TransBytesReadable	:	x11trans.o;
+text	:	.text%_X11TransSocketBytesReadable	:	x11trans.o;
+text	:	.text%_XEnq	:	XlibInt.o;
+text	:	.text%_XWireToEvent	:	XlibInt.o;
+text	:	.text%XNextEvent	:	NextEvent.o;
+text	:	.text%_XDeq	:	XlibInt.o;
+text	:	.text%XGetFontPath	:	GetFPath.o;
+text	:	.text%XFreeFontPath	:	GetFPath.o;
+text	:	.text%XCreateRegion	:	Region.o;
+text	:	.text%XrmQPutStringResource	:	Xrm.o;
+text	:	.text%XInternAtom	:	IntAtom.o;
+text	:	.text%_XInternAtom	:	IntAtom.o;
+text	:	.text%_XUpdateAtomCache	:	IntAtom.o;
+text	:	.text%XSupportsLocale	:	lcWrap.o;
+text	:	.text%_XlcCurrentLC	:	lcWrap.o;
+text	:	.text%XSetLocaleModifiers	:	lcWrap.o;
+text	:	.text%_XlcDefaultMapModifiers	:	lcWrap.o;
+text	:	.text%_XlcValidModSyntax	:	lcWrap.o;
+text	:	.text%XScreenResourceString	:	ScrResStr.o;
+text	:	.text%XGetWindowProperty	:	GetProp.o;
+text	:	.text%XrmCombineFileDatabase	:	Xrm.o;
+text	:	.text%XrmGetDatabase	:	Xrm.o;
+text	:	.text%XrmSetDatabase	:	Xrm.o;
+text	:	.text%XrmQGetSearchList	:	Xrm.o;
+text	:	.text%SearchNEntry	:	Xrm.o;
+text	:	.text%AppendLEntry	:	Xrm.o;
+text	:	.text%AppendLooseLEntry	:	Xrm.o;
+text	:	.text%XrmQGetSearchResource	:	Xrm.o;
+text	:	.text%XAddConnectionWatch	:	XlibInt.o;
+text	:	.text%DestroyNTable	:	Xrm.o;
+text	:	.text%DestroyLTable	:	Xrm.o;
+text	:	.text%XrmUniqueQuark	:	Quarks.o;
+text	:	.text%XFindContext	:	Context.o;
+text	:	.text%XESetWireToEvent	:	InitExt.o;
+text	:	.text%XESetEventToWire	:	InitExt.o;
+text	:	.text%XKeysymToKeycode	:	XKBBind.o;
+text	:	.text%_XKeysymToKeycode	:	KeyBind.o;
+text	:	.text%XSaveContext	:	Context.o;
+text	:	.text%XScreenNumberOfScreen	:	Macros.o;
+text	:	.text%XGetSelectionOwner	:	GetSOwner.o;
+text	:	.text%XCreateWindow	:	Window.o;
+text	:	.text%_XProcessWindowAttributes	:	Window.o;
+text	:	.text%XAllocSizeHints	:	PropAlloc.o;
+text	:	.text%XmbTextListToTextProperty	:	lcWrap.o;
+text	:	.text%_XmbTextListToTextProperty	:	lcTxtPr.o;
+text	:	.text%_XTextListToTextProperty	:	lcTxtPr.o;
+text	:	.text%get_buf_size	:	lcTxtPr.o;
+text	:	.text%_XlcConvert	:	lcConv.o;
+text	:	.text%strtostr	:	lcDefConv.o;
+text	:	.text%XSetWMProperties	:	WMProps.o;
+text	:	.text%_XGetHostname	:	XlibInt.o;
+text	:	.text%XSetWMName	:	SetTxtProp.o;
+text	:	.text%XSetTextProperty	:	SetTxtProp.o;
+text	:	.text%XSetWMClientMachine	:	SetTxtProp.o;
+text	:	.text%XSetWMNormalHints	:	SetNrmHint.o;
+text	:	.text%XSetWMSizeHints	:	SetNrmHint.o;
+text	:	.text%XSetWMHints	:	SetHints.o;
+text	:	.text%XSetClassHint	:	SetHints.o;
+text	:	.text%XSelectInput	:	SelInput.o;
+text	:	.text%XSetWMIconName	:	SetTxtProp.o;
+text	:	.text%XDeleteProperty	:	DelProp.o;
+text	:	.text%XCreateFontCursor	:	Cursor.o;
+text	:	.text%XLoadFont	:	LoadFont.o;
+text	:	.text%XCreateGlyphCursor	:	CrGlCur.o;
+text	:	.text%XLoadQueryFont	:	Font.o;
+text	:	.text%_XQueryFont	:	Font.o;
+text	:	.text%XCreateImage	:	ImUtil.o;
+text	:	.text%_XInitImageFuncPtrs	:	ImUtil.o;
+text	:	.text%XGetFontProperty	:	GetFProp.o;
+text	:	.text%XGetWindowAttributes	:	GetWAttrs.o;
+text	:	.text%_XWAttrsHandler	:	GetWAttrs.o;
+text	:	.text%XCreateFontSet	:	FSWrap.o;
+text	:	.text%XOpenOM	:	OMWrap.o;
+text	:	.text%_XDefaultOpenOM	:	XSunOMIF.o;
+text	:	.text%_XlcCompileResourceList	:	lcWrap.o;
+text	:	.text%init_om	:	XSunOMIF.o;
+text	:	.text%add_data	:	XSunOMIF.o;
+text	:	.text%XCreateOC	:	OCWrap.o;
+text	:	.text%_XlcCountVaList	:	lcWrap.o;
+text	:	.text%_XlcVaToArgList	:	lcWrap.o;
+text	:	.text%create_oc	:	XSunOMIF.o;
+text	:	.text%_XlcSetValues	:	lcWrap.o;
+text	:	.text%_XlcCopyFromArg	:	lcWrap.o;
+text	:	.text%create_fontset	:	XSunOMIF.o;
+text	:	.text%init_fontset	:	XSunOMIF.o;
+text	:	.text%parse_fontname	:	XSunOMIF.o;
+text	:	.text%_XParseBaseFontNameList	:	FSWrap.o;
+text	:	.text%get_font_name	:	XSunOMIF.o;
+text	:	.text%XListFonts	:	FontNames.o;
+text	:	.text%XFreeFontNames	:	FontNames.o;
+text	:	.text%XFreeStringList	:	TextToStr.o;
+text	:	.text%load_font	:	XSunOMIF.o;
+text	:	.text%init_core_part	:	XSunOMIF.o;
+text	:	.text%set_fontset_extents	:	XSunOMIF.o;
+text	:	.text%set_missing_list	:	XSunOMIF.o;
+text	:	.text%copy_string_list	:	FSWrap.o;
+text	:	.text%XAllocNamedColor	:	GetColor.o;
+text	:	.text%XcmsCCCOfColormap	:	cmsCmap.o;
+text	:	.text%CmapRecForColormap	:	cmsCmap.o;
+text	:	.text%_XcmsAddCmapRec	:	cmsCmap.o;
+text	:	.text%XcmsCreateCCC	:	CCC.o;
+text	:	.text%XcmsDefaultCCC	:	CCC.o;
+text	:	.text%_XcmsInitDefaultCCCs	:	cmsInt.o;
+text	:	.text%_XcmsInitScrnInfo	:	cmsInt.o;
+text	:	.text%LINEAR_RGB_InitSCCData	:	LRGB.o;
+text	:	.text%_XcmsGetProperty	:	cmsProp.o;
+text	:	.text%_XcmsLRGB_InitScrnDefault	:	LRGB.o;
+text	:	.text%_XcmsGetIntensityMap	:	cmsInt.o;
+text	:	.text%_XcmsResolveColorString	:	cmsColNm.o;
+text	:	.text%_XcmsParseColorString	:	cmsColNm.o;
+text	:	.text%_XcmsCopyISOLatin1Lowered	:	cmsColNm.o;
+text	:	.text%_XcmsColorSpaceOfString	:	cmsColNm.o;
+text	:	.text%XcmsLRGB_RGB_ParseString	:	LRGB.o;
+text	:	.text%_XcmsRGB_to_XColor	:	XRGB.o;
+text	:	.text%XAllocColor	:	GetHColor.o;
+text	:	.text%_XInitKeysymDB	:	StrKeysym.o;
+text	:	.text%_XcmsLookupColorName	:	cmsColNm.o;
+text	:	.text%LoadColornameDB	:	cmsColNm.o;
+text	:	.text%stringSectionSize	:	cmsColNm.o;
+text	:	.text%field2	:	cmsColNm.o;
+text	:	.text%ReadColornameDB	:	cmsColNm.o;
+text	:	.text%RemoveSpaces	:	cmsColNm.o;
+text	:	.text%FirstCmp	:	cmsColNm.o;
+text	:	.text%SetNoVisit	:	cmsColNm.o;
+text	:	.text%XQueryColor	:	QuColor.o;
+text	:	.text%XGetGCValues	:	GetGCVals.o;
+text	:	.text%XScreenOfDisplay	:	Macros.o;
+text	:	.text%XDisplayOfScreen	:	Macros.o;
+text	:	.text%XDefaultColormapOfScreen	:	Macros.o;
+text	:	.text%XParseColor	:	ParseCol.o;
+text	:	.text%_XGetBitsPerPixel	:	ImUtil.o;
+text	:	.text%SendZImage	:	PutImage.o;
+text	:	.text%_XAllocScratch	:	XlibInt.o;
+text	:	.text%NoSwap	:	PutImage.o;
+text	:	.text%XGetGeometry	:	GetGeom.o;
+text	:	.text%XDeleteContext	:	Context.o;
+text	:	.text%XmbTextExtents	:	mbWrap.o;
+text	:	.text%_XmbDefaultTextExtents	:	XSunOMIF.o;
+text	:	.text%XTextExtents	:	TextExt.o;
+text	:	.text%XFontsOfFontSet	:	FSWrap.o;
+text	:	.text%XExtentsOfFontSet	:	FSWrap.o;
+text	:	.text%XOpenIM	:	IMWrap.o;
+text	:	.text%_XDefaultOpenIM	:	XSunIMIF.o;
+text	:	.text%open_indirect_converter	:	lcConv.o;
+text	:	.text%open_cttocs	:	lcCT.o;
+text	:	.text%create_conv	:	lcCT.o;
+text	:	.text%init_state	:	lcCT.o;
+text	:	.text%open_cstostr	:	lcDefConv.o;
+text	:	.text%open_strtowcs	:	lcDefConv.o;
+text	:	.text%XGetIMValues	:	ICWrap.o;
+text	:	.text%_XIMCountVaList	:	ICWrap.o;
+text	:	.text%_XIMVaToNestedList	:	ICWrap.o;
+text	:	.text%_GetIMValues	:	XSunIMIF.o;
+text	:	.text%XmbTextEscapement	:	mbWrap.o;
+text	:	.text%_XmbDefaultTextEscapement	:	XSunOMIF.o;
+text	:	.text%XTextWidth	:	TextExt.o;
+text	:	.text%XVaCreateNestedList	:	ICWrap.o;
+text	:	.text%XCreateIC	:	ICWrap.o;
+text	:	.text%_XIMCountNestedList	:	ICWrap.o;
+text	:	.text%_XIMNestedListToNestedList	:	ICWrap.o;
+text	:	.text%_CreateIC	:	XSunIMIF.o;
+text	:	.text%_SetICValueData	:	XSunIMIF.o;
+text	:	.text%XSetCloseDownMode	:	ChClMode.o;
+text	:	.text%XMapWindow	:	MapWindow.o;
+text	:	.text%_XFreeAtomTable	:	IntAtom.o;
+text	:	.text%XUngrabServer	:	UngrabSvr.o;
+text	:	.text%XChangeGC	:	ChGC.o;
+text	:	.text%_XFlushGCCache	:	CrGC.o;
+text	:	.text%XGrabKeyboard	:	GrKeybd.o;
+text	:	.text%XGetPointerMapping	:	GetPntMap.o;
+text	:	.text%XClearArea	:	ClearArea.o;
+text	:	.text%XConfigureWindow	:	ReconfWin.o;
+text	:	.text%XDrawSegments	:	DrSegs.o;
+text	:	.text%XFillRectangle	:	FillRct.o;
+text	:	.text%XFillRectangles	:	FillRcts.o;
+text	:	.text%XGetInputFocus	:	GetIFocus.o;
+text	:	.text%XSetClipMask	:	SetClMask.o;
+text	:	.text%XDrawArc	:	DrArc.o;
+text	:	.text%XFillArc	:	FillArc.o;
+text	:	.text%XSetTransientForHint	:	SetHints.o;
+text	:	.text%XMapSubwindows	:	MapSubs.o;
+text	:	.text%XListDepths	:	Depths.o;
+text	:	.text%XCopyArea	:	CopyArea.o;
+text	:	.text%XGetKeyboardControl	:	GetKCnt.o;
+text	:	.text%XChangeKeyboardControl	:	ChKeyCon.o;
+text	:	.text%XRaiseWindow	:	RaiseWin.o;
+text	:	.text%XUnmapWindow	:	UnmapWin.o;
+text	:	.text%XMapRaised	:	MapRaised.o;
+text	:	.text%XSetClipRectangles	:	SetCRects.o;
+text	:	.text%_XSetClipRectangles	:	SetCRects.o;
+text	:	.text%XSetTSOrigin	:	SetTSOrig.o;
+text	:	.text%XCheckWindowEvent	:	ChkWinEv.o;
+text	:	.text%XInternAtoms	:	IntAtom.o;
+text	:	.text%_XIntAtomHandler	:	IntAtom.o;
+text	:	.text%XNextRequest	:	Macros.o;
+text	:	.text%XSetSelectionOwner	:	SetSOwner.o;
+text	:	.text%XUngrabKeyboard	:	UngrabKbd.o;
+text	:	.text%XEventsQueued	:	Pending.o;
+text	:	.text%XFilterEvent	:	FilterEv.o;
+text	:	.text%XGrabKey	:	GrKey.o;
+text	:	.text%XUnionRectWithRegion	:	Region.o;
+text	:	.text%XUnionRegion	:	Region.o;
+text	:	.text%miRegionCopy	:	Region.o;
+text	:	.text%miRegionOp	:	Region.o;
+text	:	.text%miUnionNonO	:	Region.o;
+text	:	.text%miCoalesce	:	Region.o;
+text	:	.text%miUnionO	:	Region.o;
+text	:	.text%XCheckIfEvent	:	ChkIfEv.o;
+text	:	.text%XClipBox	:	Region.o;
+text	:	.text%XIntersectRegion	:	Region.o;
+text	:	.text%miSetExtents	:	Region.o;
+text	:	.text%XRectInRegion	:	Region.o;
+text	:	.text%XmbDrawString	:	mbWrap.o;
+text	:	.text%_XmbDefaultDrawString	:	XSunOMIF.o;
+text	:	.text%XSetFont	:	SetFont.o;
+text	:	.text%XDrawString	:	Text.o;
+text	:	.text%XEmptyRegion	:	Region.o;
+text	:	.text%XSetInputFocus	:	SetIFocus.o;
+text	:	.text%XPeekEvent	:	PeekEvent.o;
+text	:	.text%XQueryPointer	:	QuPntr.o;
+text	:	.text%XFreeExtensionList	:	ListExt.o;
+text	:	.text%XWarpPointer	:	WarpPtr.o;
+text	:	.text%XLookupString	:	XKBBind.o;
+text	:	.text%_XLookupString	:	KeyBind.o;
+text	:	.text%_XTranslateKey	:	KeyBind.o;
+text	:	.text%_XTranslateKeySym	:	KeyBind.o;
+text	:	.text%HandleComposeSequence	:	KeyBind.o;
+text	:	.text%XFreeColors	:	FreeCols.o;
+text	:	.text%XDestroyRegion	:	Region.o;
+text	:	.text%XFreeFont	:	Font.o;
+text	:	.text%XFreeFontSet	:	FSWrap.o;
+text	:	.text%XCloseOM	:	OMWrap.o;
+text	:	.text%destroy_oc	:	XSunOMIF.o;
+text	:	.text%close_om	:	XSunOMIF.o;
+text	:	.text%XUnloadFont	:	UnldFont.o;
+text	:	.text%_XcmsFreeClientCmaps	:	cmsCmap.o;
+text	:	.text%XcmsFreeCCC	:	CCC.o;
+text	:	.text%_XcmsFreeDefaultCCCs	:	cmsInt.o;
+text	:	.text%LINEAR_RGB_FreeSCCData	:	LRGB.o;
+text	:	.text%_XFreeContextDB	:	Context.o;
+text	:	.text%XGetRGBColormaps	:	GetRGBCMap.o;
+text	:	.text%XVisualIDFromVisual	:	Misc.o;
+text	:	.text%XCreateColormap	:	CrCmap.o;
+text	:	.text%GetIncludeFile	:	Xrm.o;
+text	:	.text%XDefaultScreen	:	Macros.o;
+text	:	.text%XDisplayWidth	:	Macros.o;
+text	:	.text%XDisplayHeight	:	Macros.o;
+text	:	.text%XDefaultVisual	:	Macros.o;
+text	:	.text%XDefaultDepth	:	Macros.o;
+text	:	.text%XDefaultColormap	:	Macros.o;
+text	:	.text%XCreateSimpleWindow	:	CrWindow.o;
+text	:	.text%XChangeWindowAttributes	:	ChWAttrs.o;
+text	:	.text%XCheckTypedEvent	:	ChkTypEv.o;
+text	:	.text%XSetWindowColormap	:	ChCmap.o;
+text	:	.text%XStoreColors	:	StColors.o;
+text	:	.text%XStoreNamedColor	:	StNColor.o;
+text	:	.text%XInstallColormap	:	InsCmap.o;
+text	:	.text%XmbDrawImageString	:	mbWrap.o;
+text	:	.text%_XmbDefaultDrawImageString	:	XSunOMIF.o;
+text	:	.text%XDrawImageString	:	ImText.o;
+text	:	.text%XSetLineAttributes	:	SetLStyle.o;
+text	:	.text%XDrawLine	:	DrLine.o;
+text	:	.text%XGrabServer	:	GrServer.o;
+text	:	.text%XRootWindow	:	Macros.o;
+text	:	.text%XConvertSelection	:	ConvSel.o;
+text	:	.text%XDisplayPlanes	:	Macros.o;
+text	:	.text%XAllocColorCells	:	AllCells.o;
+text	:	.text%XBlackPixel	:	Macros.o;
+text	:	.text%XSendEvent	:	SendEvent.o;
+text	:	.text%_XEventToWire	:	EvToWire.o;
+text	:	.text%XrmPutResource	:	Xrm.o;
+text	:	.text%XWhitePixel	:	Macros.o;
+text	:	.text%XGrabPointer	:	GrPointer.o;
+text	:	.text%XGetScreenSaver	:	GetSSaver.o;
+text	:	.text%XSetScreenSaver	:	SetSSaver.o;
+text	:	.text%_XDestroyImage	:	ImUtil.o;
+text	:	.text%XSetForeground	:	SetFore.o;
+text	:	.text%XSetStipple	:	SetStip.o;
+text	:	.text%XSetFillStyle	:	GCMisc.o;
+text	:	.text%CIEXYZ_ParseString	:	XYZ.o;
+text	:	.text%_XcmsCIEXYZ_ValidSpec	:	XYZ.o;
+text	:	.text%_XcmsDDConvertColors	:	CvCols.o;
+text	:	.text%ValidDDColorSpaceID	:	CvCols.o;
+text	:	.text%ColorSpaceOfID	:	CvCols.o;
+text	:	.text%XcmsCIEXYZToRGBi	:	LRGB.o;
+text	:	.text%_XcmsMatVec	:	LRGB.o;
+text	:	.text%XcmsRGBiToRGB	:	LRGB.o;
+text	:	.text%_XcmsTableSearch	:	LRGB.o;
+text	:	.text%_XcmsIntensityCmp	:	LRGB.o;
+text	:	.text%_XcmsIntensityInterpolation	:	LRGB.o;
+text	:	.text%XSetIconSizes	:	SetHints.o;
+text	:	.text%XQueryTree	:	QuTree.o;
+text	:	.text%XGetWMHints	:	GetHints.o;
+text	:	.text%XListProperties	:	LiProps.o;
+text	:	.text%XChangeSaveSet	:	ChSaveSet.o;
+text	:	.text%XReparentWindow	:	RepWindow.o;
+text	:	.text%XGrabButton	:	GrButton.o;
+text	:	.text%_XError	:	XlibInt.o;
+text	:	.text%XDestroyWindow	:	DestWind.o;
+text	:	.text%XLowerWindow	:	LowerWin.o;
+text	:	.text%XParseGeometry	:	ParseGeom.o;
+text	:	.text%ReadInteger	:	ParseGeom.o;
+text	:	.text%XWMGeometry	:	WMGeom.o;
+text	:	.text%_GeometryMaskToGravity	:	WMGeom.o;
+text	:	.text%XCheckMaskEvent	:	ChkMaskEv.o;
+text	:	.text%XGetAtomName	:	GetAtomNm.o;
+text	:	.text%_XGetAtomName	:	GetAtomNm.o;
+text	:	.text%XGetTextProperty	:	GetTxtProp.o;
+text	:	.text%XmbTextPropertyToTextList	:	lcWrap.o;
+text	:	.text%_XmbTextPropertyToTextList	:	lcPrTxt.o;
+text	:	.text%_XTextPropertyToTextList	:	lcPrTxt.o;
+text	:	.text%alloc_list	:	lcPrTxt.o;
+text	:	.text%copy_list	:	lcPrTxt.o;
+text	:	.text%XGetDefault	:	GetDflt.o;
+text	:	.text%XMoveWindow	:	MoveWin.o;
+text	:	.text%XGetWMNormalHints	:	GetNrmHint.o;
+text	:	.text%XGetWMSizeHints	:	GetNrmHint.o;
+text	:	.text%XUngrabPointer	:	UngrabPtr.o;
+text	:	.text%XSetClipOrigin	:	SetClOrig.o;
+text	:	.text%XGetClassHint	:	GetHints.o;
+text	:	.text%XCopyPlane	:	CopyPlane.o;
+text	:	.text%XGetWMIconName	:	GetTxtProp.o;
+text	:	.text%XFillPolygon	:	FillPoly.o;
+text	:	.text%XDrawLines	:	DrLines.o;
+text	:	.text%XUngrabButton	:	UngrabBut.o;
+text	:	.text%XSetCommand	:	SetHints.o;
+text	:	.text%XReadBitmapFileData	:	RdBitF.o;
+text	:	.text%initHexTable	:	RdBitF.o;
+text	:	.text%NextInt	:	RdBitF.o;
+text	:	.text%XReadBitmapFile	:	RdBitF.o;
+text	:	.text%XGetImage	:	GetImage.o;
+text	:	.text%_XGetScanlinePad	:	ImUtil.o;
+text	:	.text%XGetWMName	:	GetTxtProp.o;
+text	:	.text%XTranslateCoordinates	:	TrCoords.o;
+text	:	.text%XAllowEvents	:	AllowEv.o;
+text	:	.text%XWithdrawWindow	:	Withdraw.o;
+text	:	.text%XScreenCount	:	Macros.o;
+text	:	.text%XGetTransientForHint	:	GetHints.o;
+text	:	.text%XMoveResizeWindow	:	ConfWind.o;
+text	:	.text%XCheckTypedWindowEvent	:	ChkTypWEv.o;
+text	:	.text%XRemoveFromSaveSet	:	ChSaveSet.o;
+text	:	.text%check_charset	:	XSunOMIF.o;
+text	:	.text%_XlcCompareISOLatin1	:	lcUtil.o;
+text	:	.text%XRecolorCursor	:	RecolorC.o;
+text	:	.text%XGetCommand	:	GetHints.o;
+text	:	.text%XTextPropertyToStringList	:	TextToStr.o;
+text	:	.text%XSetSubwindowMode	:	GCMisc.o;
+text	:	.text%XRootWindowOfScreen	:	Macros.o;
+text	:	.text%XGetIconSizes	:	GetHints.o;
+text	:	.text%XDrawRectangle	:	DrRect.o;
+text	:	.text%XMatchVisualInfo	:	VisUtil.o;
+text	:	.text%XResizeWindow	:	ChWindow.o;
+text	:	.text%XPutBackEvent	:	PutBEvent.o;
+text	:	.text%XUngrabKey	:	UngrabKey.o;
+text	:	.text%XSubtractRegion	:	Region.o;
+text	:	.text%miIntersectO	:	Region.o;
+text	:	.text%XPointInRegion	:	Region.o;
+text	:	.text%miSubtractO	:	Region.o;
+text	:	.text%Ones	:	GetImage.o;
+text	:	.text%_XGetPixel1	:	ImUtil.o;
+text	:	.text%XCreatePixmapFromBitmapData	:	CrPFBData.o;
+text	:	.text%XChangeActivePointerGrab	:	ChActPGb.o;
+text	:	.text%XOffsetRegion	:	Region.o;
+text	:	.text%miSubtractNonO1	:	Region.o;
+text	:	.text%XSetRegion	:	Region.o;
+text	:	.text%_XAllocTemp	:	XlibInt.o;
+text	:	.text%_XFreeTemp	:	XlibInt.o;
+text	:	.text%XWidthOfScreen	:	Macros.o;
+text	:	.text%XHeightOfScreen	:	Macros.o;
+text	:	.text%XStringListToTextProperty	:	StrToText.o;
+text	:	.text%XSetFunction	:	SetFunc.o;
+text	:	.text%XDefaultScreenOfDisplay	:	Macros.o;
+text	:	.text%XBell	:	Bell.o;
+text	:	.text%indirect_convert	:	lcConv.o;
+text	:	.text%cttocs	:	lcCT.o;
+text	:	.text%cstostr	:	lcDefConv.o;
+text	:	.text%close_indirect_converter	:	lcConv.o;
+text	:	.text%close_converter	:	lcCT.o;
+text	:	.text%ResizeTable	:	Context.o;
+text	:	.text%XInitThreads	:	locking.o;
+text	:	.text%InitDisplayArrayLock	:	OpenDis.o;
+text	:	.text%_XInitDisplayLock	:	locking.o;
+text	:	.text%_XLockMutex	:	locking.o;
+text	:	.text%_XUnlockMutex	:	locking.o;
+text	:	.text%_XLockDisplay	:	locking.o;
+text	:	.text%_XPushReader	:	locking.o;
+text	:	.text%_XCreateCVL	:	locking.o;
+text	:	.text%_XPopReader	:	locking.o;
+text	:	.text%_XUnlockDisplay	:	locking.o;
+text	:	.text%_XConditionBroadcast	:	locking.o;
+text	:	.text%_XFreeDisplayLock	:	locking.o;
+text	:	.text%_XCreateMutex	:	locking.o;
+text	:	.text%XSetWMColormapWindows	:	SetWMCMapW.o;
+text	:	.text%XRestackWindows	:	RestackWs.o;
+text	:	.text%_XInternalLockDisplay	:	locking.o;
+text	:	.text%XESetError	:	InitExt.o;
+text	:	.text%XGContextFromGC	:	CrGC.o;
+text	:	.text%_XWaitForWritable	:	XlibInt.o;
+text	:	.text%XFreeColormap	:	FreeCmap.o;
+text	:	.text%_XcmsDeleteCmapRec	:	cmsCmap.o;
+text	:	.text%_XIOError	:	XlibInt.o;
+