Update to libX11-1.3.2.

1.3.2:
Alan Coopersmith (2):
Add man page for Compose file format
libX11 1.3.2
Add extra configuration and sanity checks for groff and ps2pdf
Add smiley faces to compose sequences.
Fix VPATH build of libX11 specs

1.3.1:
Recognize XSUNBUFFERSIZE alias for XLIBBUFFERSIZE on Solaris
Move libX11 & XIM/locale specs from xorg-docs
Use $(AM_V_GEN) to silence echo commands for generating shadow man pages
Fix make distcheck
libX11 1.3.1
Split CFLAGS into CPPFLAGS and CFLAGS
Include sys/select.h for select() and struct timeval, if it exists
configure: quote argument to m4_pattern_forbid
Use AM_V_GEN instead of customized macros for AM_SILENT_RULES
dolt: add Cygwin to supported platforms
Provide _Xsetlocale compat wrappers on Cygwin

1.3:
Convert Xkb API man pages to ANSI prototypes
XkbSAActionSetCtrls.man: Fix typo in formatting macro
XkbQueryExtension.man: Arguments should be pointers
XkbSetDeviceButtonActions.man: remove non-existent actions argument
Fix version tag in .TH line of several XKB man pages
Update to using xorg-macros 1.3 & XORG_DEFAULT_OPTIONS
Add AM_SILENT_RULES support for cpp rules for man & nls files
Use make rules instead of shell for loops to generate shadow man pages
Add perl script to check for duplicate or conflicting compose file entries
Resolve conflicting Compose sequences in iso8859-2, el_GR.UTF-8 & pt_BR.UTF-8
Bug 24173: libX11 from git fails to build with automake older then 1.11
Add some (Serbian) Cyrillic NFD sequences.
man/xkb: use __libmansuffix__ instead of hardcoding 3Xkb for manpage sections
man: use __libmansuffix__ instead of 3X11 for references to other pages
man/xkb: delete spurious newline in .TH headers
Fix wrong typedef on HP-UX (#18998)
Don't require xdmcp in configure.ac (#22583)
man: XQueryTree may return BadWindow. (#23416)
man: fix parameters to XkbAllocGeomOverlay{Rows|Keys} (#23499)
Add XF86TouchpadToggle to XKeysymDB
nls: remove duplicate Compose sequences from pt_BR.UTF-8
libX11 1.3

1.2.99.901:
nls: add {left,right}wards arrow to compose table
Add _XFUNCPROTOBEGIN/END to Xlib-xcb.h
Update library version for new symbols
Bump to 1.2.99.1
Add generic event cookie handling to libX11.
Add utlist.h to the Makefile.am
Fix compiler warning 'unused variable qelt'
Bump to 1.2.99.901 (1.3 RC1)

4 files changed, 143 insertions, 30 deletions

diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile
index f3215ad9b11..c4340cc01cb 100644
--- a/x11/libX11/Makefile
+++ b/x11/libX11/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2009/10/22 19:32:01 tnn Exp $
+# $NetBSD: Makefile,v 1.22 2010/01/15 18:55:11 tnn Exp $
 #
 
-DISTNAME=		libX11-1.2.2
+DISTNAME=		libX11-1.3.2
 CATEGORIES=		x11 devel
 MASTER_SITES=		${MASTER_SITE_XORG:=lib/}
 EXTRACT_SUFX=		.tar.bz2
@@ -19,6 +19,7 @@ USE_TOOLS+=		gmake pkg-config
 
 CONFIGURE_ARGS+=	--enable-man-pages=3
 CONFIGURE_ARGS+=	--without-xcb
+CONFIGURE_ARGS+=	--disable-specs
 PKGCONFIG_OVERRIDE+=	x11.pc.in
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/x11/libX11/PLIST b/x11/libX11/PLIST
index d89b3fbe7b9..834bffdc8a1 100644
--- a/x11/libX11/PLIST
+++ b/x11/libX11/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 18:24:58 joerg Exp $
+@comment $NetBSD: PLIST,v 1.7 2010/01/15 18:55:11 tnn Exp $
 include/X11/ImUtil.h
 include/X11/XKBlib.h
 include/X11/Xcms.h
@@ -221,6 +221,7 @@ man/man3/XFree.3
 man/man3/XFreeColormap.3
 man/man3/XFreeColors.3
 man/man3/XFreeCursor.3
+man/man3/XFreeEventData.3
 man/man3/XFreeExtensionList.3
 man/man3/XFreeFont.3
 man/man3/XFreeFontInfo.3
@@ -233,12 +234,14 @@ man/man3/XFreePixmap.3
 man/man3/XFreeStringList.3
 man/man3/XGCValues.3
 man/man3/XGContextFromGC.3
+man/man3/XGenericEventCookie.3
 man/man3/XGetAtomName.3
 man/man3/XGetAtomNames.3
 man/man3/XGetClassHint.3
 man/man3/XGetCommand.3
 man/man3/XGetErrorDatabaseText.3
 man/man3/XGetErrorText.3
+man/man3/XGetEventData.3
 man/man3/XGetFontPath.3
 man/man3/XGetFontProperty.3
 man/man3/XGetGCValues.3
@@ -826,6 +829,7 @@ man/man3/XwcTextExtents.3
 man/man3/XwcTextListToTextProperty.3
 man/man3/XwcTextPerCharExtents.3
 man/man3/XwcTextPropertyToTextList.3
+man/man5/Compose.5
 share/X11/XErrorDB
 share/X11/XKeysymDB
 share/X11/locale/C/Compose
@@ -1011,3 +1015,4 @@ share/X11/locale/zh_TW.big5/XLC_LOCALE
 share/X11/locale/zh_TW/Compose
 share/X11/locale/zh_TW/XI18N_OBJS
 share/X11/locale/zh_TW/XLC_LOCALE
+@pkgdir share/doc/libX11
diff --git a/x11/libX11/distinfo b/x11/libX11/distinfo
index 0edf363d7d4..a2e3c10766b 100644
--- a/x11/libX11/distinfo
+++ b/x11/libX11/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.15 2009/07/18 10:20:51 wiz Exp $
+$NetBSD: distinfo,v 1.16 2010/01/15 18:55:11 tnn Exp $
 
-SHA1 (libX11-1.2.2.tar.bz2) = 7962063e124856f8a36afd760a934e6e429f036b
-RMD160 (libX11-1.2.2.tar.bz2) = 6032ed99cbd6df8e92ae7cf319bf220bc5768054
-Size (libX11-1.2.2.tar.bz2) = 1876770 bytes
+SHA1 (libX11-1.3.2.tar.bz2) = d4b3966d8eeb79514daad3eeae0debf65d16edca
+RMD160 (libX11-1.3.2.tar.bz2) = 4f7c521f96688b1ea162cfc7e303bfe1286d48a0
+Size (libX11-1.3.2.tar.bz2) = 2164426 bytes
 SHA1 (patch-aa) = 6a9fec9f8cc4f47de8d21043f7f73a20b6263f7d
 SHA1 (patch-ac) = 18ab2c2daa61de901cb6dc0df458d8848849cf53
 SHA1 (patch-ad) = 9015aa648f7f90d555bcf98d00b080ec39a7c364
-SHA1 (patch-ae) = 2a3eb6fbfce70425545ebd290e1914f6e51e5ef6
+SHA1 (patch-ae) = 1a86fcebfe9963ae7d6df6aae24d93e2a9717d14
 SHA1 (patch-af) = a97f3b31eecc783caecfeb315ac2cf6603ec32a5
 SHA1 (patch-ag) = 626875c0c772264ea53fbf4f6e9c2228f7628ecf
diff --git a/x11/libX11/patches/patch-ae b/x11/libX11/patches/patch-ae
index be7a5d8df68..e5686d02067 100644
--- a/x11/libX11/patches/patch-ae
+++ b/x11/libX11/patches/patch-ae
@@ -1,31 +1,36 @@
-$NetBSD: patch-ae,v 1.6 2009/07/18 10:20:51 wiz Exp $
+$NetBSD: patch-ae,v 1.7 2010/01/15 18:55:11 tnn Exp $
 
---- src/util/Makefile.in.orig	2009-07-10 04:08:51.000000000 +0000
+--- src/util/Makefile.in.orig	2009-10-23 20:55:44.000000000 +0000
 +++ src/util/Makefile.in
-@@ -36,7 +36,8 @@ PRE_UNINSTALL = :
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+ 
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -36,7 +36,7 @@ PRE_UNINSTALL = :
  POST_UNINSTALL = :
  build_triplet = @build@
  host_triplet = @host@
 -noinst_PROGRAMS = makekeys$(EXEEXT)
 +noinst_PROGRAMS = makekeys$(EXEEXT) $(MAKEKEYS_PROG)
-+@CROSS_COMPILING_TRUE@MAKEKEYS_PROG = xmakekeys$(EXEEXT)
  subdir = src/util
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -56,6 +57,9 @@ makekeys_LDADD = $(LDADD)
- makekeys_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- 	--mode=link $(CCLD) $(makekeys_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- 	$(LDFLAGS) -o $@
+@@ -59,6 +59,9 @@ am__v_lt_0 = --silent
+ makekeys_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(makekeys_CFLAGS) \
+ 	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 +xmakekeys_SOURCES = xmakekeys.c
 +xmakekeys_OBJECTS = xmakekeys.$(OBJEXT)
 +xmakekeys_LDADD = $(LDADD)
  DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11
  depcomp = $(SHELL) $(top_srcdir)/depcomp
  am__depfiles_maybe = depfiles
-@@ -66,8 +70,8 @@ CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- 	$(LDFLAGS) -o $@
+@@ -81,8 +84,8 @@ am__v_CCLD_0 = @echo "  CCLD  " $@;
+ AM_V_GEN = $(am__v_GEN_$(V))
+ am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+ am__v_GEN_0 = @echo "  GEN   " $@;
 -SOURCES = makekeys.c
 -DIST_SOURCES = makekeys.c
 +SOURCES = makekeys.c xmakekeys.c
@@ -33,32 +38,134 @@ $NetBSD: patch-ae,v 1.6 2009/07/18 10:20:51 wiz Exp $
  ETAGS = etags
  CTAGS = ctags
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-@@ -291,6 +295,9 @@ clean-noinstPROGRAMS:
+@@ -108,10 +111,6 @@ CHANGELOG_CMD = @CHANGELOG_CMD@
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CWARNFLAGS = @CWARNFLAGS@
+-CXX = @CXX@
+-CXXCPP = @CXXCPP@
+-CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+@@ -119,26 +118,27 @@ DOLT_BASH = @DOLT_BASH@
+ DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
+ DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+ DSYMUTIL = @DSYMUTIL@
+-ECHO = @ECHO@
++DUMPBIN = @DUMPBIN@
+ ECHO_C = @ECHO_C@
+ ECHO_N = @ECHO_N@
+ ECHO_T = @ECHO_T@
+ EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
+-F77 = @F77@
+-FFLAGS = @FFLAGS@
++FGREP = @FGREP@
+ FILE_MAN_DIR = @FILE_MAN_DIR@
+ FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+ GREP = @GREP@
+ GROFF = @GROFF@
+ I18N_MODULE_LIBS = @I18N_MODULE_LIBS@
+ INSTALL = @INSTALL@
++INSTALL_CMD = @INSTALL_CMD@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ KEYSYMDEF = @KEYSYMDEF@
+ LAUNCHD = @LAUNCHD@
++LD = @LD@
+ LDFLAGS = @LDFLAGS@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+@@ -148,6 +148,7 @@ LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
+ LINT = @LINT@
+ LINTLIB = @LINTLIB@
+ LINT_FLAGS = @LINT_FLAGS@
++LIPO = @LIPO@
+ LN_S = @LN_S@
+ LTCOMPILE = @LTCOMPILE@
+ LTCXXCOMPILE = @LTCXXCOMPILE@
+@@ -158,13 +159,18 @@ MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS
+ MISC_MAN_DIR = @MISC_MAN_DIR@
+ MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
+ MKDIR_P = @MKDIR_P@
++NM = @NM@
+ NMEDIT = @NMEDIT@
++OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
++OTOOL = @OTOOL@
++OTOOL64 = @OTOOL64@
+ PACKAGE = @PACKAGE@
+ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PERL = @PERL@
+@@ -208,8 +214,7 @@ abs_srcdir = @abs_srcdir@
+ abs_top_builddir = @abs_top_builddir@
+ abs_top_srcdir = @abs_top_srcdir@
+ ac_ct_CC = @ac_ct_CC@
+-ac_ct_CXX = @ac_ct_CXX@
+-ac_ct_F77 = @ac_ct_F77@
++ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+ am__include = @am__include@
+ am__leading_dot = @am__leading_dot@
+ am__quote = @am__quote@
+@@ -224,7 +229,6 @@ build_vendor = @build_vendor@
+ builddir = @builddir@
+ datadir = @datadir@
+ datarootdir = @datarootdir@
+-distcleancheck_listfiles = @distcleancheck_listfiles@
+ docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+@@ -241,6 +245,7 @@ libdir = @libdir@
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
++lt_ECHO = @lt_ECHO@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+@@ -257,6 +262,7 @@ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ makekeys_CFLAGS = $(X11_CFLAGS)
++@CROSS_COMPILING_TRUE@MAKEKEYS_PROG = xmakekeys$(EXEEXT)
+ EXTRA_DIST = mkks.sh
+ 
+ # Check source code with tools like lint & sparse
+@@ -309,6 +315,9 @@ clean-noinstPROGRAMS:
  makekeys$(EXEEXT): $(makekeys_OBJECTS) $(makekeys_DEPENDENCIES) 
  	@rm -f makekeys$(EXEEXT)
- 	$(makekeys_LINK) $(makekeys_OBJECTS) $(makekeys_LDADD) $(LIBS)
+ 	$(AM_V_CCLD)$(makekeys_LINK) $(makekeys_OBJECTS) $(makekeys_LDADD) $(LIBS)
 +@CROSS_COMPILING_FALSE@xmakekeys$(EXEEXT): $(xmakekeys_OBJECTS) $(xmakekeys_DEPENDENCIES) 
 +@CROSS_COMPILING_FALSE@	@rm -f xmakekeys$(EXEEXT)
-+@CROSS_COMPILING_FALSE@	$(LINK) $(xmakekeys_OBJECTS) $(xmakekeys_LDADD) $(LIBS)
++@CROSS_COMPILING_FALSE@	$(AM_V_CCLD)$(LINK) $(xmakekeys_OBJECTS) $(xmakekeys_LDADD) $(LIBS)
  
  mostlyclean-compile:
  	-rm -f *.$(OBJEXT)
-@@ -299,6 +306,7 @@ distclean-compile:
+@@ -317,6 +326,7 @@ distclean-compile:
  	-rm -f *.tab.c
  
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/makekeys-makekeys.Po@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmakekeys.Po@am__quote@
  
  .c.o:
- @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@@ -539,6 +547,10 @@ uninstall-am:
+ @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@@ -561,6 +571,9 @@ uninstall-am:
+ 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
  	pdf pdf-am ps ps-am tags uninstall uninstall-am
  
- 
 +@CROSS_COMPILING_TRUE@xmakekeys$(EXEEXT): makekeys.c
 +@CROSS_COMPILING_TRUE@	$(CC_FOR_BUILD) $(X11_CFLAGS) $(CPPFLAGS_FOR_BUILD) \
-+@CROSS_COMPILING_TRUE@	    $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ makekeys.c
-+
++@CROSS_COMPILING_TRUE@		$(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ makekeys.c
+ 
  @LINT_TRUE@lint:
  @LINT_TRUE@	$(LINT) $(ALL_LINT_FLAGS) makekeys.c
-