Update libX11 to 1.1.3:

- man page fixes
- reset hostname when setting it internally for consistency
- fix XGetMotionEvents argument order
- locking fixes

7 files changed, 59 insertions, 806 deletions

diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile
index 5edf5b42674..9d5069ef6b3 100644
--- a/x11/libX11/Makefile
+++ b/x11/libX11/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2007/08/01 16:50:24 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2007/08/05 22:39:38 joerg Exp $
 #
 
-DISTNAME=		libX11-1.1.2
+DISTNAME=		libX11-1.1.3
 CATEGORIES=		x11 devel
 MASTER_SITES=		http://xorg.freedesktop.org/releases/individual/lib/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/libX11/distinfo b/x11/libX11/distinfo
index 3e297040aac..10bd573b728 100644
--- a/x11/libX11/distinfo
+++ b/x11/libX11/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.5 2007/08/01 16:46:16 joerg Exp $
+$NetBSD: distinfo,v 1.6 2007/08/05 22:39:38 joerg Exp $
 
-SHA1 (libX11-1.1.2.tar.bz2) = 7190d36389eb7903831cd9541d919f55ac5098e9
-RMD160 (libX11-1.1.2.tar.bz2) = c722e1eaa04a3d753660496d4e527b695c68db38
-Size (libX11-1.1.2.tar.bz2) = 1523644 bytes
+SHA1 (libX11-1.1.3.tar.bz2) = 235f69172b262f874d2a2d7bd17e8197aea5b767
+RMD160 (libX11-1.1.3.tar.bz2) = fcb8d5d31befa0ae227210dc7274c17b30c37fad
+Size (libX11-1.1.3.tar.bz2) = 1526958 bytes
 SHA1 (patch-aa) = 7c1905781ca9467adfb45e2cad9b710533bbcd17
 SHA1 (patch-ab) = 000f81dd5d21cbabf38e91b5066e8f1ce43ff957
-SHA1 (patch-ac) = ee92c9dd48a60b5597260f6bd1a02eddc1cc26a7
-SHA1 (patch-ad) = 30497b3fe22bc2ed477449afa79bf98076031e61
-SHA1 (patch-ae) = c59b6f63b95814285e8d6c8bcf32fb8755930bd0
-SHA1 (patch-af) = 20531d93e19e61c2eb08612f976083f36b460a9e
-SHA1 (patch-ag) = d7a92f25a84a8d2240fe0a38206c8d78f076106b
+SHA1 (patch-ac) = 9b3bea367661efeef337f8b9ae62d5f430a2204e
+SHA1 (patch-ad) = 58645e734f48334ce5cbf62f5870d087d95194ee
+SHA1 (patch-ae) = 124c47038ac2c12dd37f3f63606396b9ed976822
+SHA1 (patch-af) = a97f3b31eecc783caecfeb315ac2cf6603ec32a5
+SHA1 (patch-ag) = 0d1cf4804049fd3640d627ddfbab7b717f20b445
diff --git a/x11/libX11/patches/patch-ac b/x11/libX11/patches/patch-ac
index 41119b81ea0..deb162eeda0 100644
--- a/x11/libX11/patches/patch-ac
+++ b/x11/libX11/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1 2007/08/01 16:48:41 joerg Exp $
+$NetBSD: patch-ac,v 1.2 2007/08/05 22:39:38 joerg Exp $
 
---- configure.orig	2007-06-04 06:44:39.000000000 +0200
+--- configure.orig	2007-08-06 00:08:02.000000000 +0200
 +++ configure
-@@ -924,6 +924,8 @@ XKB_FALSE
+@@ -926,6 +926,8 @@ XKB_FALSE
  XKBPROTO_CFLAGS
  XKBPROTO_LIBS
  XKBPROTO_REQUIRES
@@ -11,11 +11,11 @@ $NetBSD: patch-ac,v 1.1 2007/08/01 16:48:41 joerg Exp $
  LINT
  LINT_FLAGS
  LINT_TRUE
-@@ -23199,6 +23201,17 @@ fi
- 
+@@ -23423,6 +23425,15 @@ else
+ fi
  
  
-+if  test $cross_compiling = yes ; then
++ if  test $cross_compiling = yes ; then
 +  CROSS_COMPILING_TRUE=
 +  CROSS_COMPILING_FALSE='#'
 +else
@@ -24,12 +24,10 @@ $NetBSD: patch-ac,v 1.1 2007/08/01 16:48:41 joerg Exp $
 +fi
 +
 +
-+
-+
+ 
+ 
  for ac_header in stdlib.h unistd.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-@@ -24299,6 +24312,13 @@ echo "$as_me: error: conditional \"XKB\"
+@@ -24523,6 +24534,13 @@ echo "$as_me: error: conditional \"XKB\"
  Usually this means the macro was only invoked conditionally." >&2;}
     { (exit 1); exit 1; }; }
  fi
@@ -43,7 +41,7 @@ $NetBSD: patch-ac,v 1.1 2007/08/01 16:48:41 joerg Exp $
  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
-@@ -25112,6 +25132,8 @@ XKB_FALSE!$XKB_FALSE$ac_delim
+@@ -25339,6 +25357,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
@@ -52,12 +50,12 @@ $NetBSD: patch-ac,v 1.1 2007/08/01 16:48:41 joerg Exp $
  LINT!$LINT$ac_delim
  LINT_FLAGS!$LINT_FLAGS$ac_delim
  LINT_TRUE!$LINT_TRUE$ac_delim
-@@ -25133,7 +25155,7 @@ LIBOBJS!$LIBOBJS$ac_delim
+@@ -25360,7 +25380,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` = 77; then
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 79; then
+-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 79; then
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 81; 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-ad b/x11/libX11/patches/patch-ad
index 1c7c1946fa2..62b4f74faa9 100644
--- a/x11/libX11/patches/patch-ad
+++ b/x11/libX11/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.1 2007/08/01 16:48:41 joerg Exp $
+$NetBSD: patch-ad,v 1.2 2007/08/05 22:39:38 joerg Exp $
 
---- src/util/Makefile.am.orig	2006-10-04 19:43:17.000000000 +0200
+--- src/util/Makefile.am.orig	2007-05-16 17:34:44.000000000 +0200
 +++ src/util/Makefile.am
 @@ -1,11 +1,15 @@
  # $XdotOrg: lib/X11/src/util/Makefile.am,v 1.4 2006-02-19 02:14:12 jamey Exp $
diff --git a/x11/libX11/patches/patch-ae b/x11/libX11/patches/patch-ae
index bf57814bbcd..91cd2d78f55 100644
--- a/x11/libX11/patches/patch-ae
+++ b/x11/libX11/patches/patch-ae
@@ -1,35 +1,8 @@
-$NetBSD: patch-ae,v 1.1 2007/08/01 16:48:42 joerg Exp $
+$NetBSD: patch-ae,v 1.2 2007/08/05 22:39:39 joerg Exp $
 
---- src/util/Makefile.in.orig	2007-06-04 06:44:50.000000000 +0200
+--- src/util/Makefile.in.orig	2007-08-06 00:07:57.000000000 +0200
 +++ src/util/Makefile.in
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -16,15 +16,11 @@
- 
- # $XdotOrg: lib/X11/src/util/Makefile.am,v 1.4 2006-02-19 02:14:12 jamey Exp $
- 
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ../..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -38,7 +34,6 @@ PRE_UNINSTALL = :
+@@ -34,7 +34,6 @@ PRE_UNINSTALL = :
  POST_UNINSTALL = :
  build_triplet = @build@
  host_triplet = @host@
@@ -37,28 +10,19 @@ $NetBSD: patch-ae,v 1.1 2007/08/01 16:48:42 joerg Exp $
  subdir = src/util
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -52,27 +47,31 @@ CONFIG_HEADER = $(top_builddir)/src/conf
- CONFIG_CLEAN_FILES =
- PROGRAMS = $(noinst_PROGRAMS)
- makekeys_SOURCES = makekeys.c
--makekeys_OBJECTS = makekeys-makekeys.$(OBJEXT)
-+makekeys_OBJECTS = makekeys.$(OBJEXT)
- makekeys_LDADD = $(LDADD)
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src -I$(top_builddir)/include/X11
+@@ -53,6 +52,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. -I$(top_builddir)/src -I$(top_builddir)/include/X11@am__isrc@
  depcomp = $(SHELL) $(top_srcdir)/depcomp
  am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
--	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
--	$(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+@@ -62,8 +64,11 @@ LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIB
+ 	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
  CCLD = $(CC)
 -SOURCES = makekeys.c
 -DIST_SOURCES = makekeys.c
@@ -70,299 +34,45 @@ $NetBSD: patch-ae,v 1.1 2007/08/01 16:48:42 joerg Exp $
  ETAGS = etags
  CTAGS = ctags
  DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
- ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- APP_MAN_DIR = @APP_MAN_DIR@
- APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
-@@ -109,6 +108,7 @@ FILE_MAN_DIR = @FILE_MAN_DIR@
- FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
- GREP = @GREP@
- I18N_MODULE_LIBS = @I18N_MODULE_LIBS@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -121,23 +121,16 @@ LIBTOOL = @LIBTOOL@
- LIB_MAN_DIR = @LIB_MAN_DIR@
- LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
- LINT = @LINT@
--LINT_FALSE = @LINT_FALSE@
- LINT_FLAGS = @LINT_FLAGS@
--LINT_TRUE = @LINT_TRUE@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
--MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
--MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
--MANPAGES_FALSE = @MANPAGES_FALSE@
--MANPAGES_TRUE = @MANPAGES_TRUE@
- MISC_MAN_DIR = @MISC_MAN_DIR@
- MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
-+MKDIR_P = $(mkdir_p)
- OBJEXT = @OBJEXT@
--OS2_FALSE = @OS2_FALSE@
--OS2_TRUE = @OS2_TRUE@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
- PACKAGE_NAME = @PACKAGE_NAME@
-@@ -152,10 +145,6 @@ RAWCPPFLAGS = @RAWCPPFLAGS@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
--THRSTUBS_FALSE = @THRSTUBS_FALSE@
--THRSTUBS_TRUE = @THRSTUBS_TRUE@
--UDC_FALSE = @UDC_FALSE@
--UDC_TRUE = @UDC_TRUE@
- VERSION = @VERSION@
- WCHAR32 = @WCHAR32@
- X11_CFLAGS = @X11_CFLAGS@
-@@ -166,26 +155,16 @@ X11_LIBS = @X11_LIBS@
- X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
- X11_LOCALEDIR = @X11_LOCALEDIR@
- X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
--XCB_FALSE = @XCB_FALSE@
--XCB_TRUE = @XCB_TRUE@
--XCMS_FALSE = @XCMS_FALSE@
--XCMS_TRUE = @XCMS_TRUE@
- XDMCP_CFLAGS = @XDMCP_CFLAGS@
- XDMCP_LIBS = @XDMCP_LIBS@
- XERRORDB = @XERRORDB@
- XKBPROTO_CFLAGS = @XKBPROTO_CFLAGS@
- XKBPROTO_LIBS = @XKBPROTO_LIBS@
- XKBPROTO_REQUIRES = @XKBPROTO_REQUIRES@
--XKB_FALSE = @XKB_FALSE@
--XKB_TRUE = @XKB_TRUE@
- XKEYSYMDB = @XKEYSYMDB@
--XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
--XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
- XLOCALEDATADIR = @XLOCALEDATADIR@
- XLOCALEDIR = @XLOCALEDIR@
- XLOCALELIBDIR = @XLOCALELIBDIR@
--XLOCALE_FALSE = @XLOCALE_FALSE@
--XLOCALE_TRUE = @XLOCALE_TRUE@
- XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
- XPROTO_CFLAGS = @XPROTO_CFLAGS@
- XPROTO_LIBS = @XPROTO_LIBS@
-@@ -194,13 +173,13 @@ XTHREADS = @XTHREADS@
- XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
- XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
- XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
-+abs_builddir = @abs_builddir@
-+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@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -212,6 +191,7 @@ build_alias = @build_alias@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -239,12 +219,13 @@ program_transform_name = @program_transf
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
+@@ -223,10 +228,9 @@ sysconfdir = @sysconfdir@
  target_alias = @target_alias@
--makekeys_CFLAGS = $(X11_CFLAGS)
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
++noinst_PROGRAMS = makekeys$(EXEEXT) $(MAKEKEYS_PROG)
+ makekeys_CFLAGS = $(X11_CFLAGS)
 -
 -#override CC = gcc
 -LINK = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
-+noinst_PROGRAMS = makekeys$(EXEEXT) $(MAKEKEYS_PROG)
 +@CROSS_COMPILING_TRUE@MAKEKEYS_PROG = xmakekeys$(EXEEXT)
  EXTRA_DIST = mkks.sh
  
  # Check source code with tools like lint & sparse
-@@ -293,7 +274,10 @@ clean-noinstPROGRAMS:
- 	done
+@@ -276,6 +280,9 @@ clean-noinstPROGRAMS:
  makekeys$(EXEEXT): $(makekeys_OBJECTS) $(makekeys_DEPENDENCIES) 
  	@rm -f makekeys$(EXEEXT)
--	$(LINK) $(makekeys_LDFLAGS) $(makekeys_OBJECTS) $(makekeys_LDADD) $(LIBS)
-+	$(LINK) $(makekeys_OBJECTS) $(makekeys_LDADD) $(LIBS)
+ 	$(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)
  
  mostlyclean-compile:
  	-rm -f *.$(OBJEXT)
-@@ -301,53 +285,36 @@ mostlyclean-compile:
- distclean-compile:
+@@ -284,6 +291,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)/makekeys.Po@am__quote@
+ @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@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
- .c.obj:
--@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- .c.lo:
--@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
- 
--makekeys-makekeys.o: makekeys.c
--@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS) -MT makekeys-makekeys.o -MD -MP -MF "$(DEPDIR)/makekeys-makekeys.Tpo" -c -o makekeys-makekeys.o `test -f 'makekeys.c' || echo '$(srcdir)/'`makekeys.c; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/makekeys-makekeys.Tpo" "$(DEPDIR)/makekeys-makekeys.Po"; else rm -f "$(DEPDIR)/makekeys-makekeys.Tpo"; exit 1; fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='makekeys.c' object='makekeys-makekeys.o' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS) -c -o makekeys-makekeys.o `test -f 'makekeys.c' || echo '$(srcdir)/'`makekeys.c
--
--makekeys-makekeys.obj: makekeys.c
--@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS) -MT makekeys-makekeys.obj -MD -MP -MF "$(DEPDIR)/makekeys-makekeys.Tpo" -c -o makekeys-makekeys.obj `if test -f 'makekeys.c'; then $(CYGPATH_W) 'makekeys.c'; else $(CYGPATH_W) '$(srcdir)/makekeys.c'; fi`; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/makekeys-makekeys.Tpo" "$(DEPDIR)/makekeys-makekeys.Po"; else rm -f "$(DEPDIR)/makekeys-makekeys.Tpo"; exit 1; fi
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='makekeys.c' object='makekeys-makekeys.obj' libtool=no @AMDEPBACKSLASH@
--@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS) -c -o makekeys-makekeys.obj `if test -f 'makekeys.c'; then $(CYGPATH_W) 'makekeys.c'; else $(CYGPATH_W) '$(srcdir)/makekeys.c'; fi`
--
- mostlyclean-libtool:
- 	-rm -f *.lo
- 
- clean-libtool:
- 	-rm -rf .libs _libs
- 
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- 	unique=`for i in $$list; do \
-@@ -397,22 +364,21 @@ distclean-tags:
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
- 	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -460,7 +426,7 @@ distclean: distclean-am
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-libtool distclean-tags
-+	distclean-tags
- 
- dvi: dvi-am
- 
-@@ -474,12 +440,20 @@ info-am:
+ @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@@ -503,6 +511,10 @@ uninstall-am:
+ 	pdf pdf-am ps ps-am tags uninstall uninstall-am
  
- install-data-am:
- 
-+install-dvi: install-dvi-am
-+
- install-exec-am:
- 
-+install-html: install-html-am
-+
- install-info: install-info-am
- 
- install-man:
- 
-+install-pdf: install-pdf-am
-+
-+install-ps: install-ps-am
-+
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-am
-@@ -500,20 +474,27 @@ ps: ps-am
- 
- ps-am:
- 
--uninstall-am: uninstall-info-am
-+uninstall-am:
-+
-+.MAKE: install-am install-strip
- 
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- 	clean-libtool clean-noinstPROGRAMS ctags distclean \
- 	distclean-compile distclean-generic distclean-libtool \
- 	distclean-tags distdir dvi dvi-am html html-am info info-am \
--	install install-am install-data install-data-am install-exec \
--	install-exec-am install-info install-info-am install-man \
-+	install install-am install-data install-data-am install-dvi \
-+	install-dvi-am install-exec install-exec-am install-html \
-+	install-html-am install-info install-info-am install-man \
-+	install-pdf install-pdf-am install-ps install-ps-am \
- 	install-strip installcheck installcheck-am installdirs \
- 	maintainer-clean maintainer-clean-generic mostlyclean \
- 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
--	pdf pdf-am ps ps-am tags uninstall uninstall-am \
--	uninstall-info-am
-+	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) $(makekeys_CFLAGS) \
++@CROSS_COMPILING_TRUE@	$(CC_FOR_BUILD) $(X11_CFLAGS) $(CPPFLAGS_FOR_BUILD) \
 +@CROSS_COMPILING_TRUE@	    $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ makekeys.c
- 
++
  @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.
diff --git a/x11/libX11/patches/patch-af b/x11/libX11/patches/patch-af
index 13a267e74fb..57cd126e61c 100644
--- a/x11/libX11/patches/patch-af
+++ b/x11/libX11/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.1 2007/08/01 16:48:42 joerg Exp $
+$NetBSD: patch-af,v 1.2 2007/08/05 22:39:39 joerg Exp $
 
---- src/Makefile.am.orig	2006-10-07 01:40:27.000000000 +0200
+--- src/Makefile.am.orig	2007-08-05 23:59:55.000000000 +0200
 +++ src/Makefile.am
-@@ -408,11 +408,17 @@ endif LINT
+@@ -408,8 +408,14 @@ endif LINT
  
  KEYSYMDEF=@KEYSYMDEF@
  
@@ -18,7 +18,3 @@ $NetBSD: patch-af,v 1.1 2007/08/01 16:48:42 joerg Exp $
  	mv ks_tables_h $@
  
  $(top_builddir)/src/util/makekeys$(EXEEXT): force
--	cd util; $(MAKE)
-+	cd util && $(MAKE)
- 
- force:
diff --git a/x11/libX11/patches/patch-ag b/x11/libX11/patches/patch-ag
index ff63c291520..8367eeb902d 100644
--- a/x11/libX11/patches/patch-ag
+++ b/x11/libX11/patches/patch-ag
@@ -1,223 +1,8 @@
-$NetBSD: patch-ag,v 1.1 2007/08/01 16:48:42 joerg Exp $
+$NetBSD: patch-ag,v 1.2 2007/08/05 22:39:39 joerg Exp $
 
---- src/Makefile.in.orig	2007-06-04 06:44:50.000000000 +0200
+--- src/Makefile.in.orig	2007-08-06 00:07:52.000000000 +0200
 +++ src/Makefile.in
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# Makefile.in generated by automake 1.10 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -15,15 +15,11 @@
- @SET_MAKE@
- 
- 
--srcdir = @srcdir@
--top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
--top_builddir = ..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
--INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
- install_sh_PROGRAM = $(install_sh) -c
- install_sh_SCRIPT = $(install_sh) -c
-@@ -79,17 +75,13 @@ LTLIBRARIES = $(lib_LTLIBRARIES)
- am__libX11_xcb_la_SOURCES_DIST = x11_xcb.c Xxcbint.h
- @XCB_TRUE@am_libX11_xcb_la_OBJECTS = x11_xcb.lo
- libX11_xcb_la_OBJECTS = $(am_libX11_xcb_la_OBJECTS)
-+libX11_xcb_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(libX11_xcb_la_LDFLAGS) $(LDFLAGS) -o $@
- @XCB_TRUE@am_libX11_xcb_la_rpath = -rpath $(libdir)
--am__DEPENDENCIES_1 = xlibi18n/libi18n.la
--@XLOCALE_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
--am__DEPENDENCIES_3 = xcms/libxcms.la
--@XCMS_TRUE@am__DEPENDENCIES_4 = $(am__DEPENDENCIES_3)
--am__DEPENDENCIES_5 = xkb/libxkb.la
--@XKB_TRUE@am__DEPENDENCIES_6 = $(am__DEPENDENCIES_5)
--am__DEPENDENCIES_7 =
--libX11_la_DEPENDENCIES = $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_4) \
--	$(am__DEPENDENCIES_6) $(am__DEPENDENCIES_7) \
--	$(am__DEPENDENCIES_7)
-+am__DEPENDENCIES_1 =
-+libX11_la_DEPENDENCIES = $(USE_I18N_LIBS) $(USE_XCMS_LIBS) \
-+	$(USE_XKB_LIBS) $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
- am__libX11_la_SOURCES_DIST = AllCells.c AllowEv.c AllPlanes.c \
- 	AutoRep.c Backgnd.c BdrWidth.c Bell.c Border.c ChAccCon.c \
- 	ChActPGb.c ChClMode.c ChCmap.c ChGC.c ChKeyCon.c ChkIfEv.c \
-@@ -201,28 +193,35 @@ am_libX11_la_OBJECTS = AllCells.lo Allow
- 	$(am__objects_1) $(am__objects_2) $(am__objects_3) \
- 	$(am__objects_4) $(am__objects_5)
- libX11_la_OBJECTS = $(am_libX11_la_OBJECTS)
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I. -I$(top_builddir)/include/X11
-+libX11_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(libX11_la_LDFLAGS) $(LDFLAGS) -o $@
-+DEFAULT_INCLUDES = -I. -I$(top_builddir)/include/X11@am__isrc@
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
--	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
--	$(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
--LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
--	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-+	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
-+	$(LDFLAGS) -o $@
- SOURCES = $(libX11_xcb_la_SOURCES) $(libX11_la_SOURCES)
- DIST_SOURCES = $(am__libX11_xcb_la_SOURCES_DIST) \
- 	$(am__libX11_la_SOURCES_DIST)
- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
- 	html-recursive info-recursive install-data-recursive \
--	install-exec-recursive install-info-recursive \
--	install-recursive installcheck-recursive installdirs-recursive \
--	pdf-recursive ps-recursive uninstall-info-recursive \
--	uninstall-recursive
-+	install-dvi-recursive install-exec-recursive \
-+	install-html-recursive install-info-recursive \
-+	install-pdf-recursive install-ps-recursive install-recursive \
-+	installcheck-recursive installdirs-recursive pdf-recursive \
-+	ps-recursive uninstall-recursive
- x11dataDATA_INSTALL = $(INSTALL_DATA)
- DATA = $(x11data_DATA)
-+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-+  distclean-recursive maintainer-clean-recursive
- ETAGS = etags
- CTAGS = ctags
- DIST_SUBDIRS = util xcms xlibi18n xkb
-@@ -230,8 +229,6 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCE
- ACLOCAL = @ACLOCAL@
- ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
- ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
--AMDEP_FALSE = @AMDEP_FALSE@
--AMDEP_TRUE = @AMDEP_TRUE@
- AMTAR = @AMTAR@
- APP_MAN_DIR = @APP_MAN_DIR@
- APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
-@@ -268,6 +265,7 @@ FILE_MAN_DIR = @FILE_MAN_DIR@
- FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
- GREP = @GREP@
- I18N_MODULE_LIBS = @I18N_MODULE_LIBS@
-+INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
- INSTALL_SCRIPT = @INSTALL_SCRIPT@
-@@ -284,23 +282,16 @@ LIBTOOL = @LIBTOOL@
- LIB_MAN_DIR = @LIB_MAN_DIR@
- LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
- LINT = @LINT@
--LINT_FALSE = @LINT_FALSE@
- LINT_FLAGS = @LINT_FLAGS@
--LINT_TRUE = @LINT_TRUE@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
--MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
--MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MALLOC_ZERO_CFLAGS = @MALLOC_ZERO_CFLAGS@
--MANPAGES_FALSE = @MANPAGES_FALSE@
--MANPAGES_TRUE = @MANPAGES_TRUE@
- MISC_MAN_DIR = @MISC_MAN_DIR@
- MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
-+MKDIR_P = $(mkdir_p)
- OBJEXT = @OBJEXT@
--OS2_FALSE = @OS2_FALSE@
--OS2_TRUE = @OS2_TRUE@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
- PACKAGE_NAME = @PACKAGE_NAME@
-@@ -315,10 +306,6 @@ RAWCPPFLAGS = @RAWCPPFLAGS@
- SET_MAKE = @SET_MAKE@
- SHELL = @SHELL@
- STRIP = @STRIP@
--THRSTUBS_FALSE = @THRSTUBS_FALSE@
--THRSTUBS_TRUE = @THRSTUBS_TRUE@
--UDC_FALSE = @UDC_FALSE@
--UDC_TRUE = @UDC_TRUE@
- VERSION = @VERSION@
- WCHAR32 = @WCHAR32@
- X11_CFLAGS = @X11_CFLAGS@
-@@ -329,26 +316,16 @@ X11_LIBS = @X11_LIBS@
- X11_LOCALEDATADIR = @X11_LOCALEDATADIR@
- X11_LOCALEDIR = @X11_LOCALEDIR@
- X11_LOCALELIBDIR = @X11_LOCALELIBDIR@
--XCB_FALSE = @XCB_FALSE@
--XCB_TRUE = @XCB_TRUE@
--XCMS_FALSE = @XCMS_FALSE@
--XCMS_TRUE = @XCMS_TRUE@
- XDMCP_CFLAGS = @XDMCP_CFLAGS@
- XDMCP_LIBS = @XDMCP_LIBS@
- XERRORDB = @XERRORDB@
- XKBPROTO_CFLAGS = @XKBPROTO_CFLAGS@
- XKBPROTO_LIBS = @XKBPROTO_LIBS@
- XKBPROTO_REQUIRES = @XKBPROTO_REQUIRES@
--XKB_FALSE = @XKB_FALSE@
--XKB_TRUE = @XKB_TRUE@
- XKEYSYMDB = @XKEYSYMDB@
--XLIB_LOADABLE_I18N_FALSE = @XLIB_LOADABLE_I18N_FALSE@
--XLIB_LOADABLE_I18N_TRUE = @XLIB_LOADABLE_I18N_TRUE@
- XLOCALEDATADIR = @XLOCALEDATADIR@
- XLOCALEDIR = @XLOCALEDIR@
- XLOCALELIBDIR = @XLOCALELIBDIR@
--XLOCALE_FALSE = @XLOCALE_FALSE@
--XLOCALE_TRUE = @XLOCALE_TRUE@
- XMALLOC_ZERO_CFLAGS = @XMALLOC_ZERO_CFLAGS@
- XPROTO_CFLAGS = @XPROTO_CFLAGS@
- XPROTO_LIBS = @XPROTO_LIBS@
-@@ -357,13 +334,13 @@ XTHREADS = @XTHREADS@
- XTHREAD_CFLAGS = @XTHREAD_CFLAGS@
- XTMALLOC_ZERO_CFLAGS = @XTMALLOC_ZERO_CFLAGS@
- XUSE_MTSAFE_API = @XUSE_MTSAFE_API@
-+abs_builddir = @abs_builddir@
-+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@
--am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
--am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
--am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
--am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-@@ -375,6 +352,7 @@ build_alias = @build_alias@
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -402,8 +380,11 @@ program_transform_name = @program_transf
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- @XKB_TRUE@XKB_SUBDIRS = xkb
- SUBDIRS = util xcms xlibi18n $(XKB_SUBDIRS)
- lib_LTLIBRARIES = libX11.la $(am__append_5)
-@@ -530,6 +511,8 @@ libX11_la_LIBADD = \
+@@ -512,6 +512,8 @@ libX11_la_LIBADD = \
  @LINT_TRUE@ALL_LINT_FLAGS = $(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
  @LINT_TRUE@		$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
  
@@ -226,238 +11,7 @@ $NetBSD: patch-ag,v 1.1 2007/08/01 16:48:42 joerg Exp $
  all: $(BUILT_SOURCES) config.h
  	$(MAKE) $(AM_MAKEFLAGS) all-recursive
  
-@@ -568,7 +551,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(
- config.h: stamp-h1
- 	@if test ! -f $@; then \
- 	  rm -f stamp-h1; \
--	  $(MAKE) stamp-h1; \
-+	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
- 	else :; fi
- 
- stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
-@@ -583,7 +566,7 @@ distclean-hdr:
- 	-rm -f config.h stamp-h1
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
-+	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
- 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
- 	    f=$(am__strip_dir) \
-@@ -594,7 +577,7 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIE
- 
- uninstall-libLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
--	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- 	  p=$(am__strip_dir) \
- 	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
- 	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
-@@ -609,9 +592,9 @@ clean-libLTLIBRARIES:
- 	  rm -f "$${dir}/so_locations"; \
- 	done
- libX11-xcb.la: $(libX11_xcb_la_OBJECTS) $(libX11_xcb_la_DEPENDENCIES) 
--	$(LINK) $(am_libX11_xcb_la_rpath) $(libX11_xcb_la_LDFLAGS) $(libX11_xcb_la_OBJECTS) $(libX11_xcb_la_LIBADD) $(LIBS)
-+	$(libX11_xcb_la_LINK) $(am_libX11_xcb_la_rpath) $(libX11_xcb_la_OBJECTS) $(libX11_xcb_la_LIBADD) $(LIBS)
- libX11.la: $(libX11_la_OBJECTS) $(libX11_la_DEPENDENCIES) 
--	$(LINK) -rpath $(libdir) $(libX11_la_LDFLAGS) $(libX11_la_OBJECTS) $(libX11_la_LIBADD) $(LIBS)
-+	$(libX11_la_LINK) -rpath $(libdir) $(libX11_la_OBJECTS) $(libX11_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -885,22 +868,22 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xcb_lock.Plo@am__quote@
- 
- .c.o:
--@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c $<
- 
- .c.obj:
--@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
- 
- .c.lo:
--@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
--@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-@@ -910,13 +893,9 @@ mostlyclean-libtool:
- 
- clean-libtool:
- 	-rm -rf .libs _libs
--
--distclean-libtool:
--	-rm -f libtool
--uninstall-info-am:
- install-x11dataDATA: $(x11data_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(x11datadir)" || $(mkdir_p) "$(DESTDIR)$(x11datadir)"
-+	test -z "$(x11datadir)" || $(MKDIR_P) "$(DESTDIR)$(x11datadir)"
- 	@list='$(x11data_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
-@@ -963,8 +942,7 @@ $(RECURSIVE_TARGETS):
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
- 	fi; test -z "$$fail"
- 
--mostlyclean-recursive clean-recursive distclean-recursive \
--maintainer-clean-recursive:
-+$(RECURSIVE_CLEAN_TARGETS):
- 	@failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
-@@ -1065,22 +1043,21 @@ distclean-tags:
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- distdir: $(DISTFILES)
--	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
--	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
--	list='$(DISTFILES)'; for file in $$list; do \
--	  case $$file in \
--	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
--	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
--	  esac; \
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
- 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
--	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
--	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
--	    dir="/$$dir"; \
--	    $(mkdir_p) "$(distdir)$$dir"; \
--	  else \
--	    dir=''; \
--	  fi; \
- 	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- 	    fi; \
-@@ -1094,7 +1071,7 @@ distdir: $(DISTFILES)
- 	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- 	  if test "$$subdir" = .; then :; else \
- 	    test -d "$(distdir)/$$subdir" \
--	    || $(mkdir_p) "$(distdir)/$$subdir" \
-+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
- 	    || exit 1; \
- 	    distdir=`$(am__cd) $(distdir) && pwd`; \
- 	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-@@ -1102,6 +1079,8 @@ distdir: $(DISTFILES)
- 	      $(MAKE) $(AM_MAKEFLAGS) \
- 	        top_distdir="$$top_distdir" \
- 	        distdir="$$distdir/$$subdir" \
-+		am__remove_distdir=: \
-+		am__skip_length_check=: \
- 	        distdir) \
- 	      || exit 1; \
- 	  fi; \
-@@ -1113,7 +1092,7 @@ all-am: Makefile $(LTLIBRARIES) $(DATA) 
- installdirs: installdirs-recursive
- installdirs-am:
- 	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(x11datadir)"; do \
--	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
- 	done
- install: $(BUILT_SOURCES)
- 	$(MAKE) $(AM_MAKEFLAGS) install-recursive
-@@ -1151,7 +1130,7 @@ distclean: distclean-recursive
- 	-rm -rf ./$(DEPDIR)
- 	-rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
--	distclean-hdr distclean-libtool distclean-tags
-+	distclean-hdr distclean-tags
- 
- dvi: dvi-recursive
- 
-@@ -1165,12 +1144,20 @@ info-am:
- 
- install-data-am: install-x11dataDATA
- 
-+install-dvi: install-dvi-recursive
-+
- install-exec-am: install-libLTLIBRARIES
- 
-+install-html: install-html-recursive
-+
- install-info: install-info-recursive
- 
- install-man:
- 
-+install-pdf: install-pdf-recursive
-+
-+install-ps: install-ps-recursive
-+
- installcheck-am:
- 
- maintainer-clean: maintainer-clean-recursive
-@@ -1191,26 +1178,27 @@ ps: ps-recursive
- 
- ps-am:
- 
--uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
--	uninstall-x11dataDATA
-+uninstall-am: uninstall-libLTLIBRARIES uninstall-x11dataDATA
- 
--uninstall-info: uninstall-info-recursive
-+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-+	install-strip
- 
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
--	clean clean-generic clean-libLTLIBRARIES clean-libtool \
--	clean-recursive ctags ctags-recursive distclean \
--	distclean-compile distclean-generic distclean-hdr \
--	distclean-libtool distclean-recursive distclean-tags distdir \
--	dvi dvi-am html html-am info info-am install install-am \
--	install-data install-data-am install-exec install-exec-am \
--	install-info install-info-am install-libLTLIBRARIES \
--	install-man install-strip install-x11dataDATA installcheck \
--	installcheck-am installdirs installdirs-am maintainer-clean \
--	maintainer-clean-generic maintainer-clean-recursive \
-+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-+	all all-am check check-am clean clean-generic \
-+	clean-libLTLIBRARIES clean-libtool ctags ctags-recursive \
-+	distclean distclean-compile distclean-generic distclean-hdr \
-+	distclean-libtool distclean-tags distdir dvi dvi-am html \
-+	html-am info info-am install install-am install-data \
-+	install-data-am install-dvi install-dvi-am install-exec \
-+	install-exec-am install-html install-html-am install-info \
-+	install-info-am install-libLTLIBRARIES install-man install-pdf \
-+	install-pdf-am install-ps install-ps-am install-strip \
-+	install-x11dataDATA installcheck installcheck-am installdirs \
-+	installdirs-am maintainer-clean maintainer-clean-generic \
- 	mostlyclean mostlyclean-compile mostlyclean-generic \
--	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
--	tags tags-recursive uninstall uninstall-am uninstall-info-am \
--	uninstall-libLTLIBRARIES uninstall-x11dataDATA
-+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-+	uninstall uninstall-am uninstall-libLTLIBRARIES \
-+	uninstall-x11dataDATA
- 
- 
- preprocess: $(patsubst %.c,%.ii,$(libX11_la_SOURCES))
-@@ -1227,11 +1215,11 @@ preprocess: $(patsubst %.c,%.ii,$(libX11
+@@ -1214,7 +1216,7 @@ preprocess: $(patsubst %.c,%.ii,$(libX11
  @LINT_TRUE@	done
  
  ks_tables.h: $(KEYSYMDEF) $(top_builddir)/src/util/makekeys$(EXEEXT)
@@ -466,8 +20,3 @@ $NetBSD: patch-ag,v 1.1 2007/08/01 16:48:42 joerg Exp $
  	mv ks_tables_h $@
  
  $(top_builddir)/src/util/makekeys$(EXEEXT): force
--	cd util; $(MAKE)
-+	cd util && $(MAKE)
- 
- force:
- # Tell versions [3.59,3.63) of GNU make to not export all variables.