update to libX11 1.2.1

5 files changed, 29 insertions, 16 deletions

diff --git a/lib/libX11/man/xkb/Makefile.in b/lib/libX11/man/xkb/Makefile.in
index 5a99a1feb..a4e2edc90 100644
--- a/lib/libX11/man/xkb/Makefile.in
+++ b/lib/libX11/man/xkb/Makefile.in
@@ -84,9 +84,12 @@ BIGFONT_CFLAGS = @BIGFONT_CFLAGS@
 BIGFONT_LIBS = @BIGFONT_LIBS@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
+CC_FOR_BUILD = @CC_FOR_BUILD@
 CFLAGS = @CFLAGS@
+CHANGELOG_CMD = @CHANGELOG_CMD@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
+CWARNFLAGS = @CWARNFLAGS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
@@ -94,6 +97,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DOLT_BASH = @DOLT_BASH@
 DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
 DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
 DSYMUTIL = @DSYMUTIL@
@@ -107,6 +111,7 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+GREP = @GREP@
 I18N_MODULE_LIBS = @I18N_MODULE_LIBS@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -126,6 +131,8 @@ LINT_FALSE = @LINT_FALSE@
 LINT_FLAGS = @LINT_FLAGS@
 LINT_TRUE = @LINT_TRUE@
 LN_S = @LN_S@
+LTCOMPILE = @LTCOMPILE@
+LTCXXCOMPILE = @LTCXXCOMPILE@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
@@ -195,19 +202,11 @@ 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@
@@ -224,23 +223,31 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 datadir = @datadir@
+datarootdir = @datarootdir@
+distcleancheck_listfiles = @distcleancheck_listfiles@
+docdir = @docdir@
+dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
 host_os = @host_os@
 host_vendor = @host_vendor@
+htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
+psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
@@ -469,6 +476,7 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
                        -e '/^[         ]*XCOMM$$/s/XCOMM/\#/' \
                        -e '/^[         ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/\#/' \
                        -e '/^[         ]*XHASH/s/XHASH/\#/' \
+                       -e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \
                        -e '/\@\@$$/s/\@\@$$/\\/'
 
 XORGRELSTRING = @PACKAGE_STRING@
@@ -661,9 +669,8 @@ uninstall-am: uninstall-info-am uninstall-libmanDATA
 	uninstall uninstall-am uninstall-info-am uninstall-libmanDATA
 
 
-# Allow people to comment out lines by starting them with '##'
 .pre:
-	$(SED) -e '/^\#\#/d' $< | $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) | $(CPP_SED_MAGIC) > $@
+	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
 
 .man.$(LIB_MAN_SUFFIX):
 	$(RAWCPP) $(RAWCPPFLAGS) $(CPP_MAN_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
diff --git a/lib/libX11/man/xkb/XkbGetIndicatorState.man b/lib/libX11/man/xkb/XkbGetIndicatorState.man
index cd40d1553..ad2e0aa7c 100644
--- a/lib/libX11/man/xkb/XkbGetIndicatorState.man
+++ b/lib/libX11/man/xkb/XkbGetIndicatorState.man
@@ -75,8 +75,8 @@ for the state of the indicators on the device specified by the
 For each indicator that is "turned on" on the device, the associated bit is set 
 in 
 .I state_return. 
-If a compatible version of the Xkb extension is not available in the server, .I 
-XkbGetIndicatorState 
+If a compatible version of the Xkb extension is not available in the server,
+.I XkbGetIndicatorState
 returns a BadMatch error. Otherwise, it sends the request to the X server, 
 places the state of the indicators into 
 .I state_return, 
diff --git a/lib/libX11/man/xkb/XkbSAGroup.man b/lib/libX11/man/xkb/XkbSAGroup.man
index 4ba96eb29..a3608c9a3 100644
--- a/lib/libX11/man/xkb/XkbSAGroup.man
+++ b/lib/libX11/man/xkb/XkbSAGroup.man
@@ -64,4 +64,7 @@ pressed and released:
 */
         char             group_XXX;  /\(** represents a group index or delta */
     } XkbGroupAction;
-    
\ No newline at end of file
+   
+.SH WARNING
+.LP
+This manpage seems to be incomplete
diff --git a/lib/libX11/man/xkb/XkbSASetGroup.man b/lib/libX11/man/xkb/XkbSASetGroup.man
index e4bd0d452..01e86d935 100644
--- a/lib/libX11/man/xkb/XkbSASetGroup.man
+++ b/lib/libX11/man/xkb/XkbSASetGroup.man
@@ -69,4 +69,7 @@ pressed and released:
         unsigned char    flags;      /\(** with type, controls the effect on groups */
         char             group_XXX;  /\(** represents a group index or delta */
     } XkbGroupAction;
-    
\ No newline at end of file
+    
+.SH WARNING
+.LP
+This manpage seems to be incomplete
diff --git a/lib/libX11/man/xkb/XkbSetIndicatorMap.man b/lib/libX11/man/xkb/XkbSetIndicatorMap.man
index 978d6d46e..d419cc7b6 100644
--- a/lib/libX11/man/xkb/XkbSetIndicatorMap.man
+++ b/lib/libX11/man/xkb/XkbSetIndicatorMap.man
@@ -111,7 +111,7 @@ c s s
 c s s
 l l l
 l l lw(3i).
-Table 2 XkbIidocatorMapRec which_mods and mods,
+Table 2 XkbIndicatorMapRec which_mods and mods,
 Indicator Drives Keyboard
 _
 which_mods	New State	Effect on Keyboard Modifiers
@@ -191,4 +191,4 @@ sends the corresponding indicator map from the
 .I desc 
 parameter to the server.
 .SH "SEE ALSO"
-.BR XkbSetNamedIndicator (__libmansuffix__)
\ No newline at end of file
+.BR XkbSetNamedIndicator (__libmansuffix__)