Updated libX11 to 1.6.4.

Alan Coopersmith (20):
      Move Compose \ o / to be with other emoji compose sequences
      Replace Xmalloc+memset pairs with Xcalloc calls
      Get rid of some extraneous ; at the end of C source lines
      Remove unused definition of XCONN_CHECK_FREQ
      Bug 93184: read_EncodingInfo invalid free
      Bug 93183: _XDefaultOpenIM memory leaks in out-of-memory error paths
      Delete #if 0 hunks of code
      Use strdup instead of Xmalloc+strcpy in _XDefaultOpenIM
      XDefaultOMIF: replace strlen+Xmalloc+strcpy with strdup
      XDefaultOMIF: additional code simplification
      XDefaultOMIF: Remove comments referring to ancient Sun bug ids
      XlcDL.c: replace strcpy+strcat sequences with snprintf
      XlcDL.c: reduce code duplication
      lcPubWrap: replace malloc(strlen) + strcpy with strdup
      Stop checking XTRANS_SECURE_RPC_FLAGS since we no longer use them
      Stop checking for preferred order of local transports
      Don't need to link libX11-xcb against libX11
      xcms: use size_t for strlen/sizeof values instead of converting to int & back
      xcms: use unsigned indexes when looping through unsigned values
      xcms: use size_t for pointer offsets passed to strncmp

Bhavi Dhingra (1):
      omGeneric.c: Correct the parameter usage of sizeof

Christian Linhart (1):
      fix for Xlib 32-bit request number issues

Daniel Albers (1):
      Add Compose sequence for U+1F4A9.

Dominik Muth (1):
      Xlib.h: Fix macros imitating C functions.

Gunnar Hjalmarsson (1):
      Add compose file for pt_PT similar to pt_BR

James Cloos (2):
      Fix missing update in cf4d5989383a
      Fix another missing update in cf4d5989383a

Julien Cristau (1):
      Mark _XNextRequest as hidden

Mats Blakstad (1):
      New compose keys for local languages in Togo

Matthew D. Fuller (1):
      Fixup param specification for XChangeProperty()

Matthieu Herrb (1):
      libX11 1.6.4

Mike FABIAN (3):
      add be_BY.UTF-8@latin and sr_RS.UTF-8@latin to locale.dir
      fix spelling mistakes in ks_IN and sd_IN devanagari locales
      Fix spelling mistake introduced by 748d47e69f5c12d8557d56a8a8ec166588da7b93

Olivier Fourdan (1):
      XKB: fix XkbGetKeyboardByName with Xming server

Peter Hutterer (3):
      Fix potential memory leak
      Fix an indentation issue
      Fix three "use of uninitialized variable" coverity warnings

Ross Burton (1):
      Add missing NULL checks to ICWrap

Thomas Klausner (2):
      Do not return() after exit().
      Ignore test-driver (used by newer autoconf).

Tobias Stoeckmann (2):
      The validation of server responses avoids out of boundary accesses.
      Validation of server responses in XGetImage()

walter harms (1):
      XFree will accept NULL as argument

4 files changed, 20 insertions, 17 deletions

diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile
index 1a04e035313..b77e7eaea4c 100644
--- a/x11/libX11/Makefile
+++ b/x11/libX11/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.41 2016/02/26 11:27:14 jperkin Exp $
+# $NetBSD: Makefile,v 1.42 2016/10/04 21:58:10 wiz Exp $
 
-DISTNAME=		libX11-1.6.3
+DISTNAME=		libX11-1.6.4
 CATEGORIES=		x11 devel
 MASTER_SITES=		${MASTER_SITE_XORG:=lib/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/libX11/PLIST b/x11/libX11/PLIST
index dbcab2ee207..5fa131eac9d 100644
--- a/x11/libX11/PLIST
+++ b/x11/libX11/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2015/03/10 07:16:26 wiz Exp $
+@comment $NetBSD: PLIST,v 1.13 2016/10/04 21:58:10 wiz Exp $
 include/X11/ImUtil.h
 include/X11/XKBlib.h
 include/X11/Xcms.h
@@ -968,6 +968,9 @@ share/X11/locale/nokhchi-1/XLC_LOCALE
 share/X11/locale/pt_BR.UTF-8/Compose
 share/X11/locale/pt_BR.UTF-8/XI18N_OBJS
 share/X11/locale/pt_BR.UTF-8/XLC_LOCALE
+share/X11/locale/pt_PT.UTF-8/Compose
+share/X11/locale/pt_PT.UTF-8/XI18N_OBJS
+share/X11/locale/pt_PT.UTF-8/XLC_LOCALE
 share/X11/locale/ru_RU.UTF-8/Compose
 share/X11/locale/ru_RU.UTF-8/XI18N_OBJS
 share/X11/locale/ru_RU.UTF-8/XLC_LOCALE
diff --git a/x11/libX11/distinfo b/x11/libX11/distinfo
index 1fe3af2e831..f7ac7ec71db 100644
--- a/x11/libX11/distinfo
+++ b/x11/libX11/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.25 2015/11/04 03:28:44 agc Exp $
+$NetBSD: distinfo,v 1.26 2016/10/04 21:58:10 wiz Exp $
 
-SHA1 (libX11-1.6.3.tar.bz2) = 6f2aadf8346ee00b7419bd338461c6986e274733
-RMD160 (libX11-1.6.3.tar.bz2) = 42545c57ba150fead4d861907644ce51421e4933
-SHA512 (libX11-1.6.3.tar.bz2) = 01bbac8075b3fdae19cacfde1c799469f06fb864235025ce444fc10a3ba079bce30f4f3527db47c5edbf91d08299c61116cdf296efa38b2034c0099fac99cc69
-Size (libX11-1.6.3.tar.bz2) = 2363858 bytes
-SHA1 (patch-Makefile.in) = d8db87e513c71208e32a727145df41bfb3106756
+SHA1 (libX11-1.6.4.tar.bz2) = 94f375f28e592a599594d3d6ce982516afdc212c
+RMD160 (libX11-1.6.4.tar.bz2) = 660e6506b0666a24bab410ec0408880594fa2d10
+SHA512 (libX11-1.6.4.tar.bz2) = 1fb2ab1f16af14f03ad147ecf2a43c0137c528b9f7ad7de12c47a5861159313260c40122e8271ebd53bf06636d84a4766e06354c7791780f623ba316bed46e92
+Size (libX11-1.6.4.tar.bz2) = 2340176 bytes
+SHA1 (patch-Makefile.in) = 935e0023375390e5481176fe9d367067b899d038
 SHA1 (patch-aa) = 4f502264e7200fd2f9409d8684c53de3bc6f0649
 SHA1 (patch-ac) = 565aa2a636b5c50f67cbd11e7c2adcac8d55418e
diff --git a/x11/libX11/patches/patch-Makefile.in b/x11/libX11/patches/patch-Makefile.in
index 7d798a42bf2..09a41a9b273 100644
--- a/x11/libX11/patches/patch-Makefile.in
+++ b/x11/libX11/patches/patch-Makefile.in
@@ -1,16 +1,16 @@
-$NetBSD: patch-Makefile.in,v 1.3 2015/03/10 07:16:26 wiz Exp $
+$NetBSD: patch-Makefile.in,v 1.4 2016/10/04 21:58:10 wiz Exp $
 
 Avoid unnecessary auto* due to patch-aa modifying configure.ac.
 
---- Makefile.in.orig	2015-03-09 22:29:00.000000000 +0000
+--- Makefile.in.orig	2016-10-04 19:03:39.000000000 +0000
 +++ Makefile.in
-@@ -92,8 +92,7 @@ subdir = .
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/m4/ax_define_dir.m4 \
- 	$(top_srcdir)/configure.ac
+@@ -90,8 +90,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/a
+ 	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ 	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 -	$(ACLOCAL_M4)
 +am__configure_deps = 
- DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
- 	$(am__configure_deps) $(am__DIST_COMMON)
  am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+  configure.lineno config.status.lineno
+ mkinstalldirs = $(install_sh) -d