Update to 1.0.6:

Adam Jackson (1):
      libXt 1.0.6

Alan Coopersmith (3):
      Solaris builds need to pass -intelabi to makestrs, even on SPARC
      Update ac_define_dir.m4 to 2008-04-12 version
      Add README with pointers to mailing list, bugzilla & git repos

Alan Hourihane (4):
      Link with winsock for WIN32 platforms
      fix logic inverted problem
      less speed, more haste
      Set a blank default search path for WIN32

Andreas Luik (1):
      Recalculate fd_set more aggressively (bug #808)
	[was patch-ag]

Ben Byer (1):
      added -flat_namespace to CFLAGS for Darwin

Colin Harrison (4):
      Add __MINGW32__
      Fix some build issues for Win32 platforms
      Xming specific configuration file settings
      Reduce the path searches on mingw

Daniel Stone (1):
      configure.ac: Minor thinko

James Cloos (1):
      Add missing PHONY line for automatic ChangeLog generation

Jeremy Huddleston (1):
      darwin: Don't use poll() on versions of darwin before darwin10

John McKernan (2):
      Sun bug #1237023:  Dtterm crashes in XtDisplayAccelerators()
      Sun bug 4010369: Too slow to process Keycode 0 events in Xt Translati=
on Mgr.

John Tapsell (1):
      configure.ac: Use native compiler for build tools

Jon TURNEY (1):
      Cygwin/X: Build fix

Julien Cristau (1):
      Allow C++ apps to build using libXt

Matthieu Herrb (2):
      Sync XtGetErrorDatabaseText() prototype with reality.
      nuke RCS Ids

Paulo Cesar Pereira de Andrade (1):
      Janitor: ansification, make distcheck, compiler warnings, .gitignore.

Peter Breitenlohner (1):
      X.Org Bug 17942: libXt manpage formatting

9 files changed, 85 insertions, 295 deletions

diff --git a/x11/libXt/Makefile b/x11/libXt/Makefile
index 0b61523226b..b689335f3ab 100644
--- a/x11/libXt/Makefile
+++ b/x11/libXt/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2008/05/24 21:45:15 tnn Exp $
+# $NetBSD: Makefile,v 1.11 2009/07/18 10:28:47 wiz Exp $
 #
 
-DISTNAME=		libXt-1.0.5
-PKGREVISION=		1
+DISTNAME=		libXt-1.0.6
 CATEGORIES=		x11 devel
 MASTER_SITES=		${MASTER_SITE_XORG:=lib/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/libXt/distinfo b/x11/libXt/distinfo
index 7fcf12b294d..a856b15553e 100644
--- a/x11/libXt/distinfo
+++ b/x11/libXt/distinfo
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.6 2008/01/29 03:37:02 bjs Exp $
+$NetBSD: distinfo,v 1.7 2009/07/18 10:28:47 wiz Exp $
 
-SHA1 (libXt-1.0.5.tar.bz2) = 5f33921e373ce162a39eabef2ce05d946935eb5b
-RMD160 (libXt-1.0.5.tar.bz2) = 7e5ef9e03dc860bf5b64b85a897dd1d2ae1ed0bf
-Size (libXt-1.0.5.tar.bz2) = 500502 bytes
-SHA1 (patch-aa) = bc1b32ac62f012cea92de65f73ecaf521ede16e5
-SHA1 (patch-ab) = 9a03be1b08aa72375c80a21dfe10bd79fbd37a83
-SHA1 (patch-ac) = d053f56de09d13fc60b5a8dd281837020a0aee95
-SHA1 (patch-ad) = 5fa9b62316dc04eaf80cec20fc900cdd120751af
-SHA1 (patch-ae) = feff93927edcb31c1c9320212df0754b4cab0676
-SHA1 (patch-af) = 8cc0692ff61345149830682703533e65870d1693
-SHA1 (patch-ag) = da1e7688a5923542d81e87d204ce8e95b920e221
+SHA1 (libXt-1.0.6.tar.bz2) = 8396f51c413006a14c1d7ecd3270a3c59736654a
+RMD160 (libXt-1.0.6.tar.bz2) = 3ad412ee271513e2ca4d8d8f7945d1d1ec0efeae
+Size (libXt-1.0.6.tar.bz2) = 538143 bytes
+SHA1 (patch-aa) = dc323bb925a638d8cefc790d0df31cf73ce826b9
+SHA1 (patch-ab) = 0fa6ad0aadf9a694f21850de58d4a1d1581e2851
+SHA1 (patch-ac) = 3abc6e5f70a9834de2ee74f9013a3dd9d2684de8
+SHA1 (patch-ad) = 89be246fc069963ff995f1d02371ce80811c2f57
+SHA1 (patch-ae) = 2571754d179fb85510c45f67d0ba0a0af4ca1bbd
+SHA1 (patch-af) = e9b2882bc62c045afc0a32a8feab6a298108aa16
diff --git a/x11/libXt/patches/patch-aa b/x11/libXt/patches/patch-aa
index 7b4712d06b4..1eb7d25b831 100644
--- a/x11/libXt/patches/patch-aa
+++ b/x11/libXt/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.3 2007/08/01 16:52:48 joerg Exp $
+$NetBSD: patch-aa,v 1.4 2009/07/18 10:28:47 wiz Exp $
 
---- util/Makefile.am.orig	2006-07-11 20:05:55.000000000 +0200
+--- util/Makefile.am.orig	2009-07-02 17:22:11.000000000 +0000
 +++ util/Makefile.am
 @@ -1,7 +1,8 @@
  if INSTALL_MAKESTRS
@@ -11,8 +11,8 @@ $NetBSD: patch-aa,v 1.3 2007/08/01 16:52:48 joerg Exp $
 +noinst_PROGRAMS = makestrs $(MAKESTRS_PROG)
  endif
  
- EXTRA_DIST = \
-@@ -13,6 +14,13 @@ EXTRA_DIST = \
+ CC = @CC_FOR_BUILD@
+@@ -15,6 +16,13 @@ EXTRA_DIST = \
  makestrs_CFLAGS = $(XT_CFLAGS)
  makestrs_SOURCES = makestrs.c
  
diff --git a/x11/libXt/patches/patch-ab b/x11/libXt/patches/patch-ab
index 25e2f5c934a..211ef6ea9ae 100644
--- a/x11/libXt/patches/patch-ab
+++ b/x11/libXt/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.4 2007/09/20 08:30:14 rillig Exp $
+$NetBSD: patch-ab,v 1.5 2009/07/18 10:28:47 wiz Exp $
 
---- util/Makefile.in.orig	2007-01-28 07:31:13.000000000 +0100
-+++ util/Makefile.in	2007-09-20 10:23:58.000000000 +0200
-@@ -38,7 +38,9 @@ POST_UNINSTALL = :
+--- util/Makefile.in.orig	2009-07-02 17:25:58.000000000 +0000
++++ util/Makefile.in
+@@ -34,7 +34,9 @@ POST_UNINSTALL = :
  build_triplet = @build@
  host_triplet = @host@
  @INSTALL_MAKESTRS_TRUE@bin_PROGRAMS = makestrs$(EXEEXT)
@@ -13,7 +13,7 @@ $NetBSD: patch-ab,v 1.4 2007/09/20 08:30:14 rillig Exp $
  subdir = util
  DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -51,10 +53,14 @@ CONFIG_HEADER = $(top_builddir)/config.h
+@@ -47,10 +49,14 @@ CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
  am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(appmandir)"
  binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
@@ -25,13 +25,13 @@ $NetBSD: patch-ab,v 1.4 2007/09/20 08:30:14 rillig Exp $
 +xmakestrs_SOURCES = xmakestrs.c
 +xmakestrs_OBJECTS = xmakestrs.$(OBJEXT)
 +xmakestrs_LDADD = $(LDADD)
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-@@ -66,8 +72,8 @@ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=c
- CCLD = $(CC)
- LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+ makestrs_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ 	--mode=link $(CCLD) $(makestrs_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+ 	$(LDFLAGS) -o $@
+@@ -66,8 +72,8 @@ CCLD = $(CC)
+ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+ 	$(LDFLAGS) -o $@
 -SOURCES = $(makestrs_SOURCES)
 -DIST_SOURCES = $(makestrs_SOURCES)
 +SOURCES = $(makestrs_SOURCES) xmakestrs.c
@@ -39,16 +39,16 @@ $NetBSD: patch-ab,v 1.4 2007/09/20 08:30:14 rillig Exp $
  am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
  am__vpath_adj = case $$p in \
      $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-@@ -97,6 +103,8 @@ CCDEPMODE = @CCDEPMODE@
- CFLAGS = @CFLAGS@
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
+@@ -101,6 +107,8 @@ CWARNFLAGS = @CWARNFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
 +CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@
 +CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@
- CXX = @CXX@
- CXXCPP = @CXXCPP@
- CXXDEPMODE = @CXXDEPMODE@
-@@ -211,6 +219,7 @@ target_alias = @target_alias@
+ DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
+ DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
+ DSYMUTIL = @DSYMUTIL@
+@@ -220,6 +228,7 @@ top_srcdir = @top_srcdir@
  EXTRA_DIST = Shell.ht StrDefs.ct StrDefs.ht string.list $(appman_PRE)
  makestrs_CFLAGS = $(XT_CFLAGS)
  makestrs_SOURCES = makestrs.c
@@ -56,26 +56,26 @@ $NetBSD: patch-ab,v 1.4 2007/09/20 08:30:14 rillig Exp $
  
  # Man page
  appmandir = $(APP_MAN_DIR)
-@@ -298,6 +307,9 @@ clean-noinstPROGRAMS:
- makestrs$(EXEEXT): $(makestrs_OBJECTS) $(makestrs_DEPENDENCIES) 
- 	@rm -f makestrs$(EXEEXT)
- 	$(LINK) $(makestrs_LDFLAGS) $(makestrs_OBJECTS) $(makestrs_LDADD) $(LIBS)
+@@ -303,6 +312,9 @@ clean-noinstPROGRAMS:
+ 	  echo " rm -f $$p $$f"; \
+ 	  rm -f $$p $$f ; \
+ 	done
 +@CROSS_COMPILING_FALSE@xmakestrs$(EXEEXT): $(xmakestrs_OBJECTS) $(xmakestrs_DEPENDENCIES) 
 +@CROSS_COMPILING_FALSE@	@rm -f xmakestrs$(EXEEXT)
 +@CROSS_COMPILING_FALSE@	$(LINK) $(xmakestrs_LDFLAGS) $(xmakestrs_OBJECTS) $(xmakestrs_LDADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -306,6 +318,7 @@ distclean-compile:
+ makestrs$(EXEEXT): $(makestrs_OBJECTS) $(makestrs_DEPENDENCIES) 
+ 	@rm -f makestrs$(EXEEXT)
+ 	$(makestrs_LINK) $(makestrs_OBJECTS) $(makestrs_LDADD) $(LIBS)
+@@ -314,6 +326,7 @@ distclean-compile:
  	-rm -f *.tab.c
  
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/makestrs-makestrs.Po@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmakestrs.Po@am__quote@
  
  .c.o:
- @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@@ -542,6 +555,10 @@ uninstall-am: uninstall-appmanDATA unins
- 	uninstall-appmanDATA uninstall-binPROGRAMS uninstall-info-am
+ @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@@ -555,6 +568,10 @@ uninstall-am: uninstall-appmanDATA unins
+ 	uninstall-appmanDATA uninstall-binPROGRAMS
  
  
 +@CROSS_COMPILING_TRUE@xmakestrs$(EXEEXT): makestrs.c
diff --git a/x11/libXt/patches/patch-ac b/x11/libXt/patches/patch-ac
index bd6d1b6eaac..1cb0cbe1075 100644
--- a/x11/libXt/patches/patch-ac
+++ b/x11/libXt/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.2 2007/09/20 08:30:15 rillig Exp $
+$NetBSD: patch-ac,v 1.3 2009/07/18 10:28:47 wiz Exp $
 
---- src/Makefile.am	2006-12-19 04:40:53.000000000 +0100
-+++ src/Makefile.am	2007-07-27 21:30:16.000000000 +0200
-@@ -96,8 +96,15 @@
+--- src/Makefile.am.orig	2009-07-02 17:22:11.000000000 +0000
++++ src/Makefile.am
+@@ -96,8 +96,15 @@ all-local: $(BUILT_FILES)
  
  $(BUILT_HEADER): $(BUILT_SOURCE)
  
diff --git a/x11/libXt/patches/patch-ad b/x11/libXt/patches/patch-ad
index 56cc8503cd0..8f5a8bf5786 100644
--- a/x11/libXt/patches/patch-ad
+++ b/x11/libXt/patches/patch-ad
@@ -1,17 +1,17 @@
-$NetBSD: patch-ad,v 1.2 2007/09/20 08:30:15 rillig Exp $
+$NetBSD: patch-ad,v 1.3 2009/07/18 10:28:47 wiz Exp $
 
---- src/Makefile.in.orig	2007-01-28 07:31:13.000000000 +0100
-+++ src/Makefile.in	2007-09-20 10:23:58.000000000 +0200
-@@ -103,6 +103,8 @@ CCDEPMODE = @CCDEPMODE@
- CFLAGS = @CFLAGS@
+--- src/Makefile.in.orig	2009-07-02 17:25:58.000000000 +0000
++++ src/Makefile.in
+@@ -103,6 +103,8 @@ CFLAGS = @CFLAGS@
+ CHANGELOG_CMD = @CHANGELOG_CMD@
  CPP = @CPP@
  CPPFLAGS = @CPPFLAGS@
 +CROSS_COMPILING_FALSE = @CROSS_COMPILING_FALSE@
 +CROSS_COMPILING_TRUE = @CROSS_COMPILING_TRUE@
- CXX = @CXX@
- CXXCPP = @CXXCPP@
- CXXDEPMODE = @CXXDEPMODE@
-@@ -299,6 +301,8 @@ BUILT_SOURCE = StringDefs.c 
+ CWARNFLAGS = @CWARNFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+ DEFS = @DEFS@
+@@ -308,6 +310,8 @@ BUILT_SOURCE = StringDefs.c 
  BUILT_HEADER = $(top_builddir)/include/X11/StringDefs.h $(top_builddir)/include/X11/Shell.h
  BUILT_FILES = $(BUILT_SOURCE) $(BUILT_HEADER)
  STRING_LIST = $(top_srcdir)/util/string.list
@@ -20,7 +20,7 @@ $NetBSD: patch-ad,v 1.2 2007/09/20 08:30:15 rillig Exp $
  all: $(BUILT_SOURCES)
  	$(MAKE) $(AM_MAKEFLAGS) all-am
  
-@@ -637,7 +641,7 @@ all-local: $(BUILT_FILES)
+@@ -651,7 +655,7 @@ all-local: $(BUILT_FILES)
  $(BUILT_HEADER): $(BUILT_SOURCE)
  
  $(BUILT_SOURCE):
diff --git a/x11/libXt/patches/patch-ae b/x11/libXt/patches/patch-ae
index 353423ff96c..38977f28c2b 100644
--- a/x11/libXt/patches/patch-ae
+++ b/x11/libXt/patches/patch-ae
@@ -1,10 +1,10 @@
-$NetBSD: patch-ae,v 1.2 2007/09/20 08:30:15 rillig Exp $
+$NetBSD: patch-ae,v 1.3 2009/07/18 10:28:47 wiz Exp $
 
---- configure.ac	2007-01-28 07:27:22.000000000 +0100
-+++ configure.ac	2007-07-27 20:08:44.000000000 +0200
-@@ -95,6 +95,8 @@
- esac
- AC_SUBST(STRINGSABIOPTIONS)
+--- configure.ac.orig	2009-07-02 17:25:41.000000000 +0000
++++ configure.ac
+@@ -125,6 +125,8 @@ esac
+ 
+ XT_CFLAGS="$CWARNFLAGS $XT_CFLAGS $OS_CFLAGS"
  
 +AM_CONDITIONAL(CROSS_COMPILING, [ test $cross_compiling = yes ])
 +
diff --git a/x11/libXt/patches/patch-af b/x11/libXt/patches/patch-af
index 9af43a9d0df..1c21262d914 100644
--- a/x11/libXt/patches/patch-af
+++ b/x11/libXt/patches/patch-af
@@ -1,190 +1,21 @@
-$NetBSD: patch-af,v 1.2 2007/09/20 08:30:15 rillig Exp $
+$NetBSD: patch-af,v 1.3 2009/07/18 10:28:47 wiz Exp $
 
---- configure.orig	2007-01-28 07:31:11.000000000 +0100
-+++ configure	2007-09-20 10:25:10.000000000 +0200
-@@ -864,6 +864,8 @@ INSTALL_MAKESTRS_FALSE
- XFILESEARCHPATHDEFAULT
- appdefaultdir
- STRINGSABIOPTIONS
-+CROSS_COMPILING_TRUE
-+CROSS_COMPILING_FALSE
- RAWCPP
- RAWCPPFLAGS
+--- configure.orig	2009-07-02 17:25:57.000000000 +0000
++++ configure
+@@ -806,6 +806,8 @@ LIB_MAN_SUFFIX
  APP_MAN_SUFFIX
-@@ -4420,7 +4422,7 @@ ia64-*-hpux*)
-   ;;
- *-*-irix6*)
-   # Find out which ABI we are using.
--  echo '#line 4423 "configure"' > conftest.$ac_ext
-+  echo '#line 4425 "configure"' > conftest.$ac_ext
-   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
-@@ -7384,11 +7386,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:7387: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:7389: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:7391: \$? = $ac_status" >&5
-+   echo "$as_me:7393: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -7652,11 +7654,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:7655: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:7657: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:7659: \$? = $ac_status" >&5
-+   echo "$as_me:7661: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -7756,11 +7758,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:7759: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:7761: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:7763: \$? = $ac_status" >&5
-+   echo "$as_me:7765: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -10208,7 +10210,7 @@ else
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<EOF
--#line 10211 "configure"
-+#line 10213 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -10308,7 +10310,7 @@ else
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<EOF
--#line 10311 "configure"
-+#line 10313 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -12676,11 +12678,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:12679: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:12681: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:12683: \$? = $ac_status" >&5
-+   echo "$as_me:12685: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -12780,11 +12782,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:12783: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:12785: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:12787: \$? = $ac_status" >&5
-+   echo "$as_me:12789: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -14350,11 +14352,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:14353: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14355: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:14357: \$? = $ac_status" >&5
-+   echo "$as_me:14359: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -14454,11 +14456,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:14457: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14459: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:14461: \$? = $ac_status" >&5
-+   echo "$as_me:14463: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -16684,11 +16686,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:16687: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16689: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:16691: \$? = $ac_status" >&5
-+   echo "$as_me:16693: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -16952,11 +16954,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:16955: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16957: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:16959: \$? = $ac_status" >&5
-+   echo "$as_me:16961: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -17056,11 +17058,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:17059: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:17061: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:17063: \$? = $ac_status" >&5
-+   echo "$as_me:17065: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s out/conftest2.$ac_objext
-    then
-      # The compiler can only warn and ignore the option if not recognized
-@@ -20421,6 +20423,17 @@ case $host_os in
- esac
+ RAWCPPFLAGS
+ RAWCPP
++CROSS_COMPILING_FALSE
++CROSS_COMPILING_TRUE
+ STRINGSABIOPTIONS
+ appdefaultdir
+ XFILESEARCHPATHDEFAULT
+@@ -12100,6 +12102,15 @@ esac
  
+ XT_CFLAGS="$CWARNFLAGS $XT_CFLAGS $OS_CFLAGS"
  
-+
-+
-+if  test $cross_compiling = yes ; then
++ if  test $cross_compiling = yes ; then
 +  CROSS_COMPILING_TRUE=
 +  CROSS_COMPILING_FALSE='#'
 +else
@@ -196,35 +27,17 @@ $NetBSD: patch-af,v 1.2 2007/09/20 08:30:15 rillig Exp $
  # Man page processing requirements
  
  
-@@ -20850,6 +20863,13 @@ echo "$as_me: error: conditional \"INSTA
+@@ -12541,6 +12552,13 @@ $as_echo "$as_me: error: conditional \"I
  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
  
  : ${CONFIG_STATUS=./config.status}
- ac_clean_files_save=$ac_clean_files
-@@ -21525,6 +21545,8 @@ INSTALL_MAKESTRS_FALSE!$INSTALL_MAKESTRS
- XFILESEARCHPATHDEFAULT!$XFILESEARCHPATHDEFAULT$ac_delim
- appdefaultdir!$appdefaultdir$ac_delim
- STRINGSABIOPTIONS!$STRINGSABIOPTIONS$ac_delim
-+CROSS_COMPILING_TRUE!$CROSS_COMPILING_TRUE$ac_delim
-+CROSS_COMPILING_FALSE!$CROSS_COMPILING_FALSE$ac_delim
- RAWCPP!$RAWCPP$ac_delim
- RAWCPPFLAGS!$RAWCPPFLAGS$ac_delim
- APP_MAN_SUFFIX!$APP_MAN_SUFFIX$ac_delim
-@@ -21546,7 +21568,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` = 33; then
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 35; then
-     break
-   elif $ac_last_try; then
-     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+ ac_write_fail=0
diff --git a/x11/libXt/patches/patch-ag b/x11/libXt/patches/patch-ag
deleted file mode 100644
index 3f0fe3ae3b1..00000000000
--- a/x11/libXt/patches/patch-ag
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2008/01/29 03:37:02 bjs Exp $
-
-Recalculate fd_set more aggressively (bug #808)
-
-select() can modify the fd set, so be a bit pessimistic and recalculate
-it more often.
-
---- src/NextEvent.c.orig	2006-07-11 14:05:55.000000000 -0400
-+++ src/NextEvent.c
-@@ -581,10 +581,10 @@ int _XtWaitForSomething(
-     wf.stack = fdlist;
- #endif
- 
-+WaitLoop:
-     app->rebuild_fdlist = TRUE;
- 
-     while (1) {
--WaitLoop:
- 	AdjustTimes (app, block, howlong, ignoreTimers, &wt);
- 
- 	if (block && app->block_hook_list) {