Update to libX11 1.1.4. I've carefully checked that there's no API/ABI

change in this version. Only small bug fixes, manual page fixes and
some more data in the i18n tables.

lib/libX11/ChangeLog

@@ -1,3 +1,456 @@
+commit 8e085971dc661da9f80ff6b67747459c0fb15c08
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Thu Feb 28 20:17:41 2008 -0800
+
+    Man page typo fixes
+
+commit 1a1a42a3ca1dfaf42f1094936b71c140fc030fcb
+Author: Søren Sandmann Pedersen <sandmann@redhat.com>
+Date:   Sun Feb 24 20:03:35 2008 -0500
+
+    XIM: Fix a hand when switching input context.
+    
+    Red Hat bug #201284.
+
+commit e02e4ccafcaf3eb8993152dfcbfbee0240ea2db2
+Author: Adam Jackson <ajax@redhat.com>
+Date:   Sun Feb 24 20:00:43 2008 -0500
+
+    Bug #14029: Don't LockDisplay() recursively.
+    
+    See also Red Hat bugzilla #326461.
+
+commit e5892467ae3308c8651be76e06db322dcbc08522
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Fri Feb 15 17:27:53 2008 -0800
+
+    Add support for building lint library with --enable-lint-library
+
+commit e3eb83ec6a9bffa63cdffd94f077c12f85ad7240
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Mon Feb 11 20:11:43 2008 -0800
+
+    Spell out number in XkbGetKeyVirtualModMap man page to avoid cpp errors from #
+
+commit d5ceed7a73a6b61758ddb6ff4e194955fbd5c185
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Fri Feb 8 16:46:46 2008 -0800
+
+    Add WM_LOCALE_NAME to list of properties set in XSetWMProperties comment
+
+commit 416a812200f24d19149dcc497e5c51a0608120f6
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Fri Feb 8 15:31:31 2008 -0800
+
+    XErrorDB updates for Render 0.9 & XFixes 4.0
+
+commit 16a76091cd632e5a3708e235ff864b58f3e4613e
+Author: Kim Woelders <kim@woelders.dk>
+Date:   Sat Dec 22 21:45:23 2007 +0100
+
+    Fix bs_BA entries in locale.dir.pre
+    
+    X.Org bug#13786 <http://bugs.freedesktop.org/show_bug.cgi?id=13786>
+
+commit 32115c563b87d2f37e3f9de70fbd0f4d9e424aea
+Merge: 8f0bd3f... e8d4cef...
+Author: James Cloos <cloos@jhcloos.com>
+Date:   Fri Dec 14 22:43:47 2007 -0500
+
+    Merge branch 'master' of ssh://git.freedesktop.org/git/xorg/lib/libX11
+
+commit 8f0bd3f445cbdcc67650f6e8e3baf2ed89cb3695
+Author: James Cloos <cloos@jhcloos.com>
+Date:   Fri Dec 14 22:42:59 2007 -0500
+
+    add a comment to en_US.UTF-8/Compose
+
+commit 4d6c45e60ed13d3b0fea10413873d6a74f9d6a3b
+Author: James Cloos <cloos@jhcloos.com>
+Date:   Fri Dec 14 22:40:13 2007 -0500
+
+    Add <dead_stroke> compose sequences
+    
+    The added sequences match the existing <Multi_key> <slash> sequences.
+    
+    This is related to bug #12765¹.
+    
+    1] https://bugs.freedesktop.org/show_bug.cgi?id=12765
+
+commit e8d4cefa0837afa149a10e981528b368485a9e38
+Author: Jeremy Huddleston <jeremy@yuffie.local>
+Date:   Mon Dec 10 23:00:44 2007 -0800
+
+    Added launchd support.
+
+commit 13ac80469f6958cabac596834e203bd9cb6d4c94
+Author: James Cloos <cloos@jhcloos.com>
+Date:   Wed Dec 5 20:14:03 2007 -0500
+
+    Update the currency symbols block of en_US.UTF-8/Compose.pre
+    Add XCOMM lines a la the existing NEW SHEQEL SIGN entry for
+    the KIP, TUGRIK, DRACHMA. GERMAN PENNY, PESO, GUARANI,
+    AUSTRAL, HRYVNIA and CEDI SIGNs.
+
+commit b0a8f2ec4ba698841683f8ce389f9d72e6bce53e
+Author: Anton Zinoviev <anton@lml.bas.bg>
+Date:   Wed Dec 5 19:56:03 2007 -0500
+
+    Additions to the Compose file for UTF-8
+    From bug #5371¹
+    
+    Commit 5cf5bc76642bfece7cb5b76faf414bf445f14489 left out this change
+    from those in attachment #4122².  The post³ on xorg resulted in only
+    a positive reply⁴ from Daniel, so this block is now also commited.
+    
+    1] https://bugs.freedesktop.org/show_bug.cgi?id=5371
+    2] https://bugs.freedesktop.org/attachment.cgi?id=4122
+    3] http://article.gmane.org/gmane.comp.freedesktop.xorg/20628
+    4] http://article.gmane.org/gmane.comp.freedesktop.xorg/23966
+    
+    Signed-off-by: James Cloos <cloos@jhcloos.com>
+    Acked-by:  Daniel Stone <daniel@fooishbar.org>
+
+commit 438d02ebc08ee171cf1d3936f4c81050d428ab92
+Author: James Cloos <cloos@jhcloos.com>
+Date:   Tue Dec 4 17:25:39 2007 -0500
+
+    Fix the <U\x+> keysyms in the en_US.UTF-8 Compose file
+    
+    Based on src/KeysymStr.c and src/StrKeysym.c and comments in
+    bugs #11930¹ and #5129² it is clear that <U100XXXXX> is invalid;
+    those should be in the form U plus the hex of the UCS Code Point.
+    
+    The 0x01000000 is ORed in by the code.
+    
+    This update fixes all of those.
+    
+    1] https://bugs.freedesktop.org/show_bug.cgi?id=11930
+    2] https://bugs.freedesktop.org/show_bug.cgi?id=5129
+
+commit 02e04059c89e175f51647e3b031344f743286b34
+Merge: 1254c57... b57129e...
+Author: James Cloos <cloos@jhcloos.com>
+Date:   Tue Dec 4 06:55:04 2007 -0500
+
+    Merge branch 'master' of ssh://git.freedesktop.org/git/xorg/lib/libX11
+
+commit 1254c57dd3a8d6ea87041b2f63024f99094f290f
+Author: James Cloos <cloos@jhcloos.com>
+Date:   Tue Dec 4 06:53:55 2007 -0500
+
+    Use the new dead_psili and dead_dasia keysyms added to proto/x11proto 7.0.11
+    Inspired by bug 11930¹:
+    
+    Commit 40ed4eef92e31fcf7ea0a436e1a00cdf49484c1b to x11proto added dead_psili
+    and dead_dasia keysyms.  Make use of them in the en_US.UTF-8 and el_GR.UTF-8
+    Compose files.
+    
+    This was done with a pair of perl scripts based on the one quoted in the
+    log for commit c76d30253f1483ac8200ad5c032a818907e65030.
+    
+    1] https://bugs.freedesktop.org/show_bug.cgi?id=11930
+
+commit b57129ef324c73ee91c2a796b800c4b45f4d4855
+Author: Jeremy Huddleston <jeremy@yuffie.local>
+Date:   Mon Dec 3 20:04:19 2007 -0800
+
+    Use __APPLE__ instead of __DARWIN__
+
+commit b9c032e1d5ed08510863dfb91b8bda588e6c8c9e
+Author: Jeremy Huddleston <jeremy@yuffie.local>
+Date:   Wed Nov 28 16:43:49 2007 -0800
+
+    Define __DARWIN__ when host_os == darwin* as needed in SetLocale.c
+
+commit 4b91ed099554626f1ec17d5bdf7bd77ce1a70037
+Author: Alan Coopersmith <alan.coopersmith@sun.com>
+Date:   Wed Nov 21 16:50:04 2007 -0800
+
+    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
+
+commit 2af660c2fcd15c86c66459bfc074c190ea1462e6
+Author: Jamey Sharp <jamey@minilop.net>
+Date:   Mon Oct 29 10:46:20 2007 -0700
+
+    Two threads can request sequence sync and XID fetch simultaneously.
+    
+    So don't assert that they can't.
+    
+    This makes the Xlib/XCB implementation of _XAllocID more closely
+    resemble the traditional Xlib version.
+
+commit 6e5485e0a5e3ab738becad12193e760c5fee83a4
+Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
+Date:   Sun Oct 28 04:44:00 2007 -0800
+
+    X.Org Bug #12983: Typos in ./man/XChangeKeyboardControl.man
+    
+    <http://bugs.freedesktop.org/show_bug.cgi?id=12983>
+
+commit 24527c92fd1f433ea135e85ec876a94a529fe500
+Author: Yann Droneaud <ydroneaud@mandriva.com>
+Date:   Wed Oct 24 19:26:07 2007 +0300
+
+    XIM: Properly initialise client event
+    
+    Make sure all ClientMessage fields are initialised to 0 before we send it.
+
+commit e41477f37b0d9b74a056d22dbf0073a94eecb9d6
+Author: Daniel Stone <daniel@fooishbar.org>
+Date:   Wed Oct 24 19:22:22 2007 +0300
+
+    Colours: Fix --disable-xcms
+    
+    Disable large tracts of colour management code when passing
+    --disable-xcms.
+
+commit 11ea09745efa8de7dc82fe30ebd2393f08390957
+Author: Eric Anholt <eric@anholt.net>
+Date:   Fri Aug 31 17:30:33 2007 -0700
+
+    Bug #2081: Note the range limitation of XSetScreenSaver arguments.
+
+commit 31540f1438ec63faf37044f2fd654b335ddf80f0
+Author: Kristian Høgsberg <krh@redhat.com>
+Date:   Wed Aug 29 19:50:57 2007 -0400
+
+    Add GLX 1.4 requests and errors.
+
+commit 7c996f78914c77fe17e9f4feede980d895d9df51
+Author: Eric Anholt <eric@anholt.net>
+Date:   Tue Aug 28 15:15:11 2007 -0700
+
+    Add XF86 keyboard/monitor brightness keysyms to the keysymbdb.
+
+commit fa4effe82759f864a22a2dc6c920fa72ddb175a8
+Author: Eric S. Raymond <esr@thyrsus.com>
+Date:   Sun Jan 14 10:48:00 2007 -0800
+
+    Bug #9658: Bad markup on XIfEvent.3x
+    
+    X.Org Bugzilla #9658 <https://bugs.freedesktop.org/show_bug.cgi?id=9658>
+
+commit 74cba78daa738ef4d92096107d95c1a585933666
+Author: Eric S. Raymond <esr@thyrsus.com>
+Date:   Sun Jan 14 10:43:00 2007 -0800
+
+    Bug #9655: Bad markup in XrmUniqueQuark.3x
+    
+    X.Org Bugzilla #9655 <https://bugs.freedesktop.org/show_bug.cgi?id=9655>
+
+commit 4341d1a34b2a2e460b58131b6fd81935f3355bbc
+Author: Eric S. Raymond <esr@thyrsus.com>
+Date:   Sun Jan 14 10:43:00 2007 -0800
+
+    Bug #9654: Bad markup in XrmGetFileDatabase.3x
+    
+    X.Org Bugzilla #9654 <https://bugs.freedesktop.org/show_bug.cgi?id=9654>
+
+commit 2db713252090cae08f0200fecad4fc25fb64c8b1
+Author: Eric S. Raymond <esr@thyrsus.com>
+Date:   Sun Jan 14 10:40:00 2007 -0800
+
+    Bug #9653: Bad markup in XQueryColor.3x
+    
+    X.Org Bugzilla #9653 <https://bugs.freedesktop.org/show_bug.cgi?id=9653>
+
+commit 9d3ceea4b902e0471824c1e07ad64342b9a1114e
+Author: Eric S. Raymond <esr@thyrsus.com>
+Date:   Sun Jan 14 10:40:00 2007 -0800
+
+    Bug #9652: Bad markup in XDrawArc.3x
+    
+    X.Org Bugzilla #9652 <https://bugs.freedesktop.org/show_bug.cgi?id=9652>
+
+commit 2e7e0748d353d7f53bbd65ec6bf0df8758528ddc
+Author: Eric S. Raymond <esr@thyrsus.com>
+Date:   Sun Jan 14 10:39:00 2007 -0800
+
+    Bug #9651: Bad markup in XcmsColor.3x
+    
+    X.Org Bugzilla #9651 <https://bugs.freedesktop.org/show_bug.cgi?id=9651>
+
+commit c316aaf0aab06951db9dc5c9c1148bfea835d885
+Author: Eric S. Raymond <esr@thyrsus.com>
+Date:   Sun Jan 14 10:38:00 2007 -0800
+
+    Bug #9650: Bad markup in XLoadFont.3x manual page
+    
+    X.Org Bugzilla #9650 <https://bugs.freedesktop.org/show_bug.cgi?id=9650>
+
+commit ca5d9a625ea0965853fa9e74a448b8c29c78ec95
+Author: Eric S. Raymond <esr@thyrsus.com>
+Date:   Tue Jan 2 10:18:00 2007 -0800
+
+    Bug 9523: Markup problems in XQueryExtension.3x
+    
+    X.Org Bugzilla #9523 <https://bugs.freedesktop.org/show_bug.cgi?id=9523>
+
+commit fe713c616e29ba19c179b43c18eca1035079ce18
+Author: Ian Romanick <idr@us.ibm.com>
+Date:   Tue Aug 21 14:56:33 2007 -0700
+
+    Make sure nls/am_ET.UTF-8/Makefile is created by configure.
+
+commit e3430616f26b68e1439143cbe10732f3fc329d20
+Author: Eric S. Raymond <esr@thyrsus.com>
+Date:   Tue Jan 2 08:40:00 2007 -0800
+
+    Bug #9516: Markup error in XAllocWMHints.3x
+    
+    X.Org Bugzilla #9516 <https://bugs.freedesktop.org/show_bug.cgi?id=9516>
+
+commit d8fe979fc929833e8c754aed32641786d5a0622b
+Merge: 21ca953... 4ec1723...
+Author: James Cloos <cloos@jhcloos.com>
+Date:   Mon Aug 20 15:34:50 2007 -0400
+
+    Merge branch 'master' of ssh://git.freedesktop.org/git/xorg/lib/libX11
+
+commit 21ca953337fb221b85345bf35ce1a98a0dcb2bf2
+Author: James Cloos <cloos@jhcloos.com>
+Date:   Mon Aug 20 15:34:03 2007 -0400
+
+    Fix typo
+    The code <U1000000D> was used where <U10000DC> was obviously intended.
+    
+    It is possible that <Udiaeresis> should be used instead, if that will
+    not break anyone’s setup.
+
+commit 4ec1723fff729440cd3349c1f95d87d2a6ba89cf
+Author: James Cloos <cloos@jhcloos.com>
+Date:   Mon Aug 20 15:25:48 2007 -0400
+
+    Add compose file for Ethiopic to match new keyboard in xkeyboard-config
+    From bug report:
+    
+      https://bugs.freedesktop.org/show_bug.cgi?id=11307
+
+commit eff33ae525337ce2026be135a26464c7b1237113
+Author: James Cloos <cloos@jhcloos.com>
+Date:   Sat Aug 18 17:58:23 2007 -0400
+
+    Patch for Catalan locales
+    From bugzilla bug 10943¹:
+    
+      There are several Catalan locale codes which presently can
+      be used in X11 systems; especially after they were accepted
+      in belocs-locale-data².
+    
+      In the following patches, I³ add ca_AD, ca_FR and ca_IT Catalan
+      locale codes.  For instance, without this, using ca_AD (actually
+      a quite used locale⁴) some applications (eg. Emacs or Skype)
+      cannot display Catalan diacritic marks as you type them.
+    
+    1] https://bugs.freedesktop.org/show_bug.cgi?id=10943
+    2] http://lists.debian.org/debian-devel-changes/2005/07/msg01429.html
+    3] Toni Hermoso Pulido <toniher@softcatala.org>
+    4] https://launchpad.net/~ubuntu.cat/+members
+
+commit 1f980cb7d022f53d0aee9e793b08203fb888e86e
+Author: James Cloos <cloos@jhcloos.com>
+Date:   Sat Aug 18 17:47:04 2007 -0400
+
+    Add additional Euro signs to compose
+    Inspired by bug 7419¹ make all of:
+    
+        C=, =C, c=, =c, E=, =E, e=, E=
+    
+    after <Multi_key> generate € U+20AC EURO SIGN.
+    
+    1] https://bugs.freedesktop.org/show_bug.cgi?id=7419
+
+commit 4b0a14521449dfce8b4347bd17243efd1d3eae2d
+Author: James Cloos <cloos@jhcloos.com>
+Date:   Sat Aug 18 17:29:08 2007 -0400
+
+    Compose fix for Latin-1 (from Debian)
+    The description from bugzilla bug 7417¹ is:
+    
+      We've been shipping this patch for some time in Debian now. The
+      problem description from the patch header is reproduced below. You
+      may want to note the licensing issue mentioned below, but we've been
+      shipping it because the method by which this particular patch was
+      generated and updated was also given below.
+    
+      This patch by Denis Barbier.
+    
+      The X11 protocol states that Unicode keysyms are in the range
+      0x01000100 - 0x0110FFFF.  If the result of composing characters is a
+      Unicode codepoint, X returns the corresponding Unicode keysym, which
+      is its Unicode codepoint augmented by 0x01000000.  Latin-1
+      characters must not appear with their Unicode codepoints in compose
+      files, otherwise the returned composed character lies in the range
+      0x01000000 - 0x010000FF which is not valid.
+    
+      There are two solutions: either fix composing routines to return
+      0xZZ instead of 0x010000ZZ (where Z is an hexadecimal digit), or
+      replace U00ZZ by their corresponding keysyms in compose files.  The
+      latter is more logical and less error prone, so compose files will
+      be patched.  Many applications accept these invalid Unicode keysyms,
+      but few of them don't, most notably xemacs.  Only UTF-8 locales are
+      affected.
+    
+      This has been fixed very recently in XFree86 CVS (but not xorg), but
+      for licensing reasons, this patch is not grabbed.  Instead automatic
+      conversion is performed by:
+    
+        sed -e '/XK_LATIN1/,/XK_LATIN1/!d' /usr/include/X11/keysymdef.h \
+        | grep -v deprecated | grep 0x0 \
+        | sed -e 's/0x0/U0/' -e 's/XK_//' \
+        | awk '{ printf "s/\\b%s\\b/%s/ig\n", $3, $2; }' > sedfile
+        for f in nls/*.UTF-8/Compose.pre
+        do
+          sed -f sedfile $f > $f.tmp && mv $f.tmp $f
+        done
+    
+    [I edited the quoted script to update it for the current location of
+    the installed keysymdef.h and the current layout of the libX11
+    repo. -JimC]
+    
+    I applied the script, not the patch attached to the bugreport.
+    
+    1] https://bugs.freedesktop.org/show_bug.cgi?id=7417
+
+commit 5cf5bc76642bfece7cb5b76faf414bf445f14489
+Author: James Cloos <cloos@jhcloos.com>
+Date:   Sat Aug 18 17:13:41 2007 -0400
+
+    Add some compose sequences
+    
+    Add some compose sequences from the patch in bug 5371 (attachment 4122).
+    
+    Cf:
+    
+    https://bugs.freedesktop.org/show_bug.cgi?id=5371
+    https://bugs.freedesktop.org/attachment.cgi?id=4122
+
+commit d4002e389dd69780dfc7c2f7bd3cb0c57f05d4f8
+Author: James Cloos <cloos@jhcloos.com>
+Date:   Sat Aug 18 13:57:31 2007 -0400
+
+    Fix SMP Compose targets
+    The compose targets from the SMP (plane 1) were incorrect.
+    
+    At some point the 0x10000 bit had been lost.
+
+commit f1ed3da9a30a1f0264fdc7d1c6466f27fe2a3d7d
+Author: Jeremy C. Reed <reed@glacier.reedmedia.net>
+Date:   Thu Aug 16 17:37:22 2007 -0500
+
+    Fix a mutex reference-counting bug.
+    
+    I was told that some systems have a much more permissive libpthread.
+    I was asked to commit this. This is from NetBSD's X source.
+    (I didn't receive any feedback on xorg list for over two weeks
+    about this.)
+
 commit ac00a44b4875de70382da5a40dd87f976e5b9327
 Author: Tilman Sauerbeck <tilman@code-monkey.de>
 Date:   Wed Aug 1 20:36:03 2007 +0200

lib/libX11/Makefile.in

@@ -115,6 +115,7 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -131,6 +132,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -138,6 +140,7 @@ LIBTOOL = @LIBTOOL@
 LIB_MAN_DIR = @LIB_MAN_DIR@
 LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
+LINTLIB = @LINTLIB@
 LINT_FALSE = @LINT_FALSE@
 LINT_FLAGS = @LINT_FLAGS@
 LINT_TRUE = @LINT_TRUE@
@@ -147,11 +150,14 @@ MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
 MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MANPAGES_FALSE = @MANPAGES_FALSE@
 MANPAGES_TRUE = @MANPAGES_TRUE@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 OS2_FALSE = @OS2_FALSE@
 OS2_TRUE = @OS2_TRUE@
@@ -166,6 +172,7 @@ PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -214,7 +221,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
 ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
 ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@

lib/libX11/configure.ac

@@ -3,7 +3,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([libX11],
-        1.1.3,
+        1.1.4,
         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
         libX11)
 AC_CONFIG_SRCDIR([Makefile.am])
@@ -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
@@ -144,6 +148,17 @@ AC_SUBST(WCHAR32)
 
 AM_CONDITIONAL(OS2, test x$os2 = xtrue)
 
+AC_ARG_WITH(launchd, AS_HELP_STRING([--with-launchd], [Build with support for Apple's launchd (default: auto)]), [LAUNCHD=$withval], [LAUNCHD=auto])
+if test "x$LAUNCHD" = xauto; then
+	unset LAUNCHD
+	AC_CHECK_PROG(LAUNCHD, [launchd], [yes], [no])
+fi
+
+if test "x$LAUNCHD" = xyes ; then
+	AC_DEFINE(HAVE_LAUNCHD, 1, [launchd support available])
+	AC_DEFINE(TRANS_REOPEN, 1, [launchd support available])
+fi
+
 AC_ARG_ENABLE(xthreads,
               AC_HELP_STRING([--disable-xthreads],
                 [Disable Xlib support for Multithreading]),
@@ -320,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
@@ -346,6 +362,7 @@ AC_DEFINE_DIR(X11_LIBDIR, X11_LIBDIR, [Location of libX11 library data])
 AC_SUBST(X11_LIBDIR)
 
 X11_CFLAGS="$X11_CFLAGS $XPROTO_CFLAGS"
+
 AC_SUBST(X11_CFLAGS)
 AC_SUBST(X11_LIBS)
 
@@ -399,6 +416,7 @@ AC_OUTPUT([Makefile
 	   modules/om/generic/Makefile
 	   src/xkb/Makefile
 	   nls/Makefile
+	   nls/am_ET.UTF-8/Makefile
 	   nls/armscii-8/Makefile
 	   nls/C/Makefile
 	   nls/el_GR.UTF-8/Makefile

lib/libX11/include/Makefile.in

@@ -97,6 +97,7 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -113,6 +114,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -120,6 +122,7 @@ LIBTOOL = @LIBTOOL@
 LIB_MAN_DIR = @LIB_MAN_DIR@
 LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
+LINTLIB = @LINTLIB@
 LINT_FALSE = @LINT_FALSE@
 LINT_FLAGS = @LINT_FLAGS@
 LINT_TRUE = @LINT_TRUE@
@@ -129,11 +132,14 @@ MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
 MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MANPAGES_FALSE = @MANPAGES_FALSE@
 MANPAGES_TRUE = @MANPAGES_TRUE@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 OS2_FALSE = @OS2_FALSE@
 OS2_TRUE = @OS2_TRUE@
@@ -148,6 +154,7 @@ PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -196,7 +203,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
 ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
 ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@

lib/libX11/ltmain.sh

@@ -1,8 +1,8 @@
 # ltmain.sh - Provide generalized library-building support services.
 # NOTE: Changing this file will not affect anything until you rerun configure.
 #
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
+# 2007, 2008  Free Software Foundation, Inc.
 # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 #
 # This program is free software; you can redistribute it and/or modify
@@ -43,14 +43,22 @@ EXIT_FAILURE=1
 
 PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION=1.5.22
-TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
+VERSION=1.5.26
+TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
 
-# See if we are running on zsh, and set the options which allow our
-# commands through without removal of \ escapes.
-if test -n "${ZSH_VERSION+set}" ; then
+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
 fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
 
 # Check that we have a working $echo.
 if test "X$1" = X--no-reexec; then
@@ -105,11 +113,19 @@ esac
 # These must not be set unconditionally because not all systems understand
 # e.g. LANG=C (notably SCO).
 # We save the old values to restore during execute mode.
-if test "${LC_ALL+set}" = set; then
-  save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
-fi
-if test "${LANG+set}" = set; then
-  save_LANG="$LANG"; LANG=C; export LANG
+lt_env=
+for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+do
+  eval "if test \"\${$lt_var+set}\" = set; then
+	  save_$lt_var=\$$lt_var
+	  lt_env=\"$lt_var=\$$lt_var \$lt_env\"
+	  $lt_var=C
+	  export $lt_var
+	fi"
+done
+
+if test -n "$lt_env"; then
+  lt_env="env $lt_env"
 fi
 
 # Make sure IFS has a sensible default
@@ -136,6 +152,8 @@ duplicate_deps=no
 preserve_args=
 lo2o="s/\\.lo\$/.${objext}/"
 o2lo="s/\\.${objext}\$/.lo/"
+extracted_archives=
+extracted_serial=0
 
 #####################################
 # Shell function definitions:
@@ -196,7 +214,13 @@ func_win32_libid ()
     if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
       $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
       win32_nmres=`eval $NM -f posix -A $1 | \
-	$SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'`
+	$SED -n -e '1,100{
+		/ I /{
+			s,.*,import,
+			p
+			q
+			}
+		}'`
       case $win32_nmres in
       import*)  win32_libid_type="x86 archive import";;
       *)        win32_libid_type="x86 archive static";;
@@ -327,7 +351,17 @@ func_extract_archives ()
 	*) my_xabs=`pwd`"/$my_xlib" ;;
       esac
       my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
-      my_xdir="$my_gentop/$my_xlib"
+      my_xlib_u=$my_xlib
+      while :; do
+        case " $extracted_archives " in
+	*" $my_xlib_u "*)
+	  extracted_serial=`expr $extracted_serial + 1`
+	  my_xlib_u=lt$extracted_serial-$my_xlib ;;
+	*) break ;;
+	esac
+      done
+      extracted_archives="$extracted_archives $my_xlib_u"
+      my_xdir="$my_gentop/$my_xlib_u"
 
       $show "${rm}r $my_xdir"
       $run ${rm}r "$my_xdir"
@@ -454,11 +488,12 @@ do
     ;;
 
   --version)
-    $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
-    $echo
-    $echo "Copyright (C) 2005  Free Software Foundation, Inc."
-    $echo "This is free software; see the source for copying conditions.  There is NO"
-    $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+    echo "\
+$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
+
+Copyright (C) 2008  Free Software Foundation, Inc.
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
     exit $?
     ;;
 
@@ -755,9 +790,11 @@ if test -z "$show_help"; then
     *.class) xform=class ;;
     *.cpp) xform=cpp ;;
     *.cxx) xform=cxx ;;
-    *.f90) xform=f90 ;;
+    *.[fF][09]?) xform=[fF][09]. ;;
     *.for) xform=for ;;
     *.java) xform=java ;;
+    *.obj) xform=obj ;;
+    *.sx) xform=sx ;;
     esac
 
     libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
@@ -926,7 +963,7 @@ EOF
       $run $rm "$lobj" "$output_obj"
 
       $show "$command"
-      if $run eval "$command"; then :
+      if $run eval $lt_env "$command"; then :
       else
 	test -n "$output_obj" && $run $rm $removelist
 	exit $EXIT_FAILURE
@@ -998,7 +1035,7 @@ EOF
       command="$command$suppress_output"
       $run $rm "$obj" "$output_obj"
       $show "$command"
-      if $run eval "$command"; then :
+      if $run eval $lt_env "$command"; then :
       else
 	$run $rm $removelist
 	exit $EXIT_FAILURE
@@ -1131,6 +1168,7 @@ EOF
     thread_safe=no
     vinfo=
     vinfo_number=no
+    single_module="${wl}-single_module"
 
     func_infer_tag $base_compile
 
@@ -1138,8 +1176,9 @@ EOF
     for arg
     do
       case $arg in
-      -all-static | -static)
-	if test "X$arg" = "X-all-static"; then
+      -all-static | -static | -static-libtool-libs)
+	case $arg in
+	-all-static)
 	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
 	    $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
 	  fi
@@ -1147,12 +1186,20 @@ EOF
 	    dlopen_self=$dlopen_self_static
 	  fi
 	  prefer_static_libs=yes
-	else
+	  ;;
+	-static)
 	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
 	    dlopen_self=$dlopen_self_static
 	  fi
 	  prefer_static_libs=built
-	fi
+	  ;;
+	-static-libtool-libs)
+	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
+	    dlopen_self=$dlopen_self_static
+	  fi
+	  prefer_static_libs=yes
+	  ;;
+	esac
 	build_libtool_libs=no
 	build_old_libs=yes
 	break
@@ -1600,7 +1647,7 @@ EOF
 	continue
 	;;
 
-     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
+     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
 	compiler_flags="$compiler_flags $arg"
 	compile_command="$compile_command $arg"
 	finalize_command="$finalize_command $arg"
@@ -1608,6 +1655,11 @@ EOF
 	continue
 	;;
 
+      -multi_module)
+	single_module="${wl}-multi_module"
+	continue
+	;;
+
       -module)
 	module=yes
 	continue
@@ -1621,10 +1673,11 @@ EOF
       # -m* pass through architecture-specific compiler args for GCC
       # -m*, -t[45]*, -txscale* pass through architecture-specific
       # compiler args for GCC
-      # -pg pass through profiling flag for GCC
+      # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
+      # -F/path gives path to uninstalled frameworks, gcc on darwin
       # @file GCC response files
-      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \
-      -t[45]*|-txscale*|@*)
+      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
 
 	# Unknown arguments in both finalize_command and compile_command need
 	# to be aesthetically quoted because they are evaled later.
@@ -1652,9 +1705,9 @@ EOF
 
       -no-install)
 	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*)
 	  # The PATH hackery in wrapper scripts is required on Windows
-	  # in order for the loader to find any dlls it needs.
+	  # and Darwin in order for the loader to find any dlls it needs.
 	  $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
 	  $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
 	  fast_install=no
@@ -1713,7 +1766,7 @@ EOF
 	continue
 	;;
 
-      -static)
+      -static | -static-libtool-libs)
 	# The effects of -static are defined in a previous loop.
 	# We used to do the same as -all-static on platforms that
 	# didn't have a PIC flag, but the assumption that the effects
@@ -2106,7 +2159,7 @@ EOF
 	lib=
 	found=no
 	case $deplib in
-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
+	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
 	  if test "$linkmode,$pass" = "prog,link"; then
 	    compile_deplibs="$deplib $compile_deplibs"
 	    finalize_deplibs="$deplib $finalize_deplibs"
@@ -2122,7 +2175,12 @@ EOF
 	    continue
 	  fi
 	  name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
-	  for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
+	  if test "$linkmode" = lib; then
+	    searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
+	  else
+	    searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
+	  fi
+	  for searchdir in $searchdirs; do
 	    for search_ext in .la $std_shrext .so .a; do
 	      # Search the libtool library
 	      lib="$searchdir/lib${name}${search_ext}"
@@ -2503,7 +2561,9 @@ EOF
 
 	if test "$linkmode,$pass" = "prog,link"; then
 	  if test -n "$library_names" &&
-	     { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+	     { { test "$prefer_static_libs" = no ||
+		 test "$prefer_static_libs,$installed" = "built,yes"; } ||
+	       test -z "$old_library"; }; then
 	    # We need to hardcode the library path
 	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
 	      # Make sure the rpath contains only unique directories.
@@ -2916,12 +2976,18 @@ EOF
 		  # we do not want to link against static libs,
 		  # but need to link against shared
 		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
+		  eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
 		  if test -n "$deplibrary_names" ; then
 		    for tmp in $deplibrary_names ; do
 		      depdepl=$tmp
 		    done
-		    if test -f "$path/$depdepl" ; then
+		    if test -f "$deplibdir/$depdepl" ; then
+		      depdepl="$deplibdir/$depdepl"
+	      	    elif test -f "$path/$depdepl" ; then
 		      depdepl="$path/$depdepl"
+		    else
+		      # Can't find it, oh well...
+		      depdepl=
 		    fi
 		    # do not add paths which are already there
 		    case " $newlib_search_path " in
@@ -3069,9 +3135,10 @@ EOF
 
     case $linkmode in
     oldlib)
-      if test -n "$deplibs"; then
-	$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
-      fi
+      case " $deplibs" in
+      *\ -l* | *\ -L*)
+	$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;;
+      esac
 
       if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
 	$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
@@ -3199,7 +3266,7 @@ EOF
 	  # which has an extra 1 added just for fun
 	  #
 	  case $version_type in
-	  darwin|linux|osf|windows)
+	  darwin|linux|osf|windows|none)
 	    current=`expr $number_major + $number_minor`
 	    age="$number_minor"
 	    revision="$number_revision"
@@ -3210,9 +3277,10 @@ EOF
 	    age="0"
 	    ;;
 	  irix|nonstopux)
-	    current=`expr $number_major + $number_minor - 1`
+	    current=`expr $number_major + $number_minor`
 	    age="$number_minor"
 	    revision="$number_minor"
+	    lt_irix_increment=no
 	    ;;
 	  esac
 	  ;;
@@ -3271,7 +3339,8 @@ EOF
 	  versuffix="$major.$age.$revision"
 	  # Darwin ld doesn't like 0 for these options...
 	  minor_current=`expr $current + 1`
-	  verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+	  xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
 	  ;;
 
 	freebsd-aout)
@@ -3285,8 +3354,11 @@ EOF
 	  ;;
 
 	irix | nonstopux)
-	  major=`expr $current - $age + 1`
-
+	  if test "X$lt_irix_increment" = "Xno"; then
+	    major=`expr $current - $age`
+	  else
+	    major=`expr $current - $age + 1`
+	  fi
 	  case $version_type in
 	    nonstopux) verstring_prefix=nonstopux ;;
 	    *)         verstring_prefix=sgi ;;
@@ -3437,11 +3509,11 @@ EOF
       fi
 
       # Eliminate all temporary directories.
-      for path in $notinst_path; do
-	lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
-	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
-	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
-      done
+      #for path in $notinst_path; do
+      #	lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
+      #	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
+      #	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
+      #done
 
       if test -n "$xrpath"; then
 	# If the user specified any rpath flags, then add them.
@@ -3542,13 +3614,12 @@ EOF
 	  int main() { return 0; }
 EOF
 	  $rm conftest
-	  $LTCC $LTCFLAGS -o conftest conftest.c $deplibs
-	  if test "$?" -eq 0 ; then
+	  if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
 	    ldd_output=`ldd conftest`
 	    for i in $deplibs; do
 	      name=`expr $i : '-l\(.*\)'`
 	      # If $name is empty we are operating on a -L argument.
-              if test "$name" != "" && test "$name" -ne "0"; then
+              if test "$name" != "" && test "$name" != "0"; then
 		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 		  case " $predeps $postdeps " in
 		  *" $i "*)
@@ -3587,9 +3658,7 @@ EOF
 	      # If $name is empty we are operating on a -L argument.
               if test "$name" != "" && test "$name" != "0"; then
 		$rm conftest
-		$LTCC $LTCFLAGS -o conftest conftest.c $i
-		# Did it work?
-		if test "$?" -eq 0 ; then
+		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
 		  ldd_output=`ldd conftest`
 		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 		    case " $predeps $postdeps " in
@@ -3621,7 +3690,7 @@ EOF
 		  droppeddeps=yes
 		  $echo
 		  $echo "*** Warning!  Library $i is needed by this library but I was not able to"
-		  $echo "***  make it link in!  You will probably need to install it or some"
+		  $echo "*** make it link in!  You will probably need to install it or some"
 		  $echo "*** library that it depends on before this library will be fully"
 		  $echo "*** functional.  Installing it before continuing would be even better."
 		fi
@@ -3907,7 +3976,10 @@ EOF
 	     test -n "$hardcode_libdirs"; then
 	    libdir="$hardcode_libdirs"
 	    if test -n "$hardcode_libdir_flag_spec_ld"; then
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
+	      case $archive_cmds in
+	      *\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;;
+	      *)      eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;;
+	      esac
 	    else
 	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
 	    fi
@@ -4217,9 +4289,10 @@ EOF
       ;;
 
     obj)
-      if test -n "$deplibs"; then
-	$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
-      fi
+      case " $deplibs" in
+      *\ -l* | *\ -L*)
+	$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;;
+      esac
 
       if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
 	$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
@@ -4266,12 +4339,14 @@ EOF
       reload_conv_objs=
       gentop=
       # reload_cmds runs $LD directly, so let us get rid of
-      # -Wl from whole_archive_flag_spec
+      # -Wl from whole_archive_flag_spec and hope we can get by with
+      # turning comma into space..
       wl=
 
       if test -n "$convenience"; then
 	if test -n "$whole_archive_flag_spec"; then
-	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
+	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
+	  reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
 	else
 	  gentop="$output_objdir/${obj}x"
 	  generated="$generated $gentop"
@@ -4719,16 +4794,16 @@ static const void *lt_preloaded_setup() {
           case $host in
           *cygwin* | *mingw* )
             if test -f "$output_objdir/${outputname}.def" ; then
-              compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
-              finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
+              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
+              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
             else
-              compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-              finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
              fi
             ;;
           * )
-            compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-            finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+            compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
+            finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
             ;;
           esac
 	  ;;
@@ -4743,13 +4818,13 @@ static const void *lt_preloaded_setup() {
 	# really was required.
 
 	# Nullify the symbol file.
-	compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
-	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
+	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
       fi
 
       if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
 	# Replace the output file specification.
-	compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
 	link_command="$compile_command$compile_rpath"
 
 	# We have no uninstalled library dependencies, so finalize right now.
@@ -4836,7 +4911,7 @@ static const void *lt_preloaded_setup() {
 	if test "$fast_install" != no; then
 	  link_command="$finalize_var$compile_command$finalize_rpath"
 	  if test "$fast_install" = yes; then
-	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
+	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
 	  else
 	    # fast_install is set to needless
 	    relink_command=
@@ -4873,7 +4948,7 @@ static const void *lt_preloaded_setup() {
 	  fi
 	done
 	relink_command="(cd `pwd`; $relink_command)"
-	relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+	relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
       fi
 
       # Quote $echo for shipping.
@@ -5280,6 +5355,20 @@ EOF
 Xsed='${SED} -e 1s/^X//'
 sed_quote_subst='$sed_quote_subst'
 
+# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
+if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
+  setopt NO_GLOB_SUBST
+else
+  case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
+fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
+
 # The HP-UX ksh and POSIX shell print the target directory to stdout
 # if CDPATH is set.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
@@ -5422,7 +5511,7 @@ else
 	  ;;
 	esac
 	$echo >> $output "\
-      \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
+      \$echo \"\$0: cannot exec \$program \$*\"
       exit $EXIT_FAILURE
     fi
   else
@@ -5608,7 +5697,7 @@ fi\
       done
       # Quote the link command for shipping.
       relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-      relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
       if test "$hardcode_automatic" = yes ; then
 	relink_command=
       fi
@@ -5957,9 +6046,9 @@ relink_command=\"$relink_command\""
 
 	  if test -n "$inst_prefix_dir"; then
 	    # Stick the inst_prefix_dir data into the link command.
-	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
 	  else
-	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
+	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
 	  fi
 
 	  $echo "$modename: warning: relinking \`$file'" 1>&2
@@ -6168,7 +6257,7 @@ relink_command=\"$relink_command\""
 	      file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
 	      outputname="$tmpdir/$file"
 	      # Replace the output file specification.
-	      relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
+	      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
 
 	      $show "$relink_command"
 	      if $run eval "$relink_command"; then :
@@ -6345,8 +6434,10 @@ relink_command=\"$relink_command\""
 	if test -f "$dir/$objdir/$dlname"; then
 	  dir="$dir/$objdir"
 	else
-	  $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
-	  exit $EXIT_FAILURE
+	  if test ! -f "$dir/$dlname"; then
+	    $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
+	    exit $EXIT_FAILURE
+	  fi
 	fi
 	;;
 
@@ -6410,12 +6501,12 @@ relink_command=\"$relink_command\""
       fi
 
       # Restore saved environment variables
-      if test "${save_LC_ALL+set}" = set; then
-	LC_ALL="$save_LC_ALL"; export LC_ALL
-      fi
-      if test "${save_LANG+set}" = set; then
-	LANG="$save_LANG"; export LANG
-      fi
+      for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+      do
+	eval "if test \"\${save_$lt_var+set}\" = set; then
+		$lt_var=\$save_$lt_var; export $lt_var
+	      fi"
+      done
 
       # Now prepare to actually exec the command.
       exec_cmd="\$cmd$args"
@@ -6772,9 +6863,9 @@ The following components of LINK-COMMAND are treated specially:
   -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
   -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
   -export-symbols SYMFILE
-		    try to export only the symbols listed in SYMFILE
+                    try to export only the symbols listed in SYMFILE
   -export-symbols-regex REGEX
-		    try to export only the symbols matching REGEX
+                    try to export only the symbols matching REGEX
   -LLIBDIR          search LIBDIR for required installed libraries
   -lNAME            OUTPUT-FILE requires the installed library libNAME
   -module           build a library that can dlopened
@@ -6788,9 +6879,11 @@ The following components of LINK-COMMAND are treated specially:
   -release RELEASE  specify package release information
   -rpath LIBDIR     the created library will eventually be installed in LIBDIR
   -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-  -static           do not do any dynamic linking of libtool libraries
+  -static           do not do any dynamic linking of uninstalled libtool libraries
+  -static-libtool-libs
+                    do not do any dynamic linking of libtool libraries
   -version-info CURRENT[:REVISION[:AGE]]
-		    specify library version info [each variable defaults to 0]
+                    specify library version info [each variable defaults to 0]
 
 All other options (arguments beginning with \`-') are ignored.
 

lib/libX11/man/Makefile.in

@@ -105,6 +105,7 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -121,6 +122,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -128,6 +130,7 @@ LIBTOOL = @LIBTOOL@
 LIB_MAN_DIR = @LIB_MAN_DIR@
 LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
+LINTLIB = @LINTLIB@
 LINT_FALSE = @LINT_FALSE@
 LINT_FLAGS = @LINT_FLAGS@
 LINT_TRUE = @LINT_TRUE@
@@ -137,11 +140,14 @@ MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
 MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MANPAGES_FALSE = @MANPAGES_FALSE@
 MANPAGES_TRUE = @MANPAGES_TRUE@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 OS2_FALSE = @OS2_FALSE@
 OS2_TRUE = @OS2_TRUE@
@@ -156,6 +162,7 @@ PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -204,7 +211,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
 ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
 ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -442,7 +451,6 @@ libman_PRE = \
 @MANPAGES_TRUE@BUILT_SOURCES = shadows.DONE
 EXTRA_DIST = $(libman_PRE)
 CLEANFILES = $(libman_DATA)
-SED = sed
 SUFFIXES = .pre .$(LIB_MAN_SUFFIX) .man
 WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
 CPP_FILES_FLAGS = $(WCHAR32_FLAGS)

lib/libX11/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

lib/libX11/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

lib/libX11/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

lib/libX11/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
@@ -218,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{
@@ -293,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
@@ -359,7 +358,7 @@ T}	T{
 T}	T{
 1
 T}	T{
-/\(** most applications start this way */
+/\&* most applications start this way */
 T}
 T{
 \&#define
@@ -368,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

lib/libX11/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 structures declared for each event type:
 .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;

lib/libX11/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 XButtonReleasedEvent;
 .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

lib/libX11/man/XChangeKeyboardControl.man

@@ -149,9 +149,9 @@ XChangeKeyboardControl, XGetKeyboardControl, XAutoRepeatOn, XAutoRepeatOff, XBel
 .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\^); 
@@ -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

lib/libX11/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

lib/libX11/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

lib/libX11/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

lib/libX11/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;

lib/libX11/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

lib/libX11/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;

lib/libX11/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

lib/libX11/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;

lib/libX11/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

lib/libX11/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

lib/libX11/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

lib/libX11/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

lib/libX11/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;

lib/libX11/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;

lib/libX11/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 range % [ 0 , ~2 pi  ]% and where atan
 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 */
+	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.

lib/libX11/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

lib/libX11/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

lib/libX11/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

lib/libX11/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 

lib/libX11/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

lib/libX11/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;

lib/libX11/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

lib/libX11/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

lib/libX11/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;

lib/libX11/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 

lib/libX11/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;	

lib/libX11/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,62 +319,54 @@ 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 */
-	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;
-.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
-typedef struct {	/\(** normal 16 bit characters are two bytes */
+.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 */
-	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;
-.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 are less than 256,
 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

lib/libX11/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

lib/libX11/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;

lib/libX11/man/XOpenIM.man

@@ -142,7 +142,7 @@
 .ny0
 .TH XOpenIM __libmansuffix__ __xorgversion__ "XLIB FUNCTIONS"
 .SH NAME
-XOpenIM, XCloseIM, XSetIMValues, XGetIMValues, XDisplayOfIM, XLocaleOfIM, XRegisterIMInstantiateCallback, XUnregisterIMInstantiateCallback \- open, close, and otain input method information
+XOpenIM, XCloseIM, XSetIMValues, XGetIMValues, XDisplayOfIM, XLocaleOfIM, XRegisterIMInstantiateCallback, XUnregisterIMInstantiateCallback \- open, close, and obtain input method information
 .SH SYNTAX
 .HP
 XIM XOpenIM\^(\^Display *\fIdisplay\fP\^, XrmDatabase \fIdb\fP\^, char

lib/libX11/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

lib/libX11/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 encouraged.
 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, 

lib/libX11/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, \fIname\fP, \fImajor_opcode_return\fP, \fIfir
 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.

lib/libX11/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;

lib/libX11/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;

lib/libX11/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;

lib/libX11/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

lib/libX11/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;

lib/libX11/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.

lib/libX11/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"

lib/libX11/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;

lib/libX11/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;

lib/libX11/man/XcmsCIELabQueryMaxC.man

@@ -164,7 +164,7 @@ are ignored.
 .ds Ch maximum lightness (MaxL) or minimum lightness (MinL)
 .IP \fIchroma\fP 1i
 Specifies the chroma at which to find \*(Ch.
-.ds Lc maximum chroma (MaxC and MaxLC), maximum lightnes (MaxL), \
+.ds Lc maximum chroma (MaxC and MaxLC), maximum lightness (MaxL), \
 or minimum lightness (MinL)
 .ds lC hue angle and lightness (MaxC), hue angle and chroma (MaxL and MinL), \
 or hue angle (MaxLC)

lib/libX11/man/XcmsCIELuvQueryMaxC.man

@@ -164,7 +164,7 @@ are ignored.
 .ds Ch maximum lightness (MaxL) or minimum lightness (MinL)
 .IP \fIchroma\fP 1i
 Specifies the chroma at which to find \*(Ch.
-.ds Lc maximum chroma (MaxC and MaxLC), maximum lightnes (MaxL), \
+.ds Lc maximum chroma (MaxC and MaxLC), maximum lightness (MaxL), \
 or minimum lightness (MinL)
 .ds lC hue angle and lightness (MaxC), hue angle and chroma (MaxL and MinL), \
 or hue angle (MaxLC)

lib/libX11/man/XcmsColor.man

@@ -140,18 +140,26 @@
 .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
+XcmsColor, XcmsRGB, XcmsRGBi, XcmsCIEXYZ, XcmsCIEuvY, XcmsCIExyY, XcmsCIELab, XcmsCIELuv, XcmsTekHVC, XcmsPad \- Xcms color structure
 .SH STRUCTURES
 The structure for
 .ZN XcmsColor
 contains:
 .LP
-.Ds 0
-.TA .5i 1i 2.5i
-.ta .5i 1i 2.5i
-typedef unsigned long XcmsColorFormat;			/\(** Color Specification Format */
+.EX
+typedef unsigned long XcmsColorFormat;			/\&* Color Specification Format */
 
 typedef struct {
 	union {
@@ -167,101 +175,83 @@ typedef struct {
 	} spec;
 	unsigned long pixel;
 	XcmsColorFormat format;
-} XcmsColor;			/\(** Xcms Color Structure */
-.De
+} XcmsColor;			/\&* Xcms Color Structure */
+.EE
 .LP
-.Ds 0
-.TA .5i 2.5i
-.ta .5i 2.5i
+.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 */
-.De
+	unsigned short red;	/\&* 0x0000 to 0xffff */
+	unsigned short green;	/\&* 0x0000 to 0xffff */
+	unsigned short blue;	/\&* 0x0000 to 0xffff */
+} XcmsRGB;		/\&* RGB Device */
+.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
+	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
-.Ds 0
-.TA .5i 2.5i
-.ta .5i 2.5i
+.EX
 typedef struct {
 	XcmsFloat X;
-	XcmsFloat Y;	/\(** 0.0 to 1.0 */
+	XcmsFloat Y;	/\&* 0.0 to 1.0 */
 	XcmsFloat Z;
-} XcmsCIEXYZ;		/\(** CIE XYZ */
-.De
+} XcmsCIEXYZ;		/\&* CIE XYZ */
+.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
+	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
-.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
+	XcmsFloat x; 	/\&* 0.0 to ~.75 */
+	XcmsFloat y; 	/\&* 0.0 to ~.85 */
+	XcmsFloat Y; 	/\&* 0.0 to 1.0 */
+} XcmsCIExyY;		/\&* CIE xyY */
+.EE
 .LP
-.Ds 0
-.TA .5i 2.5i
-.ta .5i 2.5i
+.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* */
-.De
+} XcmsCIELab;		/\&* CIE L*a*b* */
+.EE
 .LP
-.Ds 0
-.TA .5i 2.5i
-.ta .5i 2.5i
+.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* */
-.De
+} XcmsCIELuv;		/\&* CIE L*u*v* */
+.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
+	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
-.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
+} XcmsPad;		/\&* four doubles */
+.EE
 .SH DESCRIPTION
 The
 .ZN XcmsColor
@@ -271,5 +261,5 @@ each supporting color specification encoding for a particular color space.
 XcmsAllocColor(3X11),
 XcmsStoreColor(3X11),
 XcmsConvertColors(3X11),
-.br
+.LP
 \fI\*(xL\fP

lib/libX11/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"

lib/libX11/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"

lib/libX11/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 end of the file.
 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

lib/libX11/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

lib/libX11/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 or asterisk,
 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

lib/libX11/man/xkb/Makefile.in

@@ -96,6 +96,7 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -119,6 +121,7 @@ LIBTOOL = @LIBTOOL@
 LIB_MAN_DIR = @LIB_MAN_DIR@
 LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
+LINTLIB = @LINTLIB@
 LINT_FALSE = @LINT_FALSE@
 LINT_FLAGS = @LINT_FLAGS@
 LINT_TRUE = @LINT_TRUE@
@@ -128,11 +131,14 @@ MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
 MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MANPAGES_FALSE = @MANPAGES_FALSE@
 MANPAGES_TRUE = @MANPAGES_TRUE@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 OS2_FALSE = @OS2_FALSE@
 OS2_TRUE = @OS2_TRUE@
@@ -147,6 +153,7 @@ PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -195,7 +202,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
 ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
 ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -445,7 +454,6 @@ libman_PRE = \
 @MANPAGES_TRUE@libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@)
 EXTRA_DIST = $(libman_PRE)
 CLEANFILES = $(libman_DATA)
-SED = sed
 SUFFIXES = .pre .$(LIB_MAN_SUFFIX) .man
 WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
 CPP_FILES_FLAGS = $(WCHAR32_FLAGS)

lib/libX11/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

lib/libX11/modules/Makefile.in

@@ -87,6 +87,7 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -103,6 +104,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -110,6 +112,7 @@ LIBTOOL = @LIBTOOL@
 LIB_MAN_DIR = @LIB_MAN_DIR@
 LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
+LINTLIB = @LINTLIB@
 LINT_FALSE = @LINT_FALSE@
 LINT_FLAGS = @LINT_FLAGS@
 LINT_TRUE = @LINT_TRUE@
@@ -119,11 +122,14 @@ MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
 MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MANPAGES_FALSE = @MANPAGES_FALSE@
 MANPAGES_TRUE = @MANPAGES_TRUE@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 OS2_FALSE = @OS2_FALSE@
 OS2_TRUE = @OS2_TRUE@
@@ -138,6 +144,7 @@ PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -186,7 +193,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
 ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
 ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@

lib/libX11/modules/im/Makefile.in

@@ -87,6 +87,7 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -103,6 +104,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -110,6 +112,7 @@ LIBTOOL = @LIBTOOL@
 LIB_MAN_DIR = @LIB_MAN_DIR@
 LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
+LINTLIB = @LINTLIB@
 LINT_FALSE = @LINT_FALSE@
 LINT_FLAGS = @LINT_FLAGS@
 LINT_TRUE = @LINT_TRUE@
@@ -119,11 +122,14 @@ MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
 MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MANPAGES_FALSE = @MANPAGES_FALSE@
 MANPAGES_TRUE = @MANPAGES_TRUE@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 OS2_FALSE = @OS2_FALSE@
 OS2_TRUE = @OS2_TRUE@
@@ -138,6 +144,7 @@ PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -186,7 +193,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
 ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
 ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@

lib/libX11/modules/im/ximcp/Makefile.in

@@ -122,6 +122,7 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -138,6 +139,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -145,6 +147,7 @@ LIBTOOL = @LIBTOOL@
 LIB_MAN_DIR = @LIB_MAN_DIR@
 LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
+LINTLIB = @LINTLIB@
 LINT_FALSE = @LINT_FALSE@
 LINT_FLAGS = @LINT_FLAGS@
 LINT_TRUE = @LINT_TRUE@
@@ -154,11 +157,14 @@ MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
 MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MANPAGES_FALSE = @MANPAGES_FALSE@
 MANPAGES_TRUE = @MANPAGES_TRUE@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 OS2_FALSE = @OS2_FALSE@
 OS2_TRUE = @OS2_TRUE@
@@ -173,6 +179,7 @@ PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -221,7 +228,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
 ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
 ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@

lib/libX11/modules/im/ximcp/imDefIc.c

@@ -949,6 +949,8 @@ _XimProtoSetFocus(
     (void)_XimWrite(im, len, (XPointer)buf);
     _XimFlush(im);
 
+    MARK_FOCUSED(ic);
+
     _XimRegisterFilter(ic);
     return;
 }
@@ -994,6 +996,8 @@ _XimProtoUnsetFocus(
     (void)_XimWrite(im, len, (XPointer)buf);
     _XimFlush(im);
 
+    UNMARK_FOCUSED(ic);
+    
     _XimUnregisterFilter(ic);
     return;
 }

lib/libX11/modules/im/ximcp/imDefLkup.c

@@ -216,8 +216,13 @@ _XimRespSyncReply(
     Xic		 ic,
     BITMASK16	 mode)
 {
-    if (mode & XimSYNCHRONUS) /* SYNC Request */
-	MARK_NEED_SYNC_REPLY(ic);
+    if (mode & XimSYNCHRONUS) /* SYNC Request */ {
+	if (IS_FOCUSED(ic))
+	    MARK_NEED_SYNC_REPLY(ic);
+	else
+	    _XimProcSyncReply(ic->core.im, ic);
+    }
+    
     return True;
 }
 

lib/libX11/modules/im/ximcp/imTrX.c

@@ -156,6 +156,8 @@ _XimXConnect(Xim im)
     event.xclient.data.l[0]    = (CARD32)spec->lib_connect_wid;
     event.xclient.data.l[1]    = spec->major_code;
     event.xclient.data.l[2]    = spec->minor_code;
+    event.xclient.data.l[3]    = 0;
+    event.xclient.data.l[4]    = 0;
 
     if(event.xclient.data.l[1] == 1 || event.xclient.data.l[1] == 2) {
 	XWindowAttributes	 atr;

lib/libX11/modules/lc/Makefile.in

@@ -87,6 +87,7 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -103,6 +104,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -110,6 +112,7 @@ LIBTOOL = @LIBTOOL@
 LIB_MAN_DIR = @LIB_MAN_DIR@
 LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
+LINTLIB = @LINTLIB@
 LINT_FALSE = @LINT_FALSE@
 LINT_FLAGS = @LINT_FLAGS@
 LINT_TRUE = @LINT_TRUE@
@@ -119,11 +122,14 @@ MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
 MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MANPAGES_FALSE = @MANPAGES_FALSE@
 MANPAGES_TRUE = @MANPAGES_TRUE@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 OS2_FALSE = @OS2_FALSE@
 OS2_TRUE = @OS2_TRUE@
@@ -138,6 +144,7 @@ PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -186,7 +193,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
 ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
 ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@

lib/libX11/modules/lc/Utf8/Makefile.in

@@ -113,6 +113,7 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -129,6 +130,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -136,6 +138,7 @@ LIBTOOL = @LIBTOOL@
 LIB_MAN_DIR = @LIB_MAN_DIR@
 LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
+LINTLIB = @LINTLIB@
 LINT_FALSE = @LINT_FALSE@
 LINT_FLAGS = @LINT_FLAGS@
 LINT_TRUE = @LINT_TRUE@
@@ -145,11 +148,14 @@ MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
 MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MANPAGES_FALSE = @MANPAGES_FALSE@
 MANPAGES_TRUE = @MANPAGES_TRUE@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 OS2_FALSE = @OS2_FALSE@
 OS2_TRUE = @OS2_TRUE@
@@ -164,6 +170,7 @@ PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -212,7 +219,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
 ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
 ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@

lib/libX11/modules/lc/def/Makefile.in

@@ -112,6 +112,7 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -128,6 +129,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -135,6 +137,7 @@ LIBTOOL = @LIBTOOL@
 LIB_MAN_DIR = @LIB_MAN_DIR@
 LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
+LINTLIB = @LINTLIB@
 LINT_FALSE = @LINT_FALSE@
 LINT_FLAGS = @LINT_FLAGS@
 LINT_TRUE = @LINT_TRUE@
@@ -144,11 +147,14 @@ MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
 MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MANPAGES_FALSE = @MANPAGES_FALSE@
 MANPAGES_TRUE = @MANPAGES_TRUE@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 OS2_FALSE = @OS2_FALSE@
 OS2_TRUE = @OS2_TRUE@
@@ -163,6 +169,7 @@ PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -211,7 +218,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
 ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
 ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@

lib/libX11/modules/lc/gen/Makefile.in

@@ -112,6 +112,7 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -128,6 +129,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -135,6 +137,7 @@ LIBTOOL = @LIBTOOL@
 LIB_MAN_DIR = @LIB_MAN_DIR@
 LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
+LINTLIB = @LINTLIB@
 LINT_FALSE = @LINT_FALSE@
 LINT_FLAGS = @LINT_FLAGS@
 LINT_TRUE = @LINT_TRUE@
@@ -144,11 +147,14 @@ MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
 MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MANPAGES_FALSE = @MANPAGES_FALSE@
 MANPAGES_TRUE = @MANPAGES_TRUE@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 OS2_FALSE = @OS2_FALSE@
 OS2_TRUE = @OS2_TRUE@
@@ -163,6 +169,7 @@ PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -211,7 +218,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
 ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
 ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@

lib/libX11/modules/lc/xlocale/Makefile.in

@@ -112,6 +112,7 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -128,6 +129,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -135,6 +137,7 @@ LIBTOOL = @LIBTOOL@
 LIB_MAN_DIR = @LIB_MAN_DIR@
 LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
+LINTLIB = @LINTLIB@
 LINT_FALSE = @LINT_FALSE@
 LINT_FLAGS = @LINT_FLAGS@
 LINT_TRUE = @LINT_TRUE@
@@ -144,11 +147,14 @@ MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
 MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MANPAGES_FALSE = @MANPAGES_FALSE@
 MANPAGES_TRUE = @MANPAGES_TRUE@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 OS2_FALSE = @OS2_FALSE@
 OS2_TRUE = @OS2_TRUE@
@@ -163,6 +169,7 @@ PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -211,7 +218,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
 ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
 ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@

lib/libX11/modules/om/Makefile.in

@@ -87,6 +87,7 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -103,6 +104,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -110,6 +112,7 @@ LIBTOOL = @LIBTOOL@
 LIB_MAN_DIR = @LIB_MAN_DIR@
 LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
+LINTLIB = @LINTLIB@
 LINT_FALSE = @LINT_FALSE@
 LINT_FLAGS = @LINT_FLAGS@
 LINT_TRUE = @LINT_TRUE@
@@ -119,11 +122,14 @@ MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
 MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MANPAGES_FALSE = @MANPAGES_FALSE@
 MANPAGES_TRUE = @MANPAGES_TRUE@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 OS2_FALSE = @OS2_FALSE@
 OS2_TRUE = @OS2_TRUE@
@@ -138,6 +144,7 @@ PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -186,7 +193,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
 ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
 ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@

lib/libX11/modules/om/generic/Makefile.in

@@ -115,6 +115,7 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -131,6 +132,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -138,6 +140,7 @@ LIBTOOL = @LIBTOOL@
 LIB_MAN_DIR = @LIB_MAN_DIR@
 LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
+LINTLIB = @LINTLIB@
 LINT_FALSE = @LINT_FALSE@
 LINT_FLAGS = @LINT_FLAGS@
 LINT_TRUE = @LINT_TRUE@
@@ -147,11 +150,14 @@ MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
 MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MANPAGES_FALSE = @MANPAGES_FALSE@
 MANPAGES_TRUE = @MANPAGES_TRUE@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 OS2_FALSE = @OS2_FALSE@
 OS2_TRUE = @OS2_TRUE@
@@ -166,6 +172,7 @@ PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -214,7 +221,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
 ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
 ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@

lib/libX11/nls/C/Makefile.in

@@ -96,6 +96,7 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -119,6 +121,7 @@ LIBTOOL = @LIBTOOL@
 LIB_MAN_DIR = @LIB_MAN_DIR@
 LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
+LINTLIB = @LINTLIB@
 LINT_FALSE = @LINT_FALSE@
 LINT_FLAGS = @LINT_FLAGS@
 LINT_TRUE = @LINT_TRUE@
@@ -128,11 +131,14 @@ MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
 MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MANPAGES_FALSE = @MANPAGES_FALSE@
 MANPAGES_TRUE = @MANPAGES_TRUE@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 OS2_FALSE = @OS2_FALSE@
 OS2_TRUE = @OS2_TRUE@
@@ -147,6 +153,7 @@ PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -195,7 +202,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
 ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
 ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -237,7 +246,6 @@ sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 x11thislocaledir = $(X11_LOCALEDATADIR)/C
-SED = sed
 SUFFIXES = .pre
 WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
 CPP_FILES_FLAGS = $(WCHAR32_FLAGS)

lib/libX11/nls/Makefile.am

@@ -11,6 +11,7 @@ CLEANFILES= \
 	XLC_LOCALE
 
 SUBDIRS= \
+	am_ET.UTF-8		\
 	armscii-8		\
 	C			\
 	el_GR.UTF-8		\

lib/libX11/nls/Makefile.in

@@ -102,6 +102,7 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -118,6 +119,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -125,6 +127,7 @@ LIBTOOL = @LIBTOOL@
 LIB_MAN_DIR = @LIB_MAN_DIR@
 LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
+LINTLIB = @LINTLIB@
 LINT_FALSE = @LINT_FALSE@
 LINT_FLAGS = @LINT_FLAGS@
 LINT_TRUE = @LINT_TRUE@
@@ -134,11 +137,14 @@ MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
 MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MANPAGES_FALSE = @MANPAGES_FALSE@
 MANPAGES_TRUE = @MANPAGES_TRUE@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 OS2_FALSE = @OS2_FALSE@
 OS2_TRUE = @OS2_TRUE@
@@ -153,6 +159,7 @@ PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -201,7 +208,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
 ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
 ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -252,6 +261,7 @@ CLEANFILES = \
 	XLC_LOCALE
 
 SUBDIRS = \
+	am_ET.UTF-8		\
 	armscii-8		\
 	C			\
 	el_GR.UTF-8		\
@@ -310,7 +320,6 @@ SUBDIRS = \
 	zh_TW.big5		\
 	zh_TW.UTF-8
 
-SED = sed
 SUFFIXES = .pre
 WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
 CPP_FILES_FLAGS = $(WCHAR32_FLAGS)

lib/libX11/nls/am_ET.UTF-8/Compose.pre

@@ -0,0 +1,341 @@
+XCOMM 
+XCOMM UTF-8 (Unicode) compose sequence
+XCOMM for Ethiopean layout.
+XCOMM Designed as a part of OLPC project
+XCOMM
+XCOMM 2007 Sergey Udaltsov <svu@gnome.org>
+XCOMM
+
+
+XCOMM
+XCOMM Group I
+XCOMM
+
+XCOMM Modifier: /u/
+<u> <U1200> : "ሁ" <U1201> # key h (base character ሀ)
+<u> <U1208> : "ሉ" <U1209> # key l (base character ለ)
+<u> <U1218> : "ሙ" <U1219> # key m (base character መ)
+<u> <U1228> : "ሩ" <U1229> # key r (base character ረ)
+<u> <U1230> : "ሱ" <U1231> # key s (base character ሰ)
+<u> <U1240> : "ቁ" <U1241> # key q (base character ቀ)
+<u> <U1260> : "ቡ" <U1261> # key b (base character በ)
+<u> <U1270> : "ቱ" <U1271> # key t (base character ተ)
+<u> <U1290> : "ኑ" <U1291> # key n (base character ነ)
+<u> <U12A0> : "ኡ" <U12A1> # key x (base character አ)
+<u> <U12A8> : "ኩ" <U12A9> # key k (base character ከ)
+<u> <U12C8> : "ዉ" <U12C9> # key w (base character ወ)
+<u> <U12D8> : "ዙ" <U12D9> # key z (base character ዘ)
+<u> <U12E8> : "ዩ" <U12E9> # key y (base character የ)
+<u> <U12F0> : "ዱ" <U12F1> # key d (base character ደ)
+<u> <U1300> : "ጁ" <U1301> # key j (base character ጀ)
+<u> <U1308> : "ጉ" <U1309> # key g (base character ገ)
+<u> <U1340> : "ፁ" <U1341> # key [ (base character ፀ)
+<u> <U1348> : "ፉ" <U1349> # key f (base character ፈ)
+<u> <U1350> : "ፑ" <U1351> # key p (base character ፐ)
+<u> <U1238> : "ሹ" <U1239> # key v (base character ሸ)
+<u> <U1328> : "ጩ" <U1329> # key ] (base character ጨ)
+
+XCOMM Modifier: /i/
+<i> <U1200> : "ሂ" <U1202> # key h (base character ሀ)
+<i> <U1208> : "ሊ" <U120A> # key l (base character ለ)
+<i> <U1218> : "ሚ" <U121A> # key m (base character መ)
+<i> <U1228> : "ሪ" <U122A> # key r (base character ረ)
+<i> <U1230> : "ሲ" <U1232> # key s (base character ሰ)
+<i> <U1240> : "ቂ" <U1242> # key q (base character ቀ)
+<i> <U1260> : "ቢ" <U1262> # key b (base character በ)
+<i> <U1270> : "ቲ" <U1272> # key t (base character ተ)
+<i> <U1290> : "ኒ" <U1292> # key n (base character ነ)
+<i> <U12A0> : "ኢ" <U12A2> # key x (base character አ)
+<i> <U12A8> : "ኪ" <U12AA> # key k (base character ከ)
+<i> <U12C8> : "ዊ" <U12CA> # key w (base character ወ)
+<i> <U12D8> : "ዚ" <U12DA> # key z (base character ዘ)
+<i> <U12E8> : "ዪ" <U12EA> # key y (base character የ)
+<i> <U12F0> : "ዲ" <U12F2> # key d (base character ደ)
+<i> <U1300> : "ጂ" <U1302> # key j (base character ጀ)
+<i> <U1308> : "ጊ" <U130A> # key g (base character ገ)
+<i> <U1340> : "ፂ" <U1342> # key [ (base character ፀ)
+<i> <U1348> : "ፊ" <U134A> # key f (base character ፈ)
+<i> <U1350> : "ፒ" <U1352> # key p (base character ፐ)
+<i> <U1238> : "ሺ" <U123A> # key v (base character ሸ)
+<i> <U1328> : "ጪ" <U132A> # key ] (base character ጨ)
+
+XCOMM Modifier: /a/
+<a> <U1200> : "ሃ" <U1203> # key h (base character ሀ)
+<a> <U1208> : "ላ" <U120B> # key l (base character ለ)
+<a> <U1218> : "ማ" <U121B> # key m (base character መ)
+<a> <U1228> : "ራ" <U122B> # key r (base character ረ)
+<a> <U1230> : "ሳ" <U1233> # key s (base character ሰ)
+<a> <U1240> : "ቃ" <U1243> # key q (base character ቀ)
+<a> <U1260> : "ባ" <U1263> # key b (base character በ)
+<a> <U1270> : "ታ" <U1273> # key t (base character ተ)
+<a> <U1290> : "ና" <U1293> # key n (base character ነ)
+<a> <U12A0> : "ኣ" <U12A3> # key x (base character አ)
+<a> <U12A8> : "ካ" <U12AB> # key k (base character ከ)
+<a> <U12C8> : "ዋ" <U12CB> # key w (base character ወ)
+<a> <U12D8> : "ዛ" <U12DB> # key z (base character ዘ)
+<a> <U12E8> : "ያ" <U12EB> # key y (base character የ)
+<a> <U12F0> : "ዳ" <U12F3> # key d (base character ደ)
+<a> <U1300> : "ጃ" <U1303> # key j (base character ጀ)
+<a> <U1308> : "ጋ" <U130B> # key g (base character ገ)
+<a> <U1340> : "ፃ" <U1343> # key [ (base character ፀ)
+<a> <U1348> : "ፋ" <U134B> # key f (base character ፈ)
+<a> <U1350> : "ፓ" <U1353> # key p (base character ፐ)
+<a> <U1238> : "ሻ" <U123B> # key v (base character ሸ)
+<a> <U1328> : "ጫ" <U132B> # key ] (base character ጨ)
+
+XCOMM Modifier: /e/
+<e> <U1200> : "ሄ" <U1204> # key h (base character ሀ)
+<e> <U1208> : "ሌ" <U120C> # key l (base character ለ)
+<e> <U1218> : "ሜ" <U121C> # key m (base character መ)
+<e> <U1228> : "ሬ" <U122C> # key r (base character ረ)
+<e> <U1230> : "ሴ" <U1234> # key s (base character ሰ)
+<e> <U1240> : "ቄ" <U1244> # key q (base character ቀ)
+<e> <U1260> : "ቤ" <U1264> # key b (base character በ)
+<e> <U1270> : "ቴ" <U1274> # key t (base character ተ)
+<e> <U1290> : "ኔ" <U1294> # key n (base character ነ)
+<e> <U12A0> : "ኤ" <U12A4> # key x (base character አ)
+<e> <U12A8> : "ኬ" <U12AC> # key k (base character ከ)
+<e> <U12C8> : "ዌ" <U12CC> # key w (base character ወ)
+<e> <U12D8> : "ዜ" <U12DC> # key z (base character ዘ)
+<e> <U12E8> : "ዬ" <U12EC> # key y (base character የ)
+<e> <U12F0> : "ዴ" <U12F4> # key d (base character ደ)
+<e> <U1300> : "ጄ" <U1304> # key j (base character ጀ)
+<e> <U1308> : "ጌ" <U130C> # key g (base character ገ)
+<e> <U1340> : "ፄ" <U1344> # key [ (base character ፀ)
+<e> <U1348> : "ፌ" <U134C> # key f (base character ፈ)
+<e> <U1350> : "ፔ" <U1354> # key p (base character ፐ)
+<e> <U1238> : "ሼ" <U123C> # key v (base character ሸ)
+<e> <U1328> : "ጬ" <U132C> # key ] (base character ጨ)
+
+XCOMM Modifier: /c/
+<c> <U1200> : "ህ" <U1205> # key h (base character ሀ)
+<c> <U1208> : "ል" <U120D> # key l (base character ለ)
+<c> <U1218> : "ም" <U121D> # key m (base character መ)
+<c> <U1228> : "ር" <U122D> # key r (base character ረ)
+<c> <U1230> : "ስ" <U1235> # key s (base character ሰ)
+<c> <U1240> : "ቅ" <U1245> # key q (base character ቀ)
+<c> <U1260> : "ብ" <U1265> # key b (base character በ)
+<c> <U1270> : "ት" <U1275> # key t (base character ተ)
+<c> <U1290> : "ን" <U1295> # key n (base character ነ)
+<c> <U12A0> : "እ" <U12A5> # key x (base character አ)
+<c> <U12A8> : "ክ" <U12AD> # key k (base character ከ)
+<c> <U12C8> : "ው" <U12CD> # key w (base character ወ)
+<c> <U12D8> : "ዝ" <U12DD> # key z (base character ዘ)
+<c> <U12E8> : "ይ" <U12ED> # key y (base character የ)
+<c> <U12F0> : "ድ" <U12F5> # key d (base character ደ)
+<c> <U1300> : "ጅ" <U1305> # key j (base character ጀ)
+<c> <U1308> : "ግ" <U130D> # key g (base character ገ)
+<c> <U1340> : "ፅ" <U1345> # key [ (base character ፀ)
+<c> <U1348> : "ፍ" <U134D> # key f (base character ፈ)
+<c> <U1350> : "ፕ" <U1355> # key p (base character ፐ)
+<c> <U1238> : "ሽ" <U123D> # key v (base character ሸ)
+<c> <U1328> : "ጭ" <U132D> # key ] (base character ጨ)
+
+XCOMM Modifier: /o/
+<o> <U1200> : "ሆ" <U1206> # key h (base character ሀ)
+<o> <U1208> : "ሎ" <U120E> # key l (base character ለ)
+<o> <U1218> : "ሞ" <U121E> # key m (base character መ)
+<o> <U1228> : "ሮ" <U122E> # key r (base character ረ)
+<o> <U1230> : "ሶ" <U1236> # key s (base character ሰ)
+<o> <U1240> : "ቆ" <U1246> # key q (base character ቀ)
+<o> <U1260> : "ቦ" <U1266> # key b (base character በ)
+<o> <U1270> : "ቶ" <U1276> # key t (base character ተ)
+<o> <U1290> : "ኖ" <U1296> # key n (base character ነ)
+<o> <U12A0> : "ኦ" <U12A6> # key x (base character አ)
+<o> <U12A8> : "ኮ" <U12AE> # key k (base character ከ)
+<o> <U12C8> : "ዎ" <U12CE> # key w (base character ወ)
+<o> <U12D8> : "ዞ" <U12DE> # key z (base character ዘ)
+<o> <U12E8> : "ዮ" <U12EE> # key y (base character የ)
+<o> <U12F0> : "ዶ" <U12F6> # key d (base character ደ)
+<o> <U1300> : "ጆ" <U1306> # key j (base character ጀ)
+<o> <U1308> : "ጎ" <U130E> # key g (base character ገ)
+<o> <U1340> : "ፆ" <U1346> # key [ (base character ፀ)
+<o> <U1348> : "ፎ" <U134E> # key f (base character ፈ)
+<o> <U1350> : "ፖ" <U1356> # key p (base character ፐ)
+<o> <U1238> : "ሾ" <U123E> # key v (base character ሸ)
+<o> <U1328> : "ጮ" <U132E> # key ] (base character ጨ)
+
+XCOMM Modifier: /A/
+<A> <U1208> : "ሏ" <U120F> # key l (base character ለ)
+<A> <U1218> : "ሟ" <U121F> # key m (base character መ)
+<A> <U1228> : "ሯ" <U122F> # key r (base character ረ)
+<A> <U1230> : "ሷ" <U1237> # key s (base character ሰ)
+<A> <U1240> : "ቋ" <U124B> # key q (base character ቀ)
+<A> <U1260> : "ቧ" <U1267> # key b (base character በ)
+<A> <U1270> : "ቷ" <U1277> # key t (base character ተ)
+<A> <U1290> : "ኗ" <U1297> # key n (base character ነ)
+<A> <U12A0> : "ኧ" <U12A7> # key x (base character አ)
+<A> <U12A8> : "ኳ" <U12B3> # key k (base character ከ)
+<A> <U12D8> : "ዟ" <U12DF> # key z (base character ዘ)
+<A> <U12F0> : "ዷ" <U12F7> # key d (base character ደ)
+<A> <U1300> : "ጇ" <U1307> # key j (base character ጀ)
+<A> <U1308> : "ጓ" <U1313> # key g (base character ገ)
+<A> <U1348> : "ፏ" <U134F> # key f (base character ፈ)
+<A> <U1350> : "ፗ" <U1357> # key p (base character ፐ)
+<A> <U1238> : "ሿ" <U123F> # key v (base character ሸ)
+<A> <U1328> : "ጯ" <U132F> # key ] (base character ጨ)
+
+XCOMM Modifier: /U/
+<U> <U1240> : "ቍ" <U124D> # key q (base character ቀ)
+<U> <U12A8> : "ኵ" <U12B5> # key k (base character ከ)
+<U> <U1308> : "ጕ" <U1315> # key g (base character ገ)
+
+XCOMM Modifier: /I/
+<I> <U1240> : "ቊ" <U124A> # key q (base character ቀ)
+<I> <U12A8> : "ኲ" <U12B2> # key k (base character ከ)
+<I> <U1308> : "ጒ" <U1312> # key g (base character ገ)
+
+XCOMM Modifier: /E/
+<E> <U1240> : "ቌ" <U124C> # key q (base character ቀ)
+<E> <U12A8> : "ኴ" <U12B4> # key k (base character ከ)
+<E> <U1308> : "ጔ" <U1314> # key g (base character ገ)
+
+XCOMM Modifier: /O/
+<O> <U1240> : "ቈ" <U1248> # key q (base character ቀ)
+<O> <U12A8> : "ኰ" <U12B0> # key k (base character ከ)
+<O> <U1308> : "ጐ" <U1310> # key g (base character ገ)
+
+XCOMM
+XCOMM Group II
+XCOMM
+XCOMM Modifier: /u/
+<u> <U1210> : "ሑ" <U1211> # key h (base character ሐ)
+<u> <U1220> : "ሡ" <U1221> # key s (base character ሠ)
+<u> <U1250> : "ቑ" <U1251> # key q (base character ቐ)
+<u> <U1278> : "ቹ" <U1279> # key c (base character ቸ)
+<u> <U1320> : "ጡ" <U1321> # key t (base character ጠ)
+<u> <U1298> : "ኙ" <U1299> # key n (base character ኘ)
+<u> <U12D0> : "ዑ" <U12D1> # key x (base character ዐ)
+<u> <U12B8> : "ኹ" <U12B9> # key k (base character ኸ)
+<u> <U12E0> : "ዡ" <U12E1> # key z (base character ዠ)
+<u> <U12F8> : "ዹ" <U12F9> # key d (base character ዸ)
+<u> <U1318> : "ጙ" <U1319> # key g (base character ጘ)
+<u> <U1338> : "ጹ" <U1339> # key [ (base character ጸ)
+<u> <U1330> : "ጱ" <U1331> # key p (base character ጰ)
+<u> <U1280> : "ኁ" <U1281> # key ] (base character ኀ)
+<u> <U1268> : "ቩ" <U1269> # key v (base character ቨ)
+
+XCOMM Modifier: /i/
+<i> <U1210> : "ሒ" <U1212> # key h (base character ሐ)
+<i> <U1220> : "ሢ" <U1222> # key s (base character ሠ)
+<i> <U1250> : "ቒ" <U1252> # key q (base character ቐ)
+<i> <U1278> : "ቺ" <U127A> # key c (base character ቸ)
+<i> <U1320> : "ጢ" <U1322> # key t (base character ጠ)
+<i> <U1298> : "ኚ" <U129A> # key n (base character ኘ)
+<i> <U12D0> : "ዒ" <U12D2> # key x (base character ዐ)
+<i> <U12B8> : "ኺ" <U12BA> # key k (base character ኸ)
+<i> <U12E0> : "ዢ" <U12E2> # key z (base character ዠ)
+<i> <U12F8> : "ዺ" <U12FA> # key d (base character ዸ)
+<i> <U1318> : "ጚ" <U131A> # key g (base character ጘ)
+<i> <U1338> : "ጺ" <U133A> # key [ (base character ጸ)
+<i> <U1330> : "ጲ" <U1332> # key p (base character ጰ)
+<i> <U1280> : "ኂ" <U1282> # key ] (base character ኀ)
+<i> <U1268> : "ቪ" <U126A> # key v (base character ቨ)
+
+XCOMM Modifier: /a/
+<a> <U1210> : "ሓ" <U1213> # key h (base character ሐ)
+<a> <U1220> : "ሣ" <U1223> # key s (base character ሠ)
+<a> <U1250> : "ቓ" <U1253> # key q (base character ቐ)
+<a> <U1278> : "ቻ" <U127B> # key c (base character ቸ)
+<a> <U1320> : "ጣ" <U1323> # key t (base character ጠ)
+<a> <U1298> : "ኛ" <U129B> # key n (base character ኘ)
+<a> <U12D0> : "ዓ" <U12D3> # key x (base character ዐ)
+<a> <U12B8> : "ኻ" <U12BB> # key k (base character ኸ)
+<a> <U12E0> : "ዣ" <U12E3> # key z (base character ዠ)
+<a> <U12F8> : "ዻ" <U12FB> # key d (base character ዸ)
+<a> <U1318> : "ጛ" <U131B> # key g (base character ጘ)
+<a> <U1338> : "ጻ" <U133B> # key [ (base character ጸ)
+<a> <U1330> : "ጳ" <U1333> # key p (base character ጰ)
+<a> <U1280> : "ኃ" <U1283> # key ] (base character ኀ)
+<a> <U1268> : "ቫ" <U126B> # key v (base character ቨ)
+
+XCOMM Modifier: /e/
+<e> <U1210> : "ሔ" <U1214> # key h (base character ሐ)
+<e> <U1220> : "ሤ" <U1224> # key s (base character ሠ)
+<e> <U1250> : "ቔ" <U1254> # key q (base character ቐ)
+<e> <U1278> : "ቼ" <U127C> # key c (base character ቸ)
+<e> <U1320> : "ጤ" <U1324> # key t (base character ጠ)
+<e> <U1298> : "ኜ" <U129C> # key n (base character ኘ)
+<e> <U12D0> : "ዔ" <U12D4> # key x (base character ዐ)
+<e> <U12B8> : "ኼ" <U12BC> # key k (base character ኸ)
+<e> <U12E0> : "ዤ" <U12E4> # key z (base character ዠ)
+<e> <U12F8> : "ዼ" <U12FC> # key d (base character ዸ)
+<e> <U1318> : "ጜ" <U131C> # key g (base character ጘ)
+<e> <U1338> : "ጼ" <U133C> # key [ (base character ጸ)
+<e> <U1330> : "ጴ" <U1334> # key p (base character ጰ)
+<e> <U1280> : "ኄ" <U1284> # key ] (base character ኀ)
+<e> <U1268> : "ቬ" <U126C> # key v (base character ቨ)
+
+XCOMM Modifier: /c/
+<c> <U1210> : "ሕ" <U1215> # key h (base character ሐ)
+<c> <U1220> : "ሥ" <U1225> # key s (base character ሠ)
+<c> <U1250> : "ቕ" <U1255> # key q (base character ቐ)
+<c> <U1278> : "ች" <U127D> # key c (base character ቸ)
+<c> <U1320> : "ጥ" <U1325> # key t (base character ጠ)
+<c> <U1298> : "ኝ" <U129D> # key n (base character ኘ)
+<c> <U12D0> : "ዕ" <U12D5> # key x (base character ዐ)
+<c> <U12B8> : "ኽ" <U12BD> # key k (base character ኸ)
+<c> <U12E0> : "ዥ" <U12E5> # key z (base character ዠ)
+<c> <U12F8> : "ዽ" <U12FD> # key d (base character ዸ)
+<c> <U1318> : "ጝ" <U131D> # key g (base character ጘ)
+<c> <U1338> : "ጽ" <U133D> # key [ (base character ጸ)
+<c> <U1330> : "ጵ" <U1335> # key p (base character ጰ)
+<c> <U1280> : "ኅ" <U1285> # key ] (base character ኀ)
+<c> <U1268> : "ቭ" <U126D> # key v (base character ቨ)
+
+XCOMM Modifier: /o/
+<o> <U1210> : "ሖ" <U1216> # key h (base character ሐ)
+<o> <U1220> : "ሦ" <U1226> # key s (base character ሠ)
+<o> <U1250> : "ቖ" <U1256> # key q (base character ቐ)
+<o> <U1278> : "ቾ" <U127E> # key c (base character ቸ)
+<o> <U1320> : "ጦ" <U1326> # key t (base character ጠ)
+<o> <U1298> : "ኞ" <U129E> # key n (base character ኘ)
+<o> <U12D0> : "ዖ" <U12D6> # key x (base character ዐ)
+<o> <U12B8> : "ኾ" <U12BE> # key k (base character ኸ)
+<o> <U12E0> : "ዦ" <U12E6> # key z (base character ዠ)
+<o> <U12F8> : "ዾ" <U12FE> # key d (base character ዸ)
+<o> <U1318> : "ጞ" <U131E> # key g (base character ጘ)
+<o> <U1338> : "ጾ" <U133E> # key [ (base character ጸ)
+<o> <U1330> : "ጶ" <U1336> # key p (base character ጰ)
+<o> <U1280> : "ኆ" <U1286> # key ] (base character ኀ)
+<o> <U1268> : "ቮ" <U126E> # key v (base character ቨ)
+
+XCOMM Modifier: /A/
+<A> <U1210> : "ሗ" <U1217> # key h (base character ሐ)
+<A> <U1220> : "ሧ" <U1227> # key s (base character ሠ)
+<A> <U1250> : "ቛ" <U125B> # key q (base character ቐ)
+<A> <U1278> : "ቿ" <U127F> # key c (base character ቸ)
+<A> <U1320> : "ጧ" <U1327> # key t (base character ጠ)
+<A> <U1298> : "ኟ" <U129F> # key n (base character ኘ)
+<A> <U12B8> : "ዃ" <U12C3> # key k (base character ኸ)
+<A> <U12E0> : "ዧ" <U12E7> # key z (base character ዠ)
+<A> <U12F8> : "ዿ" <U12FF> # key d (base character ዸ)
+<A> <U1338> : "ጿ" <U133F> # key [ (base character ጸ)
+<A> <U1330> : "ጷ" <U1337> # key p (base character ጰ)
+<A> <U1280> : "ኋ" <U128B> # key ] (base character ኀ)
+<A> <U1268> : "ቯ" <U126F> # key v (base character ቨ)
+
+XCOMM Modifier: /U/
+<U> <U1250> : "ቝ" <U125D> # key q (base character ቐ)
+<U> <U12B8> : "ዅ" <U12C5> # key k (base character ኸ)
+
+XCOMM Modifier: /I/
+<I> <U1250> : "ቚ" <U125A> # key q (base character ቐ)
+<I> <U12B8> : "ዂ" <U12C2> # key k (base character ኸ)
+
+XCOMM Modifier: /E/
+<E> <U1250> : "ቜ" <U125C> # key q (base character ቐ)
+<E> <U12B8> : "ዄ" <U12C4> # key k (base character ኸ)
+
+XCOMM Modifier: /O/
+<O> <U1250> : "ቘ" <U1258> # key q (base character ቐ)
+<O> <U12B8> : "ዀ" <U12C0> # key k (base character ኸ)
+
+XCOMM
+XCOMM Group III
+XCOMM 
+<backslash> <quotedbl> : "፥" <U1365> # key "
+<backslash> <apostrophe> : "፦" <U1366> # key "
+<backslash> <minus> : "|" <U007C> # key -
+<backslash> <underscore> : "¥" <U00A5> # key _
+<backslash> <question> : "፧" <U1367> # key ?

lib/libX11/nls/am_ET.UTF-8/Makefile.am

@@ -0,0 +1,3 @@
+x11thislocaledir = $(X11_LOCALEDATADIR)/am_ET.UTF-8
+
+include $(top_srcdir)/nls/localerules.in

lib/libX11/nls/am_ET.UTF-8/Makefile.in

@@ -0,0 +1,480 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005  Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+#							-*- Makefile -*-
+# Rules for generating files using the C pre-processor
+# (Replaces CppFileTarget from Imake)
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+DIST_COMMON = $(dist_x11thislocale_DATA) $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in $(top_srcdir)/cpprules.in \
+	$(top_srcdir)/nls/localerules.in
+subdir = nls/am_ET.UTF-8
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/src/config.h \
+	$(top_builddir)/include/X11/XlibConf.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(x11thislocaledir)" \
+	"$(DESTDIR)$(x11thislocaledir)"
+dist_x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
+x11thislocaleDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(dist_x11thislocale_DATA) $(x11thislocale_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
+ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+APP_MAN_DIR = @APP_MAN_DIR@
+APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
+BIGFONT_LIBS = @BIGFONT_LIBS@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
+DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+FILE_MAN_DIR = @FILE_MAN_DIR@
+FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+I18N_MODULE_LIBS = @I18N_MODULE_LIBS@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIB_MAN_DIR = @LIB_MAN_DIR@
+LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
+LINT = @LINT@
+LINTLIB = @LINTLIB@
+LINT_FALSE = @LINT_FALSE@
+LINT_FLAGS = @LINT_FLAGS@
+LINT_TRUE = @LINT_TRUE@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
+MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
+MANPAGES_FALSE = @MANPAGES_FALSE@
+MANPAGES_TRUE = @MANPAGES_TRUE@
+MISC_MAN_DIR = @MISC_MAN_DIR@
+MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
+OBJEXT = @OBJEXT@
+OS2_FALSE = @OS2_FALSE@
+OS2_TRUE = @OS2_TRUE@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+RANLIB = @RANLIB@
+RAWCPP = @RAWCPP@
+RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+THRSTUBS_FALSE = @THRSTUBS_FALSE@
+THRSTUBS_TRUE = @THRSTUBS_TRUE@
+UDC_FALSE = @UDC_FALSE@
+UDC_TRUE = @UDC_TRUE@
+VERSION = @VERSION@
+WCHAR32 = @WCHAR32@
+X11_CFLAGS = @X11_CFLAGS@
+X11_DATADIR = @X11_DATADIR@
+X11_EXTRA_DEPS = @X11_EXTRA_DEPS@
+X11_LIBDIR = @X11_LIBDIR@
+X11_LIBS = @X11_LIBS@
+X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
+X11_LOCALEDIR = @X11_LOCALEDIR@
+X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
+XCB_FALSE = @XCB_FALSE@
+XCB_TRUE = @XCB_TRUE@
+XCMS_FALSE = @XCMS_FALSE@
+XCMS_TRUE = @XCMS_TRUE@
+XDMCP_CFLAGS = @XDMCP_CFLAGS@
+XDMCP_LIBS = @XDMCP_LIBS@
+XERRORDB = @XERRORDB@
+XKBPROTO_CFLAGS = @XKBPROTO_CFLAGS@
+XKBPROTO_LIBS = @XKBPROTO_LIBS@
+XKBPROTO_REQUIRES = @XKBPROTO_REQUIRES@
+XKB_FALSE = @XKB_FALSE@
+XKB_TRUE = @XKB_TRUE@
+XKEYSYMDB = @XKEYSYMDB@
+XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
+XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
+XLOCALEDATADIR = @XLOCALEDATADIR@
+XLOCALEDIR = @XLOCALEDIR@
+XLOCALELIBDIR = @XLOCALELIBDIR@
+XLOCALE_FALSE = @XLOCALE_FALSE@
+XLOCALE_TRUE = @XLOCALE_TRUE@
+XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
+XPROTO_CFLAGS = @XPROTO_CFLAGS@
+XPROTO_LIBS = @XPROTO_LIBS@
+XTHREADLIB = @XTHREADLIB@
+XTHREADS = @XTHREADS@
+XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
+XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
+XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
+ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+x11thislocaledir = $(X11_LOCALEDATADIR)/am_ET.UTF-8
+SUFFIXES = .pre
+WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
+CPP_FILES_FLAGS = $(WCHAR32_FLAGS)
+
+# Translate XCOMM into pound sign with sed, rather than passing -DXCOMM=XCOMM
+# to cpp, because that trick does not work on all ANSI C preprocessors.
+# Delete line numbers from the cpp output (-P is not portable, I guess).
+# Allow XCOMM to be preceded by whitespace and provide a means of generating
+# output lines with trailing backslashes.
+# Allow XHASH to always be substituted, even in cases where XCOMM isn't.
+CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
+                       -e '/^\#line  *[0-9][0-9]*  *.*$$/d' \
+                       -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
+                       -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
+                       -e '/^[         ]*XHASH/s/XHASH/\#/' \
+                       -e '/\@\@$$/s/\@\@$$/\\/'
+
+EXTRA_DIST = XLC_LOCALE.pre Compose.pre
+dist_x11thislocale_DATA = XI18N_OBJS
+x11thislocale_DATA = XLC_LOCALE Compose
+CLEANFILES = XLC_LOCALE Compose
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .pre
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/nls/localerules.in $(top_srcdir)/cpprules.in $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
+		&& exit 0; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  nls/am_ET.UTF-8/Makefile'; \
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  nls/am_ET.UTF-8/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+install-dist_x11thislocaleDATA: $(dist_x11thislocale_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(x11thislocaledir)" || $(mkdir_p) "$(DESTDIR)$(x11thislocaledir)"
+	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(dist_x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
+	  $(dist_x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	done
+
+uninstall-dist_x11thislocaleDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_x11thislocale_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	done
+install-x11thislocaleDATA: $(x11thislocale_DATA)
+	@$(NORMAL_INSTALL)
+	test -z "$(x11thislocaledir)" || $(mkdir_p) "$(DESTDIR)$(x11thislocaledir)"
+	@list='$(x11thislocale_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f=$(am__strip_dir) \
+	  echo " $(x11thislocaleDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
+	  $(x11thislocaleDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	done
+
+uninstall-x11thislocaleDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(x11thislocale_DATA)'; for p in $$list; do \
+	  f=$(am__strip_dir) \
+	  echo " rm -f '$(DESTDIR)$(x11thislocaledir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(x11thislocaledir)/$$f"; \
+	done
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	$(mkdir_p) $(distdir)/../.. $(distdir)/../../nls
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkdir_p) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(x11thislocaledir)" "$(DESTDIR)$(x11thislocaledir)"; do \
+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-libtool
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-dist_x11thislocaleDATA \
+	install-x11thislocaleDATA
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-dist_x11thislocaleDATA uninstall-info-am \
+	uninstall-x11thislocaleDATA
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	distclean distclean-generic distclean-libtool distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dist_x11thislocaleDATA \
+	install-exec install-exec-am install-info install-info-am \
+	install-man install-strip install-x11thislocaleDATA \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-dist_x11thislocaleDATA uninstall-info-am \
+	uninstall-x11thislocaleDATA
+
+
+# Allow people to comment out lines by starting them with '##'
+.pre:
+	$(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:

lib/libX11/nls/armscii-8/Makefile.in

@@ -96,6 +96,7 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -119,6 +121,7 @@ LIBTOOL = @LIBTOOL@
 LIB_MAN_DIR = @LIB_MAN_DIR@
 LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
+LINTLIB = @LINTLIB@
 LINT_FALSE = @LINT_FALSE@
 LINT_FLAGS = @LINT_FLAGS@
 LINT_TRUE = @LINT_TRUE@
@@ -128,11 +131,14 @@ MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
 MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MANPAGES_FALSE = @MANPAGES_FALSE@
 MANPAGES_TRUE = @MANPAGES_TRUE@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 OS2_FALSE = @OS2_FALSE@
 OS2_TRUE = @OS2_TRUE@
@@ -147,6 +153,7 @@ PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -195,7 +202,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
 ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
 ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -237,7 +246,6 @@ sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 x11thislocaledir = $(X11_LOCALEDATADIR)/armscii-8
-SED = sed
 SUFFIXES = .pre
 WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
 CPP_FILES_FLAGS = $(WCHAR32_FLAGS)

lib/libX11/nls/compose.dir.pre

@@ -32,8 +32,14 @@ iso8859-1/Compose:		br_FR.ISO8859-1
 iso8859-14/Compose:		br_FR.ISO8859-14
 iso8859-15/Compose:		br_FR.ISO8859-15
 iso8859-2/Compose:		bs_BA.ISO8859-2
+iso8859-1/Compose:		ca_AD.ISO8859-1
+iso8859-15/Compose:		ca_AD.ISO8859-15
 iso8859-1/Compose:		ca_ES.ISO8859-1
 iso8859-15/Compose:		ca_ES.ISO8859-15
+iso8859-1/Compose:		ca_FR.ISO8859-1
+iso8859-15/Compose:		ca_FR.ISO8859-15
+iso8859-1/Compose:		ca_IT.ISO8859-1
+iso8859-15/Compose:		ca_IT.ISO8859-15
 iso8859-2/Compose:		cs_CZ.ISO8859-2
 iso8859-1/Compose:		cy_GB.ISO8859-1
 iso8859-14/Compose:		cy_GB.ISO8859-14
@@ -258,7 +264,10 @@ en_US.UTF-8/Compose:		be_BY.UTF-8
 en_US.UTF-8/Compose:		bg_BG.UTF-8
 en_US.UTF-8/Compose:		bn_IN.UTF-8
 en_US.UTF-8/Compose:		br_FR.UTF-8
+en_US.UTF-8/Compose:		ca_AD.UTF-8
 en_US.UTF-8/Compose:		ca_ES.UTF-8
+en_US.UTF-8/Compose:		ca_FR.UTF-8
+en_US.UTF-8/Compose:		ca_IT.UTF-8
 en_US.UTF-8/Compose:		cs_CZ.UTF-8
 en_US.UTF-8/Compose:		cy_GB.UTF-8
 en_US.UTF-8/Compose:		cz_CZ.UTF-8

lib/libX11/nls/el_GR.UTF-8/Makefile.in

@@ -96,6 +96,7 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -119,6 +121,7 @@ LIBTOOL = @LIBTOOL@
 LIB_MAN_DIR = @LIB_MAN_DIR@
 LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
+LINTLIB = @LINTLIB@
 LINT_FALSE = @LINT_FALSE@
 LINT_FLAGS = @LINT_FLAGS@
 LINT_TRUE = @LINT_TRUE@
@@ -128,11 +131,14 @@ MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
 MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MANPAGES_FALSE = @MANPAGES_FALSE@
 MANPAGES_TRUE = @MANPAGES_TRUE@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 OS2_FALSE = @OS2_FALSE@
 OS2_TRUE = @OS2_TRUE@
@@ -147,6 +153,7 @@ PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -195,7 +202,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
 ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
 ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -237,7 +246,6 @@ sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 x11thislocaledir = $(X11_LOCALEDATADIR)/el_GR.UTF-8
-SED = sed
 SUFFIXES = .pre
 WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
 CPP_FILES_FLAGS = $(WCHAR32_FLAGS)

lib/libX11/nls/en_US.UTF-8/Makefile.in

@@ -96,6 +96,7 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -119,6 +121,7 @@ LIBTOOL = @LIBTOOL@
 LIB_MAN_DIR = @LIB_MAN_DIR@
 LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
+LINTLIB = @LINTLIB@
 LINT_FALSE = @LINT_FALSE@
 LINT_FLAGS = @LINT_FLAGS@
 LINT_TRUE = @LINT_TRUE@
@@ -128,11 +131,14 @@ MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
 MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MANPAGES_FALSE = @MANPAGES_FALSE@
 MANPAGES_TRUE = @MANPAGES_TRUE@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 OS2_FALSE = @OS2_FALSE@
 OS2_TRUE = @OS2_TRUE@
@@ -147,6 +153,7 @@ PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -195,7 +202,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
 ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
 ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -237,7 +246,6 @@ sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 x11thislocaledir = $(X11_LOCALEDATADIR)/en_US.UTF-8
-SED = sed
 SUFFIXES = .pre
 WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
 CPP_FILES_FLAGS = $(WCHAR32_FLAGS)

lib/libX11/nls/georgian-academy/Makefile.in

@@ -96,6 +96,7 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -119,6 +121,7 @@ LIBTOOL = @LIBTOOL@
 LIB_MAN_DIR = @LIB_MAN_DIR@
 LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
+LINTLIB = @LINTLIB@
 LINT_FALSE = @LINT_FALSE@
 LINT_FLAGS = @LINT_FLAGS@
 LINT_TRUE = @LINT_TRUE@
@@ -128,11 +131,14 @@ MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
 MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MANPAGES_FALSE = @MANPAGES_FALSE@
 MANPAGES_TRUE = @MANPAGES_TRUE@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 OS2_FALSE = @OS2_FALSE@
 OS2_TRUE = @OS2_TRUE@
@@ -147,6 +153,7 @@ PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -195,7 +202,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
 ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
 ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -237,7 +246,6 @@ sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 x11thislocaledir = $(X11_LOCALEDATADIR)/georgian-academy
-SED = sed
 SUFFIXES = .pre
 WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
 CPP_FILES_FLAGS = $(WCHAR32_FLAGS)

lib/libX11/nls/georgian-ps/Makefile.in

@@ -96,6 +96,7 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -119,6 +121,7 @@ LIBTOOL = @LIBTOOL@
 LIB_MAN_DIR = @LIB_MAN_DIR@
 LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
+LINTLIB = @LINTLIB@
 LINT_FALSE = @LINT_FALSE@
 LINT_FLAGS = @LINT_FLAGS@
 LINT_TRUE = @LINT_TRUE@
@@ -128,11 +131,14 @@ MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
 MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MANPAGES_FALSE = @MANPAGES_FALSE@
 MANPAGES_TRUE = @MANPAGES_TRUE@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 OS2_FALSE = @OS2_FALSE@
 OS2_TRUE = @OS2_TRUE@
@@ -147,6 +153,7 @@ PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -195,7 +202,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
 ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
 ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -237,7 +246,6 @@ sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 x11thislocaledir = $(X11_LOCALEDATADIR)/georgian-ps
-SED = sed
 SUFFIXES = .pre
 WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
 CPP_FILES_FLAGS = $(WCHAR32_FLAGS)

lib/libX11/nls/ibm-cp1133/Makefile.in

@@ -96,6 +96,7 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -119,6 +121,7 @@ LIBTOOL = @LIBTOOL@
 LIB_MAN_DIR = @LIB_MAN_DIR@
 LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
+LINTLIB = @LINTLIB@
 LINT_FALSE = @LINT_FALSE@
 LINT_FLAGS = @LINT_FLAGS@
 LINT_TRUE = @LINT_TRUE@
@@ -128,11 +131,14 @@ MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
 MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MANPAGES_FALSE = @MANPAGES_FALSE@
 MANPAGES_TRUE = @MANPAGES_TRUE@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 OS2_FALSE = @OS2_FALSE@
 OS2_TRUE = @OS2_TRUE@
@@ -147,6 +153,7 @@ PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -195,7 +202,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
 ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
 ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -237,7 +246,6 @@ sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 x11thislocaledir = $(X11_LOCALEDATADIR)/ibm-cp1133
-SED = sed
 SUFFIXES = .pre
 WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
 CPP_FILES_FLAGS = $(WCHAR32_FLAGS)

lib/libX11/nls/iscii-dev/Makefile.in

@@ -96,6 +96,7 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -119,6 +121,7 @@ LIBTOOL = @LIBTOOL@
 LIB_MAN_DIR = @LIB_MAN_DIR@
 LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
+LINTLIB = @LINTLIB@
 LINT_FALSE = @LINT_FALSE@
 LINT_FLAGS = @LINT_FLAGS@
 LINT_TRUE = @LINT_TRUE@
@@ -128,11 +131,14 @@ MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
 MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MANPAGES_FALSE = @MANPAGES_FALSE@
 MANPAGES_TRUE = @MANPAGES_TRUE@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 OS2_FALSE = @OS2_FALSE@
 OS2_TRUE = @OS2_TRUE@
@@ -147,6 +153,7 @@ PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -195,7 +202,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
 ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
 ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -237,7 +246,6 @@ sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 x11thislocaledir = $(X11_LOCALEDATADIR)/iscii-dev
-SED = sed
 SUFFIXES = .pre
 WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
 CPP_FILES_FLAGS = $(WCHAR32_FLAGS)

lib/libX11/nls/isiri-3342/Makefile.in

@@ -96,6 +96,7 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -119,6 +121,7 @@ LIBTOOL = @LIBTOOL@
 LIB_MAN_DIR = @LIB_MAN_DIR@
 LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
+LINTLIB = @LINTLIB@
 LINT_FALSE = @LINT_FALSE@
 LINT_FLAGS = @LINT_FLAGS@
 LINT_TRUE = @LINT_TRUE@
@@ -128,11 +131,14 @@ MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
 MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MANPAGES_FALSE = @MANPAGES_FALSE@
 MANPAGES_TRUE = @MANPAGES_TRUE@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 OS2_FALSE = @OS2_FALSE@
 OS2_TRUE = @OS2_TRUE@
@@ -147,6 +153,7 @@ PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -195,7 +202,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
 ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
 ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -237,7 +246,6 @@ sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 x11thislocaledir = $(X11_LOCALEDATADIR)/isiri-3342
-SED = sed
 SUFFIXES = .pre
 WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
 CPP_FILES_FLAGS = $(WCHAR32_FLAGS)

lib/libX11/nls/iso8859-1/Makefile.in

@@ -96,6 +96,7 @@ DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+DSYMUTIL = @DSYMUTIL@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -112,6 +113,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 KEYSYMDEF = @KEYSYMDEF@
+LAUNCHD = @LAUNCHD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -119,6 +121,7 @@ LIBTOOL = @LIBTOOL@
 LIB_MAN_DIR = @LIB_MAN_DIR@
 LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
 LINT = @LINT@
+LINTLIB = @LINTLIB@
 LINT_FALSE = @LINT_FALSE@
 LINT_FLAGS = @LINT_FLAGS@
 LINT_TRUE = @LINT_TRUE@
@@ -128,11 +131,14 @@ MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
+MAKE_LINT_LIB_FALSE = @MAKE_LINT_LIB_FALSE@
+MAKE_LINT_LIB_TRUE = @MAKE_LINT_LIB_TRUE@
 MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
 MANPAGES_FALSE = @MANPAGES_FALSE@
 MANPAGES_TRUE = @MANPAGES_TRUE@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+NMEDIT = @NMEDIT@
 OBJEXT = @OBJEXT@
 OS2_FALSE = @OS2_FALSE@
 OS2_TRUE = @OS2_TRUE@
@@ -147,6 +153,7 @@ PKG_CONFIG = @PKG_CONFIG@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
+SED = sed
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
@@ -195,7 +202,9 @@ XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
 ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DSYMUTIL = @ac_ct_DSYMUTIL@
 ac_ct_F77 = @ac_ct_F77@
+ac_ct_NMEDIT = @ac_ct_NMEDIT@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
 ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
@@ -237,7 +246,6 @@ sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 x11thislocaledir = $(X11_LOCALEDATADIR)/iso8859-1
-SED = sed
 SUFFIXES = .pre
 WCHAR32_FLAGS = -DWCHAR32=@WCHAR32@
 CPP_FILES_FLAGS = $(WCHAR32_FLAGS)