Update to libx11 1.4.2. Tested by ajacoutot@, jasper@ krw@, landry@,

shadchin@ on various architectures.
Bump major.

15 files changed, 34 insertions, 56 deletions

diff --git a/lib/libX11/src/xlibi18n/ICWrap.c b/lib/libX11/src/xlibi18n/ICWrap.c
index 018f89a6b..1eacfa5f1 100644
--- a/lib/libX11/src/xlibi18n/ICWrap.c
+++ b/lib/libX11/src/xlibi18n/ICWrap.c
@@ -61,7 +61,6 @@ from The Open Group.
 
 */
 
-#define NEED_EVENTS
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
diff --git a/lib/libX11/src/xlibi18n/Makefile.am b/lib/libX11/src/xlibi18n/Makefile.am
index 9a27a1308..853953adc 100644
--- a/lib/libX11/src/xlibi18n/Makefile.am
+++ b/lib/libX11/src/xlibi18n/Makefile.am
@@ -12,7 +12,6 @@ AM_CPPFLAGS= \
 AM_CFLAGS= \
 	$(X11_CFLAGS) \
 	$(BIGFONT_CFLAGS) \
-	$(XDMCP_CFLAGS) \
 	$(XMALLOC_ZERO_CFLAGS) \
 	$(CWARNFLAGS)
 
diff --git a/lib/libX11/src/xlibi18n/Makefile.in b/lib/libX11/src/xlibi18n/Makefile.in
index c9aa47b78..48050c851 100644
--- a/lib/libX11/src/xlibi18n/Makefile.in
+++ b/lib/libX11/src/xlibi18n/Makefile.in
@@ -23,9 +23,9 @@ 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_sh_DATA = ${SHELL} $(install_sh) -c -m 644
+install_sh_PROGRAM = ${SHELL} $(install_sh) -c
+install_sh_SCRIPT = ${SHELL} $(install_sh) -c
 INSTALL_HEADER = $(INSTALL_DATA)
 transform = $(program_transform_name)
 NORMAL_INSTALL = :
@@ -40,7 +40,7 @@ subdir = src/xlibi18n
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_define_dir.m4 \
-	$(top_srcdir)/m4/dolt.m4 $(top_srcdir)/configure.ac
+	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(install_sh) -d
@@ -95,6 +95,9 @@ depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
@@ -136,7 +139,6 @@ 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@
@@ -152,21 +154,18 @@ F77 = @F77@
 FFLAGS = @FFLAGS@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+FOP = @FOP@
 GREP = @GREP@
-GROFF = @GROFF@
-GS_PATH = @GS_PATH@
-HAVE_GROFF_FALSE = @HAVE_GROFF_FALSE@
-HAVE_GROFF_HTML_FALSE = @HAVE_GROFF_HTML_FALSE@
-HAVE_GROFF_HTML_TRUE = @HAVE_GROFF_HTML_TRUE@
-HAVE_GROFF_MM_FALSE = @HAVE_GROFF_MM_FALSE@
-HAVE_GROFF_MM_TRUE = @HAVE_GROFF_MM_TRUE@
-HAVE_GROFF_MS_FALSE = @HAVE_GROFF_MS_FALSE@
-HAVE_GROFF_MS_TRUE = @HAVE_GROFF_MS_TRUE@
-HAVE_GROFF_TRUE = @HAVE_GROFF_TRUE@
+HAVE_FOP_FALSE = @HAVE_FOP_FALSE@
+HAVE_FOP_TRUE = @HAVE_FOP_TRUE@
 HAVE_PERL_FALSE = @HAVE_PERL_FALSE@
 HAVE_PERL_TRUE = @HAVE_PERL_TRUE@
-HAVE_PS2PDF_FALSE = @HAVE_PS2PDF_FALSE@
-HAVE_PS2PDF_TRUE = @HAVE_PS2PDF_TRUE@
+HAVE_STYLESHEETS_FALSE = @HAVE_STYLESHEETS_FALSE@
+HAVE_STYLESHEETS_TRUE = @HAVE_STYLESHEETS_TRUE@
+HAVE_XMLTO_FALSE = @HAVE_XMLTO_FALSE@
+HAVE_XMLTO_TEXT_FALSE = @HAVE_XMLTO_TEXT_FALSE@
+HAVE_XMLTO_TEXT_TRUE = @HAVE_XMLTO_TEXT_TRUE@
+HAVE_XMLTO_TRUE = @HAVE_XMLTO_TRUE@
 I18N_MODULE_LIBS = @I18N_MODULE_LIBS@
 INSTALL_CMD = @INSTALL_CMD@
 INSTALL_DATA = @INSTALL_DATA@
@@ -188,8 +187,6 @@ 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@
@@ -198,8 +195,6 @@ 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@
 MAN_SUBSTS = @MAN_SUBSTS@
 MISC_MAN_DIR = @MISC_MAN_DIR@
 MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
@@ -216,9 +211,6 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
 PKG_CONFIG = @PKG_CONFIG@
-PNMTOPNG_PATH = @PNMTOPNG_PATH@
-PS2PDF = @PS2PDF@
-PSSELECT_PATH = @PSSELECT_PATH@
 RANLIB = @RANLIB@
 RAWCPP = @RAWCPP@
 RAWCPPFLAGS = @RAWCPPFLAGS@
@@ -226,6 +218,7 @@ SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+STYLESHEET_SRCDIR = @STYLESHEET_SRCDIR@
 THRSTUBS_FALSE = @THRSTUBS_FALSE@
 THRSTUBS_TRUE = @THRSTUBS_TRUE@
 UDC_FALSE = @UDC_FALSE@
@@ -240,12 +233,8 @@ 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_REQUIRES = @XKBPROTO_REQUIRES@
 XKB_FALSE = @XKB_FALSE@
@@ -259,7 +248,10 @@ XLOCALELIBDIR = @XLOCALELIBDIR@
 XLOCALE_FALSE = @XLOCALE_FALSE@
 XLOCALE_TRUE = @XLOCALE_TRUE@
 XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
+XMLTO = @XMLTO@
 XORG_MAN_PAGE = @XORG_MAN_PAGE@
+XORG_SGML_PATH = @XORG_SGML_PATH@
+XSL_STYLESHEET = @XSL_STYLESHEET@
 XTHREADLIB = @XTHREADLIB@
 XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
 XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
@@ -324,7 +316,6 @@ AM_CPPFLAGS = \
 AM_CFLAGS = \
 	$(X11_CFLAGS) \
 	$(BIGFONT_CFLAGS) \
-	$(XDMCP_CFLAGS) \
 	$(XMALLOC_ZERO_CFLAGS) \
 	$(CWARNFLAGS)
 
diff --git a/lib/libX11/src/xlibi18n/XDefaultIMIF.c b/lib/libX11/src/xlibi18n/XDefaultIMIF.c
index de17d20c6..ca6ee29de 100644
--- a/lib/libX11/src/xlibi18n/XDefaultIMIF.c
+++ b/lib/libX11/src/xlibi18n/XDefaultIMIF.c
@@ -37,7 +37,7 @@ Sun Microsystems, Inc. or its licensors is granted.
 
 */
 /*
- * Copyright 2000 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2000 Oracle and/or its affiliates. All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -64,7 +64,6 @@ Sun Microsystems, Inc. or its licensors is granted.
 #include <config.h>
 #endif
 #include <stdio.h>
-#define NEED_EVENTS
 #include "Xlibint.h"
 #include "Xlcint.h"
 #include "XlcGeneric.h"
diff --git a/lib/libX11/src/xlibi18n/XDefaultOMIF.c b/lib/libX11/src/xlibi18n/XDefaultOMIF.c
index be9977d38..ae8ac79e4 100644
--- a/lib/libX11/src/xlibi18n/XDefaultOMIF.c
+++ b/lib/libX11/src/xlibi18n/XDefaultOMIF.c
@@ -37,7 +37,7 @@ Sun Microsystems, Inc. or its licensors is granted.
 
 */
 /*
- * Copyright 2000 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2000 Oracle and/or its affiliates. All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -381,7 +381,7 @@ get_font_name(
     XOC oc,
     char *pattern)
 {
-    char **list, *name, *prop_name;
+    char **list, *name;
     int count;
     XFontStruct *fs;
     Display *dpy = oc->core.om->core.display;
@@ -397,13 +397,7 @@ get_font_name(
 	fs = XLoadQueryFont(dpy, pattern);
 	if (fs == NULL) return NULL;
 
-	prop_name = get_prop_name(dpy, fs);
-	if (prop_name == NULL) return NULL;
-
-	name = (char*) Xmalloc(strlen(prop_name) + 1);
-	if (name)
-	    strcpy(name, prop_name);
-
+	name = get_prop_name(dpy, fs);
 	XFreeFont(dpy, fs);
     }
     return name;
diff --git a/lib/libX11/src/xlibi18n/XimTrInt.h b/lib/libX11/src/xlibi18n/XimTrInt.h
index b7e4439d2..a08ac0308 100644
--- a/lib/libX11/src/xlibi18n/XimTrInt.h
+++ b/lib/libX11/src/xlibi18n/XimTrInt.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 1992 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 1992 Oracle and/or its affiliates. All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/lib/libX11/src/xlibi18n/XimTrX.h b/lib/libX11/src/xlibi18n/XimTrX.h
index 1c24fe368..198d5fa5f 100644
--- a/lib/libX11/src/xlibi18n/XimTrX.h
+++ b/lib/libX11/src/xlibi18n/XimTrX.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 1992 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 1992 Oracle and/or its affiliates. All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/lib/libX11/src/xlibi18n/XimTrans.h b/lib/libX11/src/xlibi18n/XimTrans.h
index 987b5ee33..8c3aa829a 100644
--- a/lib/libX11/src/xlibi18n/XimTrans.h
+++ b/lib/libX11/src/xlibi18n/XimTrans.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 1992 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 1992 Oracle and/or its affiliates. All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/lib/libX11/src/xlibi18n/XimintP.h b/lib/libX11/src/xlibi18n/XimintP.h
index 89b7c214f..0e384abb8 100644
--- a/lib/libX11/src/xlibi18n/XimintP.h
+++ b/lib/libX11/src/xlibi18n/XimintP.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 1991, 1992 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 1991, 1992 Oracle and/or its affiliates. All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/lib/libX11/src/xlibi18n/XlcDL.c b/lib/libX11/src/xlibi18n/XlcDL.c
index 879bc51eb..bf064909e 100644
--- a/lib/libX11/src/xlibi18n/XlcDL.c
+++ b/lib/libX11/src/xlibi18n/XlcDL.c
@@ -37,7 +37,7 @@ Sun Microsystems, Inc. or its licensors is granted.
 
 */
 /*
- * Copyright 2000 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2000 Oracle and/or its affiliates. All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/lib/libX11/src/xlibi18n/XlcSL.c b/lib/libX11/src/xlibi18n/XlcSL.c
index 526f677fb..574e4c0d1 100644
--- a/lib/libX11/src/xlibi18n/XlcSL.c
+++ b/lib/libX11/src/xlibi18n/XlcSL.c
@@ -37,7 +37,7 @@ Sun Microsystems, Inc. or its licensors is granted.
 
 */
 /*
- * Copyright 2000 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2000 Oracle and/or its affiliates. All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/lib/libX11/src/xlibi18n/lcFile.c b/lib/libX11/src/xlibi18n/lcFile.c
index 21a546d8f..18756c1ca 100644
--- a/lib/libX11/src/xlibi18n/lcFile.c
+++ b/lib/libX11/src/xlibi18n/lcFile.c
@@ -685,8 +685,7 @@ _XlcLocaleDirName(char *dir_name, size_t dir_len, char *lc_name)
  		Xfree(name);
  	    continue;
  	}
- 	if ((1 + (target_dir ? strlen (target_dir) : 0) +
- 	     strlen("locale.dir")) < PATH_MAX) {
+ 	if ((1 + strlen (target_dir) + strlen("locale.dir")) < PATH_MAX) {
  	    sprintf(buf, "%s/locale.dir", target_dir);
  	    target_name = resolve_name(name, buf, RtoL);
  	}
@@ -785,8 +784,7 @@ _XlcLocaleLibDirName(char *dir_name, size_t dir_len, char *lc_name)
  		Xfree(name);
  	    continue;
  	}
- 	if ((1 + (target_dir ? strlen (target_dir) : 0) +
- 	     strlen("locale.dir")) < PATH_MAX) {
+ 	if ((1 + strlen (target_dir) + strlen("locale.dir")) < PATH_MAX) {
  	    sprintf(buf, "%s/locale.dir", target_dir);
  	    target_name = resolve_name(name, buf, RtoL);
  	}
diff --git a/lib/libX11/src/xlibi18n/lcGeneric.c b/lib/libX11/src/xlibi18n/lcGeneric.c
index 69ea97db8..688a4cfc4 100644
--- a/lib/libX11/src/xlibi18n/lcGeneric.c
+++ b/lib/libX11/src/xlibi18n/lcGeneric.c
@@ -428,7 +428,7 @@ read_charset_define(
     char name[BUFSIZ];
     XlcCharSet charsetd;
     char **value;
-    int num, new;
+    int num, new = 0;
     XlcSide side = XlcUnknown;
     char *tmp;
 
diff --git a/lib/libX11/src/xlibi18n/lcInit.c b/lib/libX11/src/xlibi18n/lcInit.c
index ee66b8c92..5aaf1832b 100644
--- a/lib/libX11/src/xlibi18n/lcInit.c
+++ b/lib/libX11/src/xlibi18n/lcInit.c
@@ -37,7 +37,7 @@ Sun Microsystems, Inc. or its licensors is granted.
 
 */
 /*
- * Copyright 2000 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2000 Oracle and/or its affiliates. All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
diff --git a/lib/libX11/src/xlibi18n/xim_trans.c b/lib/libX11/src/xlibi18n/xim_trans.c
index 63274129e..752ae00b1 100644
--- a/lib/libX11/src/xlibi18n/xim_trans.c
+++ b/lib/libX11/src/xlibi18n/xim_trans.c
@@ -1,6 +1,4 @@
 /*
- * $Id: xim_trans.c,v 1.1 2006/11/25 16:37:45 matthieu Exp $
- *
  * Copyright © 2003 Keith Packard
  *
  * Permission to use, copy, modify, distribute, and sell this software and its