Changes 8.4.15:

* Minor bugfixes

12 files changed, 78 insertions, 79 deletions

diff --git a/lang/tcl/Makefile.version b/lang/tcl/Makefile.version
index aa36c7d11ed..82d002455d9 100644
--- a/lang/tcl/Makefile.version
+++ b/lang/tcl/Makefile.version
@@ -1,3 +1,3 @@
-# $NetBSD: Makefile.version,v 1.5 2006/11/02 17:41:23 adam Exp $
+# $NetBSD: Makefile.version,v 1.6 2007/05/31 13:01:53 adam Exp $
 
-TCL_VERSION=8.4.14
+TCL_VERSION=8.4.15
diff --git a/lang/tcl/distinfo b/lang/tcl/distinfo
index c38198a58f8..d2a24c7ac62 100644
--- a/lang/tcl/distinfo
+++ b/lang/tcl/distinfo
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.39 2006/11/02 17:41:23 adam Exp $
+$NetBSD: distinfo,v 1.40 2007/05/31 13:01:53 adam Exp $
 
-SHA1 (tcl8.4.14-src.tar.gz) = d7af7e0c7ed563e2344dda04bbe49961589244dd
-RMD160 (tcl8.4.14-src.tar.gz) = 392a4f4617ee77cfdae10b24e9ccbe84afed0a40
-Size (tcl8.4.14-src.tar.gz) = 3544609 bytes
+SHA1 (tcl8.4.15-src.tar.gz) = fbfae3ca68633a10b3fe870018588ade0944caed
+RMD160 (tcl8.4.15-src.tar.gz) = b6b41cb5ae18744ba5aa7fdf3d64277d97d8546e
+Size (tcl8.4.15-src.tar.gz) = 3635163 bytes
 SHA1 (patch-aa) = 9d648f1df5209a346f9cf6dafa220875e32fcf90
-SHA1 (patch-ab) = 4e1ad03a46f15106341371d3021ef2e1bdb6ffe7
-SHA1 (patch-ac) = 926e8026e2cd147db6b472d1a73ae28d76ccb08a
+SHA1 (patch-ab) = 9b26c7eaead6343490d8dbabcd2ac1c42029e4c5
+SHA1 (patch-ac) = 3139a65c6647d806fc69765bc62aa715b49f4d41
 SHA1 (patch-ad) = 05a945172651513e178c6f49672bb18d8c4ad3e7
 SHA1 (patch-ae) = 8b36b48dc316dd975484fda8763af16f4a95bf68
-SHA1 (patch-af) = 8d21778bdc2b5db976ae3ff52ec56ab1c7cd9f00
+SHA1 (patch-af) = 107848ba45196d6168abaab4f84cd5e0b087ddd5
 SHA1 (patch-ag) = fe371866b438063515bad6d145287455c4636824
-SHA1 (patch-ah) = 6f358329a7bc3a29580f902eccbde53b7f8b049b
+SHA1 (patch-ah) = b6a68a26ed018f424e9e41bcf6f8da1517bd599a
 SHA1 (patch-ai) = b0f7818adedd53a123c6ab809bbec28924b3f07b
 SHA1 (patch-aj) = 74d5d7f0d47f39241068c98a316104da94f1cdb9
diff --git a/lang/tcl/patches/patch-ab b/lang/tcl/patches/patch-ab
index ee0ef42c431..f63505ea217 100644
--- a/lang/tcl/patches/patch-ab
+++ b/lang/tcl/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.35 2006/11/02 17:41:23 adam Exp $
+$NetBSD: patch-ab,v 1.36 2007/05/31 13:01:53 adam Exp $
 
---- unix/configure.orig	2006-10-19 19:26:15.000000000 +0200
+--- unix/configure.orig	2007-05-24 22:40:13.000000000 +0200
 +++ unix/configure
-@@ -2558,12 +2558,13 @@ fi
+@@ -2565,12 +2565,13 @@ fi
      # Step 3: set configuration options based on system name and version.
  
      do64bit_ok=no
@@ -17,7 +17,7 @@ $NetBSD: patch-ab,v 1.35 2006/11/02 17:41:23 adam Exp $
      CFLAGS_DEBUG=-g
      CFLAGS_OPTIMIZE=-O
      if test "$GCC" = "yes" ; then
-@@ -2978,6 +2979,21 @@ fi
+@@ -2989,6 +2990,21 @@ fi
  		LD_LIBRARY_PATH_VAR="SHLIB_PATH"
  	    fi
  	    ;;
@@ -39,7 +39,7 @@ $NetBSD: patch-ab,v 1.35 2006/11/02 17:41:23 adam Exp $
  	IRIX-4.*)
  	    SHLIB_CFLAGS="-G 0"
  	    SHLIB_SUFFIX=".a"
-@@ -3218,6 +3234,9 @@ fi
+@@ -3265,6 +3281,9 @@ fi
  	    LD_SEARCH_FLAGS=""
  	    ;;
  	NetBSD-*|FreeBSD-[1-2].*)
@@ -49,7 +49,7 @@ $NetBSD: patch-ab,v 1.35 2006/11/02 17:41:23 adam Exp $
  	    # Not available on all versions:  check for include file.
  	    ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
-@@ -3250,13 +3269,11 @@ if eval "test \"`echo '$ac_cv_header_'$a
+@@ -3297,13 +3316,11 @@ if eval "test \"`echo '$ac_cv_header_'$a
    
  		# NetBSD/SPARC needs -fPIC, -fpic will not do.
  		SHLIB_CFLAGS="-fPIC"
@@ -61,9 +61,9 @@ $NetBSD: patch-ab,v 1.35 2006/11/02 17:41:23 adam Exp $
  		CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
 -		LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
  		echo $ac_n "checking for ELF""... $ac_c" 1>&6
- echo "configure:3262: checking for ELF" >&5
+ echo "configure:3309: checking for ELF" >&5
  if eval "test \"`echo '$''{'tcl_cv_ld_elf'+set}'`\" = set"; then
-@@ -3285,6 +3302,9 @@ rm -f conftest*
+@@ -3332,6 +3349,9 @@ rm -f conftest*
  fi
  
  echo "$ac_t""$tcl_cv_ld_elf" 1>&6
@@ -73,7 +73,7 @@ $NetBSD: patch-ab,v 1.35 2006/11/02 17:41:23 adam Exp $
  		if test $tcl_cv_ld_elf = yes; then
  		    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
  		else
-@@ -3382,7 +3402,7 @@ echo "$ac_t""$tcl_cv_ld_elf" 1>&6
+@@ -3429,7 +3449,7 @@ echo "$ac_t""$tcl_cv_ld_elf" 1>&6
  	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
  	    TCL_LIB_VERSIONS_OK=nodots
  	    ;;
@@ -82,7 +82,7 @@ $NetBSD: patch-ab,v 1.35 2006/11/02 17:41:23 adam Exp $
  	    # FreeBSD 3.* and greater have ELF.
  	    SHLIB_CFLAGS="-fPIC"
  	    SHLIB_LD="ld -Bshareable -x"
-@@ -4156,16 +4176,16 @@ fi
+@@ -4279,16 +4299,16 @@ fi
      fi
  
      if test "$SHARED_LIB_SUFFIX" = "" ; then
@@ -103,7 +103,7 @@ $NetBSD: patch-ab,v 1.35 2006/11/02 17:41:23 adam Exp $
      else
          LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
  
-@@ -9006,7 +9026,7 @@ else
+@@ -9130,7 +9150,7 @@ else
              TCL_LIB_FLAG="-ltcl`echo ${TCL_VERSION} | tr -d .`\${TCL_DBGX}"
          fi
          TCL_BUILD_LIB_SPEC="-L`pwd` ${TCL_LIB_FLAG}"
@@ -112,7 +112,7 @@ $NetBSD: patch-ab,v 1.35 2006/11/02 17:41:23 adam Exp $
      else
          TCL_BUILD_EXP_FILE="lib.exp"
          eval "TCL_EXP_FILE=libtcl${TCL_EXPORT_FILE_SUFFIX}"
-@@ -9037,13 +9057,21 @@ VERSION=${TCL_VERSION}
+@@ -9161,13 +9181,21 @@ VERSION=${TCL_VERSION}
  #--------------------------------------------------------------------
  
  if test "$FRAMEWORK_BUILD" = "1" ; then
diff --git a/lang/tcl/patches/patch-ac b/lang/tcl/patches/patch-ac
index d1e0756ffea..18399a5bf3f 100644
--- a/lang/tcl/patches/patch-ac
+++ b/lang/tcl/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.10 2006/11/02 17:41:23 adam Exp $
+$NetBSD: patch-ac,v 1.11 2007/05/31 13:01:53 adam Exp $
 
---- unix/tclUnixInit.c.orig	2006-09-10 19:04:42.000000000 +0200
+--- unix/tclUnixInit.c.orig	2007-04-29 04:19:51.000000000 +0200
 +++ unix/tclUnixInit.c
 @@ -26,7 +26,7 @@
  #       endif
@@ -23,7 +23,7 @@ $NetBSD: patch-ac,v 1.10 2006/11/02 17:41:23 adam Exp $
  
  /*
   * The Init script (common to Windows and Unix platforms) is
-@@ -221,7 +226,7 @@ TclpInitPlatform()
+@@ -223,7 +228,7 @@ TclpInitPlatform()
      (void) signal(SIGPIPE, SIG_IGN);
  #endif /* SIGPIPE */
  
@@ -32,7 +32,7 @@ $NetBSD: patch-ac,v 1.10 2006/11/02 17:41:23 adam Exp $
      /*
       * Adjust the rounding mode to be more conventional. Note that FreeBSD
       * only provides the __fpsetreg() used by the following two for the GNU
-@@ -779,6 +784,11 @@ TclpSetVariables(interp)
+@@ -781,6 +786,11 @@ TclpSetVariables(interp)
      int unameOK;
      CONST char *user;
      Tcl_DString ds;
@@ -44,7 +44,7 @@ $NetBSD: patch-ac,v 1.10 2006/11/02 17:41:23 adam Exp $
  
  #ifdef HAVE_COREFOUNDATION
      char tclLibPath[MAXPATHLEN + 1];
-@@ -905,8 +915,16 @@ TclpSetVariables(interp)
+@@ -907,8 +917,16 @@ TclpSetVariables(interp)
  	    Tcl_SetVar2(interp, "tcl_platform", "osVersion", name.release,
  		    TCL_GLOBAL_ONLY|TCL_APPEND_VALUE);
  	}
diff --git a/lang/tcl/patches/patch-af b/lang/tcl/patches/patch-af
index 792e3ebce26..af6e3c24fd8 100644
--- a/lang/tcl/patches/patch-af
+++ b/lang/tcl/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.21 2006/11/02 17:41:23 adam Exp $
+$NetBSD: patch-af,v 1.22 2007/05/31 13:01:53 adam Exp $
 
---- unix/tcl.m4.orig	2006-10-19 19:26:15.000000000 +0200
+--- unix/tcl.m4.orig	2007-05-24 22:40:13.000000000 +0200
 +++ unix/tcl.m4
-@@ -1032,6 +1032,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
+@@ -1033,6 +1033,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
      # Step 3: set configuration options based on system name and version.
  
      do64bit_ok=no
@@ -10,7 +10,7 @@ $NetBSD: patch-af,v 1.21 2006/11/02 17:41:23 adam Exp $
      LDFLAGS_ORIG="$LDFLAGS"
      TCL_EXPORT_FILE_SUFFIX=""
      UNSHARED_LIB_SUFFIX=""
-@@ -1258,6 +1259,21 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1263,6 +1264,21 @@ dnl AC_CHECK_TOOL(AR, ar)
  		LD_LIBRARY_PATH_VAR="SHLIB_PATH"
  	    fi
  	    ;;
@@ -32,7 +32,7 @@ $NetBSD: patch-af,v 1.21 2006/11/02 17:41:23 adam Exp $
  	IRIX-4.*)
  	    SHLIB_CFLAGS="-G 0"
  	    SHLIB_SUFFIX=".a"
-@@ -1279,6 +1295,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1284,6 +1300,9 @@ dnl AC_CHECK_TOOL(AR, ar)
  	    DL_LIBS=""
  	    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
  	    LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
@@ -42,7 +42,7 @@ $NetBSD: patch-af,v 1.21 2006/11/02 17:41:23 adam Exp $
  	    ;;
  	IRIX-6.*)
  	    SHLIB_CFLAGS=""
-@@ -1304,6 +1323,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1309,6 +1328,9 @@ dnl AC_CHECK_TOOL(AR, ar)
  		esac
  		LDFLAGS="$LDFLAGS -n32"
  	    fi
@@ -52,7 +52,7 @@ $NetBSD: patch-af,v 1.21 2006/11/02 17:41:23 adam Exp $
  	    ;;
  	IRIX64-6.*)
  	    SHLIB_CFLAGS=""
-@@ -1327,6 +1349,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1332,6 +1354,9 @@ dnl AC_CHECK_TOOL(AR, ar)
  	            LDFLAGS="$LDFLAGS -64"
  	        fi
  	    fi
@@ -62,7 +62,7 @@ $NetBSD: patch-af,v 1.21 2006/11/02 17:41:23 adam Exp $
  	    ;;
  	Linux*)
  	    SHLIB_CFLAGS="-fPIC"
-@@ -1372,6 +1397,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1388,6 +1413,9 @@ dnl AC_CHECK_TOOL(AR, ar)
  	    # XIM peeking works under XFree86.
  	    AC_DEFINE(PEEK_XCLOSEIM)
  
@@ -72,7 +72,7 @@ $NetBSD: patch-af,v 1.21 2006/11/02 17:41:23 adam Exp $
  	    ;;
  	GNU*)
  	    SHLIB_CFLAGS="-fPIC"
-@@ -1431,23 +1459,26 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1447,23 +1475,26 @@ dnl AC_CHECK_TOOL(AR, ar)
  	    LD_SEARCH_FLAGS=""
  	    ;;
  	NetBSD-*|FreeBSD-[[1-2]].*)
@@ -101,7 +101,7 @@ $NetBSD: patch-af,v 1.21 2006/11/02 17:41:23 adam Exp $
  		if test $tcl_cv_ld_elf = yes; then
  		    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
  		else
-@@ -1518,7 +1549,7 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1534,7 +1565,7 @@ dnl AC_CHECK_TOOL(AR, ar)
  	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
  	    TCL_LIB_VERSIONS_OK=nodots
  	    ;;
@@ -110,7 +110,7 @@ $NetBSD: patch-af,v 1.21 2006/11/02 17:41:23 adam Exp $
  	    # FreeBSD 3.* and greater have ELF.
  	    SHLIB_CFLAGS="-fPIC"
  	    SHLIB_LD="ld -Bshareable -x"
-@@ -1880,6 +1911,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1923,6 +1954,9 @@ dnl AC_CHECK_TOOL(AR, ar)
  		CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
  		LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
  	    fi
@@ -120,7 +120,7 @@ $NetBSD: patch-af,v 1.21 2006/11/02 17:41:23 adam Exp $
  	    ;;
  	ULTRIX-4.*)
  	    SHLIB_CFLAGS="-G 0"
-@@ -2058,8 +2092,8 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -2107,8 +2141,8 @@ dnl # preprocessing tests use only CPPFL
  
      if test "${SHARED_BUILD}" = "1" && test "${SHLIB_SUFFIX}" != "" ; then
          LIB_SUFFIX=${SHARED_LIB_SUFFIX}
@@ -131,7 +131,7 @@ $NetBSD: patch-af,v 1.21 2006/11/02 17:41:23 adam Exp $
      else
          LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
  
-@@ -2089,10 +2123,10 @@ dnl        esac
+@@ -2138,10 +2172,10 @@ dnl        esac
  
      # Stub lib does not depend on shared/static configuration
      if test "$RANLIB" = "" ; then
diff --git a/lang/tcl/patches/patch-ah b/lang/tcl/patches/patch-ah
index 7bfeb4bcebe..e1b22571e5f 100644
--- a/lang/tcl/patches/patch-ah
+++ b/lang/tcl/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.3 2006/11/02 17:41:23 adam Exp $
+$NetBSD: patch-ah,v 1.4 2007/05/31 13:01:54 adam Exp $
 
---- unix/tclUnixFCmd.c.orig	2006-09-07 20:49:28.000000000 +0200
+--- unix/tclUnixFCmd.c.orig	2007-04-29 04:19:51.000000000 +0200
 +++ unix/tclUnixFCmd.c
-@@ -602,6 +602,14 @@ TclpDeleteFile(path)
+@@ -631,6 +631,14 @@ TclpDeleteFile(path)
   *---------------------------------------------------------------------------
   */
  
diff --git a/x11/tk/Makefile.version b/x11/tk/Makefile.version
index 3c711ed1065..f1b41092b97 100644
--- a/x11/tk/Makefile.version
+++ b/x11/tk/Makefile.version
@@ -1,3 +1,3 @@
-# $NetBSD: Makefile.version,v 1.5 2006/11/02 17:42:03 adam Exp $
+# $NetBSD: Makefile.version,v 1.6 2007/05/31 13:02:06 adam Exp $
 
-TK_VERSION=	8.4.14
+TK_VERSION=	8.4.15
diff --git a/x11/tk/PLIST b/x11/tk/PLIST
index 1442645881f..03f712b162f 100644
--- a/x11/tk/PLIST
+++ b/x11/tk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2006/04/27 08:18:09 adam Exp $
+@comment $NetBSD: PLIST,v 1.9 2007/05/31 13:02:06 adam Exp $
 bin/wish
 bin/wish8.4
 include/tk.h
@@ -131,7 +131,6 @@ lib/tk8.4/msgs/en.msg
 lib/tk8.4/msgs/en_gb.msg
 lib/tk8.4/msgs/eo.msg
 lib/tk8.4/msgs/es.msg
-lib/tk8.4/msgs/es_ES.msg
 lib/tk8.4/msgs/fr.msg
 lib/tk8.4/msgs/it.msg
 lib/tk8.4/msgs/nl.msg
diff --git a/x11/tk/distinfo b/x11/tk/distinfo
index c718ce07d7f..826d3bd8f56 100644
--- a/x11/tk/distinfo
+++ b/x11/tk/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.29 2006/11/02 17:42:03 adam Exp $
+$NetBSD: distinfo,v 1.30 2007/05/31 13:02:06 adam Exp $
 
-SHA1 (tk8.4.14-src.tar.gz) = d3a8d1240fe37408a3d39613cb1d845764b7a5b1
-RMD160 (tk8.4.14-src.tar.gz) = 055ea75b91fe0e33ac9d96bd3b9099622008820e
-Size (tk8.4.14-src.tar.gz) = 3268223 bytes
+SHA1 (tk8.4.15-src.tar.gz) = 832b39fc3e64dcbbfff4fc192e33d3fc8ef76c43
+RMD160 (tk8.4.15-src.tar.gz) = 8facb8033ce811097a3568373581687a749dda2d
+Size (tk8.4.15-src.tar.gz) = 3340313 bytes
 SHA1 (patch-aa) = 8425d47efc6feab4a19a79b7d857b9da8042aedf
-SHA1 (patch-ab) = 034f05b45dd9ec824c59fbd9182c8a0476d52523
-SHA1 (patch-ac) = 814e990db42a3a4b8dfb86c91d7c00e970372e48
-SHA1 (patch-ad) = a5881628ec98095e5d95429a6de324a681a14535
+SHA1 (patch-ab) = 81f203519a75dd270d9eaf9d9551cde3c6c52beb
+SHA1 (patch-ac) = 90cb841327d21d606bcebd9d13061115ec791581
+SHA1 (patch-ad) = 408cb4e1f6dbcc00d66e4a817c65d4ed0f0230a7
diff --git a/x11/tk/patches/patch-ab b/x11/tk/patches/patch-ab
index de6c22a7c9e..e0fe3a974c7 100644
--- a/x11/tk/patches/patch-ab
+++ b/x11/tk/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.26 2006/11/02 17:42:03 adam Exp $
+$NetBSD: patch-ab,v 1.27 2007/05/31 13:02:06 adam Exp $
 
---- unix/configure.orig	2006-10-19 19:27:34.000000000 +0200
+--- unix/configure.orig	2007-05-25 18:09:53.000000000 +0200
 +++ unix/configure
-@@ -2055,12 +2055,13 @@ fi
+@@ -2062,12 +2062,13 @@ fi
      # Step 3: set configuration options based on system name and version.
  
      do64bit_ok=no
@@ -17,7 +17,7 @@ $NetBSD: patch-ab,v 1.26 2006/11/02 17:42:03 adam Exp $
      CFLAGS_DEBUG=-g
      CFLAGS_OPTIMIZE=-O
      if test "$GCC" = "yes" ; then
-@@ -2747,7 +2748,6 @@ if eval "test \"`echo '$ac_cv_header_'$a
+@@ -2794,7 +2795,6 @@ if eval "test \"`echo '$ac_cv_header_'$a
    
  		# NetBSD/SPARC needs -fPIC, -fpic will not do.
  		SHLIB_CFLAGS="-fPIC"
@@ -25,7 +25,7 @@ $NetBSD: patch-ab,v 1.26 2006/11/02 17:42:03 adam Exp $
  		SHLIB_LD_LIBS='${LIBS}'
  		SHLIB_SUFFIX=".so"
  		DL_OBJS="tclLoadDl.o"
-@@ -2782,6 +2782,9 @@ rm -f conftest*
+@@ -2829,6 +2829,9 @@ rm -f conftest*
  fi
  
  echo "$ac_t""$tcl_cv_ld_elf" 1>&6
@@ -35,7 +35,7 @@ $NetBSD: patch-ab,v 1.26 2006/11/02 17:42:03 adam Exp $
  		if test $tcl_cv_ld_elf = yes; then
  		    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
  		else
-@@ -2879,12 +2882,13 @@ echo "$ac_t""$tcl_cv_ld_elf" 1>&6
+@@ -2926,12 +2929,13 @@ echo "$ac_t""$tcl_cv_ld_elf" 1>&6
  	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
  	    TCL_LIB_VERSIONS_OK=nodots
  	    ;;
@@ -50,7 +50,7 @@ $NetBSD: patch-ab,v 1.26 2006/11/02 17:42:03 adam Exp $
  	    DL_OBJS="tclLoadDl.o"
  	    DL_LIBS=""
  	    LDFLAGS="$LDFLAGS -export-dynamic"
-@@ -3635,7 +3639,7 @@ fi
+@@ -3758,7 +3762,7 @@ fi
  		    ;;
  		IRIX*)
  		    ;;
@@ -59,7 +59,7 @@ $NetBSD: patch-ab,v 1.26 2006/11/02 17:42:03 adam Exp $
  		    ;;
  		Darwin-*)
  		    ;;
-@@ -3653,16 +3657,16 @@ fi
+@@ -3776,16 +3780,16 @@ fi
      fi
  
      if test "$SHARED_LIB_SUFFIX" = "" ; then
@@ -80,7 +80,7 @@ $NetBSD: patch-ab,v 1.26 2006/11/02 17:42:03 adam Exp $
      else
          LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
  
-@@ -5213,7 +5217,11 @@ echo "configure:5211: checking for X11 l
+@@ -5336,7 +5340,11 @@ echo "configure:5334: checking for X11 l
  	for i in $dirs ; do
  	    if test -r $i/libX11.a -o -r $i/libX11.so -o -r $i/libX11.sl; then
  		echo "$ac_t""$i" 1>&6
@@ -93,7 +93,7 @@ $NetBSD: patch-ab,v 1.26 2006/11/02 17:42:03 adam Exp $
  		x_libraries="$i"
  		break
  	    fi
-@@ -5222,7 +5230,11 @@ echo "configure:5211: checking for X11 l
+@@ -5345,7 +5353,11 @@ echo "configure:5334: checking for X11 l
  	if test "$x_libraries" = ""; then
  	    XLIBSW=-lX11
  	else
@@ -106,7 +106,7 @@ $NetBSD: patch-ab,v 1.26 2006/11/02 17:42:03 adam Exp $
  	fi
      fi
      if test "$XLIBSW" = nope ; then
-@@ -5294,6 +5306,10 @@ if test "x${x_libraries}" != "x"; then
+@@ -5417,6 +5429,10 @@ if test "x${x_libraries}" != "x"; then
  fi
  if test "${TCL_LD_SEARCH_FLAGS}" = '-L${LIB_RUNTIME_DIR}'; then
      LIB_RUNTIME_DIR=`echo ${LIB_RUNTIME_DIR} |sed -e 's/:/ -L/g'`
@@ -117,7 +117,7 @@ $NetBSD: patch-ab,v 1.26 2006/11/02 17:42:03 adam Exp $
  fi
  
  # The statement below is very tricky!  It actually *evaluates* the
-@@ -5827,11 +5843,18 @@ else
+@@ -5951,11 +5967,18 @@ else
      if test "$SHARED_BUILD" = "0" || test "$TCL_NEEDS_EXP_FILE" = "0"; then
          if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
              eval TK_LIB_FLAG="-ltk${VERSION}\${TK_DBGX}"
diff --git a/x11/tk/patches/patch-ac b/x11/tk/patches/patch-ac
index a2cf63a30be..ee7bd33afb2 100644
--- a/x11/tk/patches/patch-ac
+++ b/x11/tk/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.16 2006/11/02 17:42:03 adam Exp $
+$NetBSD: patch-ac,v 1.17 2007/05/31 13:02:06 adam Exp $
 
---- unix/tcl.m4.orig	2006-10-19 19:27:34.000000000 +0200
+--- unix/tcl.m4.orig	2007-05-25 18:09:54.000000000 +0200
 +++ unix/tcl.m4
 @@ -1033,6 +1033,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
      # Step 3: set configuration options based on system name and version.
@@ -10,7 +10,7 @@ $NetBSD: patch-ac,v 1.16 2006/11/02 17:42:03 adam Exp $
      LDFLAGS_ORIG="$LDFLAGS"
      TCL_EXPORT_FILE_SUFFIX=""
      UNSHARED_LIB_SUFFIX=""
-@@ -1280,6 +1281,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1284,6 +1285,9 @@ dnl AC_CHECK_TOOL(AR, ar)
  	    DL_LIBS=""
  	    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
  	    LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
@@ -20,7 +20,7 @@ $NetBSD: patch-ac,v 1.16 2006/11/02 17:42:03 adam Exp $
  	    ;;
  	IRIX-6.*)
  	    SHLIB_CFLAGS=""
-@@ -1305,6 +1309,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1309,6 +1313,9 @@ dnl AC_CHECK_TOOL(AR, ar)
  		esac
  		LDFLAGS="$LDFLAGS -n32"
  	    fi
@@ -30,7 +30,7 @@ $NetBSD: patch-ac,v 1.16 2006/11/02 17:42:03 adam Exp $
  	    ;;
  	IRIX64-6.*)
  	    SHLIB_CFLAGS=""
-@@ -1328,6 +1335,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1332,6 +1339,9 @@ dnl AC_CHECK_TOOL(AR, ar)
  	            LDFLAGS="$LDFLAGS -64"
  	        fi
  	    fi
@@ -40,7 +40,7 @@ $NetBSD: patch-ac,v 1.16 2006/11/02 17:42:03 adam Exp $
  	    ;;
  	Linux*)
  	    SHLIB_CFLAGS="-fPIC"
-@@ -1373,6 +1383,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1388,6 +1398,9 @@ dnl AC_CHECK_TOOL(AR, ar)
  	    # XIM peeking works under XFree86.
  	    AC_DEFINE(PEEK_XCLOSEIM)
  
@@ -50,7 +50,7 @@ $NetBSD: patch-ac,v 1.16 2006/11/02 17:42:03 adam Exp $
  	    ;;
  	GNU*)
  	    SHLIB_CFLAGS="-fPIC"
-@@ -1432,23 +1445,27 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1447,23 +1460,27 @@ dnl AC_CHECK_TOOL(AR, ar)
  	    LD_SEARCH_FLAGS=""
  	    ;;
  	NetBSD-*|FreeBSD-[[1-2]].*)
@@ -80,7 +80,7 @@ $NetBSD: patch-ac,v 1.16 2006/11/02 17:42:03 adam Exp $
  		if test $tcl_cv_ld_elf = yes; then
  		    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
  		else
-@@ -1881,6 +1898,9 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -1923,6 +1940,9 @@ dnl AC_CHECK_TOOL(AR, ar)
  		CC_SEARCH_FLAGS='-Wl,-R,${LIB_RUNTIME_DIR}'
  		LD_SEARCH_FLAGS='-R ${LIB_RUNTIME_DIR}'
  	    fi
@@ -90,7 +90,7 @@ $NetBSD: patch-ac,v 1.16 2006/11/02 17:42:03 adam Exp $
  	    ;;
  	ULTRIX-4.*)
  	    SHLIB_CFLAGS="-G 0"
-@@ -2059,8 +2079,8 @@ dnl AC_CHECK_TOOL(AR, ar)
+@@ -2107,8 +2127,8 @@ dnl # preprocessing tests use only CPPFL
  
      if test "${SHARED_BUILD}" = "1" && test "${SHLIB_SUFFIX}" != "" ; then
          LIB_SUFFIX=${SHARED_LIB_SUFFIX}
@@ -101,7 +101,7 @@ $NetBSD: patch-ac,v 1.16 2006/11/02 17:42:03 adam Exp $
      else
          LIB_SUFFIX=${UNSHARED_LIB_SUFFIX}
  
-@@ -2090,10 +2110,10 @@ dnl        esac
+@@ -2138,10 +2158,10 @@ dnl        esac
  
      # Stub lib does not depend on shared/static configuration
      if test "$RANLIB" = "" ; then
diff --git a/x11/tk/patches/patch-ad b/x11/tk/patches/patch-ad
index 67bd8d6a3b2..e3afe578ccc 100644
--- a/x11/tk/patches/patch-ad
+++ b/x11/tk/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.10 2006/11/02 17:42:03 adam Exp $
+$NetBSD: patch-ad,v 1.11 2007/05/31 13:02:06 adam Exp $
 
---- unix/configure.in.orig	2006-10-19 19:27:34.000000000 +0200
+--- unix/configure.in.orig	2007-05-25 18:09:53.000000000 +0200
 +++ unix/configure.in
-@@ -302,6 +302,10 @@ if test "x${x_libraries}" != "x"; then
+@@ -301,6 +301,10 @@ if test "x${x_libraries}" != "x"; then
  fi
  if test "${TCL_LD_SEARCH_FLAGS}" = '-L${LIB_RUNTIME_DIR}'; then
      LIB_RUNTIME_DIR=`echo ${LIB_RUNTIME_DIR} |sed -e 's/:/ -L/g'`