Changes 8.6.3:

Correct Method Search Order
Regression [lreplace {} 1 1]
Crash regression in [oo::class destroy]
Regress [regsub -all {\(.*} a(b) {}]
[try {} on ok {} - on return {} {}] panic
[tcl::unsupported::getbytecode] disassember
[string cat] bytecode optimization
segfault in mangled bytecode
Hang in some [read]s of limited size
segfault in [array set] of traced array
MSVC14 compile support
[fcopy] treats [blocked] as error
regression in Tcl_Write() interface
fix [gets] on non-blocking channels
restore [open comX: r+]
Restore [lappend v] return value
Stop forcing EOF to be permanent

10 files changed, 134 insertions, 134 deletions

diff --git a/lang/tcl/Makefile.version b/lang/tcl/Makefile.version
index 9a09e400214..d0857a1ef04 100644
--- a/lang/tcl/Makefile.version
+++ b/lang/tcl/Makefile.version
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.version,v 1.14 2014/10/31 21:11:18 adam Exp $
+# $NetBSD: Makefile.version,v 1.15 2014/11/22 15:57:17 adam Exp $
 # used by cad/xcircuit/Makefile
 # used by devel/tcl-tclcl/Makefile
 # used by lang/tcl/Makefile
@@ -6,4 +6,4 @@
 
 TCL_SONUM=	86
 TCL_BASEVER=	8.6
-TCL_VERSION=	8.6.2
+TCL_VERSION=	8.6.3
diff --git a/lang/tcl/PLIST b/lang/tcl/PLIST
index e6debd88562..3851a062b1b 100644
--- a/lang/tcl/PLIST
+++ b/lang/tcl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2014/10/31 21:11:18 adam Exp $
+@comment $NetBSD: PLIST,v 1.17 2014/11/22 15:57:17 adam Exp $
 bin/tclsh
 bin/tclsh${BASEVER}
 include/fakemysql.h
@@ -50,20 +50,20 @@ include/tclThread.h
 include/tdbc.h
 include/tdbcDecls.h
 include/tdbcInt.h
-lib/itcl4.0.1/itcl.tcl
-lib/itcl4.0.1/itclConfig.sh
-lib/itcl4.0.1/itclHullCmds.tcl
-lib/itcl4.0.1/itclWidget.tcl
-lib/itcl4.0.1/libitcl4.0.1.so
-lib/itcl4.0.1/libitclstub4.0.1.a
-lib/itcl4.0.1/pkgIndex.tcl
+lib/itcl4.0.2/itcl.tcl
+lib/itcl4.0.2/itclConfig.sh
+lib/itcl4.0.2/itclHullCmds.tcl
+lib/itcl4.0.2/itclWidget.tcl
+lib/itcl4.0.2/libitcl4.0.2.so
+lib/itcl4.0.2/libitclstub4.0.2.a
+lib/itcl4.0.2/pkgIndex.tcl
 lib/libtcl${SONUM}.a
 lib/libtcl${SONUM}.so
 lib/libtcl${SONUM}.so.1.0
 lib/libtclstub${SONUM}.a
 lib/pkgconfig/tcl.pc
-lib/sqlite3.8.6/libsqlite3.8.6.so
-lib/sqlite3.8.6/pkgIndex.tcl
+lib/sqlite3.8.7.1/libsqlite3.8.7.1.so
+lib/sqlite3.8.7.1/pkgIndex.tcl
 lib/tcl${BASEVER}/auto.tcl
 lib/tcl${BASEVER}/clock.tcl
 lib/tcl${BASEVER}/encoding/ascii.enc
@@ -299,23 +299,23 @@ lib/tcl8/8.4/platform/shell-1.1.4.tm
 lib/tcl8/8.5/msgcat-1.5.2.tm
 lib/tcl8/8.5/tcltest-2.3.8.tm
 lib/tcl8/8.6/http-2.8.8.tm
-lib/tcl8/8.6/tdbc/sqlite3-1.0.1.tm
+lib/tcl8/8.6/tdbc/sqlite3-1.0.2.tm
 lib/tclConfig.sh
 lib/tclooConfig.sh
-lib/tdbc1.0.1/libtdbc1.0.1.so
-lib/tdbc1.0.1/libtdbcstub1.0.1.a
-lib/tdbc1.0.1/pkgIndex.tcl
-lib/tdbc1.0.1/tdbc.tcl
-lib/tdbc1.0.1/tdbcConfig.sh
-lib/tdbcmysql1.0.1/libtdbcmysql1.0.1.so
-lib/tdbcmysql1.0.1/pkgIndex.tcl
-lib/tdbcmysql1.0.1/tdbcmysql.tcl
-lib/tdbcodbc1.0.1/libtdbcodbc1.0.1.so
-lib/tdbcodbc1.0.1/pkgIndex.tcl
-lib/tdbcodbc1.0.1/tdbcodbc.tcl
-lib/tdbcpostgres1.0.1/libtdbcpostgres1.0.1.so
-lib/tdbcpostgres1.0.1/pkgIndex.tcl
-lib/tdbcpostgres1.0.1/tdbcpostgres.tcl
+lib/tdbc1.0.2/libtdbc1.0.2.so
+lib/tdbc1.0.2/libtdbcstub1.0.2.a
+lib/tdbc1.0.2/pkgIndex.tcl
+lib/tdbc1.0.2/tdbc.tcl
+lib/tdbc1.0.2/tdbcConfig.sh
+lib/tdbcmysql1.0.2/libtdbcmysql1.0.2.so
+lib/tdbcmysql1.0.2/pkgIndex.tcl
+lib/tdbcmysql1.0.2/tdbcmysql.tcl
+lib/tdbcodbc1.0.2/libtdbcodbc1.0.2.so
+lib/tdbcodbc1.0.2/pkgIndex.tcl
+lib/tdbcodbc1.0.2/tdbcodbc.tcl
+lib/tdbcpostgres1.0.2/libtdbcpostgres1.0.2.so
+lib/tdbcpostgres1.0.2/pkgIndex.tcl
+lib/tdbcpostgres1.0.2/tdbcpostgres.tcl
 lib/thread2.7.1/libthread2.7.1.so
 lib/thread2.7.1/pkgIndex.tcl
 lib/thread2.7.1/ttrace.tcl
diff --git a/lang/tcl/distinfo b/lang/tcl/distinfo
index f9c17128fc4..51a30acfa40 100644
--- a/lang/tcl/distinfo
+++ b/lang/tcl/distinfo
@@ -1,17 +1,17 @@
-$NetBSD: distinfo,v 1.62 2014/10/31 21:11:18 adam Exp $
+$NetBSD: distinfo,v 1.63 2014/11/22 15:57:17 adam Exp $
 
-SHA1 (tcl8.6.2-src.tar.gz) = f01ee98da154f83ce4b1c2db752decf734384954
-RMD160 (tcl8.6.2-src.tar.gz) = 574bffdf3e390cf6460ab4a9d4b59db0e58f2998
-Size (tcl8.6.2-src.tar.gz) = 8857161 bytes
+SHA1 (tcl8.6.3-src.tar.gz) = 026b4b6330205bdc49af12332ee17c2b01f76d37
+RMD160 (tcl8.6.3-src.tar.gz) = 7d798ddba4e0b2fce9228f2d654e2cfeef015aca
+Size (tcl8.6.3-src.tar.gz) = 8901509 bytes
 SHA1 (patch-generic_tclInt.h) = 13289d8fcf5021898b06a9608bc05fc968a1ba5c
 SHA1 (patch-generic_tclPort.h) = 36ff05b22591d588952e55d0f13c2ef52e371d1e
 SHA1 (patch-generic_tclPosixStr.c) = 68da211865282fe7124cad71381658f8dfb986d6
-SHA1 (patch-pkgs_itcl4.0.1_configure) = 64802cb0c09a2405ec2d3e4d73188d10e478efc2
-SHA1 (patch-pkgs_sqlite3.8.6_configure) = 61a826a32c033cd5879da69e90d5dad4de061f58
-SHA1 (patch-pkgs_tdbc1.0.1_configure) = 65189aa432013c02ed42833ec43985a55b7c8a20
-SHA1 (patch-pkgs_tdbcmysql1.0.1_configure) = acbb6dfbf4e35a2cf7eb16d0d5b415bb0f34431d
-SHA1 (patch-pkgs_tdbcodbc1.0.1_configure) = 4e124750268a72770274452d5c1d01e2701794f3
-SHA1 (patch-pkgs_tdbcpostgres1.0.1_configure) = ad5faf45d755670761ea8f4888c761a166a2938f
+SHA1 (patch-pkgs_itcl4.0.2_configure) = 1a1f5e69ee59dedb517ba4fe954b4821618da835
+SHA1 (patch-pkgs_sqlite3.8.7.1_configure) = b90fbbceeac74f8c23be575740052435f3ea0cd0
+SHA1 (patch-pkgs_tdbc1.0.2_configure) = e81672bd0e2f6a24159bf0756db2703d767f094e
+SHA1 (patch-pkgs_tdbcmysql1.0.2_configure) = 2f2705ac502b1d9954b1240c5d0f70e677a85387
+SHA1 (patch-pkgs_tdbcodbc1.0.2_configure) = 804ed3189dde8ee0e41f43a6a09285a65f78c118
+SHA1 (patch-pkgs_tdbcpostgres1.0.2_configure) = 81f5bf3aecf3deee1df9c7e4a4624e77dd013923
 SHA1 (patch-pkgs_thread2.7.1_configure) = f722be8d70eb16c34acd9685d5b594665d811b76
 SHA1 (patch-tests_load.test) = 438695ab76e01646e49aadc01c44344a5495eabb
 SHA1 (patch-tests_pkgMkIndex.test) = 70d1042c1f4743052c5fa191fa7c4732a08e28a2
diff --git a/lang/tcl/patches/patch-pkgs_tdbc1.0.1_configure b/lang/tcl/patches/patch-pkgs_itcl4.0.2_configure
index 326a92dd155..ff6ac726f15 100644
--- a/lang/tcl/patches/patch-pkgs_tdbc1.0.1_configure
+++ b/lang/tcl/patches/patch-pkgs_itcl4.0.2_configure
@@ -1,18 +1,18 @@
-$NetBSD: patch-pkgs_tdbc1.0.1_configure,v 1.1 2014/10/31 21:11:18 adam Exp $
+$NetBSD: patch-pkgs_itcl4.0.2_configure,v 1.1 2014/11/22 15:57:17 adam Exp $
 
 Add support for DragonFly.
 
---- pkgs/tdbc1.0.1/configure.orig	2014-08-14 17:26:06.000000000 +0000
-+++ pkgs/tdbc1.0.1/configure
-@@ -9409,7 +9409,6 @@ fi
+--- pkgs/itcl4.0.2/configure.orig	2014-10-20 19:25:24.000000000 +0000
++++ pkgs/itcl4.0.2/configure
+@@ -9224,7 +9224,6 @@ fi
  fi
  
  		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
--		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}'
+-		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
  		LDFLAGS="-Wl,-export-dynamic"
  		;;
  	    esac
-@@ -9431,8 +9430,6 @@ fi
+@@ -9246,8 +9245,6 @@ fi
  fi
  
  	    # OpenBSD doesn't do version numbers with dots.
@@ -21,7 +21,7 @@ Add support for DragonFly.
  	    ;;
  	NetBSD-*)
  	    # NetBSD has ELF and can use 'cc -shared' to build shared libs
-@@ -9456,7 +9453,7 @@ fi
+@@ -9271,7 +9268,7 @@ fi
  fi
  
  	    ;;
@@ -30,7 +30,7 @@ Add support for DragonFly.
  	    # This configuration from FreeBSD Ports.
  	    SHLIB_CFLAGS="-fPIC"
  	    SHLIB_LD="${CC} -shared"
-@@ -9481,10 +9478,6 @@ fi
+@@ -9295,10 +9292,6 @@ fi
  	    case $system in
  	    FreeBSD-3.*)
  		# Version numbers are dot-stripped by system policy.
@@ -41,7 +41,7 @@ Add support for DragonFly.
  		;;
  	    esac
  	    ;;
-@@ -10335,7 +10328,7 @@ fi
+@@ -10149,7 +10142,7 @@ fi
  	    BSD/OS*) ;;
  	    CYGWIN_*|MINGW32_*) ;;
  	    IRIX*) ;;
diff --git a/lang/tcl/patches/patch-pkgs_sqlite3.8.6_configure b/lang/tcl/patches/patch-pkgs_sqlite3.8.6_configure
deleted file mode 100644
index 3ac4721d6ef..00000000000
--- a/lang/tcl/patches/patch-pkgs_sqlite3.8.6_configure
+++ /dev/null
@@ -1,52 +0,0 @@
-$NetBSD: patch-pkgs_sqlite3.8.6_configure,v 1.1 2014/10/31 21:11:18 adam Exp $
-
-Add support for DragonFly.
-
---- pkgs/sqlite3.8.6/configure.orig	2014-08-15 14:09:19.000000000 +0000
-+++ pkgs/sqlite3.8.6/configure
-@@ -7241,7 +7241,6 @@ fi
- 		    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
- fi
- 		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
--		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}'
- 		LDFLAGS="-Wl,-export-dynamic"
- 		;;
- 	    esac
-@@ -7262,8 +7261,6 @@ fi
- 
- fi
- 	    # OpenBSD doesn't do version numbers with dots.
--	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
--	    TCL_LIB_VERSIONS_OK=nodots
- 	    ;;
- 	NetBSD-*)
- 	    # NetBSD has ELF and can use 'cc -shared' to build shared libs
-@@ -7285,7 +7282,7 @@ fi
- 
- fi
- 	    ;;
--	FreeBSD-*)
-+	FreeBSD-*|DragonFly-*)
- 	    # This configuration from FreeBSD Ports.
- 	    SHLIB_CFLAGS="-fPIC"
- 	    SHLIB_LD="${CC} -shared"
-@@ -7305,10 +7302,6 @@ fi
- 		LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
- fi
- 	    # Version numbers are dot-stripped by system policy.
--	    TCL_TRIM_DOTS=`echo ${PACKAGE_VERSION} | tr -d .`
--	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
--	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
--	    TCL_LIB_VERSIONS_OK=nodots
- 	    ;;
- 	Darwin-*)
- 	    CFLAGS_OPTIMIZE="-Os"
-@@ -7917,7 +7910,7 @@ fi
- 	    BSD/OS*) ;;
- 	    CYGWIN_*|MINGW32_*) ;;
- 	    IRIX*) ;;
--	    NetBSD-*|FreeBSD-*|OpenBSD-*) ;;
-+	    NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*) ;;
- 	    Darwin-*) ;;
- 	    SCO_SV-3.2*) ;;
- 	    windows) ;;
diff --git a/lang/tcl/patches/patch-pkgs_tdbcodbc1.0.1_configure b/lang/tcl/patches/patch-pkgs_sqlite3.8.7.1_configure
index 07f5f955b3a..27b8f35bea6 100644
--- a/lang/tcl/patches/patch-pkgs_tdbcodbc1.0.1_configure
+++ b/lang/tcl/patches/patch-pkgs_sqlite3.8.7.1_configure
@@ -1,18 +1,18 @@
-$NetBSD: patch-pkgs_tdbcodbc1.0.1_configure,v 1.1 2014/10/31 21:11:18 adam Exp $
+$NetBSD: patch-pkgs_sqlite3.8.7.1_configure,v 1.1 2014/11/22 15:57:17 adam Exp $
 
 Add support for DragonFly.
 
---- pkgs/tdbcodbc1.0.1/configure.orig	2014-08-14 17:52:58.000000000 +0000
-+++ pkgs/tdbcodbc1.0.1/configure
-@@ -7770,7 +7770,6 @@ fi
+--- pkgs/sqlite3.8.7.1/configure.orig	2014-11-07 18:09:52.000000000 +0000
++++ pkgs/sqlite3.8.7.1/configure
+@@ -7270,7 +7270,6 @@ fi
  		    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
  fi
  		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
--		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}'
+-		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
  		LDFLAGS="-Wl,-export-dynamic"
  		;;
  	    esac
-@@ -7791,8 +7790,6 @@ fi
+@@ -7291,8 +7290,6 @@ fi
  
  fi
  	    # OpenBSD doesn't do version numbers with dots.
@@ -21,7 +21,7 @@ Add support for DragonFly.
  	    ;;
  	NetBSD-*)
  	    # NetBSD has ELF and can use 'cc -shared' to build shared libs
-@@ -7814,7 +7811,7 @@ fi
+@@ -7314,7 +7311,7 @@ fi
  
  fi
  	    ;;
@@ -30,7 +30,7 @@ Add support for DragonFly.
  	    # This configuration from FreeBSD Ports.
  	    SHLIB_CFLAGS="-fPIC"
  	    SHLIB_LD="${CC} -shared"
-@@ -7837,10 +7834,6 @@ fi
+@@ -7336,10 +7333,6 @@ fi
  	    case $system in
  	    FreeBSD-3.*)
  		# Version numbers are dot-stripped by system policy.
@@ -41,7 +41,7 @@ Add support for DragonFly.
  		;;
  	    esac
  	    ;;
-@@ -8451,7 +8444,7 @@ fi
+@@ -7950,7 +7943,7 @@ fi
  	    BSD/OS*) ;;
  	    CYGWIN_*|MINGW32_*) ;;
  	    IRIX*) ;;
diff --git a/lang/tcl/patches/patch-pkgs_tdbc1.0.2_configure b/lang/tcl/patches/patch-pkgs_tdbc1.0.2_configure
new file mode 100644
index 00000000000..1bc8443d008
--- /dev/null
+++ b/lang/tcl/patches/patch-pkgs_tdbc1.0.2_configure
@@ -0,0 +1,52 @@
+$NetBSD: patch-pkgs_tdbc1.0.2_configure,v 1.1 2014/11/22 15:57:17 adam Exp $
+
+Add support for DragonFly.
+
+--- pkgs/tdbc1.0.2/configure.orig	2014-10-23 20:00:31.000000000 +0000
++++ pkgs/tdbc1.0.2/configure
+@@ -9424,7 +9424,6 @@ fi
+ fi
+ 
+ 		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+-		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
+ 		LDFLAGS="-Wl,-export-dynamic"
+ 		;;
+ 	    esac
+@@ -9446,8 +9445,6 @@ fi
+ fi
+ 
+ 	    # OpenBSD doesn't do version numbers with dots.
+-	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
+-	    TCL_LIB_VERSIONS_OK=nodots
+ 	    ;;
+ 	NetBSD-*)
+ 	    # NetBSD has ELF and can use 'cc -shared' to build shared libs
+@@ -9471,7 +9468,7 @@ fi
+ fi
+ 
+ 	    ;;
+-	FreeBSD-*)
++	FreeBSD-*|DragonFly-*)
+ 	    # This configuration from FreeBSD Ports.
+ 	    SHLIB_CFLAGS="-fPIC"
+ 	    SHLIB_LD="${CC} -shared"
+@@ -9495,10 +9492,6 @@ fi
+ 	    case $system in
+ 	    FreeBSD-3.*)
+ 		# Version numbers are dot-stripped by system policy.
+-		TCL_TRIM_DOTS=`echo ${PACKAGE_VERSION} | tr -d .`
+-		UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
+-		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
+-		TCL_LIB_VERSIONS_OK=nodots
+ 		;;
+ 	    esac
+ 	    ;;
+@@ -10349,7 +10342,7 @@ fi
+ 	    BSD/OS*) ;;
+ 	    CYGWIN_*|MINGW32_*) ;;
+ 	    IRIX*) ;;
+-	    NetBSD-*|FreeBSD-*|OpenBSD-*) ;;
++	    NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*) ;;
+ 	    Darwin-*) ;;
+ 	    SCO_SV-3.2*) ;;
+ 	    windows) ;;
diff --git a/lang/tcl/patches/patch-pkgs_tdbcmysql1.0.1_configure b/lang/tcl/patches/patch-pkgs_tdbcmysql1.0.2_configure
index ff94841f7bd..60b8fa976d0 100644
--- a/lang/tcl/patches/patch-pkgs_tdbcmysql1.0.1_configure
+++ b/lang/tcl/patches/patch-pkgs_tdbcmysql1.0.2_configure
@@ -1,18 +1,18 @@
-$NetBSD: patch-pkgs_tdbcmysql1.0.1_configure,v 1.1 2014/10/31 21:11:18 adam Exp $
+$NetBSD: patch-pkgs_tdbcmysql1.0.2_configure,v 1.1 2014/11/22 15:57:17 adam Exp $
 
 Add support for DragonFly.
 
---- pkgs/tdbcmysql1.0.1/configure.orig	2014-08-14 17:46:47.000000000 +0000
-+++ pkgs/tdbcmysql1.0.1/configure
-@@ -7776,7 +7776,6 @@ fi
+--- pkgs/tdbcmysql1.0.2/configure.orig	2014-10-23 20:04:27.000000000 +0000
++++ pkgs/tdbcmysql1.0.2/configure
+@@ -7793,7 +7793,6 @@ fi
  		    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
  fi
  		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
--		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}'
+-		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
  		LDFLAGS="-Wl,-export-dynamic"
  		;;
  	    esac
-@@ -7797,8 +7796,6 @@ fi
+@@ -7814,8 +7813,6 @@ fi
  
  fi
  	    # OpenBSD doesn't do version numbers with dots.
@@ -21,7 +21,7 @@ Add support for DragonFly.
  	    ;;
  	NetBSD-*)
  	    # NetBSD has ELF and can use 'cc -shared' to build shared libs
-@@ -7820,7 +7817,7 @@ fi
+@@ -7837,7 +7834,7 @@ fi
  
  fi
  	    ;;
@@ -30,7 +30,7 @@ Add support for DragonFly.
  	    # This configuration from FreeBSD Ports.
  	    SHLIB_CFLAGS="-fPIC"
  	    SHLIB_LD="${CC} -shared"
-@@ -7843,10 +7840,6 @@ fi
+@@ -7859,10 +7856,6 @@ fi
  	    case $system in
  	    FreeBSD-3.*)
  		# Version numbers are dot-stripped by system policy.
@@ -41,7 +41,7 @@ Add support for DragonFly.
  		;;
  	    esac
  	    ;;
-@@ -8457,7 +8450,7 @@ fi
+@@ -8473,7 +8466,7 @@ fi
  	    BSD/OS*) ;;
  	    CYGWIN_*|MINGW32_*) ;;
  	    IRIX*) ;;
diff --git a/lang/tcl/patches/patch-pkgs_itcl4.0.1_configure b/lang/tcl/patches/patch-pkgs_tdbcodbc1.0.2_configure
index 80534e52538..8364cc96e4c 100644
--- a/lang/tcl/patches/patch-pkgs_itcl4.0.1_configure
+++ b/lang/tcl/patches/patch-pkgs_tdbcodbc1.0.2_configure
@@ -1,18 +1,18 @@
-$NetBSD: patch-pkgs_itcl4.0.1_configure,v 1.1 2014/10/31 21:11:18 adam Exp $
+$NetBSD: patch-pkgs_tdbcodbc1.0.2_configure,v 1.1 2014/11/22 15:57:17 adam Exp $
 
 Add support for DragonFly.
 
---- pkgs/itcl4.0.1/configure.orig	2014-08-14 17:05:04.000000000 +0000
-+++ pkgs/itcl4.0.1/configure
-@@ -7304,7 +7304,6 @@ fi
+--- pkgs/tdbcodbc1.0.2/configure.orig	2014-10-23 20:06:52.000000000 +0000
++++ pkgs/tdbcodbc1.0.2/configure
+@@ -7787,7 +7787,6 @@ fi
  		    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
  fi
  		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
--		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}'
+-		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
  		LDFLAGS="-Wl,-export-dynamic"
  		;;
  	    esac
-@@ -7325,8 +7324,6 @@ fi
+@@ -7808,8 +7807,6 @@ fi
  
  fi
  	    # OpenBSD doesn't do version numbers with dots.
@@ -21,7 +21,7 @@ Add support for DragonFly.
  	    ;;
  	NetBSD-*)
  	    # NetBSD has ELF and can use 'cc -shared' to build shared libs
-@@ -7348,7 +7345,7 @@ fi
+@@ -7831,7 +7828,7 @@ fi
  
  fi
  	    ;;
@@ -30,7 +30,7 @@ Add support for DragonFly.
  	    # This configuration from FreeBSD Ports.
  	    SHLIB_CFLAGS="-fPIC"
  	    SHLIB_LD="${CC} -shared"
-@@ -7371,10 +7368,6 @@ fi
+@@ -7853,10 +7850,6 @@ fi
  	    case $system in
  	    FreeBSD-3.*)
  		# Version numbers are dot-stripped by system policy.
@@ -41,7 +41,7 @@ Add support for DragonFly.
  		;;
  	    esac
  	    ;;
-@@ -7985,7 +7978,7 @@ fi
+@@ -8467,7 +8460,7 @@ fi
  	    BSD/OS*) ;;
  	    CYGWIN_*|MINGW32_*) ;;
  	    IRIX*) ;;
diff --git a/lang/tcl/patches/patch-pkgs_tdbcpostgres1.0.1_configure b/lang/tcl/patches/patch-pkgs_tdbcpostgres1.0.2_configure
index 66d42bacc28..74b7db569e9 100644
--- a/lang/tcl/patches/patch-pkgs_tdbcpostgres1.0.1_configure
+++ b/lang/tcl/patches/patch-pkgs_tdbcpostgres1.0.2_configure
@@ -1,18 +1,18 @@
-$NetBSD: patch-pkgs_tdbcpostgres1.0.1_configure,v 1.1 2014/10/31 21:11:18 adam Exp $
+$NetBSD: patch-pkgs_tdbcpostgres1.0.2_configure,v 1.1 2014/11/22 15:57:17 adam Exp $
 
 Add support for DragonFly.
 
---- pkgs/tdbcpostgres1.0.1/configure.orig	2014-08-14 17:59:04.000000000 +0000
-+++ pkgs/tdbcpostgres1.0.1/configure
-@@ -7770,7 +7770,6 @@ fi
+--- pkgs/tdbcpostgres1.0.2/configure.orig	2014-10-23 20:08:52.000000000 +0000
++++ pkgs/tdbcpostgres1.0.2/configure
+@@ -7787,7 +7787,6 @@ fi
  		    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
  fi
  		LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
--		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}'
+-		SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so${SHLIB_VERSION}'
  		LDFLAGS="-Wl,-export-dynamic"
  		;;
  	    esac
-@@ -7791,8 +7790,6 @@ fi
+@@ -7808,8 +7807,6 @@ fi
  
  fi
  	    # OpenBSD doesn't do version numbers with dots.
@@ -21,7 +21,7 @@ Add support for DragonFly.
  	    ;;
  	NetBSD-*)
  	    # NetBSD has ELF and can use 'cc -shared' to build shared libs
-@@ -7814,7 +7811,7 @@ fi
+@@ -7831,7 +7828,7 @@ fi
  
  fi
  	    ;;
@@ -30,7 +30,7 @@ Add support for DragonFly.
  	    # This configuration from FreeBSD Ports.
  	    SHLIB_CFLAGS="-fPIC"
  	    SHLIB_LD="${CC} -shared"
-@@ -7837,10 +7834,6 @@ fi
+@@ -7853,10 +7850,6 @@ fi
  	    case $system in
  	    FreeBSD-3.*)
  		# Version numbers are dot-stripped by system policy.
@@ -41,7 +41,7 @@ Add support for DragonFly.
  		;;
  	    esac
  	    ;;
-@@ -8451,7 +8444,7 @@ fi
+@@ -8467,7 +8460,7 @@ fi
  	    BSD/OS*) ;;
  	    CYGWIN_*|MINGW32_*) ;;
  	    IRIX*) ;;