Update to libX11-1.3.5:

- Enable XCB support [pkgsrc]

- Improve I18N support
- Various bug fixes, including use-after-free and XCB thread fixes

10 files changed, 588 insertions, 388 deletions

diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile
index 8516bc829a3..e3c6e7dad9c 100644
--- a/x11/libX11/Makefile
+++ b/x11/libX11/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2010/01/15 21:20:14 tnn Exp $
+# $NetBSD: Makefile,v 1.24 2010/09/10 20:28:03 joerg Exp $
 #
 
-DISTNAME=		libX11-1.3.2
+DISTNAME=		libX11-1.3.5
 CATEGORIES=		x11 devel
 MASTER_SITES=		${MASTER_SITE_XORG:=lib/}
 EXTRACT_SUFX=		.tar.bz2
@@ -9,6 +9,7 @@ EXTRACT_SUFX=		.tar.bz2
 MAINTAINER=		joerg@NetBSD.org
 HOMEPAGE=		http://xorg.freedesktop.org/
 COMMENT=		Base X libraries from modular Xorg X11
+LICENSE=		mit
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -18,7 +19,7 @@ GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake pkg-config
 
 CONFIGURE_ARGS+=	--enable-man-pages=3
-CONFIGURE_ARGS+=	--without-xcb
+CONFIGURE_ARGS+=	--with-xcb
 CONFIGURE_ARGS+=	--disable-specs
 PKGCONFIG_OVERRIDE+=	x11.pc.in
 
@@ -46,6 +47,7 @@ CONFIGURE_ENV+=		ac_cv_path_RAWCPP="cc -E -Uunix -"
 .include "../../x11/kbproto/buildlink3.mk"
 .include "../../x11/libXau/buildlink3.mk"
 .include "../../x11/libXdmcp/buildlink3.mk"
+.include "../../x11/libxcb/buildlink3.mk"
 .include "../../x11/xcmiscproto/buildlink3.mk"
 .include "../../x11/xextproto/buildlink3.mk"
 .include "../../x11/xf86bigfontproto/buildlink3.mk"
diff --git a/x11/libX11/PLIST b/x11/libX11/PLIST
index 834bffdc8a1..2f892edd4b0 100644
--- a/x11/libX11/PLIST
+++ b/x11/libX11/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.7 2010/01/15 18:55:11 tnn Exp $
+@comment $NetBSD: PLIST,v 1.8 2010/09/10 20:28:03 joerg Exp $
 include/X11/ImUtil.h
 include/X11/XKBlib.h
 include/X11/Xcms.h
+include/X11/Xlib-xcb.h
 include/X11/Xlib.h
 include/X11/XlibConf.h
 include/X11/Xlibint.h
@@ -11,7 +12,9 @@ include/X11/Xresource.h
 include/X11/Xutil.h
 include/X11/cursorfont.h
 lib/X11/Xcms.txt
+lib/libX11-xcb.la
 lib/libX11.la
+lib/pkgconfig/x11-xcb.pc
 lib/pkgconfig/x11.pc
 man/man3/AllPlanes.3
 man/man3/BitmapBitOrder.3
@@ -655,7 +658,7 @@ man/man3/XkbGetBounceKeysDelay.3
 man/man3/XkbGetCompatMap.3
 man/man3/XkbGetControls.3
 man/man3/XkbGetControlsChanges.3
-man/man3/XkbGetDetectableAutorepeat.3
+man/man3/XkbGetDetectableAutoRepeat.3
 man/man3/XkbGetDeviceButtonActions.3
 man/man3/XkbGetDeviceInfo.3
 man/man3/XkbGetDeviceInfoChanges.3
@@ -748,7 +751,7 @@ man/man3/XkbSetBounceKeysDelay.3
 man/man3/XkbSetCompatMap.3
 man/man3/XkbSetControls.3
 man/man3/XkbSetDebuggingFlags.3
-man/man3/XkbSetDetectableAutorepeat.3
+man/man3/XkbSetDetectableAutoRepeat.3
 man/man3/XkbSetDeviceButtonActions.3
 man/man3/XkbSetDeviceInfo.3
 man/man3/XkbSetIgnoreLockMods.3
@@ -830,6 +833,7 @@ man/man3/XwcTextListToTextProperty.3
 man/man3/XwcTextPerCharExtents.3
 man/man3/XwcTextPropertyToTextList.3
 man/man5/Compose.5
+man/man5/XCompose.5
 share/X11/XErrorDB
 share/X11/XKeysymDB
 share/X11/locale/C/Compose
@@ -1015,4 +1019,3 @@ 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/buildlink3.mk b/x11/libX11/buildlink3.mk
index 7fabade9f01..41792f351bb 100644
--- a/x11/libX11/buildlink3.mk
+++ b/x11/libX11/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:25:43 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2010/09/10 20:28:03 joerg Exp $
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -21,6 +21,7 @@ X11_LDFLAGS+=	-L${BUILDLINK_PREFIX.libX11}/lib
 .include "../../x11/kbproto/buildlink3.mk"
 .include "../../x11/libXau/buildlink3.mk"
 .include "../../x11/libXdmcp/buildlink3.mk"
+.include "../../x11/libxcb/buildlink3.mk"
 .include "../../x11/xproto/buildlink3.mk"
 .endif # LIBX11_BUILDLINK3_MK
 
diff --git a/x11/libX11/distinfo b/x11/libX11/distinfo
index a2e3c10766b..78d68a3b8be 100644
--- a/x11/libX11/distinfo
+++ b/x11/libX11/distinfo
@@ -1,11 +1,7 @@
-$NetBSD: distinfo,v 1.16 2010/01/15 18:55:11 tnn Exp $
+$NetBSD: distinfo,v 1.17 2010/09/10 20:28:03 joerg Exp $
 
-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) = 1a86fcebfe9963ae7d6df6aae24d93e2a9717d14
-SHA1 (patch-af) = a97f3b31eecc783caecfeb315ac2cf6603ec32a5
-SHA1 (patch-ag) = 626875c0c772264ea53fbf4f6e9c2228f7628ecf
+SHA1 (libX11-1.3.5.tar.bz2) = c5dda2b6279f3e3267646576138fcd091a7f3c54
+RMD160 (libX11-1.3.5.tar.bz2) = 84544006514eec6f37b642b294ea5f3658b52934
+Size (libX11-1.3.5.tar.bz2) = 2104595 bytes
+SHA1 (patch-aa) = 5531b1334884222e6c941a3f4348e2d8520d54d2
+SHA1 (patch-ac) = e679a8c1bcf2d18f16e32f74664bf11a3476d583
diff --git a/x11/libX11/patches/patch-aa b/x11/libX11/patches/patch-aa
index 579a3cf28f7..f4e29ca8f2b 100644
--- a/x11/libX11/patches/patch-aa
+++ b/x11/libX11/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.7 2009/02/21 16:44:29 wiz Exp $
+$NetBSD: patch-aa,v 1.8 2010/09/10 20:28:03 joerg Exp $
 
 Include pthread.h as thread stubs might be macros like on NetBSD.
 
@@ -29,12 +29,3 @@ builds (from GIT).
      freebsd*)
          XTHREAD_CFLAGS="-D_THREAD_SAFE"
          XTHREADLIB="-pthread" ;;
-@@ -340,6 +340,8 @@ else
- fi
- AC_SUBST(XKBPROTO_REQUIRES)
- 
-+AM_CONDITIONAL(CROSS_COMPILING, [ test $cross_compiling = yes ])
-+
- AC_FUNC_MMAP()
- composecache_default=$ac_cv_func_mmap_fixed_mapped
- AC_CHECK_FUNC(nl_langinfo, , [composecache_default=no])
diff --git a/x11/libX11/patches/patch-ac b/x11/libX11/patches/patch-ac
index 3b7c0a8f07a..5960c52eeb2 100644
--- a/x11/libX11/patches/patch-ac
+++ b/x11/libX11/patches/patch-ac
@@ -1,41 +1,408 @@
-$NetBSD: patch-ac,v 1.9 2009/07/18 10:20:51 wiz Exp $
+$NetBSD: patch-ac,v 1.10 2010/09/10 20:28:03 joerg Exp $
 
-_POSIX_THREAD_SAFE_FUNCTIONS is not used on NetBSD.  Instead,
-let's use _REENTRANT.
+See patch-aa.
 
---- configure.orig	2009-07-10 04:08:41.000000000 +0000
+--- configure.orig	2010-08-11 23:24:54.000000000 +0000
 +++ configure
-@@ -812,6 +812,8 @@ LINT_FALSE
- LINT_TRUE
- LINT_FLAGS
- LINT
-+CROSS_COMPILING_FALSE
-+CROSS_COMPILING_TRUE
- XKBPROTO_REQUIRES
- XKBPROTO_LIBS
- XKBPROTO_CFLAGS
-@@ -15467,44 +15469,39 @@ _ACEOF
+@@ -828,28 +828,22 @@ ac_ct_DUMPBIN
+ DUMPBIN
+ LD
+ FGREP
++SED
+ LIBTOOL
+ HAVE_PS2PDF_FALSE
+ HAVE_PS2PDF_TRUE
+ PS2PDF
+-HAVE_GROFF_HTML_FALSE
+-HAVE_GROFF_HTML_TRUE
+ HAVE_GROFF_MM_FALSE
+ HAVE_GROFF_MM_TRUE
+ HAVE_GROFF_MS_FALSE
+ HAVE_GROFF_MS_TRUE
+ HAVE_GROFF_FALSE
+ HAVE_GROFF_TRUE
+-PSSELECT_PATH
+-PNMTOPNG_PATH
+-GS_PATH
+ GROFF
+ ENABLE_SPECS_FALSE
+ ENABLE_SPECS_TRUE
+ AM_BACKSLASH
+ AM_DEFAULT_VERBOSITY
+-MAN_SUBSTS
+-XORG_MAN_PAGE
+ ADMIN_MAN_DIR
+ DRIVER_MAN_DIR
+ MISC_MAN_DIR
+@@ -862,7 +856,6 @@ MISC_MAN_SUFFIX
+ FILE_MAN_SUFFIX
+ LIB_MAN_SUFFIX
+ APP_MAN_SUFFIX
+-SED
+ INSTALL_CMD
+ PKG_CONFIG
+ CHANGELOG_CMD
+@@ -964,6 +957,7 @@ enable_option_checking
+ enable_maintainer_mode
+ enable_dependency_tracking
+ enable_strict_compilation
++with_release_version
+ enable_silent_rules
+ enable_specs
+ with_groff
+@@ -1014,8 +1008,6 @@ XDMCP_CFLAGS
+ XDMCP_LIBS
+ BIGFONT_CFLAGS
+ BIGFONT_LIBS
+-LINT
+-LINT_FLAGS
+ X11_CFLAGS
+ X11_LIBS'
+ 
+@@ -1677,6 +1669,8 @@ Optional Features:
+ Optional Packages:
+   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
++  --with-release-version=STRING
++                          Use release version string in package name
+   --with-groff            Use groff to regenerate documentation (default: yes,
+                           if installed)
+   --with-ps2pdf           Use ps2pdf to regenerate documentation (default:
+@@ -1716,8 +1710,6 @@ Some influential environment variables:
+               C compiler flags for BIGFONT, overriding pkg-config
+   BIGFONT_LIBS
+               linker flags for BIGFONT, overriding pkg-config
+-  LINT        Path to a lint-style command
+-  LINT_FLAGS  Flags for the lint-style command
+   X11_CFLAGS  C compiler flags for X11, overriding pkg-config
+   X11_LIBS    linker flags for X11, overriding pkg-config
+ 
+@@ -5010,76 +5002,6 @@ $as_echo "no" >&6; }
+ 	fi
+ 
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+-$as_echo_n "checking for a sed that does not truncate output... " >&6; }
+-if test "${ac_cv_path_SED+set}" = set; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+-     for ac_i in 1 2 3 4 5 6 7; do
+-       ac_script="$ac_script$as_nl$ac_script"
+-     done
+-     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
+-     { ac_script=; unset ac_script;}
+-     if test -z "$SED"; then
+-  ac_path_SED_found=false
+-  # Loop through the user's path and test for each of PROGNAME-LIST
+-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_prog in sed gsed; do
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+-      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
+-# Check for GNU ac_path_SED and select it if it is found.
+-  # Check for GNU $ac_path_SED
+-case `"$ac_path_SED" --version 2>&1` in
+-*GNU*)
+-  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
+-*)
+-  ac_count=0
+-  $as_echo_n 0123456789 >"conftest.in"
+-  while :
+-  do
+-    cat "conftest.in" "conftest.in" >"conftest.tmp"
+-    mv "conftest.tmp" "conftest.in"
+-    cp "conftest.in" "conftest.nl"
+-    $as_echo '' >> "conftest.nl"
+-    "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
+-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+-    as_fn_arith $ac_count + 1 && ac_count=$as_val
+-    if test $ac_count -gt ${ac_path_SED_max-0}; then
+-      # Best one so far, save it but keep looking for a better one
+-      ac_cv_path_SED="$ac_path_SED"
+-      ac_path_SED_max=$ac_count
+-    fi
+-    # 10*(2^10) chars as input seems more than enough
+-    test $ac_count -gt 10 && break
+-  done
+-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+-esac
+-
+-      $ac_path_SED_found && break 3
+-    done
+-  done
+-  done
+-IFS=$as_save_IFS
+-  if test -z "$ac_cv_path_SED"; then
+-    as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
+-  fi
+-else
+-  ac_cv_path_SED=$SED
+-fi
+-
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+-$as_echo "$ac_cv_path_SED" >&6; }
+- SED="$ac_cv_path_SED"
+-  rm -f conftest.sed
+-
+-
+ 
+ 
+ 
+@@ -5107,7 +5029,7 @@ fi
+ 
+ 
+ 
+-# If the module's configure.ac calls AC_PROG_CC later on, CC gets set to C89
++
+ 
+ 
+ 
+@@ -5146,6 +5068,20 @@ CWARNFLAGS="$CWARNFLAGS $STRICT_CFLAGS"
+ 
+ 
+ 
++# Check whether --with-release-version was given.
++if test "${with_release_version+set}" = set; then :
++  withval=$with_release_version; RELEASE_VERSION="$withval"
++else
++  RELEASE_VERSION=""
++fi
++
++	if test "x$RELEASE_VERSION" != "x"; then
++		PACKAGE="$PACKAGE-$RELEASE_VERSION"
++		PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION"
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: Building with package name set to $PACKAGE" >&5
++$as_echo "$as_me: Building with package name set to $PACKAGE" >&6;}
++	fi
++
+ cat >>confdefs.h <<_ACEOF
+ #define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1`
+ _ACEOF
+@@ -5188,7 +5124,6 @@ echo 'util-macros \"pkgdatadir\" from xo
+ 
+ 
+ 
+-
+ if test x$APP_MAN_SUFFIX = x    ; then
+     APP_MAN_SUFFIX=1
+ fi
+@@ -5257,23 +5192,6 @@ fi
+ 
+ 
+ 
+-XORG_MAN_PAGE="X Version 11"
+-
+-MAN_SUBSTS="\
+-	-e 's|__vendorversion__|\"\$(PACKAGE_STRING)\" \"\$(XORG_MAN_PAGE)\"|' \
+-	-e 's|__xorgversion__|\"\$(PACKAGE_STRING)\" \"\$(XORG_MAN_PAGE)\"|' \
+-	-e 's|__xservername__|Xorg|g' \
+-	-e 's|__xconfigfile__|xorg.conf|g' \
+-	-e 's|__projectroot__|\$(prefix)|g' \
+-	-e 's|__appmansuffix__|\$(APP_MAN_SUFFIX)|g' \
+-	-e 's|__drivermansuffix__|\$(DRIVER_MAN_SUFFIX)|g' \
+-	-e 's|__adminmansuffix__|\$(ADMIN_MAN_SUFFIX)|g' \
+-	-e 's|__libmansuffix__|\$(LIB_MAN_SUFFIX)|g' \
+-	-e 's|__miscmansuffix__|\$(MISC_MAN_SUFFIX)|g' \
+-	-e 's|__filemansuffix__|\$(FILE_MAN_SUFFIX)|g'"
+-
+-
+-
+ # Check whether --enable-silent-rules was given.
+ if test "${enable_silent_rules+set}" = set; then :
+   enableval=$enable_silent_rules;
+@@ -5425,7 +5343,6 @@ $as_echo "$as_me: WARNING: ignoring GROF
+ else
+    as_fn_error "--with-groff expects 'yes' or 'no'" "$LINENO" 5
+ fi
+-
+ # We have groff, test for the presence of the macro packages
+ if test "x$have_groff" = x"yes"; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${GROFF} -ms macros" >&5
+@@ -5447,144 +5364,6 @@ $as_echo_n "checking for ${GROFF} -mm ma
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $groff_mm_works" >&5
+ $as_echo "$groff_mm_works" >&6; }
+ fi
+-
+-# We have groff, test for HTML dependencies, one command per package
+-if test "x$have_groff" = x"yes"; then
+-   for ac_prog in gs gswin32c
+-do
+-  # Extract the first word of "$ac_prog", so it can be a program name with args.
+-set dummy $ac_prog; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_GS_PATH+set}" = set; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  case $GS_PATH in
+-  [\\/]* | ?:[\\/]*)
+-  ac_cv_path_GS_PATH="$GS_PATH" # Let the user override the test with a path.
+-  ;;
+-  *)
+-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+-    ac_cv_path_GS_PATH="$as_dir/$ac_word$ac_exec_ext"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-  ;;
+-esac
+-fi
+-GS_PATH=$ac_cv_path_GS_PATH
+-if test -n "$GS_PATH"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GS_PATH" >&5
+-$as_echo "$GS_PATH" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+-  test -n "$GS_PATH" && break
+-done
+-
+-   # Extract the first word of "pnmtopng", so it can be a program name with args.
+-set dummy pnmtopng; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_PNMTOPNG_PATH+set}" = set; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  case $PNMTOPNG_PATH in
+-  [\\/]* | ?:[\\/]*)
+-  ac_cv_path_PNMTOPNG_PATH="$PNMTOPNG_PATH" # Let the user override the test with a path.
+-  ;;
+-  *)
+-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+-    ac_cv_path_PNMTOPNG_PATH="$as_dir/$ac_word$ac_exec_ext"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-  ;;
+-esac
+-fi
+-PNMTOPNG_PATH=$ac_cv_path_PNMTOPNG_PATH
+-if test -n "$PNMTOPNG_PATH"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PNMTOPNG_PATH" >&5
+-$as_echo "$PNMTOPNG_PATH" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+-   # Extract the first word of "psselect", so it can be a program name with args.
+-set dummy psselect; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_PSSELECT_PATH+set}" = set; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  case $PSSELECT_PATH in
+-  [\\/]* | ?:[\\/]*)
+-  ac_cv_path_PSSELECT_PATH="$PSSELECT_PATH" # Let the user override the test with a path.
+-  ;;
+-  *)
+-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+-    ac_cv_path_PSSELECT_PATH="$as_dir/$ac_word$ac_exec_ext"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-  ;;
+-esac
+-fi
+-PSSELECT_PATH=$ac_cv_path_PSSELECT_PATH
+-if test -n "$PSSELECT_PATH"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PSSELECT_PATH" >&5
+-$as_echo "$PSSELECT_PATH" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+-   if test "x$GS_PATH" != "x" -a "x$PNMTOPNG_PATH" != "x" -a "x$PSSELECT_PATH" != "x"; then
+-      have_groff_html=yes
+-   else
+-      have_groff_html=no
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: grohtml dependencies not found - HTML Documentation skipped. Refer to grohtml man pages" >&5
+-$as_echo "$as_me: WARNING: grohtml dependencies not found - HTML Documentation skipped. Refer to grohtml man pages" >&2;}
+-   fi
+-fi
+-
+-# Set Automake conditionals for Makefiles
+  if test "$have_groff" = yes; then
+   HAVE_GROFF_TRUE=
+   HAVE_GROFF_FALSE='#'
+@@ -5609,14 +5388,6 @@ else
+   HAVE_GROFF_MM_FALSE=
+ fi
+ 
+- if test "$have_groff_html" = yes; then
+-  HAVE_GROFF_HTML_TRUE=
+-  HAVE_GROFF_HTML_FALSE='#'
+-else
+-  HAVE_GROFF_HTML_TRUE='#'
+-  HAVE_GROFF_HTML_FALSE=
+-fi
+-
+ 
+ 
+ 
+@@ -14431,43 +14202,18 @@ $as_echo "#define XUSE_MTSAFE_API 1" >>c
  	;;
  esac
  
--{ $as_echo "$as_me:$LINENO: checking for pthread_self in -lc" >&5
+-{ $as_echo "$as_me:${as_lineno-$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
-+{ $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
-   $as_echo_n "(cached) " >&6
+-if test "${ac_cv_lib_c_pthread_self+set}" = set; then :
+-  $as_echo_n "(cached) " >&6
++ac_fn_c_check_decl "$LINENO" "pthread_self" "ac_cv_have_decl_pthread_self" "#include <pthread.h>
++"
++if test "x$ac_cv_have_decl_pthread_self" = x""yes; then :
++  ac_have_decl=1
  else
 -  ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lc  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
-+  cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
-+#include <pthread.h>
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
++  ac_have_decl=0
++fi
  
 -/* Override any GCC internal prototype to avoid an error.
 -   Use char because int might match the return type of a GCC
@@ -44,85 +411,33 @@ let's use _REENTRANT.
 -extern "C"
 -#endif
 -char pthread_self ();
- int
- main ()
- {
+-int
+-main ()
+-{
 -return pthread_self ();
-+#ifndef pthread_self
-+  (void) pthread_self;
-+#endif
-+
-   ;
-   return 0;
- }
+-  ;
+-  return 0;
+-}
++cat >>confdefs.h <<_ACEOF
++#define HAVE_DECL_PTHREAD_SELF $ac_have_decl
  _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
- 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
-@@ -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 && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
+-if ac_fn_c_try_link "$LINENO"; then :
 -  ac_cv_lib_c_pthread_self=yes
-+       } && test -s conftest.$ac_objext; then
-+  ac_cv_have_decl_pthread_self=yes
- else
-   $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
+-else
+-  ac_cv_lib_c_pthread_self=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext conftest.$ac_ext
 -LIBS=$ac_check_lib_save_LIBS
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_c_pthread_self" >&5
+-fi
+-{ $as_echo "$as_me:${as_lineno-$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"
-+{ $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
-+_ACEOF
-+
-+thrstubs="no"
+-if test "x$ac_cv_lib_c_pthread_self" = x""yes; then :
++if test $ac_have_decl = 1; then :
+   thrstubs="no"
  else
--  thrstubs="yes"
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_DECL_PTHREAD_SELF 0
-+_ACEOF
-+
-+thrstubs="yes"
- fi
- 
-+
-  if test x$thrstubs = xyes; then
-   THRSTUBS_TRUE=
-   THRSTUBS_FALSE='#'
-@@ -15552,8 +15553,8 @@ if test x$xthreads = xyes ; then
+   thrstubs="yes"
+@@ -14487,8 +14233,8 @@ if test x$xthreads = xyes ; then
      linux*|openbsd*|gnu*|k*bsd*-gnu)
          XTHREADLIB=-lpthread ;;
      netbsd*)
@@ -133,33 +448,160 @@ let's use _REENTRANT.
      freebsd*)
          XTHREAD_CFLAGS="-D_THREAD_SAFE"
          XTHREADLIB="-pthread" ;;
-@@ -16082,6 +16083,15 @@ else
+@@ -14960,8 +14706,7 @@ fi
+ 
+ 
+ 
+-
+-
++# Allow checking code with lint, sparse, etc.
+ 
+ # Check whether --with-lint was given.
+ if test "${with_lint+set}" = set; then :
+@@ -14970,86 +14715,26 @@ else
+   use_lint=no
  fi
  
+-
+-# Obtain platform specific info like program name and options
+-# The lint program on FreeBSD and NetBSD is different from the one on Solaris
+-case $host_os in
+-  *linux* | *openbsd* | kfreebsd*-gnu | darwin* | cygwin*)
+-	lint_name=splint
+-	lint_options="-badflag"
+-	;;
+-  *freebsd* | *netbsd*)
+-	lint_name=lint
+-	lint_options="-u -b"
+-	;;
+-  *solaris*)
+-	lint_name=lint
+-	lint_options="-u -b -h -erroff=E_INDISTING_FROM_TRUNC2"
+-	;;
+-esac
+-
+-# Test for the presence of the program (either guessed by the code or spelled out by the user)
+-if test "x$use_lint" = x"yes" ; then
+-   # Extract the first word of "$lint_name", so it can be a program name with args.
+-set dummy $lint_name; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_LINT+set}" = set; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  case $LINT in
+-  [\\/]* | ?:[\\/]*)
+-  ac_cv_path_LINT="$LINT" # Let the user override the test with a path.
+-  ;;
+-  *)
+-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+-    ac_cv_path_LINT="$as_dir/$ac_word$ac_exec_ext"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-  ;;
+-esac
+-fi
+-LINT=$ac_cv_path_LINT
+-if test -n "$LINT"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINT" >&5
+-$as_echo "$LINT" >&6; }
++if test "x$use_lint" = "xyes" ; then
++	LINT="lint"
+ else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
++	LINT="$use_lint"
+ fi
+-
+-
+-   if test "x$LINT" = "x"; then
+-        as_fn_error "--with-lint=yes specified but lint-style tool not found in PATH" "$LINENO" 5
+-   fi
+-elif test "x$use_lint" = x"no" ; then
+-   if test "x$LINT" != "x"; then
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ignoring LINT environment variable since --with-lint=no was specified" >&5
+-$as_echo "$as_me: WARNING: ignoring LINT environment variable since --with-lint=no was specified" >&2;}
+-   fi
+-else
+-   as_fn_error "--with-lint expects 'yes' or 'no'. Use LINT variable to specify path." "$LINENO" 5
++if test "x$LINT_FLAGS" = "x" -a "x$LINT" != "xno" ; then
++    case $LINT in
++	lint|*/lint)
++	    case $host_os in
++		solaris*)
++			LINT_FLAGS="-u -b -h -erroff=E_INDISTING_FROM_TRUNC2"
++			;;
++	    esac
++	    ;;
++    esac
+ fi
  
-+ if  test $cross_compiling = yes ; then
-+  CROSS_COMPILING_TRUE=
-+  CROSS_COMPILING_FALSE='#'
-+else
-+  CROSS_COMPILING_TRUE='#'
-+  CROSS_COMPILING_FALSE=
-+fi
-+
-+
+-# User supplied flags override default flags
+-if test "x$LINT_FLAGS" != "x"; then
+-   lint_options=$LINT_FLAGS
+-fi
  
+-LINT_FLAGS=$lint_options
  
- for ac_header in stdlib.h unistd.h
-@@ -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; }; }
+- if test "x$LINT" != x; then
++ if test x$LINT != xno; then
+   LINT_TRUE=
+   LINT_FALSE='#'
+ else
+@@ -15061,6 +14746,7 @@ fi
+ 
+ 
+ 
++# Build lint "library" for more indepth checks of programs calling this library
+ # Check whether --enable-lint-library was given.
+ if test "${enable_lint_library+set}" = set; then :
+   enableval=$enable_lint_library; make_lint_lib=$enableval
+@@ -15068,17 +14754,17 @@ else
+   make_lint_lib=no
  fi
-+if test -z "${CROSS_COMPILING_TRUE}" && test -z "${CROSS_COMPILING_FALSE}"; then
-+  { { $as_echo "$as_me:$LINENO: error: conditional \"CROSS_COMPILING\" was never defined.
-+Usually this means the macro was only invoked conditionally." >&5
-+$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
-   { { $as_echo "$as_me:$LINENO: error: conditional \"LINT\" was never defined.
- Usually this means the macro was only invoked conditionally." >&5
+ 
+-
+-if test "x$make_lint_lib" = x"yes" ; then
+-   LINTLIB=llib-lX11.ln
+-   if test "x$LINT" = "x"; then
+-        as_fn_error "Cannot make lint library without --with-lint" "$LINENO" 5
+-   fi
+-elif test "x$make_lint_lib" != x"no" ; then
+-   as_fn_error "--enable-lint-library expects 'yes' or 'no'." "$LINENO" 5
++if test "x$make_lint_lib" != "xno" ; then
++	if test "x$LINT" = "xno" ; then
++		as_fn_error "Cannot make lint library without --with-lint" "$LINENO" 5
++	fi
++	if test "x$make_lint_lib" = "xyes" ; then
++		LINTLIB=llib-lX11.ln
++	else
++		LINTLIB=$make_lint_lib
++	fi
+ fi
+ 
+-
+  if test x$make_lint_lib != xno; then
+   MAKE_LINT_LIB_TRUE=
+   MAKE_LINT_LIB_FALSE='#'
+@@ -15524,10 +15210,6 @@ if test -z "${HAVE_GROFF_MM_TRUE}" && te
+   as_fn_error "conditional \"HAVE_GROFF_MM\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+-if test -z "${HAVE_GROFF_HTML_TRUE}" && test -z "${HAVE_GROFF_HTML_FALSE}"; then
+-  as_fn_error "conditional \"HAVE_GROFF_HTML\" was never defined.
+-Usually this means the macro was only invoked conditionally." "$LINENO" 5
+-fi
+ if test -z "${HAVE_PS2PDF_TRUE}" && test -z "${HAVE_PS2PDF_FALSE}"; then
+   as_fn_error "conditional \"HAVE_PS2PDF\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff --git a/x11/libX11/patches/patch-ad b/x11/libX11/patches/patch-ad
deleted file mode 100644
index 947398ea33c..00000000000
--- a/x11/libX11/patches/patch-ad
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2009/02/21 16:44:29 wiz Exp $
-
---- src/util/Makefile.am.orig	2009-02-02 16:34:16.000000000 +0000
-+++ src/util/Makefile.am
-@@ -1,9 +1,16 @@
- # $XdotOrg: lib/X11/src/util/Makefile.am,v 1.4 2006-02-19 02:14:12 jamey Exp $
- 
--noinst_PROGRAMS=makekeys
-+noinst_PROGRAMS=makekeys $(MAKEKEYS_PROG)
- 
- makekeys_CFLAGS=$(X11_CFLAGS)
- 
-+if CROSS_COMPILING
-+MAKEKEYS_PROG=         xmakekeys$(EXEEXT)
-+xmakekeys$(EXEEXT): makekeys.c
-+	$(CC_FOR_BUILD) $(X11_CFLAGS) $(CPPFLAGS_FOR_BUILD) \
-+		$(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ makekeys.c
-+endif
-+
- CC = @CC_FOR_BUILD@
- 
- EXTRA_DIST = mkks.sh
diff --git a/x11/libX11/patches/patch-ae b/x11/libX11/patches/patch-ae
deleted file mode 100644
index e5686d02067..00000000000
--- a/x11/libX11/patches/patch-ae
+++ /dev/null
@@ -1,171 +0,0 @@
-$NetBSD: patch-ae,v 1.7 2010/01/15 18:55:11 tnn Exp $
-
---- src/util/Makefile.in.orig	2009-10-23 20:55:44.000000000 +0000
-+++ src/util/Makefile.in
-@@ -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)
- subdir = src/util
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -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
-@@ -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
-+DIST_SOURCES = makekeys.c xmakekeys.c
- ETAGS = etags
- CTAGS = ctags
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-@@ -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)
- 	$(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@	$(AM_V_CCLD)$(LINK) $(xmakekeys_OBJECTS) $(xmakekeys_LDADD) $(LIBS)
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-@@ -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@	$(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
- 
- @LINT_TRUE@lint:
- @LINT_TRUE@	$(LINT) $(ALL_LINT_FLAGS) makekeys.c
diff --git a/x11/libX11/patches/patch-af b/x11/libX11/patches/patch-af
deleted file mode 100644
index 57cd126e61c..00000000000
--- a/x11/libX11/patches/patch-af
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-af,v 1.2 2007/08/05 22:39:39 joerg Exp $
-
---- src/Makefile.am.orig	2007-08-05 23:59:55.000000000 +0200
-+++ src/Makefile.am
-@@ -408,8 +408,14 @@ endif LINT
- 
- KEYSYMDEF=@KEYSYMDEF@
- 
-+if CROSS_COMPILING
-+MAKEKEYS=	$(top_builddir)/src/util/xmakekeys
-+else
-+MAKEKEYS=	$(top_builddir)/src/util/makekeys
-+endif
-+
- ks_tables.h: $(KEYSYMDEF) $(top_builddir)/src/util/makekeys$(EXEEXT)
--	$(top_builddir)/src/util/makekeys < $(KEYSYMDEF) > ks_tables_h
-+	$(MAKEKEYS) < $(KEYSYMDEF) > ks_tables_h
- 	mv ks_tables_h $@
- 
- $(top_builddir)/src/util/makekeys$(EXEEXT): force
diff --git a/x11/libX11/patches/patch-ag b/x11/libX11/patches/patch-ag
deleted file mode 100644
index ab1e65b8b9d..00000000000
--- a/x11/libX11/patches/patch-ag
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2008/04/17 12:33:56 wiz Exp $
-
---- src/Makefile.in.orig	2008-03-06 20:48:51.000000000 +0000
-+++ src/Makefile.in
-@@ -512,6 +512,8 @@ libX11_la_LIBADD = \
- 	$(X11_LIBS) \
- 	$(XDMCP_LIBS)
- 
-+@CROSS_COMPILING_FALSE@MAKEKEYS = $(top_builddir)/src/util/makekeys
-+@CROSS_COMPILING_TRUE@MAKEKEYS = $(top_builddir)/src/util/xmakekeys
- 
- # Check source code with tools like lint & sparse
- @LINT_TRUE@ALL_LINT_FLAGS = $(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-@@ -1243,7 +1245,7 @@ preprocess: $(patsubst %.c,%.ii,$(libX11
- @MAKE_LINT_LIB_TRUE@	$(LINT) -y -oX11 -x $(ALL_LINT_FLAGS) $(lintlib_src)
- 
- ks_tables.h: $(KEYSYMDEF) $(top_builddir)/src/util/makekeys$(EXEEXT)
--	$(top_builddir)/src/util/makekeys < $(KEYSYMDEF) > ks_tables_h
-+	$(MAKEKEYS) < $(KEYSYMDEF) > ks_tables_h
- 	mv ks_tables_h $@
- 
- $(top_builddir)/src/util/makekeys$(EXEEXT): force