Update to 1.6.0:

Changes since libX11 1.5 (found in the release candidates) include fixes
for the recently announced security issues CVE-2013-1981, CVE-2013-1997,
and CVE-2013-2004; the addition of the _XEatDataWords API for use by
Xlib-based extension libraries, to help them avoid integer overflows when
it is necessary to discard data; removal of ancient, unused, incomplete
support for the Cray Unicos OS, and the DECnet and TLI transport types;
numerous improvements to compose files and locale data; man page macro
cleanups to improve compatibility with doclifter; and various other
code cleanups and compiler warning fixes.

Alan Coopersmith (1):
      libX11 1.6.0

Thomas Klausner (2):
      XCreateGC man page: Avoid .TS H and .TH macros
      cmsMath.c: Add missing stdio header for printf(3) in DEBUG build.

4 files changed, 25 insertions, 16 deletions

diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile
index b8d17f1dfff..aad0e2bd01c 100644
--- a/x11/libX11/Makefile
+++ b/x11/libX11/Makefile
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.30 2013/05/10 22:38:31 riastradh Exp $
-#
+# $NetBSD: Makefile,v 1.31 2013/06/04 07:57:13 wiz Exp $
 
-DISTNAME=		libX11-1.5.0
-PKGREVISION=		1
+DISTNAME=		libX11-1.6.0
 CATEGORIES=		x11 devel
 MASTER_SITES=		${MASTER_SITE_XORG:=lib/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/libX11/PLIST b/x11/libX11/PLIST
index 2d30087764d..014b51e615b 100644
--- a/x11/libX11/PLIST
+++ b/x11/libX11/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2012/07/10 03:03:01 mef Exp $
+@comment $NetBSD: PLIST,v 1.10 2013/06/04 07:57:13 wiz Exp $
 include/X11/ImUtil.h
 include/X11/XKBlib.h
 include/X11/Xcms.h
@@ -11,7 +11,6 @@ include/X11/Xregion.h
 include/X11/Xresource.h
 include/X11/Xutil.h
 include/X11/cursorfont.h
-lib/X11/Xcms.txt
 lib/libX11-xcb.la
 lib/libX11.la
 lib/pkgconfig/x11-xcb.pc
@@ -836,6 +835,7 @@ man/man3/XwcTextPropertyToTextList.3
 man/man5/Compose.5
 man/man5/XCompose.5
 share/X11/XErrorDB
+share/X11/Xcms.txt
 share/X11/locale/C/Compose
 share/X11/locale/C/XI18N_OBJS
 share/X11/locale/C/XLC_LOCALE
@@ -918,15 +918,9 @@ share/X11/locale/iso8859-9e/XLC_LOCALE
 share/X11/locale/ja.JIS/Compose
 share/X11/locale/ja.JIS/XI18N_OBJS
 share/X11/locale/ja.JIS/XLC_LOCALE
-share/X11/locale/ja.S90/Compose
-share/X11/locale/ja.S90/XI18N_OBJS
-share/X11/locale/ja.S90/XLC_LOCALE
 share/X11/locale/ja.SJIS/Compose
 share/X11/locale/ja.SJIS/XI18N_OBJS
 share/X11/locale/ja.SJIS/XLC_LOCALE
-share/X11/locale/ja.U90/Compose
-share/X11/locale/ja.U90/XI18N_OBJS
-share/X11/locale/ja.U90/XLC_LOCALE
 share/X11/locale/ja/Compose
 share/X11/locale/ja/XI18N_OBJS
 share/X11/locale/ja/XLC_LOCALE
diff --git a/x11/libX11/distinfo b/x11/libX11/distinfo
index 810a708eb70..a58a4f755d9 100644
--- a/x11/libX11/distinfo
+++ b/x11/libX11/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.19 2012/07/10 03:03:01 mef Exp $
+$NetBSD: distinfo,v 1.20 2013/06/04 07:57:13 wiz Exp $
 
-SHA1 (libX11-1.5.0.tar.bz2) = 8177535c9c59d8c3ab98d55ce53520b5737ccd1a
-RMD160 (libX11-1.5.0.tar.bz2) = 53873128000cb6827941ee81cb005f5b730a7940
-Size (libX11-1.5.0.tar.bz2) = 2322265 bytes
+SHA1 (libX11-1.6.0.tar.bz2) = e75329fbb5614ff54ccdf8d81e962bcde735c8ed
+RMD160 (libX11-1.6.0.tar.bz2) = 442e503f938f0de00346d3ebb1c3f1858af49662
+Size (libX11-1.6.0.tar.bz2) = 2373718 bytes
+SHA1 (patch-Makefile.in) = 5bb9465a1be62cf75d0be893627862aea937e984
 SHA1 (patch-aa) = ed69aa016d58e46fa9349778852264e3e1975135
 SHA1 (patch-ac) = 5d73fc6b7544f8be7a988f0fd5cb17dd84b25896
diff --git a/x11/libX11/patches/patch-Makefile.in b/x11/libX11/patches/patch-Makefile.in
new file mode 100644
index 00000000000..a5c64ac7e42
--- /dev/null
+++ b/x11/libX11/patches/patch-Makefile.in
@@ -0,0 +1,16 @@
+$NetBSD: patch-Makefile.in,v 1.1 2013/06/04 07:57:13 wiz Exp $
+
+Avoid unnecessary auto* due to patch-aa modifying configure.ac.
+
+--- Makefile.in.orig	2013-06-04 02:21:47.000000000 +0000
++++ Makefile.in
+@@ -87,8 +87,7 @@ DIST_COMMON = $(srcdir)/Makefile.in $(sr
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_define_dir.m4 \
+ 	$(top_srcdir)/configure.ac
+-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+-	$(ACLOCAL_M4)
++am__configure_deps = 
+ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+  configure.lineno config.status.lineno
+ mkinstalldirs = $(install_sh) -d