Update to 1.2.2:

Adam Jackson (1):
      Remove X_NOT_STDC_ENV usage. (#6527)

Alan Coopersmith (4):
      Revert "Change masculine to ordmasculine in Compose file comments"
      Use AC_USE_SYSTEM_EXTENSIONS instead of hand-rolled check for _GNU_SOURCE
      Correct return type in XkbGetKeyboard man page
      Drop ancient USG SysV #ifdefs

Caolan McNamara (1):
      man: missing space in XAllocColor man page

Christoph Pfister (1):
      X.Org Bug #21117: crash in get_rotate_fontname (omGeneric.c)

James Cloos (3):
      [nls] Remove combining_ keysyms from the Compose files
      [nls] Remove extraneous instances of UCS Combining Characters in Compose sequences.
      [nls] Replace remaining UCS Combining Characters in Compose sequences.

Julien Cristau (4):
      Fix fi_FI.UTF-8, again
      nls: remove duplicated en_US* aliases
      nls: remove broken sd_IN.UTF-8 alias
      nls: remove more duplicated aliases

Peter Hutterer (3):
      XWindowEvent/XCheckWindowEvent must not return GenericEvents.
      XMaskEvent/XCheckMaskedEvents must not check for GenericEvents.
      Bump to 1.2.2

Theppitak Karoonboonyanan (3):
      CharSet-to-CompoundText Conversion Failed for Thai Locales
      Thai XIM not filters when NumLock or CapsLock is on
      Thai XIM not retrieve MB surrounding on UTF-8 LC

parag (2):
      libX11: Add new Indic language information to nls directory files. #21560
      nls: Add pa_PK locale information and make pa_IN as default for pa.

4 files changed, 55 insertions, 72 deletions

diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile
index c19f47df269..7cd14061abe 100644
--- a/x11/libX11/Makefile
+++ b/x11/libX11/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2009/06/06 22:37:28 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2009/07/18 10:20:51 wiz Exp $
 #
 
-DISTNAME=		libX11-1.2.1
+DISTNAME=		libX11-1.2.2
 CATEGORIES=		x11 devel
 MASTER_SITES=		${MASTER_SITE_XORG:=lib/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/libX11/distinfo b/x11/libX11/distinfo
index 51a045fe03d..0edf363d7d4 100644
--- a/x11/libX11/distinfo
+++ b/x11/libX11/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.14 2009/06/06 22:37:28 wiz Exp $
+$NetBSD: distinfo,v 1.15 2009/07/18 10:20:51 wiz Exp $
 
-SHA1 (libX11-1.2.1.tar.bz2) = 8e58c3d9070cd164a960dc89b20cf0e35bade8c8
-RMD160 (libX11-1.2.1.tar.bz2) = 1207c7a9430751e25a758163dd47b07bf18c6ab7
-Size (libX11-1.2.1.tar.bz2) = 1798407 bytes
+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 (patch-aa) = 6a9fec9f8cc4f47de8d21043f7f73a20b6263f7d
-SHA1 (patch-ac) = d193143bf4b63183efdd75947ed585ac6905d9da
+SHA1 (patch-ac) = 18ab2c2daa61de901cb6dc0df458d8848849cf53
 SHA1 (patch-ad) = 9015aa648f7f90d555bcf98d00b080ec39a7c364
-SHA1 (patch-ae) = c76e2e1e5800010cd9e309b1d46c2e3cf24a17cf
+SHA1 (patch-ae) = 2a3eb6fbfce70425545ebd290e1914f6e51e5ef6
 SHA1 (patch-af) = a97f3b31eecc783caecfeb315ac2cf6603ec32a5
 SHA1 (patch-ag) = 626875c0c772264ea53fbf4f6e9c2228f7628ecf
diff --git a/x11/libX11/patches/patch-ac b/x11/libX11/patches/patch-ac
index c77ac04ba57..3b7c0a8f07a 100644
--- a/x11/libX11/patches/patch-ac
+++ b/x11/libX11/patches/patch-ac
@@ -1,30 +1,30 @@
-$NetBSD: patch-ac,v 1.8 2009/06/06 22:37:28 wiz Exp $
+$NetBSD: patch-ac,v 1.9 2009/07/18 10:20:51 wiz Exp $
 
 _POSIX_THREAD_SAFE_FUNCTIONS is not used on NetBSD.  Instead,
 let's use _REENTRANT.
 
---- configure.orig	2009-04-07 22:40:47.000000000 +0000
+--- configure.orig	2009-07-10 04:08:41.000000000 +0000
 +++ configure
-@@ -929,6 +929,8 @@ XKB_FALSE
- XKBPROTO_CFLAGS
- XKBPROTO_LIBS
- XKBPROTO_REQUIRES
-+CROSS_COMPILING_TRUE
-+CROSS_COMPILING_FALSE
- LINT
- LINT_FLAGS
+@@ -812,6 +812,8 @@ LINT_FALSE
  LINT_TRUE
-@@ -23139,43 +23141,38 @@ _ACEOF
+ LINT_FLAGS
+ LINT
++CROSS_COMPILING_FALSE
++CROSS_COMPILING_TRUE
+ XKBPROTO_REQUIRES
+ XKBPROTO_LIBS
+ XKBPROTO_CFLAGS
+@@ -15467,44 +15469,39 @@ _ACEOF
  	;;
  esac
  
--{ echo "$as_me:$LINENO: checking for pthread_self in -lc" >&5
--echo $ECHO_N "checking for pthread_self in -lc... $ECHO_C" >&6; }
+-{ $as_echo "$as_me:$LINENO: checking for pthread_self in -lc" >&5
+-$as_echo_n "checking for pthread_self in -lc... " >&6; }
 -if test "${ac_cv_lib_c_pthread_self+set}" = set; then
-+{ echo "$as_me:$LINENO: checking whether pthread_self is declared" >&5
-+echo $ECHO_N "checking whether pthread_self is declared... $ECHO_C" >&6; }
++{ $as_echo "$as_me:$LINENO: checking whether pthread_self is declared" >&5
++$as_echo_n "checking whether pthread_self is declared... " >&6; }
 +if test "${ac_cv_have_decl_pthread_self+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   $as_echo_n "(cached) " >&6
  else
 -  ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lc  $LIBS"
@@ -64,41 +64,45 @@ let's use _REENTRANT.
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
- eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+ $as_echo "$ac_try_echo") >&5
 -  (eval "$ac_link") 2>conftest.er1
 +  (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -23184,28 +23181,35 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -15513,31 +15510,35 @@ $as_echo "$ac_try_echo") >&5
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
 -  ac_cv_lib_c_pthread_self=yes
 +       } && test -s conftest.$ac_objext; then
 +  ac_cv_have_decl_pthread_self=yes
  else
-   echo "$as_me: failed program was:" >&5
+   $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -	ac_cv_lib_c_pthread_self=no
 +	ac_cv_have_decl_pthread_self=no
  fi
  
+-rm -rf conftest.dSYM
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
 -LIBS=$ac_check_lib_save_LIBS
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
--{ echo "$as_me:$LINENO: result: $ac_cv_lib_c_pthread_self" >&5
--echo "${ECHO_T}$ac_cv_lib_c_pthread_self" >&6; }
--if test $ac_cv_lib_c_pthread_self = yes; then
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_c_pthread_self" >&5
+-$as_echo "$ac_cv_lib_c_pthread_self" >&6; }
+-if test "x$ac_cv_lib_c_pthread_self" = x""yes; then
 -  thrstubs="no"
-+{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_pthread_self" >&5
-+echo "${ECHO_T}$ac_cv_have_decl_pthread_self" >&6; }
-+if test $ac_cv_have_decl_pthread_self = yes; then
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_pthread_self" >&5
++$as_echo "$ac_cv_have_decl_pthread_self" >&6; }
++if test "x$ac_cv_have_decl_pthread_self" = x""yes; then
 +
 +cat >>confdefs.h <<_ACEOF
 +#define HAVE_DECL_PTHREAD_SELF 1
@@ -118,7 +122,7 @@ let's use _REENTRANT.
   if test x$thrstubs = xyes; then
    THRSTUBS_TRUE=
    THRSTUBS_FALSE='#'
-@@ -23220,8 +23224,8 @@ if test x$xthreads = xyes ; then
+@@ -15552,8 +15553,8 @@ if test x$xthreads = xyes ; then
      linux*|openbsd*|gnu*|k*bsd*-gnu)
          XTHREADLIB=-lpthread ;;
      netbsd*)
@@ -129,7 +133,7 @@ let's use _REENTRANT.
      freebsd*)
          XTHREAD_CFLAGS="-D_THREAD_SAFE"
          XTHREADLIB="-pthread" ;;
-@@ -23702,6 +23706,15 @@ else
+@@ -16082,6 +16083,15 @@ else
  fi
  
  
@@ -145,35 +149,17 @@ let's use _REENTRANT.
  
  
  for ac_header in stdlib.h unistd.h
-@@ -24850,6 +24863,13 @@ echo "$as_me: error: conditional \"XKB\"
+@@ -17206,6 +17216,13 @@ $as_echo "$as_me: error: conditional \"X
  Usually this means the macro was only invoked conditionally." >&2;}
     { (exit 1); exit 1; }; }
  fi
 +if test -z "${CROSS_COMPILING_TRUE}" && test -z "${CROSS_COMPILING_FALSE}"; then
-+  { { echo "$as_me:$LINENO: error: conditional \"CROSS_COMPILING\" was never defined.
++  { { $as_echo "$as_me:$LINENO: error: conditional \"CROSS_COMPILING\" was never defined.
 +Usually this means the macro was only invoked conditionally." >&5
-+echo "$as_me: error: conditional \"CROSS_COMPILING\" was never defined.
++$as_echo "$as_me: error: conditional \"CROSS_COMPILING\" was never defined.
 +Usually this means the macro was only invoked conditionally." >&2;}
 +   { (exit 1); exit 1; }; }
 +fi
  if test -z "${LINT_TRUE}" && test -z "${LINT_FALSE}"; then
-   { { echo "$as_me:$LINENO: error: conditional \"LINT\" was never defined.
+   { { $as_echo "$as_me:$LINENO: error: conditional \"LINT\" was never defined.
  Usually this means the macro was only invoked conditionally." >&5
-@@ -25679,6 +25699,8 @@ XKB_FALSE!$XKB_FALSE$ac_delim
- XKBPROTO_CFLAGS!$XKBPROTO_CFLAGS$ac_delim
- XKBPROTO_LIBS!$XKBPROTO_LIBS$ac_delim
- XKBPROTO_REQUIRES!$XKBPROTO_REQUIRES$ac_delim
-+CROSS_COMPILING_TRUE!$CROSS_COMPILING_TRUE$ac_delim
-+CROSS_COMPILING_FALSE!$CROSS_COMPILING_FALSE$ac_delim
- LINT!$LINT$ac_delim
- LINT_FLAGS!$LINT_FLAGS$ac_delim
- LINT_TRUE!$LINT_TRUE$ac_delim
-@@ -25705,7 +25727,7 @@ LIBOBJS!$LIBOBJS$ac_delim
- LTLIBOBJS!$LTLIBOBJS$ac_delim
- _ACEOF
- 
--  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 87; then
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 89; then
-     break
-   elif $ac_last_try; then
-     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/x11/libX11/patches/patch-ae b/x11/libX11/patches/patch-ae
index c943ad469bb..be7a5d8df68 100644
--- a/x11/libX11/patches/patch-ae
+++ b/x11/libX11/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.5 2009/06/06 22:37:28 wiz Exp $
+$NetBSD: patch-ae,v 1.6 2009/07/18 10:20:51 wiz Exp $
 
---- src/util/Makefile.in.orig	2009-04-07 22:40:59.000000000 +0000
+--- src/util/Makefile.in.orig	2009-07-10 04:08:51.000000000 +0000
 +++ src/util/Makefile.in
-@@ -34,7 +34,8 @@ PRE_UNINSTALL = :
+@@ -36,7 +36,8 @@ PRE_UNINSTALL = :
  POST_UNINSTALL = :
  build_triplet = @build@
  host_triplet = @host@
@@ -12,31 +12,28 @@ $NetBSD: patch-ae,v 1.5 2009/06/06 22:37:28 wiz Exp $
  subdir = src/util
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -53,6 +54,9 @@ makekeys_LDADD = $(LDADD)
+@@ -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 $@
 +xmakekeys_SOURCES = xmakekeys.c
 +xmakekeys_OBJECTS = xmakekeys.$(OBJEXT)
 +xmakekeys_LDADD = $(LDADD)
- DEFAULT_INCLUDES = -I. -I$(top_builddir)/src -I$(top_builddir)/include/X11@am__isrc@
+ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11
  depcomp = $(SHELL) $(top_srcdir)/depcomp
  am__depfiles_maybe = depfiles
-@@ -62,8 +66,11 @@ CCLD = $(CC)
+@@ -66,8 +70,8 @@ CCLD = $(CC)
  LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
  	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
  	$(LDFLAGS) -o $@
 -SOURCES = makekeys.c
 -DIST_SOURCES = makekeys.c
-+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
 +SOURCES = makekeys.c xmakekeys.c
 +DIST_SOURCES = makekeys.c xmakekeys.c
  ETAGS = etags
  CTAGS = ctags
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-@@ -279,6 +286,9 @@ clean-noinstPROGRAMS:
+@@ -291,6 +295,9 @@ clean-noinstPROGRAMS:
  makekeys$(EXEEXT): $(makekeys_OBJECTS) $(makekeys_DEPENDENCIES) 
  	@rm -f makekeys$(EXEEXT)
  	$(makekeys_LINK) $(makekeys_OBJECTS) $(makekeys_LDADD) $(LIBS)
@@ -46,7 +43,7 @@ $NetBSD: patch-ae,v 1.5 2009/06/06 22:37:28 wiz Exp $
  
  mostlyclean-compile:
  	-rm -f *.$(OBJEXT)
-@@ -287,6 +297,7 @@ distclean-compile:
+@@ -299,6 +306,7 @@ distclean-compile:
  	-rm -f *.tab.c
  
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/makekeys-makekeys.Po@am__quote@
@@ -54,7 +51,7 @@ $NetBSD: patch-ae,v 1.5 2009/06/06 22:37:28 wiz Exp $
  
  .c.o:
  @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@@ -506,6 +517,10 @@ uninstall-am:
+@@ -539,6 +547,10 @@ uninstall-am:
  	pdf pdf-am ps ps-am tags uninstall uninstall-am
  
  
@@ -64,4 +61,4 @@ $NetBSD: patch-ae,v 1.5 2009/06/06 22:37:28 wiz Exp $
 +
  @LINT_TRUE@lint:
  @LINT_TRUE@	$(LINT) $(ALL_LINT_FLAGS) makekeys.c
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
+