Update to 1.2.1:

Alan Coopersmith (21):
      flags member of Display structure needs to be marked volatile
      Incorporate char range comments from Solaris version of ksc5601.h
      Incorporate more locale names/aliases from Solaris libX11
      Add --with-locale-lib-dir configure option to set locale lib install dir
      Bug 6820: Xlib shouldn't handle EAGAIN as a fatal IO error
      Bug 9953: Please provide locale alias hu_HU.utf8
      Correct locale alias for sh_BA.ISO8859-2@bosnia (should be sr, not nr)
      Bug 14651: We need to add new locale specification for Belarusian Latin locale
      Bug 10082: Compose entries for some standard mathematical operators
      XErrorDB additions for RANDR 1.3
      XErrorDB additions for XInput errors and new XInput 1.5 requests
      XErrorDB additions for DRI2 requests
      Remove ifdef checks for macII left over from ancient A/UX 3.0 support
      When makekeys fails to find a good hash, print error instead of divide-by-zero
      makekeys: combine malloc(strlen)+strcpy into strdup
      Remove _XP_PRINT_SERVER_ #ifdefs from Xrm.c
      Delete some unused "#ifdef notdef" static functions
      Change masculine to ordmasculine in Compose file comments
      Further ansify prototypes & reduce #ifdefs in locking.c
      Fix a several sparse warnings: Using plain integer as NULL pointer
      Version bump: 1.2.1

Caolan McNamara (1):
      Bug 20575: man page for XCreatePixmapFromBitmapData doesn't match signature

Chris Ball (2):
      Build fix for fi_FI.
      Fix fi_FI locale install directory.

Emilio Jesús Gallego Arias (1):
      xcb_io: Avoid datatype overflow on AMD64 and friends.

Julien Cristau (2):
      nls: actually use the fi_FI.UTF-8 files
      Add a ru_RU.UTF-8 locale

Lubos Lunak (2):
      XGetErrorText() fails for extension error codes equal to the error base
      XErrorDB updates for XTEST, RANDR, DAMAGE extensions

Mlos Komarcevic (1):
      Bug 11456: Serbian locale updates (sr_RS and sr_ME)

Paul Bender (1):
      Bug 15664: xau & xdmcp not needed in x11.pc dependencies when built with xcb

Xue Wei (4):
      Add kk_KZ.UTF-8 to locale.dir.pre for Kazakhstan
      Add locale aliases for no_NO & sh_BA locale variants
      Add nn_NO.UTF-8 to compose.dir.pre for Norwegian Nynorsk
      Add UTF-8 locale entries for es_US, kk_KZ, mt_MT, and sh_BA

Yaakov Selkowitz (Cygwin Ports maintainer) (1):
      Bug 20773: Xcursor dynamic loading on Cygwin

5 files changed, 35 insertions, 27 deletions

diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile
index f8bf07084e1..c19f47df269 100644
--- a/x11/libX11/Makefile
+++ b/x11/libX11/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2009/02/21 16:44:29 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2009/06/06 22:37:28 wiz Exp $
 #
 
-DISTNAME=		libX11-1.2
+DISTNAME=		libX11-1.2.1
 CATEGORIES=		x11 devel
 MASTER_SITES=		${MASTER_SITE_XORG:=lib/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/libX11/PLIST b/x11/libX11/PLIST
index c5f415c97e5..10ef3aded35 100644
--- a/x11/libX11/PLIST
+++ b/x11/libX11/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2008/04/17 12:33:56 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2009/06/06 22:37:28 wiz Exp $
 include/X11/ImUtil.h
 include/X11/XKBlib.h
 include/X11/Xcms.h
@@ -844,6 +844,9 @@ share/X11/locale/el_GR.UTF-8/XLC_LOCALE
 share/X11/locale/en_US.UTF-8/Compose
 share/X11/locale/en_US.UTF-8/XI18N_OBJS
 share/X11/locale/en_US.UTF-8/XLC_LOCALE
+share/X11/locale/fi_FI.UTF-8/Compose
+share/X11/locale/fi_FI.UTF-8/XI18N_OBJS
+share/X11/locale/fi_FI.UTF-8/XLC_LOCALE
 share/X11/locale/georgian-academy/Compose
 share/X11/locale/georgian-academy/XI18N_OBJS
 share/X11/locale/georgian-academy/XLC_LOCALE
@@ -957,6 +960,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/ru_RU.UTF-8/Compose
+share/X11/locale/ru_RU.UTF-8/XI18N_OBJS
+share/X11/locale/ru_RU.UTF-8/XLC_LOCALE
 share/X11/locale/tatar-cyr/Compose
 share/X11/locale/tatar-cyr/XI18N_OBJS
 share/X11/locale/tatar-cyr/XLC_LOCALE
@@ -1021,6 +1027,7 @@ share/X11/locale/zh_TW/XLC_LOCALE
 @dirrm share/X11/locale/th_TH.UTF-8
 @dirrm share/X11/locale/th_TH
 @dirrm share/X11/locale/tatar-cyr
+@dirrm share/X11/locale/ru_RU.UTF-8
 @dirrm share/X11/locale/pt_BR.UTF-8
 @dirrm share/X11/locale/nokhchi-1
 @dirrm share/X11/locale/mulelao-1
@@ -1058,6 +1065,7 @@ share/X11/locale/zh_TW/XLC_LOCALE
 @dirrm share/X11/locale/ibm-cp1133
 @dirrm share/X11/locale/georgian-ps
 @dirrm share/X11/locale/georgian-academy
+@dirrm share/X11/locale/fi_FI.UTF-8
 @dirrm share/X11/locale/en_US.UTF-8
 @dirrm share/X11/locale/el_GR.UTF-8
 @dirrm share/X11/locale/armscii-8
diff --git a/x11/libX11/distinfo b/x11/libX11/distinfo
index caace8ae4fa..51a045fe03d 100644
--- a/x11/libX11/distinfo
+++ b/x11/libX11/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.13 2009/02/21 16:44:29 wiz Exp $
+$NetBSD: distinfo,v 1.14 2009/06/06 22:37:28 wiz Exp $
 
-SHA1 (libX11-1.2.tar.bz2) = b3d2bbdb5839031f4372c5711348d493c7a41dd6
-RMD160 (libX11-1.2.tar.bz2) = 9d736a55f7d56a4f0f4969c9f84210f05e846de4
-Size (libX11-1.2.tar.bz2) = 1805478 bytes
+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 (patch-aa) = 6a9fec9f8cc4f47de8d21043f7f73a20b6263f7d
-SHA1 (patch-ac) = 42e89ec091e53ef2b714bacc56f357f540223799
+SHA1 (patch-ac) = d193143bf4b63183efdd75947ed585ac6905d9da
 SHA1 (patch-ad) = 9015aa648f7f90d555bcf98d00b080ec39a7c364
-SHA1 (patch-ae) = af22062dd5a232de52f1bd3091e3a002ee915143
+SHA1 (patch-ae) = c76e2e1e5800010cd9e309b1d46c2e3cf24a17cf
 SHA1 (patch-af) = a97f3b31eecc783caecfeb315ac2cf6603ec32a5
 SHA1 (patch-ag) = 626875c0c772264ea53fbf4f6e9c2228f7628ecf
diff --git a/x11/libX11/patches/patch-ac b/x11/libX11/patches/patch-ac
index 1177b2618f1..c77ac04ba57 100644
--- a/x11/libX11/patches/patch-ac
+++ b/x11/libX11/patches/patch-ac
@@ -1,11 +1,11 @@
-$NetBSD: patch-ac,v 1.7 2009/02/21 16:44:29 wiz Exp $
+$NetBSD: patch-ac,v 1.8 2009/06/06 22:37:28 wiz Exp $
 
 _POSIX_THREAD_SAFE_FUNCTIONS is not used on NetBSD.  Instead,
 let's use _REENTRANT.
 
---- configure.orig	2009-02-17 15:10:53.000000000 +0000
+--- configure.orig	2009-04-07 22:40:47.000000000 +0000
 +++ configure
-@@ -932,6 +932,8 @@ XKB_FALSE
+@@ -929,6 +929,8 @@ XKB_FALSE
  XKBPROTO_CFLAGS
  XKBPROTO_LIBS
  XKBPROTO_REQUIRES
@@ -14,7 +14,7 @@ let's use _REENTRANT.
  LINT
  LINT_FLAGS
  LINT_TRUE
-@@ -23828,43 +23830,38 @@ _ACEOF
+@@ -23139,43 +23141,38 @@ _ACEOF
  	;;
  esac
  
@@ -70,7 +70,7 @@ let's use _REENTRANT.
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -23873,28 +23870,35 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
+@@ -23184,28 +23181,35 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
@@ -118,7 +118,7 @@ let's use _REENTRANT.
   if test x$thrstubs = xyes; then
    THRSTUBS_TRUE=
    THRSTUBS_FALSE='#'
-@@ -23909,8 +23913,8 @@ if test x$xthreads = xyes ; then
+@@ -23220,8 +23224,8 @@ if test x$xthreads = xyes ; then
      linux*|openbsd*|gnu*|k*bsd*-gnu)
          XTHREADLIB=-lpthread ;;
      netbsd*)
@@ -129,7 +129,7 @@ let's use _REENTRANT.
      freebsd*)
          XTHREAD_CFLAGS="-D_THREAD_SAFE"
          XTHREADLIB="-pthread" ;;
-@@ -24441,6 +24445,15 @@ else
+@@ -23702,6 +23706,15 @@ else
  fi
  
  
@@ -145,7 +145,7 @@ let's use _REENTRANT.
  
  
  for ac_header in stdlib.h unistd.h
-@@ -25582,6 +25595,13 @@ echo "$as_me: error: conditional \"XKB\"
+@@ -24850,6 +24863,13 @@ echo "$as_me: error: conditional \"XKB\"
  Usually this means the macro was only invoked conditionally." >&2;}
     { (exit 1); exit 1; }; }
  fi
@@ -159,7 +159,7 @@ let's use _REENTRANT.
  if test -z "${LINT_TRUE}" && test -z "${LINT_FALSE}"; then
    { { echo "$as_me:$LINENO: error: conditional \"LINT\" was never defined.
  Usually this means the macro was only invoked conditionally." >&5
-@@ -26412,6 +26432,8 @@ XKB_FALSE!$XKB_FALSE$ac_delim
+@@ -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
@@ -168,12 +168,12 @@ let's use _REENTRANT.
  LINT!$LINT$ac_delim
  LINT_FLAGS!$LINT_FLAGS$ac_delim
  LINT_TRUE!$LINT_TRUE$ac_delim
-@@ -26438,7 +26460,7 @@ LIBOBJS!$LIBOBJS$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` = 90; then
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 92; then
+-  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 4e8f387066b..c943ad469bb 100644
--- a/x11/libX11/patches/patch-ae
+++ b/x11/libX11/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.4 2009/02/21 16:44:29 wiz Exp $
+$NetBSD: patch-ae,v 1.5 2009/06/06 22:37:28 wiz Exp $
 
---- src/util/Makefile.in.orig	2009-02-17 15:11:02.000000000 +0000
+--- src/util/Makefile.in.orig	2009-04-07 22:40:59.000000000 +0000
 +++ src/util/Makefile.in
 @@ -34,7 +34,8 @@ PRE_UNINSTALL = :
  POST_UNINSTALL = :
@@ -19,7 +19,7 @@ $NetBSD: patch-ae,v 1.4 2009/02/21 16:44:29 wiz Exp $
 +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
+ DEFAULT_INCLUDES = -I. -I$(top_builddir)/src -I$(top_builddir)/include/X11@am__isrc@
  depcomp = $(SHELL) $(top_srcdir)/depcomp
  am__depfiles_maybe = depfiles
 @@ -62,8 +66,11 @@ CCLD = $(CC)
@@ -36,7 +36,7 @@ $NetBSD: patch-ae,v 1.4 2009/02/21 16:44:29 wiz Exp $
  ETAGS = etags
  CTAGS = ctags
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-@@ -282,6 +289,9 @@ clean-noinstPROGRAMS:
+@@ -279,6 +286,9 @@ clean-noinstPROGRAMS:
  makekeys$(EXEEXT): $(makekeys_OBJECTS) $(makekeys_DEPENDENCIES) 
  	@rm -f makekeys$(EXEEXT)
  	$(makekeys_LINK) $(makekeys_OBJECTS) $(makekeys_LDADD) $(LIBS)
@@ -46,7 +46,7 @@ $NetBSD: patch-ae,v 1.4 2009/02/21 16:44:29 wiz Exp $
  
  mostlyclean-compile:
  	-rm -f *.$(OBJEXT)
-@@ -290,6 +300,7 @@ distclean-compile:
+@@ -287,6 +297,7 @@ distclean-compile:
  	-rm -f *.tab.c
  
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/makekeys-makekeys.Po@am__quote@
@@ -54,7 +54,7 @@ $NetBSD: patch-ae,v 1.4 2009/02/21 16:44:29 wiz Exp $
  
  .c.o:
  @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@@ -508,6 +519,10 @@ uninstall-am:
+@@ -506,6 +517,10 @@ uninstall-am:
  	pdf pdf-am ps ps-am tags uninstall uninstall-am